This is an automated email from the ASF dual-hosted git repository.
absurdfarce pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/cassandra-java-driver.git
The following commit(s) were added to refs/heads/4.x by this push:
new 4fb51081a Fix C* 3.0 tests failing on Jenkins patch by Lukasz
Antoniak; reviewed by Bret McGuire reference: #1939
4fb51081a is described below
commit 4fb51081a3a71b2017ddc3f43a7945e3a9d19e25
Author: Lukasz Antoniak <lukasz.anton...@gmail.com>
AuthorDate: Mon Jun 10 12:42:29 2024 +0200
Fix C* 3.0 tests failing on Jenkins
patch by Lukasz Antoniak; reviewed by Bret McGuire
reference: #1939
---
.../src/test/java/com/datastax/oss/driver/mapper/DeleteIT.java | 3 +--
.../test/java/com/datastax/oss/driver/mapper/InventoryITBase.java | 6 +++++-
.../com/datastax/oss/driver/mapper/SelectCustomWhereClauseIT.java | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git
a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/DeleteIT.java
b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/DeleteIT.java
index 0acdbeae5..03e359750 100644
---
a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/DeleteIT.java
+++
b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/DeleteIT.java
@@ -60,8 +60,7 @@ import org.junit.rules.TestRule;
description = ">= in WHERE clause not supported in legacy versions")
public class DeleteIT extends InventoryITBase {
- private static CustomCcmRule CCM_RULE =
-
CustomCcmRule.builder().withCassandraConfiguration("enable_sasi_indexes",
"true").build();
+ private static CustomCcmRule CCM_RULE = CustomCcmRule.builder().build();
private static final SessionRule<CqlSession> SESSION_RULE =
SessionRule.builder(CCM_RULE).build();
diff --git
a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/InventoryITBase.java
b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/InventoryITBase.java
index 2be025b37..9495003ae 100644
---
a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/InventoryITBase.java
+++
b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/InventoryITBase.java
@@ -59,6 +59,10 @@ public abstract class InventoryITBase {
new ProductSale(MP3_DOWNLOAD.getId(), DATE_3, 7,
Uuids.startOf(915192000), 0.99, 12);
protected static List<String> createStatements(BaseCcmRule ccmRule) {
+ return createStatements(ccmRule, false);
+ }
+
+ protected static List<String> createStatements(BaseCcmRule ccmRule, boolean
requiresSasiIndex) {
ImmutableList.Builder<String> builder =
ImmutableList.<String>builder()
.add(
@@ -71,7 +75,7 @@ public abstract class InventoryITBase {
"CREATE TABLE product_sale(id uuid, day text, ts uuid,
customer_id int, price "
+ "double, count int, PRIMARY KEY ((id, day), customer_id,
ts))");
- if (supportsSASI(ccmRule) && !isSasiBroken(ccmRule)) {
+ if (requiresSasiIndex && supportsSASI(ccmRule) && !isSasiBroken(ccmRule)) {
builder.add(
"CREATE CUSTOM INDEX product_description ON product(description) "
+ "USING 'org.apache.cassandra.index.sasi.SASIIndex' "
diff --git
a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SelectCustomWhereClauseIT.java
b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SelectCustomWhereClauseIT.java
index 3df1ccd21..1f1b92b86 100644
---
a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SelectCustomWhereClauseIT.java
+++
b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SelectCustomWhereClauseIT.java
@@ -75,7 +75,7 @@ public class SelectCustomWhereClauseIT extends
InventoryITBase {
SchemaChangeSynchronizer.withLock(
() -> {
- for (String query : createStatements(CCM_RULE)) {
+ for (String query : createStatements(CCM_RULE, true)) {
session.execute(
SimpleStatement.builder(query)
.setExecutionProfile(SESSION_RULE.slowProfile())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
