Pull changes from 4.18.1 #440
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ASF does not have a subscription for fossa
…tion tests) patch by Mick Semb Wever; reviewed by Wei Deng for CASSANDRA-18970
…mprove error messages, etc.
…ull in config, rather than using sentinel Duration.ZERO
…nsport_port_ssl for DSE 6.8 (4.x edition) patch by absurdfarce; reviewed by absurdfarce and adutra for CASSANDRA-19352
The java driver uses netty channel attributes to decorate a connection's channel with the cluster name (returned from the system.local table) and the map from the OPTIONS response, both of which are obtained on connection initialization. There's an issue here that I wouldn't expect to see in practice in that the AttributeKey's used are created using AttributeKey.newInstance, which throws an exception if an AttributeKey of that name is defined anywhere else in evaluated code. This change attempts to resolve this issue by changing AttributeKey initialiation in DriverChannel from newInstance to valueOf, which avoids throwing an exception if an AttributeKey of the same name was previously instantiated. patch by Andy Tolbert; reviewed by Bret McGuire, Alexandre Dutra, Abe Ratnofsky for CASSANDRA-19290
patch by Ekaterina Dimitrova; reviewed by Alexandre Dutra and Bret McGuire for CASSANDRA-19333
…sfile patch by Bret McGuire; reviewed by Bret McGuire for CASSANDRA-19504
Typo carried over from old docs, needed closing parenthesis.
…opulating the component field. Patch by Bret McGuire; reviewed by Bret McGuire, Alexandre Dutra
If an exception was thrown while getting new metadata as part of schema refresh it died on the admin executor instead of being propagated to the CompletableFuture argument. Instead, catch those exceptions and hand them off to the CompletableFuture. patch by Ammar Khaku; reviewed by Chris Lohfink, Bret McGuire for CASSANDRA-19468
Patch by Bret McGuire; reviewed by Bret McGuire, Alexandre Dutra for PR 1914
patch by Bret McGuire; reviewed by Bret McGuire for PR 1928
patch by Bret McGuire; reviewed by Bret McGuire for PR 1930
patch by Bret McGuire; reviewed by Bret McGuire, Alexandre Dutra for CASSANDRA-19292
…onfiguration for graceful automatic failovers patch by Nitin Chhabra; reviewed by Alexandre Dutra, Andy Tolbert, and Bret McGuire for JAVA-3142
patch by Jane He and Bret McGuire; reviewed by Bret McGuire for CASSANDRA-19568
patch by Nitin Chhabra; reviewed by Bret McGuire for JAVA-3142
Bouncheck
force-pushed
the
scylla-4.x-merge-4.18.1
branch
from
574a07c to
dbf4224
Compare
Bouncheck
force-pushed
the
scylla-4.x-merge-4.18.1
branch
from
5c1e1b2 to
78abcdd
Compare
dkropachev
approved these changes
Mar 4, 2025
Bouncheck
force-pushed
the
scylla-4.x-merge-4.18.1
branch
2 times, most recently
from
d348354 to
5df628a
Compare
…thub.com/apache/cassandra-java-driver into scylla-4.x-merge-4.18.1 Following conflict resolutions and additional changes were made: - Version was changed to 4.18.1.0-SNAPSHOT - deep-lic-scan.yaml was removed. Likewise we don't have a fossa subscription. - added with modifications previously skipped distribution-source module. Changed groupId, versions and names. - added with modifications previously skipped distribution-tests module. Changed groupId, versions and names. - Skipped license-maven-plugin which was checking for ASF license headers. - removed `<oldArtifacts>` section of revapi plugin configuration pointing to datastax. - Skipped addition of maven-remote-resources-plugin (pom.xml). - Skipped removal of distributionManagement section (pom.xml). We are not using `org.apache` parent pom to define that part. - Switched Scylla specific uses of `AttributeKey.newInstance` to `.valueOf` too - Added `WHERE key='local'` to `system.local` queries in `DefaultTopologyMonitorTest` - Removed irrelevant to Scylla version of the driver parts of the documentation - Merged in translation between older and newer variations of config keys and values. - Discarded some adjustments for upstream's Jenkins setup which conflicted with adjustments for our CI. - Added extra stubs in BasicLoadBalancingPolicyPreferredRemoteDcsTest to match Scylla's modifications.
Bouncheck
force-pushed
the
scylla-4.x-merge-4.18.1
branch
from
5df628a to
e605e01
Compare
|
Since we're post-review I've "squashed" all partial merge commits into singular merge commit before the final merge. Files should be in identical state as evidenced by https://github.com/scylladb/java-driver/compare/78abcdd308caae4abee05866ce38337d8b0af1a1..e605e018e27dc9b1fe184378dfdaeb4f4c789276 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Switched approach another time.
Pulls all changes up to 1 commit past 4.18.1 release. Divided into multiple smaller merges. Relevant adjustments and descriptions are added to corresponding merge commits.