diff options
Diffstat (limited to 'config-model/src/test/derived/tensor')
4 files changed, 29 insertions, 7 deletions
diff --git a/config-model/src/test/derived/tensor/attributes.cfg b/config-model/src/test/derived/tensor/attributes.cfg index a3026d579d5..8819e28b354 100644 --- a/config-model/src/test/derived/tensor/attributes.cfg +++ b/config-model/src/test/derived/tensor/attributes.cfg @@ -16,7 +16,7 @@ attribute[0].arity 8 attribute[0].lowerbound -9223372036854775808 attribute[0].upperbound 9223372036854775807 attribute[0].densepostinglistthreshold 0.4 -attribute[0].tensortype "" +attribute[0].tensortype "tensor(x[2],y[])" attribute[1].name "f3" attribute[1].datatype TENSOR attribute[1].collectiontype SINGLE @@ -35,7 +35,7 @@ attribute[1].arity 8 attribute[1].lowerbound -9223372036854775808 attribute[1].upperbound 9223372036854775807 attribute[1].densepostinglistthreshold 0.4 -attribute[1].tensortype "" +attribute[1].tensortype "tensor(x{})" attribute[2].name "f4" attribute[2].datatype TENSOR attribute[2].collectiontype SINGLE diff --git a/config-model/src/test/derived/tensor/documenttypes.cfg b/config-model/src/test/derived/tensor/documenttypes.cfg index 2a76458a97a..7c39af767f4 100644 --- a/config-model/src/test/derived/tensor/documenttypes.cfg +++ b/config-model/src/test/derived/tensor/documenttypes.cfg @@ -24,26 +24,32 @@ documenttype[0].datatype[0].sstruct.field[0].name "f1" documenttype[0].datatype[0].sstruct.field[0].id 26661415 documenttype[0].datatype[0].sstruct.field[0].id_v6 1740179945 documenttype[0].datatype[0].sstruct.field[0].datatype 21 +documenttype[0].datatype[0].sstruct.field[2].detailedtype "tensor(x[])" documenttype[0].datatype[0].sstruct.field[1].name "f2" documenttype[0].datatype[0].sstruct.field[1].id 2080644671 documenttype[0].datatype[0].sstruct.field[1].id_v6 1424572148 documenttype[0].datatype[0].sstruct.field[1].datatype 21 +documenttype[0].datatype[0].sstruct.field[2].detailedtype "tensor(x[2],y[])" documenttype[0].datatype[0].sstruct.field[2].name "f3" documenttype[0].datatype[0].sstruct.field[2].id 1295091863 documenttype[0].datatype[0].sstruct.field[2].id_v6 1444109654 documenttype[0].datatype[0].sstruct.field[2].datatype 21 +documenttype[0].datatype[0].sstruct.field[2].detailedtype "tensor(x{})" documenttype[0].datatype[0].sstruct.field[3].name "f4" documenttype[0].datatype[0].sstruct.field[3].id 1224191509 documenttype[0].datatype[0].sstruct.field[3].id_v6 1039544782 documenttype[0].datatype[0].sstruct.field[3].datatype 21 +documenttype[0].datatype[0].sstruct.field[3].detailedtype "tensor(x[],y[])" documenttype[0].datatype[0].sstruct.field[4].name "rankfeatures" documenttype[0].datatype[0].sstruct.field[4].id 1883197392 documenttype[0].datatype[0].sstruct.field[4].id_v6 699950698 documenttype[0].datatype[0].sstruct.field[4].datatype 2 +documenttype[0].datatype[0].sstruct.field[4].detailedtype "" documenttype[0].datatype[0].sstruct.field[5].name "summaryfeatures" documenttype[0].datatype[0].sstruct.field[5].id 1840337115 documenttype[0].datatype[0].sstruct.field[5].id_v6 1981648971 documenttype[0].datatype[0].sstruct.field[5].datatype 2 +documenttype[0].datatype[0].sstruct.field[5].detailedtype "" documenttype[0].datatype[1].id -1903234535 documenttype[0].datatype[1].type STRUCT documenttype[0].datatype[1].array.element.id 0 diff --git a/config-model/src/test/derived/tensor/rank-profiles.cfg b/config-model/src/test/derived/tensor/rank-profiles.cfg index d70555c9131..d9c6c5088c2 100644 --- a/config-model/src/test/derived/tensor/rank-profiles.cfg +++ b/config-model/src/test/derived/tensor/rank-profiles.cfg @@ -1,4 +1,8 @@ rankprofile[].name "default" +rankprofile[].fef.property[].name "vespa.type.attribute.f2" +rankprofile[].fef.property[].value "tensor(x[2],y[])" +rankprofile[].fef.property[].name "vespa.type.attribute.f3" +rankprofile[].fef.property[].value "tensor(x{})" rankprofile[].fef.property[].name "vespa.type.attribute.f4" rankprofile[].fef.property[].value "tensor(x[10],y[20])" rankprofile[].name "unranked" @@ -10,6 +14,10 @@ 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[].fef.property[].name "vespa.type.attribute.f2" +rankprofile[].fef.property[].value "tensor(x[2],y[])" +rankprofile[].fef.property[].name "vespa.type.attribute.f3" +rankprofile[].fef.property[].value "tensor(x{})" rankprofile[].fef.property[].name "vespa.type.attribute.f4" rankprofile[].fef.property[].value "tensor(x[10],y[20])" rankprofile[].name "profile1" @@ -17,6 +25,10 @@ rankprofile[].fef.property[].name "vespa.rank.firstphase" rankprofile[].fef.property[].value "rankingExpression(firstphase)" rankprofile[].fef.property[].name "rankingExpression(firstphase).rankingScript" rankprofile[].fef.property[].value "map(attribute(f4), f(x)(x * x)) + reduce(tensor(x[2],y[3])(random), count) * rename(attribute(f4), (x, y), (y, x))" +rankprofile[].fef.property[].name "vespa.type.attribute.f2" +rankprofile[].fef.property[].value "tensor(x[2],y[])" +rankprofile[].fef.property[].name "vespa.type.attribute.f3" +rankprofile[].fef.property[].value "tensor(x{})" rankprofile[].fef.property[].name "vespa.type.attribute.f4" rankprofile[].fef.property[].value "tensor(x[10],y[20])" rankprofile[].name "profile2" @@ -24,5 +36,9 @@ 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(join(attribute(f4), tensor(x[2],y[2],z[3])((x==y)*(y==z)), f(a,b)(a * b)), sum, x)" +rankprofile[].fef.property[].name "vespa.type.attribute.f2" +rankprofile[].fef.property[].value "tensor(x[2],y[])" +rankprofile[].fef.property[].name "vespa.type.attribute.f3" +rankprofile[].fef.property[].value "tensor(x{})" rankprofile[].fef.property[].name "vespa.type.attribute.f4" -rankprofile[].fef.property[].value "tensor(x[10],y[20])" +rankprofile[].fef.property[].value "tensor(x[10],y[20])"
\ No newline at end of file diff --git a/config-model/src/test/derived/tensor/tensor.sd b/config-model/src/test/derived/tensor/tensor.sd index fab4cafddab..18f1245e0b4 100644 --- a/config-model/src/test/derived/tensor/tensor.sd +++ b/config-model/src/test/derived/tensor/tensor.sd @@ -2,16 +2,16 @@ search tensor { document tensor { - field f1 type tensor { + field f1 type tensor(x[]) { indexing: summary } - field f2 type tensor { + field f2 type tensor(x[2],y[]) { indexing: attribute } - field f3 type tensor { + field f3 type tensor(x{}) { indexing: attribute | summary } - field f4 type tensor { + field f4 type tensor(x[],y[]) { indexing: attribute attribute: tensor(x[10],y[20]) } |