Inherit constants

4 files changed, 30 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstants.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstants.java
index 8df68b210ce..1e0eacaea16 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstants.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstants.java
@@ -6,7 +6,9 @@ import com.yahoo.vespa.model.AbstractService;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
@@ -18,11 +20,16 @@ import java.util.function.Function;
  */
 public class RankingConstants {
 
-    private final Map<String, RankingConstant> constants = new ConcurrentHashMap<>();
     private final FileRegistry fileRegistry;
 
-    public RankingConstants(FileRegistry fileRegistry) {
+    /** The schema this belongs to, or empty if it is global */
+    private final Optional<Schema> owner;
+
+    private final Map<String, RankingConstant> constants = new ConcurrentHashMap<>();
+
+    public RankingConstants(FileRegistry fileRegistry, Optional<Schema> owner) {
         this.fileRegistry = fileRegistry;
+        this.owner = owner;
     }
 
     public void add(RankingConstant constant) {
@@ -33,12 +40,14 @@ public class RankingConstants {
         if ( prev != null )
             throw new IllegalArgumentException("Ranking constant '" + name + "' defined twice");
     }
+
     public void putIfAbsent(RankingConstant constant) {
         constant.validate();
         constant.register(fileRegistry);
         String name = constant.getName();
         constants.putIfAbsent(name, constant);
     }
+
     public void computeIfAbsent(String name, Function<? super String, ? extends RankingConstant> createConstant) {
         constants.computeIfAbsent(name, key -> {
             RankingConstant constant = createConstant.apply(key);
@@ -50,16 +59,26 @@ public class RankingConstants {
 
     /** Returns the ranking constant with the given name, or null if not present */
     public RankingConstant get(String name) {
-        return constants.get(name);
+        var constant = constants.get(name);
+        if (constant != null) return constant;
+        if (owner.isPresent() && owner.get().inherited().isPresent())
+            return owner.get().inherited().get().rankingConstants().get(name);
+        return null;
     }
 
     /** Returns a read-only map of the ranking constants in this indexed by name */
     public Map<String, RankingConstant> asMap() {
-        return Collections.unmodifiableMap(constants);
+        // Shortcuts
+        if (owner.isEmpty() || owner.get().inherited().isEmpty()) return Collections.unmodifiableMap(constants);
+        if (constants.isEmpty()) return owner.get().inherited().get().rankingConstants().asMap();
+
+        var allConstants = new HashMap<>(owner.get().inherited().get().rankingConstants().asMap());
+        allConstants.putAll(constants);
+        return Collections.unmodifiableMap(allConstants);
     }
 
     /** Initiate sending of these constants to some services over file distribution */
     public void sendTo(Collection<? extends AbstractService> services) {
-        constants.values().forEach(constant -> constant.sendTo(services));
+        asMap().values().forEach(constant -> constant.sendTo(services));
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java b/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java
index fcecac3fc2e..aeab718cda1 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java
@@ -140,7 +140,7 @@ public class Schema implements ImmutableSearch {
         this.properties = properties;
         this.documentsOnly = documentsOnly;
         largeRankExpressions = new LargeRankExpressions(fileRegistry);
-        rankingConstants = new RankingConstants(fileRegistry);
+        rankingConstants = new RankingConstants(fileRegistry, Optional.of(this));
         onnxModels = new OnnxModels(fileRegistry);
     }
 
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 9f043770eab..d507fb917c0 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
@@ -23,13 +23,14 @@ import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
 
 /**
- * The derived rank profiles of a search definition
+ * The derived rank profiles of a schema
  *
  * @author bratseth
  */
@@ -45,7 +46,7 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ
     public static RankProfileList empty = new RankProfileList();
 
     private RankProfileList() {
-        rankingConstants = new RankingConstants(null);
+        rankingConstants = new RankingConstants(null, Optional.empty());
         largeRankExpressions = new LargeRankExpressions(null);
         onnxModels = new OnnxModels(null);
     }
@@ -53,7 +54,7 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ
     /**
      * Creates a rank profile
      *
-     * @param schema the search definition this is a rank profile from
+     * @param schema the schema this is a rank profile from
      * @param attributeFields the attribute fields to create a ranking for
      */
     public RankProfileList(Schema schema,
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 b5fc0e88540..3873596c835 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
@@ -178,7 +178,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
         version = deployState.getVespaVersion();
         fileRegistry = deployState.getFileRegistry();
         largeRankExpressions = new LargeRankExpressions(deployState.getFileRegistry());
-        rankingConstants = new RankingConstants(deployState.getFileRegistry());
+        rankingConstants = new RankingConstants(deployState.getFileRegistry(), Optional.empty());
         validationOverrides = deployState.validationOverrides();
         applicationPackage = deployState.getApplicationPackage();
         provisioned = deployState.provisioned();