Allow and ignore 'default inherits default'

2 files changed, 18 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java
index 440e41e192b..812726a609e 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java
@@ -25,6 +25,12 @@ public class DefaultRankProfile extends RankProfile {
         super("default", schema, rankProfileRegistry, rankingConstants);
     }
 
+    /** Ignore self inheriting of default as some applications may use that for historical reasons. */
+    public void inherit(String inheritedName) {
+        if (inheritedName.equals("default")) return;
+        super.inherit(inheritedName);
+    }
+
     @Override
     public RankSetting getRankSetting(String fieldOrIndex, RankSetting.Type type) {
         RankSetting setting = super.getRankSetting(fieldOrIndex, type);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java
index 939d197da5b..d77c6d822e3 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java
@@ -171,6 +171,18 @@ public class RankProfileTestCase extends AbstractSchemaTestCase {
     }
 
     @Test
+    public void requireThatDefaultInheritingDefaultIsIgnored() throws ParseException {
+        RankProfileRegistry registry = new RankProfileRegistry();
+        ApplicationBuilder builder = new ApplicationBuilder(registry, setupQueryProfileTypes());
+        builder.addSchema(joinLines(
+                "schema test {",
+                "  document test { } ",
+                "  rank-profile default inherits default {}",
+                "}"));
+        builder.build(true);
+    }
+
+    @Test
     public void requireThatCyclicInheritanceIsIllegal() throws ParseException {
         try {
             RankProfileRegistry registry = new RankProfileRegistry();