From 5f73e06dfbdbcaf416b8cc28a83398a40b2b7036 Mon Sep 17 00:00:00 2001 From: Tor Brede Vekterli Date: Mon, 5 Dec 2022 14:53:48 +0100 Subject: Rename short tensor output CLI option `tensor-short-form` -> `shorttensors` to be in line with existing option formatting. --- .../src/main/java/com/yahoo/vespaget/CommandLineOptions.java | 11 +++++------ .../src/main/java/com/yahoo/vespavisit/VdsVisit.java | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'vespaclient-java/src/main/java/com/yahoo') 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 a6af51687eb..b059ca6e62a 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaget; -import com.yahoo.document.fieldset.AllFields; import com.yahoo.document.fieldset.DocumentOnly; import com.yahoo.document.fieldset.DocIdOnly; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; @@ -39,7 +38,7 @@ public class CommandLineOptions { public static final String PRIORITY_OPTION = "priority"; public static final String JSONOUTPUT_OPTION = "jsonoutput"; public static final String XMLOUTPUT_OPTION = "xmloutput"; - public static final String TENSOR_SHORT_FORM_OPTION = "tensor-short-form"; + public static final String SHORTTENSORS_OPTION = "shorttensors"; private final Options options = createOptions(); private final InputStream stdIn; @@ -132,9 +131,9 @@ public class CommandLineOptions { .desc("XML output") .longOpt(XMLOUTPUT_OPTION).build()); - // TODO Vespa 9: replace with --tensor-long-form ? + // TODO Vespa 9: replace with --longtensors ? options.addOption(Option.builder() - .longOpt(TENSOR_SHORT_FORM_OPTION) + .longOpt(SHORTTENSORS_OPTION) .desc("Output JSON tensors in short form. Will be the default on Vespa 9") .hasArg(false) .build()); @@ -167,7 +166,7 @@ public class CommandLineOptions { boolean showDocSize = cl.hasOption(SHOWDOCSIZE_OPTION); boolean jsonOutput = cl.hasOption(JSONOUTPUT_OPTION); boolean xmlOutput = cl.hasOption(XMLOUTPUT_OPTION); - boolean tensorShortForm = cl.hasOption(TENSOR_SHORT_FORM_OPTION); + boolean shortTensors = cl.hasOption(SHORTTENSORS_OPTION); int trace = getTrace(cl); DocumentProtocol.Priority priority = getPriority(cl); double timeout = getTimeout(cl); @@ -218,7 +217,7 @@ public class CommandLineOptions { .setPriority(priority) .setTimeout(timeout) .setJsonOutput(!xmlOutput) - .setTensorShortForm(tensorShortForm) + .setTensorShortForm(shortTensors) .build(); } catch (ParseException pe) { throw new IllegalArgumentException(pe.getMessage()); 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 44e2cd55bdc..f84cb7270bd 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java @@ -348,9 +348,9 @@ public class VdsVisit { FixedBucketSpaces.defaultSpace(), FixedBucketSpaces.globalSpace(), FixedBucketSpaces.defaultSpace())) .build()); - // TODO Vespa 9: replace with --tensor-long-form ? + // TODO Vespa 9: replace with --longtensors ? options.addOption(Option.builder() - .longOpt("tensor-short-form") + .longOpt("shorttensors") .desc("Output JSON tensors in short form. Will be the default on Vespa 9") .hasArg(false) .build()); @@ -569,7 +569,7 @@ public class VdsVisit { throttlePolicy.setMaxPendingCount(((Number)line.getParsedOptionValue("maxpendingsuperbuckets")).intValue()); params.setThrottlePolicy(throttlePolicy); } - if (line.hasOption("tensor-short-form")) { + if (line.hasOption("shorttensors")) { allParams.setTensorShortForm(true); } -- cgit v1.2.3