Check for schemas with mixed mode.

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.");
             }