Revert "Bratseth/typecheck all 2"

4 files changed, 8 insertions, 78 deletions

diff --git a/config-model/src/test/derived/rankexpression/rank-profiles.cfg b/config-model/src/test/derived/rankexpression/rank-profiles.cfg
index f5652c31d2a..e890b75770b 100644
--- a/config-model/src/test/derived/rankexpression/rank-profiles.cfg
+++ b/config-model/src/test/derived/rankexpression/rank-profiles.cfg
@@ -24,7 +24,7 @@ rankprofile[0].fef.property[10].value "4"
 rankprofile[0].fef.property[11].name "vespa.dump.feature"
 rankprofile[0].fef.property[11].value "attribute(foo1).out"
 rankprofile[0].fef.property[12].name "vespa.dump.feature"
-rankprofile[0].fef.property[12].value "attribute(bar1)"
+rankprofile[0].fef.property[12].value "attribute(bar1.out)"
 rankprofile[0].fef.property[13].name "vespa.dump.feature"
 rankprofile[0].fef.property[13].value "attribute(foo2).out"
 rankprofile[0].fef.property[14].name "vespa.dump.feature"
@@ -64,7 +64,7 @@ rankprofile[2].fef.property[2].value "10 + feature(arg1).out.out"
 rankprofile[2].fef.property[3].name "vespa.summary.feature"
 rankprofile[2].fef.property[3].value "attribute(foo1).out"
 rankprofile[2].fef.property[4].name "vespa.summary.feature"
-rankprofile[2].fef.property[4].value "attribute(bar1)"
+rankprofile[2].fef.property[4].value "attribute(bar1.out)"
 rankprofile[2].fef.property[5].name "vespa.summary.feature"
 rankprofile[2].fef.property[5].value "attribute(foo2).out"
 rankprofile[2].fef.property[6].name "vespa.summary.feature"
diff --git a/config-model/src/test/derived/rankexpression/rankexpression.sd b/config-model/src/test/derived/rankexpression/rankexpression.sd
index d3e0057cfe1..8ed1f2bab4c 100644
--- a/config-model/src/test/derived/rankexpression/rankexpression.sd
+++ b/config-model/src/test/derived/rankexpression/rankexpression.sd
@@ -5,10 +5,12 @@ search rankexpression {
 
     field artist type string {
       indexing: summary | index
+      # index-to: artist, default
     }
 
     field title type string {
       indexing: summary | index
+      # index-to: title, default
     }
 
     field surl type string {
@@ -19,38 +21,6 @@ search rankexpression {
       indexing: summary | attribute
     }
 
-    field foo1 type int {
-      indexing: attribute
-    }
-
-    field foo2 type int {
-      indexing: attribute
-    }
-
-    field foo3 type int {
-      indexing: attribute
-    }
-
-    field foo4 type int {
-      indexing: attribute
-    }
-
-    field bar1 type int {
-      indexing: attribute
-    }
-
-    field bar2 type int {
-      indexing: attribute
-    }
-
-    field bar3 type int {
-      indexing: attribute
-    }
-
-    field bar4 type int {
-      indexing: attribute
-    }
-
   }
 
   rank-profile default {
@@ -63,7 +33,7 @@ search rankexpression {
         expression: if(3>2,4,2)
         rerank-count: 10
       }
-      rank-features: attribute(foo1).out attribute(bar1)
+      rank-features: attribute(foo1).out attribute(bar1.out)
       rank-features { attribute(foo2).out attribute(bar2).out }
       rank-features {
         attribute(foo3).out attribute(bar3).out }
@@ -95,7 +65,7 @@ search rankexpression {
             file:rankexpression
         }
       }
-      summary-features: attribute(foo1).out attribute(bar1)
+      summary-features: attribute(foo1).out attribute(bar1.out)
       summary-features { attribute(foo2).out attribute(bar2).out }
       summary-features {
         attribute(foo3).out attribute(bar3).out }
diff --git a/config-model/src/test/derived/rankexpression/summary.cfg b/config-model/src/test/derived/rankexpression/summary.cfg
index 9752a9f55e3..00df2e87144 100644
--- a/config-model/src/test/derived/rankexpression/summary.cfg
+++ b/config-model/src/test/derived/rankexpression/summary.cfg
@@ -15,25 +15,9 @@ classes[0].fields[5].name "summaryfeatures"
 classes[0].fields[5].type "featuredata"
 classes[0].fields[6].name "documentid"
 classes[0].fields[6].type "longstring"
-classes[1].id 1736696699
+classes[1].id 1787488393
 classes[1].name "attributeprefetch"
 classes[1].fields[0].name "year"
-classes[].fields[].type "integer"
-classes[].fields[].name "foo1"
-classes[].fields[].type "integer"
-classes[].fields[].name "foo2"
-classes[].fields[].type "integer"
-classes[].fields[].name "foo3"
-classes[].fields[].type "integer"
-classes[].fields[].name "foo4"
-classes[].fields[].type "integer"
-classes[].fields[].name "bar1"
-classes[].fields[].type "integer"
-classes[].fields[].name "bar2"
-classes[].fields[].type "integer"
-classes[].fields[].name "bar3"
-classes[].fields[].type "integer"
-classes[].fields[].name "bar4"
 classes[1].fields[0].type "integer"
 classes[1].fields[1].name "rankfeatures"
 classes[1].fields[1].type "featuredata"
diff --git a/config-model/src/test/derived/rankexpression/summarymap.cfg b/config-model/src/test/derived/rankexpression/summarymap.cfg
index 21e6cdf346f..c810f7282ba 100644
--- a/config-model/src/test/derived/rankexpression/summarymap.cfg
+++ b/config-model/src/test/derived/rankexpression/summarymap.cfg
@@ -7,28 +7,4 @@ override[1].command "rankfeatures"
 override[1].arguments ""
 override[2].field "summaryfeatures"
 override[2].command "summaryfeatures"
-override[2].arguments ""
-override[].field "foo1"
-override[].command "attribute"
-override[].arguments "foo1"
-override[].field "foo2"
-override[].command "attribute"
-override[].arguments "foo2"
-override[].field "foo3"
-override[].command "attribute"
-override[].arguments "foo3"
-override[].field "foo4"
-override[].command "attribute"
-override[].arguments "foo4"
-override[].field "bar1"
-override[].command "attribute"
-override[].arguments "bar1"
-override[].field "bar2"
-override[].command "attribute"
-override[].arguments "bar2"
-override[].field "bar3"
-override[].command "attribute"
-override[].arguments "bar3"
-override[].field "bar4"
-override[].command "attribute"
-override[].arguments "bar4"
\ No newline at end of file
+override[2].arguments ""
\ No newline at end of file