This is an automated email from the ASF dual-hosted git repository. blerer pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e087afee057b132927795864efbc625e4a9e1561 Merge: 2a1e537 c4fab93 Author: Benjamin Lerer <[email protected]> AuthorDate: Thu May 6 11:46:21 2021 +0200 Merge branch cassandra-4.0 into trunk CHANGES.txt | 1 + .../org/apache/cassandra/db/SystemKeyspace.java | 22 ++++-- .../apache/cassandra/db/commitlog/CommitLog.java | 10 ++- .../cassandra/db/commitlog/CommitLogReplayer.java | 23 ++++-- .../org/apache/cassandra/db/view/ViewBuilder.java | 2 +- .../cassandra/io/sstable/format/Version.java | 2 + .../cassandra/io/sstable/format/big/BigFormat.java | 13 +++- .../io/sstable/metadata/MetadataCollector.java | 25 ++++--- .../io/sstable/metadata/StatsMetadata.java | 32 +++++++++ .../apache/cassandra/service/StorageService.java | 4 +- src/java/org/apache/cassandra/utils/CounterId.java | 2 +- .../legacy_md_clust/md-1-big-CompressionInfo.db | Bin 0 -> 83 bytes .../legacy_tables/legacy_md_clust/md-1-big-Data.db | Bin 0 -> 5220 bytes .../legacy_md_clust/md-1-big-Digest.crc32 | 1 + .../legacy_md_clust/md-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_md_clust/md-1-big-Index.db | Bin 0 -> 157553 bytes .../legacy_md_clust/md-1-big-Statistics.db | Bin 0 -> 7134 bytes .../legacy_md_clust/md-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_tables/legacy_md_clust/md-1-big-TOC.txt | 8 +++ .../md-1-big-CompressionInfo.db | Bin 0 -> 83 bytes .../legacy_md_clust_compact/md-1-big-Data.db | Bin 0 -> 5262 bytes .../legacy_md_clust_compact/md-1-big-Digest.crc32 | 1 + .../legacy_md_clust_compact/md-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_md_clust_compact/md-1-big-Index.db | Bin 0 -> 157553 bytes .../legacy_md_clust_compact/md-1-big-Statistics.db | Bin 0 -> 7134 bytes .../legacy_md_clust_compact/md-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_md_clust_compact/md-1-big-TOC.txt | 8 +++ .../md-1-big-CompressionInfo.db | Bin 0 -> 75 bytes .../legacy_md_clust_counter/md-1-big-Data.db | Bin 0 -> 4526 bytes .../legacy_md_clust_counter/md-1-big-Digest.crc32 | 1 + .../legacy_md_clust_counter/md-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_md_clust_counter/md-1-big-Index.db | Bin 0 -> 157553 bytes .../legacy_md_clust_counter/md-1-big-Statistics.db | Bin 0 -> 7143 bytes .../legacy_md_clust_counter/md-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_md_clust_counter/md-1-big-TOC.txt | 8 +++ .../md-1-big-CompressionInfo.db | Bin 0 -> 75 bytes .../md-1-big-Data.db | Bin 0 -> 4533 bytes .../md-1-big-Digest.crc32 | 1 + .../md-1-big-Filter.db | Bin 0 -> 24 bytes .../md-1-big-Index.db | Bin 0 -> 157553 bytes .../md-1-big-Statistics.db | Bin 0 -> 7143 bytes .../md-1-big-Summary.db | Bin 0 -> 47 bytes .../md-1-big-TOC.txt | 8 +++ .../legacy_md_simple/md-1-big-CompressionInfo.db | Bin 0 -> 43 bytes .../legacy_md_simple/md-1-big-Data.db | Bin 0 -> 89 bytes .../legacy_md_simple/md-1-big-Digest.crc32 | 1 + .../legacy_md_simple/md-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_md_simple/md-1-big-Index.db | Bin 0 -> 26 bytes .../legacy_md_simple/md-1-big-Statistics.db | Bin 0 -> 4687 bytes .../legacy_md_simple/md-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_md_simple/md-1-big-TOC.txt | 8 +++ .../md-1-big-CompressionInfo.db | Bin 0 -> 43 bytes .../legacy_md_simple_compact/md-1-big-Data.db | Bin 0 -> 91 bytes .../legacy_md_simple_compact/md-1-big-Digest.crc32 | 1 + .../legacy_md_simple_compact/md-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_md_simple_compact/md-1-big-Index.db | Bin 0 -> 26 bytes .../md-1-big-Statistics.db | Bin 0 -> 4728 bytes .../legacy_md_simple_compact/md-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_md_simple_compact/md-1-big-TOC.txt | 8 +++ .../md-1-big-CompressionInfo.db | Bin 0 -> 43 bytes .../legacy_md_simple_counter/md-1-big-Data.db | Bin 0 -> 110 bytes .../legacy_md_simple_counter/md-1-big-Digest.crc32 | 1 + .../legacy_md_simple_counter/md-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_md_simple_counter/md-1-big-Index.db | Bin 0 -> 27 bytes .../md-1-big-Statistics.db | Bin 0 -> 4696 bytes .../legacy_md_simple_counter/md-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_md_simple_counter/md-1-big-TOC.txt | 8 +++ .../md-1-big-CompressionInfo.db | Bin 0 -> 43 bytes .../md-1-big-Data.db | Bin 0 -> 112 bytes .../md-1-big-Digest.crc32 | 1 + .../md-1-big-Filter.db | Bin 0 -> 24 bytes .../md-1-big-Index.db | Bin 0 -> 27 bytes .../md-1-big-Statistics.db | Bin 0 -> 4737 bytes .../md-1-big-Summary.db | Bin 0 -> 47 bytes .../md-1-big-TOC.txt | 8 +++ .../legacy_me_clust/me-1-big-CompressionInfo.db | Bin 0 -> 83 bytes .../legacy_tables/legacy_me_clust/me-1-big-Data.db | Bin 0 -> 5239 bytes .../legacy_me_clust/me-1-big-Digest.crc32 | 1 + .../legacy_me_clust/me-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_me_clust/me-1-big-Index.db | Bin 0 -> 157553 bytes .../legacy_me_clust/me-1-big-Statistics.db | Bin 0 -> 7151 bytes .../legacy_me_clust/me-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_tables/legacy_me_clust/me-1-big-TOC.txt | 8 +++ .../me-1-big-CompressionInfo.db | Bin 0 -> 83 bytes .../legacy_me_clust_compact/me-1-big-Data.db | Bin 0 -> 5258 bytes .../legacy_me_clust_compact/me-1-big-Digest.crc32 | 1 + .../legacy_me_clust_compact/me-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_me_clust_compact/me-1-big-Index.db | Bin 0 -> 157553 bytes .../legacy_me_clust_compact/me-1-big-Statistics.db | Bin 0 -> 7151 bytes .../legacy_me_clust_compact/me-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_me_clust_compact/me-1-big-TOC.txt | 8 +++ .../me-1-big-CompressionInfo.db | Bin 0 -> 75 bytes .../legacy_me_clust_counter/me-1-big-Data.db | Bin 0 -> 4529 bytes .../legacy_me_clust_counter/me-1-big-Digest.crc32 | 1 + .../legacy_me_clust_counter/me-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_me_clust_counter/me-1-big-Index.db | Bin 0 -> 157553 bytes .../legacy_me_clust_counter/me-1-big-Statistics.db | Bin 0 -> 7160 bytes .../legacy_me_clust_counter/me-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_me_clust_counter/me-1-big-TOC.txt | 8 +++ .../me-1-big-CompressionInfo.db | Bin 0 -> 75 bytes .../me-1-big-Data.db | Bin 0 -> 4532 bytes .../me-1-big-Digest.crc32 | 1 + .../me-1-big-Filter.db | Bin 0 -> 24 bytes .../me-1-big-Index.db | Bin 0 -> 157553 bytes .../me-1-big-Statistics.db | Bin 0 -> 7160 bytes .../me-1-big-Summary.db | Bin 0 -> 47 bytes .../me-1-big-TOC.txt | 8 +++ .../legacy_me_simple/me-1-big-CompressionInfo.db | Bin 0 -> 43 bytes .../legacy_me_simple/me-1-big-Data.db | Bin 0 -> 88 bytes .../legacy_me_simple/me-1-big-Digest.crc32 | 1 + .../legacy_me_simple/me-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_me_simple/me-1-big-Index.db | Bin 0 -> 26 bytes .../legacy_me_simple/me-1-big-Statistics.db | Bin 0 -> 4704 bytes .../legacy_me_simple/me-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_me_simple/me-1-big-TOC.txt | 8 +++ .../me-1-big-CompressionInfo.db | Bin 0 -> 43 bytes .../legacy_me_simple_compact/me-1-big-Data.db | Bin 0 -> 90 bytes .../legacy_me_simple_compact/me-1-big-Digest.crc32 | 1 + .../legacy_me_simple_compact/me-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_me_simple_compact/me-1-big-Index.db | Bin 0 -> 26 bytes .../me-1-big-Statistics.db | Bin 0 -> 4745 bytes .../legacy_me_simple_compact/me-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_me_simple_compact/me-1-big-TOC.txt | 8 +++ .../me-1-big-CompressionInfo.db | Bin 0 -> 43 bytes .../legacy_me_simple_counter/me-1-big-Data.db | Bin 0 -> 110 bytes .../legacy_me_simple_counter/me-1-big-Digest.crc32 | 1 + .../legacy_me_simple_counter/me-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_me_simple_counter/me-1-big-Index.db | Bin 0 -> 27 bytes .../me-1-big-Statistics.db | Bin 0 -> 4713 bytes .../legacy_me_simple_counter/me-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_me_simple_counter/me-1-big-TOC.txt | 8 +++ .../me-1-big-CompressionInfo.db | Bin 0 -> 43 bytes .../me-1-big-Data.db | Bin 0 -> 111 bytes .../me-1-big-Digest.crc32 | 1 + .../me-1-big-Filter.db | Bin 0 -> 24 bytes .../me-1-big-Index.db | Bin 0 -> 27 bytes .../me-1-big-Statistics.db | Bin 0 -> 4754 bytes .../me-1-big-Summary.db | Bin 0 -> 47 bytes .../me-1-big-TOC.txt | 8 +++ .../legacy_nb_clust/nb-1-big-CompressionInfo.db | Bin 0 -> 207 bytes .../legacy_tables/legacy_nb_clust/nb-1-big-Data.db | Bin 0 -> 8739 bytes .../legacy_nb_clust/nb-1-big-Digest.crc32 | 1 + .../legacy_nb_clust/nb-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_nb_clust/nb-1-big-Index.db | Bin 0 -> 157553 bytes .../legacy_nb_clust/nb-1-big-Statistics.db | Bin 0 -> 7177 bytes .../legacy_nb_clust/nb-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_tables/legacy_nb_clust/nb-1-big-TOC.txt | 8 +++ .../nb-1-big-CompressionInfo.db | Bin 0 -> 199 bytes .../legacy_nb_clust_counter/nb-1-big-Data.db | Bin 0 -> 7779 bytes .../legacy_nb_clust_counter/nb-1-big-Digest.crc32 | 1 + .../legacy_nb_clust_counter/nb-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_nb_clust_counter/nb-1-big-Index.db | Bin 0 -> 157553 bytes .../legacy_nb_clust_counter/nb-1-big-Statistics.db | Bin 0 -> 7186 bytes .../legacy_nb_clust_counter/nb-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_nb_clust_counter/nb-1-big-TOC.txt | 8 +++ .../legacy_nb_simple/nb-1-big-CompressionInfo.db | Bin 0 -> 47 bytes .../legacy_nb_simple/nb-1-big-Data.db | Bin 0 -> 89 bytes .../legacy_nb_simple/nb-1-big-Digest.crc32 | 1 + .../legacy_nb_simple/nb-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_nb_simple/nb-1-big-Index.db | Bin 0 -> 26 bytes .../legacy_nb_simple/nb-1-big-Statistics.db | Bin 0 -> 4730 bytes .../legacy_nb_simple/nb-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_nb_simple/nb-1-big-TOC.txt | 8 +++ .../nb-1-big-CompressionInfo.db | Bin 0 -> 47 bytes .../legacy_nb_simple_counter/nb-1-big-Data.db | Bin 0 -> 141 bytes .../legacy_nb_simple_counter/nb-1-big-Digest.crc32 | 1 + .../legacy_nb_simple_counter/nb-1-big-Filter.db | Bin 0 -> 24 bytes .../legacy_nb_simple_counter/nb-1-big-Index.db | Bin 0 -> 27 bytes .../nb-1-big-Statistics.db | Bin 0 -> 4739 bytes .../legacy_nb_simple_counter/nb-1-big-Summary.db | Bin 0 -> 47 bytes .../legacy_nb_simple_counter/nb-1-big-TOC.txt | 8 +++ .../test/metrics/StreamingMetricsTest.java | 13 +++- .../cassandra/db/RecoveryManagerFlushedTest.java | 4 ++ .../apache/cassandra/db/SystemKeyspaceTest.java | 4 +- .../cassandra/db/commitlog/CommitLogTest.java | 3 + .../org/apache/cassandra/gms/ShadowRoundTest.java | 4 +- .../cassandra/io/sstable/LegacySSTableTest.java | 4 +- .../sstable/metadata/MetadataSerializerTest.java | 80 ++++++++++----------- 178 files changed, 355 insertions(+), 73 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
