diff options
author | Lester Solbakken <lesters@oath.com> | 2021-03-16 14:04:56 +0100 |
---|---|---|
committer | Lester Solbakken <lesters@oath.com> | 2021-03-16 14:04:56 +0100 |
commit | 5a563c0389808404a37b7af25edd29fad94318c8 (patch) | |
tree | 0c475355dd7c3a105ba0ff81b259219642c7304d /searchlib/src | |
parent | d7456a4c3504ad84afa9f461322bcdcc79e8b357 (diff) |
Add missing pipe to cell_cast parsing
Diffstat (limited to 'searchlib/src')
-rwxr-xr-x | searchlib/src/main/javacc/RankingExpressionParser.jj | 2 | ||||
-rw-r--r-- | searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/searchlib/src/main/javacc/RankingExpressionParser.jj b/searchlib/src/main/javacc/RankingExpressionParser.jj index d33e9ccff7f..7506fe250fc 100755 --- a/searchlib/src/main/javacc/RankingExpressionParser.jj +++ b/searchlib/src/main/javacc/RankingExpressionParser.jj @@ -693,7 +693,7 @@ String tensorFunctionName() : ( <XW_PLUS_B> { return token.image; } ) | ( <ARGMAX> { return token.image; } ) | ( <ARGMIN> { return token.image; } ) | - ( <CELL_CAST> { return token.image; } ) + ( <CELL_CAST> { return token.image; } ) | ( aggregator = tensorReduceAggregator() { return aggregator.toString(); } ) } diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java index fae5a7a093c..5c4840a555d 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java @@ -409,7 +409,6 @@ public class EvaluationTestCase { "tensor<double>(x[2]):[3,4]"); } - @Test public void testMixedTensorType() throws ParseException { String expected = "tensor(x[1],y{},z[2]):{{x:0,y:a,z:0}:4.0,{x:0,y:a,z:1}:5.0,{x:0,y:b,z:0}:7.0,{x:0,y:b,z:1}:8.0}"; |