summaryrefslogtreecommitdiffstats
path: root/searchlib/abi-spec.json
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-01-02 11:35:37 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-01-02 11:35:37 +0100
commitfe102598a18b21a859d5b802883ccb2f462962f9 (patch)
tree70a8d6d239797c18a8634665e2a65bfaabebabba /searchlib/abi-spec.json
parent6d7909e022817be11b5f088cbd1e537d9b71919d (diff)
Add merge
Diffstat (limited to 'searchlib/abi-spec.json')
-rw-r--r--searchlib/abi-spec.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/searchlib/abi-spec.json b/searchlib/abi-spec.json
index ff6c1ad0b9d..79752c5feaf 100644
--- a/searchlib/abi-spec.json
+++ b/searchlib/abi-spec.json
@@ -878,6 +878,7 @@
"public final com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode tensorReduce()",
"public final com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode tensorReduceComposites()",
"public final com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode tensorJoin()",
+ "public final com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode tensorMerge()",
"public final com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode tensorRename()",
"public final com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode tensorConcat()",
"public final com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode tensorGenerate()",
@@ -1026,6 +1027,7 @@
"public static final int MAP",
"public static final int REDUCE",
"public static final int JOIN",
+ "public static final int MERGE",
"public static final int RENAME",
"public static final int CONCAT",
"public static final int TENSOR",