From 27b3cdd6c04f83d540258a964265977e06dfc499 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 2 Feb 2022 09:40:31 +0100 Subject: Allow the default rank profile to inherit --- .../src/test/derived/rankprofilemodularity/rank-profiles.cfg | 10 +++++----- config-model/src/test/derived/rankprofilemodularity/test.sd | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'config-model/src/test/derived') diff --git a/config-model/src/test/derived/rankprofilemodularity/rank-profiles.cfg b/config-model/src/test/derived/rankprofilemodularity/rank-profiles.cfg index 9364e7e1369..3af23fd3770 100644 --- a/config-model/src/test/derived/rankprofilemodularity/rank-profiles.cfg +++ b/config-model/src/test/derived/rankprofilemodularity/rank-profiles.cfg @@ -1,4 +1,8 @@ rankprofile[].name "default" +rankprofile[].fef.property[].name "rankingExpression(fo2).rankingScript" +rankprofile[].fef.property[].value "random" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "fieldMatch(title).completeness" rankprofile[].name "unranked" rankprofile[].fef.property[].name "vespa.rank.firstphase" rankprofile[].fef.property[].value "value(0)" @@ -11,12 +15,8 @@ rankprofile[].fef.property[].value "true" rankprofile[].name "in_schema0" rankprofile[].fef.property[].name "rankingExpression(fo2).rankingScript" rankprofile[].fef.property[].value "random" -rankprofile[].fef.property[].name "rankingExpression(f2).rankingScript" -rankprofile[].fef.property[].value "fieldMatch(title) + rankingExpression(fo2)" -rankprofile[].fef.property[].name "rankingExpression(fo1).rankingScript" -rankprofile[].fef.property[].value "now" rankprofile[].fef.property[].name "vespa.rank.firstphase" -rankprofile[].fef.property[].value "rankingExpression(f2)" +rankprofile[].fef.property[].value "fieldMatch(title).completeness" rankprofile[].name "in_schema1" rankprofile[].fef.property[].name "vespa.rank.firstphase" rankprofile[].fef.property[].value "nativeRank" diff --git a/config-model/src/test/derived/rankprofilemodularity/test.sd b/config-model/src/test/derived/rankprofilemodularity/test.sd index b017a70fef1..34414414d6c 100644 --- a/config-model/src/test/derived/rankprofilemodularity/test.sd +++ b/config-model/src/test/derived/rankprofilemodularity/test.sd @@ -8,7 +8,10 @@ schema test { } - rank-profile in_schema0 inherits in_schema3 { + rank-profile default inherits outside_schema2 { + } + + rank-profile in_schema0 inherits outside_schema2 { } rank-profile in_schema1 { -- cgit v1.2.3