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:36 UTC
[1/6] git commit: ACCUMULO-2586 Ensure that all of the constructors
from 1.5.0 are present
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT 926133889 -> 0607c8cf0
refs/heads/1.6.0-SNAPSHOT a694e9ab1 -> b2008ca92
refs/heads/master 0ee108eaa -> c9f52faa7
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.5.2-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);
}
}
[2/6] git commit: ACCUMULO-2586 Ensure that all of the constructors
from 1.5.0 are present
Posted by el...@apache.org.
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);
}
}
[3/6] git commit: ACCUMULO-2586 Ensure that all of the constructors
from 1.5.0 are present
Posted by el...@apache.org.
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/master
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);
}
}
[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c9f52faa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c9f52faa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c9f52faa
Branch: refs/heads/master
Commit: c9f52faa72de440ee471d342c77d662ea1ec90f4
Parents: 0ee108e b2008ca
Author: Josh Elser <el...@apache.org>
Authored: Thu Apr 10 23:49:47 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Apr 10 23:49:47 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/core/client/mapred/InputFormatBase.java | 4 ++++
.../apache/accumulo/core/client/mapreduce/InputFormatBase.java | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b2008ca9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b2008ca9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b2008ca9
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: b2008ca92a6861c75e6f531176461a4d3e33c403
Parents: a694e9a 0607c8c
Author: Josh Elser <el...@apache.org>
Authored: Thu Apr 10 23:49:32 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Apr 10 23:49:32 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/core/client/mapred/InputFormatBase.java | 4 ++++
.../apache/accumulo/core/client/mapreduce/InputFormatBase.java | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2008ca9/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
index 8cd63bc,e2ab25a..f2ac488
--- 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
@@@ -349,12 -917,13 +349,16 @@@ public abstract class InputFormatBase<K
super();
}
- public RangeInputSplit(RangeInputSplit split) throws IOException {
- this.setRange(split.getRange());
- this.setLocations(split.getLocations());
+ public RangeInputSplit(RangeInputSplit other) throws IOException {
+ super(other);
+ }
+
+ public RangeInputSplit(String table, String tableId, Range range, String[] locations) {
+ super(table, tableId, range, locations);
}
+
+ protected RangeInputSplit(String table, Range range, String[] locations) {
- super(range, locations);
++ super(table, "", range, locations);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2008ca9/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
index e3ac3cb,4c88bd5..a934d71
--- 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
@@@ -356,12 -1329,13 +356,16 @@@ public abstract class InputFormatBase<K
super();
}
- public RangeInputSplit(RangeInputSplit split) throws IOException {
- this.setRange(split.getRange());
- this.setLocations(split.getLocations());
+ public RangeInputSplit(RangeInputSplit other) throws IOException {
+ super(other);
}
- protected RangeInputSplit(String table, String tableId, Range range, String[] locations) {
+ protected RangeInputSplit(String table, Range range, String[] locations) {
- super(range, locations);
++ super(table, "", range, locations);
++ }
++
++ public RangeInputSplit(String table, String tableId, Range range, String[] locations) {
+ super(table, tableId, range, locations);
}
}
}
[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b2008ca9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b2008ca9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b2008ca9
Branch: refs/heads/master
Commit: b2008ca92a6861c75e6f531176461a4d3e33c403
Parents: a694e9a 0607c8c
Author: Josh Elser <el...@apache.org>
Authored: Thu Apr 10 23:49:32 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Apr 10 23:49:32 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/core/client/mapred/InputFormatBase.java | 4 ++++
.../apache/accumulo/core/client/mapreduce/InputFormatBase.java | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2008ca9/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
index 8cd63bc,e2ab25a..f2ac488
--- 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
@@@ -349,12 -917,13 +349,16 @@@ public abstract class InputFormatBase<K
super();
}
- public RangeInputSplit(RangeInputSplit split) throws IOException {
- this.setRange(split.getRange());
- this.setLocations(split.getLocations());
+ public RangeInputSplit(RangeInputSplit other) throws IOException {
+ super(other);
+ }
+
+ public RangeInputSplit(String table, String tableId, Range range, String[] locations) {
+ super(table, tableId, range, locations);
}
+
+ protected RangeInputSplit(String table, Range range, String[] locations) {
- super(range, locations);
++ super(table, "", range, locations);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2008ca9/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
index e3ac3cb,4c88bd5..a934d71
--- 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
@@@ -356,12 -1329,13 +356,16 @@@ public abstract class InputFormatBase<K
super();
}
- public RangeInputSplit(RangeInputSplit split) throws IOException {
- this.setRange(split.getRange());
- this.setLocations(split.getLocations());
+ public RangeInputSplit(RangeInputSplit other) throws IOException {
+ super(other);
}
- protected RangeInputSplit(String table, String tableId, Range range, String[] locations) {
+ protected RangeInputSplit(String table, Range range, String[] locations) {
- super(range, locations);
++ super(table, "", range, locations);
++ }
++
++ public RangeInputSplit(String table, String tableId, Range range, String[] locations) {
+ super(table, tableId, range, locations);
}
}
}