Merge pull request #29096 from vespa-engine/arnej/more-reserved-function-names

add some more built-in function names

1 files changed, 23 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/processing/ReservedFunctionNames.java b/config-model/src/main/java/com/yahoo/schema/processing/ReservedFunctionNames.java
index f4d2faf9444..0987521831b 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/ReservedFunctionNames.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/ReservedFunctionNames.java
@@ -9,6 +9,7 @@ import com.yahoo.searchlib.rankingexpression.parser.RankingExpressionParserConst
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
@@ -46,8 +47,28 @@ public class ReservedFunctionNames extends Processor {
     }
 
     private static Set<String> getReservedNames() {
-        return Arrays.stream(RankingExpressionParserConstants.tokenImage)
-                .map(token -> token.substring(1, token.length()-1)).collect(Collectors.toUnmodifiableSet());
+        Set<String> temp = new HashSet<>();
+        Arrays.stream(RankingExpressionParserConstants.tokenImage)
+                .map(token -> token.substring(1, token.length()-1)).forEach(name -> temp.add(name));
+        temp.add("attribute");
+        temp.add("constant");
+        temp.add("customTokenInputIds");
+        temp.add("firstphase");
+        temp.add("globalphase");
+        temp.add("normalize_linear");
+        temp.add("onnx");
+        temp.add("onnx_vespa");
+        temp.add("query");
+        temp.add("reciprocal_rank");
+        temp.add("reciprocal_rank_fusion");
+        temp.add("secondphase");
+        temp.add("tensor");
+        temp.add("tokenAttentionMask");
+        temp.add("tokenInputIds");
+        temp.add("tokenTypeIds");
+        temp.add("value");
+        temp.add("xgboost");
+        return Set.copyOf(temp);
     }
 
 }