Use fully qualified rank-profile names

2 files changed, 10 insertions, 5 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 4c4cc3b524f..17b5953b824 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
@@ -217,17 +217,22 @@ public class RankProfile implements Cloneable {
                 }
             } else {
                 List<String> children = new ArrayList<>();
-                children.add(getName());
+                children.add(createFullyQualifiedName());
                 verifyNoInheritanceCycle(children, inherited);
             }
         }
         return inherited;
     }
+    private String createFullyQualifiedName() {
+        return (search != null)
+                ? (search.getName() + "." + getName())
+                : getName();
+    }
 
     private void verifyNoInheritanceCycle(List<String> children, RankProfile parent) {
-        children.add(parent.getName());
+        children.add(parent.createFullyQualifiedName());
         String root = children.get(0);
-        if (root.equals(parent.getName())) {
+        if (root.equals(parent.createFullyQualifiedName())) {
             throw new IllegalArgumentException("There is a cycle in the inheritance for rank-profile '" + root + "' = " + children);
         }
         if (parent.getInherited() != null) {
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 c58a539abf1..6330a7bfc72 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java
@@ -92,7 +92,7 @@ public class RankProfileTestCase extends SchemaTestCase {
             builder.build(true);
             fail();
         } catch (IllegalArgumentException e) {
-            assertEquals("There is a cycle in the inheritance for rank-profile 'self' = [self, self]", e.getMessage());
+            assertEquals("There is a cycle in the inheritance for rank-profile 'test.self' = [test.self, test.self]", e.getMessage());
         }
     }
 
@@ -111,7 +111,7 @@ public class RankProfileTestCase extends SchemaTestCase {
             builder.build(true);
             fail();
         } catch (IllegalArgumentException e) {
-            assertEquals("There is a cycle in the inheritance for rank-profile 'c' = [c, a, b, c]", e.getMessage());
+            assertEquals("There is a cycle in the inheritance for rank-profile 'test.c' = [test.c, test.a, test.b, test.c]", e.getMessage());
         }
     }