You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2018/03/16 22:53:40 UTC
phoenix git commit: PHOENIX-4505
IndexHalfStoreFileReaderGenerator.preStoreScannerOpen does not close the
passed in KeyValueScanner while creating and returning a new scanner
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 ade93c9d5 -> d92434365
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/d9243436
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d9243436
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d9243436
Branch: refs/heads/4.x-HBase-0.98
Commit: d92434365cd228eb825330256cb148aecd29bfaf
Parents: ade93c9
Author: Thomas D'Silva <td...@apache.org>
Authored: Thu Mar 15 13:18:24 2018 -0700
Committer: Thomas D'Silva <td...@apache.org>
Committed: Fri Mar 16 14:22:53 2018 -0700
----------------------------------------------------------------------
.../regionserver/IndexHalfStoreFileReaderGenerator.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d9243436/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 ffe2e5e..ac90f88 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
@@ -209,6 +209,9 @@ public class IndexHalfStoreFileReaderGenerator extends BaseRegionObserver {
}
}
if (repairScanner != null) {
+ if (s!=null) {
+ s.close();
+ }
return repairScanner;
} else {
return s;
@@ -226,6 +229,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);
}
@@ -310,6 +316,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) {