diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-04-28 21:44:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-28 21:44:38 +0200 |
commit | 415c02613c96c081e86a665a51a667b0f95935d7 (patch) | |
tree | 85020e1e55cc4ff0af6509deb120d64c7ff310bc | |
parent | 4c10a5ef8316f8e2afeca2ba325d49e385b3b6df (diff) | |
parent | 899d1d2750f9b35699c45bd0626f8230c92622ba (diff) |
Merge pull request #22344 from vespa-engine/arnej/prepare-flag-flips
Arnej/prepare flag flips
37 files changed, 90 insertions, 108 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java index 86f1a9eb9f4..4ef9c8b366c 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java @@ -73,9 +73,9 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private int persistenceThrottlingWindowSize = -1; private double persistenceThrottlingWsResizeRate = 3.0; private boolean persistenceThrottlingOfMergeFeedOps = true; - private boolean useV8GeoPositions = false; + private boolean useV8GeoPositions = true; private List<String> environmentVariables = List.of(); - private boolean avoidRenamingSummaryFeatures = false; + private boolean avoidRenamingSummaryFeatures = true; private boolean experimentalSdParsing = true; private Architecture adminClusterNodeResourcesArchitecture = Architecture.getDefault(); diff --git a/config-model/src/test/derived/advanced/summary.cfg b/config-model/src/test/derived/advanced/summary.cfg index e4845c1994e..18d67a9ea84 100644 --- a/config-model/src/test/derived/advanced/summary.cfg +++ b/config-model/src/test/derived/advanced/summary.cfg @@ -1,6 +1,6 @@ -defaultsummaryid 1271952241 -usev8geopositions false -classes[].id 1271952241 +defaultsummaryid 1580275499 +usev8geopositions true +classes[].id 1580275499 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "debug" @@ -13,10 +13,6 @@ classes[].fields[].name "product" classes[].fields[].type "longstring" classes[].fields[].name "product3" classes[].fields[].type "longstring" -classes[].fields[].name "location.position" -classes[].fields[].type "xmlstring" -classes[].fields[].name "location.distance" -classes[].fields[].type "integer" classes[].fields[].name "mysummary" classes[].fields[].type "longstring" classes[].fields[].name "rankfeatures" diff --git a/config-model/src/test/derived/advanced/summarymap.cfg b/config-model/src/test/derived/advanced/summarymap.cfg index 23e2b6d30da..31cc15f07db 100644 --- a/config-model/src/test/derived/advanced/summarymap.cfg +++ b/config-model/src/test/derived/advanced/summarymap.cfg @@ -1,10 +1,4 @@ defaultoutputclass -1 -override[].field "location.position" -override[].command "positions" -override[].arguments "location_zcurve" -override[].field "location.distance" -override[].command "absdist" -override[].arguments "location_zcurve" override[].field "rankfeatures" override[].command "rankfeatures" override[].arguments "" 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 e750d1454e8..3f0994cf2bd 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 @@ -1,5 +1,5 @@ defaultsummaryid 252850086 -usev8geopositions false +usev8geopositions true classes[].id 252850086 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/attributeprefetch/summary.cfg b/config-model/src/test/derived/attributeprefetch/summary.cfg index f52952e2871..7fabb674ebd 100644 --- a/config-model/src/test/derived/attributeprefetch/summary.cfg +++ b/config-model/src/test/derived/attributeprefetch/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1151071433 -usev8geopositions false +usev8geopositions true classes[].id 1151071433 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/complex/summary.cfg b/config-model/src/test/derived/complex/summary.cfg index 1eeef44cd54..44b97327ee9 100644 --- a/config-model/src/test/derived/complex/summary.cfg +++ b/config-model/src/test/derived/complex/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1506848752 -usev8geopositions false +usev8geopositions true classes[].id 1506848752 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/emptychild/summary.cfg b/config-model/src/test/derived/emptychild/summary.cfg index 733fa1fde54..116bad51740 100644 --- a/config-model/src/test/derived/emptychild/summary.cfg +++ b/config-model/src/test/derived/emptychild/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1814603381 -usev8geopositions false +usev8geopositions true classes[].id 1814603381 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/emptydefault/summary.cfg b/config-model/src/test/derived/emptydefault/summary.cfg index 5aacec1d0b6..f1a858d2d1e 100644 --- a/config-model/src/test/derived/emptydefault/summary.cfg +++ b/config-model/src/test/derived/emptydefault/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1151071433 -usev8geopositions false +usev8geopositions true classes[].id 1151071433 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/id/summary.cfg b/config-model/src/test/derived/id/summary.cfg index f7e9f6a239f..6880a8a7bd5 100644 --- a/config-model/src/test/derived/id/summary.cfg +++ b/config-model/src/test/derived/id/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1814716401 -usev8geopositions false +usev8geopositions true classes[].id 1814716401 classes[].name "default" classes[].omitsummaryfeatures false 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 722443641cd..b324b4cd8e4 100644 --- a/config-model/src/test/derived/imported_position_field/summary.cfg +++ b/config-model/src/test/derived/imported_position_field/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1570252291 -usev8geopositions false +usev8geopositions true classes[].id 1570252291 classes[].name "default" classes[].omitsummaryfeatures false 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 0642382aabe..cf80a3f31d0 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 @@ -1,6 +1,6 @@ -defaultsummaryid 1194448774 -usev8geopositions false -classes[].id 1194448774 +defaultsummaryid 697058562 +usev8geopositions true +classes[].id 697058562 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "parent_ref" @@ -11,13 +11,9 @@ classes[].fields[].name "summaryfeatures" classes[].fields[].type "featuredata" classes[].fields[].name "my_pos" classes[].fields[].type "jsonstring" -classes[].fields[].name "my_pos.position" -classes[].fields[].type "xmlstring" -classes[].fields[].name "my_pos.distance" -classes[].fields[].type "integer" classes[].fields[].name "documentid" classes[].fields[].type "longstring" -classes[].id 890647799 +classes[].id 656588065 classes[].name "mysummary" classes[].omitsummaryfeatures false classes[].fields[].name "my_pos" @@ -26,10 +22,6 @@ classes[].fields[].name "rankfeatures" classes[].fields[].type "featuredata" classes[].fields[].name "summaryfeatures" classes[].fields[].type "featuredata" -classes[].fields[].name "my_pos.position" -classes[].fields[].type "xmlstring" -classes[].fields[].name "my_pos.distance" -classes[].fields[].type "integer" classes[].id 1274088866 classes[].name "attributeprefetch" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/imported_position_field_summary/summarymap.cfg b/config-model/src/test/derived/imported_position_field_summary/summarymap.cfg index e2c0b546a59..5ea45a67905 100644 --- a/config-model/src/test/derived/imported_position_field_summary/summarymap.cfg +++ b/config-model/src/test/derived/imported_position_field_summary/summarymap.cfg @@ -8,9 +8,3 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" -override[].field "my_pos.position" -override[].command "positions" -override[].arguments "my_pos_zcurve" -override[].field "my_pos.distance" -override[].command "absdist" -override[].arguments "my_pos_zcurve" 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 0a9b29524e1..38fdd23123b 100644 --- a/config-model/src/test/derived/imported_struct_fields/summary.cfg +++ b/config-model/src/test/derived/imported_struct_fields/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1570252291 -usev8geopositions false +usev8geopositions true classes[].id 1570252291 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/importedfields/summary.cfg b/config-model/src/test/derived/importedfields/summary.cfg index 975c601a97d..4b792d15de9 100644 --- a/config-model/src/test/derived/importedfields/summary.cfg +++ b/config-model/src/test/derived/importedfields/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1294344677 -usev8geopositions false +usev8geopositions true classes[].id 1294344677 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/indexswitches/summary.cfg b/config-model/src/test/derived/indexswitches/summary.cfg index bcc050dad4f..a58d5da25e1 100644 --- a/config-model/src/test/derived/indexswitches/summary.cfg +++ b/config-model/src/test/derived/indexswitches/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1698765342 -usev8geopositions false +usev8geopositions true classes[].id 1698765342 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/inheritance/summary.cfg b/config-model/src/test/derived/inheritance/summary.cfg index 73c22f82a99..6d30c0ad231 100644 --- a/config-model/src/test/derived/inheritance/summary.cfg +++ b/config-model/src/test/derived/inheritance/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1797992819 -usev8geopositions false +usev8geopositions true classes[].id 1797992819 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/integerattributetostringindex/summary.cfg b/config-model/src/test/derived/integerattributetostringindex/summary.cfg index bfbb1eb01ca..9c2c8f4cd0e 100644 --- a/config-model/src/test/derived/integerattributetostringindex/summary.cfg +++ b/config-model/src/test/derived/integerattributetostringindex/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1195656216 -usev8geopositions false +usev8geopositions true classes[].id 1195656216 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/map_attribute/summary.cfg b/config-model/src/test/derived/map_attribute/summary.cfg index b50b40b9b72..b5ee816719e 100644 --- a/config-model/src/test/derived/map_attribute/summary.cfg +++ b/config-model/src/test/derived/map_attribute/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1376056200 -usev8geopositions false +usev8geopositions true classes[].id 1376056200 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/map_of_struct_attribute/summary.cfg b/config-model/src/test/derived/map_of_struct_attribute/summary.cfg index cf875704fa0..dadf7b5cfe7 100644 --- a/config-model/src/test/derived/map_of_struct_attribute/summary.cfg +++ b/config-model/src/test/derived/map_of_struct_attribute/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1131098132 -usev8geopositions false +usev8geopositions true classes[].id 1131098132 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/mlr/summary.cfg b/config-model/src/test/derived/mlr/summary.cfg index 5bea06a8472..0345ec305ae 100644 --- a/config-model/src/test/derived/mlr/summary.cfg +++ b/config-model/src/test/derived/mlr/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1868876861 -usev8geopositions false +usev8geopositions true classes[].id 1868876861 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/multiplesummaries/summary.cfg b/config-model/src/test/derived/multiplesummaries/summary.cfg index 1c8fc47878b..c05cb43dade 100644 --- a/config-model/src/test/derived/multiplesummaries/summary.cfg +++ b/config-model/src/test/derived/multiplesummaries/summary.cfg @@ -1,14 +1,10 @@ -defaultsummaryid 456145241 -usev8geopositions false -classes[].id 456145241 +defaultsummaryid 2052850997 +usev8geopositions true +classes[].id 2052850997 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "loc_pos" classes[].fields[].type "jsonstring" -classes[].fields[].name "loc_pos.position" -classes[].fields[].type "xmlstring" -classes[].fields[].name "loc_pos.distance" -classes[].fields[].type "integer" classes[].fields[].name "a" classes[].fields[].type "longstring" classes[].fields[].name "adynamic" diff --git a/config-model/src/test/derived/multiplesummaries/summarymap.cfg b/config-model/src/test/derived/multiplesummaries/summarymap.cfg index 94adc250c54..df6d3bedafd 100644 --- a/config-model/src/test/derived/multiplesummaries/summarymap.cfg +++ b/config-model/src/test/derived/multiplesummaries/summarymap.cfg @@ -47,12 +47,6 @@ override[].arguments "aboldeddynamic" override[].field "loc_pos" override[].command "geopos" override[].arguments "loc_pos_zcurve" -override[].field "loc_pos.position" -override[].command "positions" -override[].arguments "loc_pos_zcurve" -override[].field "loc_pos.distance" -override[].command "absdist" -override[].arguments "loc_pos_zcurve" override[].field "abolded" override[].command "dynamicteaser" override[].arguments "abolded" diff --git a/config-model/src/test/derived/music/summary.cfg b/config-model/src/test/derived/music/summary.cfg index c92b5491ebc..007c2ef3345 100644 --- a/config-model/src/test/derived/music/summary.cfg +++ b/config-model/src/test/derived/music/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 2086497905 -usev8geopositions false +usev8geopositions true classes[].id 2086497905 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/newrank/summary.cfg b/config-model/src/test/derived/newrank/summary.cfg index ddebcbe6ca6..7f77633602e 100644 --- a/config-model/src/test/derived/newrank/summary.cfg +++ b/config-model/src/test/derived/newrank/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 912980235 -usev8geopositions false +usev8geopositions true classes[].id 912980235 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/predicate_attribute/summary.cfg b/config-model/src/test/derived/predicate_attribute/summary.cfg index 10040fd71c6..d01ddcfcf2d 100644 --- a/config-model/src/test/derived/predicate_attribute/summary.cfg +++ b/config-model/src/test/derived/predicate_attribute/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1391971216 -usev8geopositions false +usev8geopositions true classes[].id 1391971216 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/rankingexpression/rank-profiles.cfg b/config-model/src/test/derived/rankingexpression/rank-profiles.cfg index cf59ae9c326..9291a690f7c 100644 --- a/config-model/src/test/derived/rankingexpression/rank-profiles.cfg +++ b/config-model/src/test/derived/rankingexpression/rank-profiles.cfg @@ -177,6 +177,10 @@ rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature2)" rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "mysummaryfeature" rankprofile[].fef.property[].name "vespa.type.attribute.t1" rankprofile[].fef.property[].value "tensor(m{},v[3])" rankprofile[].name "macros3" @@ -218,6 +222,10 @@ rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature2)" rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "mysummaryfeature" rankprofile[].fef.property[].name "vespa.type.attribute.t1" rankprofile[].fef.property[].value "tensor(m{},v[3])" rankprofile[].name "macros-inherited2" @@ -245,6 +253,10 @@ rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature2)" rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "mysummaryfeature" rankprofile[].fef.property[].name "vespa.type.attribute.t1" rankprofile[].fef.property[].value "tensor(m{},v[3])" rankprofile[].name "macros-inherited3" @@ -270,6 +282,10 @@ rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature2)" rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "mysummaryfeature" rankprofile[].fef.property[].name "vespa.type.attribute.t1" rankprofile[].fef.property[].value "tensor(m{},v[3])" rankprofile[].name "macros-refering-macros" @@ -361,6 +377,14 @@ rankprofile[].fef.property[].name "vespa.match.feature" rankprofile[].fef.property[].value "rankingExpression(myplus)" rankprofile[].fef.property[].name "vespa.match.feature" rankprofile[].fef.property[].value "rankingExpression(mymul)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "rankingExpression(myplus)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "myplus" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "rankingExpression(mymul)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "mymul" rankprofile[].fef.property[].name "vespa.type.attribute.t1" rankprofile[].fef.property[].value "tensor(m{},v[3])" rankprofile[].name "withboolean" diff --git a/config-model/src/test/derived/rankingexpression/summary.cfg b/config-model/src/test/derived/rankingexpression/summary.cfg index aec076aa8fe..b9f89f4a76d 100644 --- a/config-model/src/test/derived/rankingexpression/summary.cfg +++ b/config-model/src/test/derived/rankingexpression/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1753207254 -usev8geopositions false +usev8geopositions true classes[].id 1753207254 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/rankprofileinheritance/rank-profiles.cfg b/config-model/src/test/derived/rankprofileinheritance/rank-profiles.cfg index 440b0ad2b97..a3bc6791412 100644 --- a/config-model/src/test/derived/rankprofileinheritance/rank-profiles.cfg +++ b/config-model/src/test/derived/rankprofileinheritance/rank-profiles.cfg @@ -23,6 +23,14 @@ rankprofile[].fef.property[].name "vespa.match.feature" rankprofile[].fef.property[].value "rankingExpression(function3)" rankprofile[].fef.property[].name "vespa.match.feature" rankprofile[].fef.property[].value "rankingExpression(function1b)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "rankingExpression(function3)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "function3" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "rankingExpression(function1b)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "function1b" rankprofile[].name "profile4" rankprofile[].fef.property[].name "rankingExpression(function2).rankingScript" rankprofile[].fef.property[].value "attribute(field2) + 5" @@ -36,3 +44,11 @@ rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "rankingExpression(function2)" rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "rankingExpression(function4)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "rankingExpression(function2)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "function2" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "rankingExpression(function4)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "function4" diff --git a/config-model/src/test/derived/ranktypes/summary.cfg b/config-model/src/test/derived/ranktypes/summary.cfg index 7ab01302d8b..b39f10f354b 100644 --- a/config-model/src/test/derived/ranktypes/summary.cfg +++ b/config-model/src/test/derived/ranktypes/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1567556360 -usev8geopositions false +usev8geopositions true classes[].id 1567556360 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/reference_fields/summary.cfg b/config-model/src/test/derived/reference_fields/summary.cfg index b23b6c5b5a8..2bcabe81c3c 100644 --- a/config-model/src/test/derived/reference_fields/summary.cfg +++ b/config-model/src/test/derived/reference_fields/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1987541865 -usev8geopositions false +usev8geopositions true classes[].id 1987541865 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/schemainheritance/summary.cfg b/config-model/src/test/derived/schemainheritance/summary.cfg index 11f876c66c6..0d54f8ceaf7 100644 --- a/config-model/src/test/derived/schemainheritance/summary.cfg +++ b/config-model/src/test/derived/schemainheritance/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1313596701 -usev8geopositions false +usev8geopositions true classes[].id 1313596701 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/streamingstruct/summary.cfg b/config-model/src/test/derived/streamingstruct/summary.cfg index d7b7057bf1f..4c44f7f38b2 100644 --- a/config-model/src/test/derived/streamingstruct/summary.cfg +++ b/config-model/src/test/derived/streamingstruct/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 569269436 -usev8geopositions false +usev8geopositions true classes[].id 569269436 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/streamingstructdefault/summary.cfg b/config-model/src/test/derived/streamingstructdefault/summary.cfg index 7274804a5de..71b8c1371b3 100644 --- a/config-model/src/test/derived/streamingstructdefault/summary.cfg +++ b/config-model/src/test/derived/streamingstructdefault/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 718801936 -usev8geopositions false +usev8geopositions true classes[].id 718801936 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/tensor/summary.cfg b/config-model/src/test/derived/tensor/summary.cfg index de6a2a6e386..badb7c37829 100644 --- a/config-model/src/test/derived/tensor/summary.cfg +++ b/config-model/src/test/derived/tensor/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 898020074 -usev8geopositions false +usev8geopositions true classes[].id 898020074 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/derived/types/summary.cfg b/config-model/src/test/derived/types/summary.cfg index fc3b9e655ca..33af9d88630 100644 --- a/config-model/src/test/derived/types/summary.cfg +++ b/config-model/src/test/derived/types/summary.cfg @@ -1,5 +1,5 @@ defaultsummaryid 1131946680 -usev8geopositions false +usev8geopositions true classes[].id 1131946680 classes[].name "default" classes[].omitsummaryfeatures false diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java index c0fa3e8311f..bfa135de90e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java @@ -92,14 +92,6 @@ public class SummaryMapTestCase extends AbstractSchemaTestCase { assertEquals(SummaryTransform.GEOPOS, transform.getTransform()); transform = (FieldResultTransform)transforms.next(); - assertEquals(PositionDataType.getPositionSummaryFieldName(fieldName), transform.getFieldName()); - assertEquals(SummaryTransform.POSITIONS, transform.getTransform()); - - transform = (FieldResultTransform)transforms.next(); - assertEquals(PositionDataType.getDistanceSummaryFieldName(fieldName), transform.getFieldName()); - assertEquals(SummaryTransform.DISTANCE,transform.getTransform()); - - transform = (FieldResultTransform)transforms.next(); assertEquals("rankfeatures", transform.getFieldName()); assertEquals(SummaryTransform.RANKFEATURES, transform.getTransform()); @@ -118,31 +110,23 @@ public class SummaryMapTestCase extends AbstractSchemaTestCase { SummarymapConfig c = scb.build(); assertEquals(-1, c.defaultoutputclass()); - assertEquals(c.override().size(), 6); + assertEquals(c.override().size(), 4); assertEquals(c.override(0).field(), fieldName); assertEquals(c.override(0).command(), "geopos"); assertEquals(c.override(0).arguments(), PositionDataType.getZCurveFieldName(fieldName)); - assertEquals(c.override(1).field(), PositionDataType.getPositionSummaryFieldName(fieldName)); - assertEquals(c.override(1).command(), "positions"); - assertEquals(c.override(1).arguments(), PositionDataType.getZCurveFieldName(fieldName)); - - assertEquals(c.override(2).field(), PositionDataType.getDistanceSummaryFieldName(fieldName)); - assertEquals(c.override(2).command(), "absdist"); - assertEquals(c.override(2).arguments(), PositionDataType.getZCurveFieldName(fieldName)); - - assertEquals(c.override(3).field(), "rankfeatures"); - assertEquals(c.override(3).command(), "rankfeatures"); - assertEquals(c.override(3).arguments(), ""); + assertEquals(c.override(1).field(), "rankfeatures"); + assertEquals(c.override(1).command(), "rankfeatures"); + assertEquals(c.override(1).arguments(), ""); - assertEquals(c.override(4).field(), "summaryfeatures"); - assertEquals(c.override(4).command(), "summaryfeatures"); - assertEquals(c.override(4).arguments(), ""); + assertEquals(c.override(2).field(), "summaryfeatures"); + assertEquals(c.override(2).command(), "summaryfeatures"); + assertEquals(c.override(2).arguments(), ""); - assertEquals(c.override(5).field(), "location_zcurve"); - assertEquals(c.override(5).command(), "attribute"); - assertEquals(c.override(5).arguments(), "location_zcurve"); + assertEquals(c.override(3).field(), "location_zcurve"); + assertEquals(c.override(3).command(), "attribute"); + assertEquals(c.override(3).arguments(), "location_zcurve"); } @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java index eaf38396efc..a3af7706fb9 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java @@ -113,16 +113,8 @@ public class PositionTestCase { PositionDataType.getZCurveFieldName(fieldName), (isArray ? DataType.getArray(PositionDataType.INSTANCE) : PositionDataType.INSTANCE), SummaryTransform.GEOPOS); - assertSummaryField(schema, - PositionDataType.getDistanceSummaryFieldName(fieldName), - PositionDataType.getZCurveFieldName(fieldName), - DataType.INT, - SummaryTransform.DISTANCE); - assertSummaryField(schema, - PositionDataType.getPositionSummaryFieldName(fieldName), - PositionDataType.getZCurveFieldName(fieldName), - DataType.getArray(DataType.STRING), - SummaryTransform.POSITIONS); + assertNull(schema.getSummaryField(PositionDataType.getDistanceSummaryFieldName(fieldName))); + assertNull(schema.getSummaryField(PositionDataType.getPositionSummaryFieldName(fieldName))); } private static void assertSummaryField(Schema schema, String fieldName, String sourceName, DataType dataType, |