Support Diversity at rank-profile level.

6 files changed, 63 insertions, 72 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 5cfb99cc76a..0619fce5865 100644
--- a/config-model/src/main/java/com/yahoo/schema/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/schema/RankProfile.java
@@ -73,7 +73,8 @@ public class RankProfile implements Cloneable {
     /** The resolved inherited profiles, or null when not resolved. */
     private List<RankProfile> inherited;
 
-    private MatchPhaseSettings matchPhaseSettings = null;
+    private MatchPhaseSettings matchPhase = null;
+    private DiversitySettings diversity = null;
 
     protected Set<RankSetting> rankSettings = new java.util.LinkedHashSet<>();
 
@@ -225,7 +226,7 @@ public class RankProfile implements Cloneable {
 
     public boolean useSignificanceModel() {
         if (useSignificanceModel != null) return useSignificanceModel;
-        return uniquelyInherited(p -> p.useSignificanceModel(), "use-model")
+        return uniquelyInherited(RankProfile::useSignificanceModel, "use-model")
                 .orElse(false); // Disabled by default
     }
 
@@ -307,15 +308,20 @@ public class RankProfile implements Cloneable {
         return false;
     }
 
-    public void setMatchPhaseSettings(MatchPhaseSettings settings) {
+    public void setMatchPhase(MatchPhaseSettings settings) {
         settings.checkValid();
-        this.matchPhaseSettings = settings;
+        this.matchPhase = settings;
     }
 
-    public MatchPhaseSettings getMatchPhaseSettings() {
-        if (matchPhaseSettings != null) return matchPhaseSettings;
-        return uniquelyInherited(p -> p.getMatchPhaseSettings(), "match phase settings").orElse(null);
+    public MatchPhaseSettings getMatchPhase() {
+        if (matchPhase != null) return matchPhase;
+        return uniquelyInherited(p -> p.getMatchPhase(), "match phase settings").orElse(null);
     }
+    public void setDiversity(DiversitySettings value) {
+        value.checkValid();
+        diversity = value;
+    }
+    public DiversitySettings      getDiversity() { return diversity; }
 
     /** Returns the uniquely determined property, where non-empty is defined as non-null */
     private <T> Optional<T> uniquelyInherited(Function<RankProfile, T> propertyRetriever,
@@ -1019,7 +1025,8 @@ public class RankProfile implements Cloneable {
         try {
             RankProfile clone = (RankProfile)super.clone();
             clone.rankSettings = new LinkedHashSet<>(this.rankSettings);
-            clone.matchPhaseSettings = this.matchPhaseSettings; // hmm?
+            clone.matchPhase = this.matchPhase; // hmm?
+            clone.diversity = this.diversity;
             clone.summaryFeatures = summaryFeatures != null ? new LinkedHashSet<>(this.summaryFeatures) : null;
             clone.matchFeatures = matchFeatures != null ? new LinkedHashSet<>(this.matchFeatures) : null;
             clone.rankFeatures = rankFeatures != null ? new LinkedHashSet<>(this.rankFeatures) : null;
@@ -1517,15 +1524,9 @@ public class RankProfile implements Cloneable {
         private boolean ascending = false;
         private int maxHits = 0; // try to get this many hits before degrading the match phase
         private double maxFilterCoverage = 0.2; // Max coverage of original corpus that will trigger the filter.
-        private DiversitySettings diversity = null;
         private double evaluationPoint = 0.20;
         private double prePostFilterTippingPoint = 1.0;
 
-        public void setDiversity(DiversitySettings value) {
-            value.checkValid();
-            diversity = value;
-        }
-
         public void setAscending(boolean value) { ascending = value; }
         public void setAttribute(String value) { attribute = value; }
         public void setMaxHits(int value) { maxHits = value; }
@@ -1537,7 +1538,6 @@ public class RankProfile implements Cloneable {
         public String                 getAttribute() { return attribute; }
         public int                      getMaxHits() { return maxHits; }
         public double         getMaxFilterCoverage() { return maxFilterCoverage; }
-        public DiversitySettings      getDiversity() { return diversity; }
         public double           getEvaluationPoint() { return evaluationPoint; }
         public double getPrePostFilterTippingPoint() { return prePostFilterTippingPoint; }
 
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 e05225226b6..b540add4be2 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
@@ -159,6 +159,7 @@ public class RawRankProfile {
 
         private final boolean ignoreDefaultRankFeatures;
         private final RankProfile.MatchPhaseSettings matchPhaseSettings;
+        private final RankProfile.DiversitySettings diversitySettings;
         private final int rerankCount;
         private final int keepRankCount;
         private final int numThreadsPerSearch;
@@ -208,7 +209,8 @@ public class RawRankProfile {
             rankFeatures = compiled.getRankFeatures();
             rerankCount = compiled.getRerankCount();
             globalPhaseRerankCount = compiled.getGlobalPhaseRerankCount();
-            matchPhaseSettings = compiled.getMatchPhaseSettings();
+            matchPhaseSettings = compiled.getMatchPhase();
+            diversitySettings = compiled.getDiversity();
             numThreadsPerSearch = compiled.getNumThreadsPerSearch();
             minHitsPerThread = compiled.getMinHitsPerThread();
             numSearchPartitions = compiled.getNumSearchPartitions();
@@ -488,13 +490,12 @@ public class RawRankProfile {
                 properties.add(new Pair<>("vespa.matchphase.degradation.maxfiltercoverage", matchPhaseSettings.getMaxFilterCoverage() + ""));
                 properties.add(new Pair<>("vespa.matchphase.degradation.samplepercentage", matchPhaseSettings.getEvaluationPoint() + ""));
                 properties.add(new Pair<>("vespa.matchphase.degradation.postfiltermultiplier", matchPhaseSettings.getPrePostFilterTippingPoint() + ""));
-                RankProfile.DiversitySettings diversitySettings = matchPhaseSettings.getDiversity();
-                if (diversitySettings != null) {
-                    properties.add(new Pair<>("vespa.matchphase.diversity.attribute", diversitySettings.getAttribute()));
-                    properties.add(new Pair<>("vespa.matchphase.diversity.mingroups", String.valueOf(diversitySettings.getMinGroups())));
-                    properties.add(new Pair<>("vespa.matchphase.diversity.cutoff.factor", String.valueOf(diversitySettings.getCutoffFactor())));
-                    properties.add(new Pair<>("vespa.matchphase.diversity.cutoff.strategy", String.valueOf(diversitySettings.getCutoffStrategy())));
-                }
+            }
+            if (diversitySettings != null) {
+                properties.add(new Pair<>("vespa.matchphase.diversity.attribute", diversitySettings.getAttribute()));
+                properties.add(new Pair<>("vespa.matchphase.diversity.mingroups", String.valueOf(diversitySettings.getMinGroups())));
+                properties.add(new Pair<>("vespa.matchphase.diversity.cutoff.factor", String.valueOf(diversitySettings.getCutoffFactor())));
+                properties.add(new Pair<>("vespa.matchphase.diversity.cutoff.strategy", String.valueOf(diversitySettings.getCutoffStrategy())));
             }
             if (rerankCount > -1) {
                 properties.add(new Pair<>("vespa.hitcollector.heapsize", rerankCount + ""));
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 78f2c8a85ef..ff78a4a3b60 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
@@ -38,8 +38,8 @@ public class ConvertParsedRanking {
         for (String name : parsed.getInherited())
             profile.inherit(name);
 
-        parsed.isStrict().ifPresent(value -> profile.setStrict(value));
-        parsed.isUseSignificanceModel().ifPresent(value -> profile.setUseSignificanceModel(value));
+        parsed.isStrict().ifPresent(profile::setStrict);
+        parsed.isUseSignificanceModel().ifPresent(profile::setUseSignificanceModel);
 
         for (var constant : parsed.getConstants().values())
             profile.add(constant);
@@ -58,41 +58,26 @@ public class ConvertParsedRanking {
             profile.addFunction(name, parameters, expression, inline);
         }
 
-        parsed.getRankScoreDropLimit().ifPresent
-            (value -> profile.setRankScoreDropLimit(value));
-        parsed.getSecondPhaseRankScoreDropLimit().ifPresent
-                (value -> profile.setSecondPhaseRankScoreDropLimit(value));
-        parsed.getTermwiseLimit().ifPresent
-            (value -> profile.setTermwiseLimit(value));
-        parsed.getPostFilterThreshold().ifPresent
-                (value -> profile.setPostFilterThreshold(value));
-        parsed.getApproximateThreshold().ifPresent
-                (value -> profile.setApproximateThreshold(value));
-        parsed.getTargetHitsMaxAdjustmentFactor().ifPresent
-                (value -> profile.setTargetHitsMaxAdjustmentFactor(value));
-        parsed.getKeepRankCount().ifPresent
-            (value -> profile.setKeepRankCount(value));
-        parsed.getMinHitsPerThread().ifPresent
-            (value -> profile.setMinHitsPerThread(value));
-        parsed.getNumSearchPartitions().ifPresent
-            (value -> profile.setNumSearchPartitions(value));
-        parsed.getNumThreadsPerSearch().ifPresent
-            (value -> profile.setNumThreadsPerSearch(value));
-        parsed.getReRankCount().ifPresent
-            (value -> profile.setRerankCount(value));
-
-        parsed.getMatchPhaseSettings().ifPresent
-            (value -> profile.setMatchPhaseSettings(value));
-
-        parsed.getFirstPhaseExpression().ifPresent
-            (value -> profile.setFirstPhaseRanking(value));
-        parsed.getSecondPhaseExpression().ifPresent
-            (value -> profile.setSecondPhaseRanking(value));
-
-        parsed.getGlobalPhaseExpression().ifPresent
-            (value -> profile.setGlobalPhaseRanking(value));
-        parsed.getGlobalPhaseRerankCount().ifPresent
-            (value -> profile.setGlobalPhaseRerankCount(value));
+        parsed.getRankScoreDropLimit().ifPresent(profile::setRankScoreDropLimit);
+        parsed.getSecondPhaseRankScoreDropLimit().ifPresent(profile::setSecondPhaseRankScoreDropLimit);
+        parsed.getTermwiseLimit().ifPresent(profile::setTermwiseLimit);
+        parsed.getPostFilterThreshold().ifPresent(profile::setPostFilterThreshold);
+        parsed.getApproximateThreshold().ifPresent(profile::setApproximateThreshold);
+        parsed.getTargetHitsMaxAdjustmentFactor().ifPresent(profile::setTargetHitsMaxAdjustmentFactor);
+        parsed.getKeepRankCount().ifPresent(profile::setKeepRankCount);
+        parsed.getMinHitsPerThread().ifPresent(profile::setMinHitsPerThread);
+        parsed.getNumSearchPartitions().ifPresent(profile::setNumSearchPartitions);
+        parsed.getNumThreadsPerSearch().ifPresent(profile::setNumThreadsPerSearch);
+        parsed.getReRankCount().ifPresent(profile::setRerankCount);
+
+        parsed.getMatchPhase().ifPresent(profile::setMatchPhase);
+        parsed.getDiversity().ifPresent(profile::setDiversity);
+
+        parsed.getFirstPhaseExpression().ifPresent(profile::setFirstPhaseRanking);
+        parsed.getSecondPhaseExpression().ifPresent(profile::setSecondPhaseRanking);
+
+        parsed.getGlobalPhaseExpression().ifPresent(profile::setGlobalPhaseRanking);
+        parsed.getGlobalPhaseRerankCount().ifPresent(profile::setGlobalPhaseRerankCount);
 
         for (var value : parsed.getMatchFeatures()) {
             profile.addMatchFeatures(value);
@@ -104,10 +89,8 @@ public class ConvertParsedRanking {
             profile.addSummaryFeatures(value);
         }
 
-        parsed.getInheritedMatchFeatures().ifPresent
-            (value -> profile.setInheritedMatchFeatures(value));
-        parsed.getInheritedSummaryFeatures().ifPresent
-            (value -> profile.setInheritedSummaryFeatures(value));
+        parsed.getInheritedMatchFeatures().ifPresent(profile::setInheritedMatchFeatures);
+        parsed.getInheritedSummaryFeatures().ifPresent(profile::setInheritedSummaryFeatures);
         if (parsed.getIgnoreDefaultRankFeatures()) {
             profile.setIgnoreDefaultRankFeatures(true);
         }
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 6a800bf354f..2a117a4af4b 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
@@ -4,6 +4,7 @@ package com.yahoo.schema.parser;
 import com.yahoo.schema.OnnxModel;
 import com.yahoo.schema.RankProfile;
 import com.yahoo.schema.RankProfile.MatchPhaseSettings;
+import com.yahoo.schema.RankProfile.DiversitySettings;
 import com.yahoo.schema.RankProfile.MutateOperation;
 import com.yahoo.searchlib.rankingexpression.FeatureList;
 import com.yahoo.searchlib.rankingexpression.Reference;
@@ -39,7 +40,8 @@ class ParsedRankProfile extends ParsedBlock {
     private Integer numSearchPartitions = null;
     private Integer numThreadsPerSearch = null;
     private Integer reRankCount = null;
-    private MatchPhaseSettings matchPhaseSettings = null;
+    private MatchPhaseSettings matchPhase = null;
+    private DiversitySettings diversity = null;
     private String firstPhaseExpression = null;
     private String inheritedSummaryFeatures = null;
     private String inheritedMatchFeatures = null;
@@ -78,7 +80,8 @@ class ParsedRankProfile extends ParsedBlock {
     Optional<Integer> getNumSearchPartitions() { return Optional.ofNullable(this.numSearchPartitions); }
     Optional<Integer> getNumThreadsPerSearch() { return Optional.ofNullable(this.numThreadsPerSearch); }
     Optional<Integer> getReRankCount() { return Optional.ofNullable(this.reRankCount); }
-    Optional<MatchPhaseSettings> getMatchPhaseSettings() { return Optional.ofNullable(this.matchPhaseSettings); }
+    Optional<MatchPhaseSettings> getMatchPhase() { return Optional.ofNullable(this.matchPhase); }
+    Optional<DiversitySettings> getDiversity() { return Optional.ofNullable(this.diversity); }
     Optional<String> getFirstPhaseExpression() { return Optional.ofNullable(this.firstPhaseExpression); }
     Optional<String> getInheritedMatchFeatures() { return Optional.ofNullable(this.inheritedMatchFeatures); }
     List<ParsedRankFunction> getFunctions() { return List.copyOf(functions.values()); }
@@ -173,9 +176,13 @@ class ParsedRankProfile extends ParsedBlock {
         this.keepRankCount = count;
     }
 
-    void setMatchPhaseSettings(MatchPhaseSettings settings) {
-        verifyThat(matchPhaseSettings == null, "already has match-phase");
-        this.matchPhaseSettings = settings;
+    void setMatchPhase(MatchPhaseSettings settings) {
+        verifyThat(matchPhase == null, "already has match-phase");
+        this.matchPhase = settings;
+    }
+    void setDiversity(DiversitySettings settings) {
+        verifyThat(diversity == null, "already has diversity");
+        this.diversity = settings;
     }
 
     void setMinHitsPerThread(int minHits) {
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/DiversitySettingsValidator.java b/config-model/src/main/java/com/yahoo/schema/processing/DiversitySettingsValidator.java
index 5c06ce25184..24972167732 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/DiversitySettingsValidator.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/DiversitySettingsValidator.java
@@ -23,8 +23,8 @@ public class DiversitySettingsValidator extends Processor {
         if (documentsOnly) return;
 
         for (RankProfile rankProfile : rankProfileRegistry.rankProfilesOf(schema)) {
-            if (rankProfile.getMatchPhaseSettings() != null && rankProfile.getMatchPhaseSettings().getDiversity() != null) {
-                validate(rankProfile, rankProfile.getMatchPhaseSettings().getDiversity());
+            if (rankProfile.getDiversity() != null) {
+                validate(rankProfile, rankProfile.getDiversity());
             }
         }
     }
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/MatchPhaseSettingsValidator.java b/config-model/src/main/java/com/yahoo/schema/processing/MatchPhaseSettingsValidator.java
index f3a8f7cee18..d29820e0d51 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/MatchPhaseSettingsValidator.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/MatchPhaseSettingsValidator.java
@@ -25,7 +25,7 @@ public class MatchPhaseSettingsValidator extends Processor {
         if (documentsOnly) return;
 
         for (RankProfile rankProfile : rankProfileRegistry.rankProfilesOf(schema)) {
-            RankProfile.MatchPhaseSettings settings = rankProfile.getMatchPhaseSettings();
+            RankProfile.MatchPhaseSettings settings = rankProfile.getMatchPhase();
             if (settings != null) {
                 validateMatchPhaseSettings(rankProfile, settings);
             }