diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-11-08 08:37:38 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-11-08 08:37:42 +0000 |
commit | a95f1a9033545e08e21a2d656f84fd2d4f2293d4 (patch) | |
tree | e07a5c14e48127a3c8aee5f854dc9c882890f28a /config-model/src/test/derived | |
parent | a6aede7c79dcda9bee20174296b9673d9e0b32b1 (diff) |
let match-features inherit also
* a rank-profile can now inherit its parent's match-features and
add its own, exactly the same way as summary-features.
Diffstat (limited to 'config-model/src/test/derived')
3 files changed, 17 insertions, 0 deletions
diff --git a/config-model/src/test/derived/rankprofileinheritance/child.sd b/config-model/src/test/derived/rankprofileinheritance/child.sd index 9369472cb23..a6e0787a659 100644 --- a/config-model/src/test/derived/rankprofileinheritance/child.sd +++ b/config-model/src/test/derived/rankprofileinheritance/child.sd @@ -20,6 +20,10 @@ schema child { attribute(field3) } + match-features inherits profile1 { + function3 + } + } rank-profile profile4 inherits profile2 { diff --git a/config-model/src/test/derived/rankprofileinheritance/parent1.sd b/config-model/src/test/derived/rankprofileinheritance/parent1.sd index d4375427e11..d25182fde4c 100644 --- a/config-model/src/test/derived/rankprofileinheritance/parent1.sd +++ b/config-model/src/test/derived/rankprofileinheritance/parent1.sd @@ -15,11 +15,18 @@ schema parent1 { expression: attribute(field1) + 5 } + function function1b() { + expression: attribute(field1) + 42 + } + summary-features { function1 attribute(field1) } + match-features { + function1b + } } } diff --git a/config-model/src/test/derived/rankprofileinheritance/rank-profiles.cfg b/config-model/src/test/derived/rankprofileinheritance/rank-profiles.cfg index 88788f5a93a..440b0ad2b97 100644 --- a/config-model/src/test/derived/rankprofileinheritance/rank-profiles.cfg +++ b/config-model/src/test/derived/rankprofileinheritance/rank-profiles.cfg @@ -11,12 +11,18 @@ rankprofile[].fef.property[].value "true" rankprofile[].name "profile3" rankprofile[].fef.property[].name "rankingExpression(function3).rankingScript" rankprofile[].fef.property[].value "attribute(field3) + 5" +rankprofile[].fef.property[].name "rankingExpression(function1b).rankingScript" +rankprofile[].fef.property[].value "attribute(field1) + 42" rankprofile[].fef.property[].name "rankingExpression(function1).rankingScript" rankprofile[].fef.property[].value "attribute(field1) + 5" rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "attribute(field3)" rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "rankingExpression(function3)" +rankprofile[].fef.property[].name "vespa.match.feature" +rankprofile[].fef.property[].value "rankingExpression(function3)" +rankprofile[].fef.property[].name "vespa.match.feature" +rankprofile[].fef.property[].value "rankingExpression(function1b)" rankprofile[].name "profile4" rankprofile[].fef.property[].name "rankingExpression(function2).rankingScript" rankprofile[].fef.property[].value "attribute(field2) + 5" |