diff options
author | Tor Egge <Tor.Egge@online.no> | 2024-04-22 13:15:14 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2024-04-22 13:15:14 +0200 |
commit | 16d6636ffa803c9c7aa43a20d7f163fcb7b5925e (patch) | |
tree | 726f62adb8ff66e7fbf5a3949058078a4759d857 /config-model/src/main/java/com | |
parent | 0d84412bea712d42620dfaa5b365707b9c4b89b6 (diff) |
Remove dead code.
Diffstat (limited to 'config-model/src/main/java/com')
3 files changed, 13 insertions, 58 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/AddExtraFieldsToDocument.java b/config-model/src/main/java/com/yahoo/schema/processing/AddExtraFieldsToDocument.java index 49de976f7d0..587ffcb86c7 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/AddExtraFieldsToDocument.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/AddExtraFieldsToDocument.java @@ -6,16 +6,12 @@ import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.Field; import com.yahoo.schema.Schema; import com.yahoo.schema.document.Attribute; -import com.yahoo.schema.document.ImmutableSDField; import com.yahoo.schema.document.SDDocumentType; import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.model.container.search.QueryProfiles; -import java.util.LinkedHashSet; -import java.util.Set; - /** * This processor creates a {@link com.yahoo.schema.document.SDDocumentType} for each {@link Schema} * object which holds all the data that search diff --git a/config-model/src/main/java/com/yahoo/schema/processing/DynamicSummaryTransformUtils.java b/config-model/src/main/java/com/yahoo/schema/processing/DynamicSummaryTransformUtils.java index 2e9c23dbf06..487aff81c68 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/DynamicSummaryTransformUtils.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/DynamicSummaryTransformUtils.java @@ -39,20 +39,6 @@ public class DynamicSummaryTransformUtils { return (type.equals(DataType.getArray(DataType.STRING))); } - /** - * Whether a summary field must be populated by the source field with the given type in an indexing script. - */ - public static boolean summaryFieldIsPopulatedBySourceField(DataType sourceFieldType) { - return false; - } - - /** - * Whether a summary field is required as an extra field in the document type. - */ - public static boolean summaryFieldIsRequiredInDocumentType(SummaryField summaryField) { - return summaryFieldIsPopulatedBySourceField(summaryField.getDataType()); - } - public static String getSource(SummaryField summaryField, Schema schema) { // Summary fields with the original supported type is always present in the document type. // However, if the source of that summary field is a single explicit source that exists in the schema we diff --git a/config-model/src/main/java/com/yahoo/schema/processing/IndexingOutputs.java b/config-model/src/main/java/com/yahoo/schema/processing/IndexingOutputs.java index 3c655c24922..51fb6b2b065 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/IndexingOutputs.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/IndexingOutputs.java @@ -34,33 +34,25 @@ public class IndexingOutputs extends Processor { ScriptExpression script = field.getIndexingScript(); if (script == null) continue; - Set<String> summaryFields = new TreeSet<>(); - findSummaryTo(schema, field, summaryFields, summaryFields); - MyConverter converter = new MyConverter(schema, field, summaryFields, validate); + findSummaryTo(schema, field); + MyConverter converter = new MyConverter(schema, field, validate); field.setIndexingScript(schema.getName(), (ScriptExpression)converter.convert(script)); } } - public void findSummaryTo(Schema schema, SDField field, Set<String> dynamicSummary, Set<String> staticSummary) { + public void findSummaryTo(Schema schema, SDField field) { var summaryFields = schema.getSummaryFields(field); - if (summaryFields.isEmpty()) { - fillSummaryToFromField(field, dynamicSummary, staticSummary); - } else { - fillSummaryToFromSearch(schema, field, summaryFields, dynamicSummary, staticSummary); - } + fillSummaryToFromSearch(schema, field, summaryFields); } - private void fillSummaryToFromSearch(Schema schema, SDField field, List<SummaryField> summaryFields, - Set<String> dynamicSummary, Set<String> staticSummary) { + private void fillSummaryToFromSearch(Schema schema, SDField field, List<SummaryField> summaryFields) { for (SummaryField summaryField : summaryFields) { - fillSummaryToFromSummaryField(schema, field, summaryField, dynamicSummary, staticSummary); + fillSummaryToFromSummaryField(schema, field, summaryField); } } - private void fillSummaryToFromSummaryField(Schema schema, SDField field, SummaryField summaryField, - Set<String> dynamicSummary, Set<String> staticSummary) { + private void fillSummaryToFromSummaryField(Schema schema, SDField field, SummaryField summaryField) { SummaryTransform summaryTransform = summaryField.getTransform(); - String summaryName = summaryField.getName(); if (summaryTransform.isDynamic() && summaryField.getSourceCount() > 2) { // Avoid writing to summary fields that have more than a single input field, as that is handled by the // summary rewriter in the search core. @@ -68,30 +60,11 @@ public class IndexingOutputs extends Processor { } if (summaryTransform.isDynamic()) { DataType fieldType = field.getDataType(); - if (!DynamicSummaryTransformUtils.summaryFieldIsPopulatedBySourceField(fieldType)) { - if (!DynamicSummaryTransformUtils.isSupportedType(fieldType)) { - warn(schema, field, "Dynamic summaries are only supported for fields of type " + - "string and array<string>, ignoring summary field '" + summaryField.getName() + - "' for sd field '" + field.getName() + "' of type " + - fieldType.getName() + "."); - } - return; - } - dynamicSummary.add(summaryName); - } else if (summaryTransform != SummaryTransform.ATTRIBUTE && - summaryTransform != SummaryTransform.TOKENS && - summaryTransform != SummaryTransform.ATTRIBUTE_TOKENS) { - staticSummary.add(summaryName); - } - } - - private static void fillSummaryToFromField(SDField field, Set<String> dynamicSummary, Set<String> staticSummary) { - for (SummaryField summaryField : field.getSummaryFields().values()) { - String summaryName = summaryField.getName(); - if (summaryField.getTransform().isDynamic()) { - dynamicSummary.add(summaryName); - } else { - staticSummary.add(summaryName); + if (!DynamicSummaryTransformUtils.isSupportedType(fieldType)) { + warn(schema, field, "Dynamic summaries are only supported for fields of type " + + "string and array<string>, ignoring summary field '" + summaryField.getName() + + "' for sd field '" + field.getName() + "' of type " + + fieldType.getName() + "."); } } } @@ -102,7 +75,7 @@ public class IndexingOutputs extends Processor { final Field field; final boolean validate; - MyConverter(Schema schema, Field field, Set<String> summaryFields, boolean validate) { + MyConverter(Schema schema, Field field, boolean validate) { this.schema = schema; this.field = field; this.validate = validate; |