Better top<E>

Author: glorieux-f

common/src/java/com/github/oeuvres/alix/lucene/spans/OffsetsCollector.java

@@ -68,6 +68,14 @@ public final class OffsetsCollector implements SpanCollector {
 
     /** Number of leaves collected in the current span. */
     private int size;
+    
+    /**
+     * Constructs a collector with a default initial capacity of 4 leaf terms.
+     * Suitable for use as a pre-allocated slot in {@link com.github.oeuvres.alix.util.TopSlot}.
+     */
+    public OffsetsCollector() {
+        data = new int[4 * STRIDE];
+    }
 
     /**
      * Constructs a collector with a given initial capacity.
@@ -101,23 +109,32 @@ public void collectLeaf(final PostingsEnum postings, final int position, final T
     }
 
     /**
-     * {@inheritDoc}
+     * Copies all collected leaves from this collector into {@code dest},
+     * replacing any previous content in {@code dest}.
      *
-     * <p>Resets the leaf count to zero. The backing array is retained for reuse.
-     * Must be called by the caller before each {@link Spans#collect} invocation.
+     * <p>Used to populate a pre-allocated slot returned by
+     * {@link com.github.oeuvres.alix.util.TopSlot#insert(double)} without object creation.</p>
+     *
+     * @param dest destination collector; must not be {@code null}
      */
-    @Override
-    public void reset() {
-        size = 0;
+    public void copyTo(final OffsetsCollector dest) {
+        final int needed = size * STRIDE;
+        if (dest.data.length < needed) {
+            dest.data = Arrays.copyOf(data, needed);
+        } else {
+            System.arraycopy(data, 0, dest.data, 0, needed);
+        }
+        dest.size = size;
     }
-
+    
     /**
-     * Returns the number of leaf terms collected for the current span match.
+     * Returns the character end offset of the {@code i}-th collected leaf.
      *
-     * @return leaf count, {@code 0} if {@link #reset()} was called and no collection has occurred
+     * @param i zero-based leaf index; must be in {@code [0, size())}
+     * @return character end offset, or {@code -1} if offsets were not requested
      */
-    public int size() {
-        return size;
+    public int endOffset(final int i) {
+        return data[i * STRIDE + 2];
     }
 
     /**
@@ -131,23 +148,23 @@ public int position(final int i) {
     }
 
     /**
-     * Returns the character start offset of the {@code i}-th collected leaf.
+     * {@inheritDoc}
      *
-     * @param i zero-based leaf index; must be in {@code [0, size())}
-     * @return character start offset, or {@code -1} if offsets were not requested
+     * <p>Resets the leaf count to zero. The backing array is retained for reuse.
+     * Must be called by the caller before each {@link Spans#collect} invocation.
      */
-    public int startOffset(final int i) {
-        return data[i * STRIDE + 1];
+    @Override
+    public void reset() {
+        size = 0;
     }
 
     /**
-     * Returns the character end offset of the {@code i}-th collected leaf.
+     * Returns the number of leaf terms collected for the current span match.
      *
-     * @param i zero-based leaf index; must be in {@code [0, size())}
-     * @return character end offset, or {@code -1} if offsets were not requested
+     * @return leaf count, {@code 0} if {@link #reset()} was called and no collection has occurred
      */
-    public int endOffset(final int i) {
-        return data[i * STRIDE + 2];
+    public int size() {
+        return size;
     }
 
     /**
@@ -199,6 +216,16 @@ public void sort() {
         }
     }
 
+    /**
+     * Returns the character start offset of the {@code i}-th collected leaf.
+     *
+     * @param i zero-based leaf index; must be in {@code [0, size())}
+     * @return character start offset, or {@code -1} if offsets were not requested
+     */
+    public int startOffset(final int i) {
+        return data[i * STRIDE + 1];
+    }
+
     /**
      * Returns a debug string listing all collected leaves.
      *

search/src/java/com/github/oeuvres/alix/lucene/search/Doc.java

@@ -57,7 +57,7 @@
 import static com.github.oeuvres.alix.common.Names.*;
 import com.github.oeuvres.alix.common.TagFilter;
 import com.github.oeuvres.alix.lucene.terms.BytesDic;
-import com.github.oeuvres.alix.util.Top;
+import com.github.oeuvres.alix.util.TopSlot;
 
 /**
  * Tools to display a document
@@ -503,12 +503,12 @@ public String id()
      * @throws IllegalAccessException 
      * @throws InstantiationException 
      */
-    public Top<String> intersect(final String field, final int docId2, final BytesRefHash stopwords) 
+    public TopSlot<String> intersect(final String field, final int docId2, final BytesRefHash stopwords) 
         throws IOException, NoSuchFieldException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException
     {
         // new lucene API, not tested
         Terms vek2 = alix.reader().termVectors().get(docId2, field);
-        Top<String> top = new Top<String>(String.class, 100);
+        TopSlot<String> top = new TopSlot<String>(String.class, 100);
         FieldText ftext = alix.fieldText(field);
         int len1 = ftext.occsByDoc(docId);
         int len2 = ftext.occsByDoc(docId2);