Skip to content

CNDB-17831: Use 2038 max deletion time in HCD_1 #2424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
driftx merged 2 commits into from
May 19, 2026
Merged

CNDB-17831: Use 2038 max deletion time in HCD_1 #2424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b1fa36
CNDB-17831: Use 2038 max deletion time in HCD_1
driftx May 18, 2026
cc4d6c6
CNDB-17831: Skip improved max TTL test in pre-5.0 compatibility modes
driftx May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/java/org/apache/cassandra/db/rows/Cell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ public static long deletionTimeUnsignedIntegerToLong(int deletionTimeUnsignedInt

public static long getVersionedMaxDeletiontionTime()
{
if (DatabaseDescriptor.getStorageCompatibilityMode().isBefore(5))
return Cell.MAX_DELETION_TIME_2038_LEGACY_CAP;

if (DatabaseDescriptor.getStorageCompatibilityMode().disabled())
// The whole cluster is 2016, we're out of the 2038/2106 mixed cluster scenario. Shortcut to avoid the 'minClusterVersion' volatile read
return Cell.MAX_DELETION_TIME;
Expand Down
3 changes: 1 addition & 2 deletions test/unit/org/apache/cassandra/cql3/validation/operations/TTLTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
import org.apache.cassandra.tools.ToolRunner;
import org.apache.cassandra.tools.ToolRunner.ToolResult;
import org.apache.cassandra.utils.Clock;
import org.apache.cassandra.utils.StorageCompatibilityMode;
import org.assertj.core.data.Offset;

import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_UTIL_ALLOW_TOOL_REINIT_FOR_TEST;
Expand Down Expand Up @@ -230,7 +229,7 @@ public void testRejectExpirationOverflowPolicy() throws Throwable
@Test
public void testImprovedMaxTTL()
{
Assume.assumeTrue(DatabaseDescriptor.getStorageCompatibilityMode() != StorageCompatibilityMode.CASSANDRA_4);
Assume.assumeFalse(DatabaseDescriptor.getStorageCompatibilityMode().isBefore(5));
createTable("CREATE TABLE %s (k int PRIMARY KEY, i int)");
disableCompaction();
long t0 = Clock.Global.currentTimeMillis();
Expand Down
Loading