Add significance rank profile

6 files changed, 79 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/RankProfile.java b/config-model/src/main/java/com/yahoo/schema/RankProfile.java
index 82ed45028b3..cdefbbf8174 100644
--- a/config-model/src/main/java/com/yahoo/schema/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/schema/RankProfile.java
@@ -141,6 +141,8 @@ public class RankProfile implements Cloneable {
 
     private Boolean strict;
 
+    private Boolean useSignificanceModel;
+
     private final ApplicationPackage applicationPackage;
     private final DeployLogger deployLogger;
 
@@ -216,6 +218,15 @@ public class RankProfile implements Cloneable {
         this.strict = strict;
     }
 
+    public void setUseSignificanceModel(Boolean useSignificanceModel) {
+        this.useSignificanceModel = useSignificanceModel;
+    }
+
+    public Boolean useSignificanceModel() {
+        if (useSignificanceModel != null) return useSignificanceModel;
+        return uniquelyInherited(p -> p.useSignificanceModel(), "use-model").orElse(null);
+    }
+
     /**
      * Adds a profile to those inherited by this.
      * The profile must belong to this schema (directly or by inheritance).
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
index b057624f055..42586fa7d75 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
@@ -186,6 +186,7 @@ public class RawRankProfile {
         private RankingExpression globalPhaseRanking;
         private final int globalPhaseRerankCount;
         private final SerializationContext functionSerializationContext;
+        private Boolean useSignificanceModel;
 
         /**
          * Creates a raw rank profile from the given rank profile
@@ -221,6 +222,7 @@ public class RawRankProfile {
             rankScoreDropLimit = compiled.getRankScoreDropLimit();
             ignoreDefaultRankFeatures = compiled.getIgnoreDefaultRankFeatures();
             rankProperties = new ArrayList<>(compiled.getRankProperties());
+            useSignificanceModel = compiled.useSignificanceModel();
 
             Map<String, RankProfile.RankingExpressionFunction> functions = compiled.getFunctions();
             List<ExpressionFunction> functionExpressions = functions.values().stream().map(RankProfile.RankingExpressionFunction::function).toList();
@@ -479,6 +481,9 @@ public class RawRankProfile {
             if (targetHitsMaxAdjustmentFactor.isPresent()) {
                 properties.add(new Pair<>("vespa.matching.nns.target_hits_max_adjustment_factor", String.valueOf(targetHitsMaxAdjustmentFactor.getAsDouble())));
             }
+            if (useSignificanceModel != null) {
+                properties.add(new Pair<>("vespa.significance.use_model", String.valueOf(useSignificanceModel)));
+            }
             if (matchPhaseSettings != null) {
                 properties.add(new Pair<>("vespa.matchphase.degradation.attribute", matchPhaseSettings.getAttribute()));
                 properties.add(new Pair<>("vespa.matchphase.degradation.ascendingorder", matchPhaseSettings.getAscending() + ""));
diff --git a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedRanking.java b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedRanking.java
index 5ccbb7b19a4..77a10862f9c 100644
--- a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedRanking.java
+++ b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedRanking.java
@@ -39,6 +39,7 @@ public class ConvertParsedRanking {
             profile.inherit(name);
 
         parsed.isStrict().ifPresent(value -> profile.setStrict(value));
+        parsed.isUseSignificanceModel().ifPresent(value -> profile.setUseSignificanceModel(value));
 
         for (var constant : parsed.getConstants().values())
             profile.add(constant);
diff --git a/config-model/src/main/java/com/yahoo/schema/parser/ParsedRankProfile.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedRankProfile.java
index fbbb0c7fe83..93319e82076 100644
--- a/config-model/src/main/java/com/yahoo/schema/parser/ParsedRankProfile.java
+++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedRankProfile.java
@@ -44,6 +44,7 @@ class ParsedRankProfile extends ParsedBlock {
     private String inheritedMatchFeatures = null;
     private String secondPhaseExpression = null;
     private Boolean strict = null;
+    private Boolean useSignificanceModel = null;
     private final List<MutateOperation> mutateOperations = new ArrayList<>();
     private final List<String> inherited = new ArrayList<>();
     private final Map<String, Boolean> fieldsRankFilter = new LinkedHashMap<>();
@@ -96,6 +97,8 @@ class ParsedRankProfile extends ParsedBlock {
     Optional<String> getSecondPhaseExpression() { return Optional.ofNullable(this.secondPhaseExpression); }
     Optional<Boolean> isStrict() { return Optional.ofNullable(this.strict); }
 
+    Optional<Boolean> isUseSignificanceModel() { return Optional.ofNullable(this.useSignificanceModel); }
+
     void addSummaryFeatures(FeatureList features) { this.summaryFeatures.add(features); }
     void addMatchFeatures(FeatureList features) { this.matchFeatures.add(features); }
     void addRankFeatures(FeatureList features) { this.rankFeatures.add(features); }
@@ -218,6 +221,10 @@ class ParsedRankProfile extends ParsedBlock {
         this.strict = strict;
     }
 
+    void setUseSignificanceModel(boolean useSignificanceModel) {
+        verifyThat(this.useSignificanceModel == null, "already has use-model");
+        this.useSignificanceModel = useSignificanceModel;
+    }
     void setTermwiseLimit(double limit) {
         verifyThat(termwiseLimit == null, "already has termwise-limit");
         this.termwiseLimit = limit;
diff --git a/config-model/src/main/javacc/SchemaParser.jj b/config-model/src/main/javacc/SchemaParser.jj
index 255cc3cde70..b40f2d0796d 100644
--- a/config-model/src/main/javacc/SchemaParser.jj
+++ b/config-model/src/main/javacc/SchemaParser.jj
@@ -188,6 +188,8 @@ TOKEN :
 | < SUFFIX: "suffix" >
 | < CONSTANT: "constant">
 | < ONNX_MODEL: "onnx-model">
+| < SIGNIFICANCE: "significance">
+| < USE_MODEL: "use-model">
 | < INTRAOP_THREADS: "intraop-threads">
 | < INTEROP_THREADS: "interop-threads">
 | < GPU_DEVICE: "gpu-device">
@@ -1761,7 +1763,8 @@ void rankProfileItem(ParsedSchema schema, ParsedRankProfile profile) : { }
       | matchFeatures(profile)
       | summaryFeatures(profile)
       | onnxModelInProfile(profile)
-      | strict(profile) )
+      | strict(profile)
+      | significance(profile))
 }
 
 /**
@@ -2115,6 +2118,22 @@ void strict(ParsedRankProfile profile) :
     )
 }
 
+void significance(ParsedRankProfile profile) :
+{}
+{
+    <SIGNIFICANCE> lbrace() (significanceItem(profile) (<NL>)*)* <RBRACE>
+    {}
+}
+
+void significanceItem(ParsedRankProfile profile) :
+{}
+{
+    <USE_MODEL> <COLON> (
+        ( <TRUE>  { profile.setUseSignificanceModel(true);  } ) |
+        ( <FALSE> { profile.setUseSignificanceModel(false); } )
+    )
+}
+
 /**
  * Consumes a match-features block of a rank profile.
  *
@@ -2710,6 +2729,7 @@ String identifierWithDash() :
     | <TARGET_HITS_MAX_ADJUSTMENT_FACTOR>
     | <TERMWISE_LIMIT>
     | <UPPER_BOUND>
+    | <USE_MODEL>
     ) { return token.image; }
 }
 
@@ -2812,6 +2832,7 @@ String identifier() : { }
       | <STEMMING>
       | <STRENGTH>
       | <STRICT>
+      | <SIGNIFICANCE>
       | <STRING>
       | <STRUCT>
       | <SUBSTRING>
diff --git a/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java b/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java
index 5a2dc218da7..34ca6c30a61 100644
--- a/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java
@@ -121,6 +121,39 @@ public class SchemaParserTestCase {
     }
 
     @Test
+    void significance_can_be_parsed() throws Exception {
+        String input = """
+            schema foo {
+                rank-profile significance-ranking-0 inherits default {
+                    significance {
+                        use-model: true
+                    }
+                }
+                rank-profile significance-ranking-1 {
+                    significance {
+                        use-model: false
+                    }
+                }
+            }
+            """;
+
+        ParsedSchema schema = parseString(input);
+        assertEquals("foo", schema.name());
+        var rplist = schema.getRankProfiles();
+        assertEquals(2, rplist.size());
+
+        var rp0 = rplist.get(0);
+        assertEquals("significance-ranking-0", rp0.name());
+        assertTrue(rp0.isUseSignificanceModel().isPresent());
+        assertTrue(rp0.isUseSignificanceModel().get());
+
+        var rp1 = rplist.get(1);
+        assertEquals("significance-ranking-1", rp1.name());
+        assertTrue(rp1.isUseSignificanceModel().isPresent());
+        assertFalse(rp1.isUseSignificanceModel().get());
+    }
+
+    @Test
     void maxOccurrencesCanBeParsed() throws Exception {
         String input = joinLines
                 ("schema foo {",