diff options
author | Harald Musum <musum@yahoo-inc.com> | 2018-01-30 19:30:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-30 19:30:16 +0100 |
commit | 0c585016ca2f8fbd25756f761552693e2445c23d (patch) | |
tree | 4ba84755780853b3ea7e670605456d716fed38ca /vespaclient-java | |
parent | 4d175c3c37d6ffada13dd15023d575f8e663351e (diff) |
Revert "Geirst/add bucket space to document api"
Diffstat (limited to 'vespaclient-java')
5 files changed, 3 insertions, 55 deletions
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespastat/ClientParameters.java b/vespaclient-java/src/main/java/com/yahoo/vespastat/ClientParameters.java index a05e4ed1e48..47a0418e2d8 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespastat/ClientParameters.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespastat/ClientParameters.java @@ -17,7 +17,6 @@ public class ClientParameters { public final SelectionType selectionType; // The selection id public final String id; - public final String bucketSpace; public ClientParameters( boolean help, @@ -25,22 +24,11 @@ public class ClientParameters { String route, SelectionType selectionType, String id) { - this(help, dumpData, route, selectionType, id, "default"); - } - - public ClientParameters( - boolean help, - boolean dumpData, - String route, - SelectionType selectionType, - String id, - String bucketSpace) { this.help = help; this.dumpData = dumpData; this.route = route; this.selectionType = selectionType; this.id = id; - this.bucketSpace = bucketSpace; } public enum SelectionType {USER, GROUP, BUCKET, GID, DOCUMENT} @@ -51,7 +39,6 @@ public class ClientParameters { private String route; private SelectionType selectionType; private String id; - private String bucketSpace = "default"; // TODO repo etc etc public Builder setHelp(boolean help) { this.help = help; @@ -78,13 +65,8 @@ public class ClientParameters { return this; } - public Builder setBucketSpace(String bucketSpace) { - this.bucketSpace = bucketSpace; - return this; - } - public ClientParameters build() { - return new ClientParameters(help, dumpData, route, selectionType, id, bucketSpace); + return new ClientParameters(help, dumpData, route, selectionType, id); } } diff --git a/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java b/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java index b6783efb25b..59ab17af8d6 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java @@ -25,7 +25,6 @@ public class CommandLineOptions { private static final String BUCKET_OPTION = "bucket"; private static final String GID_OPTION = "gid"; private static final String DOCUMENT_OPTION = "document"; - private static final String BUCKET_SPACE_OPTION = "bucketspace"; private final Options options = createOptions(); @@ -52,13 +51,6 @@ public class CommandLineOptions { .longOpt(ROUTE_OPTION) .build()); - options.addOption(Option.builder("s") - .hasArg(true) - .desc("Stat buckets within the given bucket space. If not provided, 'default' is used.") - .argName("space") - .longOpt(BUCKET_SPACE_OPTION) - .build()); - // A group of mutually exclusive options for user, group, bucket, gid and document. OptionGroup optionGroup = new OptionGroup(); optionGroup.setRequired(false); @@ -117,7 +109,6 @@ public class CommandLineOptions { builder.setHelp(cl.hasOption(HELP_OPTION)); builder.setDumpData(cl.hasOption(DUMP_OPTION)); builder.setRoute(cl.getOptionValue(ROUTE_OPTION, "default")); - builder.setBucketSpace(cl.getOptionValue(BUCKET_SPACE_OPTION, "default")); if (cl.hasOption(USER_OPTION)) { builder.setSelectionType(ClientParameters.SelectionType.USER); diff --git a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java index 4f462bf187e..79b48731cc7 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java @@ -336,14 +336,6 @@ public class VdsVisit { .desc("Output documents as JSON") .hasArg(false) .build()); - - options.addOption(Option.builder() - .longOpt("bucketspace") - .hasArg(true) - .argName("space") - .desc("Bucket space to visit ('default' or 'global). If not specified, 'default' is used.") - .build()); - return options; } @@ -450,9 +442,6 @@ public class VdsVisit { if (line.hasOption("s")) { params.setDocumentSelection(line.getOptionValue("s")); } - if (line.hasOption("bucketspace")) { - params.setBucketSpace(line.getOptionValue("bucketspace")); - } if (line.hasOption("f")) { params.setFromTimestamp(((Number) line.getParsedOptionValue("f")).longValue()); } @@ -618,7 +607,6 @@ public class VdsVisit { } else { out.println("Visiting documents matching: " + params.getDocumentSelection()); } - out.println(String.format("Visiting bucket space: %s", params.getBucketSpace())); if (params.getFromTimestamp() != 0 && params.getToTimestamp() != 0) { out.println("Visiting in the inclusive timestamp range " + params.getFromTimestamp() + " - " + params.getToTimestamp() + "."); diff --git a/vespaclient-java/src/test/java/com/yahoo/vespastat/CommandLineOptionsTest.java b/vespaclient-java/src/test/java/com/yahoo/vespastat/CommandLineOptionsTest.java index a6bd7280c36..31cef2a6a86 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespastat/CommandLineOptionsTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespastat/CommandLineOptionsTest.java @@ -70,17 +70,6 @@ public class CommandLineOptionsTest { } } - // TODO fixed bucket space repo - @Test - public void bucket_space_is_default_unless_specified() { - assertEquals("default", getParsedOptions("--user", "id").bucketSpace); - } - - @Test - public void can_specify_explicit_bucket_space() { - assertEquals("global", getParsedOptions("--user", "id", "--bucketspace", "global").bucketSpace); - } - @Test public void testDefaultRoute() { assertEquals("default", getParsedOptions("--user", "dummyuser").route); diff --git a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java index 32e29ba51ec..e2d045e1d33 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java @@ -130,8 +130,7 @@ public class VdsVisitTestCase { "--ordering", "ascending", "--skipbucketsonfatalerrors", "--abortonclusterdown", - "--visitremoves", - "--bucketspace", "outerspace" + "--visitremoves" }; VdsVisit.ArgumentParser parser = createMockArgumentParser(); VdsVisit.VdsVisitParameters allParams = parser.parse(args); @@ -175,9 +174,8 @@ public class VdsVisitTestCase { printStream.flush(); String nl = System.getProperty("line.separator"); // the joys of running tests on windows assertEquals( - "Time out visitor after 123456789 ms." + nl + + "Time out visitor after 123456789 ms." + nl + "Visiting documents matching: 'id.user=1234'" + nl + - "Visiting bucket space: outerspace" + nl + "Visiting in the inclusive timestamp range 5678 - 9012." + nl + "Visiting field set foodoc.bar,foodoc.baz." + nl + "Visiting inconsistent buckets." + nl + |