ACCUMULO-1854 Account for 1.4 to 1.5 changes in how Authorizations.serialize works.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ef64992c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ef64992c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ef64992c Branch: refs/heads/master Commit: ef64992c6ef35ee4aba1ea0970981761e589e8c4 Parents: e08736d Author: Josh Elser <[email protected]> Authored: Thu Nov 21 21:39:51 2013 -0500 Committer: Josh Elser <[email protected]> Committed: Thu Nov 21 21:39:51 2013 -0500 ---------------------------------------------------------------------- .../apache/accumulo/core/client/mapreduce/RangeInputSplit.java | 5 +++-- .../accumulo/core/client/mapreduce/RangeInputSplitTest.java | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ef64992c/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java index 6decdc6..9855c31 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java @@ -166,14 +166,15 @@ public class RangeInputSplit extends InputSplit implements Writable { int numColumns = in.readInt(); List<String> columns = new ArrayList<String>(numColumns); for (int i = 0; i < numColumns; i++) { - columns.set(i, in.readUTF()); + columns.add(in.readUTF()); } fetchedColumns = InputConfigurator.deserializeFetchedColumns(columns); } if (in.readBoolean()) { - auths = new Authorizations(StringUtils.split(in.readUTF())); + String strAuths = in.readUTF(); + auths = new Authorizations(strAuths.getBytes(Charset.forName("UTF-8"))); } if (in.readBoolean()) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ef64992c/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java index f6c604f..6da07a5 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java @@ -39,8 +39,6 @@ public class RangeInputSplitTest { Assert.assertTrue(Arrays.equals(split.getLocations(), newSplit.getLocations())); } - - @Test public void testAllFieldsWritable() throws IOException { RangeInputSplit split = new RangeInputSplit(new Range(new Key("a"), new Key("b")), new String[]{"localhost"});
