Move to SchemaInfo

Add the missing constructs to SchemaInfo to be able to use
it in place of IndexFacts for validation, and rewrite QueryValidator
to use it. The new validation (for prefix search on indexes) is disabled
until this is verified, so this should be a no-op.

1 files changed, 4 insertions, 3 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/query/RankProfileInputTest.java b/container-search/src/test/java/com/yahoo/search/query/RankProfileInputTest.java
index cbe4ddcbc63..03b53970550 100644
--- a/container-search/src/test/java/com/yahoo/search/query/RankProfileInputTest.java
+++ b/container-search/src/test/java/com/yahoo/search/query/RankProfileInputTest.java
@@ -5,6 +5,7 @@ import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.language.Language;
 import com.yahoo.language.process.Embedder;
 import com.yahoo.search.Query;
+import com.yahoo.search.schema.Cluster;
 import com.yahoo.search.schema.RankProfile;
 import com.yahoo.search.schema.Schema;
 import com.yahoo.search.schema.SchemaInfo;
@@ -259,9 +260,9 @@ public class RankProfileInputTest {
                                          .addInput("query(myTensor1)", TensorType.fromSpec("tensor(a{},b{})"))
                                          .build())
                             .build());
-        Map<String, List<String>> clusters = new HashMap<>();
-        clusters.put("ab", List.of("a", "b"));
-        clusters.put("a", List.of("a"));
+        List<Cluster> clusters = new ArrayList<>();
+        clusters.add(new Cluster.Builder("ab").addSchema("a").addSchema("b").build());
+        clusters.add(new Cluster.Builder("a").addSchema("a").build());
         return new SchemaInfo(schemas, clusters);
     }