Merge branch 'master' into arnej/handle-dynamic-tensor

2 files changed, 70 insertions, 0 deletions

diff --git a/config-model/src/test/derived/rankproperties/rank-profiles.cfg b/config-model/src/test/derived/rankproperties/rank-profiles.cfg
index 3ca44288282..b6f51a88197 100644
--- a/config-model/src/test/derived/rankproperties/rank-profiles.cfg
+++ b/config-model/src/test/derived/rankproperties/rank-profiles.cfg
@@ -50,3 +50,49 @@ rankprofile[].fef.property[].name "vespa.fieldweight.description"
 rankprofile[].fef.property[].value "35"
 rankprofile[].fef.property[].name "vespa.fieldweight.tag"
 rankprofile[].fef.property[].value "88"
+rankprofile[].name "withconstants1"
+rankprofile[].fef.property[].name "constant(a).value"
+rankprofile[].fef.property[].value "tensor(x[2]):[1.0, 2.0]"
+rankprofile[].fef.property[].name "constant(a).type"
+rankprofile[].fef.property[].value "tensor(x[2])"
+rankprofile[].fef.property[].name "constant(b).value"
+rankprofile[].fef.property[].value "tensor(y[3]):[3.0, 4.0, 5.0]"
+rankprofile[].fef.property[].name "constant(b).type"
+rankprofile[].fef.property[].value "tensor(y[3])"
+rankprofile[].fef.property[].name "rankingExpression(usea).rankingScript"
+rankprofile[].fef.property[].value "constant(a) * 1.0"
+rankprofile[].fef.property[].name "rankingExpression(usea).type"
+rankprofile[].fef.property[].value "tensor(x[2])"
+rankprofile[].fef.property[].name "rankingExpression(useb).rankingScript"
+rankprofile[].fef.property[].value "constant(a) * 1.0 + constant(b)"
+rankprofile[].fef.property[].name "rankingExpression(useb).type"
+rankprofile[].fef.property[].value "tensor(x[2],y[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(nativeFieldMatch + constant(a) * 1.0 + constant(b), sum)"
+rankprofile[].name "withconstants2"
+rankprofile[].fef.property[].name "constant(a).value"
+rankprofile[].fef.property[].value "tensor(x[2]):[1.0, 2.0]"
+rankprofile[].fef.property[].name "constant(a).type"
+rankprofile[].fef.property[].value "tensor(x[2])"
+rankprofile[].fef.property[].name "constant(b).value"
+rankprofile[].fef.property[].value "tensor(y[3]):[3.0, 4.0, 5.0]"
+rankprofile[].fef.property[].name "constant(b).type"
+rankprofile[].fef.property[].value "tensor(y[3])"
+rankprofile[].fef.property[].name "rankingExpression(usea).rankingScript"
+rankprofile[].fef.property[].value "constant(a) * 1.0"
+rankprofile[].fef.property[].name "rankingExpression(usea).type"
+rankprofile[].fef.property[].value "tensor(x[2])"
+rankprofile[].fef.property[].name "rankingExpression(useb).rankingScript"
+rankprofile[].fef.property[].value "constant(a) * 1.0 + constant(b)"
+rankprofile[].fef.property[].name "rankingExpression(useb).type"
+rankprofile[].fef.property[].value "tensor(x[2],y[3])"
+rankprofile[].fef.property[].name "rankingExpression(usec).rankingScript"
+rankprofile[].fef.property[].value "constant(a) + constant(b)"
+rankprofile[].fef.property[].name "rankingExpression(usec).type"
+rankprofile[].fef.property[].value "tensor(x[2],y[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(nativeFieldMatch + constant(a) + constant(b), sum)"
diff --git a/config-model/src/test/derived/rankproperties/rankproperties.sd b/config-model/src/test/derived/rankproperties/rankproperties.sd
index a2eb987d4ff..a13b3081ca7 100644
--- a/config-model/src/test/derived/rankproperties/rankproperties.sd
+++ b/config-model/src/test/derived/rankproperties/rankproperties.sd
@@ -59,4 +59,28 @@ schema rankproperties {
     }
   }
 
+  rank-profile withconstants1 {
+    constants {
+      constant(a) tensor(x[2]) : [1,2]
+      constant(b) tensor(y[3]) : [3,4,5]
+    }
+    function inline usea() {
+      expression: constant(a)*1.0
+    }
+    function inline useb() {
+      expression: usea + constant(b)
+    }
+    first-phase {
+      expression: sum(nativeFieldMatch + useb)
+    }
+  }
+
+  rank-profile withconstants2 inherits withconstants1 {
+    function inline usec() {
+      expression: constant(a)+constant(b)
+    }
+    first-phase {
+      expression: sum(nativeFieldMatch + usec)
+    }
+  }
 }