Skip to content

Commit 4fb5108

Browse files
lukasz-antoniakabsurdfarce
authored andcommitted
Fix C* 3.0 tests failing on Jenkins
patch by Lukasz Antoniak; reviewed by Bret McGuire reference: #1939
1 parent 77805f5 commit 4fb5108

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@
6060
description = ">= in WHERE clause not supported in legacy versions")
6161
public class DeleteIT extends InventoryITBase {
6262

63-
private static CustomCcmRule CCM_RULE =
64-
CustomCcmRule.builder().withCassandraConfiguration("enable_sasi_indexes", "true").build();
63+
private static CustomCcmRule CCM_RULE = CustomCcmRule.builder().build();
6564

6665
private static final SessionRule<CqlSession> SESSION_RULE = SessionRule.builder(CCM_RULE).build();
6766

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ public abstract class InventoryITBase {
5959
new ProductSale(MP3_DOWNLOAD.getId(), DATE_3, 7, Uuids.startOf(915192000), 0.99, 12);
6060

6161
protected static List<String> createStatements(BaseCcmRule ccmRule) {
62+
return createStatements(ccmRule, false);
63+
}
64+
65+
protected static List<String> createStatements(BaseCcmRule ccmRule, boolean requiresSasiIndex) {
6266
ImmutableList.Builder<String> builder =
6367
ImmutableList.<String>builder()
6468
.add(
@@ -71,7 +75,7 @@ protected static List<String> createStatements(BaseCcmRule ccmRule) {
7175
"CREATE TABLE product_sale(id uuid, day text, ts uuid, customer_id int, price "
7276
+ "double, count int, PRIMARY KEY ((id, day), customer_id, ts))");
7377

74-
if (supportsSASI(ccmRule) && !isSasiBroken(ccmRule)) {
78+
if (requiresSasiIndex && supportsSASI(ccmRule) && !isSasiBroken(ccmRule)) {
7579
builder.add(
7680
"CREATE CUSTOM INDEX product_description ON product(description) "
7781
+ "USING 'org.apache.cassandra.index.sasi.SASIIndex' "

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static void setup() {
7575

7676
SchemaChangeSynchronizer.withLock(
7777
() -> {
78-
for (String query : createStatements(CCM_RULE)) {
78+
for (String query : createStatements(CCM_RULE, true)) {
7979
session.execute(
8080
SimpleStatement.builder(query)
8181
.setExecutionProfile(SESSION_RULE.slowProfile())

0 commit comments

Comments
 (0)