CPP-976: prevent ccm brdige from adding two incompatible parameters for DSE-6.x nodes

Wei Deng · Wei Deng · commit f9eac860f4f9 · 2023-07-27T04:04:38.000Z
diff --git a/tests/src/integration/ccm/bridge.cpp b/tests/src/integration/ccm/bridge.cpp
@@ -1491,7 +1491,7 @@ CCM::Bridge::generate_create_updateconf_command(CassVersion cassandra_version) {
     updateconf_command.push_back("enable_scripted_user_defined_functions:true");
   }
 
-  if (cassandra_version >= "4.0.0") {
+  if (cassandra_version >= "4.0.0" and !is_dse()) {
     updateconf_command.push_back("enable_materialized_views:true");
     updateconf_command.push_back("enable_user_defined_functions:true");
   }

Original file line number	Diff line number	Diff line change
`@@ -1491,7 +1491,7 @@ CCM::Bridge::generate_create_updateconf_command(CassVersion cassandra_version) {`
`1491`	`1491`	`updateconf_command.push_back("enable_scripted_user_defined_functions:true");`
`1492`	`1492`	`}`
`1493`	`1493`
`1494`		`- if (cassandra_version >= "4.0.0") {`
	`1494`	`+ if (cassandra_version >= "4.0.0" and !is_dse()) {`
`1495`	`1495`	`updateconf_command.push_back("enable_materialized_views:true");`
`1496`	`1496`	`updateconf_command.push_back("enable_user_defined_functions:true");`
`1497`	`1497`	`}`