We should not need to put any fields from the default summary class in the document.

At least not the ones generated specially for summary classes.

8 files changed, 9 insertions, 57 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java
index 233075155b5..f846eabbff8 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java
@@ -25,6 +25,11 @@ public class AddExtraFieldsToDocument extends Processor {
         super(search, deployLogger, rankProfileRegistry, queryProfiles);
     }
 
+    //TODO This is a tempoarry hack to avoid producing illegal code for fields not wanted anyway.
+    private boolean dirtyLegalFieldNameCheck(String fieldName) {
+        return ! fieldName.contains(".");
+    }
+
     @Override
     public void process(boolean validate, boolean documentsOnly) {
         SDDocumentType document = search.getDocument();
@@ -32,8 +37,11 @@ public class AddExtraFieldsToDocument extends Processor {
             for (Field field : search.extraFieldList()) {
                 addSdField(search, document, (SDField)field, validate);
             }
+            //TODO Vespa 8 or sooner we should avoid the dirty addition of fields from dirty 'default' summary to document at all
             for (SummaryField field : search.getSummary("default").getSummaryFields()) {
-                addSummaryField(search, document, field, validate);
+                if (dirtyLegalFieldNameCheck(field.getName())) {
+                    addSummaryField(search, document, field, validate);
+                }
             }
         }
     }
diff --git a/config-model/src/test/derived/advanced/documentmanager.cfg b/config-model/src/test/derived/advanced/documentmanager.cfg
index ee425d0d719..90948ea10d5 100644
--- a/config-model/src/test/derived/advanced/documentmanager.cfg
+++ b/config-model/src/test/derived/advanced/documentmanager.cfg
@@ -12,8 +12,6 @@ datatype[].structtype[].field[].detailedtype ""
 datatype[].structtype[].field[].name "y"
 datatype[].structtype[].field[].datatype 0
 datatype[].structtype[].field[].detailedtype ""
-datatype[].id -1486737430
-datatype[].arraytype[].datatype 2
 datatype[].id -1337915045
 datatype[].structtype[].name "advanced.header"
 datatype[].structtype[].version 0
@@ -66,12 +64,6 @@ datatype[].structtype[].field[].detailedtype ""
 datatype[].structtype[].field[].name "title_s"
 datatype[].structtype[].field[].datatype 2
 datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "location.position"
-datatype[].structtype[].field[].datatype -1486737430
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "location.distance"
-datatype[].structtype[].field[].datatype 0
-datatype[].structtype[].field[].detailedtype ""
 datatype[].structtype[].field[].name "mysummary"
 datatype[].structtype[].field[].datatype 2
 datatype[].structtype[].field[].detailedtype ""
diff --git a/config-model/src/test/derived/advanced/index-info.cfg b/config-model/src/test/derived/advanced/index-info.cfg
index 07b58814ea3..726398c1718 100644
--- a/config-model/src/test/derived/advanced/index-info.cfg
+++ b/config-model/src/test/derived/advanced/index-info.cfg
@@ -37,14 +37,6 @@ indexinfo[].command[].indexname "location"
 indexinfo[].command[].command "default-position"
 indexinfo[].command[].indexname "location"
 indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "location.distance"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "location.distance"
-indexinfo[].command[].command "numerical"
-indexinfo[].command[].indexname "location.position"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "location.position"
-indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "location_zcurve"
 indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "location_zcurve"
diff --git a/config-model/src/test/derived/imported_position_field_summary/index-info.cfg b/config-model/src/test/derived/imported_position_field_summary/index-info.cfg
index 4c8dafdf59b..356509fd818 100644
--- a/config-model/src/test/derived/imported_position_field_summary/index-info.cfg
+++ b/config-model/src/test/derived/imported_position_field_summary/index-info.cfg
@@ -9,14 +9,6 @@ indexinfo[].command[].indexname "parent_ref"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "parent_ref"
 indexinfo[].command[].command "word"
-indexinfo[].command[].indexname "my_pos.distance"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "my_pos.distance"
-indexinfo[].command[].command "numerical"
-indexinfo[].command[].indexname "my_pos.position"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "my_pos.position"
-indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "rankfeatures"
 indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "summaryfeatures"
diff --git a/config-model/src/test/derived/indexschema/index-info.cfg b/config-model/src/test/derived/indexschema/index-info.cfg
index 3a420e12a24..d027ba8c102 100644
--- a/config-model/src/test/derived/indexschema/index-info.cfg
+++ b/config-model/src/test/derived/indexschema/index-info.cfg
@@ -219,14 +219,6 @@ indexinfo[].command[].indexname "f10"
 indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "f10"
 indexinfo[].command[].command "multivalue"
-indexinfo[].command[].indexname "pos.distance"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "pos.distance"
-indexinfo[].command[].command "numerical"
-indexinfo[].command[].indexname "pos.position"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "pos.position"
-indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "pos_zcurve"
 indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "pos_zcurve"
diff --git a/config-model/src/test/derived/position_array/index-info.cfg b/config-model/src/test/derived/position_array/index-info.cfg
index 0230db3fa2b..45ec2b69350 100644
--- a/config-model/src/test/derived/position_array/index-info.cfg
+++ b/config-model/src/test/derived/position_array/index-info.cfg
@@ -17,14 +17,6 @@ indexinfo[].command[].indexname "pos"
 indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "pos"
 indexinfo[].command[].command "multivalue"
-indexinfo[].command[].indexname "pos.distance"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "pos.distance"
-indexinfo[].command[].command "numerical"
-indexinfo[].command[].indexname "pos.position"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "pos.position"
-indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "pos_zcurve"
 indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "pos_zcurve"
diff --git a/config-model/src/test/derived/position_attribute/index-info.cfg b/config-model/src/test/derived/position_attribute/index-info.cfg
index db61a7fff4f..94d9ed9ad38 100644
--- a/config-model/src/test/derived/position_attribute/index-info.cfg
+++ b/config-model/src/test/derived/position_attribute/index-info.cfg
@@ -15,14 +15,6 @@ indexinfo[].command[].indexname "pos"
 indexinfo[].command[].command "default-position"
 indexinfo[].command[].indexname "pos"
 indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "pos.distance"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "pos.distance"
-indexinfo[].command[].command "numerical"
-indexinfo[].command[].indexname "pos.position"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "pos.position"
-indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "pos_zcurve"
 indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "pos_zcurve"
diff --git a/config-model/src/test/derived/position_extra/index-info.cfg b/config-model/src/test/derived/position_extra/index-info.cfg
index f7afda263a1..d4eef66c589 100644
--- a/config-model/src/test/derived/position_extra/index-info.cfg
+++ b/config-model/src/test/derived/position_extra/index-info.cfg
@@ -9,14 +9,6 @@ indexinfo[].command[].indexname "pos_ext"
 indexinfo[].command[].command "default-position"
 indexinfo[].command[].indexname "pos_ext"
 indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "pos_ext.distance"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "pos_ext.distance"
-indexinfo[].command[].command "numerical"
-indexinfo[].command[].indexname "pos_ext.position"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "pos_ext.position"
-indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "pos_ext_zcurve"
 indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "pos_ext_zcurve"