You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/04/11 22:52:54 UTC
[2/7] git commit: ACUMULO-2659 Replace some more methods for api's
sake
ACUMULO-2659 Replace some more methods for api's sake
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/708ad54e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/708ad54e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/708ad54e
Branch: refs/heads/master
Commit: 708ad54ecce2ba92d3806c4e7144735bf6ccc271
Parents: 7a14fcc
Author: Josh Elser <el...@apache.org>
Authored: Fri Apr 11 16:13:03 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Apr 11 16:13:03 2014 -0400
----------------------------------------------------------------------
.../core/client/mapred/InputFormatBase.java | 16 +++++++++++++++-
.../core/client/mapreduce/InputFormatBase.java | 16 +++++++++++++++-
2 files changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/708ad54e/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
index e2ab25a..609733e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
@@ -538,8 +538,10 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
protected org.apache.accumulo.core.client.mapred.RangeInputSplit split;
/**
- * Apply the configured iterators from the configuration to the scanner.
+ * Apply the configured iterators to the scanner.
*
+ * @param iterators
+ * the iterators to set
* @param scanner
* the scanner to configure
*/
@@ -550,6 +552,18 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
}
/**
+ * Apply the configured iterators from the configuration to the scanner.
+ *
+ * @param job
+ * the job configuration
+ * @param scanner
+ * the scanner to configure
+ */
+ protected void setupIterators(JobConf job, Scanner scanner) {
+ setupIterators(getIterators(job), scanner);
+ }
+
+ /**
* Initialize a scanner over the given input split using this task attempt configuration.
*/
public void initialize(InputSplit inSplit, JobConf job) throws IOException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/708ad54e/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
index 4c88bd5..9710f95 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
@@ -549,8 +549,10 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
protected org.apache.accumulo.core.client.mapreduce.RangeInputSplit split;
/**
- * Apply the configured iterators from the configuration to the scanner.
+ * Apply the configured iterators to the scanner.
*
+ * @param iterators
+ * the iterators to configure
* @param scanner
* the scanner to configure
*/
@@ -561,6 +563,18 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
}
/**
+ * Apply the configured iterators from the configuration to the scanner.
+ *
+ * @param context
+ * the iterators to configure
+ * @param scanner
+ * the scanner to configure
+ */
+ protected void setupIterators(TaskAttemptContext context, Scanner scanner) {
+ setupIterators(getIterators(context), scanner);
+ }
+
+ /**
* Initialize a scanner over the given input split using this task attempt configuration.
*/
@Override