This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
from f345370f35 Merge branch 'cassandra-5.0' into trunk new 9bfaee91c4 Optionally fail writes when SAI refuses to index a term value exceeding a configured maximum size new c33c8ebab4 Merge branch 'cassandra-5.0' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt | 1 + NEWS.txt | 1 + conf/cassandra.yaml | 12 + .../config/CassandraRelevantProperties.java | 3 - src/java/org/apache/cassandra/config/Config.java | 11 +- .../apache/cassandra/config/GuardrailsOptions.java | 84 +++++++ .../cassandra/cql3/statements/BatchStatement.java | 2 +- .../cql3/statements/BatchUpdatesCollector.java | 23 +- .../cassandra/cql3/statements/CQL3CasRequest.java | 2 +- .../cql3/statements/ModificationStatement.java | 2 +- .../statements/SingleTableUpdatesCollector.java | 6 +- .../cql3/statements/UpdatesCollector.java | 3 +- src/java/org/apache/cassandra/db/IMutation.java | 27 +- .../apache/cassandra/db/guardrails/Guardrails.java | 98 +++++++- .../cassandra/db/guardrails/GuardrailsConfig.java | 54 ++++ .../cassandra/db/guardrails/GuardrailsMBean.java | 72 ++++++ .../cassandra/db/partitions/PartitionUpdate.java | 5 +- .../cassandra/db/virtual/VirtualMutation.java | 3 +- src/java/org/apache/cassandra/index/Index.java | 5 +- .../org/apache/cassandra/index/IndexRegistry.java | 41 ++-- .../cassandra/index/SecondaryIndexManager.java | 7 +- .../cassandra/index/internal/CassandraIndex.java | 10 +- .../cassandra/index/sai/StorageAttachedIndex.java | 77 +++--- .../index/sai/disk/v1/SSTableIndexWriter.java | 2 +- .../index/sai/memory/TrieMemoryIndex.java | 2 +- .../index/sai/memory/VectorMemoryIndex.java | 2 +- .../org/apache/cassandra/index/sasi/SASIIndex.java | 4 +- .../paxos/uncommitted/PaxosUncommittedIndex.java | 4 +- .../cassandra/anttasks/TestNameCheckTask.java | 26 +- .../guardrails/GuardrailColumnValueSizeTest.java | 237 ++---------------- .../guardrails/GuardrailSaiFrozenTermSizeTest.java | 139 +++++++++++ .../guardrails/GuardrailSaiStringTermSizeTest.java | 215 ++++++++++++++++ .../guardrails/GuardrailSaiVectorTermSizeTest.java | 133 ++++++++++ .../db/guardrails/ValueThresholdTester.java | 273 +++++++++++++++++++++ .../unit/org/apache/cassandra/index/StubIndex.java | 4 +- .../index/internal/CustomCassandraIndex.java | 4 +- .../index/sai/cql/AllTypesSimpleEqTest.java | 9 +- .../index/sai/cql/StorageAttachedIndexDDLTest.java | 47 ---- 38 files changed, 1270 insertions(+), 380 deletions(-) create mode 100644 test/unit/org/apache/cassandra/db/guardrails/GuardrailSaiFrozenTermSizeTest.java create mode 100644 test/unit/org/apache/cassandra/db/guardrails/GuardrailSaiStringTermSizeTest.java create mode 100644 test/unit/org/apache/cassandra/db/guardrails/GuardrailSaiVectorTermSizeTest.java create mode 100644 test/unit/org/apache/cassandra/db/guardrails/ValueThresholdTester.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org