Skip to content

Commit 32f6abd

Browse files
adutratolbertam
adutra
authored and
tolbertam
committed
Various test fixes for 3.0
Motivation: Many tests are failing when using recent versions of C* or DSE. Modifications: 1) Bump the default C* version to 3.8 2) Redesign @CassandraVersion and @DseVersion to be able to fully accept tick-tock releases and correctly compare them. 3) Reduce log verbosity for Scassandra tests 4) Prevent thrift from being enabled for C* >= 4.0 5) Fix decommission tests with C* >= 3.12 This commit contains contributions by Andrew Tolbert (@tolbertam). Result: All tests should pass.
1 parent aadc5f8 commit 32f6abd

75 files changed

Lines changed: 237 additions & 227 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎driver-core/src/test/java/com/datastax/driver/core/AggregateMetadataTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import static com.datastax.driver.core.DataType.text;
2525
import static com.datastax.driver.core.TestUtils.serializeForDynamicCompositeType;
2626

27-
@CassandraVersion(major = 2.2)
27+
@CassandraVersion("2.2.0")
2828
@CCMConfig(config = "enable_user_defined_functions:true")
2929
public class AggregateMetadataTest extends CCMTestsSupport {
3030

@@ -183,7 +183,7 @@ public void should_parse_and_format_aggregate_with_udts() {
183183
* @since 3.0.1
184184
*/
185185
@Test(groups = "short")
186-
@CassandraVersion(major = 2.2)
186+
@CassandraVersion("2.2.0")
187187
public void should_parse_and_format_aggregate_with_composite_type_literal_initcond() {
188188
VersionNumber ver = VersionNumber.parse(CCMBridge.getCassandraVersion());
189189
if (ver.getMajor() == 3) {
@@ -204,7 +204,7 @@ public void should_parse_and_format_aggregate_with_composite_type_literal_initco
204204
* @since 3.0.1
205205
*/
206206
@Test(groups = "short")
207-
@CassandraVersion(major = 3.0, minor = 4)
207+
@CassandraVersion("3.4")
208208
public void should_parse_and_format_aggregate_with_composite_type_hex_initcond() {
209209
VersionNumber ver = VersionNumber.parse(CCMBridge.getCassandraVersion());
210210
if ((ver.getMinor() >= 1 && ver.getMinor() < 4)) {

‎driver-core/src/test/java/com/datastax/driver/core/AsyncQueryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public Thread apply(ResultSet input) {
166166
}
167167

168168
@Test(groups = "short")
169-
@CassandraVersion(major = 2.0, description = "Paging is not supported until 2.0")
169+
@CassandraVersion(value = "2.0.0", description = "Paging is not supported until 2.0")
170170
public void should_fail_when_auto_paging_on_io_thread() throws Exception {
171171
for (int i = 0; i < 1000; i++) {
172172
Statement statement = new SimpleStatement("select v from asyncquerytest.foo where k = 1");

‎driver-core/src/test/java/com/datastax/driver/core/AsyncResultSetTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import static org.assertj.core.api.Assertions.assertThat;
2929

30-
@CassandraVersion(major = 2.0, description = "uses paging")
30+
@CassandraVersion(value = "2.0.0", description = "uses paging")
3131
public class AsyncResultSetTest extends CCMTestsSupport {
3232

3333
@Override

‎driver-core/src/test/java/com/datastax/driver/core/BatchStatementTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void simpleBatchTest() {
7171
}
7272

7373
@Test(groups = "short")
74-
@CassandraVersion(major = 2.0, minor = 9, description = "This will only work with C* 2.0.9 (CASSANDRA-7337)")
74+
@CassandraVersion(value = "2.0.9", description = "This will only work with C* 2.0.9 (CASSANDRA-7337)")
7575
public void casBatchTest() {
7676
PreparedStatement st = session().prepare("INSERT INTO test (k, v) VALUES (?, ?) IF NOT EXISTS");
7777

‎driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java‎

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,21 @@ public static String getCassandraVersion() {
281281
}
282282
}
283283

284+
/**
285+
* @return {@link VersionNumber} representation of {@link CCMBridge#getCassandraVersion()}
286+
*/
287+
public static VersionNumber getCassandraVersionNumber() {
288+
return VersionNumber.parse(getCassandraVersion());
289+
}
290+
291+
/**
292+
* @param compareVersion The given version to compare with.
293+
* @return Whether or not the configured cassandra version is greater than or equal to the given version.
294+
*/
295+
public static boolean isCassandraVersionAtLeast(String compareVersion) {
296+
return getCassandraVersionNumber().compareTo(VersionNumber.parse(compareVersion)) >= 0;
297+
}
298+
284299
/**
285300
* @return The configured DSE version if '-Ddse=true' specified, otherwise null.
286301
*/
@@ -292,6 +307,22 @@ public static String getDSEVersion() {
292307
}
293308
}
294309

310+
/**
311+
* @return {@link VersionNumber} representation of {@link CCMBridge#getDSEVersion()}
312+
*/
313+
public static VersionNumber getDSEVersionNumber() {
314+
return VersionNumber.parse(getDSEVersion());
315+
}
316+
317+
/**
318+
* @param compareVersion The given version to compare with.
319+
* @return Whether or not the configured dse version is greater than or equal to the given version.
320+
*/
321+
public static boolean isDSEVersionAtLeast(String compareVersion) {
322+
VersionNumber dseVersion = getDSEVersionNumber();
323+
return dseVersion != null && dseVersion.compareTo(VersionNumber.parse(compareVersion)) >= 0;
324+
}
325+
295326
/**
296327
* @return Whether or not DSE was configured via '-Ddse=true'.
297328
*/
@@ -549,7 +580,12 @@ public void add(int dc, int n) {
549580
@Override
550581
public void decommission(int n) {
551582
logger.debug(String.format("Decommissioning: node %s (%s%s:%s) from %s", n, TestUtils.IP_PREFIX, n, binaryPort, this));
552-
execute(CCM_COMMAND + " node%d decommission", n);
583+
// Special case for C* 3.12+, DSE 5.1+, force decommission (see CASSANDRA-12510)
584+
String cmd = CCM_COMMAND + " node%d decommission";
585+
if ((!isDSE() && isCassandraVersionAtLeast("3.12")) || (isDSE() && isDSEVersionAtLeast("5.1"))) {
586+
cmd += " --force";
587+
}
588+
execute(cmd, n);
553589
}
554590

555591
@Override
@@ -908,6 +944,12 @@ public CCMBridge build() {
908944
int storagePort = Integer.parseInt(cassandraConfiguration.get("storage_port").toString());
909945
int thriftPort = Integer.parseInt(cassandraConfiguration.get("rpc_port").toString());
910946
int binaryPort = Integer.parseInt(cassandraConfiguration.get("native_transport_port").toString());
947+
if (!isThriftSupported(dse, version)) {
948+
// remove thrift configuration
949+
cassandraConfiguration.remove("start_rpc");
950+
cassandraConfiguration.remove("rpc_port");
951+
cassandraConfiguration.remove("thrift_prepared_statements_cache_size_mb");
952+
}
911953
final CCMBridge ccm = new CCMBridge(clusterName, dse, version, storagePort, thriftPort, binaryPort, joinJvmArgs(), nodes);
912954

913955
Runtime.getRuntime().addShutdownHook(new Thread() {
@@ -921,10 +963,7 @@ public void run() {
921963
ccm.updateConfig(cassandraConfiguration);
922964
if (dse) {
923965
Map<String, Object> dseConfiguration = Maps.newLinkedHashMap(this.dseConfiguration);
924-
/* TODO: Use version passed in if present, there is currently a conflation of C* and DSE versions
925-
* when it comes to this that don't want to disturb. No tests are currently using withVersion with
926-
* dse, so its not an issue at the moment. */
927-
if (VersionNumber.parse(CCMBridge.getDSEVersion()).getMajor() >= 5) {
966+
if (dse && version.getMajor() >= 5) {
928967
// randomize DSE specific ports if dse present and greater than 5.0
929968
dseConfiguration.put("lease_netty_server_port", RANDOM_PORT);
930969
dseConfiguration.put("internode_messaging_options.port", RANDOM_PORT);
@@ -941,6 +980,10 @@ public void run() {
941980
return ccm;
942981
}
943982

983+
private static boolean isThriftSupported(boolean dse, VersionNumber version) {
984+
return dse || version.compareTo(VersionNumber.parse("4.0")) < 0;
985+
}
986+
944987
public int weight() {
945988
// the weight is simply function of the number of nodes
946989
int totalNodes = 0;

‎driver-core/src/test/java/com/datastax/driver/core/ConditionalUpdateTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* Test {@link ResultSet#wasApplied()} for conditional updates.
2626
*/
27-
@CassandraVersion(major = 2.0, description = "Conditional Updates requires 2.0+.")
27+
@CassandraVersion(value = "2.0.0", description = "Conditional Updates requires 2.0+.")
2828
public class ConditionalUpdateTest extends CCMTestsSupport {
2929

3030
@Override

‎driver-core/src/test/java/com/datastax/driver/core/ControlConnectionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void should_prevent_simultaneous_reconnection_attempts() throws Interrupt
8686
* Therefore we use two different driver instances in this test.
8787
*/
8888
@Test(groups = "short")
89-
@CassandraVersion(major = 2.1)
89+
@CassandraVersion("2.1.0")
9090
public void should_parse_UDT_definitions_when_using_default_protocol_version() {
9191
// First driver instance: create UDT
9292
Cluster cluster = register(Cluster.builder()

‎driver-core/src/test/java/com/datastax/driver/core/CustomPayloadTest.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import static org.assertj.core.api.Assertions.assertThat;
3434
import static org.assertj.core.api.Fail.fail;
3535

36-
@CassandraVersion(major = 2.2)
36+
@CassandraVersion("2.2.0")
3737
@CCMConfig(jvmArgs = "-Dcassandra.custom_query_handler_class=org.apache.cassandra.cql3.CustomPayloadMirroringQueryHandler")
3838
public class CustomPayloadTest extends CCMTestsSupport {
3939

@@ -85,8 +85,6 @@ public void should_echo_custom_payload_when_building_statement() throws Exceptio
8585

8686
/**
8787
* Ensures that an incoming payload is propagated from prepared to bound statements.
88-
*
89-
* @throws Exception
9088
*/
9189
@Test(groups = "short")
9290
public void should_propagate_incoming_payload_to_bound_statement() throws Exception {
@@ -113,8 +111,6 @@ public void should_propagate_incoming_payload_to_bound_statement() throws Except
113111
/**
114112
* Ensures that an incoming payload is overridden by an explicitly set outgoing payload
115113
* when propagated to bound statements.
116-
*
117-
* @throws Exception
118114
*/
119115
@Test(groups = "short")
120116
public void should_override_incoming_payload_when_outgoing_payload_explicitly_set_on_preparing_statement() throws Exception {
@@ -141,8 +137,6 @@ public void should_override_incoming_payload_when_outgoing_payload_explicitly_se
141137
/**
142138
* Ensures that payloads can still be set individually on bound statements
143139
* if the prepared statement does not have a default payload.
144-
*
145-
* @throws Exception
146140
*/
147141
@Test(groups = "short")
148142
public void should_not_set_any_payload_on_bound_statement() throws Exception {
@@ -171,8 +165,6 @@ public void should_not_set_any_payload_on_bound_statement() throws Exception {
171165

172166
/**
173167
* Ensures that a custom payload is propagated throughout pages.
174-
*
175-
* @throws Exception
176168
*/
177169
@Test(groups = "short")
178170
public void should_echo_custom_payload_when_paginating() throws Exception {
@@ -253,8 +245,6 @@ public void should_throw_ufe_when_protocol_version_lesser_than_4() throws Except
253245

254246
/**
255247
* Ensures that when debugging custom payloads, the driver will print appropriate log messages.
256-
*
257-
* @throws Exception
258248
*/
259249
@Test(groups = "short")
260250
public void should_print_log_message_when_level_trace() throws Exception {

‎driver-core/src/test/java/com/datastax/driver/core/CustomTypeTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.testng.annotations.Test;
2020

2121
import java.nio.ByteBuffer;
22-
import java.util.ArrayList;
2322
import java.util.List;
2423
import java.util.Map;
2524

@@ -153,7 +152,7 @@ public void should_serialize_and_deserialize_collections_of_custom_types() {
153152
* @test_category metadata
154153
*/
155154
@Test(groups = "short")
156-
@CassandraVersion(major = 2.1)
155+
@CassandraVersion("2.1.0")
157156
public void should_handle_udt_with_custom_type() {
158157
// Given: a UDT with custom types, and a table using it.
159158
session().execute("CREATE TYPE custom_udt (regular int, c1 'DynamicCompositeType(s => UTF8Type, i => Int32Type)', c2 'LongType')");

‎driver-core/src/test/java/com/datastax/driver/core/DataTypeCqlNameParserTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import static com.datastax.driver.core.DataTypeCqlNameParser.parse;
2424
import static com.datastax.driver.core.Metadata.quote;
2525

26-
@CassandraVersion(major = 3.0)
26+
@CassandraVersion("3.0")
2727
public class DataTypeCqlNameParserTest extends CCMTestsSupport {
2828

2929
@Test(groups = "short")

0 commit comments

Comments
 (0)