phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tdsi...@apache.org
Subject phoenix git commit: PHOENIX-4505 IndexHalfStoreFileReaderGenerator.preStoreScannerOpen does not close the passed in KeyValueScanner while creating and returning a new scanner
Date Fri, 16 Mar 2018 22:56:01 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-cdh5.11.2 1f0416616 -> cc23187fb


PHOENIX-4505 IndexHalfStoreFileReaderGenerator.preStoreScannerOpen does not close the passed
in KeyValueScanner while creating and returning a new scanner


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cc23187f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cc23187f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cc23187f

Branch: refs/heads/4.x-cdh5.11.2
Commit: cc23187fb305fefdcba55efb75c1eed5bc72c49b
Parents: 1f04166
Author: Thomas D'Silva <tdsilva@apache.org>
Authored: Thu Mar 15 13:18:24 2018 -0700
Committer: Thomas D'Silva <tdsilva@apache.org>
Committed: Fri Mar 16 14:21:05 2018 -0700

----------------------------------------------------------------------
 .../regionserver/IndexHalfStoreFileReaderGenerator.java     | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/cc23187f/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
index 88154a7..140b0ba 100644
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
@@ -210,6 +210,9 @@ public class IndexHalfStoreFileReaderGenerator extends BaseRegionObserver
{
                 }
             }
             if (repairScanner != null) {
+                if (s!=null) {
+                    s.close();
+                }
                 return repairScanner;
             } else {
                 return s;
@@ -227,6 +230,9 @@ public class IndexHalfStoreFileReaderGenerator extends BaseRegionObserver
{
                 newScanners.add(((StoreFileScanner) scanner));
             }
         }
+        if (s!=null) {
+            s.close();
+        }
         return new StoreScanner(store, store.getScanInfo(), scan, newScanners,
             scanType, store.getSmallestReadPoint(), earliestPutTs);
     }
@@ -311,6 +317,9 @@ public class IndexHalfStoreFileReaderGenerator extends BaseRegionObserver
{
                 && store.hasReferences()) {
             final long readPt = c.getEnvironment().getRegion().getReadpoint(scan.getIsolationLevel
                     ());
+            if (s!=null) {
+                s.close();
+            }
             if (!scan.isReversed()) {
                 return new StoreScanner(store, store.getScanInfo(), scan,
                         targetCols, readPt) {


Mime
View raw message