This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7ca806c60a Change trunk from 4.2 to 5.0
7ca806c60a is described below
commit 7ca806c60a3e080d740fb163c639bb76a520f6ab
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Sat Feb 25 11:25:35 2023 +0100
Change trunk from 4.2 to 5.0
– update MessagingService (remove the 4.1 version that was only a
placeholder in test code bc serialisation test files were previously
incorrectly serialising random UUIds for TimeUUIDs)
– update upgrade jvm-dtests
– remove older serialization binary files we are no longer testing against
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-17973
---
CHANGES.txt | 2 +-
NEWS.txt | 2 +-
README.asc | 2 +-
build.xml | 6 +-
debian/changelog | 2 +-
ide/nbproject/project.xml | 2 +-
.../org/apache/cassandra/net/MessagingService.java | 1 -
.../serialization/0.7/db.RangeSliceCommand.bin | Bin 777 -> 0 bytes
test/data/serialization/0.7/db.Row.bin | Bin 495 -> 0 bytes
test/data/serialization/0.7/db.RowMutation.bin | Bin 3266 -> 0 bytes
.../0.7/db.SliceByNamesReadCommand.bin | Bin 367 -> 0 bytes
.../serialization/0.7/db.SliceFromReadCommand.bin | Bin 361 -> 0 bytes
test/data/serialization/0.7/db.Truncation.bin | Bin 257 -> 0 bytes
test/data/serialization/0.7/db.WriteResponse.bin | Bin 38 -> 0 bytes
test/data/serialization/0.7/gms.EndpointState.bin | Bin 73 -> 0 bytes
test/data/serialization/0.7/gms.Gossip.bin | Bin 110 -> 0 bytes
.../data/serialization/0.7/service.TreeRequest.bin | Bin 93 -> 0 bytes
.../serialization/0.7/service.TreeResponse.bin | Bin 3656 -> 0 bytes
.../serialization/0.7/streaming.PendingFile.bin | Bin 3393 -> 0 bytes
.../serialization/0.7/streaming.StreamHeader.bin | Bin 171405 -> 0 bytes
.../serialization/0.7/streaming.StreamReply.bin | Bin 73 -> 0 bytes
.../0.7/streaming.StreamRequestMessage.bin | Bin 6909 -> 0 bytes
test/data/serialization/0.7/utils.BloomFilter.bin | Bin 2500016 -> 0 bytes
.../serialization/0.7/utils.EstimatedHistogram.bin | Bin 97500 -> 0 bytes
.../serialization/0.7/utils.LegacyBloomFilter.bin | Bin 5000170 -> 0 bytes
.../serialization/1.0/db.RangeSliceCommand.bin | Bin 777 -> 0 bytes
test/data/serialization/1.0/db.Row.bin | Bin 495 -> 0 bytes
test/data/serialization/1.0/db.RowMutation.bin | Bin 3266 -> 0 bytes
.../1.0/db.SliceByNamesReadCommand.bin | Bin 367 -> 0 bytes
.../serialization/1.0/db.SliceFromReadCommand.bin | Bin 361 -> 0 bytes
test/data/serialization/1.0/db.Truncation.bin | Bin 257 -> 0 bytes
test/data/serialization/1.0/db.WriteResponse.bin | Bin 38 -> 0 bytes
.../serialization/1.0/db.migration.Keyspace1.bin | 1 -
.../serialization/1.0/db.migration.Keyspace2.bin | 1 -
.../serialization/1.0/db.migration.Keyspace3.bin | 1 -
.../serialization/1.0/db.migration.Keyspace4.bin | 1 -
.../serialization/1.0/db.migration.Keyspace5.bin | 1 -
test/data/serialization/1.0/gms.EndpointState.bin | Bin 73 -> 0 bytes
test/data/serialization/1.0/gms.Gossip.bin | Bin 110 -> 0 bytes
.../data/serialization/1.0/service.TreeRequest.bin | Bin 121 -> 0 bytes
.../serialization/1.0/service.TreeResponse.bin | Bin 930 -> 0 bytes
.../serialization/1.0/streaming.PendingFile.bin | Bin 3436 -> 0 bytes
.../serialization/1.0/streaming.StreamHeader.bin | Bin 174421 -> 0 bytes
.../serialization/1.0/streaming.StreamReply.bin | Bin 73 -> 0 bytes
.../1.0/streaming.StreamRequestMessage.bin | Bin 7087 -> 0 bytes
test/data/serialization/1.0/utils.BloomFilter.bin | Bin 2500016 -> 0 bytes
.../serialization/1.0/utils.EstimatedHistogram.bin | Bin 97500 -> 0 bytes
.../serialization/1.0/utils.LegacyBloomFilter.bin | Bin 5000170 -> 0 bytes
.../serialization/1.2/db.RangeSliceCommand.bin | Bin 735 -> 0 bytes
test/data/serialization/1.2/db.Row.bin | Bin 527 -> 0 bytes
test/data/serialization/1.2/db.RowMutation.bin | Bin 3410 -> 0 bytes
.../1.2/db.SliceByNamesReadCommand.bin | Bin 373 -> 0 bytes
.../serialization/1.2/db.SliceFromReadCommand.bin | Bin 409 -> 0 bytes
test/data/serialization/1.2/db.Truncation.bin | Bin 257 -> 0 bytes
test/data/serialization/1.2/db.WriteResponse.bin | Bin 38 -> 0 bytes
test/data/serialization/1.2/gms.EndpointState.bin | Bin 110 -> 0 bytes
test/data/serialization/1.2/gms.Gossip.bin | Bin 158 -> 0 bytes
.../data/serialization/1.2/service.TreeRequest.bin | Bin 121 -> 0 bytes
.../serialization/1.2/service.TreeResponse.bin | Bin 930 -> 0 bytes
.../serialization/1.2/streaming.PendingFile.bin | Bin 3478 -> 0 bytes
.../serialization/1.2/streaming.StreamHeader.bin | Bin 175917 -> 0 bytes
.../serialization/1.2/streaming.StreamReply.bin | Bin 89 -> 0 bytes
.../1.2/streaming.StreamRequestMessage.bin | Bin 7215 -> 0 bytes
test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 -> 0 bytes
.../serialization/1.2/utils.EstimatedHistogram.bin | Bin 97500 -> 0 bytes
.../serialization/1.2/utils.LegacyBloomFilter.bin | Bin 5000170 -> 0 bytes
.../serialization/2.0/db.RangeSliceCommand.bin | Bin 801 -> 0 bytes
.../2.0/db.SliceByNamesReadCommand.bin | Bin 485 -> 0 bytes
.../serialization/2.0/db.SliceFromReadCommand.bin | Bin 485 -> 0 bytes
test/data/serialization/2.0/db.Truncation.bin | Bin 257 -> 0 bytes
test/data/serialization/2.0/db.WriteResponse.bin | 0
test/data/serialization/2.0/gms.EndpointState.bin | Bin 73 -> 0 bytes
test/data/serialization/2.0/gms.Gossip.bin | Bin 158 -> 0 bytes
.../serialization/2.0/service.SyncComplete.bin | Bin 290 -> 0 bytes
.../data/serialization/2.0/service.SyncRequest.bin | Bin 189 -> 0 bytes
.../2.0/service.ValidationComplete.bin | Bin 1279 -> 0 bytes
.../2.0/service.ValidationRequest.bin | Bin 131 -> 0 bytes
.../serialization/2.0/streaming.PendingFile.bin | Bin 3478 -> 0 bytes
.../serialization/2.0/streaming.StreamHeader.bin | Bin 175917 -> 0 bytes
.../serialization/2.0/streaming.StreamReply.bin | Bin 89 -> 0 bytes
.../2.0/streaming.StreamRequestMessage.bin | Bin 7215 -> 0 bytes
test/data/serialization/2.0/utils.BloomFilter.bin | Bin 2500016 -> 0 bytes
.../serialization/2.0/utils.EstimatedHistogram.bin | Bin 97500 -> 0 bytes
.../serialization/2.0/utils.LegacyBloomFilter.bin | Bin 5000170 -> 0 bytes
.../serialization/2.1/db.RangeSliceCommand.bin | Bin 801 -> 0 bytes
.../2.1/db.SliceByNamesReadCommand.bin | Bin 485 -> 0 bytes
.../serialization/2.1/db.SliceFromReadCommand.bin | Bin 485 -> 0 bytes
test/data/serialization/2.1/db.Truncation.bin | Bin 257 -> 0 bytes
test/data/serialization/2.1/db.WriteResponse.bin | 0
test/data/serialization/2.1/gms.EndpointState.bin | Bin 73 -> 0 bytes
test/data/serialization/2.1/gms.Gossip.bin | Bin 158 -> 0 bytes
.../serialization/2.1/service.SyncComplete.bin | Bin 358 -> 0 bytes
.../data/serialization/2.1/service.SyncRequest.bin | Bin 223 -> 0 bytes
.../2.1/service.ValidationComplete.bin | Bin 1381 -> 0 bytes
.../2.1/service.ValidationRequest.bin | Bin 165 -> 0 bytes
test/data/serialization/2.1/utils.BloomFilter.bin | Bin 2500016 -> 0 bytes
.../serialization/2.1/utils.BloomFilter1000.bin | Bin 2500016 -> 0 bytes
.../serialization/2.1/utils.EstimatedHistogram.bin | Bin 97500 -> 0 bytes
test/data/serialization/3.0/gms.EndpointState.bin | Bin 73 -> 0 bytes
test/data/serialization/3.0/gms.Gossip.bin | Bin 158 -> 0 bytes
.../serialization/3.0/service.SyncComplete.bin | Bin 362 -> 0 bytes
.../data/serialization/3.0/service.SyncRequest.bin | Bin 219 -> 0 bytes
.../3.0/service.ValidationComplete.bin | Bin 1251 -> 0 bytes
.../3.0/service.ValidationRequest.bin | Bin 167 -> 0 bytes
test/data/serialization/3.0/utils.BloomFilter.bin | Bin 2500016 -> 0 bytes
.../serialization/3.0/utils.EstimatedHistogram.bin | Bin 97500 -> 0 bytes
test/data/serialization/4.0/gms.EndpointState.bin | Bin 73 -> 73 bytes
test/data/serialization/4.0/gms.Gossip.bin | Bin 166 -> 166 bytes
.../serialization/4.0/service.SyncComplete.bin | Bin 256 -> 256 bytes
.../data/serialization/4.0/service.SyncRequest.bin | Bin 111 -> 111 bytes
.../4.0/service.ValidationComplete.bin | Bin 597 -> 597 bytes
.../4.0/service.ValidationRequest.bin | Bin 74 -> 74 bytes
test/data/serialization/4.1/gms.EndpointState.bin | Bin 73 -> 0 bytes
test/data/serialization/4.1/gms.Gossip.bin | Bin 166 -> 0 bytes
.../serialization/4.1/service.SyncComplete.bin | Bin 256 -> 0 bytes
.../data/serialization/4.1/service.SyncRequest.bin | Bin 111 -> 0 bytes
.../4.1/service.ValidationComplete.bin | Bin 597 -> 0 bytes
.../4.1/service.ValidationRequest.bin | Bin 74 -> 0 bytes
.../serialization/4.1/utils.EstimatedHistogram.bin | Bin 97500 -> 0 bytes
.../upgrade/CompactStorageColumnDeleteTest.java | 2 +-
.../upgrade/CompactStorageHiddenColumnTest.java | 2 +-
...CompactStorageImplicitNullInClusteringTest.java | 2 +-
.../upgrade/CompactStoragePagingTest.java | 2 +-
.../CompactStoragePagingWithProtocolV30Test.java | 33 ----
.../CompactStoragePagingWithProtocolV3XTest.java | 33 ----
.../distributed/upgrade/MixedModeGossipTest.java | 169 ---------------------
.../upgrade/MixedModeMessageForwardTest.java | 2 +-
.../distributed/upgrade/MixedModeReadTest.java | 68 ---------
.../distributed/upgrade/MixedModeRepairTest.java | 68 +++++----
.../upgrade/Pre40MessageFilterTest.java | 4 +-
.../distributed/upgrade/UpgradeTestBase.java | 8 +-
.../cassandra/AbstractSerializationsTester.java | 3 +-
132 files changed, 56 insertions(+), 362 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 4563765ebc..16a29f60fb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-4.2
+5.0
* Reduce memory allocations of calls to ByteBufer.duplicate() made in
org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212)
* CEP-17: SSTable API (CASSANDRA-17056)
* Gossip stateMapOrdering does not have correct ordering when both
EndpointState are in the bootstrapping set (CASSANDRA-18292)
diff --git a/NEWS.txt b/NEWS.txt
index 9a52d6b003..363c2deb58 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -52,7 +52,7 @@ restore snapshots created with the previous major version
using the
using the provided 'sstableupgrade' tool.
-4.2
+5.0
===
New features
diff --git a/README.asc b/README.asc
index decb6ba0e3..8810f579f2 100644
--- a/README.asc
+++ b/README.asc
@@ -41,7 +41,7 @@ be sitting in front of a prompt:
----
Connected to Test Cluster at localhost:9160.
-[cqlsh 6.2.0 | Cassandra 4.2-SNAPSHOT | CQL spec 3.4.6 | Native protocol v5]
+[cqlsh 6.2.0 | Cassandra 5.0-SNAPSHOT | CQL spec 3.4.6 | Native protocol v5]
Use HELP for help.
cqlsh>
----
diff --git a/build.xml b/build.xml
index 1cee3d0d62..c347d90428 100644
--- a/build.xml
+++ b/build.xml
@@ -32,7 +32,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="4.2"/>
+ <property name="base.version" value="5.0"/>
<property name="scm.connection"
value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
<property name="scm.developerConnection"
value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
<property name="scm.url"
value="https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/>
@@ -453,10 +453,6 @@
<jflex
file="${build.src.java}/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex"
destdir="${build.src.gen-java}/" />
</target>
- <target name="echo-base-version">
- <echo message="${base.version}" />
- </target>
-
<!-- create properties file with C version -->
<target name="createVersionPropFile" depends="get-git-sha">
<taskdef name="propertyfile"
classname="org.apache.tools.ant.taskdefs.optional.PropertyFile"/>
diff --git a/debian/changelog b/debian/changelog
index b2397e52fb..cdb1af9772 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cassandra (4.2) UNRELEASED; urgency=medium
+cassandra (5.0) UNRELEASED; urgency=medium
* New release
diff --git a/ide/nbproject/project.xml b/ide/nbproject/project.xml
index 9698d63b67..5ea2225565 100644
--- a/ide/nbproject/project.xml
+++ b/ide/nbproject/project.xml
@@ -7,7 +7,7 @@
<properties>
<property name="project.dir">..</property>
<!-- the compile classpaths should be distinct per compilation
unit… but it is kept simple and the build will catch errors -->
- <property
name="cassandra.classpath.jars">${project.dir}/build/lib/jars/HdrHistogram-2.1.9.jar:${project.dir}/build/lib/jars/ST4-4.0.8.jar:${project.dir}/build/lib/jars/agrona-1.17.1.jar:${project.dir}/build/lib/jars/airline-0.8.jar:${project.dir}/build/lib/jars/antlr-3.5.2.jar:${project.dir}/build/lib/jars/antlr-runtime-3.5.2.jar:${project.dir}/build/lib/jars/asm-9.3.jar:${project.dir}/build/lib/jars/assertj-core-3.15.0.jar:${project.dir}/build/lib/jars/byteman-4.0.20.ja
[...]
+ <property
name="cassandra.classpath.jars">${project.dir}/build/lib/jars/HdrHistogram-2.1.9.jar:${project.dir}/build/lib/jars/ST4-4.0.8.jar:${project.dir}/build/lib/jars/agrona-1.17.1.jar:${project.dir}/build/lib/jars/airline-0.8.jar:${project.dir}/build/lib/jars/antlr-3.5.2.jar:${project.dir}/build/lib/jars/antlr-runtime-3.5.2.jar:${project.dir}/build/lib/jars/asm-9.3.jar:${project.dir}/build/lib/jars/assertj-core-3.15.0.jar:${project.dir}/build/lib/jars/big-math-2.3.0.ja
[...]
</properties>
<folders>
<source-folder>
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java
b/src/java/org/apache/cassandra/net/MessagingService.java
index a6a6fe60e4..268a3c3ee8 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -211,7 +211,6 @@ public class MessagingService extends
MessagingServiceMBeanImpl
public static final int VERSION_30 = 10;
public static final int VERSION_3014 = 11;
public static final int VERSION_40 = 12;
- public static final int VERSION_41 = 13;
public static final int minimum_version = VERSION_30;
public static final int current_version = VERSION_40;
static AcceptVersions accept_messaging = new
AcceptVersions(minimum_version, current_version);
diff --git a/test/data/serialization/0.7/db.RangeSliceCommand.bin
b/test/data/serialization/0.7/db.RangeSliceCommand.bin
deleted file mode 100644
index d6a0b05061..0000000000
Binary files a/test/data/serialization/0.7/db.RangeSliceCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/0.7/db.Row.bin
b/test/data/serialization/0.7/db.Row.bin
deleted file mode 100644
index 27de8bbd5f..0000000000
Binary files a/test/data/serialization/0.7/db.Row.bin and /dev/null differ
diff --git a/test/data/serialization/0.7/db.RowMutation.bin
b/test/data/serialization/0.7/db.RowMutation.bin
deleted file mode 100644
index 5465220cb9..0000000000
Binary files a/test/data/serialization/0.7/db.RowMutation.bin and /dev/null
differ
diff --git a/test/data/serialization/0.7/db.SliceByNamesReadCommand.bin
b/test/data/serialization/0.7/db.SliceByNamesReadCommand.bin
deleted file mode 100644
index aa892d5af2..0000000000
Binary files a/test/data/serialization/0.7/db.SliceByNamesReadCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/0.7/db.SliceFromReadCommand.bin
b/test/data/serialization/0.7/db.SliceFromReadCommand.bin
deleted file mode 100644
index 7160d24695..0000000000
Binary files a/test/data/serialization/0.7/db.SliceFromReadCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/0.7/db.Truncation.bin
b/test/data/serialization/0.7/db.Truncation.bin
deleted file mode 100644
index ea679956a4..0000000000
Binary files a/test/data/serialization/0.7/db.Truncation.bin and /dev/null
differ
diff --git a/test/data/serialization/0.7/db.WriteResponse.bin
b/test/data/serialization/0.7/db.WriteResponse.bin
deleted file mode 100644
index 90762381f6..0000000000
Binary files a/test/data/serialization/0.7/db.WriteResponse.bin and /dev/null
differ
diff --git a/test/data/serialization/0.7/gms.EndpointState.bin
b/test/data/serialization/0.7/gms.EndpointState.bin
deleted file mode 100644
index 054bced997..0000000000
Binary files a/test/data/serialization/0.7/gms.EndpointState.bin and /dev/null
differ
diff --git a/test/data/serialization/0.7/gms.Gossip.bin
b/test/data/serialization/0.7/gms.Gossip.bin
deleted file mode 100644
index 20b27a8a2a..0000000000
Binary files a/test/data/serialization/0.7/gms.Gossip.bin and /dev/null differ
diff --git a/test/data/serialization/0.7/service.TreeRequest.bin
b/test/data/serialization/0.7/service.TreeRequest.bin
deleted file mode 100644
index 5ad7e2aca5..0000000000
Binary files a/test/data/serialization/0.7/service.TreeRequest.bin and
/dev/null differ
diff --git a/test/data/serialization/0.7/service.TreeResponse.bin
b/test/data/serialization/0.7/service.TreeResponse.bin
deleted file mode 100644
index b7377850bf..0000000000
Binary files a/test/data/serialization/0.7/service.TreeResponse.bin and
/dev/null differ
diff --git a/test/data/serialization/0.7/streaming.PendingFile.bin
b/test/data/serialization/0.7/streaming.PendingFile.bin
deleted file mode 100644
index 6c0d61a926..0000000000
Binary files a/test/data/serialization/0.7/streaming.PendingFile.bin and
/dev/null differ
diff --git a/test/data/serialization/0.7/streaming.StreamHeader.bin
b/test/data/serialization/0.7/streaming.StreamHeader.bin
deleted file mode 100644
index ad21a688ea..0000000000
Binary files a/test/data/serialization/0.7/streaming.StreamHeader.bin and
/dev/null differ
diff --git a/test/data/serialization/0.7/streaming.StreamReply.bin
b/test/data/serialization/0.7/streaming.StreamReply.bin
deleted file mode 100644
index 4b740581f7..0000000000
Binary files a/test/data/serialization/0.7/streaming.StreamReply.bin and
/dev/null differ
diff --git a/test/data/serialization/0.7/streaming.StreamRequestMessage.bin
b/test/data/serialization/0.7/streaming.StreamRequestMessage.bin
deleted file mode 100644
index 73f8d0eb84..0000000000
Binary files a/test/data/serialization/0.7/streaming.StreamRequestMessage.bin
and /dev/null differ
diff --git a/test/data/serialization/0.7/utils.BloomFilter.bin
b/test/data/serialization/0.7/utils.BloomFilter.bin
deleted file mode 100644
index 3ad7fba761..0000000000
Binary files a/test/data/serialization/0.7/utils.BloomFilter.bin and /dev/null
differ
diff --git a/test/data/serialization/0.7/utils.EstimatedHistogram.bin
b/test/data/serialization/0.7/utils.EstimatedHistogram.bin
deleted file mode 100644
index bedd39bce6..0000000000
Binary files a/test/data/serialization/0.7/utils.EstimatedHistogram.bin and
/dev/null differ
diff --git a/test/data/serialization/0.7/utils.LegacyBloomFilter.bin
b/test/data/serialization/0.7/utils.LegacyBloomFilter.bin
deleted file mode 100644
index faef1b8154..0000000000
Binary files a/test/data/serialization/0.7/utils.LegacyBloomFilter.bin and
/dev/null differ
diff --git a/test/data/serialization/1.0/db.RangeSliceCommand.bin
b/test/data/serialization/1.0/db.RangeSliceCommand.bin
deleted file mode 100644
index ae2491563e..0000000000
Binary files a/test/data/serialization/1.0/db.RangeSliceCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/1.0/db.Row.bin
b/test/data/serialization/1.0/db.Row.bin
deleted file mode 100644
index 1850f415cb..0000000000
Binary files a/test/data/serialization/1.0/db.Row.bin and /dev/null differ
diff --git a/test/data/serialization/1.0/db.RowMutation.bin
b/test/data/serialization/1.0/db.RowMutation.bin
deleted file mode 100644
index 0992cb543d..0000000000
Binary files a/test/data/serialization/1.0/db.RowMutation.bin and /dev/null
differ
diff --git a/test/data/serialization/1.0/db.SliceByNamesReadCommand.bin
b/test/data/serialization/1.0/db.SliceByNamesReadCommand.bin
deleted file mode 100644
index aa892d5af2..0000000000
Binary files a/test/data/serialization/1.0/db.SliceByNamesReadCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/1.0/db.SliceFromReadCommand.bin
b/test/data/serialization/1.0/db.SliceFromReadCommand.bin
deleted file mode 100644
index 7160d24695..0000000000
Binary files a/test/data/serialization/1.0/db.SliceFromReadCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/1.0/db.Truncation.bin
b/test/data/serialization/1.0/db.Truncation.bin
deleted file mode 100644
index ea679956a4..0000000000
Binary files a/test/data/serialization/1.0/db.Truncation.bin and /dev/null
differ
diff --git a/test/data/serialization/1.0/db.WriteResponse.bin
b/test/data/serialization/1.0/db.WriteResponse.bin
deleted file mode 100644
index 90762381f6..0000000000
Binary files a/test/data/serialization/1.0/db.WriteResponse.bin and /dev/null
differ
diff --git a/test/data/serialization/1.0/db.migration.Keyspace1.bin
b/test/data/serialization/1.0/db.migration.Keyspace1.bin
deleted file mode 100644
index e239c5edbb..0000000000
--- a/test/data/serialization/1.0/db.migration.Keyspace1.bin
+++ /dev/null
@@ -1 +0,0 @@
-�l/Dl7InR5cGUiOiJyZWNvcmQiLCJuYW1lIjoiTWlncmF0aW9uIiwibmFtZXNwYWNlIjoib3JnLmFwYWNoZS5jYXNzYW5kcmEuZGIubWlncmF0aW9uLmF2cm8iLCJmaWVsZHMiOlt7Im5hbWUiOiJvbGRfdmVyc2lvbiIsInR5cGUiOnsidHlwZSI6ImZpeGVkIiwibmFtZSI6IlVVSUQiLCJuYW1lc3BhY2UiOiJvcmcuYXBhY2hlLmNhc3NhbmRyYS51dGlscy5hdnJvIiwic2l6ZSI6MTZ9fSx7Im5hbWUiOiJuZXdfdmVyc2lvbiIsInR5cGUiOiJvcmcuYXBhY2hlLmNhc3NhbmRyYS51dGlscy5hdnJvLlVVSUQifSx7Im5hbWUiOiJyb3dfbXV0YXRpb24iLCJ0eXBlIjoiYnl0ZXMifSx7Im5hbWUiOiJjbGFzc25hbWUiLCJ0eXBlIjoic3RyaW5nIn0seyJuYW
[...]
\ No newline at end of file
diff --git a/test/data/serialization/1.0/db.migration.Keyspace2.bin
b/test/data/serialization/1.0/db.migration.Keyspace2.bin
deleted file mode 100644
index 0128443b34..0000000000
--- a/test/data/serialization/1.0/db.migration.Keyspace2.bin
+++ /dev/null
@@ -1 +0,0 @@
-Y�/Dl7InR5cGUiOiJyZWNvcmQiLCJuYW1lIjoiTWlncmF0aW9uIiwibmFtZXNwYWNlIjoib3JnLmFwYWNoZS5jYXNzYW5kcmEuZGIubWlncmF0aW9uLmF2cm8iLCJmaWVsZHMiOlt7Im5hbWUiOiJvbGRfdmVyc2lvbiIsInR5cGUiOnsidHlwZSI6ImZpeGVkIiwibmFtZSI6IlVVSUQiLCJuYW1lc3BhY2UiOiJvcmcuYXBhY2hlLmNhc3NhbmRyYS51dGlscy5hdnJvIiwic2l6ZSI6MTZ9fSx7Im5hbWUiOiJuZXdfdmVyc2lvbiIsInR5cGUiOiJvcmcuYXBhY2hlLmNhc3NhbmRyYS51dGlscy5hdnJvLlVVSUQifSx7Im5hbWUiOiJyb3dfbXV0YXRpb24iLCJ0eXBlIjoiYnl0ZXMifSx7Im5hbWUiOiJjbGFzc25hbWUiLCJ0eXBlIjoic3RyaW5nIn0seyJuYW
[...]
\ No newline at end of file
diff --git a/test/data/serialization/1.0/db.migration.Keyspace3.bin
b/test/data/serialization/1.0/db.migration.Keyspace3.bin
deleted file mode 100644
index 37a092e398..0000000000
--- a/test/data/serialization/1.0/db.migration.Keyspace3.bin
+++ /dev/null
@@ -1 +0,0 @@
-I�/Dl7InR5cGUiOiJyZWNvcmQiLCJuYW1lIjoiTWlncmF0aW9uIiwibmFtZXNwYWNlIjoib3JnLmFwYWNoZS5jYXNzYW5kcmEuZGIubWlncmF0aW9uLmF2cm8iLCJmaWVsZHMiOlt7Im5hbWUiOiJvbGRfdmVyc2lvbiIsInR5cGUiOnsidHlwZSI6ImZpeGVkIiwibmFtZSI6IlVVSUQiLCJuYW1lc3BhY2UiOiJvcmcuYXBhY2hlLmNhc3NhbmRyYS51dGlscy5hdnJvIiwic2l6ZSI6MTZ9fSx7Im5hbWUiOiJuZXdfdmVyc2lvbiIsInR5cGUiOiJvcmcuYXBhY2hlLmNhc3NhbmRyYS51dGlscy5hdnJvLlVVSUQifSx7Im5hbWUiOiJyb3dfbXV0YXRpb24iLCJ0eXBlIjoiYnl0ZXMifSx7Im5hbWUiOiJjbGFzc25hbWUiLCJ0eXBlIjoic3RyaW5nIn0seyJuYW
[...]
\ No newline at end of file
diff --git a/test/data/serialization/1.0/db.migration.Keyspace4.bin
b/test/data/serialization/1.0/db.migration.Keyspace4.bin
deleted file mode 100644
index 2e05da45f2..0000000000
--- a/test/data/serialization/1.0/db.migration.Keyspace4.bin
+++ /dev/null
@@ -1 +0,0 @@
-J�/Dl7InR5cGUiOiJyZWNvcmQiLCJuYW1lIjoiTWlncmF0aW9uIiwibmFtZXNwYWNlIjoib3JnLmFwYWNoZS5jYXNzYW5kcmEuZGIubWlncmF0aW9uLmF2cm8iLCJmaWVsZHMiOlt7Im5hbWUiOiJvbGRfdmVyc2lvbiIsInR5cGUiOnsidHlwZSI6ImZpeGVkIiwibmFtZSI6IlVVSUQiLCJuYW1lc3BhY2UiOiJvcmcuYXBhY2hlLmNhc3NhbmRyYS51dGlscy5hdnJvIiwic2l6ZSI6MTZ9fSx7Im5hbWUiOiJuZXdfdmVyc2lvbiIsInR5cGUiOiJvcmcuYXBhY2hlLmNhc3NhbmRyYS51dGlscy5hdnJvLlVVSUQifSx7Im5hbWUiOiJyb3dfbXV0YXRpb24iLCJ0eXBlIjoiYnl0ZXMifSx7Im5hbWUiOiJjbGFzc25hbWUiLCJ0eXBlIjoic3RyaW5nIn0seyJuYW
[...]
\ No newline at end of file
diff --git a/test/data/serialization/1.0/db.migration.Keyspace5.bin
b/test/data/serialization/1.0/db.migration.Keyspace5.bin
deleted file mode 100644
index ec0704ac35..0000000000
--- a/test/data/serialization/1.0/db.migration.Keyspace5.bin
+++ /dev/null
@@ -1 +0,0 @@
-:�/Dl7InR5cGUiOiJyZWNvcmQiLCJuYW1lIjoiTWlncmF0aW9uIiwibmFtZXNwYWNlIjoib3JnLmFwYWNoZS5jYXNzYW5kcmEuZGIubWlncmF0aW9uLmF2cm8iLCJmaWVsZHMiOlt7Im5hbWUiOiJvbGRfdmVyc2lvbiIsInR5cGUiOnsidHlwZSI6ImZpeGVkIiwibmFtZSI6IlVVSUQiLCJuYW1lc3BhY2UiOiJvcmcuYXBhY2hlLmNhc3NhbmRyYS51dGlscy5hdnJvIiwic2l6ZSI6MTZ9fSx7Im5hbWUiOiJuZXdfdmVyc2lvbiIsInR5cGUiOiJvcmcuYXBhY2hlLmNhc3NhbmRyYS51dGlscy5hdnJvLlVVSUQifSx7Im5hbWUiOiJyb3dfbXV0YXRpb24iLCJ0eXBlIjoiYnl0ZXMifSx7Im5hbWUiOiJjbGFzc25hbWUiLCJ0eXBlIjoic3RyaW5nIn0seyJuYW
[...]
\ No newline at end of file
diff --git a/test/data/serialization/1.0/gms.EndpointState.bin
b/test/data/serialization/1.0/gms.EndpointState.bin
deleted file mode 100644
index 2383c5a532..0000000000
Binary files a/test/data/serialization/1.0/gms.EndpointState.bin and /dev/null
differ
diff --git a/test/data/serialization/1.0/gms.Gossip.bin
b/test/data/serialization/1.0/gms.Gossip.bin
deleted file mode 100644
index 20b27a8a2a..0000000000
Binary files a/test/data/serialization/1.0/gms.Gossip.bin and /dev/null differ
diff --git a/test/data/serialization/1.0/service.TreeRequest.bin
b/test/data/serialization/1.0/service.TreeRequest.bin
deleted file mode 100644
index b12a1b8018..0000000000
Binary files a/test/data/serialization/1.0/service.TreeRequest.bin and
/dev/null differ
diff --git a/test/data/serialization/1.0/service.TreeResponse.bin
b/test/data/serialization/1.0/service.TreeResponse.bin
deleted file mode 100644
index 4d94e2d9b9..0000000000
Binary files a/test/data/serialization/1.0/service.TreeResponse.bin and
/dev/null differ
diff --git a/test/data/serialization/1.0/streaming.PendingFile.bin
b/test/data/serialization/1.0/streaming.PendingFile.bin
deleted file mode 100644
index ada0844ddd..0000000000
Binary files a/test/data/serialization/1.0/streaming.PendingFile.bin and
/dev/null differ
diff --git a/test/data/serialization/1.0/streaming.StreamHeader.bin
b/test/data/serialization/1.0/streaming.StreamHeader.bin
deleted file mode 100644
index 90143b852b..0000000000
Binary files a/test/data/serialization/1.0/streaming.StreamHeader.bin and
/dev/null differ
diff --git a/test/data/serialization/1.0/streaming.StreamReply.bin
b/test/data/serialization/1.0/streaming.StreamReply.bin
deleted file mode 100644
index 4b740581f7..0000000000
Binary files a/test/data/serialization/1.0/streaming.StreamReply.bin and
/dev/null differ
diff --git a/test/data/serialization/1.0/streaming.StreamRequestMessage.bin
b/test/data/serialization/1.0/streaming.StreamRequestMessage.bin
deleted file mode 100644
index 7d19ad996d..0000000000
Binary files a/test/data/serialization/1.0/streaming.StreamRequestMessage.bin
and /dev/null differ
diff --git a/test/data/serialization/1.0/utils.BloomFilter.bin
b/test/data/serialization/1.0/utils.BloomFilter.bin
deleted file mode 100644
index f403170cf6..0000000000
Binary files a/test/data/serialization/1.0/utils.BloomFilter.bin and /dev/null
differ
diff --git a/test/data/serialization/1.0/utils.EstimatedHistogram.bin
b/test/data/serialization/1.0/utils.EstimatedHistogram.bin
deleted file mode 100644
index bedd39bce6..0000000000
Binary files a/test/data/serialization/1.0/utils.EstimatedHistogram.bin and
/dev/null differ
diff --git a/test/data/serialization/1.0/utils.LegacyBloomFilter.bin
b/test/data/serialization/1.0/utils.LegacyBloomFilter.bin
deleted file mode 100644
index faef1b8154..0000000000
Binary files a/test/data/serialization/1.0/utils.LegacyBloomFilter.bin and
/dev/null differ
diff --git a/test/data/serialization/1.2/db.RangeSliceCommand.bin
b/test/data/serialization/1.2/db.RangeSliceCommand.bin
deleted file mode 100644
index 273d7382ed..0000000000
Binary files a/test/data/serialization/1.2/db.RangeSliceCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/1.2/db.Row.bin
b/test/data/serialization/1.2/db.Row.bin
deleted file mode 100644
index ed5ad9d342..0000000000
Binary files a/test/data/serialization/1.2/db.Row.bin and /dev/null differ
diff --git a/test/data/serialization/1.2/db.RowMutation.bin
b/test/data/serialization/1.2/db.RowMutation.bin
deleted file mode 100644
index e62daed8d9..0000000000
Binary files a/test/data/serialization/1.2/db.RowMutation.bin and /dev/null
differ
diff --git a/test/data/serialization/1.2/db.SliceByNamesReadCommand.bin
b/test/data/serialization/1.2/db.SliceByNamesReadCommand.bin
deleted file mode 100644
index 9b9956d682..0000000000
Binary files a/test/data/serialization/1.2/db.SliceByNamesReadCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/1.2/db.SliceFromReadCommand.bin
b/test/data/serialization/1.2/db.SliceFromReadCommand.bin
deleted file mode 100644
index 3e68cd3f8c..0000000000
Binary files a/test/data/serialization/1.2/db.SliceFromReadCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/1.2/db.Truncation.bin
b/test/data/serialization/1.2/db.Truncation.bin
deleted file mode 100644
index ea679956a4..0000000000
Binary files a/test/data/serialization/1.2/db.Truncation.bin and /dev/null
differ
diff --git a/test/data/serialization/1.2/db.WriteResponse.bin
b/test/data/serialization/1.2/db.WriteResponse.bin
deleted file mode 100644
index 90762381f6..0000000000
Binary files a/test/data/serialization/1.2/db.WriteResponse.bin and /dev/null
differ
diff --git a/test/data/serialization/1.2/gms.EndpointState.bin
b/test/data/serialization/1.2/gms.EndpointState.bin
deleted file mode 100644
index cd85279f9a..0000000000
Binary files a/test/data/serialization/1.2/gms.EndpointState.bin and /dev/null
differ
diff --git a/test/data/serialization/1.2/gms.Gossip.bin
b/test/data/serialization/1.2/gms.Gossip.bin
deleted file mode 100644
index af5ac57146..0000000000
Binary files a/test/data/serialization/1.2/gms.Gossip.bin and /dev/null differ
diff --git a/test/data/serialization/1.2/service.TreeRequest.bin
b/test/data/serialization/1.2/service.TreeRequest.bin
deleted file mode 100644
index b12a1b8018..0000000000
Binary files a/test/data/serialization/1.2/service.TreeRequest.bin and
/dev/null differ
diff --git a/test/data/serialization/1.2/service.TreeResponse.bin
b/test/data/serialization/1.2/service.TreeResponse.bin
deleted file mode 100644
index 90f3c6fa26..0000000000
Binary files a/test/data/serialization/1.2/service.TreeResponse.bin and
/dev/null differ
diff --git a/test/data/serialization/1.2/streaming.PendingFile.bin
b/test/data/serialization/1.2/streaming.PendingFile.bin
deleted file mode 100644
index efc8f77369..0000000000
Binary files a/test/data/serialization/1.2/streaming.PendingFile.bin and
/dev/null differ
diff --git a/test/data/serialization/1.2/streaming.StreamHeader.bin
b/test/data/serialization/1.2/streaming.StreamHeader.bin
deleted file mode 100644
index ac5b7ac7ec..0000000000
Binary files a/test/data/serialization/1.2/streaming.StreamHeader.bin and
/dev/null differ
diff --git a/test/data/serialization/1.2/streaming.StreamReply.bin
b/test/data/serialization/1.2/streaming.StreamReply.bin
deleted file mode 100644
index 6933316a36..0000000000
Binary files a/test/data/serialization/1.2/streaming.StreamReply.bin and
/dev/null differ
diff --git a/test/data/serialization/1.2/streaming.StreamRequestMessage.bin
b/test/data/serialization/1.2/streaming.StreamRequestMessage.bin
deleted file mode 100644
index fd53579a1d..0000000000
Binary files a/test/data/serialization/1.2/streaming.StreamRequestMessage.bin
and /dev/null differ
diff --git a/test/data/serialization/1.2/utils.BloomFilter.bin
b/test/data/serialization/1.2/utils.BloomFilter.bin
deleted file mode 100644
index 6b4e7debab..0000000000
Binary files a/test/data/serialization/1.2/utils.BloomFilter.bin and /dev/null
differ
diff --git a/test/data/serialization/1.2/utils.EstimatedHistogram.bin
b/test/data/serialization/1.2/utils.EstimatedHistogram.bin
deleted file mode 100644
index bedd39bce6..0000000000
Binary files a/test/data/serialization/1.2/utils.EstimatedHistogram.bin and
/dev/null differ
diff --git a/test/data/serialization/1.2/utils.LegacyBloomFilter.bin
b/test/data/serialization/1.2/utils.LegacyBloomFilter.bin
deleted file mode 100644
index faef1b8154..0000000000
Binary files a/test/data/serialization/1.2/utils.LegacyBloomFilter.bin and
/dev/null differ
diff --git a/test/data/serialization/2.0/db.RangeSliceCommand.bin
b/test/data/serialization/2.0/db.RangeSliceCommand.bin
deleted file mode 100644
index 099e4297e4..0000000000
Binary files a/test/data/serialization/2.0/db.RangeSliceCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/2.0/db.SliceByNamesReadCommand.bin
b/test/data/serialization/2.0/db.SliceByNamesReadCommand.bin
deleted file mode 100644
index e9c33a2bb0..0000000000
Binary files a/test/data/serialization/2.0/db.SliceByNamesReadCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/2.0/db.SliceFromReadCommand.bin
b/test/data/serialization/2.0/db.SliceFromReadCommand.bin
deleted file mode 100644
index 1beede324b..0000000000
Binary files a/test/data/serialization/2.0/db.SliceFromReadCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/2.0/db.Truncation.bin
b/test/data/serialization/2.0/db.Truncation.bin
deleted file mode 100644
index ea679956a4..0000000000
Binary files a/test/data/serialization/2.0/db.Truncation.bin and /dev/null
differ
diff --git a/test/data/serialization/2.0/db.WriteResponse.bin
b/test/data/serialization/2.0/db.WriteResponse.bin
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/data/serialization/2.0/gms.EndpointState.bin
b/test/data/serialization/2.0/gms.EndpointState.bin
deleted file mode 100644
index cd8989318b..0000000000
Binary files a/test/data/serialization/2.0/gms.EndpointState.bin and /dev/null
differ
diff --git a/test/data/serialization/2.0/gms.Gossip.bin
b/test/data/serialization/2.0/gms.Gossip.bin
deleted file mode 100644
index af5ac57146..0000000000
Binary files a/test/data/serialization/2.0/gms.Gossip.bin and /dev/null differ
diff --git a/test/data/serialization/2.0/service.SyncComplete.bin
b/test/data/serialization/2.0/service.SyncComplete.bin
deleted file mode 100644
index 66c72e1ece..0000000000
Binary files a/test/data/serialization/2.0/service.SyncComplete.bin and
/dev/null differ
diff --git a/test/data/serialization/2.0/service.SyncRequest.bin
b/test/data/serialization/2.0/service.SyncRequest.bin
deleted file mode 100644
index 8918405bcb..0000000000
Binary files a/test/data/serialization/2.0/service.SyncRequest.bin and
/dev/null differ
diff --git a/test/data/serialization/2.0/service.ValidationComplete.bin
b/test/data/serialization/2.0/service.ValidationComplete.bin
deleted file mode 100644
index 0c8d7bef98..0000000000
Binary files a/test/data/serialization/2.0/service.ValidationComplete.bin and
/dev/null differ
diff --git a/test/data/serialization/2.0/service.ValidationRequest.bin
b/test/data/serialization/2.0/service.ValidationRequest.bin
deleted file mode 100644
index 4ec4c47024..0000000000
Binary files a/test/data/serialization/2.0/service.ValidationRequest.bin and
/dev/null differ
diff --git a/test/data/serialization/2.0/streaming.PendingFile.bin
b/test/data/serialization/2.0/streaming.PendingFile.bin
deleted file mode 100644
index efc8f77369..0000000000
Binary files a/test/data/serialization/2.0/streaming.PendingFile.bin and
/dev/null differ
diff --git a/test/data/serialization/2.0/streaming.StreamHeader.bin
b/test/data/serialization/2.0/streaming.StreamHeader.bin
deleted file mode 100644
index f7e5edc38f..0000000000
Binary files a/test/data/serialization/2.0/streaming.StreamHeader.bin and
/dev/null differ
diff --git a/test/data/serialization/2.0/streaming.StreamReply.bin
b/test/data/serialization/2.0/streaming.StreamReply.bin
deleted file mode 100644
index 0094ecc806..0000000000
Binary files a/test/data/serialization/2.0/streaming.StreamReply.bin and
/dev/null differ
diff --git a/test/data/serialization/2.0/streaming.StreamRequestMessage.bin
b/test/data/serialization/2.0/streaming.StreamRequestMessage.bin
deleted file mode 100644
index 71aaf78926..0000000000
Binary files a/test/data/serialization/2.0/streaming.StreamRequestMessage.bin
and /dev/null differ
diff --git a/test/data/serialization/2.0/utils.BloomFilter.bin
b/test/data/serialization/2.0/utils.BloomFilter.bin
deleted file mode 100644
index 12f72f52e2..0000000000
Binary files a/test/data/serialization/2.0/utils.BloomFilter.bin and /dev/null
differ
diff --git a/test/data/serialization/2.0/utils.EstimatedHistogram.bin
b/test/data/serialization/2.0/utils.EstimatedHistogram.bin
deleted file mode 100644
index bedd39bce6..0000000000
Binary files a/test/data/serialization/2.0/utils.EstimatedHistogram.bin and
/dev/null differ
diff --git a/test/data/serialization/2.0/utils.LegacyBloomFilter.bin
b/test/data/serialization/2.0/utils.LegacyBloomFilter.bin
deleted file mode 100644
index faef1b8154..0000000000
Binary files a/test/data/serialization/2.0/utils.LegacyBloomFilter.bin and
/dev/null differ
diff --git a/test/data/serialization/2.1/db.RangeSliceCommand.bin
b/test/data/serialization/2.1/db.RangeSliceCommand.bin
deleted file mode 100644
index f852df0717..0000000000
Binary files a/test/data/serialization/2.1/db.RangeSliceCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/2.1/db.SliceByNamesReadCommand.bin
b/test/data/serialization/2.1/db.SliceByNamesReadCommand.bin
deleted file mode 100644
index e9c33a2bb0..0000000000
Binary files a/test/data/serialization/2.1/db.SliceByNamesReadCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/2.1/db.SliceFromReadCommand.bin
b/test/data/serialization/2.1/db.SliceFromReadCommand.bin
deleted file mode 100644
index 1beede324b..0000000000
Binary files a/test/data/serialization/2.1/db.SliceFromReadCommand.bin and
/dev/null differ
diff --git a/test/data/serialization/2.1/db.Truncation.bin
b/test/data/serialization/2.1/db.Truncation.bin
deleted file mode 100644
index ea679956a4..0000000000
Binary files a/test/data/serialization/2.1/db.Truncation.bin and /dev/null
differ
diff --git a/test/data/serialization/2.1/db.WriteResponse.bin
b/test/data/serialization/2.1/db.WriteResponse.bin
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/data/serialization/2.1/gms.EndpointState.bin
b/test/data/serialization/2.1/gms.EndpointState.bin
deleted file mode 100644
index f87fc770ca..0000000000
Binary files a/test/data/serialization/2.1/gms.EndpointState.bin and /dev/null
differ
diff --git a/test/data/serialization/2.1/gms.Gossip.bin
b/test/data/serialization/2.1/gms.Gossip.bin
deleted file mode 100644
index af5ac57146..0000000000
Binary files a/test/data/serialization/2.1/gms.Gossip.bin and /dev/null differ
diff --git a/test/data/serialization/2.1/service.SyncComplete.bin
b/test/data/serialization/2.1/service.SyncComplete.bin
deleted file mode 100644
index 533abe221c..0000000000
Binary files a/test/data/serialization/2.1/service.SyncComplete.bin and
/dev/null differ
diff --git a/test/data/serialization/2.1/service.SyncRequest.bin
b/test/data/serialization/2.1/service.SyncRequest.bin
deleted file mode 100644
index 2bb8bf9788..0000000000
Binary files a/test/data/serialization/2.1/service.SyncRequest.bin and
/dev/null differ
diff --git a/test/data/serialization/2.1/service.ValidationComplete.bin
b/test/data/serialization/2.1/service.ValidationComplete.bin
deleted file mode 100644
index 6eff48f138..0000000000
Binary files a/test/data/serialization/2.1/service.ValidationComplete.bin and
/dev/null differ
diff --git a/test/data/serialization/2.1/service.ValidationRequest.bin
b/test/data/serialization/2.1/service.ValidationRequest.bin
deleted file mode 100644
index e774d05cc5..0000000000
Binary files a/test/data/serialization/2.1/service.ValidationRequest.bin and
/dev/null differ
diff --git a/test/data/serialization/2.1/utils.BloomFilter.bin
b/test/data/serialization/2.1/utils.BloomFilter.bin
deleted file mode 100644
index 357042ab9d..0000000000
Binary files a/test/data/serialization/2.1/utils.BloomFilter.bin and /dev/null
differ
diff --git a/test/data/serialization/2.1/utils.BloomFilter1000.bin
b/test/data/serialization/2.1/utils.BloomFilter1000.bin
deleted file mode 100644
index 619679cfd5..0000000000
Binary files a/test/data/serialization/2.1/utils.BloomFilter1000.bin and
/dev/null differ
diff --git a/test/data/serialization/2.1/utils.EstimatedHistogram.bin
b/test/data/serialization/2.1/utils.EstimatedHistogram.bin
deleted file mode 100644
index bedd39bce6..0000000000
Binary files a/test/data/serialization/2.1/utils.EstimatedHistogram.bin and
/dev/null differ
diff --git a/test/data/serialization/3.0/gms.EndpointState.bin
b/test/data/serialization/3.0/gms.EndpointState.bin
deleted file mode 100644
index a230ae12fb..0000000000
Binary files a/test/data/serialization/3.0/gms.EndpointState.bin and /dev/null
differ
diff --git a/test/data/serialization/3.0/gms.Gossip.bin
b/test/data/serialization/3.0/gms.Gossip.bin
deleted file mode 100644
index af5ac57146..0000000000
Binary files a/test/data/serialization/3.0/gms.Gossip.bin and /dev/null differ
diff --git a/test/data/serialization/3.0/service.SyncComplete.bin
b/test/data/serialization/3.0/service.SyncComplete.bin
deleted file mode 100644
index 73ea4b46cc..0000000000
Binary files a/test/data/serialization/3.0/service.SyncComplete.bin and
/dev/null differ
diff --git a/test/data/serialization/3.0/service.SyncRequest.bin
b/test/data/serialization/3.0/service.SyncRequest.bin
deleted file mode 100644
index 7e09777860..0000000000
Binary files a/test/data/serialization/3.0/service.SyncRequest.bin and
/dev/null differ
diff --git a/test/data/serialization/3.0/service.ValidationComplete.bin
b/test/data/serialization/3.0/service.ValidationComplete.bin
deleted file mode 100644
index b8f0fb9330..0000000000
Binary files a/test/data/serialization/3.0/service.ValidationComplete.bin and
/dev/null differ
diff --git a/test/data/serialization/3.0/service.ValidationRequest.bin
b/test/data/serialization/3.0/service.ValidationRequest.bin
deleted file mode 100644
index a00763ba93..0000000000
Binary files a/test/data/serialization/3.0/service.ValidationRequest.bin and
/dev/null differ
diff --git a/test/data/serialization/3.0/utils.BloomFilter.bin
b/test/data/serialization/3.0/utils.BloomFilter.bin
deleted file mode 100644
index e8bfb4f166..0000000000
Binary files a/test/data/serialization/3.0/utils.BloomFilter.bin and /dev/null
differ
diff --git a/test/data/serialization/3.0/utils.EstimatedHistogram.bin
b/test/data/serialization/3.0/utils.EstimatedHistogram.bin
deleted file mode 100644
index bedd39bce6..0000000000
Binary files a/test/data/serialization/3.0/utils.EstimatedHistogram.bin and
/dev/null differ
diff --git a/test/data/serialization/4.0/gms.EndpointState.bin
b/test/data/serialization/4.0/gms.EndpointState.bin
index 17fc088128..083dbb7736 100644
Binary files a/test/data/serialization/4.0/gms.EndpointState.bin and
b/test/data/serialization/4.0/gms.EndpointState.bin differ
diff --git a/test/data/serialization/4.0/gms.Gossip.bin
b/test/data/serialization/4.0/gms.Gossip.bin
index 2fbd5d4854..7a4fb5666e 100644
Binary files a/test/data/serialization/4.0/gms.Gossip.bin and
b/test/data/serialization/4.0/gms.Gossip.bin differ
diff --git a/test/data/serialization/4.0/service.SyncComplete.bin
b/test/data/serialization/4.0/service.SyncComplete.bin
index 4e8caa6c37..39a6243972 100644
Binary files a/test/data/serialization/4.0/service.SyncComplete.bin and
b/test/data/serialization/4.0/service.SyncComplete.bin differ
diff --git a/test/data/serialization/4.0/service.SyncRequest.bin
b/test/data/serialization/4.0/service.SyncRequest.bin
index 17bb0144ba..f853b20f9c 100644
Binary files a/test/data/serialization/4.0/service.SyncRequest.bin and
b/test/data/serialization/4.0/service.SyncRequest.bin differ
diff --git a/test/data/serialization/4.0/service.ValidationComplete.bin
b/test/data/serialization/4.0/service.ValidationComplete.bin
index 7402c9e848..bb4de439f6 100644
Binary files a/test/data/serialization/4.0/service.ValidationComplete.bin and
b/test/data/serialization/4.0/service.ValidationComplete.bin differ
diff --git a/test/data/serialization/4.0/service.ValidationRequest.bin
b/test/data/serialization/4.0/service.ValidationRequest.bin
index fa4a913842..04c492a8a1 100644
Binary files a/test/data/serialization/4.0/service.ValidationRequest.bin and
b/test/data/serialization/4.0/service.ValidationRequest.bin differ
diff --git a/test/data/serialization/4.1/gms.EndpointState.bin
b/test/data/serialization/4.1/gms.EndpointState.bin
deleted file mode 100644
index 083dbb7736..0000000000
Binary files a/test/data/serialization/4.1/gms.EndpointState.bin and /dev/null
differ
diff --git a/test/data/serialization/4.1/gms.Gossip.bin
b/test/data/serialization/4.1/gms.Gossip.bin
deleted file mode 100644
index 7a4fb5666e..0000000000
Binary files a/test/data/serialization/4.1/gms.Gossip.bin and /dev/null differ
diff --git a/test/data/serialization/4.1/service.SyncComplete.bin
b/test/data/serialization/4.1/service.SyncComplete.bin
deleted file mode 100644
index 39a6243972..0000000000
Binary files a/test/data/serialization/4.1/service.SyncComplete.bin and
/dev/null differ
diff --git a/test/data/serialization/4.1/service.SyncRequest.bin
b/test/data/serialization/4.1/service.SyncRequest.bin
deleted file mode 100644
index f853b20f9c..0000000000
Binary files a/test/data/serialization/4.1/service.SyncRequest.bin and
/dev/null differ
diff --git a/test/data/serialization/4.1/service.ValidationComplete.bin
b/test/data/serialization/4.1/service.ValidationComplete.bin
deleted file mode 100644
index bb4de439f6..0000000000
Binary files a/test/data/serialization/4.1/service.ValidationComplete.bin and
/dev/null differ
diff --git a/test/data/serialization/4.1/service.ValidationRequest.bin
b/test/data/serialization/4.1/service.ValidationRequest.bin
deleted file mode 100644
index 04c492a8a1..0000000000
Binary files a/test/data/serialization/4.1/service.ValidationRequest.bin and
/dev/null differ
diff --git a/test/data/serialization/4.1/utils.EstimatedHistogram.bin
b/test/data/serialization/4.1/utils.EstimatedHistogram.bin
deleted file mode 100644
index e878eda0ce..0000000000
Binary files a/test/data/serialization/4.1/utils.EstimatedHistogram.bin and
/dev/null differ
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageColumnDeleteTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageColumnDeleteTest.java
index 920c8508a9..2a2ece644f 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageColumnDeleteTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageColumnDeleteTest.java
@@ -33,7 +33,7 @@ public class CompactStorageColumnDeleteTest extends
UpgradeTestBase
new TestCase()
.nodes(2)
.nodesToUpgrade(2)
- .upgradesToCurrentFrom(v30)
+ .upgradesToCurrentFrom(v40)
.setup((cluster) -> {
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck)) WITH COMPACT STORAGE");
})
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageHiddenColumnTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageHiddenColumnTest.java
index 178d32800b..93f770c7fc 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageHiddenColumnTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageHiddenColumnTest.java
@@ -33,7 +33,7 @@ public class CompactStorageHiddenColumnTest extends
UpgradeTestBase
new TestCase()
.nodes(2)
.nodesToUpgrade(2)
- .upgradesToCurrentFrom(v30)
+ .upgradesToCurrentFrom(v40)
.setup((cluster) -> {
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, PRIMARY KEY (pk, ck)) WITH COMPACT STORAGE");
})
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageImplicitNullInClusteringTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageImplicitNullInClusteringTest.java
index b59fda3151..52b792e459 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageImplicitNullInClusteringTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageImplicitNullInClusteringTest.java
@@ -33,7 +33,7 @@ public class CompactStorageImplicitNullInClusteringTest
extends UpgradeTestBase
new TestCase()
.nodes(2)
.nodesToUpgrade(2)
- .upgradesToCurrentFrom(v30)
+ .upgradesToCurrentFrom(v40)
.setup((cluster) -> {
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck1 int, ck2 int, v int, PRIMARY KEY (pk, ck1, ck2)) WITH COMPACT STORAGE");
})
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingTest.java
index 62d6ea04e5..16431901c8 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingTest.java
@@ -33,7 +33,7 @@ public class CompactStoragePagingTest extends UpgradeTestBase
new TestCase()
.nodes(2)
.nodesToUpgrade(2)
- .upgradesToCurrentFrom(v30)
+ .upgradesToCurrentFrom(v40)
.setup((cluster) -> {
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck)) WITH COMPACT STORAGE");
for (int i = 1; i < 10; i++)
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingWithProtocolV30Test.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingWithProtocolV30Test.java
deleted file mode 100644
index 518a514146..0000000000
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingWithProtocolV30Test.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.cassandra.distributed.upgrade;
-
-import com.vdurmont.semver4j.Semver;
-
-/**
- * {@link CompactStoragePagingWithProtocolTester} for v30 -> CURRENT upgrade
path.
- */
-public class CompactStoragePagingWithProtocolV30Test extends
CompactStoragePagingWithProtocolTester
-{
- @Override
- protected Semver initialVersion()
- {
- return v30;
- }
-}
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingWithProtocolV3XTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingWithProtocolV3XTest.java
deleted file mode 100644
index 003c372ceb..0000000000
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingWithProtocolV3XTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.cassandra.distributed.upgrade;
-
-import com.vdurmont.semver4j.Semver;
-
-/**
- * {@link CompactStoragePagingWithProtocolTester} for v3X -> CURRENT upgrade
path.
- */
-public class CompactStoragePagingWithProtocolV3XTest extends
CompactStoragePagingWithProtocolTester
-{
- @Override
- protected Semver initialVersion()
- {
- return v3X;
- }
-}
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeGossipTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeGossipTest.java
deleted file mode 100644
index e1a96ac88c..0000000000
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeGossipTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.cassandra.distributed.upgrade;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.BiConsumer;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import com.google.common.util.concurrent.Uninterruptibles;
-import org.junit.Test;
-
-import org.apache.cassandra.distributed.UpgradeableCluster;
-import org.apache.cassandra.distributed.api.Feature;
-import org.apache.cassandra.distributed.api.IMessageFilters;
-import org.apache.cassandra.net.Verb;
-import org.assertj.core.api.Assertions;
-
-public class MixedModeGossipTest extends UpgradeTestBase
-{
- Pattern expectedNormalStatus =
Pattern.compile("STATUS:\\d+:NORMAL,-?\\d+");
- Pattern expectedNormalStatusWithPort =
Pattern.compile("STATUS_WITH_PORT:\\d+:NORMAL,-?\\d+");
- Pattern expectedNormalX3 = Pattern.compile("X3:\\d+:NORMAL,-?\\d+");
-
- @Test
- public void testStatusFieldShouldExistInOldVersionNodes() throws Throwable
- {
- new TestCase()
- .withConfig(c -> c.with(Feature.GOSSIP, Feature.NETWORK))
- .nodes(3)
- .nodesToUpgradeOrdered(1, 2, 3)
- // all upgrades from v30 up, excluding v30->v3X and from v40
- .singleUpgradeToCurrentFrom(v30)
- .singleUpgradeToCurrentFrom(v3X)
- .setup(c -> {})
- .runAfterNodeUpgrade((cluster, node) -> {
- if (node == 1) {
- checkPeerGossipInfoShouldContainNormalStatus(cluster, 2);
- checkPeerGossipInfoShouldContainNormalStatus(cluster, 3);
- }
- if (node == 2) {
- checkPeerGossipInfoShouldContainNormalStatus(cluster, 3);
- }
- })
- .runAfterClusterUpgrade(cluster -> {
- // wait 1 minute for
`org.apache.cassandra.gms.Gossiper.upgradeFromVersionSupplier` to update
- Uninterruptibles.sleepUninterruptibly(1, TimeUnit.MINUTES);
-
checkPeerGossipInfoOfAllNodesShouldContainNewStatusAfterUpgrade(cluster);
- })
- .run();
- }
-
- /**
- * Similar to {@link #testStatusFieldShouldExistInOldVersionNodes}, but in
an edge case that
- * 1) node2 and node3 cannot gossip with each other.
- * 2) node2 sends SYN to node1 first when upgrading.
- * 3) node3 is at the lower version during the cluster upgrade
- * In this case, node3 gossip info does not contain STATUS field for node2
- */
- @Test
- public void testStatusFieldShouldExistInOldVersionNodesEdgeCase() throws
Throwable
- {
- AtomicReference<IMessageFilters.Filter> n1GossipSynBlocker = new
AtomicReference<>();
- new TestCase()
- .withConfig(c -> c.with(Feature.GOSSIP, Feature.NETWORK))
- .nodes(3)
- .nodesToUpgradeOrdered(1, 2, 3)
- // all upgrades from v30 up, excluding v30->v3X and from v40
- .singleUpgradeToCurrentFrom(v30)
- .singleUpgradeToCurrentFrom(v3X)
- .setup(cluster -> {
- // node2 and node3 gossiper cannot talk with each other
-
cluster.filters().verbs(Verb.GOSSIP_DIGEST_SYN.id).from(2).to(3).drop();
-
cluster.filters().verbs(Verb.GOSSIP_DIGEST_SYN.id).from(3).to(2).drop();
- })
- .runAfterNodeUpgrade((cluster, node) -> {
- // let node2 sends the SYN to node1 first
- if (node == 1)
- {
- IMessageFilters.Filter filter =
cluster.filters().verbs(Verb.GOSSIP_DIGEST_SYN.id).from(1).to(2).drop();
- n1GossipSynBlocker.set(filter);
- }
- else if (node == 2)
- {
- n1GossipSynBlocker.get().off();
- String node3GossipView =
cluster.get(3).nodetoolResult("gossipinfo").getStdout();
- String node2GossipState =
getGossipStateOfNode(node3GossipView, "/127.0.0.2");
- Assertions.assertThat(node2GossipState)
- .as("The node2's gossip state from node3's
perspective should contain status. " +
- "And it should carry an unrecognized field X3
with NORMAL.")
- .containsPattern(expectedNormalStatus)
- .containsPattern(expectedNormalX3);
- }
- })
- .runAfterClusterUpgrade(cluster -> {
- // wait 1 minute for
`org.apache.cassandra.gms.Gossiper.upgradeFromVersionSupplier` to update
- Uninterruptibles.sleepUninterruptibly(1, TimeUnit.MINUTES);
-
checkPeerGossipInfoOfAllNodesShouldContainNewStatusAfterUpgrade(cluster);
- })
- .run();
- }
-
- private void
checkPeerGossipInfoOfAllNodesShouldContainNewStatusAfterUpgrade(UpgradeableCluster
cluster)
- {
- for (int i = 1; i <= 3; i++)
- {
- int n = i;
- checkPeerGossipInfo(cluster, i, (gossipInfo, peers) -> {
- for (String p : peers)
- {
- Assertions.assertThat(getGossipStateOfNode(gossipInfo, p))
- .as(String.format("%s gossip state in node%s
should not contain STATUS " +
- "and should contain
STATUS_WITH_PORT.", p, n))
- .doesNotContain("STATUS:")
- .containsPattern(expectedNormalStatusWithPort);
- }
- });
- }
- }
-
- private void
checkPeerGossipInfoShouldContainNormalStatus(UpgradeableCluster cluster, int
node)
- {
- checkPeerGossipInfo(cluster, node, (gossipInfo, peers) -> {
- for (String n : peers)
- {
- Assertions.assertThat(getGossipStateOfNode(gossipInfo, n))
- .containsPattern(expectedNormalStatus);
- }
- });
- }
-
- private void checkPeerGossipInfo(UpgradeableCluster cluster, int node,
BiConsumer<String, Set<String>> verifier)
- {
- Set<Integer> peers = new HashSet<>(Arrays.asList(1, 2, 3));
- peers.remove(node);
- String gossipInfo =
cluster.get(node).nodetoolResult("gossipinfo").getStdout();
- verifier.accept(gossipInfo, peers.stream().map(i -> "127.0.0." +
i).collect(Collectors.toSet()));
- }
-
- private String getGossipStateOfNode(String rawOutput, String
nodeInterested)
- {
- String temp = rawOutput.substring(rawOutput.indexOf(nodeInterested));
- int nextSlashIndex = temp.indexOf('/', 1);
- if (nextSlashIndex != -1)
- return temp.substring(0, nextSlashIndex);
- else
- return temp;
- }
-}
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java
index fe85c01adc..55092ab9b2 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java
@@ -103,7 +103,7 @@ public class MixedModeMessageForwardTest extends
UpgradeTestBase
.withConfig(c -> c.with(Feature.GOSSIP, Feature.NETWORK))
.withBuilder(b -> b.withRacks(numDCs, 1, nodesPerDc))
.nodes(numDCs * nodesPerDc)
- .singleUpgradeToCurrentFrom(v30)
+ .upgradesToCurrentFrom(v40)
.setup(cluster -> {
cluster.schemaChange("ALTER KEYSPACE " + KEYSPACE +
" WITH replication = {'class': 'NetworkTopologyStrategy', " +
ntsArgs + " };");
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadTest.java
deleted file mode 100644
index a039678293..0000000000
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.cassandra.distributed.upgrade;
-
-import org.junit.Test;
-
-import org.apache.cassandra.distributed.api.Feature;
-import org.apache.cassandra.distributed.api.IInvokableInstance;
-import org.apache.cassandra.gms.Gossiper;
-import org.apache.cassandra.utils.CassandraVersion;
-
-import static
org.apache.cassandra.distributed.test.ReadDigestConsistencyTest.CREATE_TABLE;
-import static
org.apache.cassandra.distributed.test.ReadDigestConsistencyTest.insertData;
-import static
org.apache.cassandra.distributed.test.ReadDigestConsistencyTest.testDigestConsistency;
-
-public class MixedModeReadTest extends UpgradeTestBase
-{
- @Test
- public void mixedModeReadColumnSubsetDigestCheck() throws Throwable
- {
- new TestCase()
- .withConfig(c -> c.with(Feature.GOSSIP, Feature.NETWORK))
- .nodes(2)
- .nodesToUpgrade(1)
- // all upgrades from v30 up, excluding v30->v3X and from v40
- .singleUpgradeToCurrentFrom(v30)
- .singleUpgradeToCurrentFrom(v3X)
- .setup(cluster -> {
- cluster.schemaChange(CREATE_TABLE);
- insertData(cluster.coordinator(1));
- testDigestConsistency(cluster.coordinator(1));
- testDigestConsistency(cluster.coordinator(2));
- })
- .runAfterClusterUpgrade(cluster -> {
- // we need to let gossip settle or the test will fail
- int attempts = 1;
- //noinspection Convert2MethodRef
- while (!((IInvokableInstance) cluster.get(1)).callOnInstance(() ->
Gossiper.instance.isUpgradingFromVersionLowerThan(CassandraVersion.CASSANDRA_4_0)
&&
-
!Gossiper.instance.isUpgradingFromVersionLowerThan(new
CassandraVersion(("3.0")).familyLowerBound.get())))
- {
- if (attempts++ > 90)
- throw new
RuntimeException("Gossiper.instance.haveMajorVersion3Nodes() continually
returns false despite expecting to be true");
- Thread.sleep(1000);
- }
-
- // should not cause a disgest mismatch in mixed mode
- testDigestConsistency(cluster.coordinator(1));
- testDigestConsistency(cluster.coordinator(2));
- })
- .run();
- }
-}
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeRepairTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeRepairTest.java
index 6606bcde7e..6e22be5db2 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeRepairTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeRepairTest.java
@@ -54,7 +54,7 @@ public class MixedModeRepairTest extends UpgradeTestBase
new UpgradeTestBase.TestCase()
.nodes(2)
.nodesToUpgrade(UPGRADED_NODE)
- .singleUpgradeToCurrentFrom(v3X)
+ .upgradesToCurrentFrom(v40)
.withConfig(config -> config.with(NETWORK, GOSSIP))
.setup(cluster -> {
cluster.schemaChange(CREATE_TABLE);
@@ -78,39 +78,51 @@ public class MixedModeRepairTest extends UpgradeTestBase
cluster.get(2).flush(KEYSPACE);
// in case of repairing the upgraded node the repair should be
rejected with a decriptive error in both
- // nodetool output and logs (see CASSANDRA-13944)
- if (repairedNode == UPGRADED_NODE)
+ // nodetool output and logs (see CASSANDRA-13944), if
MessagingService.currentVersion has changed
+ if (cluster.get(1).getMessagingVersion() !=
cluster.get(2).getMessagingVersion())
{
- String errorMessage = "Repair is not supported in mixed
major version clusters";
- cluster.get(repairedNode)
- .nodetoolResult("repair", "--full", KEYSPACE)
- .asserts()
- .errorContains(errorMessage);
- assertLogHas(cluster, repairedNode, errorMessage);
- }
- // if the node issuing the repair is the not updated node we
don't have specific error management,
- // so the repair will produce a failure in the upgraded node,
and it will take one hour to time out in
- // the not upgraded node. Since we don't want to wait that
long, we only wait a few seconds for the
- // repair before verifying the "unknown verb id" error in the
upgraded node.
- else
- {
- try
+ if (repairedNode == UPGRADED_NODE)
{
- IUpgradeableInstance instance =
cluster.get(repairedNode);
- CompletableFuture.supplyAsync(() ->
instance.nodetoolResult("repair", "--full", KEYSPACE))
- .get(10, TimeUnit.SECONDS);
- fail("Repair in the not upgraded node should have
timed out");
+ // Repair is only not supported when
MessagingService.current_version don't match
+ // but we keep the error message simple and
user-facing
+ String errorMessage = "Repair is not supported in
mixed major version clusters";
+ cluster.get(repairedNode)
+ .nodetoolResult("repair", "--full", KEYSPACE)
+ .asserts()
+ .errorContains(errorMessage);
+ assertLogHas(cluster, repairedNode, errorMessage);
}
- catch (TimeoutException e)
+ // if the node issuing the repair is the not updated node
we don't have specific error management,
+ // so the repair will produce a failure in the upgraded
node, and it will take one hour to time out in
+ // the not upgraded node. Since we don't want to wait that
long, we only wait a few seconds for the
+ // repair before verifying the "unknown verb id" error in
the upgraded node.
+ else
{
- assertLogHas(cluster, UPGRADED_NODE, "unexpected
exception caught while processing inbound messages");
- assertLogHas(cluster, UPGRADED_NODE,
"java.lang.IllegalArgumentException: Unknown verb id");
+ try
+ {
+ IUpgradeableInstance instance =
cluster.get(repairedNode);
+ CompletableFuture.supplyAsync(() ->
instance.nodetoolResult("repair", "--full", KEYSPACE))
+ .get(10, TimeUnit.SECONDS);
+ fail("Repair in the not upgraded node should have
timed out");
+ }
+ catch (TimeoutException e)
+ {
+ assertLogHas(cluster, UPGRADED_NODE, "unexpected
exception caught while processing inbound messages");
+ assertLogHas(cluster, UPGRADED_NODE,
"java.lang.IllegalArgumentException: Unknown verb id");
+ }
}
- }
- // verify that the previous failed repair hasn't repaired the
data
- assertRows(cluster.get(1).executeInternal(SELECT, key), row1);
- assertRows(cluster.get(2).executeInternal(SELECT, key), row2);
+ // verify that the previous failed repair hasn't repaired
the data
+ assertRows(cluster.get(1).executeInternal(SELECT, key),
row1);
+ assertRows(cluster.get(2).executeInternal(SELECT, key),
row2);
+ }
+ else
+ {
+ cluster.get(repairedNode).nodetoolResult("repair",
"--full", KEYSPACE);
+ // verify that the repair repaired the data
+ assertRows(cluster.get(1).executeInternal(SELECT, key),
row1, row2);
+ assertRows(cluster.get(2).executeInternal(SELECT, key),
row1, row2);
+ }
}
})
.run();
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/Pre40MessageFilterTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/Pre40MessageFilterTest.java
index 59e624ddb3..9030fdc342 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/Pre40MessageFilterTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/Pre40MessageFilterTest.java
@@ -34,9 +34,7 @@ public class Pre40MessageFilterTest extends UpgradeTestBase
.nodes(2)
.withConfig(configConsumer)
.nodesToUpgrade(1)
- // all upgrades from v30 up, excluding v30->v3X
- .singleUpgradeToCurrentFrom(v30)
- .upgradesToCurrentFrom(v3X)
+ .upgradesToCurrentFrom(v40)
.setup((cluster) -> {
cluster.filters().outbound().allVerbs().messagesMatching((f,t,m)
-> false).drop();
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck))");
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
index e41444fe52..5dc6e5294b 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
@@ -91,19 +91,17 @@ public class UpgradeTestBase extends DistributedTestBase
public static final Semver v3X = new Semver("3.11.0", SemverType.LOOSE);
public static final Semver v40 = new Semver("4.0-alpha1",
SemverType.LOOSE);
public static final Semver v41 = new Semver("4.1-alpha1",
SemverType.LOOSE);
- public static final Semver v42 = new Semver("4.2-alpha1",
SemverType.LOOSE);
+ public static final Semver v50 = new Semver("5.0-alpha1",
SemverType.LOOSE);
protected static final SimpleGraph<Semver> SUPPORTED_UPGRADE_PATHS = new
SimpleGraph.Builder<Semver>()
.addEdge(v30, v3X)
.addEdge(v30, v40)
.addEdge(v30, v41)
-
.addEdge(v30, v42)
.addEdge(v3X, v40)
.addEdge(v3X, v41)
-
.addEdge(v3X, v42)
.addEdge(v40, v41)
-
.addEdge(v40, v42)
-
.addEdge(v41, v42)
+
.addEdge(v40, v50)
+
.addEdge(v41, v50)
.build();
// the last is always the current
diff --git a/test/unit/org/apache/cassandra/AbstractSerializationsTester.java
b/test/unit/org/apache/cassandra/AbstractSerializationsTester.java
index 6503707498..d79521b196 100644
--- a/test/unit/org/apache/cassandra/AbstractSerializationsTester.java
+++ b/test/unit/org/apache/cassandra/AbstractSerializationsTester.java
@@ -29,12 +29,11 @@ import java.util.Map;
public class AbstractSerializationsTester
{
- protected static final String CUR_VER =
System.getProperty("cassandra.version", "4.1");
+ protected static final String CUR_VER =
System.getProperty("cassandra.version", "4.0");
protected static final Map<String, Integer> VERSION_MAP = new
HashMap<String, Integer> ()
{{
put("3.0", MessagingService.VERSION_30);
put("4.0", MessagingService.VERSION_40);
- put("4.1", MessagingService.VERSION_41);
}};
protected static final boolean EXECUTE_WRITES =
Boolean.getBoolean("cassandra.test-serialization-writes");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
