From 8822bf13ddb2ad2c226a8d812efbe08c54d092a2 Mon Sep 17 00:00:00 2001
From: Arne H Juul <arnej@yahooinc.com>
Date: Tue, 7 Jun 2022 12:39:52 +0000
Subject: cleanup unused second pass stats

---
 .../java/com/yahoo/vdslib/VisitorStatistics.java   | 30 +---------------------
 .../vespa/vdslib/container/visitorstatistics.cpp   |  8 +-----
 .../src/vespa/vdslib/container/visitorstatistics.h |  8 ------
 3 files changed, 2 insertions(+), 44 deletions(-)

(limited to 'vdslib/src')

diff --git a/vdslib/src/main/java/com/yahoo/vdslib/VisitorStatistics.java b/vdslib/src/main/java/com/yahoo/vdslib/VisitorStatistics.java
index a79f3d5fb6d..fda456ace05 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/VisitorStatistics.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/VisitorStatistics.java
@@ -7,8 +7,6 @@ public class VisitorStatistics {
     long bytesVisited = 0;
     long documentsReturned = 0;
     long bytesReturned = 0;
-    long secondPassDocumentsReturned = 0;
-    long secondPassBytesReturned = 0;
 
     public void add(VisitorStatistics other) {
         bucketsVisited += other.bucketsVisited;
@@ -16,8 +14,6 @@ public class VisitorStatistics {
         bytesVisited += other.bytesVisited;
         documentsReturned += other.documentsReturned;
         bytesReturned += other.bytesReturned;
-        secondPassDocumentsReturned += other.secondPassDocumentsReturned;
-        secondPassBytesReturned += other.secondPassBytesReturned;
     }
 
     public int getBucketsVisited() { return bucketsVisited; }
@@ -44,37 +40,13 @@ public class VisitorStatistics {
     public long getBytesReturned() { return bytesReturned; }
     public void setBytesReturned(long bytesReturned) { this.bytesReturned = bytesReturned; }
 
-    /**
-     * @deprecated Use getDocumentsReturned() instead
-     */
-    @Deprecated(since = "7", forRemoval = true) // TODO: Vespa 8: remove
-    public long getSecondPassDocumentsReturned() { return secondPassDocumentsReturned; }
-    /**
-     * @deprecated only applies for deprecated "orderdoc" ID scheme
-     */
-    @Deprecated(since = "7", forRemoval = true)// TODO: Vespa 8: remove
-    public void setSecondPassDocumentsReturned(long secondPassDocumentsReturned) { this.secondPassDocumentsReturned = secondPassDocumentsReturned; }
-
-    /**
-     * @deprecated Use getBytesReturned() instead
-     */
-    @Deprecated(since = "7", forRemoval = true) // TODO: Vespa 8: remove
-    public long getSecondPassBytesReturned() { return secondPassBytesReturned; }
-    /**
-     * @deprecated only applies for deprecated "orderdoc" ID scheme
-     */
-    @Deprecated(since = "7", forRemoval = true) // TODO: Vespa 8: remove
-    public void setSecondPassBytesReturned(long secondPassBytesReturned) { this.secondPassBytesReturned = secondPassBytesReturned; }
-
     public String toString() {
         String out =
             "Buckets visited: " + bucketsVisited + "\n" +
             "Documents visited: " + documentsVisited + "\n" +
             "Bytes visited: " + bytesVisited + "\n" +
             "Documents returned: " + documentsReturned + "\n" +
-            "Bytes returned: " + bytesReturned + "\n" +
-            "Documents returned (2nd pass): " + secondPassDocumentsReturned + "\n" +
-            "Bytes returned (2nd pass): " + secondPassBytesReturned + "\n";
+            "Bytes returned: " + bytesReturned + "\n";
 
         return out;
     }
diff --git a/vdslib/src/vespa/vdslib/container/visitorstatistics.cpp b/vdslib/src/vespa/vdslib/container/visitorstatistics.cpp
index 4dc043c4654..2507b2cfaaa 100644
--- a/vdslib/src/vespa/vdslib/container/visitorstatistics.cpp
+++ b/vdslib/src/vespa/vdslib/container/visitorstatistics.cpp
@@ -10,9 +10,7 @@ VisitorStatistics::VisitorStatistics()
       _documentsVisited(0),
       _bytesVisited(0),
       _documentsReturned(0),
-      _bytesReturned(0),
-      _secondPassDocumentsReturned(0),
-      _secondPassBytesReturned(0)
+      _bytesReturned(0)
 {
 }
 
@@ -24,8 +22,6 @@ VisitorStatistics::operator+(const VisitorStatistics& other) {
     vs.setBytesVisited(_bytesVisited + other._bytesVisited);
     vs.setDocumentsReturned(_documentsReturned + other._documentsReturned);
     vs.setBytesReturned(_bytesReturned + other._bytesReturned);
-    vs.setSecondPassDocumentsReturned(_secondPassDocumentsReturned + other._secondPassDocumentsReturned);
-    vs.setSecondPassBytesReturned(_secondPassBytesReturned + other._secondPassBytesReturned);
     return vs;
 }
 
@@ -37,8 +33,6 @@ VisitorStatistics::print(std::ostream& out, bool, const std::string& indent) con
     out << indent << "Bytes visited: " << _bytesVisited << "\n";
     out << indent << "Documents returned: " << _documentsReturned << "\n";
     out << indent << "Bytes returned: " << _bytesReturned << "\n";
-    out << indent << "Documents returned (2nd pass): " << _secondPassDocumentsReturned << "\n";
-    out << indent << "Bytes returned (2nd pass): " << _secondPassBytesReturned << "\n";
 }
 
 }
diff --git a/vdslib/src/vespa/vdslib/container/visitorstatistics.h b/vdslib/src/vespa/vdslib/container/visitorstatistics.h
index d4912bbf1ba..3f62d7e602b 100644
--- a/vdslib/src/vespa/vdslib/container/visitorstatistics.h
+++ b/vdslib/src/vespa/vdslib/container/visitorstatistics.h
@@ -27,12 +27,6 @@ public:
     uint64_t getBytesReturned() const { return _bytesReturned; }
     void setBytesReturned(uint32_t bytesReturned) { _bytesReturned = bytesReturned; }
 
-    uint64_t getSecondPassDocumentsReturned() const { return _secondPassDocumentsReturned; }
-    void setSecondPassDocumentsReturned(uint32_t documentsReturned) { _secondPassDocumentsReturned = documentsReturned; }
-
-    uint64_t getSecondPassBytesReturned() const { return _secondPassBytesReturned; }
-    void setSecondPassBytesReturned(uint32_t bytesReturned) { _secondPassBytesReturned = bytesReturned; }
-
     void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 private:
     uint32_t _bucketsVisited;
@@ -40,8 +34,6 @@ private:
     uint64_t _bytesVisited;
     uint64_t _documentsReturned;
     uint64_t _bytesReturned;
-    uint64_t _secondPassDocumentsReturned; // TODO remove on Vespa 8
-    uint64_t _secondPassBytesReturned; // TODO remove on Vespa 8
 };
 
 }
-- 
cgit v1.2.3