Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 36CC2189E0 for ; Wed, 30 Sep 2015 03:27:51 +0000 (UTC) Received: (qmail 67585 invoked by uid 500); 30 Sep 2015 03:27:51 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 67546 invoked by uid 500); 30 Sep 2015 03:27:51 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 67524 invoked by uid 99); 30 Sep 2015 03:27:50 -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; Wed, 30 Sep 2015 03:27:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9E8C5E00C5; Wed, 30 Sep 2015 03:27:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jerryjch@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-14394 Properly close the connection after reading records from table: addendum Date: Wed, 30 Sep 2015 03:27:50 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/master c04d18970 -> e6905a144 HBASE-14394 Properly close the connection after reading records from table: addendum Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e6905a14 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e6905a14 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e6905a14 Branch: refs/heads/master Commit: e6905a14446e9d795a797e091d5b35a75fe370d6 Parents: c04d189 Author: Jerry He Authored: Tue Sep 29 19:48:02 2015 -0700 Committer: Jerry He Committed: Tue Sep 29 20:14:54 2015 -0700 ---------------------------------------------------------------------- .../mapreduce/MultiTableInputFormatBase.java | 53 ++++++++++++++++---- .../hbase/mapreduce/TableRecordReader.java | 9 +--- 2 files changed, 45 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e6905a14/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java index 83dca4b..ff690c8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java @@ -29,7 +29,6 @@ import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.TableName; -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.RegionLocator; @@ -92,29 +91,65 @@ public abstract class MultiTableInputFormatBase extends + " previous error. Please look at the previous logs lines from" + " the task's full log for more details."); } - Connection connection = ConnectionFactory.createConnection(context.getConfiguration()); + final Connection connection = ConnectionFactory.createConnection(context.getConfiguration()); Table table = connection.getTable(tSplit.getTable()); - TableRecordReader trr = this.tableRecordReader; + if (this.tableRecordReader == null) { + this.tableRecordReader = new TableRecordReader(); + } + final TableRecordReader trr = this.tableRecordReader; try { - // if no table record reader was provided use default - if (trr == null) { - trr = new TableRecordReader(); - } Scan sc = tSplit.getScan(); sc.setStartRow(tSplit.getStartRow()); sc.setStopRow(tSplit.getEndRow()); trr.setScan(sc); trr.setTable(table); - trr.setConnection(connection); + return new RecordReader() { + + @Override + public void close() throws IOException { + trr.close(); + if (connection != null) { + connection.close(); + } + } + + @Override + public ImmutableBytesWritable getCurrentKey() throws IOException, InterruptedException { + return trr.getCurrentKey(); + } + + @Override + public Result getCurrentValue() throws IOException, InterruptedException { + return trr.getCurrentValue(); + } + + @Override + public float getProgress() throws IOException, InterruptedException { + return trr.getProgress(); + } + + @Override + public void initialize(InputSplit inputsplit, TaskAttemptContext context) + throws IOException, InterruptedException { + trr.initialize(inputsplit, context); + } + + @Override + public boolean nextKeyValue() throws IOException, InterruptedException { + return trr.nextKeyValue(); + } + }; } catch (IOException ioe) { // If there is an exception make sure that all // resources are closed and released. trr.close(); + if (connection != null) { + connection.close(); + } throw ioe; } - return trr; } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/e6905a14/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReader.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReader.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReader.java index 9ff90e7..21dc213 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReader.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReader.java @@ -22,7 +22,6 @@ import java.io.IOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; @@ -41,7 +40,6 @@ public class TableRecordReader extends RecordReader { private TableRecordReaderImpl recordReaderImpl = new TableRecordReaderImpl(); - private Connection connection = null; /** * Restart from survivable exceptions by creating a new scanner. @@ -87,10 +85,8 @@ extends RecordReader { * @see org.apache.hadoop.mapreduce.RecordReader#close() */ @Override - public void close() throws IOException { + public void close() { this.recordReaderImpl.close(); - if (this.connection != null) - this.connection.close(); } /** @@ -162,7 +158,4 @@ extends RecordReader { return this.recordReaderImpl.getProgress(); } - public void setConnection(Connection connection) { - this.connection = connection; - } }