summaryrefslogtreecommitdiffstats
path: root/config-model/src/test/derived
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2022-01-28 20:04:37 +0100
committerGitHub <noreply@github.com>2022-01-28 20:04:37 +0100
commite6b4f1c48ab18761bb5be0e784d7345930feb14e (patch)
tree51b439f10f1fff03f048767d92a2f0c8c5240edd /config-model/src/test/derived
parent0f8ca9097666a56fb8a99841562c451411a7df80 (diff)
parentbd7b7bcf5b8d3ac710032f66e891caa90a4334a1 (diff)
Merge pull request #20979 from vespa-engine/bratseth/rank-profile-multiple-inheritance
Bratseth/rank profile multiple inheritance
Diffstat (limited to 'config-model/src/test/derived')
-rw-r--r--config-model/src/test/derived/attributerank/attributerank.sd1
-rw-r--r--config-model/src/test/derived/rankprofilemodularity/rank-profiles.cfg18
-rw-r--r--config-model/src/test/derived/rankprofilemodularity/test.sd15
3 files changed, 34 insertions, 0 deletions
diff --git a/config-model/src/test/derived/attributerank/attributerank.sd b/config-model/src/test/derived/attributerank/attributerank.sd
index 86f96e4817c..4989e1795cd 100644
--- a/config-model/src/test/derived/attributerank/attributerank.sd
+++ b/config-model/src/test/derived/attributerank/attributerank.sd
@@ -38,4 +38,5 @@ search attributerank {
rank-type singledouble: identity
rank-type singlestring: identity
}
+
}
diff --git a/config-model/src/test/derived/rankprofilemodularity/rank-profiles.cfg b/config-model/src/test/derived/rankprofilemodularity/rank-profiles.cfg
index 8953a8b6bcf..9364e7e1369 100644
--- a/config-model/src/test/derived/rankprofilemodularity/rank-profiles.cfg
+++ b/config-model/src/test/derived/rankprofilemodularity/rank-profiles.cfg
@@ -8,6 +8,15 @@ rankprofile[].fef.property[].name "vespa.hitcollector.arraysize"
rankprofile[].fef.property[].value "0"
rankprofile[].fef.property[].name "vespa.dump.ignoredefaultfeatures"
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[].name "in_schema1"
rankprofile[].fef.property[].name "vespa.rank.firstphase"
rankprofile[].fef.property[].value "nativeRank"
@@ -18,6 +27,15 @@ rankprofile[].fef.property[].name "rankingExpression(f2).rankingScript"
rankprofile[].fef.property[].value "fieldMatch(title) + rankingExpression(fo2)"
rankprofile[].fef.property[].name "vespa.rank.firstphase"
rankprofile[].fef.property[].value "rankingExpression(f2)"
+rankprofile[].name "in_schema3"
+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[].name "outside_schema1"
rankprofile[].fef.property[].name "rankingExpression(fo1).rankingScript"
rankprofile[].fef.property[].value "now"
diff --git a/config-model/src/test/derived/rankprofilemodularity/test.sd b/config-model/src/test/derived/rankprofilemodularity/test.sd
index 720e2143f17..b017a70fef1 100644
--- a/config-model/src/test/derived/rankprofilemodularity/test.sd
+++ b/config-model/src/test/derived/rankprofilemodularity/test.sd
@@ -8,6 +8,9 @@ schema test {
}
+ rank-profile in_schema0 inherits in_schema3 {
+ }
+
rank-profile in_schema1 {
first-phase {
@@ -28,4 +31,16 @@ schema test {
}
+ rank-profile in_schema3 inherits outside_schema1, outside_schema2 {
+
+ function f2() {
+ expression: fieldMatch(title) + fo2
+ }
+
+ first-phase {
+ expression: f2
+ }
+
+ }
+
} \ No newline at end of file