Merge pull request #31071 from vespa-engine/hmusum/handle-more-exceptions-from-rank-profiles-outside-schemav8.337.85

Handle TokenMgrException properly when adding rank profiles outside s…

3 files changed, 22 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/parser/IntermediateCollection.java b/config-model/src/main/java/com/yahoo/schema/parser/IntermediateCollection.java
index 789f7023aed..063962bf0c4 100644
--- a/config-model/src/main/java/com/yahoo/schema/parser/IntermediateCollection.java
+++ b/config-model/src/main/java/com/yahoo/schema/parser/IntermediateCollection.java
@@ -133,9 +133,9 @@ public class IntermediateCollection {
             var parser = new SchemaParser(stream, deployLogger, modelProperties);
             try {
                 parser.rankProfile(schema);
-            } catch (ParseException pe) {
+            } catch (ParseException | TokenMgrException e) {
                 throw new ParseException("Failed parsing rank-profile from '" + reader.getName() + "': " +
-                                         stream.formatException(Exceptions.toMessageString(pe)));
+                                         stream.formatException(Exceptions.toMessageString(e)));
             }
         } catch (java.io.IOException ex) {
             throw new IllegalArgumentException("Failed reading from '" + reader.getName() + "': " + ex.getMessage());
diff --git a/config-model/src/test/derived/rankprofilemodularity2/invalid_comment.profile b/config-model/src/test/derived/rankprofilemodularity2/invalid_comment.profile
new file mode 100644
index 00000000000..40e77c8c6be
--- /dev/null
+++ b/config-model/src/test/derived/rankprofilemodularity2/invalid_comment.profile
@@ -0,0 +1,8 @@
+rank-profile outside_schema1 {
+
+    // Comment with wrong comment character
+    function foo() {
+        expression: now
+    }
+
+}
diff --git a/config-model/src/test/java/com/yahoo/schema/parser/IntermediateCollectionTestCase.java b/config-model/src/test/java/com/yahoo/schema/parser/IntermediateCollectionTestCase.java
index 8d2c98439ca..af6fb82ee7b 100644
--- a/config-model/src/test/java/com/yahoo/schema/parser/IntermediateCollectionTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/parser/IntermediateCollectionTestCase.java
@@ -1,6 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.schema.parser;
 
+import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.io.reader.NamedReader;
 import static com.yahoo.config.model.test.TestUtil.joinLines;
 
@@ -232,5 +233,16 @@ public class IntermediateCollectionTestCase {
         assertTrue(ex.getMessage().startsWith("Inheritance/reference cycle for documents: "));
     }
 
+    @Test
+    void can_detect_errors_in_rank_profile_outside_schema() {
+        var collection = new IntermediateCollection();
+        collection.addSchemaFromFile("src/test/derived/rankprofilemodularity/test.sd");
+        var exception = assertThrows(ParseException.class, () -> {
+            collection.addRankProfileFile("test", "src/test/derived/rankprofilemodularity2/invalid_comment.profile");
+        });
+        var message = exception.getMessage();
+        assertTrue(message.contains("Failed parsing rank-profile from 'src/test/derived/rankprofilemodularity2/invalid_comment.profile'"));
+        assertTrue(message.contains("Lexical error at line 3, column 6"), message);
+    }
 
 }