diff options
author | Geir Storli <geirst@yahooinc.com> | 2022-07-14 09:31:38 +0000 |
---|---|---|
committer | Geir Storli <geirst@yahooinc.com> | 2022-07-14 09:31:38 +0000 |
commit | 63da816574b609b09806acdcf586648464b01f5a (patch) | |
tree | 42e9997aa859d5a5a55375b6e288016d4dfb8e22 /config-model/src | |
parent | 43f6b577f4cc892e162366ebb59e672997be9b97 (diff) |
Ensure the summary transform for 'documentid' is part of summarymap.cfg.
Diffstat (limited to 'config-model/src')
29 files changed, 100 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/SummaryMap.java b/config-model/src/main/java/com/yahoo/schema/derived/SummaryMap.java index 35bb147ccf5..55dc252f273 100644 --- a/config-model/src/main/java/com/yahoo/schema/derived/SummaryMap.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/SummaryMap.java @@ -30,6 +30,7 @@ public class SummaryMap extends Derived implements SummarymapConfig.Producer { for (DocumentSummary documentSummary : schema.getSummaries().values()) { derive(documentSummary); } + addSummaryTransformForDocumentId(); super.derive(schema); } @@ -37,6 +38,15 @@ public class SummaryMap extends Derived implements SummarymapConfig.Producer { protected void derive(ImmutableSDField field, Schema schema) { } + private void addSummaryTransformForDocumentId() { + // The 'documentid' field is added to the 'default' summary class in SummaryClass.deriveImplicitFields(). + // This ensures the corresponding transform is added as well. + if (!resultTransforms.containsKey(SummaryClass.DOCUMENT_ID_FIELD)) { + resultTransforms.put(SummaryClass.DOCUMENT_ID_FIELD, + new FieldResultTransform(SummaryClass.DOCUMENT_ID_FIELD, SummaryTransform.DOCUMENT_ID, "")); + } + } + private void derive(DocumentSummary documentSummary) { for (SummaryField summaryField : documentSummary.getSummaryFields().values()) { if (summaryField.getTransform()== SummaryTransform.NONE) continue; diff --git a/config-model/src/test/derived/advanced/summarymap.cfg b/config-model/src/test/derived/advanced/summarymap.cfg index 31cc15f07db..f91aebe57f9 100644 --- a/config-model/src/test/derived/advanced/summarymap.cfg +++ b/config-model/src/test/derived/advanced/summarymap.cfg @@ -8,3 +8,6 @@ override[].arguments "" override[].field "location_zcurve" override[].command "attribute" override[].arguments "location_zcurve" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/array_of_struct_attribute/summarymap.cfg b/config-model/src/test/derived/array_of_struct_attribute/summarymap.cfg index 9dd63a3f316..4fb66c0e0b1 100644 --- a/config-model/src/test/derived/array_of_struct_attribute/summarymap.cfg +++ b/config-model/src/test/derived/array_of_struct_attribute/summarymap.cfg @@ -11,3 +11,6 @@ override[].arguments "" override[].field "elem_array" override[].command "attributecombiner" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/attributeprefetch/summarymap.cfg b/config-model/src/test/derived/attributeprefetch/summarymap.cfg index 2e4bec651e7..ae5e4b5f7c5 100644 --- a/config-model/src/test/derived/attributeprefetch/summarymap.cfg +++ b/config-model/src/test/derived/attributeprefetch/summarymap.cfg @@ -23,3 +23,6 @@ override[].arguments "singledouble" override[].field "singlestring" override[].command "attribute" override[].arguments "singlestring" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/attributes/summarymap.cfg b/config-model/src/test/derived/attributes/summarymap.cfg index a96f1e3858d..72a5e41e555 100644 --- a/config-model/src/test/derived/attributes/summarymap.cfg +++ b/config-model/src/test/derived/attributes/summarymap.cfg @@ -50,3 +50,6 @@ override[].arguments "a11" override[].field "a12" override[].command "attribute" override[].arguments "a12" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/complex/summarymap.cfg b/config-model/src/test/derived/complex/summarymap.cfg index 6f65e7d3bc3..685b818fc6a 100644 --- a/config-model/src/test/derived/complex/summarymap.cfg +++ b/config-model/src/test/derived/complex/summarymap.cfg @@ -29,3 +29,6 @@ override[].arguments "ts" override[].field "combineda" override[].command "attribute" override[].arguments "combineda" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/emptydefault/summarymap.cfg b/config-model/src/test/derived/emptydefault/summarymap.cfg index 8956a146b74..b247ff94bbf 100644 --- a/config-model/src/test/derived/emptydefault/summarymap.cfg +++ b/config-model/src/test/derived/emptydefault/summarymap.cfg @@ -5,3 +5,6 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/id/summarymap.cfg b/config-model/src/test/derived/id/summarymap.cfg index 8956a146b74..b247ff94bbf 100644 --- a/config-model/src/test/derived/id/summarymap.cfg +++ b/config-model/src/test/derived/id/summarymap.cfg @@ -5,3 +5,6 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/imported_position_field/summarymap.cfg b/config-model/src/test/derived/imported_position_field/summarymap.cfg index 8956a146b74..b247ff94bbf 100644 --- a/config-model/src/test/derived/imported_position_field/summarymap.cfg +++ b/config-model/src/test/derived/imported_position_field/summarymap.cfg @@ -5,3 +5,6 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" 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 5ea45a67905..c17dcdce267 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,3 +8,6 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/importedfields/summarymap.cfg b/config-model/src/test/derived/importedfields/summarymap.cfg index 03ae5e2676e..7a4677301db 100644 --- a/config-model/src/test/derived/importedfields/summarymap.cfg +++ b/config-model/src/test/derived/importedfields/summarymap.cfg @@ -23,3 +23,6 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/indexswitches/summarymap.cfg b/config-model/src/test/derived/indexswitches/summarymap.cfg index 8956a146b74..b247ff94bbf 100644 --- a/config-model/src/test/derived/indexswitches/summarymap.cfg +++ b/config-model/src/test/derived/indexswitches/summarymap.cfg @@ -5,3 +5,6 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/inheritance/summarymap.cfg b/config-model/src/test/derived/inheritance/summarymap.cfg index 0f5303a52e7..7fb5eab0200 100644 --- a/config-model/src/test/derived/inheritance/summarymap.cfg +++ b/config-model/src/test/derived/inheritance/summarymap.cfg @@ -14,3 +14,6 @@ override[].arguments "overridden" override[].field "onlymother" override[].command "attribute" override[].arguments "onlymother" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/inheritfromparent/summarymap.cfg b/config-model/src/test/derived/inheritfromparent/summarymap.cfg index cf8b410c850..fb1a18ab864 100644 --- a/config-model/src/test/derived/inheritfromparent/summarymap.cfg +++ b/config-model/src/test/derived/inheritfromparent/summarymap.cfg @@ -8,3 +8,6 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/map_attribute/summarymap.cfg b/config-model/src/test/derived/map_attribute/summarymap.cfg index 8936b26ca64..f9267fb39d3 100644 --- a/config-model/src/test/derived/map_attribute/summarymap.cfg +++ b/config-model/src/test/derived/map_attribute/summarymap.cfg @@ -8,3 +8,6 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/map_of_struct_attribute/summarymap.cfg b/config-model/src/test/derived/map_of_struct_attribute/summarymap.cfg index 291dbb91542..46608a4a885 100644 --- a/config-model/src/test/derived/map_of_struct_attribute/summarymap.cfg +++ b/config-model/src/test/derived/map_of_struct_attribute/summarymap.cfg @@ -14,3 +14,6 @@ override[].arguments "" override[].field "str_elem_map" override[].command "attributecombiner" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/multiplesummaries/summarymap.cfg b/config-model/src/test/derived/multiplesummaries/summarymap.cfg index df6d3bedafd..ee61fac39f4 100644 --- a/config-model/src/test/derived/multiplesummaries/summarymap.cfg +++ b/config-model/src/test/derived/multiplesummaries/summarymap.cfg @@ -53,3 +53,6 @@ override[].arguments "abolded" override[].field "dynamice" override[].command "dynamicteaser" override[].arguments "dynamice" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/music/summarymap.cfg b/config-model/src/test/derived/music/summarymap.cfg index e250c3747cc..2973d4f6750 100644 --- a/config-model/src/test/derived/music/summarymap.cfg +++ b/config-model/src/test/derived/music/summarymap.cfg @@ -44,3 +44,6 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/newrank/summarymap.cfg b/config-model/src/test/derived/newrank/summarymap.cfg index 3350d892b0c..e769e3a2a5a 100644 --- a/config-model/src/test/derived/newrank/summarymap.cfg +++ b/config-model/src/test/derived/newrank/summarymap.cfg @@ -47,3 +47,6 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/position_nosummary/summarymap.cfg b/config-model/src/test/derived/position_nosummary/summarymap.cfg index 0a36f98c6ca..2ed737b5205 100644 --- a/config-model/src/test/derived/position_nosummary/summarymap.cfg +++ b/config-model/src/test/derived/position_nosummary/summarymap.cfg @@ -8,3 +8,6 @@ override[].arguments "" override[].field "pos_zcurve" override[].command "attribute" override[].arguments "pos_zcurve" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/position_summary/summarymap.cfg b/config-model/src/test/derived/position_summary/summarymap.cfg index 2223d3380a0..d34c4727810 100644 --- a/config-model/src/test/derived/position_summary/summarymap.cfg +++ b/config-model/src/test/derived/position_summary/summarymap.cfg @@ -11,3 +11,6 @@ override[].arguments "" override[].field "pos_zcurve" override[].command "attribute" override[].arguments "pos_zcurve" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/predicate_attribute/summarymap.cfg b/config-model/src/test/derived/predicate_attribute/summarymap.cfg index 8956a146b74..b247ff94bbf 100644 --- a/config-model/src/test/derived/predicate_attribute/summarymap.cfg +++ b/config-model/src/test/derived/predicate_attribute/summarymap.cfg @@ -5,3 +5,6 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/rankingexpression/summarymap.cfg b/config-model/src/test/derived/rankingexpression/summarymap.cfg index e8d9bd08ca7..bc8e67320ad 100644 --- a/config-model/src/test/derived/rankingexpression/summarymap.cfg +++ b/config-model/src/test/derived/rankingexpression/summarymap.cfg @@ -32,3 +32,6 @@ override[].arguments "bar3" override[].field "bar4" override[].command "attribute" override[].arguments "bar4" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/ranktypes/summarymap.cfg b/config-model/src/test/derived/ranktypes/summarymap.cfg index 8956a146b74..b247ff94bbf 100644 --- a/config-model/src/test/derived/ranktypes/summarymap.cfg +++ b/config-model/src/test/derived/ranktypes/summarymap.cfg @@ -5,3 +5,6 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/reference_fields/summarymap.cfg b/config-model/src/test/derived/reference_fields/summarymap.cfg index 8956a146b74..b247ff94bbf 100644 --- a/config-model/src/test/derived/reference_fields/summarymap.cfg +++ b/config-model/src/test/derived/reference_fields/summarymap.cfg @@ -5,3 +5,6 @@ override[].arguments "" override[].field "summaryfeatures" override[].command "summaryfeatures" override[].arguments "" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/schemainheritance/summarymap.cfg b/config-model/src/test/derived/schemainheritance/summarymap.cfg index d09407ca8a5..98885124eab 100644 --- a/config-model/src/test/derived/schemainheritance/summarymap.cfg +++ b/config-model/src/test/derived/schemainheritance/summarymap.cfg @@ -11,3 +11,6 @@ override[].arguments "parent_field" override[].field "child_field" override[].command "attribute" override[].arguments "child_field" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/streamingstruct/summarymap.cfg b/config-model/src/test/derived/streamingstruct/summarymap.cfg index 865c6f733f1..acb9b3491c3 100644 --- a/config-model/src/test/derived/streamingstruct/summarymap.cfg +++ b/config-model/src/test/derived/streamingstruct/summarymap.cfg @@ -11,3 +11,6 @@ override[].arguments "" override[].field "g" override[].command "dynamicteaser" override[].arguments "g" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/derived/types/summarymap.cfg b/config-model/src/test/derived/types/summarymap.cfg index b87200f6573..21ecb2dd07d 100644 --- a/config-model/src/test/derived/types/summarymap.cfg +++ b/config-model/src/test/derived/types/summarymap.cfg @@ -29,3 +29,6 @@ override[].arguments "other" override[].field "juletre" override[].command "attribute" override[].arguments "juletre" +override[].field "documentid" +override[].command "documentid" +override[].arguments "" diff --git a/config-model/src/test/java/com/yahoo/schema/derived/SummaryMapTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/SummaryMapTestCase.java index 2f1b837554d..23cd7952626 100644 --- a/config-model/src/test/java/com/yahoo/schema/derived/SummaryMapTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/SummaryMapTestCase.java @@ -70,6 +70,10 @@ public class SummaryMapTestCase extends AbstractSchemaTestCase { assertEquals("access", transform.getFieldName()); assertEquals(SummaryTransform.ATTRIBUTE, transform.getTransform()); + transform = transforms.next(); + assertEquals("documentid", transform.getFieldName()); + assertEquals(SummaryTransform.DOCUMENT_ID, transform.getTransform()); + assertFalse(transforms.hasNext()); } @Test @@ -103,6 +107,10 @@ public class SummaryMapTestCase extends AbstractSchemaTestCase { assertEquals("location_zcurve", transform.getFieldName()); assertEquals(SummaryTransform.ATTRIBUTE,transform.getTransform()); + transform = transforms.next(); + assertEquals("documentid", transform.getFieldName()); + assertEquals(SummaryTransform.DOCUMENT_ID,transform.getTransform()); + assertFalse(transforms.hasNext()); SummarymapConfig.Builder scb = new SummarymapConfig.Builder(); @@ -110,7 +118,7 @@ public class SummaryMapTestCase extends AbstractSchemaTestCase { SummarymapConfig c = scb.build(); assertEquals(-1, c.defaultoutputclass()); - assertEquals(c.override().size(), 4); + assertEquals(c.override().size(), 5); assertEquals(c.override(0).field(), fieldName); assertEquals(c.override(0).command(), "geopos"); |