If you seemingly inherit yourself, just assume that you try to inherit the same named rankprofile in the base document type.

5 files changed, 162 insertions, 120 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
index 17b5953b824..97770b6ebb9 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
@@ -9,6 +9,7 @@ import com.yahoo.search.query.profile.types.QueryProfileType;
 import com.yahoo.search.query.ranking.Diversity;
 import com.yahoo.searchdefinition.document.Attribute;
 import com.yahoo.searchdefinition.document.ImmutableSDField;
+import com.yahoo.searchdefinition.document.SDDocumentType;
 import com.yahoo.searchdefinition.expressiontransforms.ExpressionTransforms;
 import com.yahoo.searchdefinition.expressiontransforms.RankProfileTransformContext;
 import com.yahoo.searchdefinition.parser.ParseException;
@@ -240,12 +241,25 @@ public class RankProfile implements Cloneable {
         }
     }
 
+    private RankProfile resolveInherited(ImmutableSearch search) {
+        SDDocumentType documentType = search.getDocument();
+        if (documentType != null) {
+            if (name.equals(inheritedName)) {
+                // If you seemingly inherit yourself, you are actually referencing a rank-profile in one of your inherited schemas
+                for (SDDocumentType baseType : documentType.getInheritedTypes()) {
+                    RankProfile resolvedFromBase = rankProfileRegistry.resolve(baseType, inheritedName);
+                    if (resolvedFromBase != null) return resolvedFromBase;
+                }
+            }
+            return rankProfileRegistry.resolve(documentType, inheritedName);
+        }
+        return rankProfileRegistry.get(search.getName(), inheritedName);
+    }
+
     private RankProfile resolveInherited() {
         if (inheritedName == null) return null;
         return (getSearch() != null)
-                ? ((search.getDocument() != null)
-                    ? rankProfileRegistry.resolve(search.getDocument(), inheritedName)
-                    : rankProfileRegistry.get(search.getName(), inheritedName))
+                ? resolveInherited(search)
                 : rankProfileRegistry.getGlobal(inheritedName);
     }
 
diff --git a/config-model/src/test/derived/illegal_sideways_inheritance/child1.sd b/config-model/src/test/derived/illegal_sideways_inheritance/child1.sd
deleted file mode 100644
index 8ee6fa0eabe..00000000000
--- a/config-model/src/test/derived/illegal_sideways_inheritance/child1.sd
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-schema child1 {
-
-  document child1 {
-    field field1 type int {
-      indexing: attribute
-    }
-
-  }
-
-  rank-profile child inherits parent {
-    function function2() {
-      expression: attribute(field1) + 5
-    }
-
-    first-phase {
-      expression: function2() * function1()
-    }
-
-    summary-features {
-      function1
-      function2
-      attribute(field1)
-    }
-  }
-}
diff --git a/config-model/src/test/derived/illegal_sideways_inheritance/child2.sd b/config-model/src/test/derived/illegal_sideways_inheritance/child2.sd
deleted file mode 100644
index cf91b48bd07..00000000000
--- a/config-model/src/test/derived/illegal_sideways_inheritance/child2.sd
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-schema child2 {
-
-  document child2 {
-    field field1 type int {
-      indexing: attribute
-    }
-  }
-
-  rank-profile parent {
-    first-phase {
-      expression: function1()
-    }
-    function function1() {
-      expression: attribute(field1) + 7
-    }
-    
-    summary-features {
-      function1
-      attribute(field1)
-    }
-  }
-
-}
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 6330a7bfc72..8f3fbfc9de9 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java
@@ -19,6 +19,9 @@ import com.yahoo.searchdefinition.document.SDDocumentType;
 import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.searchdefinition.parser.ParseException;
 import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels;
+
+import static com.yahoo.config.model.test.TestUtil.joinLines;
+
 import org.junit.Test;
 
 import java.util.Iterator;
@@ -67,11 +70,11 @@ public class RankProfileTestCase extends SchemaTestCase {
         try {
             RankProfileRegistry registry = new RankProfileRegistry();
             SearchBuilder builder = new SearchBuilder(registry, setupQueryProfileTypes());
-            builder.importString(
-                    "search test {\n" +
-                    "  document test { } \n" +
-                    "  rank-profile p1 inherits notexist {}\n" +
-                    "}");
+            builder.importString(joinLines(
+                    "search test {",
+                    "  document test { } ",
+                    "  rank-profile p1 inherits notexist {}",
+                    "}"));
             builder.build(true);
             fail();
         } catch (IllegalArgumentException e) {
@@ -84,11 +87,11 @@ public class RankProfileTestCase extends SchemaTestCase {
         try {
             RankProfileRegistry registry = new RankProfileRegistry();
             SearchBuilder builder = new SearchBuilder(registry, setupQueryProfileTypes());
-            builder.importString(
-                    "search test {\n" +
-                            "  document test { } \n" +
-                            "  rank-profile self inherits self {}\n" +
-                            "}");
+            builder.importString(joinLines(
+                    "schema test {",
+                    "  document test { } ",
+                    "  rank-profile self inherits self {}",
+                    "}"));
             builder.build(true);
             fail();
         } catch (IllegalArgumentException e) {
@@ -97,17 +100,98 @@ public class RankProfileTestCase extends SchemaTestCase {
     }
 
     @Test
+    public void requireThatSelfInheritanceIsLegalWhenOverloading() throws ParseException {
+        RankProfileRegistry registry = new RankProfileRegistry();
+        SearchBuilder builder = new SearchBuilder(registry, setupQueryProfileTypes());
+        builder.importString(joinLines(
+                "schema base {",
+                "  document base { } ",
+                "  rank-profile self inherits default {}",
+                "}"));
+        builder.importString(joinLines(
+                "schema test {",
+                "  document test inherits base { } ",
+                "  rank-profile self inherits self {}",
+                "}"));
+        builder.build(true);
+    }
+
+    @Test
+    public void requireThatSidewaysInheritanceIsImpossible() throws ParseException {
+        RankProfileRegistry registry = new RankProfileRegistry();
+        SearchBuilder builder = new SearchBuilder(registry, setupQueryProfileTypes());
+        builder.importString(joinLines(
+                "schema child1 {",
+                "  document child1 {",
+                "    field field1 type int {",
+                "      indexing: attribute",
+                "    }",
+                "  }",
+                "  rank-profile child inherits parent {",
+                "    function function2() {",
+                "      expression: attribute(field1) + 5",
+                "    }",
+                "    first-phase {",
+                "      expression: function2() * function1()",
+                "    }",
+                "    summary-features {",
+                "      function1",
+                "      function2",
+                "      attribute(field1)",
+                "    }",
+                "  }",
+                "}\n"));
+        builder.importString(joinLines(
+                "schema child2 {",
+                "  document child2 {",
+                "    field field1 type int {",
+                "      indexing: attribute",
+                "    }",
+                "  }",
+                "  rank-profile parent {",
+                "    first-phase {",
+                "      expression: function1()",
+                "    }",
+                "    function function1() {",
+                "      expression: attribute(field1) + 7",
+                "    }",
+                "    summary-features {",
+                "      function1",
+                "      attribute(field1)",
+                "    }",
+                "  }",
+                "}"));
+        try {
+            builder.build(true);
+        } catch (IllegalArgumentException e) {
+            assertEquals("rank-profile 'child' inherits 'parent', but it does not exist anywhere in the inheritance of search 'child1'.", e.getMessage());
+        }
+    }
+
+    @Test
+    public void requireThatDefaultCanAlwaysBeInherited() throws ParseException {
+        RankProfileRegistry registry = new RankProfileRegistry();
+        SearchBuilder builder = new SearchBuilder(registry, setupQueryProfileTypes());
+        builder.importString(joinLines(
+                "schema test {",
+                "  document test { } ",
+                "  rank-profile default inherits default {}",
+                "}"));
+        builder.build(true);
+    }
+
+    @Test
     public void requireThatCyclicInheritanceIsIllegal() throws ParseException {
         try {
             RankProfileRegistry registry = new RankProfileRegistry();
             SearchBuilder builder = new SearchBuilder(registry, setupQueryProfileTypes());
-            builder.importString(
-                    "search test {\n" +
-                            "  document test { } \n" +
-                            "  rank-profile a inherits b {}\n" +
-                            "  rank-profile b inherits c {}\n" +
-                            "  rank-profile c inherits a {}\n" +
-                            "}");
+            builder.importString(joinLines(
+                    "search test {",
+                    "  document test { } ",
+                    "  rank-profile a inherits b {}",
+                    "  rank-profile b inherits c {}",
+                    "  rank-profile c inherits a {}",
+                    "}"));
             builder.build(true);
             fail();
         } catch (IllegalArgumentException e) {
@@ -120,12 +204,12 @@ public class RankProfileTestCase extends SchemaTestCase {
     {
         RankProfileRegistry registry = new RankProfileRegistry();
         SearchBuilder builder = new SearchBuilder(registry, setupQueryProfileTypes());
-        builder.importString(
-                "search test {\n" +
-                        "  document test { } \n" +
-                        "  rank-profile p1 inherits not_yet_defined {}\n" +
-                        "  rank-profile not_yet_defined {}\n" +
-                        "}");
+        builder.importString(joinLines(
+                "search test {",
+                "  document test { } ",
+                "  rank-profile p1 inherits not_yet_defined {}",
+                "  rank-profile not_yet_defined {}",
+                "}"));
         builder.build(true);
         assertNotNull(registry.get("test","p1"));
         assertTrue(registry.get("test","p1").inherits("not_yet_defined"));
@@ -133,21 +217,22 @@ public class RankProfileTestCase extends SchemaTestCase {
     }
 
     private String createSD(Double termwiseLimit) {
-        return "search test {\n" +
-                "    document test { \n" +
-                "        field a type string { \n" +
-                "            indexing: index \n" +
-                "        }\n" +
-                "    }\n" +
-                "    \n" +
-                "    rank-profile parent {\n" +
-                (termwiseLimit != null ? ("        termwise-limit:" + termwiseLimit + "\n") : "") +
-                "        num-threads-per-search:8\n" +
-                "        min-hits-per-thread:70\n" +
-                "        num-search-partitions:1200\n" +
-                "    }\n" +
-                "    rank-profile child inherits parent { }\n" +
-                "}\n";
+        return joinLines(
+                "search test {",
+                "    document test { ",
+                "        field a type string { ",
+                "            indexing: index ",
+                "        }",
+                "    }",
+                "    ",
+                "    rank-profile parent {",
+                (termwiseLimit != null ? ("        termwise-limit:" + termwiseLimit + "\n") : ""),
+                "        num-threads-per-search:8",
+                "        min-hits-per-thread:70",
+                "        num-search-partitions:1200",
+                "    }",
+                "    rank-profile child inherits parent { }",
+                "}");
     }
 
     @Test
@@ -194,15 +279,16 @@ public class RankProfileTestCase extends SchemaTestCase {
     public void requireThatConfigIsDerivedForAttributeTypeSettings() throws ParseException {
         RankProfileRegistry registry = new RankProfileRegistry();
         SearchBuilder builder = new SearchBuilder(registry);
-        builder.importString("search test {\n" +
-                "  document test { \n" +
-                "    field a type tensor(x[10]) { indexing: attribute }\n" +
-                "    field b type tensor(y{}) { indexing: attribute }\n" +
-                "    field c type tensor(x[5]) { indexing: attribute }\n" +
-                "  }\n" +
-                "  rank-profile p1 {}\n" +
-                "  rank-profile p2 {}\n" +
-                "}");
+        builder.importString(joinLines(
+                "search test {",
+                "  document test { ",
+                "    field a type tensor(x[10]) { indexing: attribute }",
+                "    field b type tensor(y{}) { indexing: attribute }",
+                "    field c type tensor(x[5]) { indexing: attribute }",
+                "  }",
+                "  rank-profile p1 {}",
+                "  rank-profile p2 {}",
+                "}"));
         builder.build();
         Search search = builder.getSearch();
 
@@ -217,11 +303,12 @@ public class RankProfileTestCase extends SchemaTestCase {
     public void requireThatDenseDimensionsMustBeBound() throws ParseException {
         try {
             SearchBuilder builder = new SearchBuilder(new RankProfileRegistry());
-            builder.importString("search test {\n" +
-                                 "  document test { \n" +
-                                 "    field a type tensor(x[]) { indexing: attribute }\n" +
-                                 "  }\n" +
-                                 "}");
+            builder.importString(joinLines(
+                    "search test {",
+                    "  document test { ",
+                    "    field a type tensor(x[]) { indexing: attribute }",
+                    "  }",
+                    "}"));
             builder.build();
         }
         catch (IllegalArgumentException e) {
@@ -245,11 +332,12 @@ public class RankProfileTestCase extends SchemaTestCase {
     public void requireThatConfigIsDerivedForQueryFeatureTypeSettings() throws ParseException {
         RankProfileRegistry registry = new RankProfileRegistry();
         SearchBuilder builder = new SearchBuilder(registry, setupQueryProfileTypes());
-        builder.importString("search test {\n" +
-                "  document test { } \n" +
-                "  rank-profile p1 {}\n" +
-                "  rank-profile p2 {}\n" +
-                "}");
+        builder.importString(joinLines(
+                "search test {",
+                "  document test { } ",
+                "  rank-profile p1 {}",
+                "  rank-profile p2 {}",
+                "}"));
         builder.build(true);
         Search search = builder.getSearch();
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
index 41c5c919a62..8ef04752800 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
@@ -166,16 +166,6 @@ public class ExportingTestCase extends AbstractExportingTestCase {
     }
 
     @Test
-    public void testIllegalSidewaysRankProfileInheritance() throws IOException, ParseException {
-        try {
-            assertCorrectDeriving("illegal_sideways_inheritance", "child1", new TestableDeployLogger());
-            fail();
-        } catch (IllegalArgumentException e) {
-            assertEquals("rank-profile 'child' inherits 'parent', but it does not exist anywhere in the inheritance of search 'child1'.", e.getMessage());
-        }
-    }
-
-    @Test
     public void testLanguage() throws IOException, ParseException {
         TestableDeployLogger logger = new TestableDeployLogger();
         assertCorrectDeriving("language", logger);