Invalidate the Prepared statement cache only if either of the prepare… #4542
+88
−1
Conversation
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
…d caches is empty, but not both
ifesdjeen
reviewed
Jan 12, 2026
| } | ||
| } | ||
| else | ||
| else if (cachedWithoutKeyspace != null || cachedWithKeyspace != null) |
Contributor
There was a problem hiding this comment.
I think we need something like else if ((cachedWithoutKeyspace != null) != (cachedWithKeyspace != null)), to make sure at least one of them is in cache.
Contributor
Author
There was a problem hiding this comment.
Let me elaborate.
boolean safeToReturnCached = cachedWithoutKeyspace != null && cachedWithKeyspace != null;
We are in the else block because safeToReturnCached is false. If safeToReturnCached is false, that means either cachedWithoutKeyspace is null or cachedWithKeyspace is null or both of them.
So, at this place, if (cachedWithoutKeyspace != null || cachedWithKeyspace != null) is sufficient.
Could you please double-check?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
https://issues.apache.org/jira/browse/CASSANDRA-17248 added prepared statement eviction logic because there was a change in prepared statements' behavior between 4.0.1 -> 4.0.2. However, the eviction logic introduces a race condition depicted in https://issues.apache.org/jira/browse/CASSANDRA-17401
As per this discussion, we should keep the eviction logic in the 4.0 branch, but invoke only in a real corner case scenario.
This PR will evict the statements only during the corner case scenario in which either of the prepared statement caches is empty, but not both.
The Cassandra Jira