Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 89AE01050E for ; Fri, 14 Feb 2014 02:18:31 +0000 (UTC) Received: (qmail 74912 invoked by uid 500); 14 Feb 2014 02:18:28 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 74816 invoked by uid 500); 14 Feb 2014 02:18:27 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 74759 invoked by uid 99); 14 Feb 2014 02:18:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Feb 2014 02:18:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B6F329260AC; Fri, 14 Feb 2014 02:18:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Fri, 14 Feb 2014 02:18:27 -0000 Message-Id: <4a4ea6b75a0f4dba8a7d3b86c7b32267@git.apache.org> In-Reply-To: <8c44a49c3a3444719431e70e602443bd@git.apache.org> References: <8c44a49c3a3444719431e70e602443bd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] git commit: ACCUMULO-2297 Remove unnecessary currentValue and add javadoc for purpose of other members ACCUMULO-2297 Remove unnecessary currentValue and add javadoc for purpose of other members Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec4d4d85 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec4d4d85 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ec4d4d85 Branch: refs/heads/master Commit: ec4d4d858ae2ad6aca01f73f2f30a09abd5f0f81 Parents: 1a91326 Author: Josh Elser Authored: Thu Feb 13 18:23:33 2014 -0500 Committer: Josh Elser Committed: Thu Feb 13 19:21:45 2014 -0500 ---------------------------------------------------------------------- .../core/client/mapreduce/AbstractInputFormat.java | 12 +++++++++++- .../core/client/mapreduce/AccumuloInputFormat.java | 2 +- .../client/mapreduce/AccumuloMultiTableInputFormat.java | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ec4d4d85/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java index 971dff5..5c7b857 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java @@ -488,10 +488,20 @@ public abstract class AbstractInputFormat extends InputFormat { return split.getProgress(currentKey); } + /** + * The Key that should be returned to the client + */ protected K currentK = null; + + /** + * The Value that should be return to the client + */ protected V currentV = null; + + /** + * The Key that is used to determine progress in the current InputSplit. It is not returned to the client and is only used internally + */ protected Key currentKey = null; - protected Value currentValue = null; @Override public K getCurrentKey() throws IOException, InterruptedException { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ec4d4d85/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java index a1340c3..7a82652 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java @@ -69,7 +69,7 @@ public class AccumuloInputFormat extends InputFormatBase { ++numKeysRead; Entry entry = scannerIterator.next(); currentK = currentKey = entry.getKey(); - currentV = currentValue = entry.getValue(); + currentV = entry.getValue(); if (log.isTraceEnabled()) log.trace("Processing key/value pair: " + DefaultFormatter.formatEntry(entry, true)); return true; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ec4d4d85/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java index 9e86c7b..c514385 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java @@ -77,7 +77,7 @@ public class AccumuloMultiTableInputFormat extends AbstractInputFormat entry = scannerIterator.next(); currentK = currentKey = entry.getKey(); - currentV = currentValue = entry.getValue(); + currentV = entry.getValue(); if (log.isTraceEnabled()) log.trace("Processing key/value pair: " + DefaultFormatter.formatEntry(entry, true)); return true;