chore: merge upstream apache 4.19.4 by nikagra · Pull Request #1291 · scylladb/java-driver

nikagra · 2026-10-21T13:28:17Z

Caution

Merge with Create a merge commit and the ruleset bypass. Squash or rebase drops 4.19.3 and 4.19.4 from scylla-4.x's history (#467, #895). To pick up new scylla-4.x commits, merge them into this branch; don't rebase it.

scylla-4.x is 39 commits behind apache 4.19.4. With the ancestry restored by #1281, this merges the tags as real merges. The history is two merge commits, seven fixes, the changelog, then the version bump, so git show --remerge-diff <merge> shows exactly what we chose:

merge upstream 4.19.3 and merge upstream 4.19.4: conflicts resolved toward the fork (poms, revapi baselines, Sphinx links, fork docs, DSE removals). Takes esri 2.2.4, the OrderingClause rework with BYPASS CACHE/USING TIMEOUT kept, and the OSGi start levels; drops mkdocs, AGENTS.md, SECURITY.md and Jenkinsfile-asf.
Fixes: Sphinx link style restored in about 80 auto-merged manual pages, the rule now in CONTRIBUTING; the mapper-runtime revapi baseline kept; the dead #inflighthandler anchor, the custom codecs nesting and the lz4 example version; geometry equals() compares the wrapped ESRI geometry (no identity fallback on ESRI 1.x); the OSGi lz4 sun.misc bundle the 4.19.3 resolution dropped, and the shaded-guava groupId; the redundant prepared-cache test retention; two upstream javadoc corrections.
The fork's 4.19.2.3 section removed from the upstream changelog.
Version bumped to 4.19.4.0-SNAPSHOT.

Verified on the final head: merge-base --is-ancestor 4.19.{2,3,4} HEAD all exit 0, and both merges keep their tag parents. make check on JDK 11 (revapi left to CI's Full verify), the geometry unit tests, PreparedStatementCachingIT against Scylla via CCM, and make -C docs test pass; the docs build does not validate #fragment anchors; those were checked by hand. CI: re-running on 5048379. The OSGi ITs are @Ignored and have no CI lane (#1293): compile-checked only.

Fixes #1255
Refs: DRIVER-1126

🤖 Generated with Claude Code

Patch by Bret McGuire; reviewed by Andy Tolbert and Bret McGuire reference: apache#2066

patch by April Murphy; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2064

The primary goal here is to address CVE-2025-12183. Netty includes a dependency on vulnerable versions of lz4-java, so update to a fixed version of Netty as well. On the C* server side, we opted to move to the new community fork of lz4-java, so match that decision here (CASSANDRA-21052). patch by Abe Ratnofsky; reviewed by Francisco Guerrero for CASSJAVA-113

patch by Bret McGuire; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2051

…kdocs I've been looking into details on custom codes and noticed that the there is an issue with rendering bullet points on the following page: https://apache.github.io/cassandra-java-driver/4.19.0/core/custom_codecs/

…der correctly while working on the previous ninja-fix

…ringClause abstraction. This allows for custom impls to define their own logic for managing "ORDER BY" clauses. patch by Bret McGuire; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2047

…t commit

patch by Lukasz Antoniak; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2075

patch by Bret McGuire: reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2076

patch by Bret McGuire; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2052

This reverts commit de96ce8.

patch by Jason Koch; reviewed by Lukasz Antoniak and Bret McGuire reference: apache#2050

patch by David Stringer; reviewed by Lukasz Antoniak and Bret McGuire reference: apache#2022

patch by Jane He; reviewed by Bret McGuire and Andy Tolbert

patch by Jane He; review by Bret McGuire and Andy Tolbert

… Build CI for Java Driver Doc Patch by Jane He and Łukasz Antoniak; Reviewed by Bret McGuire

This reverts commit 342088c.

This reverts commit 375e4b5.

… of the original PR (apache#1901). The change that was actually merged attempted to bump us up to the most recent Java8-compatible logback impl. This moved us from 1.2.x to 1.3.x which in turn brought some dependency changes that were excessive, especially for a patch release. patch by Bret McGuire; reviewed by Andy Tolbert and Abe Ratnofsky reference: apache#2088

This reverts commit 8e2e70c.

@ignore

Two slips in BundleOptions. The shaded guava bundle kept the org.apache.cassandra groupId from scylladb#895, which versionAsInProject() cannot resolve through our dependencies.properties. The 4.19.3 merge resolved the lz4Bundle() conflict to our side and dropped upstream's CASSJAVA-122 sun.misc extension bundle, which lz4-java imports. Every Osgi*IT is @ignore'd and no lane runs them (scylladb#1293), so neither showed. Refs: DRIVER-1126 Co-Authored-By: Claude Fable 5.1 <[email protected]>

Upstream 4.19.3 moved weakValues() from the protected constructor's base builder into the public constructor's decorator, so a subclass that passes its own decorator now gets a strong cache. Our TestCqlPrepareAsyncProcessor only retained the cached futures to stop them being collected mid-test. Take upstream's comment, drop the retention set and the process() override, and require the removal event again instead of checking it only when present. Refs: DRIVER-1126 Co-Authored-By: Claude Fable 5.1 <[email protected]>

Select.orderBy() still promises to append to the current list, but since the OrderingClause rework an ANN ordering is replaced instead, and orderByAnnOf() replaces any column ordering; say so. ANN stands for approximate, not adjacent, nearest neighbor. Refs: DRIVER-1126 Co-Authored-By: Claude Fable 5.1 <[email protected]>

changelog/README.md tracks upstream releases only. The 4.19.2.3 section came in with feature PRs; the same changes are described in the upgrade guide and the GitHub release notes. Refs: DRIVER-1126 Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

The line now carries upstream 4.19.4, so the next fork release restarts the fourth component at 4.19.4.0, as 4.19.2.0 did after the 4.19.2 sync. Refs: DRIVER-1126 Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

sylwiaszunejko

Looks good to me

dkropachev · 2026-10-23T13:57:25Z

@nikagra , why do we jump from 19.2 to 19.4 ?

dkropachev

split into 4.19.3 into separate pr

nikagra · 2026-10-26T13:51:09Z

@dkropachev Similarly to 3.x case split will produce a second PR containing changelog merge and version bump. There is little sense in splitting them and we already have a precedence (skipped 4.19.1 and jumped straight ahead to 4.19.2.

dkropachev · 2026-10-27T12:12:32Z

-        allowsFiltering,
-        bypassCache,
-        timeout);
+    ColumnsOrderingClause coc = getColumnOrderingClause();


Minor: orderByAnnOf(...).orderByIds(Collections.emptyMap()) now removes the ANN clause entirely. For example, a vector-search query becomes SELECT * FROM vectors LIMIT 5; the previous implementation kept its ANN ordering. Dynamically assembled empty ordering maps can therefore turn a nearest-neighbor query into an unordered query. Preserve the existing ordering when no column clauses are supplied.

Fixed in d741d7f: an empty map now leaves the query unchanged, as it did in 4.19.2.x. should_keep_ann_ordering_when_map_is_empty covers it.

dkropachev · 2026-10-27T12:12:32Z


      assertThat(changedTypes.keySet()).isEqualTo(expectedChangedTypes);
-      removedQueryIds.get().ifPresent(queryId -> assertThat(queryId).isEqualTo(queryId2));
+      assertThat(removedQueryIds.get()).isNotEmpty().get().isEqualTo(queryId2);


Minor: The cache-size wait does not establish that the removal event has been delivered. Guava publishes the reduced count before invoking the removal listener, so another thread can observe size 1 and finish the following prepare calls while removedQueryIds is still empty. This assertion can then fail despite correct eventual delivery. Keep the required assertion, but await the removal event and matching query ID within a bounded deadline.

Fixed in e839d4e: the test now waits until the removal event carries queryId2 before the re-prepare calls run.

dkropachev · 2026-10-27T12:12:32Z

-        allowsFiltering,
-        bypassCache,
-        timeout);
+    ColumnsOrderingClause coc = getColumnOrderingClause();


Minor: The map overloads now replace an existing ANN ordering, but Select.orderByIds(Map) and orderBy(Map) still describe appending the supplied clauses. The scalar overloads explicitly document replacement. Whichever behavior is selected for the open mixed-ordering question, the map-overload documentation needs to describe that same behavior, including the empty-map case.

Fixed in d741d7f: orderByIds(Map) and orderBy(Map) now document that they replace an ANN OF ordering and that an empty map leaves the query unchanged.

dkropachev · 2026-10-27T12:12:32Z

+- [improvement] CASSJAVA-108: Update ESRI (and remove org.json) dependencies
+- [improvement] PR 2076: Bump Jackson to 2.20.1
+- [improvement] PR 2047: Re-work ordering clause support in query builder
+- [improvement] PR 2051: Bump logback to 1.3.15, slf4j to 2.0.16


Nit: This entry says upstream 4.19.3 shipped Logback 1.3.15 and SLF4J 2.0.16, but that release's POM specifies 1.2.13 and 1.7.26. Correct the entry so it describes the logging versions actually released upstream.

This file mirrors upstream's changelog verbatim. Their 4.19.3 POM does have 1.2.13/1.7.26, but we don't edit their entries.

Guava lowers the cache size before it calls the removal listener, so the size wait alone left the removed-query-id assertion racing the event. Co-Authored-By: Claude Opus 5.5 <[email protected]>

The ordering-clause rework made orderByIds(emptyMap) replace an ANN ordering with nothing; 4.19.2.x kept it. Document the map overloads' replace behaviour and fix a typo in CqlPrepareAsyncProcessor. Co-Authored-By: Claude Opus 5.5 <[email protected]>

github-actions · 2026-10-27T20:45:31Z

This pull request merges upstream 4.19.4. Merge it with Create a merge commit, using the ruleset bypass. Squash or rebase drops 4.19.4 from scylla-4.x's history.
See Merging upstream releases.

github-actions · 2026-10-28T02:42:06Z

@dkropachev this merge dropped 4.19.4 from scylla-4.x's history (#1328).

#1291 was merged into scylla-4.x without 4.19.4 becoming an ancestor, so it was squashed or rebased. Its changes are on scylla-4.x; its ancestry is not.

Repair it with a pull request that holds only an ancestry merge, merged with Create a merge commit (as #1281 did):

git fetch --no-tags https://github.com/apache/cassandra-java-driver refs/tags/4.19.4:refs/upstream/4.19.4
git switch -c restore-4.19.4 <scylladb-remote>/scylla-4.x
git merge -s ours refs/upstream/4.19.4 -m "chore: record upstream 4.19.4 ancestry"

See Merging upstream releases.

#1291 and #1344 were squash-merged, so scylla-4.x carries the 4.19.3 and 4.19.4 changes but not apache's tags in its history. This merge records 4.19.4 (and through it 4.19.3) as an ancestor without changing any file. Fixes #1345 Co-Authored-By: Claude Opus 5.5 <[email protected]>

absurdfarce and others added 30 commits November 13, 2025 12:02

[maven-release-plugin] prepare for next development iteration

62eade2

Removing interface to Travis CI

a7da995

Patch by Bret McGuire; reviewed by Andy Tolbert and Bret McGuire reference: apache#2066

Replace outdated link in README

ded2985

patch by April Murphy; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2064

ninja-fix: Remove ASF donation message

e762df8

Bump logback to most recent Java8-compatible version

ad7a103

patch by Bret McGuire; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2051

ninja-fix Updating a few indented lists that were observed to not ren…

855cd0b

…der correctly while working on the previous ninja-fix

Re-work ordering clause support in query builder behind a single Orde…

af0a63a

…ringClause abstraction. This allows for custom impls to define their own logic for managing "ORDER BY" clauses. patch by Bret McGuire; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2047

ninja-fix We apparently had some unformatted files slip in in the las…

35bae4f

…t commit

CASSJAVA-122 Fix OSGi LZ4 test

e84bb1a

patch by Lukasz Antoniak; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2075

Bump Jackson to 2.20.1

deffb92

patch by Bret McGuire: reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2076

CASSJAVA-108 Update ESRI (and remove org.json) dependencies

283d3a7

patch by Bret McGuire; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2052

ninja-fix Update Jenkins label to Jammy

de96ce8

Revert "ninja-fix Update Jenkins label to Jammy"

3f5f3ac

This reverts commit de96ce8.

Fix race condition in ClockSeqAndNodeContainer

27e2bfa

patch by Jason Koch; reviewed by Lukasz Antoniak and Bret McGuire reference: apache#2050

CASSJAVA-3: Fix ordering of LIMIT and PER PARTITION LIMIT clauses

bbd1998

patch by David Stringer; reviewed by Lukasz Antoniak and Bret McGuire reference: apache#2022

CASSJAVA-30: Update CONTRIBUTING.md

bf2b36f

patch by Jane He; reviewed by Bret McGuire and Andy Tolbert

CASSJAVA-104: Fix Flaky tests

bfacd80

patch by Jane He; review by Bret McGuire and Andy Tolbert

CASSJAVA-109, CASSJAVA-117: Manual and API References after donation,…

48f33e1

… Build CI for Java Driver Doc Patch by Jane He and Łukasz Antoniak; Reviewed by Bret McGuire

[maven-release-plugin] prepare release 4.19.3

375e4b5

[maven-release-plugin] prepare for next development iteration

342088c

Revert "[maven-release-plugin] prepare for next development iteration"

805cfa8

This reverts commit 342088c.

Revert "[maven-release-plugin] prepare release 4.19.3"

c7fe73f

This reverts commit 375e4b5.

Add changelog for 4.19.3

2ed181b

[maven-release-plugin] prepare release 4.19.3

8e2e70c

Revert "[maven-release-plugin] prepare release 4.19.3"

20ee336

This reverts commit 8e2e70c.

[maven-release-plugin] prepare release 4.19.3

d954b5d

[maven-release-plugin] prepare for next development iteration

90b09e0

nikagra and others added 5 commits October 23, 2026 15:23

build: bump version to 4.19.4.0-SNAPSHOT

5048379

The line now carries upstream 4.19.4, so the next fork release restarts the fourth component at 4.19.4.0, as 4.19.2.0 did after the 4.19.2 sync. Refs: DRIVER-1126 Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

nikagra force-pushed the upstream-sync-4.19.4 branch from 312eb89 to 5048379 Compare October 23, 2026 13:25

sylwiaszunejko approved these changes Oct 23, 2026

View reviewed changes

coderabbitai Bot mentioned this pull request Oct 23, 2026

Protect 4.x releases with validation and scoped signing #1302

Merged

dkropachev requested changes Oct 25, 2026

View reviewed changes

nikagra requested a review from dkropachev October 26, 2026 18:35

dkropachev reviewed Oct 27, 2026

View reviewed changes

nikagra and others added 2 commits October 27, 2026 21:37

test: await the prepared-cache removal event

e839d4e

Guava lowers the cache size before it calls the removal listener, so the size wait alone left the removed-query-id assertion racing the event. Co-Authored-By: Claude Opus 5.5 <[email protected]>

nikagra requested a review from dkropachev October 27, 2026 21:03

dkropachev approved these changes Oct 28, 2026

View reviewed changes

Comment thread core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareAsyncProcessor.java Resolved

dkropachev merged commit 63cb907 into scylladb:scylla-4.x Oct 28, 2026
32 checks passed

github-actions Bot mentioned this pull request Oct 28, 2026

scylla-4.x: restore upstream 4.19.4 ancestry lost in #1291 #1328

Closed

coderabbitai Bot mentioned this pull request Oct 28, 2026

Update dependency at.yawk.lz4:lz4-java to v1.12.1 #1332

Merged

1 task

nikagra deleted the upstream-sync-4.19.4 branch October 30, 2026 14:02

This was referenced Oct 30, 2026

chore: record upstream 4.19.4 ancestry #1344

Merged

chore: record upstream 4.19.4 ancestry (do not squash) #1346

Merged

coderabbitai Bot mentioned this pull request Nov 6, 2026

fix: anchor the prepare cache entry on the prepared statement #893

Open

This was referenced Nov 9, 2026

4.x: sync with upstream to 4.19.1 #751

Closed

4.x: Fix Javadoc warnings #449

Closed

Docs: changelog is not up-to-date #273

Closed

Conversation

nikagra commented Oct 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sylwiaszunejko left a comment

Choose a reason for hiding this comment

Uh oh!

dkropachev commented Oct 23, 2026

Uh oh!

dkropachev left a comment

Choose a reason for hiding this comment

Uh oh!

nikagra commented Oct 26, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Oct 27, 2026

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Oct 28, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

nikagra commented Oct 21, 2026 •

edited

Loading