remove "attribute: prefetch" from unrelated tests

7 files changed, 70 insertions, 86 deletions

diff --git a/config-model/src/test/derived/complex/complex.sd b/config-model/src/test/derived/complex/complex.sd
index 8fbfd216c3e..82aca00ebfc 100644
--- a/config-model/src/test/derived/complex/complex.sd
+++ b/config-model/src/test/derived/complex/complex.sd
@@ -41,7 +41,6 @@ search complex {
     field prefixenabled type string {
       indexing: index | attribute
       index: prefix
-      attribute: prefetch
       attribute: huge
       normalizing: none
       stemming: shortest
@@ -58,12 +57,10 @@ search complex {
 
     field fleeting type array<float> {
       indexing: index | attribute
-      attribute: prefetch
     }
 
     field fleeting2 type float {
       indexing: index | attribute
-      attribute: prefetch
     }
 
     field foundat type long {
diff --git a/config-model/src/test/derived/complex/summary.cfg b/config-model/src/test/derived/complex/summary.cfg
index ff14dbba419..5bb472b5f41 100644
--- a/config-model/src/test/derived/complex/summary.cfg
+++ b/config-model/src/test/derived/complex/summary.cfg
@@ -1,43 +1,41 @@
 defaultsummaryid 1506848752
-classes[].id 1506848752
-classes[].name "default"
-classes[].fields[].name "woe"
-classes[].fields[].type "longstring"
-classes[].fields[].name "exact"
-classes[].fields[].type "longstring"
-classes[].fields[].name "title"
-classes[].fields[].type "longstring"
-classes[].fields[].name "dyntitle"
-classes[].fields[].type "longstring"
-classes[].fields[].name "source"
-classes[].fields[].type "longstring"
-classes[].fields[].name "stringfield"
-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"
-classes[].id 28214929
-classes[].name "attributeprefetch"
-classes[].fields[].name "year_sub"
-classes[].fields[].type "integer"
-classes[].fields[].name "prefixenabled"
-classes[].fields[].type "longstring"
-classes[].fields[].name "fleeting"
-classes[].fields[].type "jsonstring"
-classes[].fields[].name "fleeting2"
-classes[].fields[].type "float"
-classes[].fields[].name "foundat"
-classes[].fields[].type "int64"
-classes[].fields[].name "collapseby"
-classes[].fields[].type "integer"
-classes[].fields[].name "ts"
-classes[].fields[].type "int64"
-classes[].fields[].name "combineda"
-classes[].fields[].type "integer"
-classes[].fields[].name "rankfeatures"
-classes[].fields[].type "featuredata"
-classes[].fields[].name "summaryfeatures"
-classes[].fields[].type "featuredata"
+classes[0].id 1506848752
+classes[0].name "default"
+classes[0].fields[0].name "woe"
+classes[0].fields[0].type "longstring"
+classes[0].fields[1].name "exact"
+classes[0].fields[1].type "longstring"
+classes[0].fields[2].name "title"
+classes[0].fields[2].type "longstring"
+classes[0].fields[3].name "dyntitle"
+classes[0].fields[3].type "longstring"
+classes[0].fields[4].name "source"
+classes[0].fields[4].type "longstring"
+classes[0].fields[5].name "stringfield"
+classes[0].fields[5].type "longstring"
+classes[0].fields[6].name "rankfeatures"
+classes[0].fields[6].type "featuredata"
+classes[0].fields[7].name "summaryfeatures"
+classes[0].fields[7].type "featuredata"
+classes[0].fields[8].name "documentid"
+classes[0].fields[8].type "longstring"
+classes[1].id 128090024
+classes[1].name "attributeprefetch"
+classes[1].fields[0].name "year_sub"
+classes[1].fields[0].type "integer"
+classes[1].fields[1].name "prefixenabled"
+classes[1].fields[1].type "longstring"
+classes[1].fields[2].name "fleeting2"
+classes[1].fields[2].type "float"
+classes[1].fields[3].name "foundat"
+classes[1].fields[3].type "int64"
+classes[1].fields[4].name "collapseby"
+classes[1].fields[4].type "integer"
+classes[1].fields[5].name "ts"
+classes[1].fields[5].type "int64"
+classes[1].fields[6].name "combineda"
+classes[1].fields[6].type "integer"
+classes[1].fields[7].name "rankfeatures"
+classes[1].fields[7].type "featuredata"
+classes[1].fields[8].name "summaryfeatures"
+classes[1].fields[8].type "featuredata"
\ No newline at end of file
diff --git a/config-model/src/test/derived/complex/summarymap.cfg b/config-model/src/test/derived/complex/summarymap.cfg
index 1d4b57a49a7..f7ad249ae86 100644
--- a/config-model/src/test/derived/complex/summarymap.cfg
+++ b/config-model/src/test/derived/complex/summarymap.cfg
@@ -1,34 +1,31 @@
 defaultoutputclass -1
-override[].field "dyntitle"
-override[].command "dynamicteaser"
-override[].arguments "dyntitle"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "year_sub"
-override[].command "attribute"
-override[].arguments "year_sub"
-override[].field "prefixenabled"
-override[].command "attribute"
-override[].arguments "prefixenabled"
-override[].field "fleeting"
-override[].command "attribute"
-override[].arguments "fleeting"
-override[].field "fleeting2"
-override[].command "attribute"
-override[].arguments "fleeting2"
-override[].field "foundat"
-override[].command "attribute"
-override[].arguments "foundat"
-override[].field "collapseby"
-override[].command "attribute"
-override[].arguments "collapseby"
-override[].field "ts"
-override[].command "attribute"
-override[].arguments "ts"
-override[].field "combineda"
-override[].command "attribute"
-override[].arguments "combineda"
+override[0].field "dyntitle"
+override[0].command "dynamicteaser"
+override[0].arguments "dyntitle"
+override[1].field "rankfeatures"
+override[1].command "rankfeatures"
+override[1].arguments ""
+override[2].field "summaryfeatures"
+override[2].command "summaryfeatures"
+override[2].arguments ""
+override[3].field "year_sub"
+override[3].command "attribute"
+override[3].arguments "year_sub"
+override[4].field "prefixenabled"
+override[4].command "attribute"
+override[4].arguments "prefixenabled"
+override[5].field "fleeting2"
+override[5].command "attribute"
+override[5].arguments "fleeting2"
+override[6].field "foundat"
+override[6].command "attribute"
+override[6].arguments "foundat"
+override[7].field "collapseby"
+override[7].command "attribute"
+override[7].arguments "collapseby"
+override[8].field "ts"
+override[8].command "attribute"
+override[8].arguments "ts"
+override[9].field "combineda"
+override[9].command "attribute"
+override[9].arguments "combineda"
\ No newline at end of file
diff --git a/config-model/src/test/derived/mlr/mlr.sd b/config-model/src/test/derived/mlr/mlr.sd
index a6179f836f2..1a5354e3b30 100644
--- a/config-model/src/test/derived/mlr/mlr.sd
+++ b/config-model/src/test/derived/mlr/mlr.sd
@@ -5,7 +5,6 @@ search mlr {
 
     field a type string {
       indexing: index | summary | attribute
-      attribute: prefetch
     }
 
     field b type string {
@@ -14,7 +13,6 @@ search mlr {
 
     field ranklog type string {
       indexing: attribute
-      attribute: prefetch
     }
   }
 }
diff --git a/documentgen-test/etc/complex/book.sd b/documentgen-test/etc/complex/book.sd
index b54f822c22e..90dff0982af 100644
--- a/documentgen-test/etc/complex/book.sd
+++ b/documentgen-test/etc/complex/book.sd
@@ -26,11 +26,9 @@ search book {
         }
         field mywsfloat type weightedset<float> {
             indexing: attribute
-            attribute: prefetch
         }
         field myarrayint type array<int> {
             indexing: attribute
-            attribute: prefetch
         }
         field mytriplearray type array<array<array<int>>> {
 
diff --git a/vespa-documentgen-plugin/etc/complex/book.sd b/vespa-documentgen-plugin/etc/complex/book.sd
index 16bf4447979..6d6145cb10b 100644
--- a/vespa-documentgen-plugin/etc/complex/book.sd
+++ b/vespa-documentgen-plugin/etc/complex/book.sd
@@ -27,14 +27,12 @@ search book {
 
       field mywsfloat type weightedset<float> {
         indexing: attribute
-        attribute: prefetch
       }
 
       field mynestedwsfloat type weightedset<float> {}
 
       field myarrayint type array<int> {
         indexing: attribute
-        attribute: prefetch
       }
 
       field stringmap type map<string, string> {
diff --git a/vespa-documentgen-plugin/etc/localapp/book.sd b/vespa-documentgen-plugin/etc/localapp/book.sd
index 1f5e0e2cccb..72faa934aa6 100644
--- a/vespa-documentgen-plugin/etc/localapp/book.sd
+++ b/vespa-documentgen-plugin/etc/localapp/book.sd
@@ -27,12 +27,10 @@ search book {
 
       field mywsfloat type weightedset<float> {
         indexing: attribute
-        attribute: prefetch
       }
 
       field myarrayint type array<int> {
         indexing: attribute
-        attribute: prefetch
       }
 
       field mytriplearray type array<array<array<int>>> {}