From e43f5b34b9b72f8f7dba7c320a58d8f3121bb6e7 Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Tue, 31 May 2022 09:12:55 +0000 Subject: use [document] not [all] --- .../src/main/java/com/yahoo/vespaget/CommandLineOptions.java | 6 ++---- vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java | 5 ++++- .../src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java | 3 +-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'vespaclient-java') diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java index bc5680d38b7..b1bc9c76328 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java @@ -67,10 +67,9 @@ public class CommandLineOptions { .longOpt(PRINTIDS_OPTION) .build()); - // TODO Vespa 8: change to DocumentOnly.NAME options.addOption(Option.builder("f") .hasArg(true) - .desc("Retrieve the specified fields only (see https://docs.vespa.ai/en/documents.html#fieldsets) (default '" + AllFields.NAME + "')") + .desc("Retrieve the specified fields only (see https://docs.vespa.ai/en/documents.html#fieldsets) (default '" + DocumentOnly.NAME + "')") .longOpt(FIELDSET_OPTION) .argName("fieldset").build()); @@ -176,8 +175,7 @@ public class CommandLineOptions { if (printIdsOnly) { fieldSet = DocIdOnly.NAME; } else if (fieldSet.isEmpty()) { - // TODO Vespa 8: change to DocumentOnly.NAME - fieldSet = AllFields.NAME; + fieldSet = DocumentOnly.NAME; } if (!cluster.isEmpty() && !route.isEmpty()) { 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 0e64f824b63..42c23c4a961 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java @@ -3,6 +3,7 @@ package com.yahoo.vespavisit; import com.yahoo.document.FixedBucketSpaces; import com.yahoo.document.fieldset.DocIdOnly; +import com.yahoo.document.fieldset.DocumentOnly; import com.yahoo.document.select.parser.ParseException; import com.yahoo.documentapi.ProgressToken; import com.yahoo.documentapi.VisitorControlHandler; @@ -193,7 +194,7 @@ public class VdsVisit { .longOpt("fieldset") .hasArg(true) .argName("fieldset") - .desc("Retrieve the specified fields only (see https://docs.vespa.ai/en/documents.html#fieldsets). Default is [all].") + .desc("Retrieve the specified fields only (see https://docs.vespa.ai/en/documents.html#fieldsets). Default is [document].") .build()); options.addOption(Option.builder() @@ -467,6 +468,8 @@ public class VdsVisit { } if (line.hasOption("l")) { params.fieldSet(line.getOptionValue("l")); + } else { + params.fieldSet(DocumentOnly.NAME); } if (line.hasOption("visitinconsistentbuckets")) { params.visitInconsistentBuckets(true); diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java index d47810fa81f..0b828c91f91 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java @@ -56,8 +56,7 @@ public class CommandLineOptionsTest { assertFalse(params.help); assertFalse(params.documentIds.hasNext()); assertFalse(params.printIdsOnly); - // TODO Vespa 8: change to DocumentOnly.NAME - assertEquals(AllFields.NAME, params.fieldSet); + assertEquals(DocumentOnly.NAME, params.fieldSet); assertEquals("default-get", params.route); assertTrue(params.cluster.isEmpty()); assertEquals("client", params.configId); -- cgit v1.2.3