Merge pull request #26338 from vespa-engine/arnej/declare-more-function-return-types

Arnej/declare more function return types

1 files changed, 5 insertions, 1 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java
index e2fffd824b9..c157f44be31 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java
@@ -104,7 +104,11 @@ public class SerializationContext extends FunctionReferenceContext {
     /** Adds the serialization of the return type of a function */
     public void addFunctionTypeSerialization(String functionName, TensorType type) {
         if (type.rank() == 0) return; // no explicit type implies scalar (aka rank 0 tensor)
-        serializedFunctions.put(wrapInRankingExpression(functionName) + ".type", type.toString());
+        String key = wrapInRankingExpression(functionName) + ".type";
+        var old = serializedFunctions.put(key, type.toString());
+        if (old != null && !old.equals(type.toString())) {
+            throw new IllegalArgumentException("conflicting values for " + key + ": " + old + " != " + type.toString());
+        }
     }
 
     @Override