1 files changed, 44 insertions, 4 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/significance/SignificanceSearcher.java b/container-search/src/main/java/com/yahoo/search/significance/SignificanceSearcher.java
index 0a42bf8a259..e3a559da8f9 100644
--- a/container-search/src/main/java/com/yahoo/search/significance/SignificanceSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/significance/SignificanceSearcher.java
@@ -14,33 +14,72 @@ import com.yahoo.prelude.query.WordItem;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
+import com.yahoo.search.result.ErrorMessage;
+import com.yahoo.search.schema.RankProfile;
+import com.yahoo.search.schema.Schema;
+import com.yahoo.search.schema.SchemaInfo;
 import com.yahoo.search.searchchain.Execution;
 
+import java.util.HashSet;
 import java.util.Optional;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import static com.yahoo.prelude.querytransform.StemmingSearcher.STEMMING;
 
 /**
  * Sets significance values on word items in the query tree.
  *
- * @author MariusArhaug
+ * @author Marius Arhaug
  */
-
 @Provides(SignificanceSearcher.SIGNIFICANCE)
 @Before(STEMMING)
 public class SignificanceSearcher extends Searcher {
 
     public final static String SIGNIFICANCE = "Significance";
-    private final SignificanceModelRegistry significanceModelRegistry;
 
+    private static final Logger log = Logger.getLogger(SignificanceSearcher.class.getName());
+
+    private final SignificanceModelRegistry significanceModelRegistry;
+    private final SchemaInfo schemaInfo;
 
     @Inject
-    public SignificanceSearcher(SignificanceModelRegistry significanceModelRegistry) {
+    public SignificanceSearcher(SignificanceModelRegistry significanceModelRegistry, SchemaInfo schemaInfo) {
         this.significanceModelRegistry = significanceModelRegistry;
+        this.schemaInfo = schemaInfo;
     }
 
     @Override
     public Result search(Query query, Execution execution) {
+        var rankProfileName = query.getRanking().getProfile();
+
+        // Determine significance setup per schema for the given rank profile
+        var perSchemaSetup = schemaInfo.newSession(query).schemas().stream()
+                .collect(Collectors.toMap(Schema::name, schema ->
+                        // Fallback to disabled if the rank profile is not found in the schema
+                        // This will result in a failure later (in a "backend searcher") anyway.
+                        Optional.ofNullable(schema.rankProfiles().get(rankProfileName))
+                                .map(RankProfile::useSignificanceModel).orElse(false)));
+        var uniqueSetups = new HashSet<>(perSchemaSetup.values());
+
+        // Fail if the significance setup for the selected schemas are conflicting
+        if (uniqueSetups.size() > 1) {
+            var result = new Result(query);
+            result.hits().addError(
+                    ErrorMessage.createIllegalQuery(
+                            ("Inconsistent 'significance' configuration for the rank profile '%s' in the schemas %s. " +
+                                    "Use 'restrict' to limit the query to a subset of schemas " +
+                                    "(https://docs.vespa.ai/en/schemas.html#multiple-schemas). " +
+                                    "Specify same 'significance' configuration for all selected schemas " +
+                                    "(https://docs.vespa.ai/en/reference/schema-reference.html#significance).")
+                            .formatted(rankProfileName, perSchemaSetup.keySet())));
+            return result;
+        }
+
+        if (perSchemaSetup.isEmpty()) return execution.search(query);
+        var useSignificanceModel = uniqueSetups.iterator().next();
+        if (!useSignificanceModel) return execution.search(query);
+
         Language language = query.getModel().getParsingLanguage();
         Optional<SignificanceModel> model = significanceModelRegistry.getModel(language);
 
@@ -72,6 +111,7 @@ public class SignificanceSearcher extends Searcher {
     public static double calculateIDF(long N, long nq_i) {
         return Math.log(1 + (N - nq_i + 0.5) / (nq_i + 0.5));
     }
+
 }