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 23:46:41 UTC
[1/4] git commit: Merge branch '1.6.0-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 6fb434f92 -> 019edb161
refs/heads/master a5d772d71 -> 370bb23b2
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/6fb434f9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6fb434f9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6fb434f9
Branch: refs/heads/master
Commit: 6fb434f926f71e501762315e47870d38293a6bb6
Parents: 50f8257 882cfc8
Author: Josh Elser <el...@apache.org>
Authored: Fri Apr 11 16:52:42 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Apr 11 16:52:42 2014 -0400
----------------------------------------------------------------------
.../core/client/MutationsRejectedException.java | 23 ++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
[3/4] git commit: ACCUMULO-2659 Fall back to the configuration when
the iterator setting aren't in the split
Posted by el...@apache.org.
ACCUMULO-2659 Fall back to the configuration when the iterator setting aren't in the split
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/019edb16
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/019edb16
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/019edb16
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 019edb1614008485f523deecaef88c7455e1e404
Parents: 6fb434f
Author: Josh Elser <el...@apache.org>
Authored: Fri Apr 11 17:37:04 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Apr 11 17:37:31 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/client/mapred/InputFormatBase.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/019edb16/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 54b983f..0cee355 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
@@ -322,6 +322,9 @@ public abstract class InputFormatBase<K,V> extends AbstractInputFormat<K,V> {
iterators = getIterators(job);
} else {
iterators = split.getIterators();
+ if (null == iterators) {
+ iterators = getIterators(job);
+ }
}
setupIterators(iterators, scanner);
[4/4] 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/370bb23b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/370bb23b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/370bb23b
Branch: refs/heads/master
Commit: 370bb23b2a8f46f35098424a60bbed20110ee28d
Parents: a5d772d 019edb1
Author: Josh Elser <el...@apache.org>
Authored: Fri Apr 11 17:46:30 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Apr 11 17:46:30 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/client/mapred/InputFormatBase.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
[2/4] git commit: ACCUMULO-2659 Fall back to the configuration when
the iterator setting aren't in the split
Posted by el...@apache.org.
ACCUMULO-2659 Fall back to the configuration when the iterator setting aren't in the split
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/019edb16
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/019edb16
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/019edb16
Branch: refs/heads/master
Commit: 019edb1614008485f523deecaef88c7455e1e404
Parents: 6fb434f
Author: Josh Elser <el...@apache.org>
Authored: Fri Apr 11 17:37:04 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Apr 11 17:37:31 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/client/mapred/InputFormatBase.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/019edb16/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 54b983f..0cee355 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
@@ -322,6 +322,9 @@ public abstract class InputFormatBase<K,V> extends AbstractInputFormat<K,V> {
iterators = getIterators(job);
} else {
iterators = split.getIterators();
+ if (null == iterators) {
+ iterators = getIterators(job);
+ }
}
setupIterators(iterators, scanner);