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 <els...@apache.org> Authored: Thu Feb 13 18:23:33 2014 -0500 Committer: Josh Elser <els...@apache.org> 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<K,V> extends InputFormat<K,V> { 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<Key,Value> { ++numKeysRead; Entry<Key,Value> 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<Key,Value ++numKeysRead; Map.Entry<Key,Value> 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;
