CASSANDRA-19635 - Run integration tests with C* 5.x

Author: lukasz-antoniak

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/SchemaIT.java

@@ -254,33 +254,32 @@ public void should_get_virtual_metadata() {
                   + "    unit text,\n"
                   + "    PRIMARY KEY (keyspace_name, table_name, task_id)\n"
                   + "); */",
-              // Cassandra 5.0
+              // Cassandra 4.0
               "/* VIRTUAL TABLE system_views.sstable_tasks (\n"
                   + "    keyspace_name text,\n"
                   + "    table_name text,\n"
-                  + "    task_id timeuuid,\n"
+                  + "    task_id uuid,\n"
                   + "    completion_ratio double,\n"
                   + "    kind text,\n"
                   + "    progress bigint,\n"
-                  + "    sstables int,\n"
-                  + "    target_directory text,\n"
                   + "    total bigint,\n"
                   + "    unit text,\n"
                   + "    PRIMARY KEY (keyspace_name, table_name, task_id)\n"
                   + "); */",
-              // Cassandra 4.0
+              // Cassandra 4.1
               "/* VIRTUAL TABLE system_views.sstable_tasks (\n"
                   + "    keyspace_name text,\n"
                   + "    table_name text,\n"
-                  + "    task_id uuid,\n"
+                  + "    task_id timeuuid,\n"
                   + "    completion_ratio double,\n"
                   + "    kind text,\n"
                   + "    progress bigint,\n"
+                  + "    sstables int,\n"
                   + "    total bigint,\n"
                   + "    unit text,\n"
                   + "    PRIMARY KEY (keyspace_name, table_name, task_id)\n"
                   + "); */",
-              // Cassandra 4.1
+              // Cassandra 5.0
               "/* VIRTUAL TABLE system_views.sstable_tasks (\n"
                   + "    keyspace_name text,\n"
                   + "    table_name text,\n"
@@ -289,6 +288,7 @@ public void should_get_virtual_metadata() {
                   + "    kind text,\n"
                   + "    progress bigint,\n"
                   + "    sstables int,\n"
+                  + "    target_directory text,\n"
                   + "    total bigint,\n"
                   + "    unit text,\n"
                   + "    PRIMARY KEY (keyspace_name, table_name, task_id)\n"

integration-tests/src/test/java/com/datastax/oss/driver/mapper/DeleteReactiveIT.java

@@ -24,6 +24,7 @@
 import com.datastax.dse.driver.api.mapper.reactive.MappedReactiveResultSet;
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.Version;
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.mapper.annotations.Dao;
 import com.datastax.oss.driver.api.mapper.annotations.DaoFactory;
@@ -34,9 +35,8 @@
 import com.datastax.oss.driver.api.mapper.annotations.Mapper;
 import com.datastax.oss.driver.api.mapper.annotations.Select;
 import com.datastax.oss.driver.api.mapper.entity.saving.NullSavingStrategy;
+import com.datastax.oss.driver.api.testinfra.ccm.CcmBridge;
 import com.datastax.oss.driver.api.testinfra.ccm.CustomCcmRule;
-import com.datastax.oss.driver.api.testinfra.requirement.BackendRequirement;
-import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;
 import io.reactivex.Flowable;
 import java.util.UUID;
@@ -48,18 +48,22 @@
 import org.junit.rules.TestRule;
 
 // Do not run LWT tests in parallel because they may interfere. Tests operate on the same row.
-@BackendRequirement(
-    type = BackendType.CASSANDRA,
-    description = "SASI indexes broken in DSE. See InventoryITBase#BROKEN_SASI_VERSION.")
 public class DeleteReactiveIT extends InventoryITBase {
 
-  private static CustomCcmRule ccmRule =
-      CustomCcmRule.builder().withCassandraConfiguration("enable_sasi_indexes", "true").build();
+  private static CustomCcmRule ccmRule = configureCcm(CustomCcmRule.builder()).build();
 
   private static SessionRule<CqlSession> sessionRule = SessionRule.builder(ccmRule).build();
 
   @ClassRule public static TestRule chain = RuleChain.outerRule(ccmRule).around(sessionRule);
 
+  private static CustomCcmRule.Builder configureCcm(CustomCcmRule.Builder builder) {
+    if (!CcmBridge.DSE_ENABLEMENT
+        && CcmBridge.VERSION.nextStable().compareTo(Version.V4_0_0) >= 0) {
+      builder.withCassandraConfiguration("enable_sasi_indexes", true);
+    }
+    return builder;
+  }
+
   private static DseProductDao dao;
 
   @BeforeClass