This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f8c240147c307bf5c527ff3a34e3c0f3043b7e9c Merge: f5fba9b702 b59b832eba Author: Stefan Miklosovic <[email protected]> AuthorDate: Thu Oct 26 22:39:01 2023 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../pages/developing/cql/cql_singlefile.adoc | 16 ++++---- .../cassandra/pages/developing/cql/ddl.adoc | 3 -- .../pages/managing/operating/compression.adoc | 17 ++++++--- .../cql3/statements/schema/TableAttributes.java | 24 ++---------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 1 + .../cassandra/io/sstable/format/SSTableReader.java | 1 - .../io/sstable/format/SortedTableWriter.java | 4 ++ .../format/big/BigSSTableReaderLoadingBuilder.java | 5 ++- .../format/bti/BtiTableReaderLoadingBuilder.java | 9 ++++- .../cassandra/io/util/CompressedChunkReader.java | 19 ++++++---- .../org/apache/cassandra/io/util/FileHandle.java | 12 +++++- .../apache/cassandra/schema/CompressionParams.java | 44 ---------------------- .../apache/cassandra/schema/TableMetadataRef.java | 1 - .../miscellaneous/CrcCheckChanceTest.java | 38 +++---------------- 15 files changed, 68 insertions(+), 127 deletions(-) diff --cc CHANGES.txt index 60c5d91aaa,53d2205a18..69d3e456c9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -5.0-alpha2 +5.1 + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Remove crc_check_chance from CompressionParams (CASSANDRA-18872) * Fix schema loading of UDTs inside vectors inside UDTs (CASSANDRA-18964) * Add cqlsh autocompletion for the vector data type (CASSANDRA-18946) * Fix nodetool tablehistograms output to avoid printing repeated information and ensure at most two arguments (CASSANDRA-18955) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
