remove non-working (?) options

2 files changed, 0 insertions, 40 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 66cfa09d3da..7b938e8ec3f 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
@@ -292,14 +292,6 @@ public class VdsVisit {
                 .build());
 
         options.addOption(Option.builder()
-                .longOpt("maxhits")
-                .hasArg(true)
-                .argName("num")
-                .desc("Abort visiting when we have received this many \"first pass\" documents. Only appropriate for visiting involving id.order. This is only an approximate number, all pending work will be completed and those documents will also be returned.")
-                .type(Number.class)
-                .build());
-
-        options.addOption(Option.builder()
                 .longOpt("maxtotalhits")
                 .hasArg(true)
                 .argName("num")
@@ -323,13 +315,6 @@ public class VdsVisit {
                 .build());
 
         options.addOption(Option.builder()
-                .longOpt("ordering")
-                .hasArg(true)
-                .argName("order")
-                .desc("Order to visit documents in. Only makes sense in conjunction with a document selection involving id.order. Legal values are \"ascending\" and \"descending\"")
-                .build());
-
-        options.addOption(Option.builder()
                 .longOpt("tracelevel")
                 .hasArg(true)
                 .argName("level")
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 570f38045e6..04db1be36e6 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
@@ -123,11 +123,9 @@ public class VdsVisitTestCase {
                 "--libraryparam", "asdf", "rargh",
                 "--libraryparam", "pinkie", "pie",
                 "--processtime", "555",
-                "--maxhits", "1001",
                 "--maxtotalhits", "2002",
                 "--tracelevel", "8",
                 "--priority", "NORMAL_1",
-                "--ordering", "ascending",
                 "--skipbucketsonfatalerrors",
                 "--abortonclusterdown",
                 "--visitremoves",
@@ -161,11 +159,9 @@ public class VdsVisitTestCase {
         assertTrue(Arrays.equals("rargh".getBytes(), params.getLibraryParameters().get("asdf")));
         //assertTrue(Arrays.equals("pie".getBytes(), params.getLibraryParameters().get("pinkie")));
         assertEquals(555, allParams.getProcessTime());
-        assertEquals(1001, params.getMaxFirstPassHits());
         assertEquals(2002, params.getMaxTotalHits());
         assertEquals(8, params.getTraceLevel());
         assertEquals(DocumentProtocol.Priority.NORMAL_1, params.getPriority());
-        assertEquals(OrderingSpecification.ASCENDING, params.getVisitorOrdering());
         assertTrue(allParams.getAbortOnClusterDown());
         assertTrue(params.visitRemoves());
 
@@ -192,13 +188,6 @@ public class VdsVisitTestCase {
                         "Visitor priority NORMAL_1" + nl +
                         "Skip visiting super buckets with fatal errors." + nl,
                 outputStream.toString("utf-8"));
-
-        args = new String[] {
-                "--ordering", "descending"
-        };
-        allParams = parser.parse(args);
-        params = allParams.getVisitorParameters();
-        assertEquals(OrderingSpecification.DESCENDING, params.getVisitorOrdering());
     }
 
     private static String[] emptyArgList() { return new String[]{}; }
@@ -226,20 +215,6 @@ public class VdsVisitTestCase {
     }
 
     @Test
-    public void testBadOrderingValue() throws Exception {
-        String[] args = new String[] {
-                "--ordering", "yonder"
-        };
-        VdsVisit.ArgumentParser parser = createMockArgumentParser();
-        try {
-            parser.parse(args);
-            fail("no exception thrown");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().contains("Unknown ordering"));
-        }
-    }
-
-    @Test
     public void testCommandLineShortOptionsInvokeHelp() throws Exception {
         // Short options testing (for options that do not collide with each other)
         String[] args = new String[] {