diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-09-02 16:54:30 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-09-02 18:02:38 +0200 |
commit | 1c6c4af958e4004615c998978f186d43244a0799 (patch) | |
tree | f8d67cb026a937a86783d5f0d472ac5e246c1088 /config-model/src/test | |
parent | 052bc52450372ae1a69c12c7fa1745a5c0b3c7cc (diff) |
- Add test for large expressions and inheritance.
- Allow multiple definition as long as they are identical.
Diffstat (limited to 'config-model/src/test')
-rw-r--r-- | config-model/src/test/examples/largerankingexpressions/rankexpression.sd | 64 | ||||
-rw-r--r-- | config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java | 49 |
2 files changed, 113 insertions, 0 deletions
diff --git a/config-model/src/test/examples/largerankingexpressions/rankexpression.sd b/config-model/src/test/examples/largerankingexpressions/rankexpression.sd new file mode 100644 index 00000000000..55466b7a5d3 --- /dev/null +++ b/config-model/src/test/examples/largerankingexpressions/rankexpression.sd @@ -0,0 +1,64 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +search rankexpression { + + document rankexpression { + + field artist type string { + indexing: summary | index + } + + field title type string { + indexing: summary | index + } + + field surl type string { + indexing: summary + } + + field year type int { + indexing: summary | attribute + } + + } + + rank-profile base { + + function large_f() { + expression: 78+closeness(distance)*(attribute(year)+attribute(year))/attribute(year) + } + macro large_m() { + expression: 78+closeness(distance)*(attribute(year)+attribute(year))/attribute(year) + } + } + + rank-profile child_a inherits base { + + function large_local_f() { + expression: large_f() + large_m() + } + + function large_local_m() { + expression: large_f() + large_m() + } + + first-phase { + expression: 0.8+0.2*large_local_f() + large_local_m() + } + } + + rank-profile child_b inherits base { + + function large_local_f() { + expression: large_f() + large_m() + } + + function large_local_m() { + expression: large_f() + large_m() + } + + first-phase { + expression: 0.8+0.2*large_local_f() + large_local_m() + } + } + +} diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java index 9dd569a2f64..af21b6f5036 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java @@ -22,10 +22,12 @@ import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import org.junit.Test; import java.io.IOException; +import java.util.Arrays; import java.util.List; import java.util.Map; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class RankingExpressionsTestCase extends SchemaTestCase { @@ -78,4 +80,51 @@ public class RankingExpressionsTestCase extends SchemaTestCase { new DerivedConfiguration(search, new BaseDeployLogger(), new TestProperties(), registry, new QueryProfileRegistry(), new ImportedMlModels()); // rank profile parsing happens during deriving } + private void verifyProfile(RankProfile profile, List<String> expectedFunctions, List<Pair<String, String>> rankProperties, + LargeRankExpressions largeExpressions, QueryProfileRegistry queryProfiles, ImportedMlModels models, + AttributeFields attributes, ModelContext.Properties properties) { + var functions = profile.getFunctions(); + assertEquals(expectedFunctions.size(), functions.size()); + for (String func : expectedFunctions) { + assertTrue(functions.containsKey(func)); + } + + RawRankProfile raw = new RawRankProfile(profile, largeExpressions, queryProfiles, models, attributes, properties); + assertEquals(rankProperties.size(), raw.configProperties().size()); + for (int i = 0; i < rankProperties.size(); i++) { + assertEquals(rankProperties.get(i).getFirst(), raw.configProperties().get(i).getFirst()); + assertEquals(rankProperties.get(i).getSecond(), raw.configProperties().get(i).getSecond()); + } + } + + private void verifySearch(Search search, RankProfileRegistry rankProfileRegistry, LargeRankExpressions largeExpressions, + QueryProfileRegistry queryProfiles, ImportedMlModels models, ModelContext.Properties properties) + { + ; + AttributeFields attributes = new AttributeFields(search); + + verifyProfile(rankProfileRegistry.get(search, "base"), Arrays.asList("large_f", "large_m"), + Arrays.asList(new Pair<>("rankingExpression(large_f).expressionName", "base.large_f"), new Pair<>("rankingExpression(large_m).expressionName", "base.large_m")), + largeExpressions, queryProfiles, models, attributes, properties); + for (String child : Arrays.asList("child_a", "child_b")) { + verifyProfile(rankProfileRegistry.get(search, child), Arrays.asList("large_f", "large_m", "large_local_f", "large_local_m"), + Arrays.asList(new Pair<>("rankingExpression(large_f).expressionName", child + ".large_f"), new Pair<>("rankingExpression(large_m).expressionName", child + ".large_m"), + new Pair<>("rankingExpression(large_local_f).expressionName", child + ".large_local_f"), new Pair<>("rankingExpression(large_local_m).expressionName", child + ".large_local_m"), + new Pair<>("vespa.rank.firstphase", "rankingExpression(firstphase)"), new Pair<>("rankingExpression(firstphase).expressionName", child + ".firstphase")), + largeExpressions, queryProfiles, models, attributes, properties); + } + } + + @Test + public void testLargeInheritedFunctions() throws IOException, ParseException { + ModelContext.Properties properties = new TestProperties().useExternalRankExpression(true).largeRankExpressionLimit(50); + RankProfileRegistry rankProfileRegistry = new RankProfileRegistry(); + LargeRankExpressions largeExpressions = new LargeRankExpressions(new MockFileRegistry()); + QueryProfileRegistry queryProfiles = new QueryProfileRegistry(); + ImportedMlModels models = new ImportedMlModels(); + Search search = createSearch("src/test/examples/largerankingexpressions", properties, rankProfileRegistry); + verifySearch(search, rankProfileRegistry, largeExpressions, queryProfiles, models, properties); + // Need to verify that second derivation works as that will happen if same sd is used in multiple content clusters + verifySearch(search, rankProfileRegistry, largeExpressions, queryProfiles, models, properties); + } } |