diff options
4 files changed, 14 insertions, 14 deletions
diff --git a/config-model/src/test/derived/tensor/rank-profiles.cfg b/config-model/src/test/derived/tensor/rank-profiles.cfg index ac66ccf6938..1ec3d67cb47 100644 --- a/config-model/src/test/derived/tensor/rank-profiles.cfg +++ b/config-model/src/test/derived/tensor/rank-profiles.cfg @@ -137,7 +137,7 @@ rankprofile[].fef.property[].value "3" rankprofile[].fef.property[].name "vespa.rank.firstphase" rankprofile[].fef.property[].value "rankingExpression(firstphase)" rankprofile[].fef.property[].name "rankingExpression(firstphase).rankingScript" -rankprofile[].fef.property[].value "reduce(tensor(d0[1])((attribute{x:(rankingExpression(functionNotLabel))})), sum)" +rankprofile[].fef.property[].value "reduce(tensor(d0[1])((attribute(f3){x:(rankingExpression(functionNotLabel))})), sum)" rankprofile[].fef.property[].name "vespa.type.attribute.f2" rankprofile[].fef.property[].value "tensor<float>(x[2],y[1])" rankprofile[].fef.property[].name "vespa.type.attribute.f3" @@ -152,7 +152,7 @@ rankprofile[].fef.property[].value "3" rankprofile[].fef.property[].name "vespa.rank.firstphase" rankprofile[].fef.property[].value "rankingExpression(firstphase)" rankprofile[].fef.property[].name "rankingExpression(firstphase).rankingScript" -rankprofile[].fef.property[].value "reduce(tensor(shadow[1])((attribute{x:(shadow + rankingExpression(shadow))})), sum)" +rankprofile[].fef.property[].value "reduce(tensor(shadow[1])((attribute(f3){x:(shadow + rankingExpression(shadow))})), sum)" rankprofile[].fef.property[].name "vespa.type.attribute.f2" rankprofile[].fef.property[].value "tensor<float>(x[2],y[1])" rankprofile[].fef.property[].name "vespa.type.attribute.f3" diff --git a/config-model/src/test/derived/tensor/tensor.sd b/config-model/src/test/derived/tensor/tensor.sd index 89c00ec80cb..a0657bae2e4 100644 --- a/config-model/src/test/derived/tensor/tensor.sd +++ b/config-model/src/test/derived/tensor/tensor.sd @@ -97,7 +97,7 @@ schema tensor { rank-profile profile8 { first-phase { - expression: sum(tensor(d0[1])(attribute(f2){x:functionNotLabel()})) + expression: sum(tensor(d0[1])(attribute(f3){x:functionNotLabel()})) } function functionNotLabel() { @@ -110,7 +110,7 @@ schema tensor { # shadow refers to the generate index and shadow() to the function first-phase { - expression: sum(tensor(shadow[1])(attribute{x: shadow + shadow() })) + expression: sum(tensor(shadow[1])(attribute(f3){x: shadow + shadow() })) } function shadow() { diff --git a/config-model/src/test/examples/rankingexpressionfunction/rankingexpressionfunction.sd b/config-model/src/test/examples/rankingexpressionfunction/rankingexpressionfunction.sd index ac948b47390..ec673cff773 100644 --- a/config-model/src/test/examples/rankingexpressionfunction/rankingexpressionfunction.sd +++ b/config-model/src/test/examples/rankingexpressionfunction/rankingexpressionfunction.sd @@ -31,7 +31,7 @@ search rankexpression { } first-phase { - expression: 0.8+0.2*titlematch$(4,5)+0.8*titlematch$(7,8)*closeness(distance) + expression: 0.8+0.2*titlematch(4,5)+0.8*titlematch(7,8)*closeness(distance) } } diff --git a/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionsTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionsTestCase.java index ace3788e49a..c985d427a5a 100644 --- a/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionsTestCase.java @@ -41,11 +41,11 @@ public class RankingExpressionsTestCase extends AbstractSchemaTestCase { Schema schema = createSearch("src/test/examples/rankingexpressionfunction", deployProperties, rankProfileRegistry); RankProfile functionsRankProfile = rankProfileRegistry.get(schema, "macros"); Map<String, RankProfile.RankingExpressionFunction> functions = functionsRankProfile.getFunctions(); - assertEquals(2, functions.get("titlematch$").function().arguments().size()); - assertEquals("var1", functions.get("titlematch$").function().arguments().get(0)); - assertEquals("var2", functions.get("titlematch$").function().arguments().get(1)); - assertEquals("var1 * var2 + 890", functions.get("titlematch$").function().getBody().getRoot().toString()); - assertEquals("0.8 + 0.2 * titlematch$(4,5) + 0.8 * titlematch$(7,8) * closeness(distance)", + assertEquals(2, functions.get("titlematch").function().arguments().size()); + assertEquals("var1", functions.get("titlematch").function().arguments().get(0)); + assertEquals("var2", functions.get("titlematch").function().arguments().get(1)); + assertEquals("var1 * var2 + 890", functions.get("titlematch").function().getBody().getRoot().toString()); + assertEquals("0.8 + 0.2 * titlematch(4,5) + 0.8 * titlematch(7,8) * closeness(distance)", functionsRankProfile.getFirstPhaseRanking().getRoot().toString()); assertEquals("78 + closeness(distance)", functions.get("artistmatch").function().getBody().getRoot().toString()); @@ -56,19 +56,19 @@ public class RankingExpressionsTestCase extends AbstractSchemaTestCase { List<Pair<String, String>> rankProperties = rawRankProfile.configProperties(); assertEquals(6, rankProperties.size()); - assertEquals("rankingExpression(titlematch$).rankingScript", rankProperties.get(2).getFirst()); + assertEquals("rankingExpression(titlematch).rankingScript", rankProperties.get(2).getFirst()); assertEquals("var1 * var2 + 890", rankProperties.get(2).getSecond()); assertEquals("rankingExpression(artistmatch).rankingScript", rankProperties.get(3).getFirst()); assertEquals("78 + closeness(distance)", rankProperties.get(3).getSecond()); assertEquals("rankingExpression(firstphase).rankingScript", rankProperties.get(5).getFirst()); - assertEquals("0.8 + 0.2 * rankingExpression(titlematch$@126063073eb2deb.ab95cd69909927c) + 0.8 * rankingExpression(titlematch$@c7e4c2d0e6d9f2a1.1d4ed08e56cce2e6) * closeness(distance)", rankProperties.get(5).getSecond()); + assertEquals("0.8 + 0.2 * rankingExpression(titlematch@126063073eb2deb.ab95cd69909927c) + 0.8 * rankingExpression(titlematch@c7e4c2d0e6d9f2a1.1d4ed08e56cce2e6) * closeness(distance)", rankProperties.get(5).getSecond()); - assertEquals("rankingExpression(titlematch$@c7e4c2d0e6d9f2a1.1d4ed08e56cce2e6).rankingScript", rankProperties.get(1).getFirst()); + assertEquals("rankingExpression(titlematch@c7e4c2d0e6d9f2a1.1d4ed08e56cce2e6).rankingScript", rankProperties.get(1).getFirst()); assertEquals("7 * 8 + 890", rankProperties.get(1).getSecond()); - assertEquals("rankingExpression(titlematch$@126063073eb2deb.ab95cd69909927c).rankingScript", rankProperties.get(0).getFirst()); + assertEquals("rankingExpression(titlematch@126063073eb2deb.ab95cd69909927c).rankingScript", rankProperties.get(0).getFirst()); assertEquals("4 * 5 + 890", rankProperties.get(0).getSecond()); } |