aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/test/derived/tensor
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-12-17 13:31:28 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2019-12-17 13:31:28 +0100
commit427c4539b2ab8dd395135ce711caa81317ae0d22 (patch)
treef67adcdf2fab036eb8eec81dca6fbc0388c58d69 /config-model/src/test/derived/tensor
parent988b1cb658b65a4d880f1bc70201a58fd1dee9e4 (diff)
Test literal tensor with quoted labels
Diffstat (limited to 'config-model/src/test/derived/tensor')
-rw-r--r--config-model/src/test/derived/tensor/rank-profiles.cfg6
-rw-r--r--config-model/src/test/derived/tensor/tensor.sd6
2 files changed, 10 insertions, 2 deletions
diff --git a/config-model/src/test/derived/tensor/rank-profiles.cfg b/config-model/src/test/derived/tensor/rank-profiles.cfg
index 9e9dfae2bc7..0c24b47258c 100644
--- a/config-model/src/test/derived/tensor/rank-profiles.cfg
+++ b/config-model/src/test/derived/tensor/rank-profiles.cfg
@@ -115,10 +115,14 @@ rankprofile[].fef.property[].name "rankingExpression(reshaped).rankingScript"
rankprofile[].fef.property[].value "tensor<float>(d0[1],x[2])(attribute(f2){x:1 - x, y:d0})"
rankprofile[].fef.property[].name "rankingExpression(reshaped).type"
rankprofile[].fef.property[].value "tensor<float>(d0[1],x[2])"
+rankprofile[].fef.property[].name "rankingExpression(literal).rankingScript"
+rankprofile[].fef.property[].value "tensor<float>(key{}):{{key:foo}:0.5,{key:bar}:1.2,{key:\"han's\"}:3.1}"
+rankprofile[].fef.property[].name "rankingExpression(literal).type"
+rankprofile[].fef.property[].value "tensor<float>(key{})"
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(rankingExpression(reshaped), sum)"
+rankprofile[].fef.property[].value "reduce(rankingExpression(reshaped) * rankingExpression(literal), sum)"
rankprofile[].fef.property[].name "vespa.type.attribute.f2"
rankprofile[].fef.property[].value "tensor<float>(x[2],y[1])"
rankprofile[].fef.property[].name "vespa.type.attribute.f3"
diff --git a/config-model/src/test/derived/tensor/tensor.sd b/config-model/src/test/derived/tensor/tensor.sd
index 6e0e7e3e148..aa33684a979 100644
--- a/config-model/src/test/derived/tensor/tensor.sd
+++ b/config-model/src/test/derived/tensor/tensor.sd
@@ -81,13 +81,17 @@ search tensor {
rank-profile profile7 {
first-phase {
- expression: sum(reshaped())
+ expression: sum(reshaped() * literal())
}
function reshaped() {
expression: tensor<float>(d0[1],x[2])(attribute(f2){x:1-x, y:d0})
}
+ function literal() {
+ expression: tensor<float>(key{}):{ 'foo':0.5, bar:1.2, "han's":3.1}
+ }
+
}
rank-profile profile8 {