This is an automated email from the ASF dual-hosted git repository. snazy pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 5f7c886 Merge branch 'cassandra-3.11' into trunk new 4f27a37 C* 3.0 sstables w/ UDTs are corrupted in C* 3.11 and 4.0 new ffab2b8 C* 3.0 sstables w/ UDTs are corrupted in C* 3.11 and 4.0 new 7a7eece Merge branch 'cassandra-3.11' into trunk The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt | 1 + NEWS.txt | 18 + src/java/org/apache/cassandra/cql3/CQL3Type.java | 4 +- .../apache/cassandra/db/SerializationHeader.java | 12 + .../org/apache/cassandra/db/SystemKeyspace.java | 2 + .../org/apache/cassandra/db/rows/AbstractCell.java | 15 +- .../org/apache/cassandra/db/rows/AbstractRow.java | 22 +- .../db/rows/AbstractTypeVersionComparator.java | 121 --- .../db/rows/ColumnMetadataVersionComparator.java | 85 ++ src/java/org/apache/cassandra/db/rows/Row.java | 2 +- src/java/org/apache/cassandra/db/rows/Rows.java | 2 +- .../cassandra/io/sstable/SSTableHeaderFix.java | 918 ++++++++++++++++++++ .../cassandra/io/sstable/format/SSTableReader.java | 5 + .../io/sstable/metadata/IMetadataSerializer.java | 5 + .../io/sstable/metadata/MetadataSerializer.java | 2 +- .../apache/cassandra/service/CassandraDaemon.java | 3 + .../apache/cassandra/tools/StandaloneScrubber.java | 144 ++- .../org/apache/cassandra/utils/FBUtilities.java | 12 + ...va => ColumnMetadataVersionComparatorTest.java} | 29 +- .../cassandra/io/sstable/SSTableHeaderFixTest.java | 964 +++++++++++++++++++++ .../schema/TupleTypesRepresentationTest.java | 403 +++++++++ 21 files changed, 2621 insertions(+), 148 deletions(-) delete mode 100644 src/java/org/apache/cassandra/db/rows/AbstractTypeVersionComparator.java create mode 100644 src/java/org/apache/cassandra/db/rows/ColumnMetadataVersionComparator.java create mode 100644 src/java/org/apache/cassandra/io/sstable/SSTableHeaderFix.java rename test/unit/org/apache/cassandra/db/rows/{AbstractTypeVersionComparatorTest.java => ColumnMetadataVersionComparatorTest.java} (71%) create mode 100644 test/unit/org/apache/cassandra/io/sstable/SSTableHeaderFixTest.java create mode 100644 test/unit/org/apache/cassandra/schema/TupleTypesRepresentationTest.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org