Remove maxFirstPass support on Vespa 8

5 files changed, 2 insertions, 55 deletions

diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json
index e4d64dd05c5..257b5a8d183 100644
--- a/documentapi/abi-spec.json
+++ b/documentapi/abi-spec.json
@@ -895,8 +895,6 @@
       "public void setRoute(java.lang.String)",
       "public void setRoute(com.yahoo.messagebus.routing.Route)",
       "public com.yahoo.messagebus.routing.Route getRoute()",
-      "public void setMaxFirstPassHits(long)",
-      "public long getMaxFirstPassHits()",
       "public void setMaxTotalHits(long)",
       "public long getMaxTotalHits()",
       "public java.util.Set getBucketsToVisit()",
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
index 503def16c21..651269f8db2 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
@@ -38,7 +38,6 @@ public class VisitorParameters extends Parameters {
     private Map<String, byte []> libraryParameters = new TreeMap<>();
     private Route visitRoute = null;
     private final float weight = 1;
-    private long maxFirstPassHits = -1;
     private long maxTotalHits = -1;
     private int maxBucketsPerVisitor = 1;
     private boolean dynamicallyIncreaseMaxBucketsPerVisitor = false;
@@ -88,7 +87,6 @@ public class VisitorParameters extends Parameters {
             setLocalDataHandler(params.getLocalDataHandler());
         }
         setControlHandler(params.getControlHandler());
-        setMaxFirstPassHits(params.getMaxFirstPassHits());
         setMaxTotalHits(params.getMaxTotalHits());
         setMaxBucketsPerVisitor(params.getMaxBucketsPerVisitor());
         setPriority(params.getPriority());
@@ -272,20 +270,6 @@ public class VisitorParameters extends Parameters {
     // TODO: Document: Where is the default - does this ever return null, or does it return "storage" if input is null?
     public Route getRoute() { return visitRoute; }
 
-    /** Set the maximum number of documents to visit (max documents returned by the visitor)
-     *
-     * @deprecated use setMaxTotalHits instead
-     */
-    @Deprecated(since = "7", forRemoval = true) // TODO: Vespa 8: remove
-    public void setMaxFirstPassHits(long max) { maxFirstPassHits = max; }
-
-    /** @return Returns the maximum number of documents to visit (max documents returned by the visitor)
-     *
-     * @deprecated Use getMaxTotalHits() instead
-     */
-    @Deprecated(since = "7", forRemoval = true) // TODO: Vespa 8: remove
-    public long getMaxFirstPassHits() { return maxFirstPassHits; }
-
     /** Set the maximum number of documents to visit (max documents returned by the visitor) */
     public void setMaxTotalHits(long max) { maxTotalHits = max; }
 
@@ -368,7 +352,6 @@ public class VisitorParameters extends Parameters {
         sb.append("  Field set:          ").append(fieldSet).append('\n');
         sb.append("  Route:              ").append(visitRoute).append('\n');
         sb.append("  Weight:             ").append(weight).append('\n');
-        sb.append("  Max firstpass hits: ").append(maxFirstPassHits).append('\n');
         sb.append("  Max total hits:     ").append(maxTotalHits).append('\n');
         sb.append("  Max buckets:        ").append(maxBucketsPerVisitor).append('\n');
         sb.append("  Priority:           ").append(getPriority().toString()).append('\n');
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
index 46a05687701..ccd9c65e77e 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
@@ -1000,11 +1000,6 @@ public class MessageBusVisitorSession implements VisitorSession {
     @SuppressWarnings("removal") // TODO: Vespa 8: remove
     private boolean enoughHitsReceived() {
         // TODO: Vespa 8: remove "Nth pass" concept entirely from API and internals
-        if (params.getMaxFirstPassHits() != -1
-                && statistics.getDocumentsReturned() >= params.getMaxFirstPassHits())
-        {
-            return true;
-        }
         if (params.getMaxTotalHits() != -1
             && (statistics.getDocumentsReturned() >= params.getMaxTotalHits()))
         {
@@ -1105,11 +1100,8 @@ public class MessageBusVisitorSession implements VisitorSession {
             trace.getRoot().addChild(reply.getTrace().getRoot());
         }
 
-        // TODO: Vespa 8 remove this unused functionality
-        if (params.getDynamicallyIncreaseMaxBucketsPerVisitor()
-                && (reply.getVisitorStatistics().getDocumentsReturned()
-                    < params.getMaxFirstPassHits() / 2.0))
-        {
+        // TODO: Vespa 8 remove this unused functionality (?)
+        if (params.getDynamicallyIncreaseMaxBucketsPerVisitor()) {
             // Attempt to increase parallelism to reduce latency of visiting
             // Ensure new count is within [1, 128]
             int newMaxBuckets = Math.max(Math.min((int)(params.getMaxBucketsPerVisitor()
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java
index de6ad1e15a3..6d641eaba08 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java
@@ -32,7 +32,6 @@ public class VisitorParametersTestCase {
         params.setResumeToken(new ProgressToken());
         params.setRemoteDataHandler("mars_rover");
         params.setControlHandler(new VisitorControlHandler());
-        params.setMaxFirstPassHits(555);
         params.setMaxTotalHits(777);
         params.setDynamicallyIncreaseMaxBucketsPerVisitor(true);
         params.setDynamicMaxBucketsIncreaseFactor(2.5f);
@@ -67,7 +66,6 @@ public class VisitorParametersTestCase {
         assertEquals(params.getResumeToken(), copy.getResumeToken()); // instance compare
         assertEquals("mars_rover", copy.getRemoteDataHandler());
         assertEquals(params.getControlHandler(), copy.getControlHandler());
-        assertEquals(555, copy.getMaxFirstPassHits());
         assertEquals(777, copy.getMaxTotalHits());
         assertEquals(true, copy.getDynamicallyIncreaseMaxBucketsPerVisitor());
         assertEquals(2.5f, copy.getDynamicMaxBucketsIncreaseFactor(), 0.0001);
@@ -100,7 +98,6 @@ public class VisitorParametersTestCase {
                 "  Field set:          [all]\n" +
                 "  Route:              extraterrestrial/highway\n" +
                 "  Weight:             1.0\n" +
-                "  Max firstpass hits: 555\n" +
                 "  Max total hits:     777\n" +
                 "  Max buckets:        55\n" +
                 "  Priority:           HIGHEST\n" +
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
index f9b469192fb..d729bb9aa76 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
@@ -1432,28 +1432,6 @@ public class MessageBusVisitorSessionTestCase {
         doTestEarlyCompletion(visitorParameters, replyModifier1, replyModifier2);
     }
 
-    @SuppressWarnings("removal")// TODO: Vespa 8: remove
-    @Test
-    public void testVisitingCompletedFromSufficientFirstPassHits() {
-        VisitorParameters visitorParameters = createVisitorParameters("id.user==1234");
-        visitorParameters.setMaxFirstPassHits(10);
-        ReplyModifier replyModifier1 = (reply) -> {
-            VisitorStatistics stats = new VisitorStatistics();
-            stats.setBucketsVisited(1);
-            stats.setDocumentsReturned(9);
-            reply.setVisitorStatistics(stats);
-            reply.setLastBucket(new BucketId(33, 1234 | (1L << 32)));
-        };
-        ReplyModifier replyModifier2 = (reply) -> {
-            VisitorStatistics stats = new VisitorStatistics();
-            stats.setBucketsVisited(1);
-            stats.setDocumentsReturned(1);
-            reply.setVisitorStatistics(stats);
-            reply.setLastBucket(new BucketId(34, 1234 | (1L << 33)));
-        };
-        doTestEarlyCompletion(visitorParameters, replyModifier1, replyModifier2);
-    }
-
     /**
      * Test that waitUntilDone on the session is forwarded to the control handler.
      */
@@ -2319,7 +2297,6 @@ public class MessageBusVisitorSessionTestCase {
         visitorParameters.setDynamicallyIncreaseMaxBucketsPerVisitor(true);
         visitorParameters.setMaxBucketsPerVisitor(2);
         visitorParameters.setDynamicMaxBucketsIncreaseFactor(10);
-        visitorParameters.setMaxFirstPassHits(10);
         MockComponents mc = createDefaultMock(visitorParameters);
 
         mc.visitorSession.start();