Skip to content

Commit 88d594e

Browse files
dkropachevdkropachev
authored
Merge pull request #104 from Bouncheck/patch-for-3.11.5.7-v1
Add patch for scylla/3.11.5.7
2 parents e3effe0 + a44132b commit 88d594e

File tree

2 files changed

+197
-0
lines changed

2 files changed

+197
-0
lines changed

‎versions/scylla/3.11.5.7/ignore.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tests:

‎versions/scylla/3.11.5.7/patch‎

Lines changed: 196 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,196 @@
1+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java b/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
2+
index 80d461aa5..de1867dea 100644
3+
--- a/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
4+
+++ b/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
5+
@@ -1348,6 +1348,9 @@ public class CCMBridge implements CCMAccess {
6+
String quote = isWindows() ? "\"" : "";
7+
for (String jvmArg : jvmArgs) {
8+
// Windows requires jvm arguments to be quoted, while *nix requires unquoted.
9+
+ if (scylla && jvmArg.startsWith("-Dcassandra")) {
10+
+ continue;
11+
+ }
12+
allJvmArgs.append(" ");
13+
allJvmArgs.append(quote);
14+
allJvmArgs.append("--jvm_arg=");
15+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/CCMBridgeTest.java b/driver-core/src/test/java/com/datastax/driver/core/CCMBridgeTest.java
16+
index 2f340b3a7..636763691 100644
17+
--- a/driver-core/src/test/java/com/datastax/driver/core/CCMBridgeTest.java
18+
+++ b/driver-core/src/test/java/com/datastax/driver/core/CCMBridgeTest.java
19+
@@ -32,6 +32,7 @@ public class CCMBridgeTest extends CCMTestsSupport {
20+
@Test(groups = "short")
21+
@ScyllaVersion(
22+
maxOSS = "6.2.0",
23+
+ maxEnterprise = "2025.1.0",
24+
description = "JMX was dropped in scylladb/3cd2a6173668c5a13b6e674f912ff597f76422f5")
25+
public void should_make_JMX_connection() throws Exception {
26+
InetSocketAddress addr1 = ccm().jmxAddressOfNode(1);
27+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/ClusterStressTest.java b/driver-core/src/test/java/com/datastax/driver/core/ClusterStressTest.java
28+
index 74befba29..e5867e506 100644
29+
--- a/driver-core/src/test/java/com/datastax/driver/core/ClusterStressTest.java
30+
+++ b/driver-core/src/test/java/com/datastax/driver/core/ClusterStressTest.java
31+
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
32+
import org.testng.annotations.AfterMethod;
33+
import org.testng.annotations.Test;
34+
35+
+@CCMConfig(jvmArgs = {"--smp", "1"})
36+
public class ClusterStressTest extends CCMTestsSupport {
37+
38+
private static final Logger logger = LoggerFactory.getLogger(ClusterStressTest.class);
39+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/ControlConnectionTest.java b/driver-core/src/test/java/com/datastax/driver/core/ControlConnectionTest.java
40+
index 7fa9c8550..9ac6b9135 100644
41+
--- a/driver-core/src/test/java/com/datastax/driver/core/ControlConnectionTest.java
42+
+++ b/driver-core/src/test/java/com/datastax/driver/core/ControlConnectionTest.java
43+
@@ -119,13 +119,14 @@ public class ControlConnectionTest extends CCMTestsSupport {
44+
Cluster cluster = register(createClusterBuilder().build());
45+
Session session = cluster.connect();
46+
session.execute(
47+
- "create keyspace ks WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}");
48+
- session.execute("create type ks.foo (i int)");
49+
+ "create keyspace ControlConnectionTest_ks WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}");
50+
+ session.execute("create type ControlConnectionTest_ks.foo (i int)");
51+
cluster.close();
52+
53+
// Second driver instance: read UDT definition
54+
Cluster cluster2 = register(createClusterBuilder().build());
55+
- UserType fooType = cluster2.getMetadata().getKeyspace("ks").getUserType("foo");
56+
+ UserType fooType =
57+
+ cluster2.getMetadata().getKeyspace("ControlConnectionTest_ks").getUserType("foo");
58+
59+
assertThat(fooType.getFieldNames()).containsExactly("i");
60+
}
61+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/HostConnectionPoolTest.java b/driver-core/src/test/java/com/datastax/driver/core/HostConnectionPoolTest.java
62+
index 34d382dcb..097d502da 100644
63+
--- a/driver-core/src/test/java/com/datastax/driver/core/HostConnectionPoolTest.java
64+
+++ b/driver-core/src/test/java/com/datastax/driver/core/HostConnectionPoolTest.java
65+
@@ -597,7 +597,7 @@ public class HostConnectionPoolTest extends ScassandraTestBase.PerClassCluster {
66+
allRequests.addAll(requests);
67+
allRequests.add(MockRequest.send(pool));
68+
69+
- verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class));
70+
+ verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class), anyInt(), anyInt());
71+
assertPoolSize(pool, 2);
72+
Connection connection2 = pool.connections[0].get(1);
73+
74+
@@ -625,7 +625,7 @@ public class HostConnectionPoolTest extends ScassandraTestBase.PerClassCluster {
75+
76+
// Borrowing one more time should resurrect the trashed connection
77+
allRequests.addAll(MockRequest.sendMany(1, pool));
78+
- verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class));
79+
+ verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class), eq(-1), anyInt());
80+
assertPoolSize(pool, 2);
81+
82+
assertThat(pool.connections[0]).containsExactly(connection2, connection1);
83+
@@ -664,7 +664,7 @@ public class HostConnectionPoolTest extends ScassandraTestBase.PerClassCluster {
84+
allRequests.addAll(requests);
85+
allRequests.add(MockRequest.send(pool));
86+
87+
- verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class));
88+
+ verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class), anyInt(), anyInt());
89+
assertPoolSize(pool, 2);
90+
reset(factory);
91+
Connection connection2 = pool.connections[0].get(1);
92+
@@ -699,7 +699,7 @@ public class HostConnectionPoolTest extends ScassandraTestBase.PerClassCluster {
93+
allRequests.addAll(requests);
94+
allRequests.add(MockRequest.send(pool));
95+
assertThat(connection2.inFlight.get()).isEqualTo(101);
96+
- verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class));
97+
+ verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class), eq(-1), anyInt());
98+
assertPoolSize(pool, 2);
99+
100+
// Borrow again to get the new connection
101+
@@ -742,7 +742,7 @@ public class HostConnectionPoolTest extends ScassandraTestBase.PerClassCluster {
102+
allRequests.addAll(requests);
103+
allRequests.add(MockRequest.send(pool));
104+
105+
- verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class));
106+
+ verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class), anyInt(), anyInt());
107+
assertThat(pool.connections[0]).hasSize(2);
108+
109+
// Return enough times to get back under the threshold where one connection is enough
110+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementTest.java b/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementTest.java
111+
index 168b86730..27bf7ac5a 100644
112+
--- a/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementTest.java
113+
+++ b/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementTest.java
114+
@@ -775,6 +775,7 @@ public class PreparedStatementTest extends CCMTestsSupport {
115+
* @since 2.2.0
116+
*/
117+
@Test(groups = "long")
118+
+ @ScyllaSkip /* @IntegrationTestDisabledScyllaUnsupportedFunctionality @IntegrationTestDisabledScyllaQueryTrace */
119+
public void should_create_tombstone_when_null_value_on_bound_statement() {
120+
PreparedStatement prepared =
121+
session().prepare("INSERT INTO " + SIMPLE_TABLE + " (k, i) VALUES (?, ?)");
122+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java b/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java
123+
index ea75f8454..ea70e9081 100644
124+
--- a/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java
125+
+++ b/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java
126+
@@ -38,7 +38,9 @@ import org.slf4j.LoggerFactory;
127+
import org.testng.annotations.AfterMethod;
128+
import org.testng.annotations.Test;
129+
130+
-@CCMConfig(dirtiesContext = true)
131+
+@CCMConfig(
132+
+ dirtiesContext = true,
133+
+ jvmArgs = {"--smp", "1", "--max-networking-io-control-blocks", "15000"})
134+
public class SessionStressTest extends CCMTestsSupport {
135+
136+
private static final Logger logger = LoggerFactory.getLogger(SessionStressTest.class);
137+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/TableMetadataTest.java b/driver-core/src/test/java/com/datastax/driver/core/TableMetadataTest.java
138+
index 777ea439f..4c7113eb8 100644
139+
--- a/driver-core/src/test/java/com/datastax/driver/core/TableMetadataTest.java
140+
+++ b/driver-core/src/test/java/com/datastax/driver/core/TableMetadataTest.java
141+
@@ -36,6 +36,7 @@ import static org.assertj.core.api.Assertions.entry;
142+
143+
import com.datastax.driver.core.utils.CassandraVersion;
144+
import com.datastax.driver.core.utils.ScyllaSkip;
145+
+import com.datastax.driver.core.utils.ScyllaVersion;
146+
import com.google.common.collect.ImmutableMap;
147+
import java.nio.ByteBuffer;
148+
import org.testng.annotations.Test;
149+
@@ -149,6 +150,11 @@ public class TableMetadataTest extends CCMTestsSupport {
150+
}
151+
152+
@Test(groups = "short")
153+
+ @ScyllaVersion(
154+
+ maxOSS = "6.3.0",
155+
+ maxEnterprise = "2025.1.0",
156+
+ description =
157+
+ "COMPACT STORAGE discontinued in https://github.com/scylladb/scylladb/pull/16403")
158+
public void should_parse_compact_static_table() {
159+
TestUtils.compactStorageSupportCheck(ccm());
160+
// given
161+
@@ -190,6 +196,11 @@ public class TableMetadataTest extends CCMTestsSupport {
162+
}
163+
164+
@Test(groups = "short")
165+
+ @ScyllaVersion(
166+
+ maxOSS = "6.3.0",
167+
+ maxEnterprise = "2025.1.0",
168+
+ description =
169+
+ "COMPACT STORAGE discontinued in https://github.com/scylladb/scylladb/pull/16403")
170+
public void should_parse_dense_table() {
171+
TestUtils.compactStorageSupportCheck(ccm());
172+
// given
173+
@@ -215,6 +226,11 @@ public class TableMetadataTest extends CCMTestsSupport {
174+
}
175+
176+
@Test(groups = "short")
177+
+ @ScyllaVersion(
178+
+ maxOSS = "6.3.0",
179+
+ maxEnterprise = "2025.1.0",
180+
+ description =
181+
+ "COMPACT STORAGE discontinued in https://github.com/scylladb/scylladb/pull/16403")
182+
public void should_parse_compact_dynamic_table() {
183+
TestUtils.compactStorageSupportCheck(ccm());
184+
// given
185+
@@ -251,6 +267,11 @@ public class TableMetadataTest extends CCMTestsSupport {
186+
}
187+
188+
@Test(groups = "short")
189+
+ @ScyllaVersion(
190+
+ maxOSS = "6.3.0",
191+
+ maxEnterprise = "2025.1.0",
192+
+ description =
193+
+ "COMPACT STORAGE discontinued in https://github.com/scylladb/scylladb/pull/16403")
194+
public void should_parse_compact_table_with_multiple_clustering_columns() {
195+
TestUtils.compactStorageSupportCheck(ccm());
196+
// given

0 commit comments

Comments
 (0)