diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-20 11:43:14 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-20 11:45:53 +0100 |
commit | 473ef63d27db0e260df3f0fa93bb239c5f0f061d (patch) | |
tree | 7e8bb10020323d9eca86e2f8d15e611a9bc20ed7 /config-model/src/main/java/com | |
parent | 7938460dd3b3d72ec1900febe29c1a94db964648 (diff) |
- Document types with mode store-only are not searchable.
Diffstat (limited to 'config-model/src/main/java/com')
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java | 60 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java | 11 |
2 files changed, 19 insertions, 52 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); } } |