Add new CassandraContainer implementation #8616

maximevw · 2024-05-12T15:32:59Z

This allows a full support of Cassandra 5 without errors/warnings. Indeed, as explained in the discussion #7786, the Cassandra module is still using the deprecated version 3.x of the Java driver for Cassandra. Even if it works with Cassandra 5, it may lead to warnings/errors when using specific features of Cassandra 5. By upgrading the driver to the latest version, we remain compatible with all versions of Cassandra from 3 to 5 (note that version 3 is now reaching EoL).

I successfully tested a locally built version of the Cassandra module including the submitted changes in the tests of Cassandra JDBC wrapper without impact on the performance of the tests running testcontainers with Cassandra.

Few notes regarding the submitted changes:

In Java driver 4.x, JMX is not supported by default, contrary to the version 3.x, so I removed the method withJmxReporting(boolean).
To keep good performance when running initialisation script, some specific configuration need to be defined regarding the "debouncing" feature introduced by the Java driver 4.x. This is explained in details in the code.

This allows a full support of Cassandra 5 without errors/warnings

eddumelendez · 2024-05-21T20:00:17Z

Hi @maximevw, thanks for submitting a PR and sorry for missing the discussion 😢 Currently, the CassandraContainer implementation relies on the Java client and that's something we are trying to avoid. Do you know if there is a way to execute scripts without using the Java Client? If so, I would propose adding a new implementation under org.testcontainers.cassandra.CassadraContainer that is free of Cassandra Java Driver and can run successfully with latest versions, would be great if works with versions since Cassandra 3. Of course, we will be deprecating org.testcontainers.container.CassandraContainer.

maximevw · 2024-05-21T20:36:22Z

Hello @eddumelendez, thanks for your response.

Yes, it should be possible to run CQL scripts without using the Java driver thanks to cqlsh CLI provided with Cassandra server. And this should work with Cassandra 3+.

So, executing a cqlsh command at the container startup could be a solution to get rid of the Java driver dependency.

kiview · 2024-05-23T09:25:14Z

So, executing a cqlsh command at the container startup could be a solution to get rid of the Java driver dependency.

@maximevw Sounds like a great suggestion, do you want to have a stab at this approach?

@eddumelendez What is the motivation behind doing this in a new version, rather than in the old version? It is not really a breaking change, is it?

maximevw · 2024-05-23T10:16:11Z

@kiview Sure, I'll take a look at this asap.

eddumelendez · 2024-05-23T14:14:20Z

What is the motivation behind doing this in a new version, rather than in the old version? It is not really a breaking change, is it?

Current CassandraContainer implementation relies on Cluster class from cassandra java driver. So, the dependency could not be removed at all without causing breaking changes.

kiview · 2024-05-24T07:51:08Z

After discussing more with @eddumelendez, it seems indeed a good idea to deprecate org.testcontainers.container.CassandraContainer and do the proposed changes in a new class org.testcontainers.cassandra.CassadraContainer, so we can get our modules slowly ready for JPMS without suffering from split-package issues.

This implementation in the new package org.testcontainers.cassandra uses cqlsh command inside the running Cassandra container to execute scripts. So, the dependency to the Java driver is no more required. The implementation in the package org.testcontainers.containers has been marked as deprecated.

maximevw · 2024-05-25T14:03:28Z

Hello @kiview @eddumelendez,

As previously discussed, I updated this pull request to implement org.testcontainers.cassandra.CassandraContainer using cqlsh command instead of the Java driver to run script.
I also deprecated classes in org.testcontainers.containers package.

I let you review the changes.

eddumelendez · 2024-05-26T21:20:13Z

Thanks for the quick update, @maximevw ! Can you please run ./gradlew spotlessApply for code formatting, please?

maximevw · 2024-05-27T05:16:05Z

Sure @eddumelendez!
Done and pushed 🙂

eddumelendez

Thanks for your contribution! Existing implementation shouldn't be touched to support Cassandra 5. That's why the new implementation is added. The new implementation solved two issues:

implementation doesn't rely on cassandra driver
transitive dependency to cassandra driver could be removed

modules/cassandra/build.gradle

modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java

- revert changes on org.testcontainers.containers package except deprecation annotations - remove unnecessary genericity on new implementation

maximevw · 2024-05-27T18:50:16Z

Thanks for your contribution! Existing implementation shouldn't be touched to support Cassandra 5. That's why the new implementation is added. The new implementation solved two issues:

implementation doesn't rely on cassandra driver

transitive dependency to cassandra driver could be removed

@eddumelendez I pushed the changes following your review.

eddumelendez

Small comments. Will perform a deep review later today.

modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java

maximevw · 2024-05-28T17:46:01Z

@eddumelendez Changes done :)

maximevw · 2024-06-10T20:05:09Z

Hello @eddumelendez,

Did you have time to finalize your review? 🙂

eddumelendez

Sorry for the delay, I've left a couple of comments.

modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java

...cassandra/src/main/java/org/testcontainers/cassandra/delegate/CassandraDatabaseDelegate.java

…quired

modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java

and do some refactoring

maximevw · 2024-07-04T19:25:40Z

@eddumelendez I pushed the requested changes and replied to your comment about the username/password. 🙂

maximevw · 2024-07-29T18:38:24Z

Hello @eddumelendez,

I assume you're currently busy, but I'm still interested in finalizing this pull request. Do not hesitate to take a look to the latest updates and comments and let me know if any further changes are required.

eddumelendez · 2024-08-01T02:14:45Z

@maximevw thanks for the understading, I'll take a look soon.

eddumelendez

Thanks for your patience, @maximevw! We are getting close, I left one important question in order to make the implementation simple for the users and avoid reasoning about adding wait strategies in certain scenarios, ofc sometimes it has to be done but in this case I think we can make it happen.

modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java

…assandraContainer.java Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>

docs/modules/databases/cassandra.md

eddumelendez · 2024-08-13T18:51:09Z

Thanks for your contribution, @maximevw !

maximevw requested a review from a team as a code owner May 12, 2024 15:33

github-actions bot added modules/cassandra type/docs labels May 12, 2024

maximevw added 2 commits May 14, 2024 22:32

Upgrade Java driver for Cassandra to latest version

5479ced

This allows a full support of Cassandra 5 without errors/warnings

Fix documentation for Cassandra module

437abf6

maximevw force-pushed the upgrade-cassandra-driver branch from 1aaefd8 to 437abf6 Compare May 14, 2024 20:32

maximevw and others added 2 commits May 25, 2024 15:59

Merge branch 'testcontainers:main' into upgrade-cassandra-driver

10a64b4

Using -f argument to execute init script in Cassandra container

16a644b

Reformat code

d39cef2

eddumelendez requested changes May 27, 2024

View reviewed changes

maximevw added 2 commits May 27, 2024 20:45

Apply changes following code review

ff8648b

- revert changes on org.testcontainers.containers package except deprecation annotations - remove unnecessary genericity on new implementation

Fix tests formatting

23d98f4

eddumelendez requested changes May 28, 2024

View reviewed changes

modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java Outdated Show resolved Hide resolved

modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java Outdated Show resolved Hide resolved

Cleanup the tests following review

a054714

Merge branch 'main' into upgrade-cassandra-driver

9fc9ff4

eddumelendez reviewed Jun 26, 2024

View reviewed changes

modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java Outdated Show resolved Hide resolved

...cassandra/src/main/java/org/testcontainers/cassandra/delegate/CassandraDatabaseDelegate.java Show resolved Hide resolved

Improve init script documentation and tests when authentication is re…

0f1cc35

…quired

eddumelendez reviewed Jul 3, 2024

View reviewed changes

maximevw and others added 2 commits July 4, 2024 20:31

Merge branch 'testcontainers:main' into upgrade-cassandra-driver

9cd6625

Improve documentation

cd0e35f

and do some refactoring

eddumelendez reviewed Aug 13, 2024

View reviewed changes

modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java Show resolved Hide resolved

modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java Outdated Show resolved Hide resolved

maximevw and others added 2 commits August 13, 2024 13:39

Update modules/cassandra/src/main/java/org/testcontainers/cassandra/C…

01790ae

…assandraContainer.java Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>

Set CassandraQueryWaitStrategy by default

ebeffab

eddumelendez added this to the next milestone Aug 13, 2024

eddumelendez reviewed Aug 13, 2024

View reviewed changes

docs/modules/databases/cassandra.md Outdated Show resolved Hide resolved

eddumelendez added 2 commits August 13, 2024 13:17

Update docs/modules/databases/cassandra.md

e5db72d

Fix format

2314621

eddumelendez merged commit 88e4ac5 into testcontainers:main Aug 13, 2024
101 checks passed

eddumelendez changed the title ~~Upgrade Java driver for Cassandra to latest version~~ Add new CassandraContainer implementation Aug 13, 2024

This was referenced Aug 13, 2024

Upgrade Cassandra driver to 4.x #2768

Closed

Upgrade cassandra driver 4.10.0 #3952

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add new CassandraContainer implementation #8616

Add new CassandraContainer implementation #8616

maximevw commented May 12, 2024

eddumelendez commented May 21, 2024

maximevw commented May 21, 2024

kiview commented May 23, 2024 •

edited

Loading

maximevw commented May 23, 2024

eddumelendez commented May 23, 2024

kiview commented May 24, 2024

maximevw commented May 25, 2024 •

edited

Loading

eddumelendez commented May 26, 2024

maximevw commented May 27, 2024

eddumelendez left a comment

maximevw commented May 27, 2024 •

edited

Loading

eddumelendez left a comment

maximevw commented May 28, 2024

maximevw commented Jun 10, 2024

eddumelendez left a comment

maximevw commented Jul 4, 2024

maximevw commented Jul 29, 2024

eddumelendez commented Aug 1, 2024

eddumelendez left a comment

eddumelendez commented Aug 13, 2024

Add new CassandraContainer implementation #8616

Add new CassandraContainer implementation #8616

Conversation

maximevw commented May 12, 2024

eddumelendez commented May 21, 2024

maximevw commented May 21, 2024

kiview commented May 23, 2024 • edited Loading

maximevw commented May 23, 2024

eddumelendez commented May 23, 2024

kiview commented May 24, 2024

maximevw commented May 25, 2024 • edited Loading

eddumelendez commented May 26, 2024

maximevw commented May 27, 2024

eddumelendez left a comment

Choose a reason for hiding this comment

maximevw commented May 27, 2024 • edited Loading

eddumelendez left a comment

Choose a reason for hiding this comment

maximevw commented May 28, 2024

maximevw commented Jun 10, 2024

eddumelendez left a comment

Choose a reason for hiding this comment

maximevw commented Jul 4, 2024

maximevw commented Jul 29, 2024

eddumelendez commented Aug 1, 2024

eddumelendez left a comment

Choose a reason for hiding this comment

eddumelendez commented Aug 13, 2024

kiview commented May 23, 2024 •

edited

Loading

maximevw commented May 25, 2024 •

edited

Loading

maximevw commented May 27, 2024 •

edited

Loading