remove "attribute: prefetch" in tests

3 files changed, 50 insertions, 128 deletions

diff --git a/config-model/src/test/derived/attributeprefetch/attributeprefetch.sd b/config-model/src/test/derived/attributeprefetch/attributeprefetch.sd
index 0bf6b7a037d..ef3755e90d7 100644
--- a/config-model/src/test/derived/attributeprefetch/attributeprefetch.sd
+++ b/config-model/src/test/derived/attributeprefetch/attributeprefetch.sd
@@ -3,81 +3,63 @@ search prefetch {
   document prefetch {
     field singlebyte type byte {
       indexing: attribute
-      attribute: prefetch
     }
     field multibyte type array<byte> {
       indexing: attribute
-      attribute: prefetch
     }
     field wsbyte type weightedset<byte> {
       indexing: attribute
-      attribute: prefetch
     }
     field singleint type int {
       indexing: attribute
-      attribute: prefetch
     }
     field multiint type array<int> {
       indexing: attribute
-      attribute: prefetch
     }
     field wsint type weightedset<int> {
       indexing: attribute
-      attribute: prefetch
     }
     field singlelong type long {
       indexing: attribute
-      attribute: prefetch
     }
     field multilong type array<long> {
       indexing: attribute
-      attribute: prefetch
     }
     field wslong type weightedset<long> {
       indexing: attribute
-      attribute: prefetch
     }
     field singlefloat type float {
       indexing: attribute
-      attribute: prefetch
     }
     field multifloat type array<float> {
       indexing: attribute
-      attribute: prefetch
     }
     field wsfloat type weightedset<float> {
       indexing: attribute
-      attribute: prefetch
     }
     field singledouble type double {
       indexing: attribute
-      attribute: prefetch
     }
     field multidouble type array<double> {
       indexing: attribute
-      attribute: prefetch
     }
     field wsdouble type weightedset<double> {
       indexing: attribute
-      attribute: prefetch
     }
     field singlestring type string {
       indexing: attribute
-      attribute: prefetch
       match {
         token
       }
     }
     field multistring type array<string> {
       indexing: attribute
-      attribute: prefetch
       match {
         token
       }
     }
     field wsstring type weightedset<string> {
       indexing: attribute
-      attribute: prefetch
       match {
         token
       }
diff --git a/config-model/src/test/derived/attributeprefetch/summary.cfg b/config-model/src/test/derived/attributeprefetch/summary.cfg
index a0d7bc11662..13b17464946 100644
--- a/config-model/src/test/derived/attributeprefetch/summary.cfg
+++ b/config-model/src/test/derived/attributeprefetch/summary.cfg
@@ -1,51 +1,27 @@
 defaultsummaryid 1151071433
-classes[].id 1151071433
-classes[].name "default"
-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 1279606967
-classes[].name "attributeprefetch"
-classes[].fields[].name "singlebyte"
-classes[].fields[].type "byte"
-classes[].fields[].name "multibyte"
-classes[].fields[].type "jsonstring"
-classes[].fields[].name "wsbyte"
-classes[].fields[].type "jsonstring"
-classes[].fields[].name "singleint"
-classes[].fields[].type "integer"
-classes[].fields[].name "multiint"
-classes[].fields[].type "jsonstring"
-classes[].fields[].name "wsint"
-classes[].fields[].type "jsonstring"
-classes[].fields[].name "singlelong"
-classes[].fields[].type "int64"
-classes[].fields[].name "multilong"
-classes[].fields[].type "jsonstring"
-classes[].fields[].name "wslong"
-classes[].fields[].type "jsonstring"
-classes[].fields[].name "singlefloat"
-classes[].fields[].type "float"
-classes[].fields[].name "multifloat"
-classes[].fields[].type "jsonstring"
-classes[].fields[].name "wsfloat"
-classes[].fields[].type "jsonstring"
-classes[].fields[].name "singledouble"
-classes[].fields[].type "double"
-classes[].fields[].name "multidouble"
-classes[].fields[].type "jsonstring"
-classes[].fields[].name "wsdouble"
-classes[].fields[].type "jsonstring"
-classes[].fields[].name "singlestring"
-classes[].fields[].type "longstring"
-classes[].fields[].name "multistring"
-classes[].fields[].type "jsonstring"
-classes[].fields[].name "wsstring"
-classes[].fields[].type "jsonstring"
-classes[].fields[].name "rankfeatures"
-classes[].fields[].type "featuredata"
-classes[].fields[].name "summaryfeatures"
-classes[].fields[].type "featuredata"
+classes[0].id 1151071433
+classes[0].name "default"
+classes[0].fields[0].name "rankfeatures"
+classes[0].fields[0].type "featuredata"
+classes[0].fields[1].name "summaryfeatures"
+classes[0].fields[1].type "featuredata"
+classes[0].fields[2].name "documentid"
+classes[0].fields[2].type "longstring"
+classes[1].id 1980470965
+classes[1].name "attributeprefetch"
+classes[1].fields[0].name "singlebyte"
+classes[1].fields[0].type "byte"
+classes[1].fields[1].name "singleint"
+classes[1].fields[1].type "integer"
+classes[1].fields[2].name "singlelong"
+classes[1].fields[2].type "int64"
+classes[1].fields[3].name "singlefloat"
+classes[1].fields[3].type "float"
+classes[1].fields[4].name "singledouble"
+classes[1].fields[4].type "double"
+classes[1].fields[5].name "singlestring"
+classes[1].fields[5].type "longstring"
+classes[1].fields[6].name "rankfeatures"
+classes[1].fields[6].type "featuredata"
+classes[1].fields[7].name "summaryfeatures"
+classes[1].fields[7].type "featuredata"
\ No newline at end of file
diff --git a/config-model/src/test/derived/attributeprefetch/summarymap.cfg b/config-model/src/test/derived/attributeprefetch/summarymap.cfg
index ca1cff1b640..28bc686a266 100644
--- a/config-model/src/test/derived/attributeprefetch/summarymap.cfg
+++ b/config-model/src/test/derived/attributeprefetch/summarymap.cfg
@@ -1,61 +1,25 @@
 defaultoutputclass -1
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "singlebyte"
-override[].command "attribute"
-override[].arguments "singlebyte"
-override[].field "multibyte"
-override[].command "attribute"
-override[].arguments "multibyte"
-override[].field "wsbyte"
-override[].command "attribute"
-override[].arguments "wsbyte"
-override[].field "singleint"
-override[].command "attribute"
-override[].arguments "singleint"
-override[].field "multiint"
-override[].command "attribute"
-override[].arguments "multiint"
-override[].field "wsint"
-override[].command "attribute"
-override[].arguments "wsint"
-override[].field "singlelong"
-override[].command "attribute"
-override[].arguments "singlelong"
-override[].field "multilong"
-override[].command "attribute"
-override[].arguments "multilong"
-override[].field "wslong"
-override[].command "attribute"
-override[].arguments "wslong"
-override[].field "singlefloat"
-override[].command "attribute"
-override[].arguments "singlefloat"
-override[].field "multifloat"
-override[].command "attribute"
-override[].arguments "multifloat"
-override[].field "wsfloat"
-override[].command "attribute"
-override[].arguments "wsfloat"
-override[].field "singledouble"
-override[].command "attribute"
-override[].arguments "singledouble"
-override[].field "multidouble"
-override[].command "attribute"
-override[].arguments "multidouble"
-override[].field "wsdouble"
-override[].command "attribute"
-override[].arguments "wsdouble"
-override[].field "singlestring"
-override[].command "attribute"
-override[].arguments "singlestring"
-override[].field "multistring"
-override[].command "attribute"
-override[].arguments "multistring"
-override[].field "wsstring"
-override[].command "attribute"
-override[].arguments "wsstring"
+override[0].field "rankfeatures"
+override[0].command "rankfeatures"
+override[0].arguments ""
+override[1].field "summaryfeatures"
+override[1].command "summaryfeatures"
+override[1].arguments ""
+override[2].field "singlebyte"
+override[2].command "attribute"
+override[2].arguments "singlebyte"
+override[3].field "singleint"
+override[3].command "attribute"
+override[3].arguments "singleint"
+override[4].field "singlelong"
+override[4].command "attribute"
+override[4].arguments "singlelong"
+override[5].field "singlefloat"
+override[5].command "attribute"
+override[5].arguments "singlefloat"
+override[6].field "singledouble"
+override[6].command "attribute"
+override[6].arguments "singledouble"
+override[7].field "singlestring"
+override[7].command "attribute"
+override[7].arguments "singlestring"
\ No newline at end of file