- Document types with mode store-only are not searchable.

3 files changed, 26 insertions, 54 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java b/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java
index 421f3d5a1d1..14a62d4b601 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java
@@ -153,17 +153,12 @@ public class DerivedConfiguration {
         }
     }
 
-    public boolean isStreaming() {
-        return indexMode == SchemaInfo.IndexMode.STREAMING;
-    }
+    public boolean isStreaming() { return indexMode == SchemaInfo.IndexMode.STREAMING; }
 
-    public Summaries getSummaries() {
-        return summaries;
-    }
+    public SchemaInfo.IndexMode getIndexMode() { return indexMode; }
 
-    public AttributeFields getAttributeFields() {
-        return attributeFields;
-    }
+    public Summaries getSummaries() { return summaries; }
+    public AttributeFields getAttributeFields() { return attributeFields; }
 
     public void getConfig(AttributesConfig.Builder builder) {
         getConfig(builder, AttributeFields.FieldSet.ALL);
@@ -173,46 +168,17 @@ public class DerivedConfiguration {
         attributeFields.getConfig(builder, fs, maxUncommittedMemory);
     }
 
-    public IndexingScript getIndexingScript() {
-        return indexingScript;
-    }
-
-    public IndexInfo getIndexInfo() {
-        return indexInfo;
-    }
-
+    public IndexingScript getIndexingScript() { return indexingScript; }
+    public IndexInfo getIndexInfo() { return indexInfo; }
     public SchemaInfo getSchemaInfo() { return schemaInfo; }
-
-    public void setIndexingScript(IndexingScript script) {
-        this.indexingScript = script;
-    }
-
+    public void setIndexingScript(IndexingScript script) { this.indexingScript = script; }
     public Schema getSchema() { return schema; }
-
-    public RankProfileList getRankProfileList() {
-        return rankProfileList;
-    }
-
-    public VsmSummary getVsmSummary() {
-        return streamingSummary;
-    }
-
-    public VsmFields getVsmFields() {
-        return streamingFields;
-    }
-
-    public IndexSchema getIndexSchema() {
-        return indexSchema;
-    }
-
-    public Juniperrc getJuniperrc() {
-        return juniperrc;
-    }
-
-    public ImportedFields getImportedFields() {
-        return importedFields;
-    }
-
+    public RankProfileList getRankProfileList() { return rankProfileList; }
+    public VsmSummary getVsmSummary() { return streamingSummary; }
+    public VsmFields getVsmFields() { return streamingFields; }
+    public IndexSchema getIndexSchema() { return indexSchema; }
+    public Juniperrc getJuniperrc() { return juniperrc; }
+    public ImportedFields getImportedFields() { return importedFields; }
     public QueryProfileRegistry getQueryProfiles() { return queryProfiles; }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
index f19ae5155eb..664e1ecbe9e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
@@ -186,11 +186,12 @@ public abstract class SearchCluster extends TreeConfigProducer<AnyConfigProducer
     @Override
     public void getConfig(DocumentdbInfoConfig.Builder builder) {
         for (DocumentDatabase db : documentDbs.values()) {
-            var docDb = new DocumentdbInfoConfig.Documentdb.Builder()
-                    .name(db.getName())
-                    .mode(db.getDerivedConfiguration().isStreaming()
-                            ? DocumentdbInfoConfig.Documentdb.Mode.Enum.STREAMING
-                            : DocumentdbInfoConfig.Documentdb.Mode.Enum.INDEX);
+            var docDb = new DocumentdbInfoConfig.Documentdb.Builder().name(db.getName());
+            switch (db.getDerivedConfiguration().getIndexMode()) {
+                case INDEX -> docDb.mode(DocumentdbInfoConfig.Documentdb.Mode.Enum.INDEX);
+                case STREAMING -> docDb.mode(DocumentdbInfoConfig.Documentdb.Mode.Enum.STREAMING);
+                case STORE_ONLY -> docDb.mode(DocumentdbInfoConfig.Documentdb.Mode.Enum.STORE_ONLY);
+            }
             builder.documentdb(docDb);
         }
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
index b4c625a599b..271336712a0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
@@ -324,17 +324,22 @@ public class DocumentDatabaseTestCase {
     @Test
     void testMixedModeCluster() {
         // Will soon change
-        List<DocType> sds = List.of(DocType.create("a", "index"), DocType.create("b", "streaming"));
+        List<DocType> sds = List.of(DocType.create("a", "index"),
+                                    DocType.create("b", "streaming"),
+                                    DocType.create("c", "store-only"));
         var tester = new SchemaTester();
         var model = tester.createModel(sds, "");
         DocumentdbInfoConfig indexed_cfg = model.getConfig(DocumentdbInfoConfig.class, "test/search/cluster.test");
-        assertEquals(2, indexed_cfg.documentdb().size());
+        assertEquals(3, indexed_cfg.documentdb().size());
         var db = indexed_cfg.documentdb(0);
         assertEquals("a", db.name());
         assertEquals(DocumentdbInfoConfig.Documentdb.Mode.INDEX, db.mode());
         db = indexed_cfg.documentdb(1);
         assertEquals("b", db.name());
         assertEquals(DocumentdbInfoConfig.Documentdb.Mode.STREAMING, db.mode());
+        db = indexed_cfg.documentdb(2);
+        assertEquals("c", db.name());
+        assertEquals(DocumentdbInfoConfig.Documentdb.Mode.STORE_ONLY, db.mode());
     }
 
     private void assertAttributesConfigIndependentOfMode(String mode, List<String> sds,