diff options
author | Geir Storli <geirst@yahooinc.com> | 2023-10-25 17:43:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-25 17:43:58 +0200 |
commit | 94c83b05b11fcc0df6d60a88393c93ad78db0ce2 (patch) | |
tree | f41b0e15f246168b27705882cee88031935a394b | |
parent | 4f51d748cd49f5c14d008d7232a78e333151cdbd (diff) | |
parent | 72cb56e4d4e129f7f89db49a208101658861572f (diff) |
Merge pull request #29099 from vespa-engine/toregge/dont-add-summary-fields-with-tokens-transform-to-default-summary
Don't add summary fields with tokens transform to default summary.
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/MakeDefaultSummaryTheSuperSet.java | 1 | ||||
-rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/SummaryTestCase.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/MakeDefaultSummaryTheSuperSet.java b/config-model/src/main/java/com/yahoo/schema/processing/MakeDefaultSummaryTheSuperSet.java index 610021c510d..420df3ee575 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/MakeDefaultSummaryTheSuperSet.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/MakeDefaultSummaryTheSuperSet.java @@ -41,6 +41,7 @@ public class MakeDefaultSummaryTheSuperSet extends Processor { if (summaryField.getTransform() == SummaryTransform.ATTRIBUTE) continue; if (summaryField.getTransform() == SummaryTransform.ATTRIBUTECOMBINER) continue; if (summaryField.getTransform() == SummaryTransform.MATCHED_ATTRIBUTE_ELEMENTS_FILTER) continue; + if (summaryField.getTransform() == SummaryTransform.TOKENS) continue; defaultSummary.add(summaryField.clone()); } diff --git a/config-model/src/test/java/com/yahoo/schema/derived/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/SummaryTestCase.java index 1c03c66d17b..5019ed0dd60 100644 --- a/config-model/src/test/java/com/yahoo/schema/derived/SummaryTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/SummaryTestCase.java @@ -237,6 +237,7 @@ public class SummaryTestCase extends AbstractSchemaTestCase { " from-disk", "}")); assertOverride(schema, "baz", SummaryTransform.TOKENS.getName(), "foo", "bar"); + assert(!schema.getSummary("default").getSummaryFields().containsKey("baz")); } @Test |