diff options
author | Jon Bratseth <bratseth@oath.com> | 2021-01-06 15:52:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-06 15:52:16 +0100 |
commit | a33dd301081f98fa8d0755aaba4a81df6733315d (patch) | |
tree | c479cdbca153439f277f194ad2fb9115efb49801 /searchlib | |
parent | 20f52d23421cd25f1e2e27a17c5e404c55a86ff1 (diff) | |
parent | 3578f2b70312e681b11db97e6ead8997e2dd7d3c (diff) |
Merge pull request #15933 from vespa-engine/lesters/expressions-as-arguments-2
Allow expressions as arguments
Diffstat (limited to 'searchlib')
-rw-r--r-- | searchlib/abi-spec.json | 1 | ||||
-rwxr-xr-x | searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/ExpressionFunction.java | 14 | ||||
-rwxr-xr-x | searchlib/src/main/javacc/RankingExpressionParser.jj | 22 |
3 files changed, 14 insertions, 23 deletions
diff --git a/searchlib/abi-spec.json b/searchlib/abi-spec.json index 88eccb4559f..d412f408350 100644 --- a/searchlib/abi-spec.json +++ b/searchlib/abi-spec.json @@ -875,7 +875,6 @@ "public final java.lang.String outs()", "public final java.lang.String out()", "public final java.util.List args()", - "public final com.yahoo.searchlib.rankingexpression.rule.ExpressionNode arg()", "public final com.yahoo.searchlib.rankingexpression.rule.ExpressionNode function()", "public final com.yahoo.searchlib.rankingexpression.rule.FunctionNode scalarOrTensorFunction()", "public final com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode tensorFunction()", diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/ExpressionFunction.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/ExpressionFunction.java index 9f900ffed36..b97c8316c9b 100755 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/ExpressionFunction.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/ExpressionFunction.java @@ -3,7 +3,10 @@ package com.yahoo.searchlib.rankingexpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.yahoo.searchlib.rankingexpression.rule.ConstantNode; import com.yahoo.searchlib.rankingexpression.rule.ExpressionNode; +import com.yahoo.searchlib.rankingexpression.rule.FunctionNode; +import com.yahoo.searchlib.rankingexpression.rule.ReferenceNode; import com.yahoo.searchlib.rankingexpression.rule.SerializationContext; import com.yahoo.tensor.TensorType; import com.yahoo.text.Utf8; @@ -131,7 +134,16 @@ public class ExpressionFunction { public Instance expand(SerializationContext context, List<ExpressionNode> argumentValues, Deque<String> path) { Map<String, String> argumentBindings = new HashMap<>(); for (int i = 0; i < arguments.size() && i < argumentValues.size(); ++i) { - argumentBindings.put(arguments.get(i), argumentValues.get(i).toString(new StringBuilder(), context, path, null).toString()); + String key = arguments.get(i); + ExpressionNode expr = argumentValues.get(i); + String binding = expr.toString(new StringBuilder(), context, path, null).toString(); + + if ( ! (expr instanceof ReferenceNode) && ! (expr instanceof ConstantNode) && ! (expr instanceof FunctionNode) ) { + String funcName = "autogenerated_ranking_feature@" + Long.toHexString(symbolCode(key + "=" + binding)); + context.addFunctionSerialization(RankingExpression.propertyName(funcName), binding); + binding = funcName; + } + argumentBindings.put(key, binding); } context = argumentBindings.isEmpty() ? context.withoutBindings() : context.withBindings(argumentBindings); String symbol = toSymbol(argumentBindings); diff --git a/searchlib/src/main/javacc/RankingExpressionParser.jj b/searchlib/src/main/javacc/RankingExpressionParser.jj index 09880b8dfc3..36b1f9627bb 100755 --- a/searchlib/src/main/javacc/RankingExpressionParser.jj +++ b/searchlib/src/main/javacc/RankingExpressionParser.jj @@ -328,30 +328,10 @@ List<ExpressionNode> args() : ExpressionNode argument; } { - ( ( argument = arg() { arguments.add(argument); } ( <COMMA> argument = arg() { arguments.add(argument); } )* )? ) + ( ( argument = expression() { arguments.add(argument); } ( <COMMA> argument = expression() { arguments.add(argument); } )* )? ) { return arguments; } } -// TODO: Replace use of this for function arguments with value() -// For that to work with the current search execution framework -// we need to generate another function for the argument such that we can replace -// instances of the argument with the reference to that function in the same way -// as we replace by constants/names today (this can make for some fun combinatorial explosion). -// We should also stop doing function expansion in the toString of a function. -// - Jon 2014-05-02 -ExpressionNode arg() : -{ - ExpressionNode ret; - String name; - Function fnc; -} -{ - ( ret = constantPrimitive() | - LOOKAHEAD(2) ret = feature() | - name = identifier() { ret = new NameNode(name); } ) - { return ret; } -} - ExpressionNode function() : { ExpressionNode function; |