This is an automated email from the ASF dual-hosted git repository.

michaelsembwever pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit e4d83b3bb74c4c9be3c8e5e1119709d1aa585eb7
Merge: 6ae5ef8b90 35d6f8c816
Author: mck <[email protected]>
AuthorDate: Sat Sep 5 11:27:17 2026 +0200

    Merge branch 'cassandra-6.0' into trunk
    
    * cassandra-6.0:
      Guardrail values of zero to mean literally zero

 CHANGES.txt                                        |   1 +
 NEWS.txt                                           |   6 +
 .../apache/cassandra/config/GuardrailsOptions.java | 100 +++++++----------
 .../cassandra/db/guardrails/MaxThreshold.java      |   4 +-
 .../cassandra/db/guardrails/MinThreshold.java      |   4 +-
 .../apache/cassandra/db/guardrails/Threshold.java  |   4 +-
 .../cassandra/config/GuardrailsOptionsTest.java    |  84 ++++++++++++++
 .../db/guardrails/GuardrailDiskUsageTest.java      |   5 +-
 .../GuardrailMaximumReplicationFactorTest.java     |   8 ++
 .../GuardrailMinimumReplicationFactorTest.java     |   4 +-
 .../cassandra/db/guardrails/GuardrailsTest.java    | 124 +++++++++++++++++++++
 .../cassandra/db/guardrails/ThresholdTester.java   |  35 ++++--
 12 files changed, 301 insertions(+), 78 deletions(-)

diff --cc CHANGES.txt
index f9a4b2f709,1d76b58868..cb0ad13a74
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -6.0-alpha3
 +7.0
 + * Reject LIKE patterns with a wildcard (%) anywhere other than the start or 
end (CASSANDRA-21068)
 + * Support pluggable default role initialization (CASSANDRA-21546)
 + * Add prepared statement cache stats to nodetool info (CASSANDRA-14366)
 + * Don't increment client metrics on messaging service connection unpause 
(CASSANDRA-21491)
 + * Add nodetool getreplicas (CASSANDRA-17665)
 + * Implementation of CEP-49: Hardware-accelerated compression 
(CASSANDRA-20975)
 + * Avoid using ObjectUtils.getFirstNonNull in Schema (CASSANDRA-21394)
 + * Allow nodetool garbagecollect to take a user defined list of SSTables 
(CASSANDRA-16767)
 + * Add a guardrail for misprepared statements (CASSANDRA-21139)
 +Merged from 6.0:
+  * Guardrail configurations of zero are now treated as zero instead of 
unlimited (CASSANDRA-21517)
   * Support multi-cell columns in cursor compaction (CASSANDRA-21463)
   * Optimize authorization logic for BatchStatement and TransactionStatement 
when a single table is updated (CASSANDRA-21606)
   * Upgrade lz4-java to 1.11.2 (CASSANDRA-21564)
diff --cc NEWS.txt
index 9d6a2c6e93,6f7d088eff..0032736c90
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -234,8 -204,13 +234,14 @@@ Upgradin
      for more information.
      - system_views.settings virtual table output changed to json for 
collections, set system property
      `cassandra.virtual_table_complex_settings_format_json` to false to 
disable (defaults to true).
+     - Authorizing a batch or an Accord transaction now performs the table 
permission checks once per run of
+     consecutive statements on the same table rather than once per statement. 
The permissions required are
+     unchanged, and the datacenter and CIDR checks that ride along with them 
still run at least once per
+     request. Auth cache request/hit/miss counts and the 
system_views.cidr_filtering_metrics_* counts and
+     latencies will therefore report fewer events than before. (see 
CASSANDRA-21606)
+     - Guardrail configurations of zero are now treated as zero instead of 
unlimited. See CASSANDRA-21517.
  
 +
  Deprecation
  -----------
      - `use_deterministic_table_id` is no longer supported and should be 
removed from cassandra.yaml. Table IDs may still be supplied explicitly on 
CREATE.


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to