Unify on empty array indexes

6 files changed, 223 insertions, 223 deletions

diff --git a/config-model/src/test/derived/ranktypes/documentmanager.cfg b/config-model/src/test/derived/ranktypes/documentmanager.cfg
index 50be09891e5..62c3dff3df2 100644
--- a/config-model/src/test/derived/ranktypes/documentmanager.cfg
+++ b/config-model/src/test/derived/ranktypes/documentmanager.cfg
@@ -1,60 +1,60 @@
 enablecompression false
-datatype[0].id 1381038251
-datatype[0].structtype[0].name "position"
-datatype[0].structtype[0].version 0
-datatype[0].structtype[0].compresstype NONE
-datatype[0].structtype[0].compresslevel 0
-datatype[0].structtype[0].compressthreshold 95
-datatype[0].structtype[0].compressminsize 800
-datatype[0].structtype[0].field[0].name "x"
-datatype[0].structtype[0].field[0].datatype 0
-datatype[0].structtype[0].field[0].detailedtype ""
-datatype[0].structtype[0].field[1].name "y"
-datatype[0].structtype[0].field[1].datatype 0
-datatype[0].structtype[0].field[1].detailedtype ""
-datatype[1].id -471393776
-datatype[1].structtype[0].name "ranktypes.header"
-datatype[1].structtype[0].version 0
-datatype[1].structtype[0].compresstype NONE
-datatype[1].structtype[0].compresslevel 0
-datatype[1].structtype[0].compressthreshold 95
-datatype[1].structtype[0].compressminsize 800
-datatype[1].structtype[0].field[0].name "title"
-datatype[1].structtype[0].field[0].datatype 2
-datatype[1].structtype[0].field[0].detailedtype ""
-datatype[1].structtype[0].field[1].name "descr"
-datatype[1].structtype[0].field[1].datatype 2
-datatype[1].structtype[0].field[1].detailedtype ""
-datatype[1].structtype[0].field[2].name "keywords"
-datatype[1].structtype[0].field[2].datatype 2
-datatype[1].structtype[0].field[2].detailedtype ""
-datatype[1].structtype[0].field[3].name "identity"
-datatype[1].structtype[0].field[3].datatype 2
-datatype[1].structtype[0].field[3].detailedtype ""
-datatype[1].structtype[0].field[4].name "identity_literal"
-datatype[1].structtype[0].field[4].datatype 2
-datatype[1].structtype[0].field[4].detailedtype ""
-datatype[1].structtype[0].field[5].name "rankfeatures"
-datatype[1].structtype[0].field[5].datatype 2
-datatype[1].structtype[0].field[5].detailedtype ""
-datatype[1].structtype[0].field[6].name "summaryfeatures"
-datatype[1].structtype[0].field[6].datatype 2
-datatype[1].structtype[0].field[6].detailedtype ""
-datatype[2].id 1374506021
-datatype[2].structtype[0].name "ranktypes.body"
-datatype[2].structtype[0].version 0
-datatype[2].structtype[0].compresstype NONE
-datatype[2].structtype[0].compresslevel 0
-datatype[2].structtype[0].compressthreshold 95
-datatype[2].structtype[0].compressminsize 800
-datatype[3].id -883421617
-datatype[3].documenttype[0].name "ranktypes"
-datatype[3].documenttype[0].version 0
-datatype[3].documenttype[0].inherits[0].name "document"
-datatype[3].documenttype[0].inherits[0].version 0
-datatype[3].documenttype[0].headerstruct -471393776
-datatype[3].documenttype[0].bodystruct 1374506021
-datatype[3].documenttype[0].fieldsets{[document]}.fields[0] "descr"
-datatype[3].documenttype[0].fieldsets{[document]}.fields[1] "identity"
-datatype[3].documenttype[0].fieldsets{[document]}.fields[2] "keywords"
-datatype[3].documenttype[0].fieldsets{[document]}.fields[3] "title"
+datatype[].id 1381038251
+datatype[].structtype[].name "position"
+datatype[].structtype[].version 0
+datatype[].structtype[].compresstype NONE
+datatype[].structtype[].compresslevel 0
+datatype[].structtype[].compressthreshold 95
+datatype[].structtype[].compressminsize 800
+datatype[].structtype[].field[].name "x"
+datatype[].structtype[].field[].datatype 0
+datatype[].structtype[].field[].detailedtype ""
+datatype[].structtype[].field[].name "y"
+datatype[].structtype[].field[].datatype 0
+datatype[].structtype[].field[].detailedtype ""
+datatype[].id -471393776
+datatype[].structtype[].name "ranktypes.header"
+datatype[].structtype[].version 0
+datatype[].structtype[].compresstype NONE
+datatype[].structtype[].compresslevel 0
+datatype[].structtype[].compressthreshold 95
+datatype[].structtype[].compressminsize 800
+datatype[].structtype[].field[].name "title"
+datatype[].structtype[].field[].datatype 2
+datatype[].structtype[].field[].detailedtype ""
+datatype[].structtype[].field[].name "descr"
+datatype[].structtype[].field[].datatype 2
+datatype[].structtype[].field[].detailedtype ""
+datatype[].structtype[].field[].name "keywords"
+datatype[].structtype[].field[].datatype 2
+datatype[].structtype[].field[].detailedtype ""
+datatype[].structtype[].field[].name "identity"
+datatype[].structtype[].field[].datatype 2
+datatype[].structtype[].field[].detailedtype ""
+datatype[].structtype[].field[].name "identity_literal"
+datatype[].structtype[].field[].datatype 2
+datatype[].structtype[].field[].detailedtype ""
+datatype[].structtype[].field[].name "rankfeatures"
+datatype[].structtype[].field[].datatype 2
+datatype[].structtype[].field[].detailedtype ""
+datatype[].structtype[].field[].name "summaryfeatures"
+datatype[].structtype[].field[].datatype 2
+datatype[].structtype[].field[].detailedtype ""
+datatype[].id 1374506021
+datatype[].structtype[].name "ranktypes.body"
+datatype[].structtype[].version 0
+datatype[].structtype[].compresstype NONE
+datatype[].structtype[].compresslevel 0
+datatype[].structtype[].compressthreshold 95
+datatype[].structtype[].compressminsize 800
+datatype[].id -883421617
+datatype[].documenttype[].name "ranktypes"
+datatype[].documenttype[].version 0
+datatype[].documenttype[].inherits[].name "document"
+datatype[].documenttype[].inherits[].version 0
+datatype[].documenttype[].headerstruct -471393776
+datatype[].documenttype[].bodystruct 1374506021
+datatype[].documenttype[].fieldsets{[document]}.fields[0] "descr"
+datatype[].documenttype[].fieldsets{[document]}.fields[1] "identity"
+datatype[].documenttype[].fieldsets{[document]}.fields[2] "keywords"
+datatype[].documenttype[].fieldsets{[document]}.fields[3] "title"
diff --git a/config-model/src/test/derived/ranktypes/ilscripts.cfg b/config-model/src/test/derived/ranktypes/ilscripts.cfg
index ee191aafe90..a8c039d5b6e 100644
--- a/config-model/src/test/derived/ranktypes/ilscripts.cfg
+++ b/config-model/src/test/derived/ranktypes/ilscripts.cfg
@@ -1,12 +1,12 @@
 maxtermoccurrences 100
 fieldmatchmaxlength 1000000
-ilscript[0].doctype "ranktypes"
-ilscript[0].docfield[0] "title"
-ilscript[0].docfield[1] "descr"
-ilscript[0].docfield[2] "keywords"
-ilscript[0].docfield[3] "identity"
-ilscript[0].content[0] "clear_state | guard { input identity | tokenize | index identity_literal; }"
-ilscript[0].content[1] "clear_state | guard { input title | tokenize normalize stem:\"SHORTEST\" | summary title | index title; }"
-ilscript[0].content[2] "clear_state | guard { input descr | tokenize normalize stem:\"SHORTEST\" | summary descr | index descr; }"
-ilscript[0].content[3] "clear_state | guard { input keywords | tokenize normalize stem:\"SHORTEST\" | index keywords; }"
-ilscript[0].content[4] "clear_state | guard { input identity | tokenize normalize stem:\"SHORTEST\" | index identity; }"
+ilscript[].doctype "ranktypes"
+ilscript[].docfield[0] "title"
+ilscript[].docfield[1] "descr"
+ilscript[].docfield[2] "keywords"
+ilscript[].docfield[3] "identity"
+ilscript[].content[0] "clear_state | guard { input identity | tokenize | index identity_literal; }"
+ilscript[].content[1] "clear_state | guard { input title | tokenize normalize stem:\"SHORTEST\" | summary title | index title; }"
+ilscript[].content[2] "clear_state | guard { input descr | tokenize normalize stem:\"SHORTEST\" | summary descr | index descr; }"
+ilscript[].content[3] "clear_state | guard { input keywords | tokenize normalize stem:\"SHORTEST\" | index keywords; }"
+ilscript[].content[4] "clear_state | guard { input identity | tokenize normalize stem:\"SHORTEST\" | index identity; }"
diff --git a/config-model/src/test/derived/ranktypes/index-info.cfg b/config-model/src/test/derived/ranktypes/index-info.cfg
index d3cbc4597ff..3d4ee9e9239 100644
--- a/config-model/src/test/derived/ranktypes/index-info.cfg
+++ b/config-model/src/test/derived/ranktypes/index-info.cfg
@@ -1,57 +1,57 @@
-indexinfo[0].name "ranktypes"
-indexinfo[0].command[0].indexname "sddocname"
-indexinfo[0].command[0].command "index"
-indexinfo[0].command[1].indexname "sddocname"
-indexinfo[0].command[1].command "word"
-indexinfo[0].command[2].indexname "title"
-indexinfo[0].command[2].command "index"
-indexinfo[0].command[3].indexname "title"
-indexinfo[0].command[3].command "lowercase"
-indexinfo[0].command[4].indexname "title"
-indexinfo[0].command[4].command "stem:SHORTEST"
-indexinfo[0].command[5].indexname "title"
-indexinfo[0].command[5].command "normalize"
-indexinfo[0].command[6].indexname "title"
-indexinfo[0].command[6].command "plain-tokens"
-indexinfo[0].command[7].indexname "descr"
-indexinfo[0].command[7].command "index"
-indexinfo[0].command[8].indexname "descr"
-indexinfo[0].command[8].command "lowercase"
-indexinfo[0].command[9].indexname "descr"
-indexinfo[0].command[9].command "stem:SHORTEST"
-indexinfo[0].command[10].indexname "descr"
-indexinfo[0].command[10].command "normalize"
-indexinfo[0].command[11].indexname "descr"
-indexinfo[0].command[11].command "plain-tokens"
-indexinfo[0].command[12].indexname "keywords"
-indexinfo[0].command[12].command "index"
-indexinfo[0].command[13].indexname "keywords"
-indexinfo[0].command[13].command "lowercase"
-indexinfo[0].command[14].indexname "keywords"
-indexinfo[0].command[14].command "stem:SHORTEST"
-indexinfo[0].command[15].indexname "keywords"
-indexinfo[0].command[15].command "normalize"
-indexinfo[0].command[16].indexname "keywords"
-indexinfo[0].command[16].command "plain-tokens"
-indexinfo[0].command[17].indexname "identity"
-indexinfo[0].command[17].command "index"
-indexinfo[0].command[18].indexname "identity"
-indexinfo[0].command[18].command "lowercase"
-indexinfo[0].command[19].indexname "identity"
-indexinfo[0].command[19].command "stem:SHORTEST"
-indexinfo[0].command[20].indexname "identity"
-indexinfo[0].command[20].command "normalize"
-indexinfo[0].command[21].indexname "identity"
-indexinfo[0].command[21].command "plain-tokens"
-indexinfo[0].command[22].indexname "identity"
-indexinfo[0].command[22].command "literal-boost"
-indexinfo[0].command[23].indexname "identity_literal"
-indexinfo[0].command[23].command "index"
-indexinfo[0].command[24].indexname "identity_literal"
-indexinfo[0].command[24].command "lowercase"
-indexinfo[0].command[25].indexname "identity_literal"
-indexinfo[0].command[25].command "plain-tokens"
-indexinfo[0].command[26].indexname "rankfeatures"
-indexinfo[0].command[26].command "index"
-indexinfo[0].command[27].indexname "summaryfeatures"
-indexinfo[0].command[27].command "index"
\ No newline at end of file
+indexinfo[].name "ranktypes"
+indexinfo[].command[].indexname "sddocname"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "sddocname"
+indexinfo[].command[].command "word"
+indexinfo[].command[].indexname "title"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "title"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "title"
+indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].indexname "title"
+indexinfo[].command[].command "normalize"
+indexinfo[].command[].indexname "title"
+indexinfo[].command[].command "plain-tokens"
+indexinfo[].command[].indexname "descr"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "descr"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "descr"
+indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].indexname "descr"
+indexinfo[].command[].command "normalize"
+indexinfo[].command[].indexname "descr"
+indexinfo[].command[].command "plain-tokens"
+indexinfo[].command[].indexname "keywords"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "keywords"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "keywords"
+indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].indexname "keywords"
+indexinfo[].command[].command "normalize"
+indexinfo[].command[].indexname "keywords"
+indexinfo[].command[].command "plain-tokens"
+indexinfo[].command[].indexname "identity"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "identity"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "identity"
+indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].indexname "identity"
+indexinfo[].command[].command "normalize"
+indexinfo[].command[].indexname "identity"
+indexinfo[].command[].command "plain-tokens"
+indexinfo[].command[].indexname "identity"
+indexinfo[].command[].command "literal-boost"
+indexinfo[].command[].indexname "identity_literal"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "identity_literal"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "identity_literal"
+indexinfo[].command[].command "plain-tokens"
+indexinfo[].command[].indexname "rankfeatures"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "summaryfeatures"
+indexinfo[].command[].command "index"
diff --git a/config-model/src/test/derived/ranktypes/rank-profiles.cfg b/config-model/src/test/derived/ranktypes/rank-profiles.cfg
index aee11c0bbef..c9162db27a8 100644
--- a/config-model/src/test/derived/ranktypes/rank-profiles.cfg
+++ b/config-model/src/test/derived/ranktypes/rank-profiles.cfg
@@ -1,79 +1,79 @@
-rankprofile[0].name "default"
-rankprofile[0].fef.property[0].name "nativeFieldMatch.firstOccurrenceTable.identity_literal"
-rankprofile[0].fef.property[0].value "linear(0,0)"
-rankprofile[0].fef.property[1].name "nativeFieldMatch.occurrenceCountTable.identity_literal"
-rankprofile[0].fef.property[1].value "linear(0,0)"
-rankprofile[0].fef.property[2].name "nativeProximity.proximityTable.identity_literal"
-rankprofile[0].fef.property[2].value "linear(0,0)"
-rankprofile[0].fef.property[3].name "nativeProximity.reverseProximityTable.identity_literal"
-rankprofile[0].fef.property[3].value "linear(0,0)"
-rankprofile[0].fef.property[4].name "nativeFieldMatch.firstOccurrenceTable.title"
-rankprofile[0].fef.property[4].value "expdecay(100,12.50)"
-rankprofile[0].fef.property[5].name "nativeFieldMatch.occurrenceCountTable.title"
-rankprofile[0].fef.property[5].value "loggrowth(1500,4000,19)"
-rankprofile[0].fef.property[6].name "nativeProximity.proximityTable.title"
-rankprofile[0].fef.property[6].value "expdecay(5000,3)"
-rankprofile[0].fef.property[7].name "nativeProximity.reverseProximityTable.title"
-rankprofile[0].fef.property[7].value "expdecay(3000,3)"
-rankprofile[0].fef.property[8].name "nativeFieldMatch.firstOccurrenceTable.descr"
-rankprofile[0].fef.property[8].value "expdecay(8000,12.50)"
-rankprofile[0].fef.property[9].name "nativeFieldMatch.occurrenceCountTable.descr"
-rankprofile[0].fef.property[9].value "loggrowth(1500,4000,19)"
-rankprofile[0].fef.property[10].name "nativeProximity.proximityTable.descr"
-rankprofile[0].fef.property[10].value "expdecay(500,3)"
-rankprofile[0].fef.property[11].name "nativeProximity.reverseProximityTable.descr"
-rankprofile[0].fef.property[11].value "expdecay(400,3)"
-rankprofile[0].fef.property[12].name "nativeFieldMatch.firstOccurrenceTable.keywords"
-rankprofile[0].fef.property[12].value "expdecay(8000,12.50)"
-rankprofile[0].fef.property[13].name "nativeFieldMatch.occurrenceCountTable.keywords"
-rankprofile[0].fef.property[13].value "loggrowth(1500,4000,19)"
-rankprofile[0].fef.property[14].name "nativeProximity.proximityTable.keywords"
-rankprofile[0].fef.property[14].value "expdecay(500,3)"
-rankprofile[0].fef.property[15].name "nativeProximity.reverseProximityTable.keywords"
-rankprofile[0].fef.property[15].value "expdecay(400,3)"
-rankprofile[0].fef.property[16].name "vespa.fieldweight.identity_literal"
-rankprofile[0].fef.property[16].value "200"
-rankprofile[1].name "unranked"
-rankprofile[1].fef.property[0].name "vespa.rank.firstphase"
-rankprofile[1].fef.property[0].value "value(0)"
-rankprofile[1].fef.property[1].name "vespa.hitcollector.heapsize"
-rankprofile[1].fef.property[1].value "0"
-rankprofile[1].fef.property[2].name "vespa.hitcollector.arraysize"
-rankprofile[1].fef.property[2].value "0"
-rankprofile[1].fef.property[3].name "vespa.dump.ignoredefaultfeatures"
-rankprofile[1].fef.property[3].value "true"
-rankprofile[2].name "override"
-rankprofile[2].fef.property[0].name "nativeFieldMatch.firstOccurrenceTable.descr"
-rankprofile[2].fef.property[0].value "expdecay(100,12.50)"
-rankprofile[2].fef.property[1].name "nativeFieldMatch.occurrenceCountTable.descr"
-rankprofile[2].fef.property[1].value "loggrowth(1500,4000,19)"
-rankprofile[2].fef.property[2].name "nativeProximity.proximityTable.descr"
-rankprofile[2].fef.property[2].value "expdecay(5000,3)"
-rankprofile[2].fef.property[3].name "nativeProximity.reverseProximityTable.descr"
-rankprofile[2].fef.property[3].value "expdecay(3000,3)"
-rankprofile[2].fef.property[4].name "nativeFieldMatch.firstOccurrenceTable.identity_literal"
-rankprofile[2].fef.property[4].value "linear(0,0)"
-rankprofile[2].fef.property[5].name "nativeFieldMatch.occurrenceCountTable.identity_literal"
-rankprofile[2].fef.property[5].value "linear(0,0)"
-rankprofile[2].fef.property[6].name "nativeProximity.proximityTable.identity_literal"
-rankprofile[2].fef.property[6].value "linear(0,0)"
-rankprofile[2].fef.property[7].name "nativeProximity.reverseProximityTable.identity_literal"
-rankprofile[2].fef.property[7].value "linear(0,0)"
-rankprofile[2].fef.property[8].name "nativeFieldMatch.firstOccurrenceTable.title"
-rankprofile[2].fef.property[8].value "expdecay(100,12.50)"
-rankprofile[2].fef.property[9].name "nativeFieldMatch.occurrenceCountTable.title"
-rankprofile[2].fef.property[9].value "loggrowth(1500,4000,19)"
-rankprofile[2].fef.property[10].name "nativeProximity.proximityTable.title"
-rankprofile[2].fef.property[10].value "expdecay(5000,3)"
-rankprofile[2].fef.property[11].name "nativeProximity.reverseProximityTable.title"
-rankprofile[2].fef.property[11].value "expdecay(3000,3)"
-rankprofile[2].fef.property[12].name "nativeFieldMatch.firstOccurrenceTable.keywords"
-rankprofile[2].fef.property[12].value "expdecay(8000,12.50)"
-rankprofile[2].fef.property[13].name "nativeFieldMatch.occurrenceCountTable.keywords"
-rankprofile[2].fef.property[13].value "loggrowth(1500,4000,19)"
-rankprofile[2].fef.property[14].name "nativeProximity.proximityTable.keywords"
-rankprofile[2].fef.property[14].value "expdecay(500,3)"
-rankprofile[2].fef.property[15].name "nativeProximity.reverseProximityTable.keywords"
-rankprofile[2].fef.property[15].value "expdecay(400,3)"
-rankprofile[2].fef.property[16].name "vespa.fieldweight.identity_literal"
-rankprofile[2].fef.property[16].value "200"
\ No newline at end of file
+rankprofile[].name "default"
+rankprofile[].fef.property[].name "nativeFieldMatch.firstOccurrenceTable.identity_literal"
+rankprofile[].fef.property[].value "linear(0,0)"
+rankprofile[].fef.property[].name "nativeFieldMatch.occurrenceCountTable.identity_literal"
+rankprofile[].fef.property[].value "linear(0,0)"
+rankprofile[].fef.property[].name "nativeProximity.proximityTable.identity_literal"
+rankprofile[].fef.property[].value "linear(0,0)"
+rankprofile[].fef.property[].name "nativeProximity.reverseProximityTable.identity_literal"
+rankprofile[].fef.property[].value "linear(0,0)"
+rankprofile[].fef.property[].name "nativeFieldMatch.firstOccurrenceTable.title"
+rankprofile[].fef.property[].value "expdecay(100,12.50)"
+rankprofile[].fef.property[].name "nativeFieldMatch.occurrenceCountTable.title"
+rankprofile[].fef.property[].value "loggrowth(1500,4000,19)"
+rankprofile[].fef.property[].name "nativeProximity.proximityTable.title"
+rankprofile[].fef.property[].value "expdecay(5000,3)"
+rankprofile[].fef.property[].name "nativeProximity.reverseProximityTable.title"
+rankprofile[].fef.property[].value "expdecay(3000,3)"
+rankprofile[].fef.property[].name "nativeFieldMatch.firstOccurrenceTable.descr"
+rankprofile[].fef.property[].value "expdecay(8000,12.50)"
+rankprofile[].fef.property[].name "nativeFieldMatch.occurrenceCountTable.descr"
+rankprofile[].fef.property[].value "loggrowth(1500,4000,19)"
+rankprofile[].fef.property[].name "nativeProximity.proximityTable.descr"
+rankprofile[].fef.property[].value "expdecay(500,3)"
+rankprofile[].fef.property[].name "nativeProximity.reverseProximityTable.descr"
+rankprofile[].fef.property[].value "expdecay(400,3)"
+rankprofile[].fef.property[].name "nativeFieldMatch.firstOccurrenceTable.keywords"
+rankprofile[].fef.property[].value "expdecay(8000,12.50)"
+rankprofile[].fef.property[].name "nativeFieldMatch.occurrenceCountTable.keywords"
+rankprofile[].fef.property[].value "loggrowth(1500,4000,19)"
+rankprofile[].fef.property[].name "nativeProximity.proximityTable.keywords"
+rankprofile[].fef.property[].value "expdecay(500,3)"
+rankprofile[].fef.property[].name "nativeProximity.reverseProximityTable.keywords"
+rankprofile[].fef.property[].value "expdecay(400,3)"
+rankprofile[].fef.property[].name "vespa.fieldweight.identity_literal"
+rankprofile[].fef.property[].value "200"
+rankprofile[].name "unranked"
+rankprofile[].fef.property[].name "vespa.rank.firstphase"
+rankprofile[].fef.property[].value "value(0)"
+rankprofile[].fef.property[].name "vespa.hitcollector.heapsize"
+rankprofile[].fef.property[].value "0"
+rankprofile[].fef.property[].name "vespa.hitcollector.arraysize"
+rankprofile[].fef.property[].value "0"
+rankprofile[].fef.property[].name "vespa.dump.ignoredefaultfeatures"
+rankprofile[].fef.property[].value "true"
+rankprofile[].name "override"
+rankprofile[].fef.property[].name "nativeFieldMatch.firstOccurrenceTable.descr"
+rankprofile[].fef.property[].value "expdecay(100,12.50)"
+rankprofile[].fef.property[].name "nativeFieldMatch.occurrenceCountTable.descr"
+rankprofile[].fef.property[].value "loggrowth(1500,4000,19)"
+rankprofile[].fef.property[].name "nativeProximity.proximityTable.descr"
+rankprofile[].fef.property[].value "expdecay(5000,3)"
+rankprofile[].fef.property[].name "nativeProximity.reverseProximityTable.descr"
+rankprofile[].fef.property[].value "expdecay(3000,3)"
+rankprofile[].fef.property[].name "nativeFieldMatch.firstOccurrenceTable.identity_literal"
+rankprofile[].fef.property[].value "linear(0,0)"
+rankprofile[].fef.property[].name "nativeFieldMatch.occurrenceCountTable.identity_literal"
+rankprofile[].fef.property[].value "linear(0,0)"
+rankprofile[].fef.property[].name "nativeProximity.proximityTable.identity_literal"
+rankprofile[].fef.property[].value "linear(0,0)"
+rankprofile[].fef.property[].name "nativeProximity.reverseProximityTable.identity_literal"
+rankprofile[].fef.property[].value "linear(0,0)"
+rankprofile[].fef.property[].name "nativeFieldMatch.firstOccurrenceTable.title"
+rankprofile[].fef.property[].value "expdecay(100,12.50)"
+rankprofile[].fef.property[].name "nativeFieldMatch.occurrenceCountTable.title"
+rankprofile[].fef.property[].value "loggrowth(1500,4000,19)"
+rankprofile[].fef.property[].name "nativeProximity.proximityTable.title"
+rankprofile[].fef.property[].value "expdecay(5000,3)"
+rankprofile[].fef.property[].name "nativeProximity.reverseProximityTable.title"
+rankprofile[].fef.property[].value "expdecay(3000,3)"
+rankprofile[].fef.property[].name "nativeFieldMatch.firstOccurrenceTable.keywords"
+rankprofile[].fef.property[].value "expdecay(8000,12.50)"
+rankprofile[].fef.property[].name "nativeFieldMatch.occurrenceCountTable.keywords"
+rankprofile[].fef.property[].value "loggrowth(1500,4000,19)"
+rankprofile[].fef.property[].name "nativeProximity.proximityTable.keywords"
+rankprofile[].fef.property[].value "expdecay(500,3)"
+rankprofile[].fef.property[].name "nativeProximity.reverseProximityTable.keywords"
+rankprofile[].fef.property[].value "expdecay(400,3)"
+rankprofile[].fef.property[].name "vespa.fieldweight.identity_literal"
+rankprofile[].fef.property[].value "200"
diff --git a/config-model/src/test/derived/ranktypes/summary.cfg b/config-model/src/test/derived/ranktypes/summary.cfg
index aaf8398b303..9644eb878ea 100644
--- a/config-model/src/test/derived/ranktypes/summary.cfg
+++ b/config-model/src/test/derived/ranktypes/summary.cfg
@@ -1,13 +1,13 @@
 defaultsummaryid 1567556360
-classes[0].id 1567556360
-classes[0].name "default"
-classes[0].fields[0].name "title"
-classes[0].fields[0].type "longstring"
-classes[0].fields[1].name "descr"
-classes[0].fields[1].type "longstring"
-classes[0].fields[2].name "rankfeatures"
-classes[0].fields[2].type "featuredata"
-classes[0].fields[3].name "summaryfeatures"
-classes[0].fields[3].type "featuredata"
-classes[0].fields[4].name "documentid"
-classes[0].fields[4].type "longstring"
\ No newline at end of file
+classes[].id 1567556360
+classes[].name "default"
+classes[].fields[].name "title"
+classes[].fields[].type "longstring"
+classes[].fields[].name "descr"
+classes[].fields[].type "longstring"
+classes[].fields[].name "rankfeatures"
+classes[].fields[].type "featuredata"
+classes[].fields[].name "summaryfeatures"
+classes[].fields[].type "featuredata"
+classes[].fields[].name "documentid"
+classes[].fields[].type "longstring"
diff --git a/config-model/src/test/derived/ranktypes/summarymap.cfg b/config-model/src/test/derived/ranktypes/summarymap.cfg
index 42b6e811ee6..8956a146b74 100644
--- a/config-model/src/test/derived/ranktypes/summarymap.cfg
+++ b/config-model/src/test/derived/ranktypes/summarymap.cfg
@@ -1,7 +1,7 @@
 defaultoutputclass -1
-override[0].field "rankfeatures"
-override[0].command "rankfeatures"
-override[0].arguments ""
-override[1].field "summaryfeatures"
-override[1].command "summaryfeatures"
-override[1].arguments ""
\ No newline at end of file
+override[].field "rankfeatures"
+override[].command "rankfeatures"
+override[].arguments ""
+override[].field "summaryfeatures"
+override[].command "summaryfeatures"
+override[].arguments ""