From commits-return-19907-archive-asf-public=cust-asf.ponee.io@phoenix.apache.org Fri Mar 16 23:54:14 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 2F7D8180608 for ; Fri, 16 Mar 2018 23:54:14 +0100 (CET) Received: (qmail 90623 invoked by uid 500); 16 Mar 2018 22:54:13 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 90614 invoked by uid 99); 16 Mar 2018 22:54:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2018 22:54:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 20B72EB4B2; Fri, 16 Mar 2018 22:54:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tdsilva@apache.org To: commits@phoenix.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer 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:54:13 +0000 (UTC) Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.2 be634b576 -> 9f3bbd97a 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/9f3bbd97 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9f3bbd97 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9f3bbd97 Branch: refs/heads/4.x-HBase-1.2 Commit: 9f3bbd97aca97b10bfa5e898d2721b645496e365 Parents: be634b5 Author: Thomas D'Silva Authored: Thu Mar 15 13:18:24 2018 -0700 Committer: Thomas D'Silva Committed: Fri Mar 16 14:22:06 2018 -0700 ---------------------------------------------------------------------- .../regionserver/IndexHalfStoreFileReaderGenerator.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/9f3bbd97/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) {