diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-06-08 17:13:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-08 17:13:31 +0200 |
commit | e14f7006a20d14f2445bcf22a7445267ffaaed40 (patch) | |
tree | fad36a022136edb9bcbbca1b2d0348640557d274 /config-model/src/test/derived/map_of_struct_attribute | |
parent | 8232481e8cf9c1df4c6f98fa8e3dacd0f226cf0e (diff) | |
parent | 8170cbe91308e4789f2a35f00d79af900beb0b20 (diff) |
Merge pull request #6141 from vespa-engine/geirst/add-support-for-primitive-map-attribute-fields
Geirst/add support for primitive map attribute fields
Diffstat (limited to 'config-model/src/test/derived/map_of_struct_attribute')
4 files changed, 59 insertions, 8 deletions
diff --git a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg index 9ada79e78bd..95cf8f761a0 100644 --- a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg +++ b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg @@ -1,4 +1,4 @@ -attribute[].name "elem_map.key" +attribute[].name "str_elem_map.key" attribute[].datatype STRING attribute[].collectiontype ARRAY attribute[].removeifzero false @@ -18,7 +18,7 @@ attribute[].upperbound 9223372036854775807 attribute[].densepostinglistthreshold 0.4 attribute[].tensortype "" attribute[].imported false -attribute[].name "elem_map.value.name" +attribute[].name "str_elem_map.value.name" attribute[].datatype STRING attribute[].collectiontype ARRAY attribute[].removeifzero false @@ -38,7 +38,7 @@ attribute[].upperbound 9223372036854775807 attribute[].densepostinglistthreshold 0.4 attribute[].tensortype "" attribute[].imported false -attribute[].name "elem_map.value.weight" +attribute[].name "str_elem_map.value.weight" attribute[].datatype INT32 attribute[].collectiontype ARRAY attribute[].removeifzero false @@ -58,3 +58,43 @@ attribute[].upperbound 9223372036854775807 attribute[].densepostinglistthreshold 0.4 attribute[].tensortype "" attribute[].imported false +attribute[].name "int_elem_map.key" +attribute[].datatype INT32 +attribute[].collectiontype ARRAY +attribute[].removeifzero false +attribute[].createifnonexistent false +attribute[].fastsearch false +attribute[].huge false +attribute[].sortascending true +attribute[].sortfunction UCA +attribute[].sortstrength PRIMARY +attribute[].sortlocale "" +attribute[].enablebitvectors false +attribute[].enableonlybitvector false +attribute[].fastaccess false +attribute[].arity 8 +attribute[].lowerbound -9223372036854775808 +attribute[].upperbound 9223372036854775807 +attribute[].densepostinglistthreshold 0.4 +attribute[].tensortype "" +attribute[].imported false +attribute[].name "int_elem_map.value.name" +attribute[].datatype STRING +attribute[].collectiontype ARRAY +attribute[].removeifzero false +attribute[].createifnonexistent false +attribute[].fastsearch false +attribute[].huge false +attribute[].sortascending true +attribute[].sortfunction UCA +attribute[].sortstrength PRIMARY +attribute[].sortlocale "" +attribute[].enablebitvectors false +attribute[].enableonlybitvector false +attribute[].fastaccess false +attribute[].arity 8 +attribute[].lowerbound -9223372036854775808 +attribute[].upperbound 9223372036854775807 +attribute[].densepostinglistthreshold 0.4 +attribute[].tensortype "" +attribute[].imported false diff --git a/config-model/src/test/derived/map_of_struct_attribute/summary.cfg b/config-model/src/test/derived/map_of_struct_attribute/summary.cfg index 4e1e3aec8aa..f70025c8f02 100644 --- a/config-model/src/test/derived/map_of_struct_attribute/summary.cfg +++ b/config-model/src/test/derived/map_of_struct_attribute/summary.cfg @@ -1,7 +1,9 @@ -defaultsummaryid 653486243 -classes[].id 653486243 +defaultsummaryid 1131098132 +classes[].id 1131098132 classes[].name "default" -classes[].fields[].name "elem_map" +classes[].fields[].name "str_elem_map" +classes[].fields[].type "jsonstring" +classes[].fields[].name "int_elem_map" classes[].fields[].type "jsonstring" classes[].fields[].name "rankfeatures" classes[].fields[].type "featuredata" diff --git a/config-model/src/test/derived/map_of_struct_attribute/summarymap.cfg b/config-model/src/test/derived/map_of_struct_attribute/summarymap.cfg index ccfba719a96..1540b821ae1 100644 --- a/config-model/src/test/derived/map_of_struct_attribute/summarymap.cfg +++ b/config-model/src/test/derived/map_of_struct_attribute/summarymap.cfg @@ -1,5 +1,5 @@ defaultoutputclass -1 -override[].field "elem_map" +override[].field "str_elem_map" override[].command "attributecombiner" override[].arguments "" override[].field "rankfeatures" diff --git a/config-model/src/test/derived/map_of_struct_attribute/test.sd b/config-model/src/test/derived/map_of_struct_attribute/test.sd index cb2eac4ed78..e139a7f8168 100644 --- a/config-model/src/test/derived/map_of_struct_attribute/test.sd +++ b/config-model/src/test/derived/map_of_struct_attribute/test.sd @@ -4,7 +4,7 @@ search test { field name type string {} field weight type int {} } - field elem_map type map<string,elem> { + field str_elem_map type map<string,elem> { indexing: summary struct-field key { indexing: attribute @@ -16,5 +16,14 @@ search test { indexing: attribute } } + field int_elem_map type map<int,elem> { + indexing: summary + struct-field key { + indexing: attribute + } + struct-field value.name { + indexing: attribute + } + } } } |