diff options
37 files changed, 47 insertions, 543 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/SummaryClass.java b/config-model/src/main/java/com/yahoo/schema/derived/SummaryClass.java index b9355693da8..ec941eacce1 100644 --- a/config-model/src/main/java/com/yahoo/schema/derived/SummaryClass.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/SummaryClass.java @@ -113,7 +113,6 @@ public class SummaryClass extends Derived { for (SummaryClassField field : fields.values() ) { classBuilder.fields(new SummaryConfig.Classes.Fields.Builder(). name(field.getName()). - type(field.getType().getName()). command(field.getCommand()). source(field.getSource())); } diff --git a/config-model/src/test/derived/advanced/summary.cfg b/config-model/src/test/derived/advanced/summary.cfg index 11a73d6a90c..f73f832cf52 100644 --- a/config-model/src/test/derived/advanced/summary.cfg +++ b/config-model/src/test/derived/advanced/summary.cfg @@ -4,53 +4,41 @@ classes[].id 1580275499 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "debug" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "attributes" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "title_s" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "product" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "product3" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "mysummary" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 472092010 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "location_zcurve" -classes[].fields[].type "int64" classes[].fields[].command "attribute" classes[].fields[].source "location_zcurve" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/array_of_struct_attribute/summary.cfg b/config-model/src/test/derived/array_of_struct_attribute/summary.cfg index e62a8a5c39c..a463059d61b 100644 --- a/config-model/src/test/derived/array_of_struct_attribute/summary.cfg +++ b/config-model/src/test/derived/array_of_struct_attribute/summary.cfg @@ -4,33 +4,26 @@ classes[].id 252850086 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "elem_array" -classes[].fields[].type "jsonstring" classes[].fields[].command "attributecombiner" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 659145226 classes[].name "rename" classes[].omitsummaryfeatures false classes[].fields[].name "new_elem_array" -classes[].fields[].type "jsonstring" classes[].fields[].command "attributecombiner" classes[].fields[].source "elem_array" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/attributeprefetch/summary.cfg b/config-model/src/test/derived/attributeprefetch/summary.cfg index e2ed135c3a2..074d22f24e6 100644 --- a/config-model/src/test/derived/attributeprefetch/summary.cfg +++ b/config-model/src/test/derived/attributeprefetch/summary.cfg @@ -4,49 +4,38 @@ classes[].id 1151071433 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 1980470965 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "singlebyte" -classes[].fields[].type "byte" classes[].fields[].command "attribute" classes[].fields[].source "singlebyte" classes[].fields[].name "singleint" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "singleint" classes[].fields[].name "singlelong" -classes[].fields[].type "int64" classes[].fields[].command "attribute" classes[].fields[].source "singlelong" classes[].fields[].name "singlefloat" -classes[].fields[].type "float" classes[].fields[].command "attribute" classes[].fields[].source "singlefloat" classes[].fields[].name "singledouble" -classes[].fields[].type "double" classes[].fields[].command "attribute" classes[].fields[].source "singledouble" classes[].fields[].name "singlestring" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "singlestring" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/bolding_dynamic_summary/summary.cfg b/config-model/src/test/derived/bolding_dynamic_summary/summary.cfg index b056ada8bd5..3703bb8b218 100644 --- a/config-model/src/test/derived/bolding_dynamic_summary/summary.cfg +++ b/config-model/src/test/derived/bolding_dynamic_summary/summary.cfg @@ -4,89 +4,68 @@ classes[].id 1128441658 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "str_1" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "str_1" classes[].fields[].name "str_2" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "str_2" classes[].fields[].name "str_3" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "str_4" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "arr_1" -classes[].fields[].type "jsonstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "arr_1" classes[].fields[].name "arr_2" -classes[].fields[].type "jsonstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "arr_2" classes[].fields[].name "arr_3" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "arr_4" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "str_3_dyn" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "str_3_dyn" classes[].fields[].name "arr_3_dyn" -classes[].fields[].type "jsonstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "arr_3" classes[].fields[].name "str_4_bold" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "str_4_bold" classes[].fields[].name "arr_4_bold" -classes[].fields[].type "jsonstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "arr_4" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 2139497711 classes[].name "dyn" classes[].omitsummaryfeatures false classes[].fields[].name "str_3_dyn" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "str_3_dyn" classes[].fields[].name "arr_3_dyn" -classes[].fields[].type "jsonstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "arr_3" classes[].fields[].name "str_4_bold" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "str_4_bold" classes[].fields[].name "arr_4_bold" -classes[].fields[].type "jsonstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "arr_4" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/complex/summary.cfg b/config-model/src/test/derived/complex/summary.cfg index 1d6f7141635..8a3b1ee011d 100644 --- a/config-model/src/test/derived/complex/summary.cfg +++ b/config-model/src/test/derived/complex/summary.cfg @@ -4,77 +4,59 @@ classes[].id 1506848752 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "woe" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "exact" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "title" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "dyntitle" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "dyntitle" classes[].fields[].name "source" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "stringfield" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 128090024 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "year_sub" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "year_sub" classes[].fields[].name "prefixenabled" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "prefixenabled" classes[].fields[].name "fleeting2" -classes[].fields[].type "float" classes[].fields[].command "attribute" classes[].fields[].source "fleeting2" classes[].fields[].name "foundat" -classes[].fields[].type "int64" classes[].fields[].command "attribute" classes[].fields[].source "foundat" classes[].fields[].name "collapseby" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "collapseby" classes[].fields[].name "ts" -classes[].fields[].type "int64" classes[].fields[].command "attribute" classes[].fields[].source "ts" classes[].fields[].name "combineda" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "combineda" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/emptychild/summary.cfg b/config-model/src/test/derived/emptychild/summary.cfg index 5fe39cbb04c..429904b315b 100644 --- a/config-model/src/test/derived/emptychild/summary.cfg +++ b/config-model/src/test/derived/emptychild/summary.cfg @@ -4,33 +4,26 @@ classes[].id 1814603381 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "a1" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "a1" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 1490368133 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "a1" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "a1" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/emptydefault/summary.cfg b/config-model/src/test/derived/emptydefault/summary.cfg index c09b606210f..d857203953d 100644 --- a/config-model/src/test/derived/emptydefault/summary.cfg +++ b/config-model/src/test/derived/emptydefault/summary.cfg @@ -4,14 +4,11 @@ classes[].id 1151071433 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" diff --git a/config-model/src/test/derived/id/summary.cfg b/config-model/src/test/derived/id/summary.cfg index 203be8549b8..85a33142929 100644 --- a/config-model/src/test/derived/id/summary.cfg +++ b/config-model/src/test/derived/id/summary.cfg @@ -4,18 +4,14 @@ classes[].id 1814716401 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "uri" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" diff --git a/config-model/src/test/derived/imported_position_field/summary.cfg b/config-model/src/test/derived/imported_position_field/summary.cfg index c3f3e45e2f0..11f4a1a89f5 100644 --- a/config-model/src/test/derived/imported_position_field/summary.cfg +++ b/config-model/src/test/derived/imported_position_field/summary.cfg @@ -4,29 +4,23 @@ classes[].id 1570252291 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "parent_ref" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 1274088866 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/imported_position_field_summary/summary.cfg b/config-model/src/test/derived/imported_position_field_summary/summary.cfg index 06fca8c89a1..19b476f5801 100644 --- a/config-model/src/test/derived/imported_position_field_summary/summary.cfg +++ b/config-model/src/test/derived/imported_position_field_summary/summary.cfg @@ -4,48 +4,38 @@ classes[].id 697058562 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "parent_ref" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "my_pos" -classes[].fields[].type "jsonstring" classes[].fields[].command "geopos" classes[].fields[].source "my_pos_zcurve" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 656588065 classes[].name "mysummary" classes[].omitsummaryfeatures false classes[].fields[].name "my_pos" -classes[].fields[].type "jsonstring" classes[].fields[].command "geopos" classes[].fields[].source "my_pos_zcurve" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 1274088866 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/imported_struct_fields/summary.cfg b/config-model/src/test/derived/imported_struct_fields/summary.cfg index 46a6a7db64f..17e43de3314 100644 --- a/config-model/src/test/derived/imported_struct_fields/summary.cfg +++ b/config-model/src/test/derived/imported_struct_fields/summary.cfg @@ -4,79 +4,62 @@ classes[].id 1570252291 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "parent_ref" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 2126652894 classes[].name "mysummary" classes[].omitsummaryfeatures false classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].fields[].name "my_elem_array" -classes[].fields[].type "jsonstring" classes[].fields[].command "attributecombiner" classes[].fields[].source "" classes[].fields[].name "my_elem_map" -classes[].fields[].type "jsonstring" classes[].fields[].command "attributecombiner" classes[].fields[].source "" classes[].fields[].name "my_str_int_map" -classes[].fields[].type "jsonstring" classes[].fields[].command "attributecombiner" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 1629947863 classes[].name "filtered" classes[].omitsummaryfeatures false classes[].fields[].name "elem_array_filtered" -classes[].fields[].type "jsonstring" classes[].fields[].command "matchedattributeelementsfilter" classes[].fields[].source "my_elem_array" classes[].fields[].name "elem_map_filtered" -classes[].fields[].type "jsonstring" classes[].fields[].command "matchedattributeelementsfilter" classes[].fields[].source "my_elem_map" classes[].fields[].name "str_int_map_filtered" -classes[].fields[].type "jsonstring" classes[].fields[].command "matchedattributeelementsfilter" classes[].fields[].source "my_str_int_map" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 1274088866 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/importedfields/summary.cfg b/config-model/src/test/derived/importedfields/summary.cfg index 2614bea2092..ffff6f9daf6 100644 --- a/config-model/src/test/derived/importedfields/summary.cfg +++ b/config-model/src/test/derived/importedfields/summary.cfg @@ -4,72 +4,56 @@ classes[].id 1294344677 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "b_ref_with_summary" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 159551552 classes[].name "mysummary" classes[].omitsummaryfeatures false classes[].fields[].name "a_ref" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "b_ref_with_summary" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "my_int_field" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "my_int_field" classes[].fields[].name "my_string_field" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "my_string_field" classes[].fields[].name "my_int_array_field" -classes[].fields[].type "jsonstring" classes[].fields[].command "attribute" classes[].fields[].source "my_int_array_field" classes[].fields[].name "my_int_wset_field" -classes[].fields[].type "jsonstring" classes[].fields[].command "attribute" classes[].fields[].source "my_int_wset_field" classes[].fields[].name "my_ancient_int_field" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "my_ancient_int_field" classes[].fields[].name "my_filtered_int_array_field" -classes[].fields[].type "jsonstring" classes[].fields[].command "matchedattributeelementsfilter" classes[].fields[].source "my_int_array_field" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 1274088866 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/indexswitches/summary.cfg b/config-model/src/test/derived/indexswitches/summary.cfg index edc38aacf89..138c0d647d2 100644 --- a/config-model/src/test/derived/indexswitches/summary.cfg +++ b/config-model/src/test/derived/indexswitches/summary.cfg @@ -4,26 +4,20 @@ classes[].id 1698765342 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "source" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "title" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "descr" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" diff --git a/config-model/src/test/derived/inheritance/summary.cfg b/config-model/src/test/derived/inheritance/summary.cfg index 7615429bebf..225719cd8aa 100644 --- a/config-model/src/test/derived/inheritance/summary.cfg +++ b/config-model/src/test/derived/inheritance/summary.cfg @@ -4,41 +4,32 @@ classes[].id 1797992819 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "onlyfather" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 1608562186 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "onlygrandparent" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "onlygrandparent" classes[].fields[].name "overridden" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "overridden" classes[].fields[].name "onlymother" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "onlymother" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/inheritfromparent/summary.cfg b/config-model/src/test/derived/inheritfromparent/summary.cfg index 32719e81eb9..d3daacb9021 100644 --- a/config-model/src/test/derived/inheritfromparent/summary.cfg +++ b/config-model/src/test/derived/inheritfromparent/summary.cfg @@ -4,33 +4,26 @@ classes[].id 1561972036 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "weight" -classes[].fields[].type "float" classes[].fields[].command "attribute" classes[].fields[].source "weight" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 571976254 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "weight" -classes[].fields[].type "float" classes[].fields[].command "attribute" classes[].fields[].source "weight" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/integerattributetostringindex/summary.cfg b/config-model/src/test/derived/integerattributetostringindex/summary.cfg index 87a6539de56..cab7f72a42d 100644 --- a/config-model/src/test/derived/integerattributetostringindex/summary.cfg +++ b/config-model/src/test/derived/integerattributetostringindex/summary.cfg @@ -4,53 +4,41 @@ classes[].id 1195656216 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "attinx" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "attinx" classes[].fields[].name "artist" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "artist" classes[].fields[].name "title" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "year" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "year" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 1706878063 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "attinx" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "attinx" classes[].fields[].name "artist" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "artist" classes[].fields[].name "year" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "year" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/map_attribute/summary.cfg b/config-model/src/test/derived/map_attribute/summary.cfg index a18ca43bbd7..7d78bc1a0f7 100644 --- a/config-model/src/test/derived/map_attribute/summary.cfg +++ b/config-model/src/test/derived/map_attribute/summary.cfg @@ -4,22 +4,17 @@ classes[].id 1376056200 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "str_map" -classes[].fields[].type "jsonstring" classes[].fields[].command "attributecombiner" classes[].fields[].source "" classes[].fields[].name "int_map" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" 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 c871c4bb97e..5a6f1b7c7e8 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 @@ -4,45 +4,35 @@ classes[].id 1048168773 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "str_elem_map" -classes[].fields[].type "jsonstring" classes[].fields[].command "attributecombiner" classes[].fields[].source "" classes[].fields[].name "int_elem_map" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "new_int_elem_map" -classes[].fields[].type "jsonstring" classes[].fields[].command "copy" classes[].fields[].source "int_elem_map" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 1424421039 classes[].name "rename" classes[].omitsummaryfeatures false classes[].fields[].name "new_str_elem_map" -classes[].fields[].type "jsonstring" classes[].fields[].command "attributecombiner" classes[].fields[].source "str_elem_map" classes[].fields[].name "new_int_elem_map" -classes[].fields[].type "jsonstring" classes[].fields[].command "copy" classes[].fields[].source "int_elem_map" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/mlr/summary.cfg b/config-model/src/test/derived/mlr/summary.cfg index 8087955a206..29e3333e321 100644 --- a/config-model/src/test/derived/mlr/summary.cfg +++ b/config-model/src/test/derived/mlr/summary.cfg @@ -4,41 +4,32 @@ classes[].id 1868876861 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "a" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "a" classes[].fields[].name "b" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 1944325986 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "a" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "a" classes[].fields[].name "ranklog" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "ranklog" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/multiplesummaries/summary.cfg b/config-model/src/test/derived/multiplesummaries/summary.cfg index 17d7040bc78..72543b46c8e 100644 --- a/config-model/src/test/derived/multiplesummaries/summary.cfg +++ b/config-model/src/test/derived/multiplesummaries/summary.cfg @@ -4,351 +4,272 @@ classes[].id 2052850997 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "loc_pos" -classes[].fields[].type "jsonstring" classes[].fields[].command "geopos" classes[].fields[].source "loc_pos_zcurve" classes[].fields[].name "a" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "a" classes[].fields[].name "adynamic" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "adynamic" classes[].fields[].name "abolded" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "abolded" classes[].fields[].name "b" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "c" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "c" classes[].fields[].name "d" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "d" classes[].fields[].name "dynamice" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "dynamice" classes[].fields[].name "f" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "g" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "h" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "e" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "adynamic2" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "adynamic2" classes[].fields[].name "alltags" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "sometags" -classes[].fields[].type "jsonstring" classes[].fields[].command "matchedelementsfilter" classes[].fields[].source "mytags" classes[].fields[].name "anotherb" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "abolded2" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "abolded2" classes[].fields[].name "aboldeddynamic" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "aboldeddynamic" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 783153771 classes[].name "third" classes[].omitsummaryfeatures false classes[].fields[].name "a" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "a" classes[].fields[].name "adynamic" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "adynamic" classes[].fields[].name "d" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "d" classes[].fields[].name "e" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "f" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "g" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "h" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 815922035 classes[].name "attributesonly1" classes[].omitsummaryfeatures false classes[].fields[].name "a" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "a" classes[].fields[].name "c" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "c" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 1308077923 classes[].name "notattributesonly1" classes[].omitsummaryfeatures false classes[].fields[].name "adynamic" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "adynamic" classes[].fields[].name "c" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "c" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 1609068631 classes[].name "anothernotattributesonly2" classes[].omitsummaryfeatures false classes[].fields[].name "adynamic2" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "adynamic2" classes[].fields[].name "c" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "c" classes[].fields[].name "alltags" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "sometags" -classes[].fields[].type "jsonstring" classes[].fields[].command "matchedelementsfilter" classes[].fields[].source "mytags" classes[].fields[].name "anothera" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "a" classes[].fields[].name "anotherb" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 686755772 classes[].name "notattributesonly3" classes[].omitsummaryfeatures false classes[].fields[].name "a" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "a" classes[].fields[].name "d" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "d" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 1711750363 classes[].name "attributesonly2" classes[].omitsummaryfeatures false classes[].fields[].name "anotdynamic" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "adynamic" classes[].fields[].name "c" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "c" classes[].fields[].name "loc_position" -classes[].fields[].type "int64" classes[].fields[].command "attribute" classes[].fields[].source "loc_pos_zcurve" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 1510953467 classes[].name "attributesonly3" classes[].omitsummaryfeatures false classes[].fields[].name "a" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "a" classes[].fields[].name "anotbolded" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "a" classes[].fields[].name "loc_pos_zcurve" -classes[].fields[].type "int64" classes[].fields[].command "attribute" classes[].fields[].source "loc_pos_zcurve" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 923824943 classes[].name "notattributesonly4" classes[].omitsummaryfeatures false classes[].fields[].name "abolded2" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "abolded2" classes[].fields[].name "c" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "c" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 552611075 classes[].name "notattributesonly5" classes[].omitsummaryfeatures false classes[].fields[].name "aboldeddynamic" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "aboldeddynamic" classes[].fields[].name "c" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "c" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 146047714 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "loc_pos_zcurve" -classes[].fields[].type "int64" classes[].fields[].command "attribute" classes[].fields[].source "loc_pos_zcurve" classes[].fields[].name "a" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "a" classes[].fields[].name "c" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "c" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 324773027 classes[].name "second" classes[].omitsummaryfeatures false classes[].fields[].name "a" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "a" classes[].fields[].name "adynamic" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "adynamic" classes[].fields[].name "c" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "c" classes[].fields[].name "f" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/music/summary.cfg b/config-model/src/test/derived/music/summary.cfg index 10bb238dca7..d15c1cdac06 100644 --- a/config-model/src/test/derived/music/summary.cfg +++ b/config-model/src/test/derived/music/summary.cfg @@ -4,201 +4,152 @@ classes[].id 2086497905 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "bgndata" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "bgndata" classes[].fields[].name "sales" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "sales" classes[].fields[].name "pto" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "pto" classes[].fields[].name "mid" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "mid" classes[].fields[].name "ew" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "ew" classes[].fields[].name "surl" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "userrate" -classes[].fields[].type "integer" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "pid" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "weight" -classes[].fields[].type "float" classes[].fields[].command "attribute" classes[].fields[].source "weight" classes[].fields[].name "url" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "isbn" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "fmt" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "albumid" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "disp_song" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "song" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "song" classes[].fields[].name "pfrom" -classes[].fields[].type "integer" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "bgnpfrom" -classes[].fields[].type "float" classes[].fields[].command "attribute" classes[].fields[].source "bgnpfrom" classes[].fields[].name "categories" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "data" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "numreview" -classes[].fields[].type "integer" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "bgnsellers" -classes[].fields[].type "integer" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "image" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "artist" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "artistspid" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "title" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "newestedition" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "newestedition" classes[].fields[].name "bgnpto" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "bgnpto" classes[].fields[].name "year" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "year" classes[].fields[].name "did" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "did" classes[].fields[].name "scorekey" -classes[].fields[].type "integer" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "cbid" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "cbid" classes[].fields[].name "metalvalue" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "hiphopvalue" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "powermetalvalue" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "progvalue" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 2060710706 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "sales" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "sales" classes[].fields[].name "pto" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "pto" classes[].fields[].name "mid" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "mid" classes[].fields[].name "weight" -classes[].fields[].type "float" classes[].fields[].command "attribute" classes[].fields[].source "weight" classes[].fields[].name "bgnpfrom" -classes[].fields[].type "float" classes[].fields[].command "attribute" classes[].fields[].source "bgnpfrom" classes[].fields[].name "newestedition" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "newestedition" classes[].fields[].name "year" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "year" classes[].fields[].name "did" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "did" classes[].fields[].name "cbid" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "cbid" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/newrank/summary.cfg b/config-model/src/test/derived/newrank/summary.cfg index 79e0aa2ce6c..a7bd5e3b2f9 100644 --- a/config-model/src/test/derived/newrank/summary.cfg +++ b/config-model/src/test/derived/newrank/summary.cfg @@ -4,189 +4,143 @@ classes[].id 912980235 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "bgndata" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "bgndata" classes[].fields[].name "sales" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "sales" classes[].fields[].name "pto" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "pto" classes[].fields[].name "mid" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "mid" classes[].fields[].name "ew" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "ew" classes[].fields[].name "surl" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "userrate" -classes[].fields[].type "integer" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "pid" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "weight" -classes[].fields[].type "float" classes[].fields[].command "attribute" classes[].fields[].source "weight" classes[].fields[].name "url" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "isbn" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "fmt" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "albumid" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "disp_song" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "song" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "song" classes[].fields[].name "pfrom" -classes[].fields[].type "integer" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "bgnpfrom" -classes[].fields[].type "float" classes[].fields[].command "attribute" classes[].fields[].source "bgnpfrom" classes[].fields[].name "categories" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "data" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "numreview" -classes[].fields[].type "integer" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "bgnsellers" -classes[].fields[].type "integer" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "image" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "artist" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "artistspid" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "title" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "newestedition" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "newestedition" classes[].fields[].name "bgnpto" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "bgnpto" classes[].fields[].name "year" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "year" classes[].fields[].name "did" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "did" classes[].fields[].name "scorekey" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "scorekey" classes[].fields[].name "cbid" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "cbid" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 1606815285 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "sales" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "sales" classes[].fields[].name "pto" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "pto" classes[].fields[].name "mid" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "mid" classes[].fields[].name "weight" -classes[].fields[].type "float" classes[].fields[].command "attribute" classes[].fields[].source "weight" classes[].fields[].name "bgnpfrom" -classes[].fields[].type "float" classes[].fields[].command "attribute" classes[].fields[].source "bgnpfrom" classes[].fields[].name "newestedition" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "newestedition" classes[].fields[].name "year" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "year" classes[].fields[].name "did" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "did" classes[].fields[].name "scorekey" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "scorekey" classes[].fields[].name "cbid" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "cbid" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/position_nosummary/summary.cfg b/config-model/src/test/derived/position_nosummary/summary.cfg index cda3a7df60f..9dd03412aa6 100644 --- a/config-model/src/test/derived/position_nosummary/summary.cfg +++ b/config-model/src/test/derived/position_nosummary/summary.cfg @@ -4,29 +4,23 @@ classes[].id 1151071433 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 1530141163 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "pos_zcurve" -classes[].fields[].type "int64" classes[].fields[].command "attribute" classes[].fields[].source "pos_zcurve" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/position_summary/summary.cfg b/config-model/src/test/derived/position_summary/summary.cfg index ca26f898b1d..eb3f9913623 100644 --- a/config-model/src/test/derived/position_summary/summary.cfg +++ b/config-model/src/test/derived/position_summary/summary.cfg @@ -4,33 +4,26 @@ classes[].id 644855547 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "pos" -classes[].fields[].type "jsonstring" classes[].fields[].command "geopos" classes[].fields[].source "pos_zcurve" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 1530141163 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "pos_zcurve" -classes[].fields[].type "int64" classes[].fields[].command "attribute" classes[].fields[].source "pos_zcurve" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/predicate_attribute/summary.cfg b/config-model/src/test/derived/predicate_attribute/summary.cfg index 88a0828f9e1..fed16602199 100644 --- a/config-model/src/test/derived/predicate_attribute/summary.cfg +++ b/config-model/src/test/derived/predicate_attribute/summary.cfg @@ -4,29 +4,23 @@ classes[].id 1391971216 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "some_predicate_field" -classes[].fields[].type "string" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 1274088866 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/rankingexpression/summary.cfg b/config-model/src/test/derived/rankingexpression/summary.cfg index 0dc717c8993..1c1453a8a89 100644 --- a/config-model/src/test/derived/rankingexpression/summary.cfg +++ b/config-model/src/test/derived/rankingexpression/summary.cfg @@ -4,77 +4,59 @@ classes[].id 1753207254 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "artist" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "title" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "surl" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "year" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "year" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 1736696699 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "year" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "year" classes[].fields[].name "foo1" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "foo1" classes[].fields[].name "foo2" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "foo2" classes[].fields[].name "foo3" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "foo3" classes[].fields[].name "foo4" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "foo4" classes[].fields[].name "bar1" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "bar1" classes[].fields[].name "bar2" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "bar2" classes[].fields[].name "bar3" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "bar3" classes[].fields[].name "bar4" -classes[].fields[].type "integer" classes[].fields[].command "attribute" classes[].fields[].source "bar4" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/ranktypes/summary.cfg b/config-model/src/test/derived/ranktypes/summary.cfg index 5499349184b..3d48e71f29b 100644 --- a/config-model/src/test/derived/ranktypes/summary.cfg +++ b/config-model/src/test/derived/ranktypes/summary.cfg @@ -4,22 +4,17 @@ classes[].id 1567556360 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "title" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "descr" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" diff --git a/config-model/src/test/derived/reference_fields/summary.cfg b/config-model/src/test/derived/reference_fields/summary.cfg index 9e70d42d874..c7b5d047368 100644 --- a/config-model/src/test/derived/reference_fields/summary.cfg +++ b/config-model/src/test/derived/reference_fields/summary.cfg @@ -4,44 +4,35 @@ classes[].id 1987541865 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "campaign_ref" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 428144659 classes[].name "explicit_summary" classes[].omitsummaryfeatures false classes[].fields[].name "yet_another_ref" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 1274088866 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/schemainheritance/summary.cfg b/config-model/src/test/derived/schemainheritance/summary.cfg index d774250f209..1b1be82a6cb 100644 --- a/config-model/src/test/derived/schemainheritance/summary.cfg +++ b/config-model/src/test/derived/schemainheritance/summary.cfg @@ -4,83 +4,65 @@ classes[].id 1313596701 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "parent_field" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "parent_field" classes[].fields[].name "child_field" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "child_field" classes[].fields[].name "pf1" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "cf1" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 2134223620 classes[].name "parent_summary" classes[].omitsummaryfeatures false classes[].fields[].name "pf1" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 524210908 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "parent_field" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "parent_field" classes[].fields[].name "child_field" -classes[].fields[].type "longstring" classes[].fields[].command "attribute" classes[].fields[].source "child_field" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].id 1486475170 classes[].name "child_summary" classes[].omitsummaryfeatures false classes[].fields[].name "pf1" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "cf1" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" diff --git a/config-model/src/test/derived/streamingstruct/summary.cfg b/config-model/src/test/derived/streamingstruct/summary.cfg index 7ed8cb3a192..f648eca0a86 100644 --- a/config-model/src/test/derived/streamingstruct/summary.cfg +++ b/config-model/src/test/derived/streamingstruct/summary.cfg @@ -4,97 +4,74 @@ classes[].id 569269436 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "coupleof" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "anothersummaryfield" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "a" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "m" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "b" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "c" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "c2" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "c3" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "n" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "array1" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "array2" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "array3" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "subject" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "g" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "g" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "snippet" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "snippet" classes[].fields[].name "snippet2" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 109252281 classes[].name "summ" classes[].omitsummaryfeatures false classes[].fields[].name "snippet" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "snippet" classes[].fields[].name "snippet2" -classes[].fields[].type "longstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/streamingstructdefault/summary.cfg b/config-model/src/test/derived/streamingstructdefault/summary.cfg index e06f934554d..c27730aeb48 100644 --- a/config-model/src/test/derived/streamingstructdefault/summary.cfg +++ b/config-model/src/test/derived/streamingstructdefault/summary.cfg @@ -4,26 +4,20 @@ classes[].id 718801936 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "sum1" -classes[].fields[].type "longstring" classes[].fields[].command "dynamicteaser" classes[].fields[].source "sum1" classes[].fields[].name "f1" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "f2" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" diff --git a/config-model/src/test/derived/tensor/summary.cfg b/config-model/src/test/derived/tensor/summary.cfg index 444ab70d2a7..1d57b7b2282 100644 --- a/config-model/src/test/derived/tensor/summary.cfg +++ b/config-model/src/test/derived/tensor/summary.cfg @@ -4,45 +4,35 @@ classes[].id 898020074 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "f1" -classes[].fields[].type "tensor" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "f3" -classes[].fields[].type "tensor" classes[].fields[].command "attribute" classes[].fields[].source "f3" classes[].fields[].name "f4" -classes[].fields[].type "tensor" classes[].fields[].command "attribute" classes[].fields[].source "f4" classes[].fields[].name "f5" -classes[].fields[].type "tensor" classes[].fields[].command "attribute" classes[].fields[].source "f5" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 219619290 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "f6" -classes[].fields[].type "float" classes[].fields[].command "attribute" classes[].fields[].source "f6" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/config-model/src/test/derived/types/summary.cfg b/config-model/src/test/derived/types/summary.cfg index 6b2085d0975..ab57f32cebc 100644 --- a/config-model/src/test/derived/types/summary.cfg +++ b/config-model/src/test/derived/types/summary.cfg @@ -4,81 +4,62 @@ classes[].id 1131946680 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "abyte" -classes[].fields[].type "byte" classes[].fields[].command "attribute" classes[].fields[].source "abyte" classes[].fields[].name "along" -classes[].fields[].type "int64" classes[].fields[].command "attribute" classes[].fields[].source "along" classes[].fields[].name "abool" -classes[].fields[].type "bool" classes[].fields[].command "attribute" classes[].fields[].source "abool" classes[].fields[].name "ashortfloat" -classes[].fields[].type "float16" classes[].fields[].command "attribute" classes[].fields[].source "ashortfloat" classes[].fields[].name "tagfield" -classes[].fields[].type "jsonstring" classes[].fields[].command "attribute" classes[].fields[].source "tagfield" classes[].fields[].name "stringmapfield" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "album0" -classes[].fields[].type "jsonstring" classes[].fields[].command "" classes[].fields[].source "" classes[].fields[].name "album1" -classes[].fields[].type "jsonstring" classes[].fields[].command "attribute" classes[].fields[].source "album1" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" classes[].fields[].name "documentid" -classes[].fields[].type "longstring" classes[].fields[].command "documentid" classes[].fields[].source "" classes[].id 1027812395 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false classes[].fields[].name "other" -classes[].fields[].type "int64" classes[].fields[].command "attribute" classes[].fields[].source "other" classes[].fields[].name "abyte" -classes[].fields[].type "byte" classes[].fields[].command "attribute" classes[].fields[].source "abyte" classes[].fields[].name "along" -classes[].fields[].type "int64" classes[].fields[].command "attribute" classes[].fields[].source "along" classes[].fields[].name "abool" -classes[].fields[].type "bool" classes[].fields[].command "attribute" classes[].fields[].source "abool" classes[].fields[].name "ashortfloat" -classes[].fields[].type "float16" classes[].fields[].command "attribute" classes[].fields[].source "ashortfloat" classes[].fields[].name "juletre" -classes[].fields[].type "int64" classes[].fields[].command "attribute" classes[].fields[].source "juletre" classes[].fields[].name "rankfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "rankfeatures" classes[].fields[].source "" classes[].fields[].name "summaryfeatures" -classes[].fields[].type "featuredata" classes[].fields[].command "summaryfeatures" classes[].fields[].source "" diff --git a/configdefinitions/src/vespa/summary.def b/configdefinitions/src/vespa/summary.def index 29438fda3b6..0f6232153c7 100644 --- a/configdefinitions/src/vespa/summary.def +++ b/configdefinitions/src/vespa/summary.def @@ -9,7 +9,6 @@ classes[].id int classes[].name string classes[].omitsummaryfeatures bool default=false classes[].fields[].name string -classes[].fields[].type string # The name of the command that is writing this field. # See docsumconfig.cpp for all supported commands (DocsumFieldWriter implementations). classes[].fields[].command string default="" diff --git a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp b/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp index d7904881e4d..6051ef6efb7 100644 --- a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp @@ -28,7 +28,7 @@ using namespace search::docsummary; namespace vespa::config::search::internal { std::ostream &operator<<(std::ostream &os, const SummaryConfig::Classes::Fields &field) { - return os << "{name=" << field.name << ", type=" << field.type << ", command=" << field.command << ", source=" << field.source << "}"; + return os << "{name=" << field.name << ", command=" << field.command << ", source=" << field.source << "}"; } } @@ -96,19 +96,17 @@ AttributesConfig::Attribute make_fa(const AttributesConfig::Attribute &cfg) return attr; } -SummaryConfig::Classes::Fields make_summary_field(const vespalib::string &name, const vespalib::string &type) +SummaryConfig::Classes::Fields make_summary_field(const vespalib::string &name) { SummaryConfig::Classes::Fields field; field.name = name; - field.type = type; return field; } -SummaryConfig::Classes::Fields make_summary_field(const vespalib::string &name, const vespalib::string &type, const vespalib::string& command, const vespalib::string& source) +SummaryConfig::Classes::Fields make_summary_field(const vespalib::string &name, const vespalib::string& command, const vespalib::string& source) { SummaryConfig::Classes::Fields field; field.name = name; - field.type = type; field.command = command; field.source = source; return field; @@ -196,52 +194,52 @@ TEST_F(DelayerTest, require_that_empty_config_is_ok) TEST_F(DelayerTest, require_that_simple_attribute_config_is_ok) { setup(attrCfg({make_int32_sv_cfg()}), attrCfg({make_int32_sv_cfg()}), - sCfg({make_summary_field("a", "integer", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummaryConfig({make_summary_field("a", "integer", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_if_field_type_is_unchanged) { addFields({"a"}); setup(attrCfg({}), attrCfg({make_int32_sv_cfg()}), - sCfg({make_summary_field("a", "integer", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "integer")}); + assertSummaryConfig({make_summary_field("a")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_if_field_type_is_unchanged_geopos_override) { addFields({"a"}); setup(attrCfg({}), attrCfg({make_int32_sv_cfg()}), - sCfg({make_summary_field("a", "integer", command::geo_position, "a")})); + sCfg({make_summary_field("a", command::geo_position, "a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "integer", command::geo_position, "a")}); + assertSummaryConfig({make_summary_field("a", command::geo_position, "a")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_if_field_type_is_unchanged_mapped_summary) { addFields({"a"}); setup(attrCfg({}), attrCfg({make_int32_sv_cfg()}), - sCfg({make_summary_field("a_mapped", "integer", command::attribute, "a")})); + sCfg({make_summary_field("a_mapped", command::attribute, "a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a_mapped", "integer", command::copy, "a")}); + assertSummaryConfig({make_summary_field("a_mapped", command::copy, "a")}); } TEST_F(DelayerTest, require_that_adding_attribute_is_not_delayed_if_field_type_changed) { setup(attrCfg({}), attrCfg({make_int32_sv_cfg()}), - sCfg({make_summary_field("a", "integer", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummaryConfig({make_summary_field("a", "integer", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_delayed_if_field_type_is_unchanged) { addFields({"a"}); - setup(attrCfg({make_int32_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a", "integer")})); + setup(attrCfg({make_int32_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a")})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummaryConfig({make_summary_field("a", "integer", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_summary_map_override_is_removed_when_summary_aspect_is_removed_even_if_removing_attribute_aspect_is_delayed) @@ -262,18 +260,18 @@ TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_delayed_if_field_t TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_not_delayed_if_field_type_changed) { - setup(attrCfg({make_int32_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a", "integer")})); + setup(attrCfg({make_int32_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "integer")}); + assertSummaryConfig({make_summary_field("a")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_not_delayed_if_also_indexed) { addFields({"a"}); addOldIndexField("a"); - setup(attrCfg({make_string_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a", "string")})); + setup(attrCfg({make_string_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "string")}); + assertSummaryConfig({make_summary_field("a")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_for_tensor_field) @@ -281,61 +279,61 @@ TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_for_tensor_f addFields({"a"}); setup(attrCfg({}), attrCfg({make_tensor_cfg("tensor(x[10])")}), - sCfg({make_summary_field("a", "tensor", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "tensor")}); + assertSummaryConfig({make_summary_field("a")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_delayed_for_tensor_field) { addFields({"a"}); setup(attrCfg({make_tensor_cfg("tensor(x[10])")}), - attrCfg({}), sCfg({make_summary_field("a", "tensor")})); + attrCfg({}), sCfg({make_summary_field("a")})); assertAttributeConfig({make_tensor_cfg("tensor(x[10])")}); - assertSummaryConfig({make_summary_field("a", "tensor", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_not_delayed_for_predicate) { addFields({"a"}); - setup(attrCfg({make_predicate_cfg(4)}), attrCfg({}), sCfg({make_summary_field("a", "string")})); + setup(attrCfg({make_predicate_cfg(4)}), attrCfg({}), sCfg({make_summary_field("a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "string")}); + assertSummaryConfig({make_summary_field("a")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_not_delayed_for_reference) { addFields({"a"}); - setup(attrCfg({make_reference_cfg()}), attrCfg({}), sCfg({make_summary_field("a", "longstring")})); + setup(attrCfg({make_reference_cfg()}), attrCfg({}), sCfg({make_summary_field("a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "longstring")}); + assertSummaryConfig({make_summary_field("a")}); } TEST_F(DelayerTest, require_that_fast_access_flag_change_is_delayed_false_true_edge) { addFields({"a"}); setup(attrCfg({make_int32_sv_cfg()}), attrCfg({make_fa(make_int32_sv_cfg())}), - sCfg({make_summary_field("a", "integer", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummaryConfig({make_summary_field("a", "integer", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_fast_access_flag_change_is_delayed_true_false_edge) { addFields({"a"}); setup(attrCfg({make_fa(make_int32_sv_cfg())}), attrCfg({make_int32_sv_cfg()}), - sCfg({make_summary_field("a", "integer", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_fa(make_int32_sv_cfg())}); - assertSummaryConfig({make_summary_field("a", "integer", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_fast_access_flag_change_is_delayed_false_true_edge_on_tensor_attribute) { addFields({"a"}); setup(attrCfg({make_tensor_cfg("tensor(x[10])")}), attrCfg({make_fa(make_tensor_cfg("tensor(x[10])"))}), - sCfg({make_summary_field("a", "tensor", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_tensor_cfg("tensor(x[10])")}); - assertSummaryConfig({make_summary_field("a", "tensor", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_fast_access_flag_change_is_delayed_true_false_edge_on_tensor_attribute) @@ -343,9 +341,9 @@ TEST_F(DelayerTest, require_that_fast_access_flag_change_is_delayed_true_false_e addFields({"a"}); setup(attrCfg({make_fa(make_tensor_cfg("tensor(x[10])"))}), attrCfg({make_tensor_cfg("tensor(x[10])")}), - sCfg({make_summary_field("a", "tensor", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_fa(make_tensor_cfg("tensor(x[10])"))}); - assertSummaryConfig({make_summary_field("a", "tensor", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_fast_access_flag_change_is_not_delayed_true_false_edge_on_string_attribute_indexed_field) @@ -353,45 +351,45 @@ TEST_F(DelayerTest, require_that_fast_access_flag_change_is_not_delayed_true_fal addFields({"a"}); addOldIndexField("a"); setup(attrCfg({make_fa(make_string_sv_cfg())}), attrCfg({make_string_sv_cfg()}), - sCfg({make_summary_field("a", "string", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_string_sv_cfg()}); - assertSummaryConfig({make_summary_field("a", "string", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_to_struct_field_is_not_delayed_if_field_type_is_changed) { setup(attrCfg({}), attrCfg({make_int32_sv_cfg("array.a")}), - sCfg({make_summary_field("array", "jsonstring", command::attribute_combiner, "array")})); + sCfg({make_summary_field("array", command::attribute_combiner, "array")})); assertAttributeConfig({make_int32_sv_cfg("array.a")}); - assertSummaryConfig({make_summary_field("array", "jsonstring", command::attribute_combiner, "array")}); + assertSummaryConfig({make_summary_field("array", command::attribute_combiner, "array")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_to_struct_field_is_delayed_if_field_type_is_unchanged) { addFields({"array.a"}); setup(attrCfg({}), attrCfg({make_int32_sv_cfg("array.a")}), - sCfg({make_summary_field("array", "jsonstring", command::attribute_combiner, "array")})); + sCfg({make_summary_field("array", command::attribute_combiner, "array")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("array", "jsonstring")}); + assertSummaryConfig({make_summary_field("array")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_from_struct_field_is_not_delayed) { addFields({"array.a"}); - setup(attrCfg({make_int32_sv_cfg("array.a")}), attrCfg({}), sCfg({make_summary_field("array", "jsonstring")})); + setup(attrCfg({make_int32_sv_cfg("array.a")}), attrCfg({}), sCfg({make_summary_field("array")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("array", "jsonstring")}); + assertSummaryConfig({make_summary_field("array")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_to_struct_field_is_delayed_if_field_type_is_unchanged_with_filtering_docsum) { addFields({"array.a"}); setup(attrCfg({}), attrCfg({make_int32_sv_cfg("array.a")}), - sCfg({make_summary_field("array", "jsonstring", command::attribute_combiner, "array"), - make_summary_field("array_filtered", "jsonstring", command::matched_attribute_elements_filter, "array")})); + sCfg({make_summary_field("array", command::attribute_combiner, "array"), + make_summary_field("array_filtered", command::matched_attribute_elements_filter, "array")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("array", "jsonstring"), - make_summary_field("array_filtered", "jsonstring", command::matched_elements_filter, "array")}); + assertSummaryConfig({make_summary_field("array"), + make_summary_field("array_filtered", command::matched_elements_filter, "array")}); } } diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp index 619160ad0d9..c7e060a9269 100644 --- a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp @@ -108,7 +108,6 @@ public: if (hasField) { builder.classes.back().fields.resize(1); builder.classes.back().fields.back().name = "my_attribute"; - builder.classes.back().fields.back().type = "integer"; if (has_attribute) { builder.classes.back().fields.back().command = "attribute"; builder.classes.back().fields.back().source = "my_attribute"; |