Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 4c379d764 -> dc7e377d4
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/dc7e377d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/dc7e377d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/dc7e377d Branch: refs/heads/5.x-HBase-2.0 Commit: dc7e377d4f79b88c2371abf8385a56378667960f Parents: 4c379d7 Author: Thomas D'Silva <[email protected]> Authored: Fri Mar 16 14:16:05 2018 -0700 Committer: Thomas D'Silva <[email protected]> Committed: Fri Mar 16 14:16:05 2018 -0700 ---------------------------------------------------------------------- .../hbase/regionserver/IndexHalfStoreFileReaderGenerator.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/dc7e377d/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 3a70f66..5241885 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 @@ -30,13 +30,13 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.CompareOperator; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; +import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; @@ -204,6 +204,9 @@ public class IndexHalfStoreFileReaderGenerator implements RegionObserver { } } if (repairScanner != null) { + if (s!=null) { + s.close(); + } return repairScanner; } else { return s;
