From e193523a063f9d5676ecb24b616247de2268b37c Mon Sep 17 00:00:00 2001 From: Stefan Miklosovic Date: Mon, 20 Apr 2026 18:03:46 +0200 Subject: [PATCH] Update 6.0 and 7.0 branches to reflect their versions across the project. In 6.0, only rename test/data/serialization/5.1 to 6.0 In 7.0, same plus update edges in UpgradeTestBase patch by Stefan Miklosovic; reviewed by Dmitry Konstantinov for CASSANDRA-21319 --- .../{5.1 => 6.0}/gms.EndpointState.bin | Bin test/data/serialization/{5.1 => 6.0}/gms.Gossip.bin | Bin .../{5.1 => 6.0}/service.SyncComplete.bin | Bin .../{5.1 => 6.0}/service.SyncRequest.bin | Bin .../{5.1 => 6.0}/service.ValidationComplete.bin | Bin .../{5.1 => 6.0}/service.ValidationRequest.bin | Bin .../{5.1 => 6.0}/utils.EstimatedHistogram.bin | Bin .../cassandra/AbstractSerializationsTester.java | 4 ++-- 8 files changed, 2 insertions(+), 2 deletions(-) rename test/data/serialization/{5.1 => 6.0}/gms.EndpointState.bin (100%) rename test/data/serialization/{5.1 => 6.0}/gms.Gossip.bin (100%) rename test/data/serialization/{5.1 => 6.0}/service.SyncComplete.bin (100%) rename test/data/serialization/{5.1 => 6.0}/service.SyncRequest.bin (100%) rename test/data/serialization/{5.1 => 6.0}/service.ValidationComplete.bin (100%) rename test/data/serialization/{5.1 => 6.0}/service.ValidationRequest.bin (100%) rename test/data/serialization/{5.1 => 6.0}/utils.EstimatedHistogram.bin (100%) diff --git a/test/data/serialization/5.1/gms.EndpointState.bin b/test/data/serialization/6.0/gms.EndpointState.bin similarity index 100% rename from test/data/serialization/5.1/gms.EndpointState.bin rename to test/data/serialization/6.0/gms.EndpointState.bin diff --git a/test/data/serialization/5.1/gms.Gossip.bin b/test/data/serialization/6.0/gms.Gossip.bin similarity index 100% rename from test/data/serialization/5.1/gms.Gossip.bin rename to test/data/serialization/6.0/gms.Gossip.bin diff --git a/test/data/serialization/5.1/service.SyncComplete.bin b/test/data/serialization/6.0/service.SyncComplete.bin similarity index 100% rename from test/data/serialization/5.1/service.SyncComplete.bin rename to test/data/serialization/6.0/service.SyncComplete.bin diff --git a/test/data/serialization/5.1/service.SyncRequest.bin b/test/data/serialization/6.0/service.SyncRequest.bin similarity index 100% rename from test/data/serialization/5.1/service.SyncRequest.bin rename to test/data/serialization/6.0/service.SyncRequest.bin diff --git a/test/data/serialization/5.1/service.ValidationComplete.bin b/test/data/serialization/6.0/service.ValidationComplete.bin similarity index 100% rename from test/data/serialization/5.1/service.ValidationComplete.bin rename to test/data/serialization/6.0/service.ValidationComplete.bin diff --git a/test/data/serialization/5.1/service.ValidationRequest.bin b/test/data/serialization/6.0/service.ValidationRequest.bin similarity index 100% rename from test/data/serialization/5.1/service.ValidationRequest.bin rename to test/data/serialization/6.0/service.ValidationRequest.bin diff --git a/test/data/serialization/5.1/utils.EstimatedHistogram.bin b/test/data/serialization/6.0/utils.EstimatedHistogram.bin similarity index 100% rename from test/data/serialization/5.1/utils.EstimatedHistogram.bin rename to test/data/serialization/6.0/utils.EstimatedHistogram.bin diff --git a/test/unit/org/apache/cassandra/AbstractSerializationsTester.java b/test/unit/org/apache/cassandra/AbstractSerializationsTester.java index 2509f7e83a..fa95894712 100644 --- a/test/unit/org/apache/cassandra/AbstractSerializationsTester.java +++ b/test/unit/org/apache/cassandra/AbstractSerializationsTester.java @@ -36,13 +36,13 @@ import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_SERIA public class AbstractSerializationsTester { - protected static final String CUR_VER = CASSANDRA_VERSION.getString("5.1"); + protected static final String CUR_VER = CASSANDRA_VERSION.getString("6.0"); protected static final Map VERSION_MAP = new HashMap () {{ put("3.0", MessagingService.VERSION_30); put("4.0", MessagingService.VERSION_40); put("5.0", MessagingService.VERSION_50); - put("5.1", MessagingService.VERSION_60); + put("6.0", MessagingService.VERSION_60); }}; protected static final boolean EXECUTE_WRITES = TEST_SERIALIZATION_WRITES.getBoolean();