Repository: accumulo Updated Branches: refs/heads/master ee8e0705c -> a094324a5
ACCUMULO-4128: Use setshelliter and profile name in scan commands Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a094324a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a094324a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a094324a Branch: refs/heads/master Commit: a094324a5b7ceebaf7f3e5c656beeebc0710fbc4 Parents: ee8e070 Author: Dave Marion <dlmar...@apache.org> Authored: Wed Jul 20 08:03:23 2016 -0400 Committer: Dave Marion <dlmar...@apache.org> Committed: Wed Jul 20 08:03:23 2016 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/test/ShellServerIT.java | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a094324a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java index d67dc0a..765ddf6 100644 --- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java @@ -1757,24 +1757,24 @@ public class ShellServerIT extends SharedMiniClusterBase { assertEquals("root@miniInstance t> config -s " + Property.VFS_CONTEXT_CLASSPATH_PROPERTY + FAKE_CONTEXT + "=" + FAKE_CONTEXT_CLASSPATH + "\n", result); result = ts.exec("config -t t -s table.classpath.context=" + FAKE_CONTEXT); assertEquals("root@miniInstance t> config -t t -s table.classpath.context=" + FAKE_CONTEXT + "\n", result); - result = ts.exec("setiter -scan -n reverse -t t -p 21 -class org.apache.accumulo.test.functional.ValueReversingIterator"); + result = ts.exec("setshelliter -pn baz -n reverse -t t -p 21 -class org.apache.accumulo.test.functional.ValueReversingIterator"); assertTrue(result.contains("The iterator class does not implement OptionDescriber")); // The implementation of ValueReversingIterator in the FAKE context does nothing, the value is not reversed. - result = ts.exec("scan -np -b row1 -e row1"); + result = ts.exec("scan -pn baz -np -b row1 -e row1"); assertEquals(2, result.split("\n").length); assertTrue(result.contains("value")); - result = ts.exec("scan -np -b row3 -e row5"); + result = ts.exec("scan -pn baz -np -b row3 -e row5"); assertEquals(4, result.split("\n").length); assertTrue(result.contains("value")); - result = ts.exec("scan -np -r row3"); + result = ts.exec("scan -pn baz -np -r row3"); assertEquals(2, result.split("\n").length); assertTrue(result.contains("value")); - result = ts.exec("scan -np -b row:"); + result = ts.exec("scan -pn baz -np -b row:"); assertEquals(1, result.split("\n").length); - result = ts.exec("scan -np -b row"); + result = ts.exec("scan -pn baz -np -b row"); assertEquals(11, result.split("\n").length); assertTrue(result.contains("value")); - result = ts.exec("scan -np -e row:"); + result = ts.exec("scan -pn baz -np -e row:"); assertEquals(11, result.split("\n").length); assertTrue(result.contains("value")); @@ -1783,25 +1783,25 @@ public class ShellServerIT extends SharedMiniClusterBase { result = ts.exec("config -s " + Property.VFS_CONTEXT_CLASSPATH_PROPERTY + REAL_CONTEXT + "=" + REAL_CONTEXT_CLASSPATH); assertEquals("root@miniInstance t> config -s " + Property.VFS_CONTEXT_CLASSPATH_PROPERTY + REAL_CONTEXT + "=" + REAL_CONTEXT_CLASSPATH + "\n", result); // Override the table classloader context with the REAL implementation of ValueReversingIterator, which does reverse the value. - result = ts.exec("scan -np -b row1 -e row1 -cc " + REAL_CONTEXT); + result = ts.exec("scan -pn baz -np -b row1 -e row1 -cc " + REAL_CONTEXT); assertEquals(2, result.split("\n").length); assertTrue(result.contains("eulav")); assertFalse(result.contains("value")); - result = ts.exec("scan -np -b row3 -e row5 -cc " + REAL_CONTEXT); + result = ts.exec("scan -pn baz -np -b row3 -e row5 -cc " + REAL_CONTEXT); assertEquals(4, result.split("\n").length); assertTrue(result.contains("eulav")); assertFalse(result.contains("value")); - result = ts.exec("scan -np -r row3 -cc " + REAL_CONTEXT); + result = ts.exec("scan -pn baz -np -r row3 -cc " + REAL_CONTEXT); assertEquals(2, result.split("\n").length); assertTrue(result.contains("eulav")); assertFalse(result.contains("value")); - result = ts.exec("scan -np -b row: -cc " + REAL_CONTEXT); + result = ts.exec("scan -pn baz -np -b row: -cc " + REAL_CONTEXT); assertEquals(1, result.split("\n").length); - result = ts.exec("scan -np -b row -cc " + REAL_CONTEXT); + result = ts.exec("scan -pn baz -np -b row -cc " + REAL_CONTEXT); assertEquals(11, result.split("\n").length); assertTrue(result.contains("eulav")); assertFalse(result.contains("value")); - result = ts.exec("scan -np -e row: -cc " + REAL_CONTEXT); + result = ts.exec("scan -pn baz -np -e row: -cc " + REAL_CONTEXT); assertEquals(11, result.split("\n").length); assertTrue(result.contains("eulav")); assertFalse(result.contains("value"));