diff options
Diffstat (limited to 'config-model/src/main/java/com/yahoo/schema')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/SummaryMap.java | 19 |
1 files changed, 4 insertions, 15 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 df9174a12ed..40d763eb897 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 @@ -57,9 +57,10 @@ public class SummaryMap extends Derived implements SummarymapConfig.Producer { // This works, but is suboptimal. We could consolidate to a minimal set and // use the right value from the minimal set as the third parameter here, // and add "override" commands to multiple static values + boolean useFieldNameAsArgument = summaryField.getTransform().isDynamic() || summaryField.getTransform() == SummaryTransform.TEXTEXTRACTOR; resultTransforms.put(summaryField.getName(), new FieldResultTransform(summaryField.getName(), summaryField.getTransform(), - summaryField.getName())); + useFieldNameAsArgument ? summaryField.getName() : "")); } } } @@ -99,20 +100,8 @@ public class SummaryMap extends Derived implements SummarymapConfig.Producer { for (FieldResultTransform frt : resultTransforms.values()) { SummarymapConfig.Override.Builder oB = new SummarymapConfig.Override.Builder() .field(frt.getFieldName()) - .command(getCommand(frt.getTransform())); - if (frt.getTransform().isDynamic() || - frt.getTransform().equals(SummaryTransform.ATTRIBUTE) || - frt.getTransform().equals(SummaryTransform.DISTANCE) || - frt.getTransform().equals(SummaryTransform.GEOPOS) || - frt.getTransform().equals(SummaryTransform.POSITIONS) || - frt.getTransform().equals(SummaryTransform.TEXTEXTRACTOR) || - frt.getTransform().equals(SummaryTransform.MATCHED_ELEMENTS_FILTER) || - frt.getTransform().equals(SummaryTransform.MATCHED_ATTRIBUTE_ELEMENTS_FILTER)) - { - oB.arguments(frt.getArgument()); - } else { - oB.arguments(""); - } + .command(getCommand(frt.getTransform())) + .arguments(frt.getArgument()); builder.override(oB); } } |