Don't emit unneeded index-info config for inner struct in map of struct.

2 files changed, 4 insertions, 20 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java
index ae5494ec636..9ddb18ecc8d 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java
@@ -13,8 +13,6 @@ import com.yahoo.search.config.IndexInfoConfig;
 import java.util.*;
 import java.util.stream.Stream;
 
-import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isMapOfSimpleStruct;
-
 /**
  * Per-index commands which should be applied to queries prior to searching
  *
@@ -89,17 +87,7 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
     }
 
     private void deriveImportedComplexField(ImportedField field) {
-        ImmutableSDField targetField = field.targetField();
-        while (targetField.isImportedField()) {
-            targetField = targetField.getBackingField();
-        }
-        addStructFieldIndexCommand(field.fieldName());
-        if (isMapOfSimpleStruct(targetField)) {
-            addStructFieldIndexCommand(field.fieldName() + ".value");
-        }
-    }
-
-    private void addStructFieldIndexCommand(String fieldName) {
+        String fieldName = field.fieldName();
         addIndexCommand(fieldName, CMD_MULTIVALUE);
         addIndexCommand(fieldName, CMD_INDEX);
     }
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 b33b9f09951..b32b487fe0f 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
@@ -65,11 +65,7 @@ indexinfo[0].command[31].indexname "my_elem_map"
 indexinfo[0].command[31].command "multivalue"
 indexinfo[0].command[32].indexname "my_elem_map"
 indexinfo[0].command[32].command "index"
-indexinfo[0].command[33].indexname "my_elem_map.value"
+indexinfo[0].command[33].indexname "my_str_int_map"
 indexinfo[0].command[33].command "multivalue"
-indexinfo[0].command[34].indexname "my_elem_map.value"
-indexinfo[0].command[34].command "index"
-indexinfo[0].command[35].indexname "my_str_int_map"
-indexinfo[0].command[35].command "multivalue"
-indexinfo[0].command[36].indexname "my_str_int_map"
-indexinfo[0].command[36].command "index"
\ No newline at end of file
+indexinfo[0].command[34].indexname "my_str_int_map"
+indexinfo[0].command[34].command "index"
\ No newline at end of file