Merge upstream changes from 4.19.0 to 4.19.1#828
Draft
dkropachev wants to merge 16 commits intoscylladb:scylla-4.xfrom
Draft
Merge upstream changes from 4.19.0 to 4.19.1#828dkropachev wants to merge 16 commits intoscylladb:scylla-4.xfrom
dkropachev wants to merge 16 commits intoscylladb:scylla-4.xfrom
Conversation
…ate Object[] allocation (found via profiler) patch by Tatu Saloranta; reviewed by Dmitry Konstantinov and Bret McGuire for CASSJAVA-68
…ate network based on its subnet mask patch by Alex Sasnouskikh; reviewed by Bret McGuire and Andy Tolbert reference: apache#2013
This value is initialized at constructor time and marked final, so it can never change. There is no need to have access to this reference synchronized. Patch by Jason Koch; reviewed by Alexandre Dutra, Andy Tolbert and Jane He
Patch by Michael Karsten; reviewed by Abe Ratnofsky and Andy Tolbert for CASSJAVA-89
Following from 6d3ba47 this changes the throttler to a complete lock-free implementation. Update the related comments and README now that it is lock-free. Patch by Jason Koch; reviewed by Alexandre Dutra and Andy Tolbert
patch by Lukasz Antoniak; reviewed by Bret McGuire and Abe Ratnofsky for CASSJAVA-92
… custom payload patch by Jane He; reviewed by Abe Ratnofsky and Bret McGuire for CASSJAVA-97
Upstream PR: apache#1999 Cherry-picked from: 204dd09 (code changes only, CI changes excluded)
… SAN validation Upstream PR: apache#2018 Cherry-picked from: 3bb5b18, 7982f41
patch by Lukasz Antoniak and Alexandre Dutra; reviewed by Bret McGuire
With CASSJAVA-52, the java-driver-guava-shaded is now in tree. This appears to work great, but there is a slight issue with the dependency tree that allows unshaded guava packages to be imported within the project. It looks like marking guava as an optional dependency in java-driver-guava-shaded resolves this. patch by Andy Tolbert; reviewed by Alexandre Dutra and Dmitry Konstantinov for CASSJAVA-76
The DefaultLoadBalancingPolicy constructor reads LOAD_BALANCING_DEFAULT_LWT_REQUEST_ROUTING_METHOD which was missing from the mocked profile, causing NPE in StartupOptionsBuilderTest.
…IdGeneratorIT - Fix code formatting in DefaultDriverOption.java - Add request_id docs to manual/core toctree - Skip RequestIdGeneratorIT on Scylla (custom payload not supported)
dkropachev
force-pushed
the
merge-upstream-4.19.1
branch
from
4e93977 to
08bf881
Compare
When BaseCcmRule is used as @rule (instance-level), JUnit passes a Description for the test method, so description.getAnnotation() only finds method-level annotations. Class-level annotations like @ScyllaSkip on RequestIdGeneratorIT were not being detected. Now also check description.getTestClass().getAnnotation() as a fallback, which correctly finds class-level annotations regardless of whether the rule is used as @rule or @ClassRule. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Summary
Cherry-picks upstream Apache Cassandra Java Driver changes from 4.19.0 to 4.19.1 into scylla-4.x.
Upstream PRs included
53bb5c8b65,c9facc3c36bb9bb11e57ddd6f03d71f32069bd8a7e21eb2028ff2d7f26c6e2c7ad4d113bb5b18903,7982f413a90115cd67c1d7e829775c204dd09329(code only)Upstream commits skipped (not applicable to our fork)
90612f6758c0cae9bf76529d56e174,7161d12fb2f42ab99cccc43efd42cbeb54934d5d29d3531202f49e19b8c7,17ebe6092e69eebb939c05e6717253104751c166,77b2baebebAdditional fixes
inet.ipaddr.Address#isPrefixBlock()(changed@linkto@code)MockedDriverContextFactoryandStartupOptionsBuilderTestto mockLOAD_BALANCING_DEFAULT_LWT_REQUEST_ROUTING_METHODoption (pre-existing test issue exposed by CASSJAVA-92 changes)Test plan
🤖 Generated with Claude Code