cleanup unused second pass stats

2 files changed, 5 insertions, 9 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;
         }
     }