Add and propagate visitor parameter bucket space

Command line option for bucket space added to vespavisit binary.

2 files changed, 16 insertions, 2 deletions

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 79b48731cc7..4f462bf187e 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
@@ -336,6 +336,14 @@ 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;
     }
 
@@ -442,6 +450,9 @@ 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());
             }
@@ -607,6 +618,7 @@ 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/vespavisit/VdsVisitTestCase.java b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
index e2d045e1d33..32e29ba51ec 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
@@ -130,7 +130,8 @@ public class VdsVisitTestCase {
                 "--ordering", "ascending",
                 "--skipbucketsonfatalerrors",
                 "--abortonclusterdown",
-                "--visitremoves"
+                "--visitremoves",
+                "--bucketspace", "outerspace"
         };
         VdsVisit.ArgumentParser parser = createMockArgumentParser();
         VdsVisit.VdsVisitParameters allParams = parser.parse(args);
@@ -174,8 +175,9 @@ 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 +