diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-15 13:00:57 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-15 13:00:57 +0100 |
commit | 97754144fa0a7c5a61458ce2fe539ee377490c15 (patch) | |
tree | 2009137298557c24d57c52b5cc9543deff9e68a2 /config-model/src/main/java/com/yahoo/vespa/model | |
parent | c809f7d0727f6dc833fd209f27e875e984c7da3c (diff) |
Check for schemas with mixed mode.
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/EngineFactoryBuilder.java | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java index ae9c0b681d2..01708333ed5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java @@ -232,6 +232,14 @@ public class ContentSearchCluster extends TreeConfigProducer<AnyConfigProducer> return hasStreaming; } + public boolean hasStreaming() { + return (indexedCluster != null) && indexedCluster.hasStreaming(); + } + + public boolean hasIndexed() { + return (indexedCluster != null) && indexedCluster.hasIndexed(); + } + public List<SearchNode> getSearchNodes() { return hasIndexedCluster() ? getIndexed().getSearchNodes() : nonIndexed; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/EngineFactoryBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/EngineFactoryBuilder.java index 7fc713f81ef..f4e6244fa25 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/EngineFactoryBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/EngineFactoryBuilder.java @@ -13,7 +13,7 @@ public class EngineFactoryBuilder { public PersistenceEngine.PersistenceFactory build(ModelElement clusterElem, ContentCluster c) { ModelElement persistence = clusterElem.child("engine"); if (persistence != null) { - if (c.getSearch().hasIndexedCluster() && persistence.child("proton") == null) { + if (c.getSearch().hasIndexed() && persistence.child("proton") == null) { throw new IllegalArgumentException("Persistence engine does not allow for indexed search. Please use <proton> as your engine."); } |