Merge branch '1.5.1-SNAPSHOT' 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/7d24ff5b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d24ff5b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d24ff5b Branch: refs/heads/1.6.0-SNAPSHOT Commit: 7d24ff5b5576a5fd54595866b8db60ee2a22d9ca Parents: 0f3f93f e6e1df4 Author: Josh Elser <els...@apache.org> Authored: Sat Nov 23 14:28:45 2013 -0500 Committer: Josh Elser <els...@apache.org> Committed: Sat Nov 23 14:28:45 2013 -0500 ---------------------------------------------------------------------- .../BadPasswordSplitsAccumuloInputFormat.java | 18 +++++++++++++++++- .../mapreduce/EmptySplitsAccumuloInputFormat.java | 18 +++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7d24ff5b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java ---------------------------------------------------------------------- diff --cc core/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java index 7130f24,440dbf7..8b2b020 --- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java +++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java @@@ -14,16 -30,8 +30,16 @@@ public class EmptySplitsAccumuloInputFo @Override public List<InputSplit> getSplits(JobContext context) throws IOException { - super.getSplits(context); + List<InputSplit> oldSplits = super.getSplits(context); + List<InputSplit> newSplits = new ArrayList<InputSplit>(oldSplits.size()); - return Arrays.<InputSplit> asList(new RangeInputSplit()); + // Copy only the necessary information + for (InputSplit oldSplit : oldSplits) { + RangeInputSplit newSplit = new RangeInputSplit((RangeInputSplit) oldSplit); + newSplits.add(newSplit); + } + + + return newSplits; } - } + }
