cleanup unused second pass stats

2 files changed, 1 insertions, 29 deletions

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());
             }
         }
     }