Merge pull request #28566 from vespa-engine/arnej/avoid-recomputing-match-features

if something is already a match-feature, avoid computing it again in …

2 files changed, 9 insertions, 0 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 35ef12f077a..dafe0b48698 100644
--- a/config-model/src/main/java/com/yahoo/schema/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/schema/RankProfile.java
@@ -1067,6 +1067,11 @@ public class RankProfile implements Cloneable {
                                                           inlineFunctions);
             var needInputs = new HashSet<String>();
             var recorder = new InputRecorder(needInputs);
+            if (matchFeatures != null) {
+                for (ReferenceNode mf : matchFeatures) {
+                    recorder.alreadyHandled(mf.toString());
+                }
+            }
             recorder.process(globalPhaseRanking.function().getBody(), context);
             List<FeatureList> addIfMissing = new ArrayList<>();
             for (String input : needInputs) {
diff --git a/config-model/src/main/java/com/yahoo/schema/expressiontransforms/InputRecorder.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/InputRecorder.java
index 160d82e08ab..b30873fabee 100644
--- a/config-model/src/main/java/com/yahoo/schema/expressiontransforms/InputRecorder.java
+++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/InputRecorder.java
@@ -38,6 +38,10 @@ public class InputRecorder extends ExpressionTransformer<InputRecorderContext> {
         transform(expression.getRoot(), new InputRecorderContext(context));
     }
 
+    public void alreadyHandled(String name) {
+        handled.add(name);
+    }
+
     @Override
     public ExpressionNode transform(ExpressionNode node, InputRecorderContext context) {
         if (node instanceof ReferenceNode r) {