Merge pull request #35803 from vespa-engine/bratseth/totalTargetHits

Bratseth/total target hits

Author: arnej27959

container-search/abi-spec.json

@@ -182,7 +182,7 @@ private void fill(Result result, String summaryClass) {
                 } else {
                     if (result.hits().getErrorHit() == null) {
                         result.hits().addError(ErrorMessage.createTimeout("No time left to get summaries, query timeout was " +
-                                query.getTimeout() + " ms"));
+                                                                          query.getTimeout() + " ms"));
                     }
                 }
             }
@@ -225,9 +225,9 @@ private Result doSearch(Query query) {
     }
 
     private Result perSchemaSearch(String schema, Query query) {
-        Set<String> restrict = query.getModel().getRestrict();
-        if (restrict.size() != 1) {
-            throw new IllegalStateException("perSchemaSearch must always be called with 1 schema, got: " + restrict.size());
+        if (query.getModel().getRestrict().size() != 1) {
+            throw new IllegalStateException("perSchemaSearch must always be called with 1 schema, got: " +
+                                            query.getModel().getRestrict());
         }
         int rerankCount = globalPhaseRanker != null ? globalPhaseRanker.getRerankCount(query, schema) : 0;
         boolean useGlobalPhase = rerankCount > 0;

container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java

@@ -32,7 +32,6 @@
 // catch and unwrap into a results with an error in high level methods.  -Jon
 public class IndexedBackend extends VespaBackend {
 
-    /** Used to dispatch directly to search nodes over RPC, replacing the old fnet communication path */
     private final Dispatcher dispatcher;
 
     /**
@@ -44,14 +43,14 @@ public class IndexedBackend extends VespaBackend {
      *                   backend.
      * @param clusterParams the cluster number, and other cluster backend parameters
      */
-    public IndexedBackend(ClusterParams clusterParams, Dispatcher dispatcher)
-    {
+    public IndexedBackend(ClusterParams clusterParams, Dispatcher dispatcher) {
         super(clusterParams);
         this.dispatcher = dispatcher;
     }
 
     @Override
     protected void transformQuery(Query query) {
+        super.transformQuery(query);
         QueryRewrite.rewriteSddocname(query);
     }
 
@@ -68,7 +67,7 @@ public Result doSearch2(String schema, Query query) {
         if (dispatcher.allGroupsHaveSize1())
             forceSinglePassGrouping(query);
         try (SearchInvoker invoker = getSearchInvoker(query)) {
-            Result result = invoker.search(query);
+            Result result = invoker.search(query, 1.0);
             injectSource(result.hits());
 
             if (query.properties().getBoolean(Ranking.RANKFEATURES, false)) {
@@ -98,7 +97,7 @@ public Result doSearch2(String schema, Query query) {
      *
      * @param result result containing a partition of the unfilled hits
      * @param summaryClass the summary class we want to fill with
-     **/
+     */
     @Override
     protected void doPartialFill(Result result, String summaryClass) {
         if (result.isFilled(summaryClass)) return;

container-search/src/main/java/com/yahoo/prelude/fastsearch/IndexedBackend.java

@@ -85,9 +85,7 @@ protected VespaBackend(ClusterParams clusterParams) {
     protected abstract void doPartialFill(Result result, String summaryClass);
 
     private boolean hasLocation(Item tree) {
-        if (tree instanceof GeoLocationItem) {
-            return true;
-        }
+        if (tree instanceof GeoLocationItem) return true;
         if (tree instanceof CompositeItem composite) {
             for (Item child : composite.items()) {
                 if (hasLocation(child)) return true;
@@ -118,7 +116,6 @@ public boolean summaryNeedsQuery(Query query) {
         if (query.getRanking().getListFeatures()) return true;
 
         // (Don't just add other checks here as there is a return false above)
-
         return false;
     }
 
@@ -128,28 +125,24 @@ public DocumentDatabase getDocumentDatabase(Query query) {
         if (query.getModel().getRestrict().size() == 1) {
             String docTypeName = (String)query.getModel().getRestrict().toArray()[0];
             DocumentDatabase db = documentDbs.get(docTypeName);
-            if (db != null) {
-                return db;
-            }
+            if (db != null) return db;
         }
         return defaultDocumentDb;
     }
 
-    private void resolveDocumentDatabase(Query query) {
-        DocumentDatabase docDb = getDocumentDatabase(query);
-        if (docDb != null) {
-            query.getModel().setDocumentDb(docDb.schema().name());
-        }
+    private DocumentDatabase resolveDocumentDatabase(Query query) {
+        DocumentDatabase documentDb = getDocumentDatabase(query);
+        if (documentDb != null)
+            query.getModel().setDocumentDb(documentDb.schema().name());
+        return documentDb;
     }
 
     protected void transformQuery(Query query) { }
 
     public Result search(String schema, Query query) {
-        // query root should not be null here
         Item root = query.getModel().getQueryTree().getRoot();
-        if (root == null || root instanceof NullItem) {
+        if (root == null || root instanceof NullItem)
             return new Result(query, ErrorMessage.createNullQuery(query.getUri().toString()));
-        }
 
         if ( ! getDocumentDatabase(query).schema().rankProfiles().containsKey(query.getRanking().getProfile()))
             return new Result(query, ErrorMessage.createInvalidQueryParameter(getDocumentDatabase(query).schema() +
@@ -206,7 +199,7 @@ private static List<Result> partitionHits(Result result, String summaryClass) {
         return parts;
     }
 
-    //TODO Add schema here too.
+    // TODO: Add schema here too.
     public void fill(Result result, String summaryClass) {
         if (result.isFilled(summaryClass)) return; // TODO: Checked in the superclass - remove
 

container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackend.java

@@ -21,10 +21,10 @@ public String getName() {
     }
 
     @Override
-    SearchProtocol.QueryTreeItem toProtobuf() {
+    SearchProtocol.QueryTreeItem toProtobuf(SerializationContext context) {
         var builder = SearchProtocol.ItemAnd.newBuilder();
         for (var child : items()) {
-            builder.addChildren(child.toProtobuf());
+            builder.addChildren(child.toProtobuf(context));
         }
         return SearchProtocol.QueryTreeItem.newBuilder()
                 .setItemAnd(builder.build())

container-search/src/main/java/com/yahoo/prelude/query/AndItem.java

@@ -60,11 +60,11 @@ public void setWeight(int w) {
     }
 
     @Override
-    SearchProtocol.QueryTreeItem toProtobuf() {
+    SearchProtocol.QueryTreeItem toProtobuf(SerializationContext context) {
         // AndSegmentItem should be folded/converted before serialization
         var builder = SearchProtocol.ItemAnd.newBuilder();
         for (var child : items()) {
-            builder.addChildren(child.toProtobuf());
+            builder.addChildren(child.toProtobuf(context));
         }
         return SearchProtocol.QueryTreeItem.newBuilder()
                 .setItemAnd(builder.build())

container-search/src/main/java/com/yahoo/prelude/query/AndSegmentItem.java

@@ -34,8 +34,8 @@ public BoolItem(boolean value, String indexName, boolean isFromQuery) {
     public String getName() { return "BOOL"; }
 
     @Override
-    protected void encodeThis(ByteBuffer buffer) {
-        super.encodeThis(buffer); // takes care of index bytes
+    protected void encodeThis(ByteBuffer buffer, SerializationContext context) {
+        super.encodeThis(buffer, context); // takes care of index bytes
         putString(stringValue(), buffer);
     }
 
@@ -105,7 +105,7 @@ public boolean equals(Object object) {
     public boolean isWords() { return false; }
 
     @Override
-    SearchProtocol.QueryTreeItem toProtobuf() {
+    SearchProtocol.QueryTreeItem toProtobuf(SerializationContext context) {
         // BoolItem is serialized as a word term
         var builder = SearchProtocol.ItemWordTerm.newBuilder();
         builder.setProperties(ToProtobuf.buildTermProperties(this, getIndexName()));

container-search/src/main/java/com/yahoo/prelude/query/BoolItem.java

@@ -28,8 +28,8 @@ public String getIndexName() {
     }
 
     // encode index bytes
-    protected void encodeThis(ByteBuffer buffer) {
-        super.encodeThis(buffer);
+    protected void encodeThis(ByteBuffer buffer, SerializationContext context) {
+        super.encodeThis(buffer, context);
         putString(index, buffer);
     }
 

container-search/src/main/java/com/yahoo/prelude/query/CompositeIndexedItem.java

@@ -169,21 +169,21 @@ public ListIterator<Item> getItemIterator() {
     /** Returns a read only list of the immediate children of this */
     public List<Item> items() { return Collections.unmodifiableList(subitems); }
 
-    public int encode(ByteBuffer buffer) {
-        encodeThis(buffer);
+    public int encode(ByteBuffer buffer, SerializationContext context) {
+        encodeThis(buffer, context);
         int itemCount = 1;
 
         for (Iterator<Item> i = getItemIterator(); i.hasNext();) {
             Item subitem = i.next();
 
-            itemCount += subitem.encode(buffer);
+            itemCount += subitem.encode(buffer, context);
         }
         return itemCount;
     }
 
     /** Encodes just this item, not its regular subitems, to the given buffer. */
-    protected void encodeThis(ByteBuffer buffer) {
-        super.encodeThis(buffer);
+    protected void encodeThis(ByteBuffer buffer, SerializationContext context) {
+        super.encodeThis(buffer, context);
         IntegerCompressor.putCompressedPositiveNumber(encodingArity(), buffer);
     }
 

container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java

@@ -21,7 +21,7 @@ public class DotProductItem extends WeightedSetItem {
     public ItemType getItemType() { return ItemType.DOTPRODUCT; }
 
     @Override
-    SearchProtocol.QueryTreeItem toProtobuf() {
+    SearchProtocol.QueryTreeItem toProtobuf(SerializationContext context) {
         if (hasOnlyLongs()) {
             var builder = SearchProtocol.ItemDotProductOfLong.newBuilder();
             builder.setProperties(ToProtobuf.buildTermProperties(this, getIndexName()));