diff options
| author | Tor Egge <tegge@vespa.ai> | 2024-04-19 16:21:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-19 16:21:05 +0200 |
| commit | ff4a1d0c18c9a64ded7e0a9e66edbfe2e4f2e0d7 (patch) | |
| tree | cbb2a1a31e4cc6f77ded8331673db5b282269a02 /config-model | |
| parent | 299b594f70e4c9a320a528769b808d359891b9d6 (diff) | |
| parent | 1bf9d94c54d177e29660e610ec5874c3b6d27361 (diff) | |
Merge pull request #30974 from vespa-engine/toregge/stop-adding-extra-documentid-field-to-document-type
Stop adding extra documentid field to document type.
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/AddExtraFieldsToDocument.java | 4 | ||||
| -rw-r--r-- | config-model/src/test/derived/imported_struct_fields/index-info.cfg | 4 |
2 files changed, 1 insertions, 7 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 67297245ff1..e736f289003 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 @@ -41,10 +41,8 @@ public class AddExtraFieldsToDocument extends Processor { for (var summaryField : docsum.getSummaryFields().values()) { var transform = summaryField.getTransform(); if (transform.isDynamic() && DynamicSummaryTransformUtils.summaryFieldIsRequiredInDocumentType(summaryField) || - transform == SummaryTransform.NONE || - transform == SummaryTransform.DOCUMENT_ID) + transform == SummaryTransform.NONE) { - // TODO: Adding the 'documentid' field should no longer be needed when the docsum framework in the backend has been simplified and the transform is always used. addSummaryField(schema, document, summaryField, validate); } else { // skip: generated from attribute or similar, diff --git a/config-model/src/test/derived/imported_struct_fields/index-info.cfg b/config-model/src/test/derived/imported_struct_fields/index-info.cfg index f023328380c..2b8a6fc344d 100644 --- a/config-model/src/test/derived/imported_struct_fields/index-info.cfg +++ b/config-model/src/test/derived/imported_struct_fields/index-info.cfg @@ -9,10 +9,6 @@ indexinfo[].command[].indexname "parent_ref" indexinfo[].command[].command "type Reference<parent>" indexinfo[].command[].indexname "parent_ref" indexinfo[].command[].command "word" -indexinfo[].command[].indexname "documentid" -indexinfo[].command[].command "string" -indexinfo[].command[].indexname "documentid" -indexinfo[].command[].command "type string" indexinfo[].command[].indexname "my_elem_array.name" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "my_elem_array.name" |