Remove v6 and v7 from java side.

9 files changed, 2 insertions, 55 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java
index 86be74dd6f8..b09f85726e5 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java
@@ -6,7 +6,8 @@ import com.yahoo.searchdefinition.Search;
 import com.yahoo.searchdefinition.derived.DerivedConfiguration;
 import com.yahoo.searchdefinition.derived.IndexingScript;
 import com.yahoo.vespa.indexinglanguage.ExpressionVisitor;
-import com.yahoo.vespa.indexinglanguage.expressions.*;
+import com.yahoo.vespa.indexinglanguage.expressions.Expression;
+import com.yahoo.vespa.indexinglanguage.expressions.OutputExpression;
 
 /**
  * @author <a href="mailto:mlidal@yahoo-inc.com">Mathias M Lidal</a>
diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java
index cf294c2af1a..d4228b52746 100644
--- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java
+++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java
@@ -140,7 +140,6 @@ public class DocumentTypes {
                     new DocumenttypesConfig.Documenttype.Datatype.Sstruct.Field.Builder();
             builder.name(field.getName()).
                     id(field.getId()).
-                    id_v6(field.getIdV6()).
                     datatype(field.getDataType().getId());
             if (field.getDataType() instanceof TensorDataType) {
                 builder.detailedtype(((TensorDataType) field.getDataType()).getTensorType().toString());
diff --git a/config-model/src/test/configmodel/types/documenttypes.cfg b/config-model/src/test/configmodel/types/documenttypes.cfg
index 0a78e18dd40..8c88ee4f4e0 100644
--- a/config-model/src/test/configmodel/types/documenttypes.cfg
+++ b/config-model/src/test/configmodel/types/documenttypes.cfg
@@ -37,22 +37,18 @@ documenttype[0].datatype[1].sstruct.compression.threshold 95
 documenttype[0].datatype[1].sstruct.compression.minsize 200
 documenttype[0].datatype[1].sstruct.field[0].name "Version"
 documenttype[0].datatype[1].sstruct.field[0].id 64430502
-documenttype[0].datatype[1].sstruct.field[0].id_v6 634243672
 documenttype[0].datatype[1].sstruct.field[0].datatype 0
 documenttype[0].datatype[1].sstruct.field[0].detailedtype ""
 documenttype[0].datatype[1].sstruct.field[1].name "Name"
 documenttype[0].datatype[1].sstruct.field[1].id 2002760220
-documenttype[0].datatype[1].sstruct.field[1].id_v6 62942997
 documenttype[0].datatype[1].sstruct.field[1].datatype 2
 documenttype[0].datatype[1].sstruct.field[1].detailedtype ""
 documenttype[0].datatype[1].sstruct.field[2].name "FlagsCounter"
 documenttype[0].datatype[1].sstruct.field[2].id 1741227606
-documenttype[0].datatype[1].sstruct.field[2].id_v6 1287497652
 documenttype[0].datatype[1].sstruct.field[2].datatype -1865479609
 documenttype[0].datatype[1].sstruct.field[2].detailedtype ""
 documenttype[0].datatype[1].sstruct.field[3].name "anotherfolder"
 documenttype[0].datatype[1].sstruct.field[3].id 1582421848
-documenttype[0].datatype[1].sstruct.field[3].id_v6 1898725199
 documenttype[0].datatype[1].sstruct.field[3].datatype 294108848
 documenttype[0].datatype[1].sstruct.field[3].detailedtype ""
 documenttype[0].datatype[2].id 109267174
@@ -72,12 +68,10 @@ documenttype[0].datatype[2].sstruct.compression.threshold 95
 documenttype[0].datatype[2].sstruct.compression.minsize 200
 documenttype[0].datatype[2].sstruct.field[0].name "s1"
 documenttype[0].datatype[2].sstruct.field[0].id 2146820765
-documenttype[0].datatype[2].sstruct.field[0].id_v6 142373281
 documenttype[0].datatype[2].sstruct.field[0].datatype 2
 documenttype[0].datatype[2].sstruct.field[0].detailedtype ""
 documenttype[0].datatype[2].sstruct.field[1].name "s2"
 documenttype[0].datatype[2].sstruct.field[1].id 45366795
-documenttype[0].datatype[2].sstruct.field[1].id_v6 31106270
 documenttype[0].datatype[2].sstruct.field[1].datatype 2
 documenttype[0].datatype[2].sstruct.field[1].detailedtype ""
 documenttype[0].datatype[3].id 49942803
@@ -127,22 +121,18 @@ documenttype[0].datatype[5].sstruct.compression.threshold 95
 documenttype[0].datatype[5].sstruct.compression.minsize 200
 documenttype[0].datatype[5].sstruct.field[0].name "bytearr"
 documenttype[0].datatype[5].sstruct.field[0].id 1079701754
-documenttype[0].datatype[5].sstruct.field[0].id_v6 1198855694
 documenttype[0].datatype[5].sstruct.field[0].datatype 49942803
 documenttype[0].datatype[5].sstruct.field[0].detailedtype ""
 documenttype[0].datatype[5].sstruct.field[1].name "mymap"
 documenttype[0].datatype[5].sstruct.field[1].id 1954178122
-documenttype[0].datatype[5].sstruct.field[1].id_v6 707189723
 documenttype[0].datatype[5].sstruct.field[1].datatype 339965458
 documenttype[0].datatype[5].sstruct.field[1].detailedtype ""
 documenttype[0].datatype[5].sstruct.field[2].name "title"
 documenttype[0].datatype[5].sstruct.field[2].id 567626448
-documenttype[0].datatype[5].sstruct.field[2].id_v6 29129762
 documenttype[0].datatype[5].sstruct.field[2].datatype 2
 documenttype[0].datatype[5].sstruct.field[2].detailedtype ""
 documenttype[0].datatype[5].sstruct.field[3].name "structfield"
 documenttype[0].datatype[5].sstruct.field[3].id 1726890940
-documenttype[0].datatype[5].sstruct.field[3].id_v6 418303145
 documenttype[0].datatype[5].sstruct.field[3].datatype 2
 documenttype[0].datatype[5].sstruct.field[3].detailedtype ""
 documenttype[0].datatype[6].id -1245117006
@@ -447,142 +437,114 @@ documenttype[0].datatype[25].sstruct.compression.threshold 95
 documenttype[0].datatype[25].sstruct.compression.minsize 200
 documenttype[0].datatype[25].sstruct.field[0].name "abyte"
 documenttype[0].datatype[25].sstruct.field[0].id 110138156
-documenttype[0].datatype[25].sstruct.field[0].id_v6 1369099343
 documenttype[0].datatype[25].sstruct.field[0].datatype 16
 documenttype[0].datatype[25].sstruct.field[0].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[1].name "along"
 documenttype[0].datatype[25].sstruct.field[1].id 1206464520
-documenttype[0].datatype[25].sstruct.field[1].id_v6 871280609
 documenttype[0].datatype[25].sstruct.field[1].datatype 4
 documenttype[0].datatype[25].sstruct.field[1].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[2].name "arrayfield"
 documenttype[0].datatype[25].sstruct.field[2].id 965790107
-documenttype[0].datatype[25].sstruct.field[2].id_v6 1010955705
 documenttype[0].datatype[25].sstruct.field[2].datatype -1245117006
 documenttype[0].datatype[25].sstruct.field[2].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[3].name "setfield"
 documenttype[0].datatype[25].sstruct.field[3].id 761581914
-documenttype[0].datatype[25].sstruct.field[3].id_v6 1762943268
 documenttype[0].datatype[25].sstruct.field[3].datatype 1328286588
 documenttype[0].datatype[25].sstruct.field[3].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[4].name "pos"
 documenttype[0].datatype[25].sstruct.field[4].id 1041567475
-documenttype[0].datatype[25].sstruct.field[4].id_v6 26353693
 documenttype[0].datatype[25].sstruct.field[4].datatype 1381038251
 documenttype[0].datatype[25].sstruct.field[4].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[5].name "setfield2"
 documenttype[0].datatype[25].sstruct.field[5].id 1066659198
-documenttype[0].datatype[25].sstruct.field[5].id_v6 813038565
 documenttype[0].datatype[25].sstruct.field[5].datatype 18
 documenttype[0].datatype[25].sstruct.field[5].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[6].name "setfield3"
 documenttype[0].datatype[25].sstruct.field[6].id 1180155772
-documenttype[0].datatype[25].sstruct.field[6].id_v6 1697232199
 documenttype[0].datatype[25].sstruct.field[6].datatype 2125328771
 documenttype[0].datatype[25].sstruct.field[6].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[7].name "setfield4"
 documenttype[0].datatype[25].sstruct.field[7].id 1254131631
-documenttype[0].datatype[25].sstruct.field[7].id_v6 119755202
 documenttype[0].datatype[25].sstruct.field[7].datatype 2065577986
 documenttype[0].datatype[25].sstruct.field[7].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[8].name "tagfield"
 documenttype[0].datatype[25].sstruct.field[8].id 1653562069
-documenttype[0].datatype[25].sstruct.field[8].id_v6 938523246
 documenttype[0].datatype[25].sstruct.field[8].datatype 18
 documenttype[0].datatype[25].sstruct.field[8].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[9].name "structfield"
 documenttype[0].datatype[25].sstruct.field[9].id 486207386
-documenttype[0].datatype[25].sstruct.field[9].id_v6 418303145
 documenttype[0].datatype[25].sstruct.field[9].datatype 109267174
 documenttype[0].datatype[25].sstruct.field[9].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[10].name "structarrayfield"
 documenttype[0].datatype[25].sstruct.field[10].id 335048518
-documenttype[0].datatype[25].sstruct.field[10].id_v6 607034174
 documenttype[0].datatype[25].sstruct.field[10].datatype -1244829667
 documenttype[0].datatype[25].sstruct.field[10].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[11].name "stringmapfield"
 documenttype[0].datatype[25].sstruct.field[11].id 117465687
-documenttype[0].datatype[25].sstruct.field[11].id_v6 1492788095
 documenttype[0].datatype[25].sstruct.field[11].datatype 339965458
 documenttype[0].datatype[25].sstruct.field[11].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[12].name "intmapfield"
 documenttype[0].datatype[25].sstruct.field[12].id 121004462
-documenttype[0].datatype[25].sstruct.field[12].id_v6 1642487905
 documenttype[0].datatype[25].sstruct.field[12].datatype -1584287606
 documenttype[0].datatype[25].sstruct.field[12].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[13].name "floatmapfield"
 documenttype[0].datatype[25].sstruct.field[13].id 1239120925
-documenttype[0].datatype[25].sstruct.field[13].id_v6 1609437589
 documenttype[0].datatype[25].sstruct.field[13].datatype 2125154557
 documenttype[0].datatype[25].sstruct.field[13].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[14].name "longmapfield"
 documenttype[0].datatype[25].sstruct.field[14].id 477718745
-documenttype[0].datatype[25].sstruct.field[14].id_v6 920341968
 documenttype[0].datatype[25].sstruct.field[14].datatype -1715531035
 documenttype[0].datatype[25].sstruct.field[14].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[15].name "doublemapfield"
 documenttype[0].datatype[25].sstruct.field[15].id 877047192
-documenttype[0].datatype[25].sstruct.field[15].id_v6 957317090
 documenttype[0].datatype[25].sstruct.field[15].datatype 2138385264
 documenttype[0].datatype[25].sstruct.field[15].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[16].name "arraymapfield"
 documenttype[0].datatype[25].sstruct.field[16].id 1670805928
-documenttype[0].datatype[25].sstruct.field[16].id_v6 1940354311
 documenttype[0].datatype[25].sstruct.field[16].datatype 435886609
 documenttype[0].datatype[25].sstruct.field[16].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[17].name "arrarr"
 documenttype[0].datatype[25].sstruct.field[17].id 1962567166
-documenttype[0].datatype[25].sstruct.field[17].id_v6 885141301
 documenttype[0].datatype[25].sstruct.field[17].datatype -794985308
 documenttype[0].datatype[25].sstruct.field[17].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[18].name "maparr"
 documenttype[0].datatype[25].sstruct.field[18].id 904375219
-documenttype[0].datatype[25].sstruct.field[18].id_v6 63700074
 documenttype[0].datatype[25].sstruct.field[18].datatype 69621385
 documenttype[0].datatype[25].sstruct.field[18].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[19].name "complexarray"
 documenttype[0].datatype[25].sstruct.field[19].id 795629533
-documenttype[0].datatype[25].sstruct.field[19].id_v6 658530305
 documenttype[0].datatype[25].sstruct.field[19].datatype 1416345047
 documenttype[0].datatype[25].sstruct.field[19].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[20].name "mystructfield"
 documenttype[0].datatype[25].sstruct.field[20].id 1348513378
-documenttype[0].datatype[25].sstruct.field[20].id_v6 2033170300
 documenttype[0].datatype[25].sstruct.field[20].datatype -2092985853
 documenttype[0].datatype[25].sstruct.field[20].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[21].name "mystructmap"
 documenttype[0].datatype[25].sstruct.field[21].id 1511423250
-documenttype[0].datatype[25].sstruct.field[21].id_v6 449602635
 documenttype[0].datatype[25].sstruct.field[21].datatype 1901258752
 documenttype[0].datatype[25].sstruct.field[21].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[22].name "mystructarr"
 documenttype[0].datatype[25].sstruct.field[22].id 595856991
-documenttype[0].datatype[25].sstruct.field[22].id_v6 764861972
 documenttype[0].datatype[25].sstruct.field[22].datatype 759956026
 documenttype[0].datatype[25].sstruct.field[22].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[23].name "Folders"
 documenttype[0].datatype[25].sstruct.field[23].id 34575524
-documenttype[0].datatype[25].sstruct.field[23].id_v6 280569744
 documenttype[0].datatype[25].sstruct.field[23].datatype -389833101
 documenttype[0].datatype[25].sstruct.field[23].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[24].name "juletre"
 documenttype[0].datatype[25].sstruct.field[24].id 1039981530
-documenttype[0].datatype[25].sstruct.field[24].id_v6 2073084146
 documenttype[0].datatype[25].sstruct.field[24].datatype 4
 documenttype[0].datatype[25].sstruct.field[24].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[25].name "album0"
 documenttype[0].datatype[25].sstruct.field[25].id 764312262
-documenttype[0].datatype[25].sstruct.field[25].id_v6 1409364160
 documenttype[0].datatype[25].sstruct.field[25].datatype 18
 documenttype[0].datatype[25].sstruct.field[25].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[26].name "album1"
 documenttype[0].datatype[25].sstruct.field[26].id 1967160809
-documenttype[0].datatype[25].sstruct.field[26].id_v6 1833811264
 documenttype[0].datatype[25].sstruct.field[26].datatype 18
 documenttype[0].datatype[25].sstruct.field[26].detailedtype ""
 documenttype[0].datatype[25].sstruct.field[27].name "other"
 documenttype[0].datatype[25].sstruct.field[27].id 2443357
-documenttype[0].datatype[25].sstruct.field[27].id_v6 903806222
 documenttype[0].datatype[25].sstruct.field[27].datatype 4
 documenttype[0].datatype[25].sstruct.field[27].detailedtype ""
 documenttype[0].datatype[26].id 348447225
diff --git a/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg b/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg
index a24fa03a834..4f04e901a92 100644
--- a/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg
+++ b/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg
@@ -73,7 +73,6 @@ documenttype[1].datatype[1].sstruct.compression.threshold 95
 documenttype[1].datatype[1].sstruct.compression.minsize 200
 documenttype[1].datatype[1].sstruct.field[0].name "doc_field"
 documenttype[1].datatype[1].sstruct.field[0].id 819293364
-documenttype[1].datatype[1].sstruct.field[0].id_v6 1634907905
 documenttype[1].datatype[1].sstruct.field[0].datatype -1368624373
 documenttype[1].datatype[1].sstruct.field[0].detailedtype ""
 documenttype[1].datatype[2].id 348447225
diff --git a/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg b/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg
index d07b16431be..ca568aaa43d 100644
--- a/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg
+++ b/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg
@@ -22,7 +22,6 @@ documenttype[].datatype[].sstruct.compression.threshold 95
 documenttype[].datatype[].sstruct.compression.minsize 200
 documenttype[].datatype[].sstruct.field[].name "self_ref"
 documenttype[].datatype[].sstruct.field[].id 852207313
-documenttype[].datatype[].sstruct.field[].id_v6 768042879
 documenttype[].datatype[].sstruct.field[].datatype -1895788438
 documenttype[].datatype[].sstruct.field[].detailedtype ""
 documenttype[].datatype[].id -255288561
diff --git a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg
index e3002074d04..a7fd3577789 100644
--- a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg
+++ b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg
@@ -22,12 +22,10 @@ documenttype[0].datatype[0].sstruct.compression.threshold 95
 documenttype[0].datatype[0].sstruct.compression.minsize 200
 documenttype[0].datatype[0].sstruct.field[0].name "campaign_ref"
 documenttype[0].datatype[0].sstruct.field[0].id 23963250
-documenttype[0].datatype[0].sstruct.field[0].id_v6 568616261
 documenttype[0].datatype[0].sstruct.field[0].datatype 595216861
 documenttype[0].datatype[0].sstruct.field[0].detailedtype ""
 documenttype[0].datatype[0].sstruct.field[1].name "person_ref"
 documenttype[0].datatype[0].sstruct.field[1].id 100779805
-documenttype[0].datatype[0].sstruct.field[1].id_v6 907695193
 documenttype[0].datatype[0].sstruct.field[1].datatype 542332920
 documenttype[0].datatype[0].sstruct.field[1].detailedtype ""
 documenttype[0].datatype[1].id -255288561
diff --git a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg
index d2759d86715..46a951ae8ea 100644
--- a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg
+++ b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg
@@ -22,12 +22,10 @@ documenttype[0].datatype[0].sstruct.compression.threshold 95
 documenttype[0].datatype[0].sstruct.compression.minsize 200
 documenttype[0].datatype[0].sstruct.field[0].name "campaign_ref"
 documenttype[0].datatype[0].sstruct.field[0].id 23963250
-documenttype[0].datatype[0].sstruct.field[0].id_v6 568616261
 documenttype[0].datatype[0].sstruct.field[0].datatype 595216861
 documenttype[0].datatype[0].sstruct.field[0].detailedtype ""
 documenttype[0].datatype[0].sstruct.field[1].name "other_campaign_ref"
 documenttype[0].datatype[0].sstruct.field[1].id 874751172
-documenttype[0].datatype[0].sstruct.field[1].id_v6 895644372
 documenttype[0].datatype[0].sstruct.field[1].datatype 595216861
 documenttype[0].datatype[0].sstruct.field[1].detailedtype ""
 documenttype[0].datatype[1].id -255288561
diff --git a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg
index a5ea3dbf8ed..f5ec18c4203 100644
--- a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg
+++ b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg
@@ -22,7 +22,6 @@ documenttype[].datatype[].sstruct.compression.threshold 95
 documenttype[].datatype[].sstruct.compression.minsize 200
 documenttype[].datatype[].sstruct.field[].name "parent_field"
 documenttype[].datatype[].sstruct.field[].id 933533022
-documenttype[].datatype[].sstruct.field[].id_v6 2116869443
 documenttype[].datatype[].sstruct.field[].datatype 2
 documenttype[].datatype[].sstruct.field[].detailedtype ""
 documenttype[].datatype[].id 836075987
@@ -42,12 +41,10 @@ documenttype[].datatype[].sstruct.compression.threshold 95
 documenttype[].datatype[].sstruct.compression.minsize 200
 documenttype[].datatype[].sstruct.field[].name "weight_src"
 documenttype[].datatype[].sstruct.field[].id 1225660233
-documenttype[].datatype[].sstruct.field[].id_v6 1350588470
 documenttype[].datatype[].sstruct.field[].datatype 1
 documenttype[].datatype[].sstruct.field[].detailedtype ""
 documenttype[].datatype[].sstruct.field[].name "weight"
 documenttype[].datatype[].sstruct.field[].id 1001392207
-documenttype[].datatype[].sstruct.field[].id_v6 1329620545
 documenttype[].datatype[].sstruct.field[].datatype 1
 documenttype[].datatype[].sstruct.field[].detailedtype ""
 documenttype[].datatype[].id -389494616
@@ -90,7 +87,6 @@ documenttype[].datatype[].sstruct.compression.threshold 95
 documenttype[].datatype[].sstruct.compression.minsize 200
 documenttype[].datatype[].sstruct.field[].name "child_field"
 documenttype[].datatype[].sstruct.field[].id 1814271363
-documenttype[].datatype[].sstruct.field[].id_v6 405182398
 documenttype[].datatype[].sstruct.field[].datatype 1091188812
 documenttype[].datatype[].sstruct.field[].detailedtype ""
 documenttype[].datatype[].id -126593034
diff --git a/config-model/src/test/derived/tensor/documenttypes.cfg b/config-model/src/test/derived/tensor/documenttypes.cfg
index 4e04ad4c309..af1748e484e 100644
--- a/config-model/src/test/derived/tensor/documenttypes.cfg
+++ b/config-model/src/test/derived/tensor/documenttypes.cfg
@@ -22,27 +22,22 @@ documenttype[].datatype[].sstruct.compression.threshold 95
 documenttype[].datatype[].sstruct.compression.minsize 200
 documenttype[].datatype[].sstruct.field[].name "f1"
 documenttype[].datatype[].sstruct.field[].id 26661415
-documenttype[].datatype[].sstruct.field[].id_v6 1740179945
 documenttype[].datatype[].sstruct.field[].datatype 21
 documenttype[].datatype[].sstruct.field[].detailedtype "tensor(x[])"
 documenttype[].datatype[].sstruct.field[].name "f2"
 documenttype[].datatype[].sstruct.field[].id 2080644671
-documenttype[].datatype[].sstruct.field[].id_v6 1424572148
 documenttype[].datatype[].sstruct.field[].datatype 21
 documenttype[].datatype[].sstruct.field[].detailedtype "tensor<float>(x[2],y[1])"
 documenttype[].datatype[].sstruct.field[].name "f3"
 documenttype[].datatype[].sstruct.field[].id 1295091863
-documenttype[].datatype[].sstruct.field[].id_v6 1444109654
 documenttype[].datatype[].sstruct.field[].datatype 21
 documenttype[].datatype[].sstruct.field[].detailedtype "tensor(x{})"
 documenttype[].datatype[].sstruct.field[].name "f4"
 documenttype[].datatype[].sstruct.field[].id 1224191509
-documenttype[].datatype[].sstruct.field[].id_v6 1039544782
 documenttype[].datatype[].sstruct.field[].datatype 21
 documenttype[].datatype[].sstruct.field[].detailedtype "tensor(x[10],y[20])"
 documenttype[].datatype[].sstruct.field[].name "f5"
 documenttype[].datatype[].sstruct.field[].id 329055840
-documenttype[].datatype[].sstruct.field[].id_v6 105711688
 documenttype[].datatype[].sstruct.field[].datatype 21
 documenttype[].datatype[].sstruct.field[].detailedtype "tensor<float>(x[10])"
 documenttype[].datatype[].id -1903234535