diff options
| author | Geir Storli <geirst@verizonmedia.com> | 2019-10-22 14:53:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-22 14:53:30 +0200 |
| commit | fd2ec77369f8ef58c844bc6dc912be1fdd2c1118 (patch) | |
| tree | 8ebeb6b5d2c103d0710aa9d67135485d9a53dfc6 /config-model/src/main | |
| parent | 1f3b8d3dccd622a64cf710fe3b6f77cb26b20269 (diff) | |
| parent | 4f2f3397b3a66ee377b704ea54ab705db1529c79 (diff) | |
Merge pull request #11043 from vespa-engine/geirst/matched-elements-only-for-imported-fields
Geirst/matched elements only for imported fields
Diffstat (limited to 'config-model/src/main')
3 files changed, 10 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java index 74de63eae3a..9ef563edbc4 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java @@ -85,9 +85,12 @@ public class SummaryMap extends Derived implements SummarymapConfig.Producer { /** * Does this summary command name stand for a dynamic transform? * We need this because some model information is shared through configs instead of model - see usage + * A dynamic transform needs the query to perform its computations. */ public static boolean isDynamicCommand(String commandName) { - return (commandName.equals("dynamicteaser") || commandName.equals("smartsummary")); + return (commandName.equals("dynamicteaser") || + commandName.equals(SummaryTransform.MATCHED_ELEMENTS_FILTER.getName()) || + commandName.equals(SummaryTransform.MATCHED_ATTRIBUTE_ELEMENTS_FILTER.getName())); } @Override diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java index f0575f1f70f..73018e2cbc1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java @@ -52,6 +52,10 @@ public class AddAttributeTransformToSummaryOfImportedFields extends Processor { } private static void setAttributeCombinerTransform(SummaryField summaryField) { - summaryField.setTransform(SummaryTransform.ATTRIBUTECOMBINER); + if (summaryField.getTransform() == SummaryTransform.MATCHED_ELEMENTS_FILTER) { + summaryField.setTransform(SummaryTransform.MATCHED_ATTRIBUTE_ELEMENTS_FILTER); + } else { + summaryField.setTransform(SummaryTransform.ATTRIBUTECOMBINER); + } } } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java index 13eebc289a6..fec610ec41e 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java @@ -40,6 +40,7 @@ public class MakeDefaultSummaryTheSuperSet extends Processor { if (defaultSummary.getSummaryField(summaryField.getName()) != null) continue; if (summaryField.getTransform() == SummaryTransform.ATTRIBUTE) continue; if (summaryField.getTransform() == SummaryTransform.ATTRIBUTECOMBINER) continue; + if (summaryField.getTransform() == SummaryTransform.MATCHED_ATTRIBUTE_ELEMENTS_FILTER) continue; defaultSummary.add(summaryField.clone()); } |