Repository: phoenix Updated Branches: refs/heads/master 74228aee7 -> 1099a0a1d
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/1099a0a1 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1099a0a1 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1099a0a1 Branch: refs/heads/master Commit: 1099a0a1d8d6e8f7cb116d2724b61a489fc1264c Parents: 74228ae Author: Thomas D'Silva <tdsi...@apache.org> Authored: Thu Mar 15 13:18:24 2018 -0700 Committer: Thomas D'Silva <tdsi...@apache.org> Committed: Fri Mar 16 14:18:48 2018 -0700 ---------------------------------------------------------------------- .../regionserver/IndexHalfStoreFileReaderGenerator.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/1099a0a1/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 67564cd..21a075c 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) {