Modular rank profiles

10 files changed, 26 insertions, 23 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/DisallowComplexMapAndWsetKeyTypesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/DisallowComplexMapAndWsetKeyTypesTestCase.java
index 3bdda1ea0d8..b03aff455c5 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/DisallowComplexMapAndWsetKeyTypesTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/DisallowComplexMapAndWsetKeyTypesTestCase.java
@@ -51,7 +51,7 @@ public class DisallowComplexMapAndWsetKeyTypesTestCase {
                         "        field a type " + fieldType + " {}\n" +
                         "    }\n" +
                         "}\n");
-        builder.build();
+        builder.build(true);
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/FastAccessValidatorTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/FastAccessValidatorTest.java
index 6e01909ea44..0c25cef49a1 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/FastAccessValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/FastAccessValidatorTest.java
@@ -55,7 +55,7 @@ public class FastAccessValidatorTest {
                 "For schema 'test': The following attributes have a type that is incompatible " +
                         "with fast-access: predicate_attribute, tensor_attribute, reference_attribute. " +
                         "Predicate, tensor and reference attributes are incompatible with fast-access.");
-        builder.build();
+        builder.build(true);
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSchemaFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSchemaFieldsTestCase.java
index cfc1779ded0..b0b9ce81cc7 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSchemaFieldsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSchemaFieldsTestCase.java
@@ -84,7 +84,7 @@ public class ImplicitSchemaFieldsTestCase extends AbstractSchemaTestCase {
     public void testRequireThatDerivedConfigurationWorks() throws IOException, ParseException {
         ApplicationBuilder sb = new ApplicationBuilder();
         sb.addSchemaFile("src/test/examples/nextgen/simple.sd");
-        sb.build();
+        sb.build(true);
         assertNotNull(sb.getSchema());
         new DerivedConfiguration(sb.getSchema(), sb.getRankProfileRegistry());
     }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java
index e87ecd3294f..b15b81b717d 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java
@@ -82,7 +82,7 @@ public class ImportedFieldsTestCase {
                 "  }",
                 "}"));
         builder.addSchema(sdContent);
-        builder.build();
+        builder.build(true);
         return builder.getSchema("ad");
     }
 
@@ -315,7 +315,7 @@ public class ImportedFieldsTestCase {
         ApplicationBuilder builder = new ApplicationBuilder();
         builder.addSchema(parentSdContent);
         builder.addSchema(sdContent);
-        builder.build();
+        builder.build(true);
         return builder.getSchema("child");
     }
 
@@ -324,7 +324,7 @@ public class ImportedFieldsTestCase {
         builder.addSchema(grandParentSdContent);
         builder.addSchema(parentSdContent);
         builder.addSchema(sdContent);
-        builder.build();
+        builder.build(true);
         return builder.getSchema("child");
     }
 
@@ -522,7 +522,7 @@ public class ImportedFieldsTestCase {
                                     "import field ref_parent_b.entries as entries_from_b {}",
                                     "}"));
 
-        builder.build();
+        builder.build(true);
         return builder;
     }
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java
index ea5102baf17..b48927d58a3 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java
@@ -186,7 +186,7 @@ public class MatchedElementsOnlyResolverTestCase {
                                     "  }",
                                     summary,
                                     "}"));
-        builder.build();
+        builder.build(true);
         return builder.getSchema();
     }
 }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java
index dbf339dee4b..2d0bdb58122 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java
@@ -78,7 +78,7 @@ class RankProfileSearchFixture {
                            "\n" +
                            "}";
         builder.addSchema(sdContent);
-        builder.build();
+        builder.build(true);
         schema = builder.getSchema();
     }
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolverTestCase.java
index ec8d9bc4261..7f5e8f8753a 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolverTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolverTestCase.java
@@ -48,7 +48,7 @@ public class RankingExpressionTypeResolverTestCase {
                     "  }",
                     "}"
             ));
-            builder.build();
+            builder.build(true);
             fail("Expected exception");
         }
         catch (IllegalArgumentException expected) {
@@ -96,7 +96,7 @@ public class RankingExpressionTypeResolverTestCase {
                     "  }",
                     "}"
             ));
-            builder.build();
+            builder.build(true);
             fail("Expected exception");
         }
         catch (IllegalArgumentException expected) {
@@ -128,7 +128,7 @@ public class RankingExpressionTypeResolverTestCase {
                     "  }",
                     "}"
             ));
-            builder.build();
+            builder.build(true);
             fail("Expected exception");
         }
         catch (IllegalArgumentException expected) {
@@ -158,7 +158,7 @@ public class RankingExpressionTypeResolverTestCase {
                     "  }",
                     "}"
             ));
-            schemaBuilder.build();
+            schemaBuilder.build(true);
             fail("Expected exception");
         }
         catch (IllegalArgumentException expected) {
@@ -194,7 +194,7 @@ public class RankingExpressionTypeResolverTestCase {
                 "  }",
                 "}"
         ));
-        builder.build();
+        builder.build(true);
         RankProfile profile =
                 builder.getRankProfileRegistry().get(builder.getSchema(), "my_rank_profile");
         assertEquals(TensorType.fromSpec("tensor(x[10],y[3])"),
@@ -236,7 +236,7 @@ public class RankingExpressionTypeResolverTestCase {
                 "  }",
                 "}"
         ));
-        builder.build();
+        builder.build(true);
         RankProfile profile =
                 builder.getRankProfileRegistry().get(builder.getSchema(), "my_rank_profile");
         assertEquals(TensorType.fromSpec("tensor(x[10],y[1])"),
@@ -280,7 +280,7 @@ public class RankingExpressionTypeResolverTestCase {
                                  "        first-phase { expression: commonfirstphase(eustaticrank) }",
                                  "    }",
                                  "}"));
-        builder.build();
+        builder.build(true);
         RankProfile profile = builder.getRankProfileRegistry().get(builder.getSchema(), "eurank");
     }
 
@@ -320,7 +320,7 @@ public class RankingExpressionTypeResolverTestCase {
                 "  }",
                 "}"
         ));
-        builder.build();
+        builder.build(true);
         RankProfile profile =
                 builder.getRankProfileRegistry().get(builder.getSchema(), "my_rank_profile");
         assertEquals(TensorType.fromSpec("tensor(x[10],y[1])"),
@@ -345,7 +345,7 @@ public class RankingExpressionTypeResolverTestCase {
                                  "        summary-features { test_func_via_func_with_expr }",
                                  "    }",
                                  "}"));
-        builder.build();
+        builder.build(true);
         RankProfile profile = builder.getRankProfileRegistry().get(builder.getSchema(), "test");
         assertEquals(TensorType.fromSpec("tensor<float>(y{})"),
                      summaryFeatures(profile).get("test_func_via_func_with_expr").type(profile.typeContext(builder.getQueryProfileRegistry())));
@@ -378,7 +378,7 @@ public class RankingExpressionTypeResolverTestCase {
                 "  }",
                 "}"
         ));
-        builder.build();
+        builder.build(true);
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java
index 09aa09a626b..2a9d64767ba 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java
@@ -399,8 +399,10 @@ public class RankingExpressionWithOnnxTestCase {
 
         @Override
         public List<NamedReader> getFiles(Path path, String suffix) {
+            File[] files = getFileReference(path).listFiles();
+            if (files == null)  return List.of();
             List<NamedReader> readers = new ArrayList<>();
-            for (File file : getFileReference(path).listFiles()) {
+            for (File file : files) {
                 if ( ! file.getName().endsWith(suffix)) continue;
                 try {
                     readers.add(new NamedReader(file.getName(), new FileReader(file)));
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java
index 1cdc0aef1cc..ffc073ed434 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java
@@ -89,7 +89,7 @@ public class RankingExpressionWithTransformerTokensTestCase {
                 "}";
         ApplicationBuilder schemaBuilder = new ApplicationBuilder(application, new MockFileRegistry(), new BaseDeployLogger(), new TestProperties(), rankProfileRegistry, queryProfileRegistry);
         schemaBuilder.addSchema(sdContent);
-        schemaBuilder.build();
+        schemaBuilder.build(true);
         Schema schema = schemaBuilder.getSchema();
         RankProfile rp = rankProfileRegistry.get(schema, "my_profile");
         return new RankProfileTransformContext(rp, queryProfileRegistry, Collections.emptyMap(), null, Collections.emptyMap(), Collections.emptyMap());
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java
index a2da13b3749..d60cb9040d8 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java
@@ -49,7 +49,7 @@ public class ReferenceFieldTestCase {
         builder.addSchema(campaignSdContent);
         builder.addSchema(salespersonSdContent);
         builder.addSchema(adSdContent);
-        builder.build();
+        builder.build(true);
         Schema schema = builder.getSchema("ad");
         assertSearchContainsReferenceField("campaign_ref", "campaign", schema.getDocument());
         assertSearchContainsReferenceField("salesperson_ref", "salesperson", schema.getDocument());
@@ -74,7 +74,7 @@ public class ReferenceFieldTestCase {
         builder.addSchema(adSdContent);
         exceptionRule.expect(DocumentGraphValidator.DocumentGraphException.class);
         exceptionRule.expectMessage("Document dependency cycle detected: campaign->ad->campaign.");
-        builder.build();
+        builder.build(true);
     }
 
     private static void assertSearchContainsReferenceField(String expectedFieldname,
@@ -87,4 +87,5 @@ public class ReferenceFieldTestCase {
         ReferenceDataType refField = (ReferenceDataType) dataType;
         assertEquals(referencedDocType, refField.getTargetType().getName());
     }
+
 }