This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c2c20ab8430246c38e375966c1c8c9d9e10dec23 Merge: 7d3a8d5312 57f494d8d4 Author: Jacek Lewandowski <[email protected]> AuthorDate: Thu Oct 19 12:56:10 2023 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Fixed the inconsistency between distributedKeyspaces and distributedAndLocalKeyspaces CHANGES.txt | 2 + .../cql3/statements/DescribeStatement.java | 3 +- .../statements/schema/CreateTableStatement.java | 1 - src/java/org/apache/cassandra/db/Keyspace.java | 7 +-- .../cassandra/db/compaction/CompactionManager.java | 2 +- .../org/apache/cassandra/dht/BootStrapper.java | 2 +- .../index/sai/virtual/ColumnIndexesSystemView.java | 9 ++- .../sai/virtual/SSTableIndexesSystemView.java | 11 ++-- .../index/sai/virtual/SegmentsSystemView.java | 9 ++- .../org/apache/cassandra/metrics/TableMetrics.java | 2 +- .../repair/consistent/admin/SchemaArgsParser.java | 2 +- src/java/org/apache/cassandra/schema/Schema.java | 65 +++++++--------------- .../org/apache/cassandra/schema/SchemaEvent.java | 4 +- .../service/PendingRangeCalculatorService.java | 2 +- .../apache/cassandra/service/StorageService.java | 42 +++++++------- .../org/apache/cassandra/dht/BootStrapperTest.java | 2 +- .../cassandra/locator/SimpleStrategyTest.java | 4 +- .../cassandra/schema/SchemaKeyspaceTest.java | 2 +- .../org/apache/cassandra/schema/SchemaTest.java | 2 +- .../cassandra/service/LeaveAndBootstrapTest.java | 4 +- .../org/apache/cassandra/service/MoveTest.java | 4 +- 21 files changed, 77 insertions(+), 104 deletions(-) diff --cc CHANGES.txt index 0a8684d7d6,89d1163f83..ed18ef6962 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -51,24 -47,6 +52,25 @@@ Merged from 3.0 * Remove commitlog_sync_batch_window_in_ms (CASSANDRA-17161) * Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696) * Add guardrail for vector dimensions (CASSANDRA-18730) +Merged from 4.1: ++ * Fixed the inconsistency between distributedKeyspaces and distributedAndLocalKeyspaces (CASSANDRA-18747) + * Waiting indefinitely on ReceivedMessage response in StreamSession#receive() can cause deadlock (CASSANDRA-18733) + * Allow empty keystore_password in encryption_options (CASSANDRA-18778) +Merged from 4.0: + * JMH improvements - faster build and async profiler (CASSANDRA-18871) +Merged from 3.11: + * Fix NPE when using udfContext in UDF after a restart of a node (CASSANDRA-18739) +Merged from 3.0: + * Add cqlshrc.sample and credentials.sample into Debian package (CASSANDRA-18818) + * Refactor validation logic in StorageService.rebuild (CASSANDRA-18803) + * Make alternation of a user type validate the same way as creation of a user type does (CASSANDRA-18585) + * Fix missing speculative retries in tablestats (CASSANDRA-18767) + * Fix Requires for Java for RPM package (CASSANDRA-18751) + * Fix CQLSH online help topic link (CASSANDRA-17534) + * Remove unused suppressions (CASSANDRA-18724) + + +5.0 * Upgraded Netty to 4.1.96, added BouncyCastle dependency (CASSANDRA-17992) * Fix for (unsupported) big endian unaligned architecture, eg s390x (CASSANDRA-17723) * CIDR filtering authorizer (CASSANDRA-18592) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
