From f6076b70ef85bc6c0c10c373307acb1b1f456702 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@oath.com>
Date: Tue, 4 Sep 2018 22:06:11 +0200
Subject: Revert "Bratseth/handle large constants take 2"

---
 .../derived/DerivedConfiguration.java              |  2 +-
 .../searchdefinition/derived/RankProfileList.java  | 26 +---------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

(limited to 'config-model/src/main/java/com/yahoo/searchdefinition/derived')

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java
index 9a00ee5bbd0..4af26b72817 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java
@@ -94,7 +94,7 @@ public class DerivedConfiguration {
             summaries = new Summaries(search, deployLogger);
             summaryMap = new SummaryMap(search, summaries);
             juniperrc = new Juniperrc(search);
-            rankProfileList = new RankProfileList(search, search.rankingConstants(), attributeFields, rankProfileRegistry, queryProfiles, importedModels);
+            rankProfileList = new RankProfileList(search, attributeFields, rankProfileRegistry, queryProfiles, importedModels);
             indexingScript = new IndexingScript(search);
             indexInfo = new IndexInfo(search);
             indexSchema = new IndexSchema(search);
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java
index e58b3da4f72..10881ab9ce0 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java
@@ -3,33 +3,24 @@ package com.yahoo.searchdefinition.derived;
 
 import com.yahoo.search.query.profile.QueryProfileRegistry;
 import com.yahoo.searchdefinition.RankProfileRegistry;
-import com.yahoo.searchdefinition.RankingConstant;
-import com.yahoo.searchdefinition.RankingConstants;
 import com.yahoo.searchlib.rankingexpression.integration.ml.ImportedModels;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
 import com.yahoo.searchdefinition.RankProfile;
 import com.yahoo.searchdefinition.Search;
-import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
-
 import java.util.Map;
-import java.util.logging.Logger;
 
 /**
  * The derived rank profiles of a search definition
  *
  * @author bratseth
  */
-public class RankProfileList extends Derived implements RankProfilesConfig.Producer, RankingConstantsConfig.Producer {
-
-    private static final Logger log = Logger.getLogger(RankProfileList.class.getName());
+public class RankProfileList extends Derived implements RankProfilesConfig.Producer {
 
     private final Map<String, RawRankProfile> rankProfiles = new java.util.LinkedHashMap<>();
-    private final RankingConstants rankingConstants;
 
     public static RankProfileList empty = new RankProfileList();
 
     private RankProfileList() {
-        this.rankingConstants = new RankingConstants();
     }
 
     /**
@@ -39,13 +30,11 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ
      * @param attributeFields the attribute fields to create a ranking for
      */
     public RankProfileList(Search search,
-                           RankingConstants rankingConstants,
                            AttributeFields attributeFields,
                            RankProfileRegistry rankProfileRegistry,
                            QueryProfileRegistry queryProfiles,
                            ImportedModels importedModels) {
         setName(search == null ? "default" : search.getName());
-        this.rankingConstants = rankingConstants;
         deriveRankProfiles(rankProfileRegistry, queryProfiles, importedModels, search, attributeFields);
     }
 
@@ -89,17 +78,4 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ
         }
     }
 
-    @Override
-    public void getConfig(RankingConstantsConfig.Builder builder) {
-        for (RankingConstant constant : rankingConstants.asMap().values()) {
-            if ("".equals(constant.getFileReference()))
-                log.warning("Illegal file reference " + constant); // Let tests pass ... we should find a better way
-            else
-                builder.constant(new RankingConstantsConfig.Constant.Builder()
-                                         .name(constant.getName())
-                                         .fileref(constant.getFileReference())
-                                         .type(constant.getType()));
-        }
-    }
-
 }
-- 
cgit v1.2.3