Unify on empty array indexes

5 files changed, 190 insertions, 190 deletions

diff --git a/config-model/src/test/derived/prefixexactattribute/attributes.cfg b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
index 180b2f4f840..a266c9bab7c 100644
--- a/config-model/src/test/derived/prefixexactattribute/attributes.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
@@ -1,40 +1,40 @@
-attribute[0].name "attributefield1"
-attribute[0].datatype STRING
-attribute[0].collectiontype SINGLE
-attribute[0].removeifzero false
-attribute[0].createifnonexistent false
-attribute[0].fastsearch false
-attribute[0].huge false
-attribute[0].sortascending true
-attribute[0].sortfunction UCA
-attribute[0].sortstrength PRIMARY
-attribute[0].sortlocale ""
-attribute[0].enablebitvectors false
-attribute[0].enableonlybitvector false
-attribute[0].fastaccess false
-attribute[0].arity 8
-attribute[0].lowerbound -9223372036854775808
-attribute[0].upperbound 9223372036854775807
-attribute[0].densepostinglistthreshold 0.4
-attribute[0].tensortype ""
-attribute[0].imported false
-attribute[1].name "attributefield2"
-attribute[1].datatype STRING
-attribute[1].collectiontype SINGLE
-attribute[1].removeifzero false
-attribute[1].createifnonexistent false
-attribute[1].fastsearch false
-attribute[1].huge false
-attribute[1].sortascending true
-attribute[1].sortfunction UCA
-attribute[1].sortstrength PRIMARY
-attribute[1].sortlocale ""
-attribute[1].enablebitvectors false
-attribute[1].enableonlybitvector false
-attribute[1].fastaccess false
-attribute[1].arity 8
-attribute[1].lowerbound -9223372036854775808
-attribute[1].upperbound 9223372036854775807
-attribute[1].densepostinglistthreshold 0.4
-attribute[1].tensortype ""
-attribute[1].imported false
\ No newline at end of file
+attribute[].name "attributefield1"
+attribute[].datatype STRING
+attribute[].collectiontype SINGLE
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype ""
+attribute[].imported false
+attribute[].name "attributefield2"
+attribute[].datatype STRING
+attribute[].collectiontype SINGLE
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype ""
+attribute[].imported false
diff --git a/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg b/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg
index 41e39ac52df..aa374bd18ce 100644
--- a/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg
@@ -1,61 +1,61 @@
 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 -739138930
-datatype[1].structtype[0].name "prefixexactattribute.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 "indexfield0"
-datatype[1].structtype[0].field[0].datatype 2
-datatype[1].structtype[0].field[0].detailedtype ""
-datatype[1].structtype[0].field[1].name "attributefield1"
-datatype[1].structtype[0].field[1].datatype 2
-datatype[1].structtype[0].field[1].detailedtype ""
-datatype[1].structtype[0].field[2].name "attributefield2"
-datatype[1].structtype[0].field[2].datatype 2
-datatype[1].structtype[0].field[2].detailedtype ""
-datatype[1].structtype[0].field[3].name "indexfield1"
-datatype[1].structtype[0].field[3].datatype 2
-datatype[1].structtype[0].field[3].detailedtype ""
-datatype[1].structtype[0].field[4].name "indexfield2"
-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 -480519133
-datatype[2].structtype[0].name "prefixexactattribute.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 -1812793455
-datatype[3].documenttype[0].name "prefixexactattribute"
-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 -739138930
-datatype[3].documenttype[0].bodystruct -480519133
-datatype[3].documenttype[0].fieldsets{[document]}.fields[0] "attributefield1"
-datatype[3].documenttype[0].fieldsets{[document]}.fields[1] "attributefield2"
-datatype[3].documenttype[0].fieldsets{[document]}.fields[2] "indexfield0"
-datatype[3].documenttype[0].fieldsets{[document]}.fields[3] "indexfield1"
-datatype[3].documenttype[0].fieldsets{[document]}.fields[4] "indexfield2"
+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 -739138930
+datatype[].structtype[].name "prefixexactattribute.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 "indexfield0"
+datatype[].structtype[].field[].datatype 2
+datatype[].structtype[].field[].detailedtype ""
+datatype[].structtype[].field[].name "attributefield1"
+datatype[].structtype[].field[].datatype 2
+datatype[].structtype[].field[].detailedtype ""
+datatype[].structtype[].field[].name "attributefield2"
+datatype[].structtype[].field[].datatype 2
+datatype[].structtype[].field[].detailedtype ""
+datatype[].structtype[].field[].name "indexfield1"
+datatype[].structtype[].field[].datatype 2
+datatype[].structtype[].field[].detailedtype ""
+datatype[].structtype[].field[].name "indexfield2"
+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 -480519133
+datatype[].structtype[].name "prefixexactattribute.body"
+datatype[].structtype[].version 0
+datatype[].structtype[].compresstype NONE
+datatype[].structtype[].compresslevel 0
+datatype[].structtype[].compressthreshold 95
+datatype[].structtype[].compressminsize 800
+datatype[].id -1812793455
+datatype[].documenttype[].name "prefixexactattribute"
+datatype[].documenttype[].version 0
+datatype[].documenttype[].inherits[].name "document"
+datatype[].documenttype[].inherits[].version 0
+datatype[].documenttype[].headerstruct -739138930
+datatype[].documenttype[].bodystruct -480519133
+datatype[].documenttype[].fieldsets{[document]}.fields[0] "attributefield1"
+datatype[].documenttype[].fieldsets{[document]}.fields[1] "attributefield2"
+datatype[].documenttype[].fieldsets{[document]}.fields[2] "indexfield0"
+datatype[].documenttype[].fieldsets{[document]}.fields[3] "indexfield1"
+datatype[].documenttype[].fieldsets{[document]}.fields[4] "indexfield2"
diff --git a/config-model/src/test/derived/prefixexactattribute/ilscripts.cfg b/config-model/src/test/derived/prefixexactattribute/ilscripts.cfg
index eb7dadf8c1a..1d3a25c2dde 100644
--- a/config-model/src/test/derived/prefixexactattribute/ilscripts.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/ilscripts.cfg
@@ -1,13 +1,13 @@
 maxtermoccurrences 100
 fieldmatchmaxlength 1000000
-ilscript[0].doctype "prefixexactattribute"
-ilscript[0].docfield[0] "indexfield0"
-ilscript[0].docfield[1] "attributefield1"
-ilscript[0].docfield[2] "attributefield2"
-ilscript[0].docfield[3] "indexfield1"
-ilscript[0].docfield[4] "indexfield2"
-ilscript[0].content[0] "clear_state | guard { input indexfield0 | tokenize normalize stem:\"SHORTEST\" max-length:79 | index indexfield0; }"
-ilscript[0].content[1] "clear_state | guard { input attributefield1 | attribute attributefield1; }"
-ilscript[0].content[2] "clear_state | guard { input attributefield2 | attribute attributefield2; }"
-ilscript[0].content[3] "clear_state | guard { input indexfield1 | exact | index indexfield1; }"
-ilscript[0].content[4] "clear_state | guard { input indexfield2 | exact | index indexfield2; }"
+ilscript[].doctype "prefixexactattribute"
+ilscript[].docfield[0] "indexfield0"
+ilscript[].docfield[1] "attributefield1"
+ilscript[].docfield[2] "attributefield2"
+ilscript[].docfield[3] "indexfield1"
+ilscript[].docfield[4] "indexfield2"
+ilscript[].content[0] "clear_state | guard { input indexfield0 | tokenize normalize stem:\"SHORTEST\" max-length:79 | index indexfield0; }"
+ilscript[].content[1] "clear_state | guard { input attributefield1 | attribute attributefield1; }"
+ilscript[].content[2] "clear_state | guard { input attributefield2 | attribute attributefield2; }"
+ilscript[].content[3] "clear_state | guard { input indexfield1 | exact | index indexfield1; }"
+ilscript[].content[4] "clear_state | guard { input indexfield2 | exact | index indexfield2; }"
diff --git a/config-model/src/test/derived/prefixexactattribute/index-info.cfg b/config-model/src/test/derived/prefixexactattribute/index-info.cfg
index f6a6b7ab32d..6429d34c5f9 100644
--- a/config-model/src/test/derived/prefixexactattribute/index-info.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/index-info.cfg
@@ -1,43 +1,43 @@
-indexinfo[0].name "prefixexactattribute"
-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 "indexfield0"
-indexinfo[0].command[2].command "index"
-indexinfo[0].command[3].indexname "indexfield0"
-indexinfo[0].command[3].command "lowercase"
-indexinfo[0].command[4].indexname "indexfield0"
-indexinfo[0].command[4].command "stem:SHORTEST"
-indexinfo[0].command[5].indexname "indexfield0"
-indexinfo[0].command[5].command "normalize"
-indexinfo[0].command[6].indexname "indexfield0"
-indexinfo[0].command[6].command "plain-tokens"
-indexinfo[0].command[7].indexname "attributefield1"
-indexinfo[0].command[7].command "index"
-indexinfo[0].command[8].indexname "attributefield1"
-indexinfo[0].command[8].command "attribute"
-indexinfo[0].command[9].indexname "attributefield1"
-indexinfo[0].command[9].command "exact @"
-indexinfo[0].command[10].indexname "attributefield2"
-indexinfo[0].command[10].command "index"
-indexinfo[0].command[11].indexname "attributefield2"
-indexinfo[0].command[11].command "attribute"
-indexinfo[0].command[12].indexname "attributefield2"
-indexinfo[0].command[12].command "exact @"
-indexinfo[0].command[13].indexname "indexfield1"
-indexinfo[0].command[13].command "index"
-indexinfo[0].command[14].indexname "indexfield1"
-indexinfo[0].command[14].command "lowercase"
-indexinfo[0].command[15].indexname "indexfield1"
-indexinfo[0].command[15].command "exact @"
-indexinfo[0].command[16].indexname "indexfield2"
-indexinfo[0].command[16].command "index"
-indexinfo[0].command[17].indexname "indexfield2"
-indexinfo[0].command[17].command "lowercase"
-indexinfo[0].command[18].indexname "indexfield2"
-indexinfo[0].command[18].command "exact @"
-indexinfo[0].command[19].indexname "rankfeatures"
-indexinfo[0].command[19].command "index"
-indexinfo[0].command[20].indexname "summaryfeatures"
-indexinfo[0].command[20].command "index"
\ No newline at end of file
+indexinfo[].name "prefixexactattribute"
+indexinfo[].command[].indexname "sddocname"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "sddocname"
+indexinfo[].command[].command "word"
+indexinfo[].command[].indexname "indexfield0"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "indexfield0"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "indexfield0"
+indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].indexname "indexfield0"
+indexinfo[].command[].command "normalize"
+indexinfo[].command[].indexname "indexfield0"
+indexinfo[].command[].command "plain-tokens"
+indexinfo[].command[].indexname "attributefield1"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "attributefield1"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "attributefield1"
+indexinfo[].command[].command "exact @"
+indexinfo[].command[].indexname "attributefield2"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "attributefield2"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "attributefield2"
+indexinfo[].command[].command "exact @"
+indexinfo[].command[].indexname "indexfield1"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "indexfield1"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "indexfield1"
+indexinfo[].command[].command "exact @"
+indexinfo[].command[].indexname "indexfield2"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "indexfield2"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "indexfield2"
+indexinfo[].command[].command "exact @"
+indexinfo[].command[].indexname "rankfeatures"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "summaryfeatures"
+indexinfo[].command[].command "index"
diff --git a/config-model/src/test/derived/prefixexactattribute/vsmfields.cfg b/config-model/src/test/derived/prefixexactattribute/vsmfields.cfg
index 598dfc0b6b1..29bcde9faad 100644
--- a/config-model/src/test/derived/prefixexactattribute/vsmfields.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/vsmfields.cfg
@@ -1,38 +1,38 @@
 documentverificationlevel 0
 searchall 1
-fieldspec[0].name "indexfield0"
-fieldspec[0].searchmethod AUTOUTF8
-fieldspec[0].arg1 "prefix"
-fieldspec[0].maxlength 79
-fieldspec[0].fieldtype INDEX
-fieldspec[1].name "attributefield1"
-fieldspec[1].searchmethod AUTOUTF8
-fieldspec[1].arg1 "exact"
-fieldspec[1].maxlength 1048576
-fieldspec[1].fieldtype ATTRIBUTE
-fieldspec[2].name "attributefield2"
-fieldspec[2].searchmethod AUTOUTF8
-fieldspec[2].arg1 "exact"
-fieldspec[2].maxlength 1048576
-fieldspec[2].fieldtype ATTRIBUTE
-fieldspec[3].name "indexfield1"
-fieldspec[3].searchmethod AUTOUTF8
-fieldspec[3].arg1 "exact"
-fieldspec[3].maxlength 1048576
-fieldspec[3].fieldtype INDEX
-fieldspec[4].name "indexfield2"
-fieldspec[4].searchmethod AUTOUTF8
-fieldspec[4].arg1 "exact"
-fieldspec[4].maxlength 1048576
-fieldspec[4].fieldtype INDEX
-documenttype[0].name "prefixexactattribute"
-documenttype[0].index[0].name "indexfield0"
-documenttype[0].index[0].field[0].name "indexfield0"
-documenttype[0].index[1].name "attributefield1"
-documenttype[0].index[1].field[0].name "attributefield1"
-documenttype[0].index[2].name "attributefield2"
-documenttype[0].index[2].field[0].name "attributefield2"
-documenttype[0].index[3].name "indexfield1"
-documenttype[0].index[3].field[0].name "indexfield1"
-documenttype[0].index[4].name "indexfield2"
-documenttype[0].index[4].field[0].name "indexfield2"
\ No newline at end of file
+fieldspec[].name "indexfield0"
+fieldspec[].searchmethod AUTOUTF8
+fieldspec[].arg1 "prefix"
+fieldspec[].maxlength 79
+fieldspec[].fieldtype INDEX
+fieldspec[].name "attributefield1"
+fieldspec[].searchmethod AUTOUTF8
+fieldspec[].arg1 "exact"
+fieldspec[].maxlength 1048576
+fieldspec[].fieldtype ATTRIBUTE
+fieldspec[].name "attributefield2"
+fieldspec[].searchmethod AUTOUTF8
+fieldspec[].arg1 "exact"
+fieldspec[].maxlength 1048576
+fieldspec[].fieldtype ATTRIBUTE
+fieldspec[].name "indexfield1"
+fieldspec[].searchmethod AUTOUTF8
+fieldspec[].arg1 "exact"
+fieldspec[].maxlength 1048576
+fieldspec[].fieldtype INDEX
+fieldspec[].name "indexfield2"
+fieldspec[].searchmethod AUTOUTF8
+fieldspec[].arg1 "exact"
+fieldspec[].maxlength 1048576
+fieldspec[].fieldtype INDEX
+documenttype[].name "prefixexactattribute"
+documenttype[].index[].name "indexfield0"
+documenttype[].index[].field[].name "indexfield0"
+documenttype[].index[].name "attributefield1"
+documenttype[].index[].field[].name "attributefield1"
+documenttype[].index[].name "attributefield2"
+documenttype[].index[].field[].name "attributefield2"
+documenttype[].index[].name "indexfield1"
+documenttype[].index[].field[].name "indexfield1"
+documenttype[].index[].name "indexfield2"
+documenttype[].index[].field[].name "indexfield2"