cleanup unused second pass stats

7 files changed, 10 insertions, 49 deletions

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 6aa0a6b9e57..46a05687701 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
@@ -1006,9 +1006,7 @@ public class MessageBusVisitorSession implements VisitorSession {
             return true;
         }
         if (params.getMaxTotalHits() != -1
-                && ((statistics.getDocumentsReturned()
-                     + statistics.getSecondPassDocumentsReturned()) // TODO: Vespa 8: remove
-                    >= params.getMaxTotalHits()))
+            && (statistics.getDocumentsReturned() >= params.getMaxTotalHits()))
         {
             return true;
         }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java
index 05c686694b4..c4d4fb216be 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java
@@ -232,7 +232,6 @@ public abstract class RoutableFactories60 {
     public static class CreateVisitorReplyFactory extends DocumentReplyFactory {
 
         @Override
-        @SuppressWarnings("removal")// TODO: Vespa 8: remove
         protected DocumentReply doDecode(DocumentDeserializer buf) {
             CreateVisitorReply reply = new CreateVisitorReply(DocumentProtocol.REPLY_CREATEVISITOR);
             reply.setLastBucket(new BucketId(buf.getLong(null)));
@@ -243,14 +242,13 @@ public abstract class RoutableFactories60 {
             vs.setBytesVisited(buf.getLong(null));
             vs.setDocumentsReturned(buf.getLong(null));
             vs.setBytesReturned(buf.getLong(null));
-            vs.setSecondPassDocumentsReturned(buf.getLong(null)); // TODO: on Vespa 8 remove setter (_not_ getLong())
-            vs.setSecondPassBytesReturned(buf.getLong(null)); // TODO: on Vespa 8 remove setter (_not_ getLong())
+            buf.getLong(null); // unused
+            buf.getLong(null); // unused
             reply.setVisitorStatistics(vs);
             return reply;
         }
 
         @Override
-        @SuppressWarnings("removal")// TODO: Vespa 8: remove
         protected boolean doEncode(DocumentReply obj, DocumentSerializer buf) {
             CreateVisitorReply reply = (CreateVisitorReply)obj;
             buf.putLong(null, reply.getLastBucket().getRawId());
@@ -259,8 +257,8 @@ public abstract class RoutableFactories60 {
             buf.putLong(null, reply.getVisitorStatistics().getBytesVisited());
             buf.putLong(null, reply.getVisitorStatistics().getDocumentsReturned());
             buf.putLong(null, reply.getVisitorStatistics().getBytesReturned());
-            buf.putLong(null, reply.getVisitorStatistics().getSecondPassDocumentsReturned()); // TODO: on Vespa 8 remove getter (_not_ putLong())
-            buf.putLong(null, reply.getVisitorStatistics().getSecondPassBytesReturned()); // TODO: on Vespa 8 remove getter (_not_ putLong())
+            buf.putLong(null, 0); // was SecondPassDocumentsReturned
+            buf.putLong(null, 0); // was SecondPassBytesReturned
             return true;
         }
     }
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 874bad6034a..f9b469192fb 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
@@ -968,7 +968,7 @@ public class MessageBusVisitorSessionTestCase {
             builder.append("onVisitorStatistics : ");
             // Only bother with a couple of fields.
             builder.append(vs.getBucketsVisited()).append(" buckets visited, ");
-            builder.append(vs.getDocumentsReturned() + vs.getSecondPassDocumentsReturned()).append(" docs returned\n");
+            builder.append(vs.getDocumentsReturned()).append(" docs returned\n");
         }
 
         @Override
@@ -1454,29 +1454,6 @@ public class MessageBusVisitorSessionTestCase {
         doTestEarlyCompletion(visitorParameters, replyModifier1, replyModifier2);
     }
 
-    @SuppressWarnings("removal")// TODO: Vespa 8: remove test
-    @Test
-    public void testVisitingCompletedFromSecondPassHits() {
-        VisitorParameters visitorParameters = createVisitorParameters("id.user==1234");
-        visitorParameters.setMaxTotalHits(10);
-        ReplyModifier replyModifier1 = (reply) -> {
-            VisitorStatistics stats = new VisitorStatistics();
-            stats.setBucketsVisited(1);
-            stats.setDocumentsReturned(5);
-            stats.setSecondPassDocumentsReturned(4);
-            reply.setVisitorStatistics(stats);
-            reply.setLastBucket(new BucketId(33, 1234 | (1L << 32)));
-        };
-        ReplyModifier replyModifier2 = (reply) -> {
-            VisitorStatistics stats = new VisitorStatistics();
-            stats.setBucketsVisited(1);
-            stats.setSecondPassDocumentsReturned(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.
      */
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
index 5e8439c9536..35f8e7cf0c8 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
@@ -271,7 +271,6 @@ public class Messages60TestCase extends MessagesTestBase {
     public class testCreateVisitorReply implements RunnableTest {
 
         @Override
-        @SuppressWarnings("removal")
         public void run() {
             CreateVisitorReply reply = new CreateVisitorReply(DocumentProtocol.REPLY_CREATEVISITOR);
             reply.setLastBucket(new BucketId(16, 123));
@@ -280,8 +279,6 @@ public class Messages60TestCase extends MessagesTestBase {
             reply.getVisitorStatistics().setBytesVisited(1024000);
             reply.getVisitorStatistics().setDocumentsReturned(123);
             reply.getVisitorStatistics().setBytesReturned(512000);
-            reply.getVisitorStatistics().setSecondPassDocumentsReturned(456);
-            reply.getVisitorStatistics().setSecondPassBytesReturned(789100);
 
             assertEquals(65, serialize("CreateVisitorReply", reply));
 
@@ -294,8 +291,6 @@ public class Messages60TestCase extends MessagesTestBase {
                 assertEquals(1024000, reply.getVisitorStatistics().getBytesVisited());
                 assertEquals(123, reply.getVisitorStatistics().getDocumentsReturned());
                 assertEquals(512000, reply.getVisitorStatistics().getBytesReturned());
-                assertEquals(456, reply.getVisitorStatistics().getSecondPassDocumentsReturned()); // TODO remove on Vespa 8
-                assertEquals(789100, reply.getVisitorStatistics().getSecondPassBytesReturned());
             }
         }
     }
diff --git a/documentapi/src/tests/messages/messages60test.cpp b/documentapi/src/tests/messages/messages60test.cpp
index f51b071fc70..ab300794307 100644
--- a/documentapi/src/tests/messages/messages60test.cpp
+++ b/documentapi/src/tests/messages/messages60test.cpp
@@ -366,8 +366,6 @@ Messages60Test::testCreateVisitorReply()
     vs.setBytesVisited(1024000);
     vs.setDocumentsReturned(123);
     vs.setBytesReturned(512000);
-    vs.setSecondPassDocumentsReturned(456);
-    vs.setSecondPassBytesReturned(789100);
     reply.setVisitorStatistics(vs);
 
     EXPECT_EQUAL(65u, serialize("CreateVisitorReply", reply));
@@ -383,8 +381,6 @@ Messages60Test::testCreateVisitorReply()
             EXPECT_EQUAL(ref.getVisitorStatistics().getBytesVisited(), (uint64_t)1024000);
             EXPECT_EQUAL(ref.getVisitorStatistics().getDocumentsReturned(), (uint64_t)123);
             EXPECT_EQUAL(ref.getVisitorStatistics().getBytesReturned(), (uint64_t)512000);
-            EXPECT_EQUAL(ref.getVisitorStatistics().getSecondPassDocumentsReturned(), (uint64_t)456); // TODO remove on Vespa 8
-            EXPECT_EQUAL(ref.getVisitorStatistics().getSecondPassBytesReturned(), (uint64_t)789100); // TODO remove on Vespa 8
         }
     }
     return true;
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
index ad32a5b4fa7..0757db9f5fc 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
@@ -171,11 +171,9 @@ RoutableFactories60::CreateVisitorReplyFactory::doDecode(document::ByteBuffer &b
     vs.setBytesVisited(decodeLong(buf));
     vs.setDocumentsReturned(decodeLong(buf));
     vs.setBytesReturned(decodeLong(buf));
-    // TODO remove second pass concept on Vespa 8
-    vs.setSecondPassDocumentsReturned(decodeLong(buf));
-    vs.setSecondPassBytesReturned(decodeLong(buf));
+    decodeLong(buf); // was SecondPassDocumentsReturned
+    decodeLong(buf); // was SecondPassBytesReturned
     reply->setVisitorStatistics(vs);
-
     return reply;
 }
 
@@ -189,9 +187,8 @@ RoutableFactories60::CreateVisitorReplyFactory::doEncode(const DocumentReply &ob
     buf.putLong(reply.getVisitorStatistics().getBytesVisited());
     buf.putLong(reply.getVisitorStatistics().getDocumentsReturned());
     buf.putLong(reply.getVisitorStatistics().getBytesReturned());
-    // TODO remove second pass concept on Vespa 8
-    buf.putLong(reply.getVisitorStatistics().getSecondPassDocumentsReturned());
-    buf.putLong(reply.getVisitorStatistics().getSecondPassBytesReturned());
+    buf.putLong(0); // was SecondPassDocumentsReturned
+    buf.putLong(0); // was SecondPassBytesReturned
     return true;
 }
 
diff --git a/documentapi/test/crosslanguagefiles/6.221-java-CreateVisitorReply.dat b/documentapi/test/crosslanguagefiles/6.221-java-CreateVisitorReply.dat
index e13917227d1..493fa3291c5 100644
--- a/documentapi/test/crosslanguagefiles/6.221-java-CreateVisitorReply.dat
+++ b/documentapi/test/crosslanguagefiles/6.221-java-CreateVisitorReply.dat