Repository: phoenix Updated Branches: refs/heads/4.x-cdh5.11.2 716a38a94 -> 1a458eb9e
PHOENIX-4460 High GC / RS shutdown when we use select query with IN clause using 4.10 phoenix client on 4.13 phoenix server Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1a458eb9 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1a458eb9 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1a458eb9 Branch: refs/heads/4.x-cdh5.11.2 Commit: 1a458eb9ebe57fa126d778ac314dfdcdfe6c0d22 Parents: 716a38a Author: Thomas D'Silva <[email protected]> Authored: Thu Dec 14 15:41:42 2017 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Mon Dec 18 12:08:51 2017 -0800 ---------------------------------------------------------------------- .../apache/phoenix/coprocessor/BaseScannerRegionObserver.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/1a458eb9/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java index 1c18a34..3d576de 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java @@ -365,7 +365,10 @@ abstract public class BaseScannerRegionObserver extends BaseRegionObserver { if (scan.isRaw() || ScanInfoUtil.isKeepDeletedCells(store.getScanInfo()) || scan.getTimeRange().getMax() == HConstants.LATEST_TIMESTAMP || TransactionUtil.isTransactionalTimestamp(scan.getTimeRange().getMax())) { return s; } - + + if (s!=null) { + s.close(); + } ScanInfo scanInfo = ScanInfoUtil.cloneScanInfoWithKeepDeletedCells(store.getScanInfo()); return new StoreScanner(store, scanInfo, scan, targetCols, c.getEnvironment().getRegion().getReadpoint(scan.getIsolationLevel()));
