no more tensors in attribute prefetch

* less hardcoded constants

8 files changed, 15 insertions, 23 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/document/Attribute.java b/config-model/src/main/java/com/yahoo/schema/document/Attribute.java
index 87830d76f78..ca8279752ac 100644
--- a/config-model/src/main/java/com/yahoo/schema/document/Attribute.java
+++ b/config-model/src/main/java/com/yahoo/schema/document/Attribute.java
@@ -181,6 +181,9 @@ public final class Attribute implements Cloneable, Serializable {
     public boolean isPrefetch() {
         if (prefetch!=null) return prefetch.booleanValue();
 
+        if (tensorType.isPresent()) {
+            return false;
+        }
         if (CollectionType.SINGLE.equals(collectionType)) {
             return true;
         }
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java
index 4080e37003f..7b4bc00230a 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java
@@ -14,6 +14,7 @@ import com.yahoo.vespa.documentmodel.SummaryField;
 import com.yahoo.vespa.documentmodel.SummaryTransform;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
+import static com.yahoo.prelude.fastsearch.VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
 import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isComplexFieldWithOnlyStructFieldAttributes;
 
 /**
@@ -119,9 +120,9 @@ public class ImplicitSummaries extends Processor {
     }
 
     private DocumentSummary getOrCreateAttributePrefetchSummary(Schema schema) {
-        DocumentSummary summary = schema.getSummariesInThis().get("attributeprefetch");
+        DocumentSummary summary = schema.getSummariesInThis().get(SORTABLE_ATTRIBUTES_SUMMARY_CLASS);
         if (summary == null) {
-            summary = new DocumentSummary("attributeprefetch", schema);
+            summary = new DocumentSummary(SORTABLE_ATTRIBUTES_SUMMARY_CLASS, schema);
             schema.addSummary(summary);
         }
         return summary;
@@ -142,7 +143,7 @@ public class ImplicitSummaries extends Processor {
         DocumentSummary summary = getOrCreateAttributePrefetchSummary(schema);
         SummaryField attributeSummaryField = new SummaryField(attribute.getName(), attribute.getDataType());
         attributeSummaryField.addSource(attribute.getName());
-        attributeSummaryField.addDestination("attributeprefetch");
+        attributeSummaryField.addDestination(SORTABLE_ATTRIBUTES_SUMMARY_CLASS);
         attributeSummaryField.setTransform(SummaryTransform.ATTRIBUTE);
         summary.add(attributeSummaryField);
     }
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/PredicateProcessor.java b/config-model/src/main/java/com/yahoo/schema/processing/PredicateProcessor.java
index 280eae3d88b..0362dc39c4c 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/PredicateProcessor.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/PredicateProcessor.java
@@ -24,6 +24,8 @@ import com.yahoo.vespa.indexinglanguage.expressions.SetVarExpression;
 import com.yahoo.vespa.indexinglanguage.expressions.StatementExpression;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
+import static com.yahoo.prelude.fastsearch.VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -68,7 +70,7 @@ public class PredicateProcessor extends Processor {
                         attribute.setDensePostingListThreshold(threshold);
                         addPredicateOptimizationIlScript(field, booleanDefinition);
                     }
-                    DocumentSummary summary = schema.getSummariesInThis().get("attributeprefetch");
+                    DocumentSummary summary = schema.getSummariesInThis().get(SORTABLE_ATTRIBUTES_SUMMARY_CLASS);
                     if (summary != null) {
                         summary.remove(attribute.getName());
                     }
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/ReferenceFieldsProcessor.java b/config-model/src/main/java/com/yahoo/schema/processing/ReferenceFieldsProcessor.java
index 43e39b1e546..67c07aaeaf4 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/ReferenceFieldsProcessor.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/ReferenceFieldsProcessor.java
@@ -10,6 +10,8 @@ import com.yahoo.vespa.documentmodel.DocumentSummary;
 import com.yahoo.vespa.documentmodel.SummaryTransform;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
+import static com.yahoo.prelude.fastsearch.VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
+
 /**
  * Class that processes reference fields and removes attribute aspect of such fields from summary.
  *
@@ -51,7 +53,7 @@ public class ReferenceFieldsProcessor extends Processor {
     }
 
     private void removeFromAttributePrefetchSummaryClass(SDField field) {
-        DocumentSummary summary = schema.getSummariesInThis().get("attributeprefetch");
+        DocumentSummary summary = schema.getSummariesInThis().get(SORTABLE_ATTRIBUTES_SUMMARY_CLASS);
         if (summary != null) {
             summary.remove(field.getName());
         }
diff --git a/config-model/src/test/derived/attributes/summarymap.cfg b/config-model/src/test/derived/attributes/summarymap.cfg
index 78bf22b7109..a96f1e3858d 100644
--- a/config-model/src/test/derived/attributes/summarymap.cfg
+++ b/config-model/src/test/derived/attributes/summarymap.cfg
@@ -50,6 +50,3 @@ override[].arguments "a11"
 override[].field "a12"
 override[].command "attribute"
 override[].arguments "a12"
-override[].field "a13"
-override[].command "attribute"
-override[].arguments "a13"
diff --git a/config-model/src/test/derived/rankingexpression/summary.cfg b/config-model/src/test/derived/rankingexpression/summary.cfg
index b9f89f4a76d..a6ba84ca7a9 100644
--- a/config-model/src/test/derived/rankingexpression/summary.cfg
+++ b/config-model/src/test/derived/rankingexpression/summary.cfg
@@ -17,7 +17,7 @@ classes[].fields[].name "summaryfeatures"
 classes[].fields[].type "featuredata"
 classes[].fields[].name "documentid"
 classes[].fields[].type "longstring"
-classes[].id 203924099
+classes[].id 1736696699
 classes[].name "attributeprefetch"
 classes[].omitsummaryfeatures false
 classes[].fields[].name "year"
@@ -38,8 +38,6 @@ classes[].fields[].name "bar3"
 classes[].fields[].type "integer"
 classes[].fields[].name "bar4"
 classes[].fields[].type "integer"
-classes[].fields[].name "t1"
-classes[].fields[].type "tensor"
 classes[].fields[].name "rankfeatures"
 classes[].fields[].type "featuredata"
 classes[].fields[].name "summaryfeatures"
diff --git a/config-model/src/test/derived/rankingexpression/summarymap.cfg b/config-model/src/test/derived/rankingexpression/summarymap.cfg
index bd92b36548c..e8d9bd08ca7 100644
--- a/config-model/src/test/derived/rankingexpression/summarymap.cfg
+++ b/config-model/src/test/derived/rankingexpression/summarymap.cfg
@@ -32,6 +32,3 @@ override[].arguments "bar3"
 override[].field "bar4"
 override[].command "attribute"
 override[].arguments "bar4"
-override[].field "t1"
-override[].command "attribute"
-override[].arguments "t1"
diff --git a/config-model/src/test/derived/tensor/summary.cfg b/config-model/src/test/derived/tensor/summary.cfg
index badb7c37829..a5b38684e52 100644
--- a/config-model/src/test/derived/tensor/summary.cfg
+++ b/config-model/src/test/derived/tensor/summary.cfg
@@ -17,17 +17,9 @@ classes[].fields[].name "summaryfeatures"
 classes[].fields[].type "featuredata"
 classes[].fields[].name "documentid"
 classes[].fields[].type "longstring"
-classes[].id 1476352352
+classes[].id 219619290
 classes[].name "attributeprefetch"
 classes[].omitsummaryfeatures false
-classes[].fields[].name "f2"
-classes[].fields[].type "tensor"
-classes[].fields[].name "f3"
-classes[].fields[].type "tensor"
-classes[].fields[].name "f4"
-classes[].fields[].type "tensor"
-classes[].fields[].name "f5"
-classes[].fields[].type "tensor"
 classes[].fields[].name "f6"
 classes[].fields[].type "float"
 classes[].fields[].name "rankfeatures"