Support model-evaluation in Application

2 files changed, 14 insertions, 13 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
index 4a187c9b9bf..f36cc3b195c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
@@ -161,18 +161,19 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
         this.applicationPackage = deployState.getApplicationPackage();
         root = builder.getRoot(VespaModel.ROOT_CONFIGID, deployState, this);
 
-        HostSystem hostSystem = root.getHostSystem();
+        createGlobalRankProfiles(deployState.getDeployLogger(), deployState.getImportedModels(),
+                                 deployState.rankProfileRegistry(), deployState.getQueryProfiles());
+        this.rankProfileList = new RankProfileList(null, // null search -> global
+                                                   rankingConstants,
+                                                   AttributeFields.empty,
+                                                   deployState.rankProfileRegistry(),
+                                                   deployState.getQueryProfiles().getRegistry(),
+                                                   deployState.getImportedModels());
+
 
-        if (complete) { // create a a completed, frozen model
-            createGlobalRankProfiles(deployState.getDeployLogger(), deployState.getImportedModels(),
-                    deployState.rankProfileRegistry(), deployState.getQueryProfiles());
-            this.rankProfileList = new RankProfileList(null, // null search -> global
-                                                  rankingConstants,
-                                                  AttributeFields.empty,
-                                                  deployState.rankProfileRegistry(),
-                                                  deployState.getQueryProfiles().getRegistry(),
-                                                  deployState.getImportedModels());
 
+        HostSystem hostSystem = root.getHostSystem();
+        if (complete) { // create a a completed, frozen model
             configModelRepo.readConfigModels(deployState, this, builder, root, configModelRegistry);
             addServiceClusters(deployState, builder);
             setupRouting(deployState);
@@ -189,7 +190,6 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
         else { // create a model with no services instantiated and the given file distributor
             this.allocatedHosts = AllocatedHosts.withHosts(hostSystem.getHostSpecs());
             this.fileDistributor = fileDistributor;
-            this.rankProfileList = RankProfileList.empty;
         }
     }
 
@@ -621,7 +621,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
     }
 
     /**
-     * @return this root's model repository
+     * Returns this root's model repository
      */
     public ConfigModelRepo configModelRepo() {
         return configModelRepo;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
index 3e9790a81a2..ca5c188ddb1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
@@ -48,7 +48,7 @@ public class VespaModelFactory implements ModelFactory {
     private final Clock clock;
     private final Version version;
 
-    /** Creates a factory for vespa models for this version of the source */
+    /** Creates a factory for Vespa models for this version of the source */
     @Inject
     public VespaModelFactory(ComponentRegistry<ConfigModelPlugin> pluginRegistry,
                              ComponentRegistry<MlModelImporter> modelImporters,
@@ -63,6 +63,7 @@ public class VespaModelFactory implements ModelFactory {
         this.configModelRegistry = new MapConfigModelRegistry(modelBuilders);
         this.modelImporters = modelImporters.allComponents();
         this.zone = zone;
+
         this.clock = Clock.systemUTC();
     }