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 608a1b59e29b514ebf0ac77a2f59583c6a3478dc Merge: 09c7a3eff0 b23db408c5 Author: Stefan Miklosovic <[email protected]> AuthorDate: Wed Sep 24 10:22:52 2025 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../apache/cassandra/schema/KeyspaceMetadata.java | 3 +- .../cassandra/schema/KeyspaceMetadataTest.java | 45 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index d45662fa6e,c8ce598f49..b1d8bd0d7e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -310,17 -85,7 +310,18 @@@ Merged from 4.1 * Optionally skip exception logging on invalid legacy protocol magic exception (CASSANDRA-19483) * Fix SimpleClient ability to release acquired capacity (CASSANDRA-20202) * Fix WaitQueue.Signal.awaitUninterruptibly may block forever if invoking thread is interrupted (CASSANDRA-20084) + * Run audit_logging_options through santiation and validation on startup (CASSANDRA-20208) + * Enforce CQL message size limit on multiframe messages (CASSANDRA-20052) + * Fix race condition in DecayingEstimatedHistogramReservoir during rescale (CASSANDRA-19365) Merged from 4.0: ++ * Fixed incorrect error message constant for keyspace name length validation (CASSANDRA-20915) + * Prevent too long table names not fitting file names (CASSANDRA-20389) + * Update Jackson to 2.19.2 (CASSANDRA-20848) + * Update commons-lang3 to 3.18.0 (CASSANDRA-20849) + * Add NativeTransportMaxConcurrentConnectionsPerIp to StorageProxyMBean (CASSANDRA-20642) + * Make secondary index implementations notified about rows in fully expired SSTables in compaction (CASSANDRA-20829) + * Ensure prepared_statement INSERT timestamp precedes eviction DELETE (CASSANDRA-19703) + * Gossip doesn't converge due to race condition when updating EndpointStates multiple fields (CASSANDRA-20659) * Handle sstable metadata stats file getting a new mtime after compaction has finished (CASSANDRA-18119) * Honor MAX_PARALLEL_TRANSFERS correctly (CASSANDRA-20532) * Updating a column with a new TTL but same expiration time is non-deterministic and causes repair mismatches. (CASSANDRA-20561) diff --cc src/java/org/apache/cassandra/schema/KeyspaceMetadata.java index bfd0f54383,ae5a587b0f..703f1c0298 --- a/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java +++ b/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java @@@ -50,12 -42,11 +50,11 @@@ import org.apache.cassandra.tcm.seriali import org.apache.cassandra.schema.Tables.TablesDiff; import org.apache.cassandra.schema.Types.TypesDiff; import org.apache.cassandra.schema.Views.ViewsDiff; -import org.apache.cassandra.service.StorageService; - -import static java.lang.String.format; import static com.google.common.collect.Iterables.any; +import static java.lang.String.format; +import static org.apache.cassandra.db.TypeSizes.sizeof; - import static org.apache.cassandra.schema.SchemaConstants.TABLE_NAME_LENGTH; +import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; /** * An immutable representation of keyspace metadata (name, params, tables, types, and functions). --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
