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 05:50:37 UTC

[2/6] git commit: ACCUMULO-2586 Ensure that all of the constructors from 1.5.0 are present

ACCUMULO-2586 Ensure that all of the constructors from 1.5.0 are present


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0607c8cf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0607c8cf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0607c8cf

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 0607c8cf0bb1a4088c0c333063c8fea9bf834fd5
Parents: 9261338
Author: Josh Elser <el...@apache.org>
Authored: Thu Apr 10 23:05:41 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Apr 10 23:05:41 2014 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/client/mapred/InputFormatBase.java   | 7 ++++++-
 .../accumulo/core/client/mapreduce/InputFormatBase.java       | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0607c8cf/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 bc568e8..e2ab25a 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
@@ -917,7 +917,12 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
       super();
     }
 
-    public RangeInputSplit(Range range, String[] locations) {
+    public RangeInputSplit(RangeInputSplit split) throws IOException {
+      this.setRange(split.getRange());
+      this.setLocations(split.getLocations());
+    }
+
+    protected RangeInputSplit(String table, Range range, String[] locations) {
       super(range, locations);
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0607c8cf/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 710c565..4c88bd5 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
@@ -1329,7 +1329,12 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
       super();
     }
 
-    public RangeInputSplit(Range range, String[] locations) {
+    public RangeInputSplit(RangeInputSplit split) throws IOException {
+      this.setRange(split.getRange());
+      this.setLocations(split.getLocations());
+    }
+
+    protected RangeInputSplit(String table, Range range, String[] locations) {
       super(range, locations);
     }
   }