deprecate Execution.fillAttributes()

* we want to make some slight changes here for Vespa 8, and
  hopefully get rid of this completely for Vespa 9.  Prepare
  for this by marking the old method (and public constant)
  as deprecated, and explain what should be used instead.

1 files changed, 5 insertions, 4 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java b/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java
index 13a9f9510cd..2dfa6ef3e3a 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java
@@ -12,6 +12,7 @@ import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
 import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig.Documentdb;
 import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig.Documentdb.Summaryclass;
 import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig.Documentdb.Summaryclass.Fields;
+import static com.yahoo.prelude.fastsearch.VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
 import com.yahoo.processing.request.CompoundName;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
@@ -95,7 +96,7 @@ public class FieldFiller extends Searcher {
         for (Documentdb db : config.documentdb()) {
             for (Summaryclass summary : db.summaryclass()) {
                 Set<String> attributes;
-                if (Execution.ATTRIBUTEPREFETCH.equals(summary.name())) {
+                if (SORTABLE_ATTRIBUTES_SUMMARY_CLASS.equals(summary.name())) {
                     attributes = new HashSet<>(summary.fields().size());
                     for (Fields f : summary.fields()) {
                         attributes.add(f.name());
@@ -134,11 +135,11 @@ public class FieldFiller extends Searcher {
         }
 
         if (intersectionOfAttributes.containsAll(summaryFields)) {
-            if ( ! Execution.ATTRIBUTEPREFETCH.equals(summaryClass)) {
-                execution.fill(result, Execution.ATTRIBUTEPREFETCH);
+            if (! SORTABLE_ATTRIBUTES_SUMMARY_CLASS.equals(summaryClass)) {
+                execution.fill(result, SORTABLE_ATTRIBUTES_SUMMARY_CLASS);
             }
         } else {
-            // Yes, summaryClass may be Execution.ATTRIBUTEPREFETCH here
+            // Yes, summaryClass may be SORTABLE_ATTRIBUTES_SUMMARY_CLASS here
             if ( ! summaryDb.hasAll(summaryFields, summaryClass, result.getQuery().getModel().getRestrict())) {
                 execution.fill(result, null);
             }