From 72cb56e4d4e129f7f89db49a208101658861572f Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Wed, 25 Oct 2023 15:00:07 +0200 Subject: Don't add summary fields with tokens transform to default summary. --- .../java/com/yahoo/schema/processing/MakeDefaultSummaryTheSuperSet.java | 1 + config-model/src/test/java/com/yahoo/schema/derived/SummaryTestCase.java | 1 + 2 files changed, 2 insertions(+) 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 -- cgit v1.2.3