make hnsw collector a decorator

Author: tteofili

lucene/core/src/java/org/apache/lucene/search/HnswKnnCollector.java

@@ -17,8 +17,12 @@
 package org.apache.lucene.search;
 
 /** {@link KnnCollector} that exposes methods to hook into specific parts of the HNSW algorithm. */
-public interface HnswKnnCollector extends KnnCollector {
+public abstract class HnswKnnCollector extends KnnCollector.Decorator {
+
+  public HnswKnnCollector(KnnCollector collector) {
+    super(collector);
+  }
 
   /** Indicates exploration of the next HNSW candidate graph node. */
-  void nextCandidate();
+  public abstract void nextCandidate();
 }

lucene/core/src/java/org/apache/lucene/search/HnswQueueSaturationCollector.java

@@ -23,9 +23,9 @@
  * delegate} KnnCollector queue, at each HNSW node candidate visit. Once it saturates for a number
  * of consecutive node visits (e.g., the patience parameter), this early terminates.
  */
-public class HnswQueueSaturationCollector implements HnswKnnCollector {
+public class HnswQueueSaturationCollector extends HnswKnnCollector {
 
-  private static final double DEFAULT_SATURATION_THRESHOLD = 0.995d;
+  private static final double DEFAULT_SATURATION_THRESHOLD = 0.95d;
 
   private final KnnCollector delegate;
   private final double saturationThreshold;
@@ -36,6 +36,7 @@ public class HnswQueueSaturationCollector implements HnswKnnCollector {
   private int currentQueueSize;
 
   HnswQueueSaturationCollector(KnnCollector delegate, double saturationThreshold, int patience) {
+    super(delegate);
     this.delegate = delegate;
     this.previousQueueSize = 0;
     this.currentQueueSize = 0;
@@ -46,6 +47,7 @@ public class HnswQueueSaturationCollector implements HnswKnnCollector {
   }
 
   public HnswQueueSaturationCollector(KnnCollector delegate) {
+    super(delegate);
     this.delegate = delegate;
     this.previousQueueSize = 0;
     this.currentQueueSize = 0;
@@ -64,26 +66,6 @@ public boolean earlyTerminated() {
     return delegate.earlyTerminated() || patienceFinished;
   }
 
-  @Override
-  public void incVisitedCount(int count) {
-    delegate.incVisitedCount(count);
-  }
-
-  @Override
-  public long visitedCount() {
-    return delegate.visitedCount();
-  }
-
-  @Override
-  public long visitLimit() {
-    return delegate.visitLimit();
-  }
-
-  @Override
-  public int k() {
-    return delegate.k();
-  }
-
   @Override
   public boolean collect(int docId, float similarity) {
     boolean collect = delegate.collect(docId, similarity);