(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit e7cf38b5de6f804ce121e7a676576135db0c4bb1 Merge: d1dd9cb4af e801d13d50 Author: Mick Semb Wever AuthorDate: Wed Jul 3 15:07:17 2024 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Prepare debian changelog for 5.0-rc1 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 d1dd9cb4afa785b1466f610686d0840020ec666c Merge: b25995fc44 a9d6900d44 Author: Stefan Miklosovic AuthorDate: Wed Jul 3 09:26:12 2024 +0200 Merge branch 'cassandra-5.0' into trunk .build/cassandra-build-deps-template.xml | 12 .build/cassandra-deps-template.xml | 4 .build/parent-pom-template.xml | 15 ++- CHANGES.txt | 1 + 4 files changed, 27 insertions(+), 5 deletions(-) diff --cc CHANGES.txt index fd8561af1a,77689676b0..0011fbd995 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,55 -1,5 +1,56 @@@ -5.0-rc1 +5.1 + * Reconfigure CMS after replacement, bootstrap and move operations (CASSANDRA-19705) + * Support querying LocalStrategy tables with any partitioner (CASSANDRA-19692) + * Relax slow_query_log_timeout for MultiNodeSAITest (CASSANDRA-19693) + * Audit Log entries are missing identity for mTLS connections (CASSANDRA-19669) + * Add support for the BETWEEN operator in WHERE clauses (CASSANDRA-19604) + * Replace Stream iteration with for-loop for SimpleRestriction::bindAndGetClusteringElements (CASSANDRA-19679) + * Consolidate logging on trace level (CASSANDRA-19632) + * Expand DDL statements on coordinator before submission to the CMS (CASSANDRA-19592) + * Fix number of arguments of String.format() in various classes (CASSANDRA-19645) + * Remove unused fields from config (CASSANDRA-19599) + * Refactor Relation and Restriction hierarchies (CASSANDRA-19341) + * Raise priority of TCM internode messages during critical operations (CASSANDRA-19517) + * Add nodetool command to unregister LEFT nodes (CASSANDRA-19581) + * Add cluster metadata id to gossip syn messages (CASSANDRA-19613) + * Reduce heap usage occupied by the metrics (CASSANDRA-19567) + * Improve handling of transient replicas during range movements (CASSANDRA-19344) + * Enable debounced internode log requests to be cancelled at shutdown (CASSANDRA-19514) + * Correctly set last modified epoch when combining multistep operations into a single step (CASSANDRA-19538) + * Add new TriggersPolicy configuration to allow operators to disable triggers (CASSANDRA-19532) + * Use Transformation.Kind.id in local and distributed log tables (CASSANDRA-19516) + * Remove period field from ClusterMetadata and metadata log tables (CASSANDRA-19482) + * Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486) + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b25995fc44dd676f3e6e69a44331d5c9b0c0b293 Merge: cbe07fd57e 1bec8b99ca Author: Caleb Rackliffe AuthorDate: Tue Jul 2 14:41:01 2024 -0500 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: UnsupportedOperationException when reducing scope for LCS compactions CHANGES.txt| 1 + .../db/compaction/LeveledCompactionTask.java | 2 +- .../test/LeveledCompactionTaskTest.java| 94 ++ 3 files changed, 96 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index e37528d201,56e6cbd4a5..fd8561af1a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -99,11 -48,14 +99,12 @@@ Merged from 4.1 * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: + * UnsupportedOperationException when reducing scope for LCS compactions (CASSANDRA-19704) * Make LWT conditions behavior on frozen and non-frozen columns consistent for null column values (CASSANDRA-19637) - * Add timeout specifically for bootstrapping nodes (CASSANDRA-15439) - * Bring Redhat packge dirs/ownership/perms in line with Debian package (CASSANDRA-19565) + * Bring Redhat package dirs/ownership/perms in line with Debian package (CASSANDRA-19565) * Make nodetool import congruent with the documentation by not relying on the folder structure of the imported SSTable files (CASSANDRA-19401) * IR may leak SSTables with pending repair when coming from streaming (CASSANDRA-19182) * Streaming exception race creates corrupt transaction log files that prevent restart (CASSANDRA-18736) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 0b14eb1f8a594a6379d94c22f65a46de202a4cd3 Merge: 6263fb3a64 37f6a5de20 Author: Stefan Miklosovic AuthorDate: Tue Jul 2 00:19:40 2024 +0200 Merge branch 'cassandra-5.0' into trunk .build/build-owasp.xml | 2 +- CHANGES.txt| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bdeggleston pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6263fb3a64d5dcbe7deec91ca92c9f60f8673dfd Merge: 487f59e66c 732fb758c6 Author: Blake Eggleston AuthorDate: Mon Jul 1 10:32:32 2024 -0700 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Use OpOrder in repairIterator to ensure we don't lose memtables mid-paxos repair CHANGES.txt| 1 + .../paxos/uncommitted/PaxosUncommittedIndex.java | 28 -- 2 files changed, 17 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch cassandra-5.0 into trunk
This is an automated email from the ASF dual-hosted git repository.
blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit beecd5c401f18f2a26147bda223b027b8bc467cb
Merge: 7f1c0e9e76 43d99c2259
Author: Benjamin Lerer
AuthorDate: Thu Jun 27 13:36:16 2024 +0200
Merge branch cassandra-5.0 into trunk
CHANGES.txt| 3 +-
.../cassandra/cql3/conditions/ColumnCondition.java | 17 +-
.../cassandra/db/marshal/CollectionType.java | 7 +
.../cql3/conditions/ColumnConditionTest.java | 667 +++--
.../InsertUpdateIfConditionCollectionsTest.java| 173 +-
5 files changed, 528 insertions(+), 339 deletions(-)
diff --cc CHANGES.txt
index fa35459efb,95ee1c9979..22502533e9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -97,10 -47,13 +97,11 @@@ Merged from 4.1
* Fix hints delivery for a node going down repeatedly (CASSANDRA-19495)
* Do not go to disk for reading hints file sizes (CASSANDRA-19477)
* Fix system_views.settings to handle array types (CASSANDRA-19475)
- * Memoize Cassandra verion and add a backoff interval for failed schema
pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
- * Bring Redhat packge dirs/ownership/perms in line with Debian package
(CASSANDRA-19565)
+ * Make LWT conditions behavior on frozen and non-frozen columns consistent
for null column values (CASSANDRA-19637)
- * Add timeout specifically for bootstrapping nodes (CASSANDRA-15439)
- * Bring Redhat packge dirs/ownership/perms in line with Debian package
(CASSANDRA-19565)
++ * Bring Redhat package dirs/ownership/perms in line with Debian package
(CASSANDRA-19565)
* Make nodetool import congruent with the documentation by not relying on
the folder structure of the imported SSTable files (CASSANDRA-19401)
* IR may leak SSTables with pending repair when coming from streaming
(CASSANDRA-19182)
* Streaming exception race creates corrupt transaction log files that
prevent restart (CASSANDRA-18736)
diff --cc src/java/org/apache/cassandra/cql3/conditions/ColumnCondition.java
index 88d54dd79d,2f6a9c572c..542ed38e31
--- a/src/java/org/apache/cassandra/cql3/conditions/ColumnCondition.java
+++ b/src/java/org/apache/cassandra/cql3/conditions/ColumnCondition.java
@@@ -464,10 -467,10 +465,10 @@@ public abstract class ColumnConditio
CollectionType type = (CollectionType) column.type;
// copy iterator contents so that we can properly reuse them for
each comparison with an IN value
-for (Term.Terminal value : values)
+for (Term.Terminal value : values.asList())
{
Iterator> iter = getCells(row, column);
- if (value == null)
-if (value == null || ((!comparisonOperator.isContains() &&
!comparisonOperator.isContainsKey()) && isEmpty(type, value)))
++if (value == null ||
(comparisonOperator.appliesToColumnValues() && isEmpty(value)))
{
if (comparisonOperator == Operator.EQ)
{
@@@ -488,13 -494,27 +492,18 @@@
return false;
}
-private boolean isEmpty(CollectionType type, Terminal value)
++private boolean isEmpty(Term.Terminal value)
+ {
-switch (type.kind)
-{
-case LIST:
-return ((Lists.Value) value).elements.isEmpty();
-case SET:
-return ((Sets.Value) value).elements.isEmpty();
-case MAP:
-return ((Maps.Value) value).map.isEmpty();
-}
-throw new AssertionError();
++return value.getElements().isEmpty();
+ }
+
private static boolean valueAppliesTo(CollectionType type,
Iterator> iter, Term.Terminal value, Operator operator)
{
- if (value == null)
- return !iter.hasNext();
+ if (!iter.hasNext() && operator != Operator.NEQ)
+ return false;
-if(operator.isContains() || operator.isContainsKey())
-return containsAppliesTo(type, iter,
value.get(ProtocolVersion.CURRENT), operator);
+if(operator == Operator.CONTAINS || operator ==
Operator.CONTAINS_KEY)
+return containsAppliesTo(type, iter, value.get(), operator);
switch (type.kind)
{
diff --cc
test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java
index 40e5516cf3,b5eb90e838..c372254c63
--- a/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java
+++ b/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java
@@@ -24,9 -24,6 +24,10 @@@ import org.junit.Assert
import org.junit.Test;
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c713132aa6c20305a4a0157e9246057925ccbf78 Merge: a83213c4d8 b43f0b2e9f Author: Mick Semb Wever AuthorDate: Fri Jun 21 17:08:20 2024 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Prepare debian changelog for 5.0-rc1 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a83213c4d862e368389e43ee1192578a8fb5a6ab Merge: 3f780d5650 410cce16b8 Author: Mick Semb Wever AuthorDate: Fri Jun 21 16:08:18 2024 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Increment version to 5.0-rc1 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 3f780d56507afc410c98ae079c1a0abd9093dc29 Merge: b5cc1fa358 cfdeef43b3 Author: Brandon Williams AuthorDate: Thu Jun 20 13:44:15 2024 -0500 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b5cc1fa358d9097642ae69b58fae1e56bd63e094 Merge: 7627cfde02 ba5ab993c7 Author: Caleb Rackliffe AuthorDate: Thu Jun 20 11:15:13 2024 -0500 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Avoid streams in the common case for UpdateTransaction creation CHANGES.txt| 1 + .../cassandra/index/SecondaryIndexManager.java | 110 + 2 files changed, 72 insertions(+), 39 deletions(-) diff --cc CHANGES.txt index 1a4c4b2441,8c7e925aca..fa35459efb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,54 -1,5 +1,55 @@@ -5.0-beta2 +5.1 + * Support querying LocalStrategy tables with any partitioner (CASSANDRA-19692) + * Relax slow_query_log_timeout for MultiNodeSAITest (CASSANDRA-19693) + * Audit Log entries are missing identity for mTLS connections (CASSANDRA-19669) + * Add support for the BETWEEN operator in WHERE clauses (CASSANDRA-19604) + * Replace Stream iteration with for-loop for SimpleRestriction::bindAndGetClusteringElements (CASSANDRA-19679) + * Consolidate logging on trace level (CASSANDRA-19632) + * Expand DDL statements on coordinator before submission to the CMS (CASSANDRA-19592) + * Fix number of arguments of String.format() in various classes (CASSANDRA-19645) + * Remove unused fields from config (CASSANDRA-19599) + * Refactor Relation and Restriction hierarchies (CASSANDRA-19341) + * Raise priority of TCM internode messages during critical operations (CASSANDRA-19517) + * Add nodetool command to unregister LEFT nodes (CASSANDRA-19581) + * Add cluster metadata id to gossip syn messages (CASSANDRA-19613) + * Reduce heap usage occupied by the metrics (CASSANDRA-19567) + * Improve handling of transient replicas during range movements (CASSANDRA-19344) + * Enable debounced internode log requests to be cancelled at shutdown (CASSANDRA-19514) + * Correctly set last modified epoch when combining multistep operations into a single step (CASSANDRA-19538) + * Add new TriggersPolicy configuration to allow operators to disable triggers (CASSANDRA-19532) + * Use Transformation.Kind.id in local and distributed log tables (CASSANDRA-19516) + * Remove period field from ClusterMetadata and metadata log tables (CASSANDRA-19482) + * Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486) + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Avoid streams in the common case for
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7627cfde02f4c2b0502a8992b7924e0b5c72268f Merge: 63648c1e86 3d878201fb Author: Brandon Williams AuthorDate: Wed Jun 19 06:03:01 2024 -0500 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/transport/Server.java | 10 ++ 2 files changed, 11 insertions(+) diff --cc CHANGES.txt index 19a62ea12f,1396600720..1a4c4b2441 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,54 -1,5 +1,55 @@@ -5.0-beta2 +5.1 + * Support querying LocalStrategy tables with any partitioner (CASSANDRA-19692) + * Relax slow_query_log_timeout for MultiNodeSAITest (CASSANDRA-19693) + * Audit Log entries are missing identity for mTLS connections (CASSANDRA-19669) + * Add support for the BETWEEN operator in WHERE clauses (CASSANDRA-19604) + * Replace Stream iteration with for-loop for SimpleRestriction::bindAndGetClusteringElements (CASSANDRA-19679) + * Consolidate logging on trace level (CASSANDRA-19632) + * Expand DDL statements on coordinator before submission to the CMS (CASSANDRA-19592) + * Fix number of arguments of String.format() in various classes (CASSANDRA-19645) + * Remove unused fields from config (CASSANDRA-19599) + * Refactor Relation and Restriction hierarchies (CASSANDRA-19341) + * Raise priority of TCM internode messages during critical operations (CASSANDRA-19517) + * Add nodetool command to unregister LEFT nodes (CASSANDRA-19581) + * Add cluster metadata id to gossip syn messages (CASSANDRA-19613) + * Reduce heap usage occupied by the metrics (CASSANDRA-19567) + * Improve handling of transient replicas during range movements (CASSANDRA-19344) + * Enable debounced internode log requests to be cancelled at shutdown (CASSANDRA-19514) + * Correctly set last modified epoch when combining multistep operations into a single step (CASSANDRA-19538) + * Add new TriggersPolicy configuration to allow operators to disable triggers (CASSANDRA-19532) + * Use Transformation.Kind.id in local and distributed log tables (CASSANDRA-19516) + * Remove period field from ClusterMetadata and metadata log tables (CASSANDRA-19482) + * Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486) + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Only wait until native_transport_timeout for dispatcher to finish (CASSANDRA-19697) * Disable chronicle analytics (CASSANDRA-19656) * Replace Stream iteration
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a09ab6313cab4babf7d09e80b26b3659b3e7189a Merge: 18ec9f77bc 531de93369 Author: Brandon Williams AuthorDate: Tue Jun 11 13:11:11 2024 -0500 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + conf/jvm-server.options | 3 +++ src/java/org/apache/cassandra/config/CassandraRelevantProperties.java | 1 + src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 ++ 4 files changed, 7 insertions(+) diff --cc CHANGES.txt index f762f1e81b,f3bcf42bbe..6670601f06 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,53 -1,5 +1,54 @@@ -5.0-beta2 +5.1 + * Relax slow_query_log_timeout for MultiNodeSAITest (CASSANDRA-19693) + * Audit Log entries are missing identity for mTLS connections (CASSANDRA-19669) + * Add support for the BETWEEN operator in WHERE clauses (CASSANDRA-19604) + * Replace Stream iteration with for-loop for SimpleRestriction::bindAndGetClusteringElements (CASSANDRA-19679) + * Consolidate logging on trace level (CASSANDRA-19632) + * Expand DDL statements on coordinator before submission to the CMS (CASSANDRA-19592) + * Fix number of arguments of String.format() in various classes (CASSANDRA-19645) + * Remove unused fields from config (CASSANDRA-19599) + * Refactor Relation and Restriction hierarchies (CASSANDRA-19341) + * Raise priority of TCM internode messages during critical operations (CASSANDRA-19517) + * Add nodetool command to unregister LEFT nodes (CASSANDRA-19581) + * Add cluster metadata id to gossip syn messages (CASSANDRA-19613) + * Reduce heap usage occupied by the metrics (CASSANDRA-19567) + * Improve handling of transient replicas during range movements (CASSANDRA-19344) + * Enable debounced internode log requests to be cancelled at shutdown (CASSANDRA-19514) + * Correctly set last modified epoch when combining multistep operations into a single step (CASSANDRA-19538) + * Add new TriggersPolicy configuration to allow operators to disable triggers (CASSANDRA-19532) + * Use Transformation.Kind.id in local and distributed log tables (CASSANDRA-19516) + * Remove period field from ClusterMetadata and metadata log tables (CASSANDRA-19482) + * Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486) + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Disable chronicle analytics (CASSANDRA-19656) * Replace Stream
(cassandra) 01/01: Merge branch cassandra-5.0 into trunk
This is an automated email from the ASF dual-hosted git repository. blerer pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b0211ea6490aaa885329234aae4d3d180752d35f Merge: bb68141861 636ffad069 Author: Benjamin Lerer AuthorDate: Tue Jun 11 15:32:31 2024 +0200 Merge branch cassandra-5.0 into trunk CHANGES.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 69289806fa,ffaeeaa61e..0db0b5d2a9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,53 -1,4 +1,53 @@@ -5.0-beta2 ++<<< HEAD +5.1 + * Audit Log entries are missing identity for mTLS connections (CASSANDRA-19669) + * Add support for the BETWEEN operator in WHERE clauses (CASSANDRA-19604) + * Replace Stream iteration with for-loop for SimpleRestriction::bindAndGetClusteringElements (CASSANDRA-19679) + * Consolidate logging on trace level (CASSANDRA-19632) + * Expand DDL statements on coordinator before submission to the CMS (CASSANDRA-19592) + * Fix number of arguments of String.format() in various classes (CASSANDRA-19645) + * Remove unused fields from config (CASSANDRA-19599) + * Refactor Relation and Restriction hierarchies (CASSANDRA-19341) + * Raise priority of TCM internode messages during critical operations (CASSANDRA-19517) + * Add nodetool command to unregister LEFT nodes (CASSANDRA-19581) + * Add cluster metadata id to gossip syn messages (CASSANDRA-19613) + * Reduce heap usage occupied by the metrics (CASSANDRA-19567) + * Improve handling of transient replicas during range movements (CASSANDRA-19344) + * Enable debounced internode log requests to be cancelled at shutdown (CASSANDRA-19514) + * Correctly set last modified epoch when combining multistep operations into a single step (CASSANDRA-19538) + * Add new TriggersPolicy configuration to allow operators to disable triggers (CASSANDRA-19532) + * Use Transformation.Kind.id in local and distributed log tables (CASSANDRA-19516) + * Remove period field from ClusterMetadata and metadata log tables (CASSANDRA-19482) + * Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486) + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: - * Refresh stale paxos commit (CASSANDRA-19617) * Replace Stream iteration with for-loop for StorageProxy::updateCoordinatorWriteLatencyTableMetric (CASSANDRA-19676) * Enforce metric naming contract if scope is used in a metric name (CASSANDRA-19619) * Avoid reading of the same IndexInfo from disk many times for a large partition (CASSANDRA-19557)
(cassandra) 01/01: Merge branch cassandra-5.0 into trunk
This is an automated email from the ASF dual-hosted git repository. blerer pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 137e3236571a35925593758bf3df0ae9de45d577 Merge: 053ba8476d 8c165b4cc0 Author: Benjamin Lerer AuthorDate: Mon Jun 10 18:41:42 2024 +0200 Merge branch cassandra-5.0 into trunk CHANGES.txt| 1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 15 ++- src/java/org/apache/cassandra/db/Keyspace.java | 13 ++ .../org/apache/cassandra/db/SystemKeyspace.java| 31 - .../db/compaction/CompactionIterator.java | 1 + .../org/apache/cassandra/service/paxos/Commit.java | 5 + .../cassandra/service/paxos/PaxosPrepare.java | 22 ++- .../service/paxos/uncommitted/PaxosRows.java | 23 ++-- .../cassandra/distributed/test/CasWriteTest.java | 147 - .../cassandra/service/paxos/PaxosStateTest.java| 45 --- .../cassandra/streaming/StreamSessionTest.java | 2 +- 11 files changed, 262 insertions(+), 43 deletions(-) diff --cc CHANGES.txt index 12492b05eb,9d2c9da3c1..6e2493b192 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,51 -1,5 +1,52 @@@ -5.0-beta2 +5.1 + * Add support for the BETWEEN operator in WHERE clauses (CASSANDRA-19604) + * Replace Stream iteration with for-loop for SimpleRestriction::bindAndGetClusteringElements (CASSANDRA-19679) + * Consolidate logging on trace level (CASSANDRA-19632) + * Expand DDL statements on coordinator before submission to the CMS (CASSANDRA-19592) + * Fix number of arguments of String.format() in various classes (CASSANDRA-19645) + * Remove unused fields from config (CASSANDRA-19599) + * Refactor Relation and Restriction hierarchies (CASSANDRA-19341) + * Raise priority of TCM internode messages during critical operations (CASSANDRA-19517) + * Add nodetool command to unregister LEFT nodes (CASSANDRA-19581) + * Add cluster metadata id to gossip syn messages (CASSANDRA-19613) + * Reduce heap usage occupied by the metrics (CASSANDRA-19567) + * Improve handling of transient replicas during range movements (CASSANDRA-19344) + * Enable debounced internode log requests to be cancelled at shutdown (CASSANDRA-19514) + * Correctly set last modified epoch when combining multistep operations into a single step (CASSANDRA-19538) + * Add new TriggersPolicy configuration to allow operators to disable triggers (CASSANDRA-19532) + * Use Transformation.Kind.id in local and distributed log tables (CASSANDRA-19516) + * Remove period field from ClusterMetadata and metadata log tables (CASSANDRA-19482) + * Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486) + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 053ba8476db50094ed7114d2c86dc4c5e4a480a2 Merge: 336ad623c1 786ba38200 Author: Stefan Miklosovic AuthorDate: Mon Jun 10 10:56:13 2024 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../cleanup/PaxosCleanupLocalCoordinator.java | 22 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --cc CHANGES.txt index 3a95f15519,210a834af5..12492b05eb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -84,8 -37,10 +84,9 @@@ Merged from 5.0 * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) Merged from 4.1: + * Reduce info logging from automatic paxos repair (CASSANDRA-19445) * Support legacy plain_text_auth section in credentials file removed unintentionally (CASSANDRA-19498) * Make queries visible to the "system_views.queries" virtual table at the coordinator level (CASSANDRA-19577) - * Concurrent equivalent schema updates lead to unresolved disagreement (CASSANDRA-19578) * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 cb9656b24079233a7ef041e071ea8eda0fec0680 Merge: bbe0db1f3e 1b4f898c32 Author: Stefan Miklosovic AuthorDate: Thu Jun 6 11:56:40 2024 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 14 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index c7fccce46b,0379e6fb81..2dcbb6982b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,49 -1,5 +1,50 @@@ -5.0-beta2 +5.1 + * Consolidate logging on trace level (CASSANDRA-19632) + * Expand DDL statements on coordinator before submission to the CMS (CASSANDRA-19592) + * Fix number of arguments of String.format() in various classes (CASSANDRA-19645) + * Remove unused fields from config (CASSANDRA-19599) + * Refactor Relation and Restriction hierarchies (CASSANDRA-19341) + * Raise priority of TCM internode messages during critical operations (CASSANDRA-19517) + * Add nodetool command to unregister LEFT nodes (CASSANDRA-19581) + * Add cluster metadata id to gossip syn messages (CASSANDRA-19613) + * Reduce heap usage occupied by the metrics (CASSANDRA-19567) + * Improve handling of transient replicas during range movements (CASSANDRA-19344) + * Enable debounced internode log requests to be cancelled at shutdown (CASSANDRA-19514) + * Correctly set last modified epoch when combining multistep operations into a single step (CASSANDRA-19538) + * Add new TriggersPolicy configuration to allow operators to disable triggers (CASSANDRA-19532) + * Use Transformation.Kind.id in local and distributed log tables (CASSANDRA-19516) + * Remove period field from ClusterMetadata and metadata log tables (CASSANDRA-19482) + * Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486) + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Replace Stream iteration with for-loop for StorageProxy::updateCoordinatorWriteLatencyTableMetric (CASSANDRA-19676) * Enforce metric naming contract if scope is used in a metric name (CASSANDRA-19619) * Avoid reading of the same IndexInfo from disk many times for a large partition (CASSANDRA-19557) * Resolve the oldest hints just from descriptors and current writer if available (CASSANDRA-19600) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands,
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit bbe0db1f3ef893cb28541d055b392e3e33b63449 Merge: d10008d54b 8ea424 Author: Brandon Williams AuthorDate: Tue Jun 4 08:26:37 2024 -0500 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 04dfa883295eb19651edcdfba895e0c801573990
Merge: 863ee3978b fbfa77e70f
Author: Mick Semb Wever
AuthorDate: Wed May 29 11:11:56 2024 +0200
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Update netbeans project file for latest deps
ide/nbproject/project.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc ide/nbproject/project.xml
index 038b2b1cf9,a88011a4ba..63c5b25a53
--- a/ide/nbproject/project.xml
+++ b/ide/nbproject/project.xml
@@@ -7,8 -7,7 +7,8 @@@
..
-${project.dir}/build/lib/jars/AmazonCorrettoCryptoProvider-2.2.0-linux-aarch_64.jar:${project.dir}/build/lib/jars/HdrHistogram-2.1.12.jar:${project.dir}/build/lib/jars/ST4-4.0.8.jar:${project.dir}/build/lib/jars/affinity-3.23.3.jar:${project.dir}/build/lib/jars/agrona-1.17.1.jar:${project.dir}/build/lib/jars/airline-0.8.jar:${project.dir}/build/lib/jars/antlr-3.5.2.jar:${project.dir}/build/lib/jars/antlr-runtime-3.5.2.jar:${proje
[...]
+
- ${project.dir}/build/lib/jars/affinity-3.23.3.jar:${project.dir}/build/lib/jars/agrona-1.17.1.jar:${project.dir}/build/lib/jars/airline-0.8.jar:${project.dir}/build/lib/jars/AmazonCorrettoCryptoProvider-2.2.0-linux-x86_64.jar:${project.dir}/build/lib/jars/antlr-3.5.2.jar:${project.dir}/build/lib/jars/antlr-runtime-3.5.2.jar:${project.dir}/build/lib/jars/asm-9.4.jar:${project.dir}/build/lib/jars/bcpkix-jdk15on-1.70.jar:${project.d
[...]
++${project.dir}/build/lib/jars/AmazonCorrettoCryptoProvider-2.2.0-linux-aarch_64.jar:${project.dir}/build/lib/jars/HdrHistogram-2.1.12.jar:${project.dir}/build/lib/jars/ST4-4.0.8.jar:${project.dir}/build/lib/jars/affinity-3.23.3.jar:${project.dir}/build/lib/jars/agrona-1.17.1.jar:${project.dir}/build/lib/jars/airline-0.8.jar:${project.dir}/build/lib/jars/antlr-3.5.2.jar:${project.dir}/build/lib/jars/antlr-runtime-3.5.2.jar:${proje
[...]
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 863ee3978b25165dd481013c360a9a0e5a1cad01 Merge: 2e05cd4c8d 8be9b583b2 Author: Mick Semb Wever AuthorDate: Wed May 29 11:01:46 2024 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Increment version - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 75794540573b6f0c39094b5448fe73326e14e058 Merge: 6bae4f76fb 59a5c6477d Author: Stefan Miklosovic AuthorDate: Tue May 14 11:33:05 2024 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + conf/credentials.sample | 13 - doc/modules/cassandra/pages/managing/tools/cqlsh.adoc | 10 ++ pylib/cqlshlib/cqlshmain.py | 3 +-- 4 files changed, 24 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 7ddd707989,d320b77349..b0ba04f3e2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -77,7 -36,9 +77,8 @@@ Merged from 5.0 * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) Merged from 4.1: + * Support legacy plain_text_auth section in credentials file removed unintentionally (CASSANDRA-19498) * Make queries visible to the "system_views.queries" virtual table at the coordinator level (CASSANDRA-19577) - * Concurrent equivalent schema updates lead to unresolved disagreement (CASSANDRA-19578) * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. mmuzaf pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6bae4f76fb043b4c3a3886178b5650b280e9a50b Merge: 7f4a0f0c00 ccdeb12419 Author: Maxim Muzafarov AuthorDate: Wed May 8 19:49:54 2024 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Enforce metric naming contract if scope is used in a metric name CHANGES.txt | 1 + src/java/org/apache/cassandra/index/sai/metrics/AbstractMetrics.java | 2 +- src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java | 5 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 6b391cc980,d3400ec57a..7ddd707989 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,45 -1,5 +1,46 @@@ -5.0-beta2 +5.1 + * Refactor Relation and Restriction hierarchies (CASSANDRA-19341) + * Raise priority of TCM internode messages during critical operations (CASSANDRA-19517) + * Add nodetool command to unregister LEFT nodes (CASSANDRA-19581) + * Add cluster metadata id to gossip syn messages (CASSANDRA-19613) + * Reduce heap usage occupied by the metrics (CASSANDRA-19567) + * Improve handling of transient replicas during range movements (CASSANDRA-19344) + * Enable debounced internode log requests to be cancelled at shutdown (CASSANDRA-19514) + * Correctly set last modified epoch when combining multistep operations into a single step (CASSANDRA-19538) + * Add new TriggersPolicy configuration to allow operators to disable triggers (CASSANDRA-19532) + * Use Transformation.Kind.id in local and distributed log tables (CASSANDRA-19516) + * Remove period field from ClusterMetadata and metadata log tables (CASSANDRA-19482) + * Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486) + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Enforce metric naming contract if scope is used in a metric name (CASSANDRA-19619) * Avoid reading of the same IndexInfo from disk many times for a large partition (CASSANDRA-19557) * Resolve the oldest hints just from descriptors and current writer if available (CASSANDRA-19600) * Optionally fail writes when SAI refuses to index a term value exceeding configured term max size (CASSANDRA-19493) diff --cc src/java/org/apache/cassandra/index/sai/metrics/AbstractMetrics.java index 17fd99291c,1bb0a7666a..642cfd24fc --- a/src/java/org/apache/cassandra/index/sai/metrics/AbstractMetrics.java +++ b/src/java/org/apache/cassandra/index/sai/metrics/AbstractMetrics.java @@@
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7f4a0f0c00e193018a590a8fc158ded51b411027 Merge: 534da538d2 3b8c48024e Author: Brandon Williams AuthorDate: Wed May 8 10:29:02 2024 -0500 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 68a42b23c47556059dca749aec8872cf6b82269e Merge: 505f06a4ae 049160e70a Author: Brandon Williams AuthorDate: Mon May 6 10:28:33 2024 -0500 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../apache/cassandra/io/sstable/format/big/IndexState.java | 13 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index ddb6a57103,8af3d01ac9..6be56fcf3e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,44 -1,5 +1,45 @@@ -5.0-beta2 +5.1 + * Raise priority of TCM internode messages during critical operations (CASSANDRA-19517) + * Add nodetool command to unregister LEFT nodes (CASSANDRA-19581) + * Add cluster metadata id to gossip syn messages (CASSANDRA-19613) + * Reduce heap usage occupied by the metrics (CASSANDRA-19567) + * Improve handling of transient replicas during range movements (CASSANDRA-19344) + * Enable debounced internode log requests to be cancelled at shutdown (CASSANDRA-19514) + * Correctly set last modified epoch when combining multistep operations into a single step (CASSANDRA-19538) + * Add new TriggersPolicy configuration to allow operators to disable triggers (CASSANDRA-19532) + * Use Transformation.Kind.id in local and distributed log tables (CASSANDRA-19516) + * Remove period field from ClusterMetadata and metadata log tables (CASSANDRA-19482) + * Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486) + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Avoid reading of the same IndexInfo from disk many times for a large partition (CASSANDRA-19557) * Resolve the oldest hints just from descriptors and current writer if available (CASSANDRA-19600) * Optionally fail writes when SAI refuses to index a term value exceeding configured term max size (CASSANDRA-19493) * Vector search can restrict on clustering keys when filtering isn't required (CASSANDRA-19544) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 505f06a4ae5a8c80e2fad75a78eda95cfae742ce Merge: a9dbb89419 1902195d99 Author: Brandon Williams AuthorDate: Mon May 6 08:37:11 2024 -0500 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + redhat/cassandra.spec | 11 --- 2 files changed, 5 insertions(+), 7 deletions(-) diff --cc CHANGES.txt index fb1ae2f8bd,45500b642e..ddb6a57103 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -78,9 -38,11 +78,10 @@@ Merged from 4.1 * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: + * Bring Redhat packge dirs/ownership/perms in line with Debian package (CASSANDRA-19565) * Make nodetool import congruent with the documentation by not relying on the folder structure of the imported SSTable files (CASSANDRA-19401) * IR may leak SSTables with pending repair when coming from streaming (CASSANDRA-19182) * Streaming exception race creates corrupt transaction log files that prevent restart (CASSANDRA-18736) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 41a4a266515f9462c28dd1c28f5791506f7653b6 Merge: 1d04457a24 326bf4b3f5 Author: Stefan Miklosovic AuthorDate: Thu May 2 23:32:29 2024 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../org/apache/cassandra/hints/HintsBuffer.java| 38 ++--- .../apache/cassandra/hints/HintsBufferPool.java| 26 -- .../cassandra/hints/HintsDispatchTrigger.java | 2 - .../org/apache/cassandra/hints/HintsService.java | 24 ++ .../org/apache/cassandra/hints/HintsStore.java | 27 -- .../apache/cassandra/hints/HintsWriteExecutor.java | 32 --- .../org/apache/cassandra/service/StorageProxy.java | 6 +- ...WindowTest.java => AbstractHintWindowTest.java} | 96 - .../distributed/test/HintsMaxWindowTest.java | 88 +-- .../test/HintsPersistentWindowTest.java| 99 ++ .../apache/cassandra/hints/HintsBufferTest.java| 47 -- .../apache/cassandra/hints/HintsServiceTest.java | 48 --- 13 files changed, 171 insertions(+), 363 deletions(-) diff --cc CHANGES.txt index 40a5161ff5,5a53faf257..168f40d224 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,41 -1,5 +1,42 @@@ -5.0-beta2 +5.1 + * Reduce heap usage occupied by the metrics (CASSANDRA-19567) + * Improve handling of transient replicas during range movements (CASSANDRA-19344) + * Enable debounced internode log requests to be cancelled at shutdown (CASSANDRA-19514) + * Correctly set last modified epoch when combining multistep operations into a single step (CASSANDRA-19538) + * Add new TriggersPolicy configuration to allow operators to disable triggers (CASSANDRA-19532) + * Use Transformation.Kind.id in local and distributed log tables (CASSANDRA-19516) + * Remove period field from ClusterMetadata and metadata log tables (CASSANDRA-19482) + * Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486) + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Resolve the oldest hints just from descriptors and current writer if available (CASSANDRA-19600) * Optionally fail writes when SAI refuses to index a term value exceeding configured term max size (CASSANDRA-19493) * Vector search can restrict on clustering keys when filtering isn't required (CASSANDRA-19544) * Fix FBUtilities' parsing of gcp cos_containerd kernel versions (CASSANDRA-18594) diff --cc
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 1d04457a2414c5b631e84f2dc198842eefbd90c9 Merge: 668d678d5c e22f67a2f7 Author: Caleb Rackliffe AuthorDate: Thu May 2 13:35:55 2024 -0500 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Make sure IntersectFilteringQueryTest#shouldNotWarnOrFailOnIndexQuery waits for indexes to be available before making queries .../test/guardrails/IntersectFilteringQueryTest.java | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 668d678d5c4e339ac2e0ba6a2bff7da0797f7504 Merge: ba902a7915 7402bcb8f7 Author: Brandon Williams AuthorDate: Thu May 2 10:47:09 2024 -0500 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ba902a79153d54496d802a9dc870db33b251b9b5 Merge: 7dc067e3ac d7aa3c60f9 Author: Brandon Williams AuthorDate: Thu May 2 10:14:20 2024 -0500 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7dc067e3ac83ab2895749c3714a4d38d628e3d27 Merge: 48f6a31879 3262847ad7 Author: Brandon Williams AuthorDate: Thu May 2 08:48:46 2024 -0500 Merge branch 'cassandra-5.0' into trunk .build/docker/bullseye-build.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 48f6a318796c02ba8e2f22b078958200ba37c9a6
Merge: dd4e3fa6df d1101eeccc
Author: Stefan Miklosovic
AuthorDate: Thu May 2 10:48:01 2024 +0200
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt| 1 +
src/java/org/apache/cassandra/db/Directories.java | 55 ++
.../org/apache/cassandra/db/SSTableImporter.java | 4 +-
test/unit/org/apache/cassandra/db/ImportTest.java | 66 --
4 files changed, 109 insertions(+), 17 deletions(-)
diff --cc CHANGES.txt
index 19eb240b42,87fb75b057..40a5161ff5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -74,9 -37,11 +74,10 @@@ Merged from 4.1
* Fix hints delivery for a node going down repeatedly (CASSANDRA-19495)
* Do not go to disk for reading hints file sizes (CASSANDRA-19477)
* Fix system_views.settings to handle array types (CASSANDRA-19475)
- * Memoize Cassandra verion and add a backoff interval for failed schema
pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
+ * Make nodetool import congruent with the documentation by not relying on
the folder structure of the imported SSTable files (CASSANDRA-19401)
* IR may leak SSTables with pending repair when coming from streaming
(CASSANDRA-19182)
* Streaming exception race creates corrupt transaction log files that
prevent restart (CASSANDRA-18736)
* Fix CQL tojson timestamp output on negative timestamp values before
Gregorian calendar reform in 1582 (CASSANDRA-19566)
diff --cc test/unit/org/apache/cassandra/db/ImportTest.java
index f6383b5ef8,b5e6355106..4d7a9efe31
--- a/test/unit/org/apache/cassandra/db/ImportTest.java
+++ b/test/unit/org/apache/cassandra/db/ImportTest.java
@@@ -71,7 -70,12 +71,14 @@@ import static org.junit.Assert.assertTr
public class ImportTest extends CQLTester
{
-@After
-public void afterTest()
+
++@Override
++public void afterTest() throws Throwable
+ {
++super.afterTest();
+ SSTableReader.resetTidying();
+ }
+
@Test
public void basicImportByMovingTest() throws Throwable
{
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. dcapwell pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit dd4e3fa6df781e8debb3be88fcee4968ace56b7f Merge: bbcf92b2c4 1b1f88e38a Author: ci worker AuthorDate: Wed May 1 14:35:14 2024 -0700 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../db/compaction/AbstractStrategyHolder.java | 1 + .../db/compaction/CompactionStrategyHolder.java| 6 .../db/compaction/CompactionStrategyManager.java | 18 +- .../db/compaction/PendingRepairHolder.java | 12 +++ .../db/compaction/PendingRepairManager.java| 11 ++- .../org/apache/cassandra/db/lifecycle/Tracker.java | 2 ++ .../apache/cassandra/repair/RepairCoordinator.java | 15 + .../cassandra/repair/RepairMessageVerbHandler.java | 3 ++ .../distributed/test/DistributedRepairUtils.java | 34 +++ .../distributed/test/RepairCoordinatorFast.java| 3 ++ .../test/RepairCoordinatorNeighbourDown.java | 3 ++ .../repair/ConcurrentIrWithPreviewFuzzTest.java| 2 +- .../cassandra/repair/FailingRepairFuzzTest.java| 1 + .../org/apache/cassandra/repair/FuzzTestBase.java | 38 -- 15 files changed, 144 insertions(+), 6 deletions(-) diff --cc CHANGES.txt index 54f370529b,ac41c7c180..19eb240b42 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -74,9 -37,11 +74,10 @@@ Merged from 4.1 * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: + * IR may leak SSTables with pending repair when coming from streaming (CASSANDRA-19182) * Streaming exception race creates corrupt transaction log files that prevent restart (CASSANDRA-18736) * Fix CQL tojson timestamp output on negative timestamp values before Gregorian calendar reform in 1582 (CASSANDRA-19566) * Fix few types issues and implement types compatibility tests (CASSANDRA-19479) diff --cc test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorNeighbourDown.java index 7815cbe3bc,590c65aa72..1d6060c082 --- a/test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorNeighbourDown.java +++ b/test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorNeighbourDown.java @@@ -41,8 -39,8 +41,9 @@@ import org.apache.cassandra.service.Sto import org.apache.cassandra.utils.FBUtilities; import static java.lang.String.format; +import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_JVM_SHUTDOWN_MESSAGING_GRACEFULLY; import static org.apache.cassandra.distributed.api.IMessageFilters.Matcher.of; + import static org.apache.cassandra.distributed.test.DistributedRepairUtils.assertNoSSTableLeak; import static org.apache.cassandra.distributed.test.DistributedRepairUtils.assertParentRepairFailedWithMessageContains; import static org.apache.cassandra.distributed.test.DistributedRepairUtils.assertParentRepairNotExist; import static org.apache.cassandra.distributed.test.DistributedRepairUtils.getRepairExceptions; diff --cc test/unit/org/apache/cassandra/repair/FuzzTestBase.java index ff205554f8,b389231c68..40959a21e1 --- a/test/unit/org/apache/cassandra/repair/FuzzTestBase.java +++ b/test/unit/org/apache/cassandra/repair/FuzzTestBase.java @@@ -50,6 -50,9 +50,9 @@@ import javax.annotation.Nullable import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import org.junit.Before; + import com.google.common.collect.Sets; + ++import org.apache.cassandra.config.UnitConfigOverride; import org.junit.BeforeClass; import accord.utils.DefaultRandom; @@@ -69,7 -71,7 +72,6 @@@ import org.apache.cassandra.concurrent. import org.apache.cassandra.concurrent.SimulatedExecutorFactory; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.config.DatabaseDescriptor; --import org.apache.cassandra.config.UnitConfigOverride; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Digest; - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit bbcf92b2c45e04e06554fb634166c0e37af38891 Merge: 20b4ca44d8 a9da19c311 Author: Caleb Rackliffe AuthorDate: Wed May 1 14:42:22 2024 -0500 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Make queries visible to the "system_views.queries" virtual table at the coordinator level CHANGES.txt| 1 + .../apache/cassandra/concurrent/TaskFactory.java | 20 +- .../apache/cassandra/db/virtual/QueriesTable.java | 2 +- .../distributed/test/QueriesTableTest.java | 221 - 4 files changed, 192 insertions(+), 52 deletions(-) diff --cc CHANGES.txt index 02509ad4dd,7e18e40c97..54f370529b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -70,6 -33,8 +70,7 @@@ Merged from 5.0 * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) Merged from 4.1: + * Make queries visible to the "system_views.queries" virtual table at the coordinator level (CASSANDRA-19577) - * Concurrent equivalent schema updates lead to unresolved disagreement (CASSANDRA-19578) * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 20b4ca44d86f67b3deec56d2b72a2f5d03b21cf9 Merge: 8619010cdc ae9be29918 Author: Brandon Williams AuthorDate: Tue Apr 30 17:01:40 2024 -0500 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 397568d033db1b335704650daff7678201531836 Merge: ad3c1ce97c 3c85def5cc Author: Mick Semb Wever AuthorDate: Fri Apr 26 11:36:46 2024 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Honour parameter defaults between builds in Jenkinsfile .build/ci/ci_parser.py | 6 +- .build/ci/junit_helpers.py | 11 +++ .build/docker/_build-debian.sh | 5 +- .build/docker/_build-redhat.sh | 2 +- .build/docker/_docker_init_tests.sh | 1 + .build/docker/_docker_run.sh | 9 +- .build/docker/centos7-build.docker | 2 +- .build/docker/run-tests.sh | 80 --- .build/docker/ubuntu2004_test.docker | 1 + .build/run-tests.sh | 2 +- .jenkins/Jenkinsfile | 183 +++ build.xml| 2 +- 12 files changed, 191 insertions(+), 113 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 ad3c1ce97c18b77f2f521ffa391dc029466b0482 Merge: 3b0b52d0f9 fda12b25d2 Author: Stefan Miklosovic AuthorDate: Fri Apr 26 08:53:56 2024 +0200 Merge branch 'cassandra-5.0' into trunk .../distributed/test/streaming/StreamFailedWhileReceivingTest.java | 1 - 1 file changed, 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 3b0b52d0f9cc51a694252d95a88457ba3a876583 Merge: b7eafa94f3 6559983d6c Author: Jon Meredith AuthorDate: Thu Apr 25 14:01:46 2024 -0600 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../org/apache/cassandra/db/lifecycle/LogFile.java | 36 ++-- .../cassandra/db/lifecycle/LogReplicaSet.java | 6 +- .../TransactionAlreadyCompletedException.java | 36 .../apache/cassandra/streaming/StreamSession.java | 20 ++ .../streaming/StreamFailedWhileReceivingTest.java | 208 + .../cassandra/db/lifecycle/LogTransactionTest.java | 40 +++- 7 files changed, 332 insertions(+), 15 deletions(-) diff --cc CHANGES.txt index cf55f7b91c,ee0696f40a..ed314c60d3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -72,9 -36,10 +72,10 @@@ Merged from 4.1 * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: + * Streaming exception race creates corrupt transaction log files that prevent restart (CASSANDRA-18736) * Fix CQL tojson timestamp output on negative timestamp values before Gregorian calendar reform in 1582 (CASSANDRA-19566) * Fix few types issues and implement types compatibility tests (CASSANDRA-19479) * Change logging to TRACE when failing to get peer certificate (CASSANDRA-19508) diff --cc src/java/org/apache/cassandra/streaming/StreamSession.java index f89a2569ec,a942b9ee9a..217c70f058 --- a/src/java/org/apache/cassandra/streaming/StreamSession.java +++ b/src/java/org/apache/cassandra/streaming/StreamSession.java @@@ -59,7 -57,7 +59,8 @@@ import org.apache.cassandra.db.Director import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.compaction.CompactionStrategyManager; + import org.apache.cassandra.db.lifecycle.TransactionAlreadyCompletedException; +import org.apache.cassandra.dht.OwnedRanges; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.util.File; - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 607d6d0361184e478fcc1cd00be89c864a3a7455 Merge: c5c4cd4e57 93692a4b17 Author: Stefan Miklosovic AuthorDate: Tue Apr 23 01:14:31 2024 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../org/apache/cassandra/db/marshal/DateType.java | 2 +- .../apache/cassandra/db/marshal/TimestampType.java | 2 +- .../cassandra/serializers/TimestampSerializer.java | 35 -- 4 files changed, 23 insertions(+), 17 deletions(-) diff --cc CHANGES.txt index 3e2fa40c1e,1d51d2d27d..cf55f7b91c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -72,9 -36,10 +72,10 @@@ Merged from 4.1 * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: + * Fix CQL tojson timestamp output on negative timestamp values before Gregorian calendar reform in 1582 (CASSANDRA-19566) * Fix few types issues and implement types compatibility tests (CASSANDRA-19479) * Change logging to TRACE when failing to get peer certificate (CASSANDRA-19508) * Push LocalSessions info logs to debug (CASSANDRA-18335) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 d9192745bc4c67f14445b5fea416736b5cec5a46 Merge: c33c8ebab4 82297b490e Author: Jacek Lewandowski AuthorDate: Thu Apr 18 12:33:56 2024 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Fix few types issues and implement types compatibility tests CHANGES.txt| 1 + .../db/marshal/AbstractCompositeType.java | 2 +- .../org/apache/cassandra/db/marshal/TupleType.java | 6 +- .../apache/cassandra/db/marshal/TypeParser.java| 2 +- .../org/apache/cassandra/db/marshal/UserType.java | 2 +- .../apache/cassandra/utils/CassandraVersion.java | 5 + test/data/types-compatibility/4.0.json.gz | Bin 0 -> 397346 bytes test/data/types-compatibility/4.1.json.gz | Bin 0 -> 396407 bytes test/data/types-compatibility/5.0.json.gz | Bin 0 -> 397761 bytes .../cassandra/db/marshal/AbstractTypeTest.java | 922 - .../cassandra/utils/AbstractTypeGenerators.java| 228 - .../utils/asserts/SoftAssertionsWithLimit.java | 42 + 12 files changed, 1200 insertions(+), 10 deletions(-) diff --cc CHANGES.txt index 6d9856ae5c,99f938c40b..4f07c455df --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -69,9 -36,10 +69,10 @@@ Merged from 4.1 * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: + * Fix few types issues and implement types compatibility tests (CASSANDRA-19479) * Change logging to TRACE when failing to get peer certificate (CASSANDRA-19508) * Push LocalSessions info logs to debug (CASSANDRA-18335) * Filter remote DC replicas out when constructing the initial replica plan for the local read repair (CASSANDRA-19120) diff --cc test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java index 22925d1e1f,499470904d..35ecfab60d --- a/test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java @@@ -42,11 -70,23 +70,23 @@@ import org.apache.cassandra.config.Data import org.apache.cassandra.cql3.AssignmentTestable; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.ColumnSpecification; -import org.apache.cassandra.cql3.Constants; +import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.Json; import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.cql3.Term; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.VariableSpecifications; + import org.apache.cassandra.db.SerializationHeader; + import org.apache.cassandra.db.filter.ColumnFilter; + import org.apache.cassandra.db.rows.BTreeRow; + import org.apache.cassandra.db.rows.Cell; + import org.apache.cassandra.db.rows.CellPath; + import org.apache.cassandra.db.rows.ComplexColumnData; + import org.apache.cassandra.db.rows.DeserializationHelper; + import org.apache.cassandra.db.rows.EncodingStats; + import org.apache.cassandra.db.rows.Row; + import org.apache.cassandra.db.rows.Rows; + import org.apache.cassandra.db.rows.SerializationHelper; + import org.apache.cassandra.db.rows.UnfilteredSerializer; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputBuffer; - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c33c8ebab444209a9675f273448110afd0787faa Merge: f345370f35 9bfaee91c4 Author: Caleb Rackliffe AuthorDate: Wed Apr 17 11:24:24 2024 -0500 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Optionally fail writes when SAI refuses to index a term value exceeding a configured maximum size 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(-) diff --cc CHANGES.txt index ab257c3baf,09c5468db4..6d9856ae5c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,37 -1,5 +1,38 @@@ -5.0-beta2 +5.1 + * Add new TriggersPolicy configuration to allow operators to disable triggers (CASSANDRA-19532) + * Use Transformation.Kind.id in local and distributed log tables (CASSANDRA-19516) + * Remove period field from ClusterMetadata and metadata log tables (CASSANDRA-19482) + * Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486) + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit f345370f35dea1256ef0401a46bad8342d224ea5 Merge: f194c0772c 1a66347e70 Author: Brandon Williams AuthorDate: Wed Apr 17 05:54:06 2024 -0500 Merge branch 'cassandra-5.0' into trunk .build/docker/ubuntu2004_test.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit f194c0772c8fd4250faa0b300bf5f59be17c6a83 Merge: 8d705b31e9 0c34234f67 Author: Brandon Williams AuthorDate: Tue Apr 16 13:27:33 2024 -0500 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9abd84b8f8735ac5f884d963847b0eb61ce26e5c Merge: 74aa4a12ad e127ddf7dd Author: Brandon Williams AuthorDate: Mon Apr 15 11:25:41 2024 -0500 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 74aa4a12adc44eb4a6fd7295fe2a0e07af38fa41 Merge: d548396597 42498a14fa Author: Brandon Williams AuthorDate: Fri Apr 12 13:51:05 2024 -0500 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 3e4f1e2839cff2ed2d51076e1cb016c381282c56 Merge: 728b9ec4c6 a620a9df86 Author: Brandon Williams AuthorDate: Thu Apr 11 13:51:41 2024 -0500 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c1562585533d8c9252553e61b959f8ce9b2a1855 Merge: 5b23692a90 cada1a13c8 Author: Mick Semb Wever AuthorDate: Thu Apr 11 00:26:14 2024 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Vector search should be able to restrict on clustering keys when filtering isn't required CHANGES.txt| 1 + .../cql3/restrictions/StatementRestrictions.java | 15 ++--- .../cassandra/cql3/statements/SelectStatement.java | 4 +-- .../CassandraXMLJUnitResultFormatter.java | 3 +- .../index/sai/cql/VectorInvalidQueryTest.java | 36 ++ 5 files changed, 52 insertions(+), 7 deletions(-) diff --cc CHANGES.txt index 7c2bcc7ea0,74d142089c..5fe89cc440 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,5 +1,35 @@@ -5.0-beta2 +5.1 + * Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486) + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Vector search can restrict on clustering keys when filtering isn't required (CASSANDRA-19544) * Fix FBUtilities' parsing of gcp cos_containerd kernel versions (CASSANDRA-18594) * Clean up KeyRangeIterator classes (CASSANDRA-19428) * Warn clients about possible consistency violations for filtering queries against multiple mutable columns (CASSANDRA-19489) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit cddfd7f17a3e676ab35a1dbdaacb66377cd2556b Merge: 7623e4678b 7c29439cef Author: Caleb Rackliffe AuthorDate: Mon Apr 8 15:30:29 2024 -0500 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Optionally avoid hint transfer during decommission - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 da8ab7e20addfd7c088fe39de3513e002aa7146e Merge: 310d790ce4 9752ceb439 Author: Stefan Miklosovic AuthorDate: Fri Apr 5 11:28:52 2024 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../apache/cassandra/hints/HintsBufferPool.java| 9 + .../cassandra/hints/HintsDispatchTrigger.java | 2 + .../org/apache/cassandra/hints/HintsService.java | 7 + .../apache/cassandra/hints/HintsWriteExecutor.java | 32 +--- .../distributed/test/HintsMaxWindowTest.java | 188 + 6 files changed, 214 insertions(+), 25 deletions(-) diff --cc CHANGES.txt index 4be9b7d42d,eaf27a314c..07ff7de532 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -60,10 -31,11 +60,11 @@@ Merged from 5.0 * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) Merged from 4.1: + * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: * Change logging to TRACE when failing to get peer certificate (CASSANDRA-19508) * Push LocalSessions info logs to debug (CASSANDRA-18335) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 310d790ce4734727f943225eb951ab0d889c0a5b Merge: 2108f9dcaf 00dccf25ab Author: Brandon Williams AuthorDate: Thu Apr 4 11:00:48 2024 -0500 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/transport/ServerConnection.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index f42a740790,7fcb87292f..4be9b7d42d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -62,9 -33,10 +62,10 @@@ Merged from 5.0 Merged from 4.1: * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: + * Change logging to TRACE when failing to get peer certificate (CASSANDRA-19508) * Push LocalSessions info logs to debug (CASSANDRA-18335) * Filter remote DC replicas out when constructing the initial replica plan for the local read repair (CASSANDRA-19120) * Remove redundant code in StorageProxy#sendToHintedReplicas (CASSANDRA-19412) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2108f9dcaf525fcedf3b9e4d703aa8f230fd4cd1
Merge: a1b0a310ed f7c11bdcd4
Author: Mick Semb Wever
AuthorDate: Thu Apr 4 11:57:23 2024 +0200
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Standalone Jenkinsfile
.build/README.md | 122 +-
.build/check-code.sh |2 +-
.build/ci/ci_parser.py | 307 +
.build/ci/generate-ci-summary.sh | 60 +
.../{check-code.sh => ci/generate-test-report.sh} | 17 +-
.build/ci/junit_helpers.py | 320 +
.build/ci/logging.sh | 124 ++
.build/ci/logging_helper.py| 136 +++
.build/{check-code.sh => ci/precommit_check.sh}| 41 +-
.build/{check-code.sh => ci/requirements.txt} | 15 +-
.build/docker/_docker_run.sh |8 +-
.build/{check-code.sh => docker/build-jars.sh} | 14 +-
.build/docker/bullseye-build.docker|3 +
.build/docker/run-tests.sh | 79 +-
.build/run-python-dtests.sh| 21 +-
.build/run-tests.sh| 12 +-
.jenkins/Jenkinsfile | 1230
CHANGES.txt|1 +
build.xml | 73 +-
pylib/cassandra-cqlsh-tests.sh |3 +-
.../org/apache/cassandra/utils/FBUtilities.java|2 +-
.../org/apache/cassandra/utils/SystemInfo.java | 15 +-
.../CassandraXMLJUnitResultFormatter.java | 23 +-
.../apache/cassandra/utils/FBUtilitiesTest.java|2 +-
24 files changed, 1707 insertions(+), 923 deletions(-)
diff --cc CHANGES.txt
index c770ef1b7c,5cd68dd179..f42a740790
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,5 +1,34 @@@
-5.0-beta2
+5.1
+ * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572)
+ * Ensured that PropertyFileSnitchTest do not overwrite
cassandra-toploogy.properties (CASSANDRA-19502)
+ * Add option for MutualTlsAuthenticator to restrict the certificate validity
period (CASSANDRA-18951)
+ * Fix StorageService::constructRangeToEndpointMap for non-distributed
keyspaces (CASSANDRA-19255)
+ * Group nodetool cms commands into single command group (CASSANDRA-19393)
+ * Register the measurements of the bootstrap process as Dropwizard metrics
(CASSANDRA-19447)
+ * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417)
+ * Modernize CQLSH datetime conversions (CASSANDRA-18879)
+ * Harry model and in-JVM tests for partition-restricted 2i queries
(CASSANDRA-18275)
+ * Refactor cqlshmain global constants (CASSANDRA-19201)
+ * Remove native_transport_port_ssl (CASSANDRA-19397)
+ * Make nodetool reconfigurecms sync by default and add --cancel to be able
to cancel ongoing reconfigurations (CASSANDRA-19216)
+ * Expose auth mode in system_views.clients, nodetool clientstats, metrics
(CASSANDRA-19366)
+ * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189)
+ * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271)
+ * Refactor structure of caching metrics and expose auth cache metrics via
JMX (CASSANDRA-17062)
+ * Allow CQL client certificate authentication to work without sending an
AUTHENTICATE request (CASSANDRA-18857)
+ * Extend nodetool tpstats and system_views.thread_pools with detailed pool
parameters (CASSANDRA-19289)
+ * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565)
+ * Simplify the bind marker and Term logic (CASSANDRA-18813)
+ * Limit cassandra startup to supported JDKs, allow higher JDKs by setting
CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688)
+ * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104)
+ * Make nodetool tablestats use number of significant digits for time and
average values consistently (CASSANDRA-19015)
+ * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875)
+ * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330)
+ * 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:
+ * Fix FBUtilities' parsing of gcp cos_containerd kernel versions
(CASSANDRA-18594)
* Clean up KeyRangeIterator classes (CASSANDRA-19428)
* Warn clients about possible consistency violations for filtering queries
against multiple mutable columns (CASSANDRA-19489)
* Align buffer with commitlog segment size (CASSANDRA-19471)
diff --cc src/java/org/apache/cassandra/utils/FBUtilities.java
index 414811aff3,eeefab136f..ff1aacf445
---
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a1b0a310eded202d86d6fd0f746a5176ff8cabbe Merge: 2944d77aac b0150e86fb Author: Ekaterina Dimitrova AuthorDate: Wed Apr 3 18:29:55 2024 -0400 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../index/sai/disk/IndexSearchResultIterator.java | 39 ++ .../disk/v1/postings/PostingListRangeIterator.java | 2 +- .../sai/iterators/KeyRangeConcatIterator.java | 105 -- .../iterators/KeyRangeIntersectionIterator.java| 132 -- .../index/sai/iterators/KeyRangeIterator.java | 99 -- .../sai/iterators/KeyRangeOrderingIterator.java| 2 +- .../index/sai/iterators/KeyRangeUnionIterator.java | 84 +++- .../index/sai/memory/InMemoryKeyRangeIterator.java | 4 +- .../cassandra/index/sai/plan/QueryController.java | 33 +++-- .../cassandra/utils/AbstractGuavaIterator.java | 5 +- .../index/sai/disk/SingleNodeQueryFailureTest.java | 100 ++ .../sai/disk/v1/BalancedTreeIndexSearcherTest.java | 2 - .../sai/disk/v1/InvertedIndexSearcherTest.java | 2 - .../iterators/AbstractKeyRangeIteratorTester.java | 119 .../sai/iterators/KeyRangeConcatIteratorTest.java | 83 +-- .../KeyRangeIntersectionIteratorTest.java | 127 ++--- .../sai/iterators/KeyRangeUnionIteratorTest.java | 151 - .../index/sai/iterators/LongIterator.java | 21 +-- .../index/sai/utils/SAIRandomizedTester.java | 10 ++ 20 files changed, 600 insertions(+), 521 deletions(-) diff --cc CHANGES.txt index c8ce4d9fae,6d6b3ea50c..c770ef1b7c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,5 +1,34 @@@ -5.0-beta2 +5.1 + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Clean up KeyRangeIterator classes (CASSANDRA-19428) * Warn clients about possible consistency violations for filtering queries against multiple mutable columns (CASSANDRA-19489) * Align buffer with commitlog segment size (CASSANDRA-19471) * Ensure SAI indexes empty byte buffers for types that allow them as a valid input (CASSANDRA-19461) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2944d77aac0e75cdc424641dbd3b7364ca72fae3
Merge: b37f47b3ee 973aad7b68
Author: Brandon Williams
AuthorDate: Wed Apr 3 17:01:48 2024 -0500
Merge branch 'cassandra-5.0' into trunk
doc/modules/cassandra/examples/BASH/add_repo_keys.sh | 2 +-
doc/modules/cassandra/examples/BASH/get_deb_package.sh | 4 ++--
doc/modules/cassandra/partials/package_versions.adoc | 11 +--
3 files changed, 8 insertions(+), 9 deletions(-)
diff --cc doc/modules/cassandra/examples/BASH/get_deb_package.sh
index 8c1b07bb1e,a1d64eaf0a..96ebb44ae5
--- a/doc/modules/cassandra/examples/BASH/get_deb_package.sh
+++ b/doc/modules/cassandra/examples/BASH/get_deb_package.sh
@@@ -1,2 -1,2 +1,2 @@@
- $ echo "deb https://debian.cassandra.apache.org 42x main" | sudo tee -a
/etc/apt/sources.list.d/cassandra.sources.list
- deb https://debian.cassandra.apache.org 42x main
-$ echo "deb [signed-by=/etc/apt/keyrings/apache-cassandra.asc]
https://debian.cassandra.apache.org 50x main" | sudo tee -a
/etc/apt/sources.list.d/cassandra.sources.list
-deb https://debian.cassandra.apache.org 50x main
++$ echo "deb [signed-by=/etc/apt/keyrings/apache-cassandra.asc]
https://debian.cassandra.apache.org 51x main" | sudo tee -a
/etc/apt/sources.list.d/cassandra.sources.list
++deb https://debian.cassandra.apache.org 51x main
diff --cc doc/modules/cassandra/partials/package_versions.adoc
index 17ca41dce3,4457d7ae19..44233bc992
--- a/doc/modules/cassandra/partials/package_versions.adoc
+++ b/doc/modules/cassandra/partials/package_versions.adoc
@@@ -1,9 -1,8 +1,8 @@@
- The latest major version is {40_version} and the corresponding distribution
name is `40x` (with an "x" as the suffix).
-The latest major version is {50_version} and the corresponding distribution
name is `50x` (with an "x" as the suffix).
++The latest major version is {51_version} and the corresponding distribution
name is `51x` (with an "x" as the suffix).
For older releases use:
- * `311x` for C* {3x_version} series
- * `30x` for {30_version}
- * `22x` for {22_version}
- * `21x` for {21_version}
++* `51x` for C* {51_version} series
+ * `50x` for C* {50_version} series
+ * `41x` for C* {41_version} series
-* `40x` for C* {40_version} series
- For example, to add the repository for version {40_version} (`40x`):
-For example, to add the repository for version {50_version} (`50x`):
++For example, to add the repository for version {51_version} (`51x`):
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b37f47b3ee8c291e8cbbd95f91b3fe04df50cfa4 Merge: 2e7def7626 be507c6e99 Author: Caleb Rackliffe AuthorDate: Wed Apr 3 16:37:43 2024 -0500 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Warn clients about possible consistency violations for filtering queries against multiple mutable columns CHANGES.txt| 1 + src/java/org/apache/cassandra/config/Config.java | 2 + .../apache/cassandra/config/GuardrailsOptions.java | 29 + .../org/apache/cassandra/cql3/QueryProcessor.java | 2 +- .../apache/cassandra/cql3/UntypedResultSet.java| 4 +- .../cql3/restrictions/StatementRestrictions.java | 3 +- .../cassandra/cql3/statements/SelectStatement.java | 45 .../org/apache/cassandra/db/filter/RowFilter.java | 10 +- .../apache/cassandra/db/guardrails/Guardrails.java | 39 +++ .../cassandra/db/guardrails/GuardrailsConfig.java | 16 +++ .../cassandra/db/guardrails/GuardrailsMBean.java | 16 +++ .../GuardrailNonPartitionRestrictedQueryTest.java | 37 ++- .../test/guardrails/GuardrailTester.java | 41 ++- .../guardrails/IntersectFilteringQueryTest.java| 120 + 14 files changed, 311 insertions(+), 54 deletions(-) diff --cc CHANGES.txt index 3703a0bf04,cb3e2676cb..c8ce4d9fae --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,5 +1,34 @@@ -5.0-beta2 +5.1 + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Warn clients about possible consistency violations for filtering queries against multiple mutable columns (CASSANDRA-19489) * Align buffer with commitlog segment size (CASSANDRA-19471) * Ensure SAI indexes empty byte buffers for types that allow them as a valid input (CASSANDRA-19461) * Deprecate Python 3.7 and earlier, but allow cqlsh to run with Python 3.6-3.11 (CASSANDRA-19467) diff --cc src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java index 9e145a2208,4f6b829191..587cc41638 --- a/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java +++ b/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java @@@ -781,7 -780,8 +781,8 @@@ public final class StatementRestriction return RowFilter.none(); // If there is only one replica, we don't need reconciliation at any consistency level. - boolean needsReconciliation = options.getConsistency().needsReconciliation()
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c9625e0102dab66f41d3ef2338c54d499e73a8c5
Merge: c2a78639de ca0b77d743
Author: David Capwell
AuthorDate: Tue Mar 26 13:04:03 2024 -0700
Merge branch 'cassandra-5.0' into trunk
src/java/org/apache/cassandra/gms/Gossiper.java| 2 +
src/java/org/apache/cassandra/gms/IGossiper.java | 3 +
.../org/apache/cassandra/net/MessageDelivery.java | 4 +
.../org/apache/cassandra/net/MessagingService.java | 5 -
.../org/apache/cassandra/repair/RepairJob.java | 2 +-
.../org/apache/cassandra/repair/SharedContext.java | 40 +
.../cassandra/service/ActiveRepairService.java | 4 +-
.../apache/cassandra/service/StorageService.java | 7 +-
.../org/apache/cassandra/service/paxos/Paxos.java | 12 +-
.../cassandra/service/paxos/PaxosRepair.java | 9 +-
.../service/paxos/cleanup/PaxosCleanup.java| 34 ++---
.../paxos/cleanup/PaxosCleanupComplete.java| 28 ++--
.../cleanup/PaxosCleanupLocalCoordinator.java | 22 +--
.../service/paxos/cleanup/PaxosCleanupRequest.java | 70 -
.../paxos/cleanup/PaxosCleanupResponse.java| 8 +-
.../service/paxos/cleanup/PaxosCleanupSession.java | 54 +++
.../paxos/cleanup/PaxosFinishPrepareCleanup.java | 112 ++
...shPrepareCleanup.java => PaxosRepairState.java} | 138 +++---
.../paxos/cleanup/PaxosStartPrepareCleanup.java| 38 +++--
.../service/paxos/cleanup/PaxosTableRepairs.java | 24 ---
.../paxos/uncommitted/PaxosUncommittedTracker.java | 4 +-
.../org/apache/cassandra/tcm/ClusterMetadata.java | 7 +-
.../distributed/test/PaxosRepairTest.java | 7 +-
.../org/apache/cassandra/repair/FuzzTestBase.java | 162 ++---
.../org/apache/cassandra/repair/RepairJobTest.java | 4 +-
25 files changed, 459 insertions(+), 341 deletions(-)
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index 21d4ab5b8f,d907f76686..35cf57d3e1
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -1058,6 -1317,18 +1058,7 @@@ public class Gossiper implements IFailu
return reqdEndpointState;
}
-/**
- * determine which endpoint started up earlier
- */
-public int compareEndpointStartup(InetAddressAndPort addr1,
InetAddressAndPort addr2)
-{
-EndpointState ep1 = getEndpointStateForEndpoint(addr1);
-EndpointState ep2 = getEndpointStateForEndpoint(addr2);
-assert ep1 != null && ep2 != null;
-return ep1.getHeartBeatState().getGeneration() -
ep2.getHeartBeatState().getGeneration();
-}
-
+ @Override
public void notifyFailureDetector(Map
remoteEpStateMap)
{
for (Entry entry :
remoteEpStateMap.entrySet())
diff --cc src/java/org/apache/cassandra/net/MessagingService.java
index ceae703097,94586b41c8..d1e2f7b260
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@@ -472,41 -449,8 +472,36 @@@ public class MessagingService extends M
send(message.responseWith(response), message.respondTo());
}
+public Future sendWithResponse(InetAddressAndPort to,
Message msg)
+{
+Promise future = AsyncPromise.uncancellable();
+MessagingService.instance().sendWithCallback(msg, to,
+ new
RequestCallback()
+ {
+ @Override
+ public void
onResponse(Message msg)
+ {
+
future.setSuccess(msg.payload);
+ }
+
+ @Override
+ public void
onFailure(InetAddressAndPort from, RequestFailureReason failureReason)
+ {
+
future.setFailure(new RuntimeException(failureReason.toString()));
+ }
+ });
+
+return future;
+}
+
- public void respondWithFailure(RequestFailureReason reason,
Message message)
- {
- send(Message.failureResponse(message.id(), message.expiresAtNanos(),
reason), message.respondTo());
- }
-
public void send(Message message, InetAddressAndPort to, ConnectionType
specifyConnection)
{
+if (isShuttingDown)
+{
+
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 e6a937c934bf9aa738dfa8d6daa4ced48daf8859
Merge: 8d8c6fbc37 35d6e6ce9c
Author: Stefan Miklosovic
AuthorDate: Mon Mar 25 14:21:25 2024 +0100
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt| 1 +
.../apache/cassandra/hints/HintsDescriptor.java| 24 +++-
.../org/apache/cassandra/hints/HintsStore.java | 12 +-
.../org/apache/cassandra/hints/HintsWriter.java| 13 ++-
.../org/apache/cassandra/service/StorageProxy.java | 14 ++-
.../distributed/test/HintsMaxSizeTest.java | 128 +
.../org/apache/cassandra/hints/AlteredHints.java | 3 +
.../apache/cassandra/hints/HintsCatalogTest.java | 17 +--
.../apache/cassandra/hints/HintsReaderTest.java| 5 +
.../org/apache/cassandra/hints/HintsStoreTest.java | 3 +
.../apache/cassandra/hints/HintsUpgradeTest.java | 3 +
11 files changed, 197 insertions(+), 26 deletions(-)
diff --cc CHANGES.txt
index e92cd81496,e879141be7..5a0ce4117d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -54,9 -28,10 +54,10 @@@ Merged from 5.0
* Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
* Suppress CVE-2023-6481 (CASSANDRA-19184)
Merged from 4.1:
+ * Do not go to disk for reading hints file sizes (CASSANDRA-19477)
* Fix system_views.settings to handle array types (CASSANDRA-19475)
- * Memoize Cassandra verion and add a backoff interval for failed schema
pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
* Push LocalSessions info logs to debug (CASSANDRA-18335)
* Filter remote DC replicas out when constructing the initial replica plan
for the local read repair (CASSANDRA-19120)
diff --cc test/unit/org/apache/cassandra/hints/HintsReaderTest.java
index 77c45c6a12,56154fd950..94be7b2b8e
--- a/test/unit/org/apache/cassandra/hints/HintsReaderTest.java
+++ b/test/unit/org/apache/cassandra/hints/HintsReaderTest.java
@@@ -28,9 -28,9 +28,11 @@@ import java.util.concurrent.TimeUnit
import java.util.function.Function;
import com.google.common.collect.Iterables;
+
+import org.apache.cassandra.exceptions.CoordinatorBehindException;
import org.apache.cassandra.io.util.File;
+
+ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --cc test/unit/org/apache/cassandra/hints/HintsUpgradeTest.java
index 3d8c443121,78b8f56b50..fd44a96317
--- a/test/unit/org/apache/cassandra/hints/HintsUpgradeTest.java
+++ b/test/unit/org/apache/cassandra/hints/HintsUpgradeTest.java
@@@ -44,11 -43,12 +44,13 @@@ import org.apache.cassandra.schema.Sche
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.schema.TableMetadata;
+ import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+ import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+@Ignore("TODO: TCM")
public class HintsUpgradeTest
{
static
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 52502002ba1340adee8b28bfe5b4d7959a0bca86 Merge: 63c6261856 389479c9a2 Author: Brandon Williams AuthorDate: Mon Mar 25 06:34:13 2024 -0500 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../cassandra/db/commitlog/DirectIOSegment.java | 21 - 2 files changed, 13 insertions(+), 9 deletions(-) diff --cc CHANGES.txt index 1e34cbe71e,0954529c82..e92cd81496 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,5 +1,31 @@@ -5.0-beta2 +5.1 + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Align buffer with commitlog segment size (CASSANDRA-19471) * Ensure SAI indexes empty byte buffers for types that allow them as a valid input (CASSANDRA-19461) * Deprecate Python 3.7 and earlier, but allow cqlsh to run with Python 3.6-3.11 (CASSANDRA-19467) * Set uuid_sstable_identifiers_enabled to true in cassandra-latest.yaml (CASSANDRA-19460) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ee75a0d95e6d7103a8d1874b5a1134f6e2816d56 Merge: c50718fd3d fdfc0019de Author: Ariel Weisberg AuthorDate: Fri Mar 22 16:50:40 2024 -0400 Merge branch 'cassandra-5.0' into trunk .build/build-owasp.xml | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c50718fd3d96a26e74652616256746baebfb0813 Merge: a69c8657d7 46acaf22e6 Author: Caleb Rackliffe AuthorDate: Fri Mar 22 11:44:40 2024 -0500 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Ensure SAI indexes empty byte buffers for types that allow them as a valid input CHANGES.txt| 1 + .../statements/schema/CreateIndexStatement.java| 2 +- .../index/sai/disk/v1/SSTableIndexWriter.java | 3 +- .../cassandra/index/sai/memory/MemtableIndex.java | 5 +- test/unit/accord/utils/Gens.java | 70 +--- .../index/sai/cql/AbstractSimpleEqTestBase.java| 92 + .../index/sai/cql/AllTypesSimpleEqTest.java| 95 ++ .../index/sai/cql/EmptyStringLifecycleTest.java| 79 ++ .../org/apache/cassandra/utils/Generators.java | 9 ++ 9 files changed, 343 insertions(+), 13 deletions(-) diff --cc CHANGES.txt index 7a63df43cc,c056c2785f..1e34cbe71e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,5 +1,31 @@@ -5.0-beta2 +5.1 + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Ensure SAI indexes empty byte buffers for types that allow them as a valid input (CASSANDRA-19461) * Deprecate Python 3.7 and earlier, but allow cqlsh to run with Python 3.6-3.11 (CASSANDRA-19467) * Set uuid_sstable_identifiers_enabled to true in cassandra-latest.yaml (CASSANDRA-19460) * Revert switching to approxTime in Dispatcher (CASSANDRA-19454) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. mikea pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit e6df9f0e3e23448cca04e48a7ba632358bb40902 Merge: 32b146dc63 7aab61b063 Author: Mike Adamson AuthorDate: Thu Mar 21 13:00:39 2024 + Merge branch 'cassandra-5.0' into trunk .../test/sai/VectorDistributedTest.java| 23 - .../cassandra/index/sai/cql/VectorLocalTest.java | 17 + .../index/sai/cql/VectorSegmentationTest.java | 29 +++--- .../cassandra/index/sai/cql/VectorTester.java | 10 .../index/sai/cql/VectorUpdateDeleteTest.java | 1 - .../apache/cassandra/index/sai/utils/Glove.java| 5 6 files changed, 35 insertions(+), 50 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 32b146dc632341124f8da9bef69de5cdf3bd2d0e Merge: 8f7c23be85 c3a18e36d1 Author: Bereng AuthorDate: Wed Mar 20 08:07:39 2024 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Minor bugs in generate.sh -d .circleci/config.yml | 81 --- .circleci/config.yml.FREE | 81 --- .circleci/config.yml.PAID | 81 --- .circleci/generate.sh | 47 ++- 4 files changed, 25 insertions(+), 265 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 8f7c23be85f3298f90d10ff9b39fa29a706f134d Merge: 3e6a551dba 8a33f32350 Author: Caleb Rackliffe AuthorDate: Tue Mar 19 23:46:18 2024 -0500 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Deprecate Python 3.7 and earlier, but allow cqlsh to run with Python 3.6-3.11 CHANGES.txt | 1 + NEWS.txt | 4 ++-- bin/cqlsh| 14 +++--- bin/cqlsh.py | 4 ++-- pylib/cqlshlib/test/run_cqlsh.py | 2 +- 5 files changed, 17 insertions(+), 8 deletions(-) diff --cc CHANGES.txt index c1b07e384f,056c84a82b..98c4245a93 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,29 -1,5 +1,30 @@@ -5.0-beta2 +5.1 + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Deprecate Python 3.7 and earlier, but allow cqlsh to run with Python 3.6-3.11 (CASSANDRA-19467) * Set uuid_sstable_identifiers_enabled to true in cassandra-latest.yaml (CASSANDRA-19460) * Revert switching to approxTime in Dispatcher (CASSANDRA-19454) * Add an optimized default configuration to tests and make it available for new users (CASSANDRA-18753) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 40319901e9fb67eeff1c0a89297db2021200f0ba Merge: 061cb88b3c 36a1ca5e48 Author: Stefan Miklosovic AuthorDate: Tue Mar 19 14:57:58 2024 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../apache/cassandra/db/virtual/SettingsTable.java | 14 -- .../cassandra/db/virtual/SettingsTableTest.java | 20 ++-- 3 files changed, 23 insertions(+), 12 deletions(-) diff --cc CHANGES.txt index 7bd2710ddf,a56ec17d01..c1b07e384f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -50,8 -25,9 +50,9 @@@ Merged from 5.0 * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) Merged from 4.1: + * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: * Push LocalSessions info logs to debug (CASSANDRA-18335) * Filter remote DC replicas out when constructing the initial replica plan for the local read repair (CASSANDRA-19120) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 86dc0c120abf369942a38eeb83e1cbaf1fd6ec77 Merge: 81a2cb782e bd2803307e Author: Brandon Williams AuthorDate: Thu Mar 14 10:28:02 2024 -0500 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../cassandra/repair/consistent/LocalSessions.java | 36 +++--- 2 files changed, 19 insertions(+), 18 deletions(-) diff --cc CHANGES.txt index af985568cd,4533e86b1c..f7ac26859f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -49,9 -25,10 +49,10 @@@ Merged from 5.0 * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) Merged from 4.1: - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: + * Push LocalSessions info logs to debug (CASSANDRA-18335) * Filter remote DC replicas out when constructing the initial replica plan for the local read repair (CASSANDRA-19120) * Remove redundant code in StorageProxy#sendToHintedReplicas (CASSANDRA-19412) * Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 da86cba2e2482ee6461142b1428bf131fbb8 Merge: 06558a8f56 2f836fa596 Author: Stefan Miklosovic AuthorDate: Tue Mar 12 13:40:01 2024 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + conf/cassandra_latest.yaml | 2 +- src/java/org/apache/cassandra/db/Directories.java | 70 +- test/conf/latest_diff.yaml | 2 + .../cassandra/distributed/impl/InstanceConfig.java | 2 + .../test/TableLevelIncrementalBackupsTest.java | 20 +-- .../apache/cassandra/index/CustomIndexTest.java| 2 +- 7 files changed, 90 insertions(+), 9 deletions(-) diff --cc CHANGES.txt index 9fc8dc5c45,2e543f1120..296d4cb2d9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,5 +1,27 @@@ -5.0-beta2 +5.1 + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Set uuid_sstable_identifiers_enabled to true in cassandra-latest.yaml (CASSANDRA-19460) * Revert switching to approxTime in Dispatcher (CASSANDRA-19454) * Add an optimized default configuration to tests and make it available for new users (CASSANDRA-18753) * Fix remote JMX under Java17 (CASSANDRA-19453) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit e8e7861f142d7e6cb178a0c1126d458956862460 Merge: 5d4bcc797a 451b0c010f Author: Bereng AuthorDate: Mon Mar 11 08:08:34 2024 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Test failure: org.apache.cassandra.distributed.test.UpgradeSSTablesTest .../cassandra/tools/nodetool/UpgradeSSTable.java | 27 +- 1 file changed, 21 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit baef2447bb3f9fc4d1d3326df39ee8437d999711 Merge: 28efb63df5 a26fa6cf2c Author: Caleb Rackliffe AuthorDate: Thu Mar 7 16:05:51 2024 -0600 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Revert switching to approxTime in Dispatcher CHANGES.txt| 1 + .../apache/cassandra/db/virtual/QueriesTable.java | 5 +++-- .../org/apache/cassandra/transport/Dispatcher.java | 22 +++--- .../cassandra/transport/MessageDispatcherTest.java | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) diff --cc CHANGES.txt index 06df50e173,cf542bbd58..9fc8dc5c45 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,5 +1,27 @@@ -5.0-beta2 +5.1 + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Revert switching to approxTime in Dispatcher (CASSANDRA-19454) * Add an optimized default configuration to tests and make it available for new users (CASSANDRA-18753) * Fix remote JMX under Java17 (CASSANDRA-19453) * Avoid consistency violations for SAI intersections over unrepaired data at consistency levels requiring reconciliation (CASSANDRA-19018) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
blambov pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 28efb63df52bafaf51cd458da021f6050900017a
Merge: bfb5c59342 06ed1afc34
Author: Branimir Lambov
AuthorDate: Thu Mar 7 11:22:48 2024 +0200
Merge branch 'cassandra-5.0' into trunk
.build/README.md |2 +-
.build/docker/run-tests.sh |2 +-
.build/run-tests.sh|4 +-
.circleci/config.yml | 2429 -
.circleci/config.yml.FREE | 2429 -
.circleci/config.yml.PAID | 2793 ++--
.circleci/config_template.yml | 374 ++-
.circleci/config_template.yml.PAID.patch | 66 +-
.jenkins/Jenkinsfile | 12 +-
CHANGES.txt|3 +-
NEWS.txt |6 +
build.xml | 47 +-
conf/cassandra.yaml| 52 +-
conf/{cassandra.yaml => cassandra_latest.yaml} | 116 +-
.../config/CassandraRelevantProperties.java|2 +
.../cassandra/config/DatabaseDescriptor.java |7 +-
src/java/org/apache/cassandra/db/ReadCommand.java |3 +
.../db/compaction/UnifiedCompactionStrategy.java |1 +
.../db/compaction/unified/Controller.java |5 +-
test/conf/{trie_memtable.yaml => latest_diff.yaml} | 37 +-
.../cassandra/distributed/impl/InstanceConfig.java | 39 +
.../cassandra/distributed/test/CasWriteTest.java | 33 +-
.../test/PreviewRepairSnapshotTest.java| 21 +-
.../test/SecondaryIndexCompactionTest.java |3 +
.../distributed/test/SecondaryIndexTest.java |2 +-
.../distributed/test/UpgradeSSTablesTest.java |6 +-
.../test/sai/ConcurrencyFactorTest.java|4 +-
test/unit/org/apache/cassandra/Util.java |8 +
.../cassandra/config/ParseAndConvertUnitsTest.java |3 +-
.../cql3/statements/DescribeStatementTest.java | 20 +-
.../validation/entities/FrozenCollectionsTest.java |3 +
.../entities/SecondaryIndexOnMapEntriesTest.java | 19 +-
.../miscellaneous/CrcCheckChanceTest.java | 61 +-
.../operations/CompactStorageSplit1Test.java |3 +
.../InsertInvalidateSizedRecordsTest.java |2 +
.../operations/InsertUpdateIfConditionTest.java|2 +-
.../validation/operations/SelectLimitTest.java |4 +-
.../operations/SelectMultiColumnRelationTest.java |4 +
.../operations/SelectOrderedPartitionerTest.java |6 +
.../operations/SelectSingleColumnRelationTest.java |7 +-
.../cql3/validation/operations/SelectTest.java | 52 +-
.../apache/cassandra/db/SchemaCQLHelperTest.java | 10 +-
.../db/compaction/ActiveCompactionsTest.java |4 +-
.../db/compaction/CancelCompactionsTest.java |7 +
.../db/compaction/unified/ControllerTest.java |8 +-
.../compaction/unified/ShardedMultiWriterTest.java | 11 +-
.../writers/CompactionAwareWriterTest.java |3 +-
.../repair/AbstractPendingAntiCompactionTest.java |5 +-
.../db/repair/PendingAntiCompactionTest.java |1 +
.../apache/cassandra/index/CustomIndexTest.java| 15 +-
.../cassandra/index/SecondaryIndexManagerTest.java |2 +
.../index/internal/CassandraIndexTest.java |2 +
.../sai/cql/MixedIndexImplementationsTest.java |3 +
.../io/sstable/CQLSSTableWriterClientTest.java |3 +-
.../cassandra/io/sstable/LegacySSTableTest.java|2 +-
.../apache/cassandra/service/StorageProxyTest.java |1 +
.../cassandra/tools/CompactionStressTest.java |4 +-
57 files changed, 4644 insertions(+), 4129 deletions(-)
diff --cc CHANGES.txt
index 43b128db24,4a005b4aab..06df50e173
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
-5.0-beta2
+5.1
+ * Modernize CQLSH datetime conversions (CASSANDRA-18879)
+ * Harry model and in-JVM tests for partition-restricted 2i queries
(CASSANDRA-18275)
+ * Refactor cqlshmain global constants (CASSANDRA-19201)
+ * Remove native_transport_port_ssl (CASSANDRA-19397)
+ * Make nodetool reconfigurecms sync by default and add --cancel to be able
to cancel ongoing reconfigurations (CASSANDRA-19216)
+ * Expose auth mode in system_views.clients, nodetool clientstats, metrics
(CASSANDRA-19366)
+ * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189)
+ * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271)
+ * Refactor structure of caching metrics and expose auth cache metrics via
JMX (CASSANDRA-17062)
+ * Allow CQL client certificate authentication to work without sending an
AUTHENTICATE request (CASSANDRA-18857)
- * Extend
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6e72cf0ee51a090ece17ff2981e4d101fd9f63f6 Merge: 8b429c8ef9 ebe07db602 Author: Bereng AuthorDate: Wed Mar 6 09:33:14 2024 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Test Failure: org.apache.cassandra.distributed.test.UpgradeSSTablesTest.truncateWhileUpgrading .../distributed/test/UpgradeSSTablesTest.java | 58 +++--- 1 file changed, 50 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 8b429c8ef9d9907dc3a435ffe7371ec69a9a85e5 Merge: 001f70367e 194a41baea Author: Brandon Williams AuthorDate: Mon Mar 4 14:18:28 2024 -0600 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + conf/jvm17-server.options | 1 + 2 files changed, 2 insertions(+) diff --cc CHANGES.txt index f3c3096705,225b9192e7..ec63666e67 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ -5.0-beta2 +5.1 + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Fix remote JMX under Java17 (CASSANDRA-19453) * Avoid consistency violations for SAI intersections over unrepaired data at consistency levels requiring reconciliation (CASSANDRA-19018) * Fix NullPointerException in ANN+WHERE when adding rows in another partition (CASSANDRA-19404) * Record latencies for SAI post-filtering reads against local storage (CASSANDRA-18940) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 58f0e2146b3d7f0bd09c4dbd9d1da5e43f37ed73 Merge: cd347bdc58 f7984627e7 Author: Caleb Rackliffe AuthorDate: Thu Feb 29 15:04:19 2024 -0600 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Avoid possible consistency violations for SAI intersection queries over partially updated rows at consistency levels that require reconciliation CHANGES.txt| 1 + .../cql3/restrictions/StatementRestrictions.java | 6 +- .../cassandra/cql3/statements/SelectStatement.java | 9 +- .../cassandra/db/AbstractReadCommandBuilder.java | 2 +- .../org/apache/cassandra/db/ConsistencyLevel.java | 15 +- src/java/org/apache/cassandra/db/ReadCommand.java | 34 +- .../db/compaction/CompactionIterator.java | 29 +- .../org/apache/cassandra/db/filter/RowFilter.java | 243 +- .../cassandra/db/rows/UnfilteredRowIterators.java | 33 +- .../apache/cassandra/index/sai/QueryContext.java | 14 +- .../cassandra/index/sai/StorageAttachedIndex.java | 17 +- .../index/sai/disk/IndexSearchResultIterator.java | 14 +- .../index/sai/disk/PerColumnIndexWriter.java | 4 +- .../cassandra/index/sai/disk/RowMapping.java | 39 +- .../index/sai/disk/v1/MemtableIndexWriter.java | 38 +- .../index/sai/iterators/KeyRangeIterator.java | 2 +- .../index/sai/iterators/KeyRangeUnionIterator.java | 38 +- .../cassandra/index/sai/plan/FilterTree.java | 58 ++- .../apache/cassandra/index/sai/plan/Operation.java | 32 +- .../cassandra/index/sai/plan/QueryController.java | 95 +++- .../cassandra/index/sai/plan/QueryViewBuilder.java | 78 +--- .../sai/plan/StorageAttachedIndexQueryPlan.java| 30 +- .../sai/plan/StorageAttachedIndexSearcher.java | 68 +-- .../cassandra/service/reads/DataResolver.java | 55 ++- .../service/reads/ReplicaFilteringProtection.java | 86 ++-- .../reads/repair/RowIteratorMergeListener.java | 10 +- .../test/ReplicaFilteringProtectionTest.java | 78 ++-- .../test/sai/ConcurrencyFactorTest.java| 9 +- .../test/sai/PartialUpdateHandlingTest.java| 494 + .../test/sai/ReplicaFilteringProtectionTest.java | 67 --- .../distributed/test/sai/StrictFilteringTest.java | 227 ++ test/unit/org/apache/cassandra/db/CleanupTest.java | 2 +- .../org/apache/cassandra/db/ReadCommandTest.java | 6 +- .../db/ReadCommandVerbHandlerOutOfRangeTest.java | 4 +- .../cql/intersection/RandomIntersectionTester.java | 6 +- .../cassandra/index/sai/plan/OperationTest.java| 86 ++-- .../apache/cassandra/index/sasi/SASIIndexTest.java | 4 +- 37 files changed, 1408 insertions(+), 625 deletions(-) diff --cc CHANGES.txt index 24da866a5f,9808945582..fbbc57216b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -5.0-beta2 +5.1 + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Avoid consistency violations for SAI intersections over unrepaired data at consistency levels requiring reconciliation (CASSANDRA-19018) * Fix NullPointerException in ANN+WHERE when adding rows in another partition (CASSANDRA-19404) * Record latencies for SAI post-filtering reads against
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit cd347bdc5810654ea04cc45e0affa9304d0f1798 Merge: bf124a30da 54cf65476a Author: Ekaterina Dimitrova AuthorDate: Thu Feb 29 09:23:52 2024 -0500 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../index/sai/iterators/KeyRangeOrderingIterator.java | 3 ++- .../apache/cassandra/index/sai/cql/VectorTypeTest.java | 18 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 884a94a59a,d650f0cf34..24da866a5f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -5.0-beta2 +5.1 + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Fix NullPointerException in ANN+WHERE when adding rows in another partition (CASSANDRA-19404) * Record latencies for SAI post-filtering reads against local storage (CASSANDRA-18940) * Fix VectorMemoryIndex#update logic to compare vectors. Fix Index view (CASSANDRA-19168) * Deprecate native_transport_port_ssl (CASSANDRA-19392) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 bf124a30da5c50f5d1cf0c195cc7750098d9460d
Merge: c26be50107 106be29feb
Author: Stefan Miklosovic
AuthorDate: Thu Feb 29 12:01:55 2024 +0100
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/ClientWarn.java | 6 --
2 files changed, 5 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index f9f28ba23d,db78d5a5cb..884a94a59a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -46,7 -26,11 +46,8 @@@ Merged from 4.0
* Remove redundant code in StorageProxy#sendToHintedReplicas
(CASSANDRA-19412)
* Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416)
* Add new concurrent_merkle_tree_requests config property to prevent OOM
during multi-range and/or multi-table repairs (CASSANDRA-19336)
- * Skip version check if an endpoint is dead state in
Gossiper#upgradeFromVersionSupplier (CASSANDRA-19187)
- * Fix Gossiper::hasMajorVersion3Nodes to return false during minor upgrade
(CASSANDRA-18999)
- * Revert unnecessary read lock acquisition when reading ring version in
TokenMetadata introduced in CASSANDRA-16286 (CASSANDRA-19107)
Merged from 3.11:
+ * Move ClientWarn.State#warnings to a thread-safe list (CASSANDRA-19427)
Merged from 3.0:
* Fix SCM URL link (CASSANDRA-19422)
* Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824)
diff --cc src/java/org/apache/cassandra/service/ClientWarn.java
index 56aa421b19,7f67a1168a..13cb21d6b2
--- a/src/java/org/apache/cassandra/service/ClientWarn.java
+++ b/src/java/org/apache/cassandra/service/ClientWarn.java
@@@ -89,8 -70,9 +89,10 @@@ public class ClientWarn extends Executo
public static class State
{
+private boolean collecting = true;
- private final List warnings = new ArrayList<>();
+ // This must be a thread-safe list. Even though it's wrapped in a
ThreadLocal, it's propagated to each thread
+ // from shared state, so multiple threads can reference the same
State.
+ private final List warnings = new CopyOnWriteArrayList<>();
private void add(String warning)
{
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c26be50107f9489ceb49531f2b914b30267a48bf Merge: ce963bc991 ab25cae4c5 Author: Bereng AuthorDate: Wed Feb 28 08:01:21 2024 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Skinny dev circle workflow .circleci/generate.sh | 88 +-- 1 file changed, 86 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ce963bc991506190b1092b8190e9c42a9bfb6621 Merge: 81e253b166 1d7bae3697 Author: Caleb Rackliffe AuthorDate: Mon Feb 26 15:28:25 2024 -0600 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Record latencies for SAI post-filtering reads against local storage CHANGES.txt| 1 + .../index/sai/metrics/TableQueryMetrics.java | 4 +++ .../cassandra/index/sai/plan/QueryController.java | 14 + .../sai/plan/StorageAttachedIndexSearcher.java | 33 +- .../index/sai/metrics/QueryMetricsTest.java| 6 +++- .../cassandra/index/sai/plan/OperationTest.java| 9 ++ 6 files changed, 33 insertions(+), 34 deletions(-) diff --cc CHANGES.txt index eecbc9e50e,4f35041497..f9f28ba23d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -5.0-beta2 +5.1 + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Record latencies for SAI post-filtering reads against local storage (CASSANDRA-18940) * Fix VectorMemoryIndex#update logic to compare vectors. Fix Index view (CASSANDRA-19168) * Deprecate native_transport_port_ssl (CASSANDRA-19392) * Update packaging shell includes (CASSANDRA-19283) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 81e253b1665ea8cee12f4e81dcaa7325c2f2e223 Merge: ec9a553f7d 939fbfa63f Author: Bereng AuthorDate: Mon Feb 26 07:49:03 2024 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Bug in generate.sh removal of jobs .circleci/generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ec9a553f7d3a6230b0c6848391fddd68dec94102 Merge: cf71b602e6 53cd2d8286 Author: Ekaterina Dimitrova AuthorDate: Fri Feb 23 14:08:05 2024 -0500 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../cassandra/index/sai/memory/VectorMemoryIndex.java | 3 +-- .../apache/cassandra/index/sai/view/RangeTermTree.java| 15 ++- src/java/org/apache/cassandra/index/sai/view/View.java| 3 ++- 4 files changed, 10 insertions(+), 12 deletions(-) diff --cc CHANGES.txt index 8460e99058,20e0c6e959..eecbc9e50e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -5.0-beta2 +5.1 + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Fix VectorMemoryIndex#update logic to compare vectors. Fix Index view (CASSANDRA-19168) * Deprecate native_transport_port_ssl (CASSANDRA-19392) * Update packaging shell includes (CASSANDRA-19283) * Fix data corruption in VectorCodec when using heap buffers (CASSANDRA-19167) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 cf71b602e61519477a60e4f0f4fac98bdb0af190 Merge: 2c0371a311 2482c8a936 Author: Stefan Miklosovic AuthorDate: Fri Feb 23 14:52:57 2024 +0100 Merge branch 'cassandra-5.0' into trunk .build/cassandra-deps-template.xml | 2 +- .build/parent-pom-template.xml | 2 +- CHANGES.txt| 1 + build.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 03c3fd2840,d02922f756..8460e99058 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -44,8 -24,12 +44,9 @@@ Merged from 4.0 * Remove redundant code in StorageProxy#sendToHintedReplicas (CASSANDRA-19412) * Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416) * Add new concurrent_merkle_tree_requests config property to prevent OOM during multi-range and/or multi-table repairs (CASSANDRA-19336) - * Skip version check if an endpoint is dead state in Gossiper#upgradeFromVersionSupplier (CASSANDRA-19187) - * Fix Gossiper::hasMajorVersion3Nodes to return false during minor upgrade (CASSANDRA-18999) - * Revert unnecessary read lock acquisition when reading ring version in TokenMetadata introduced in CASSANDRA-16286 (CASSANDRA-19107) Merged from 3.11: Merged from 3.0: + * Fix SCM URL link (CASSANDRA-19422) * Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824) diff --cc build.xml index a4395d4ff5,bb4355b413..11b7254a14 --- a/build.xml +++ b/build.xml @@@ -33,10 -33,10 +33,10 @@@ - + https://gitbox.apache.org/repos/asf/cassandra.git"/> https://gitbox.apache.org/repos/asf/cassandra.git"/> - https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/> + https://gitbox.apache.org/repos/asf?p=cassandra.git"/>
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 2c0371a3116254931271531866de6b03e2142473
Merge: 77a3e0e818 bfc6e1241d
Author: Stefan Miklosovic
AuthorDate: Fri Feb 23 00:04:56 2024 +0100
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt| 1 +
.../org/apache/cassandra/locator/ReplicaPlans.java | 4 +-
.../reads/repair/BlockingPartitionRepair.java | 39
.../reads/repair/AbstractReadRepairTest.java | 100 +++--
.../reads/repair/BlockingReadRepairTest.java | 41 +++--
.../repair/DiagEventsBlockingReadRepairTest.java | 2 +-
.../service/reads/repair/ReadRepairTest.java | 25 ++
7 files changed, 112 insertions(+), 100 deletions(-)
diff --cc CHANGES.txt
index b6ed3bc3e0,00d61ea3b9..03c3fd2840
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -37,9 -17,10 +37,10 @@@ Merged from 5.0
* Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
* Suppress CVE-2023-6481 (CASSANDRA-19184)
Merged from 4.1:
- * Memoize Cassandra verion and add a backoff interval for failed schema
pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
+ * Filter remote DC replicas out when constructing the initial replica plan
for the local read repair (CASSANDRA-19120)
* Remove redundant code in StorageProxy#sendToHintedReplicas
(CASSANDRA-19412)
* Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416)
* Add new concurrent_merkle_tree_requests config property to prevent OOM
during multi-range and/or multi-table repairs (CASSANDRA-19336)
diff --cc
src/java/org/apache/cassandra/service/reads/repair/BlockingPartitionRepair.java
index 0d2ac069d5,f2b519081d..61b529ca00
---
a/src/java/org/apache/cassandra/service/reads/repair/BlockingPartitionRepair.java
+++
b/src/java/org/apache/cassandra/service/reads/repair/BlockingPartitionRepair.java
@@@ -61,36 -60,34 +60,36 @@@ public class BlockingPartitionRepai
extends AsyncFuture implements RequestCallback
{
private final DecoratedKey key;
-private final ReplicaPlan.ForWrite writePlan;
+private final ReplicaPlan.ForWrite repairPlan;
private final Map pendingRepairs;
private final CountDownLatch latch;
- private final Predicate shouldBlockOn;
-
+private final int blockFor;
private volatile long mutationsSentTime;
-public BlockingPartitionRepair(DecoratedKey key, Map
repairs, ReplicaPlan.ForWrite writePlan)
+public BlockingPartitionRepair(DecoratedKey key, Map
repairs, ReplicaPlan.ForWrite repairPlan)
- {
- this(key, repairs, repairPlan,
- repairPlan.consistencyLevel().isDatacenterLocal() ?
InOurDc.endpoints() : Predicates.alwaysTrue());
- }
-
- @VisibleForTesting
- public BlockingPartitionRepair(DecoratedKey key, Map
repairs, ReplicaPlan.ForWrite repairPlan, Predicate
shouldBlockOn)
{
this.key = key;
this.pendingRepairs = new ConcurrentHashMap<>(repairs);
-this.writePlan = writePlan;
++this.repairPlan = repairPlan;
+
+ // make sure all the read repair targets are contact of the repair
write plan
-Preconditions.checkState(all(repairs.keySet(), (r) ->
writePlan.contacts().contains(r)),
++Preconditions.checkState(all(repairs.keySet(), (r) ->
repairPlan.contacts().contains(r)),
+ "All repair targets should be part of
contacts of read repair write plan.");
+
-int blockFor = writePlan.writeQuorum();
-// here we remove empty repair mutations from the block for total,
since
-// we're not sending them mutations
-for (Replica participant : writePlan.contacts())
+// Remove empty repair mutations from the block for total, since
we're not sending them.
+// Besides, remote dcs can sometimes get involved in dc-local reads.
We want to repair them if they do, but we
+// they shouldn't block for them.
+int adjustedBlockFor = repairPlan.writeQuorum();
+for (Replica participant : repairPlan.contacts())
{
- if (!repairs.containsKey(participant) &&
shouldBlockOn.test(participant.endpoint()))
+ if (!repairs.containsKey(participant))
-blockFor--;
+adjustedBlockFor--;
+
+ // make sure for local consistency, all contacts are local
replicas
-
Preconditions.checkState(!writePlan.consistencyLevel().isDatacenterLocal() ||
InOurDc.replicas().test(participant),
++
Preconditions.checkState(!repairPlan.consistencyLevel().isDatacenterLocal() ||
InOurDc.replicas().test(participant),
+
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 77a3e0e818df3cce45a974ecc977ad61bdcace47 Merge: 9cc688e978 5aefc95fbe Author: Stefan Miklosovic AuthorDate: Thu Feb 22 10:03:30 2024 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 7 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --cc CHANGES.txt index 1e31dcdc0d,4876e6ace0..b6ed3bc3e0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -37,11 -17,15 +37,12 @@@ Merged from 5.0 * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) Merged from 4.1: - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: + * Remove redundant code in StorageProxy#sendToHintedReplicas (CASSANDRA-19412) * Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416) * Add new concurrent_merkle_tree_requests config property to prevent OOM during multi-range and/or multi-table repairs (CASSANDRA-19336) - * Skip version check if an endpoint is dead state in Gossiper#upgradeFromVersionSupplier (CASSANDRA-19187) - * Fix Gossiper::hasMajorVersion3Nodes to return false during minor upgrade (CASSANDRA-18999) - * Revert unnecessary read lock acquisition when reading ring version in TokenMetadata introduced in CASSANDRA-16286 (CASSANDRA-19107) Merged from 3.11: Merged from 3.0: * Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 9cc688e978826baa8e44a78b3a46cea3a2aa1c5a Merge: 1163dd9a08 5ae1294cb1 Author: Stefan Miklosovic AuthorDate: Wed Feb 21 09:15:27 2024 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + conf/cassandra-env.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index d2f959ee48,bb93d9d802..1e31dcdc0d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -37,10 -17,14 +37,11 @@@ Merged from 5.0 * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) Merged from 4.1: - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: + * Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416) * Add new concurrent_merkle_tree_requests config property to prevent OOM during multi-range and/or multi-table repairs (CASSANDRA-19336) - * Skip version check if an endpoint is dead state in Gossiper#upgradeFromVersionSupplier (CASSANDRA-19187) - * Fix Gossiper::hasMajorVersion3Nodes to return false during minor upgrade (CASSANDRA-18999) - * Revert unnecessary read lock acquisition when reading ring version in TokenMetadata introduced in CASSANDRA-16286 (CASSANDRA-19107) Merged from 3.11: Merged from 3.0: * Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824) diff --cc conf/cassandra-env.sh index 0b1dec45ed,ba9f9d4596..4e28e687f9 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@@ -271,8 -271,13 +271,8 @@@ JVM_OPTS="$JVM_OPTS -Dcom.sun.managemen #MX4J_ADDRESS="127.0.0.1" #MX4J_PORT="8081" -# Cassandra uses SIGAR to capture OS metrics CASSANDRA-7838 -# for SIGAR we have to set the java.library.path -# to the location of the native libraries. -JVM_OPTS="$JVM_OPTS -Djava.library.path=$CASSANDRA_HOME/lib/sigar-bin" - if [ "x$MX4J_ADDRESS" != "x" ]; then - if [[ "$MX4J_ADDRESS" == \-Dmx4jaddress* ]]; then + if [ "$(echo "$MX4J_ADDRESS" | grep -c "\-Dmx4jaddress")" = "1" ]; then # Backward compatible with the older style #13578 JVM_OPTS="$JVM_OPTS $MX4J_ADDRESS" else - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 3c76ae2a45138222b0a797c63def82d3bfa4dc6a Merge: 3483fc0683 2aa2b59d37 Author: Stefan Miklosovic AuthorDate: Fri Feb 16 13:36:15 2024 +0100 Merge branch 'cassandra-5.0' into trunk NEWS.txt | 2 +- doc/cql3/CQL.textile | 4 +- .../CQL/sai/create-vector-index-cycling.cql| 4 +- .../examples/CQL/sai/create-vector-index.cql | 4 +- .../CQL/sai/cyclist_semi_pro_sai_indices.cql | 16 +-- .../examples/CQL/sai/index-sai-case-sensitive.cql | 4 +- ...dex-sai-composite-partition-key-index-match.cql | 8 +- .../examples/CQL/sai/index-sai-from-list-match.cql | 4 +- .../examples/CQL/sai/index-sai-from-set-match.cql | 4 +- .../index-sai-multiple-index-match-with-and.cql| 12 +-- .../CQL/sai/index-sai-similarity-function.cql | 4 +- .../CQL/sai/index-sai-single-index-match.cql | 4 +- .../examples/CQL/sai/index-sai-udt-match.cql | 4 +- .../cassandra/examples/CQL/sai/sai-error.cql | 4 +- .../RESULTS/sai/cyclist_semi_pro_describe.result | 8 +- .../pages/developing/cql/cql_singlefile.adoc | 4 +- .../pages/developing/cql/create-custom-index.adoc | 14 +-- .../developing/cql/indexing/sai/_sai-create.adoc | 2 +- .../pages/developing/cql/indexing/sai/sai-faq.adoc | 18 ++-- .../cassandra/pages/managing/operating/repair.adoc | 11 +- .../cql-commands/create-custom-index.adoc | 18 ++-- .../pages/reference/cql-commands/create-index.adoc | 118 + .../pages/reference/vector-data-type.adoc | 2 + .../cassandra/pages/vector-search/concepts.adoc| 1 + .../pages/vector-search/data-modeling.adoc | 35 +- .../cassandra/partials/table-properties.adoc | 2 +- pylib/cqlshlib/cqlshmain.py| 2 +- 27 files changed, 213 insertions(+), 100 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 3483fc06833f86c7250f998dbd5ccbf464ef1c48 Merge: 48607b8395 0f2da96c6c Author: Stefan Miklosovic AuthorDate: Fri Feb 16 10:08:08 2024 +0100 Merge branch 'cassandra-5.0' into trunk .../cassandra/examples/CQL/ddm_alter_mask.cql | 1 - .../cassandra/examples/CQL/ddm_create_table.cql| 5 - .../examples/CQL/ddm_create_table_with_udf.cql | 11 -- .../cassandra/examples/CQL/ddm_create_users.cql| 6 - .../cassandra/examples/CQL/ddm_drop_mask.cql | 1 - .../cassandra/examples/CQL/ddm_insert_data.cql | 2 - .../cassandra/examples/CQL/ddm_revoke_unmask.cql | 1 - .../CQL/ddm_select_with_masked_columns.cql | 6 - .../examples/CQL/ddm_select_with_select_masked.cql | 8 - .../CQL/ddm_select_with_unmask_permission.cql | 7 - .../CQL/ddm_select_without_select_masked.cql | 6 - .../CQL/ddm_select_without_unmask_permission.cql | 7 - .../examples/CQL/dynamic-data-masking.cql | 99 ...unctions.cql => select-with-mask-functions.cql} | 0 doc/modules/cassandra/nav.adoc | 1 + .../pages/developing/cql/dynamic-data-masking.adoc | 179 + .../pages/developing/cql/dynamic_data_masking.adoc | 179 - .../cassandra/pages/developing/cql/index.adoc | 2 +- .../developing/cql/indexing/sai/sai-query.adoc | 2 +- doc/modules/cassandra/pages/new/index.adoc | 6 +- .../cassandra/partials/masking_functions.adoc | 30 +++- 21 files changed, 306 insertions(+), 253 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 48607b83952ab923c401fd7886d76a5a5a5b3c78 Merge: 8bdf2615bc a04dc83cfc Author: Stefan Miklosovic AuthorDate: Wed Feb 14 21:19:10 2024 +0100 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 8bdf2615bcca6eacc7fd9debc7a68a917048df83 Merge: 3acec3c28e 8b037a6c84 Author: Stefan Miklosovic AuthorDate: Wed Feb 14 15:53:38 2024 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + NEWS.txt | 6 ++ conf/cassandra.yaml | 1 + src/java/org/apache/cassandra/config/Config.java | 2 ++ .../org/apache/cassandra/config/DatabaseDescriptor.java | 16 5 files changed, 22 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index d73539808e,30413804a5..d470d8f813 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,5 +1,23 @@@ -5.0-beta2 +5.1 + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Deprecate native_transport_port_ssl (CASSANDRA-19392) * Update packaging shell includes (CASSANDRA-19283) * Fix data corruption in VectorCodec when using heap buffers (CASSANDRA-19167) * Avoid over-skipping of key iterators from static column indexes during mixed intersections (CASSANDRA-19278) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 5ca972b145863bcf4eefe9c2027d0814b9e9abf1 Merge: aa3ee3c7f1 69f735d61f Author: Brandon Williams AuthorDate: Thu Feb 8 06:14:07 2024 -0600 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + debian/patches/cassandra_in.sh_dirs.diff | 62 +++- redhat/cassandra.in.sh | 69 3 files changed, 68 insertions(+), 64 deletions(-) diff --cc CHANGES.txt index 4eb4c9a822,ba14a12911..5ad47d72bd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,5 +1,19 @@@ -5.0-beta2 +5.1 + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Update packaging shell includes (CASSANDRA-19283) * Fix data corruption in VectorCodec when using heap buffers (CASSANDRA-19167) * Avoid over-skipping of key iterators from static column indexes during mixed intersections (CASSANDRA-19278) * Make concurrent_index_builders configurable at runtime (CASSANDRA-19266) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit aa3ee3c7f12ab89f8590d1366135afc65c042095
Merge: 64e2a4e9a3 5b9321eee1
Author: Andrés de la Peña
AuthorDate: Thu Feb 8 11:34:27 2024 +
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt| 1 +
conf/cassandra.yaml| 36 +-
src/java/org/apache/cassandra/config/Config.java | 2 +
.../cassandra/config/DatabaseDescriptor.java | 10 ++
.../cassandra/repair/AbstractRepairTask.java | 5 +-
.../cassandra/repair/IncrementalRepairTask.java| 4 +-
.../apache/cassandra/repair/NormalRepairTask.java | 4 +-
.../apache/cassandra/repair/PreviewRepairTask.java | 4 +-
.../apache/cassandra/repair/RepairCoordinator.java | 4 +-
.../org/apache/cassandra/repair/RepairJob.java | 129 ++-
.../org/apache/cassandra/repair/RepairSession.java | 3 +
.../org/apache/cassandra/repair/RepairTask.java| 6 +-
.../org/apache/cassandra/repair/Scheduler.java | 118 ++
.../cassandra/service/ActiveRepairService.java | 17 ++-
.../service/ActiveRepairServiceMBean.java | 4 +
.../test/OptimiseStreamsRepairTest.java| 17 +--
.../repair/ConcurrentValidationRequestsTest.java | 136 +
.../org/apache/cassandra/repair/RepairJobTest.java | 5 +-
.../apache/cassandra/repair/RepairSessionTest.java | 2 +-
19 files changed, 412 insertions(+), 95 deletions(-)
diff --cc CHANGES.txt
index 9b8da81077,4f223e469a..4eb4c9a822
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -29,9 -15,13 +29,10 @@@ Merged from 5.0
* Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
* Suppress CVE-2023-6481 (CASSANDRA-19184)
Merged from 4.1:
- * Memoize Cassandra verion and add a backoff interval for failed schema
pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
+ * Add new concurrent_merkle_tree_requests config property to prevent OOM
during multi-range and/or multi-table repairs (CASSANDRA-19336)
- * Skip version check if an endpoint is dead state in
Gossiper#upgradeFromVersionSupplier (CASSANDRA-19187)
- * Fix Gossiper::hasMajorVersion3Nodes to return false during minor upgrade
(CASSANDRA-18999)
- * Revert unnecessary read lock acquisition when reading ring version in
TokenMetadata introduced in CASSANDRA-16286 (CASSANDRA-19107)
Merged from 3.11:
Merged from 3.0:
* Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824)
diff --cc src/java/org/apache/cassandra/repair/RepairJob.java
index e88ef970af,c9966c5a05..caba564061
--- a/src/java/org/apache/cassandra/repair/RepairJob.java
+++ b/src/java/org/apache/cassandra/repair/RepairJob.java
@@@ -127,9 -124,8 +125,8 @@@ public class RepairJob extends AsyncFut
List allEndpoints = new
ArrayList<>(session.state.commonRange.endpoints);
allEndpoints.add(ctx.broadcastAddressAndPort());
- Future> treeResponses;
Future paxosRepair;
-if (paxosRepairEnabled() && ((useV2() && session.repairPaxos) ||
session.paxosOnly))
+if (paxosRepairEnabled() && (((useV2() || isMetadataKeyspace()) &&
session.repairPaxos) || session.paxosOnly))
{
logger.info("{} {}.{} starting paxos repair",
session.previewKind.logPrefix(session.getId()), desc.keyspace,
desc.columnFamily);
TableMetadata metadata =
Schema.instance.getTableMetadata(desc.keyspace, desc.columnFamily);
diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java
index cc69368248,7324b968a4..6b2e814185
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@@ -82,10 -87,10 +82,11 @@@ import org.apache.cassandra.repair.NoSu
import org.apache.cassandra.repair.RepairJobDesc;
import org.apache.cassandra.repair.RepairParallelism;
import org.apache.cassandra.repair.RepairSession;
++import org.apache.cassandra.repair.Scheduler;
+import org.apache.cassandra.repair.SharedContext;
import org.apache.cassandra.repair.consistent.CoordinatorSessions;
import org.apache.cassandra.repair.consistent.LocalSessions;
+import org.apache.cassandra.repair.consistent.RepairedState;
import org.apache.cassandra.repair.consistent.admin.CleanupSummary;
import org.apache.cassandra.repair.consistent.admin.PendingStats;
import org.apache.cassandra.repair.consistent.admin.RepairStats;
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 097c1231e2466163fe3f8b36b12cdc5235eb1403
Merge: 1a971dab7e 78dca99973
Author: Jacek Lewandowski
AuthorDate: Wed Feb 7 15:12:04 2024 +0100
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Backport CASSANDRA-16418 to 3.x
CHANGES.txt| 1 +
.../test/ring/CleanupDuringRangeMovementTest.java | 56 --
2 files changed, 32 insertions(+), 25 deletions(-)
diff --cc CHANGES.txt
index a6107c29a8,1549165f6c..367d65ecdb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -28,11 -15,15 +28,12 @@@ Merged from 5.0
* Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
* Suppress CVE-2023-6481 (CASSANDRA-19184)
Merged from 4.1:
- * Memoize Cassandra verion and add a backoff interval for failed schema
pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
- * Skip version check if an endpoint is dead state in
Gossiper#upgradeFromVersionSupplier (CASSANDRA-19187)
- * Fix Gossiper::hasMajorVersion3Nodes to return false during minor upgrade
(CASSANDRA-18999)
- * Revert unnecessary read lock acquisition when reading ring version in
TokenMetadata introduced in CASSANDRA-16286 (CASSANDRA-19107)
Merged from 3.11:
Merged from 3.0:
+ * Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824)
5.0-beta1
diff --cc
test/distributed/org/apache/cassandra/distributed/test/ring/CleanupDuringRangeMovementTest.java
index bc46a1fe7b,00..8e80732400
mode 100644,00..100644
---
a/test/distributed/org/apache/cassandra/distributed/test/ring/CleanupDuringRangeMovementTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/ring/CleanupDuringRangeMovementTest.java
@@@ -1,145 -1,0 +1,151 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.distributed.test.ring;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.junit.Test;
+
+import org.apache.cassandra.distributed.Cluster;
+import org.apache.cassandra.distributed.Constants;
+import org.apache.cassandra.distributed.api.ConsistencyLevel;
+import org.apache.cassandra.distributed.api.IInstanceConfig;
+import org.apache.cassandra.distributed.api.IInvokableInstance;
+import org.apache.cassandra.distributed.api.NodeToolResult;
+import org.apache.cassandra.distributed.shared.NetworkTopology;
+import org.apache.cassandra.distributed.test.TestBaseImpl;
+import org.apache.cassandra.tcm.transformations.PrepareJoin;
+import org.apache.cassandra.tcm.transformations.PrepareLeave;
+
++import static org.apache.cassandra.distributed.api.Feature.GOSSIP;
++import static org.apache.cassandra.distributed.api.Feature.NETWORK;
++import static
org.apache.cassandra.distributed.api.TokenSupplier.evenlyDistributedTokens;
+import static
org.apache.cassandra.distributed.shared.ClusterUtils.decommission;
+import static
org.apache.cassandra.distributed.shared.ClusterUtils.pauseBeforeCommit;
+import static
org.apache.cassandra.distributed.shared.ClusterUtils.unpauseCommits;
- import static
org.apache.cassandra.distributed.test.ring.BootstrapTest.populateExistingTable;
+import static org.junit.Assert.assertEquals;
- import static org.apache.cassandra.distributed.api.Feature.GOSSIP;
- import static org.apache.cassandra.distributed.api.Feature.NETWORK;
- import static
org.apache.cassandra.distributed.api.TokenSupplier.evenlyDistributedTokens;
+import static org.junit.Assert.assertTrue;
+
+public class CleanupDuringRangeMovementTest extends TestBaseImpl
+{
+@Test
+public void cleanupDuringDecommissionTest() throws Throwable
+{
+ExecutorService executor = Executors.newSingleThreadExecutor();
- try (Cluster cluster = builder().withNodes(2)
-
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 1a971dab7ee91a610d037b97ff5808cda7ed0b25 Merge: 997302d8a9 1086d10965 Author: Bereng AuthorDate: Wed Feb 7 08:31:49 2024 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: In-jvm dtest RepairTest fails with storage_compatibility_mode: NONE src/java/org/apache/cassandra/gms/Gossiper.java | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 997302d8a9a9b89f8e7fbc1821d693e04d314a66 Merge: a9b6fafc4f 9fe32fa8b5 Author: Brandon Williams AuthorDate: Fri Feb 2 07:25:40 2024 -0600 Merge branch 'cassandra-5.0' into trunk .circleci/config.yml | 46 +-- .circleci/config.yml.FREE | 46 +-- .circleci/config.yml.PAID | 46 +-- .circleci/config_template.yml | 2 +- 4 files changed, 70 insertions(+), 70 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a9b6fafc4f18fd23889e155b7560c9dd66eb5419 Merge: c09d0d929b ef6864fa66 Author: Ekaterina Dimitrova AuthorDate: Wed Jan 31 11:23:06 2024 -0500 Merge branch 'cassandra-5.0' into trunk test/conf/cassandra.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit dadf850ce296630e90aaf9aa55046ab368e07d20 Merge: fbd7ba5fa1 e3ce316cce Author: Ekaterina Dimitrova AuthorDate: Mon Jan 29 18:45:39 2024 -0500 Merge branch 'cassandra-5.0' into trunk doc/modules/cassandra/pages/reference/java17.adoc | 46 ++- 1 file changed, 20 insertions(+), 26 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit fbd7ba5fa15f3934fa3461979145fc475bad55c1 Merge: cf93734492 0f4a237d01 Author: Ekaterina Dimitrova AuthorDate: Mon Jan 29 18:18:19 2024 -0500 Merge branch 'cassandra-5.0' into trunk NEWS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d6c7c87f553a66b8fc270b273886e5fdf3a34f41 Merge: 37acd27f2d 87f2a7b763 Author: Caleb Rackliffe AuthorDate: Mon Jan 29 09:50:57 2024 -0600 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Avoid over-skipping of key iterators from static column indexes during mixed intersections CHANGES.txt| 1 + .../cassandra/index/sai/disk/RowMapping.java | 49 ++-- .../index/sai/disk/v1/MemtableIndexWriter.java | 31 +-- .../iterators/KeyRangeIntersectionIterator.java| 114 ++--- .../index/sai/iterators/KeyRangeIterator.java | 8 +- .../cassandra/index/sai/utils/PrimaryKey.java | 53 +++- .../index/sai/cql/RandomIntersectionTest.java | 227 - .../index/sai/cql/StaticColumnIndexTest.java | 21 +- .../cql/intersection/RandomIntersectionTester.java | 270 + .../intersection/RandomMixedIntersectionTest.java | 53 .../RandomMixedPartitionIntersectionTest.java | 53 .../RandomRegularIntersectionTest.java | 53 .../RandomRegularPartitionIntersectionTest.java| 53 .../intersection/RandomStaticIntersectionTest.java | 53 .../RandomStaticPartitionIntersectionTest.java | 53 .../TwoRegularOneStaticIntersectionTest.java | 53 ...oRegularOneStaticPartitionIntersectionTest.java | 53 .../cassandra/index/sai/utils/PrimaryKeyTest.java | 3 +- 18 files changed, 897 insertions(+), 304 deletions(-) diff --cc CHANGES.txt index 1c272c5110,90cb544d10..747936c149 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ -5.0-beta2 +5.1 + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Avoid over-skipping of key iterators from static column indexes during mixed intersections (CASSANDRA-19278) * Make concurrent_index_builders configurable at runtime (CASSANDRA-19266) * Fix storage_compatibility_mode for streaming (CASSANDRA-19126) * Add support of vector type to cqlsh COPY command (CASSANDRA-19118) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 f6707e6191a994371704f639323a31f9ecc6bcb5 Merge: 2f2bb70ccb c00ebc8d2d Author: Stefan Miklosovic AuthorDate: Thu Jan 25 10:23:22 2024 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + src/java/org/apache/cassandra/config/Config.java | 2 +- .../cassandra/config/DatabaseDescriptor.java | 5 ++ .../cassandra/db/compaction/CompactionManager.java | 84 +- .../db/compaction/CompactionManagerMBean.java | 8 +++ .../apache/cassandra/service/StorageService.java | 15 .../cassandra/service/StorageServiceMBean.java | 3 + 7 files changed, 99 insertions(+), 19 deletions(-) diff --cc CHANGES.txt index 1a06b877f4,73b0ecdea9..1c272c5110 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ -5.0-beta2 +5.1 + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Make concurrent_index_builders configurable at runtime (CASSANDRA-19266) * Fix storage_compatibility_mode for streaming (CASSANDRA-19126) * Add support of vector type to cqlsh COPY command (CASSANDRA-19118) * Make CQLSSTableWriter to support building of SAI indexes (CASSANDRA-18714) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 2f2bb70ccb2657a75abc5aa691cfa28924f98d10 Merge: dac61b4b40 4a6a015814 Author: Stefan Miklosovic AuthorDate: Tue Jan 23 20:59:12 2024 +0100 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 dac61b4b40be142e167f5dd1ac0ea44b6274bff1 Merge: ca067ca58a 1c7d8400a8 Author: Stefan Miklosovic AuthorDate: Tue Jan 23 18:42:18 2024 +0100 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 ca067ca58aecf0308b0428b443b082cacc9f9883
Merge: 5d46ff2796 d422eb1f35
Author: Jacek Lewandowski
AuthorDate: Tue Jan 23 14:24:06 2024 +0100
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Fix storage_compatibility_mode for streaming
CHANGES.txt| 1 +
build.xml | 4 ++--
.../config/CassandraRelevantProperties.java| 16 ++---
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../cassandra/config/DatabaseDescriptor.java | 22 +-
.../org/apache/cassandra/net/MessagingService.java | 26 +-
.../cassandra/net/OutboundConnectionSettings.java | 2 +-
.../cassandra/repair/messages/PrepareMessage.java | 4 +++-
.../org/apache/cassandra/tools/BulkLoader.java | 2 +-
.../org/apache/cassandra/repair/FuzzTestBase.java | 2 +-
10 files changed, 55 insertions(+), 26 deletions(-)
diff --cc CHANGES.txt
index 108096a416,485b945791..1a06b877f4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
-5.0-beta2
+5.1
+ * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565)
+ * Simplify the bind marker and Term logic (CASSANDRA-18813)
+ * Limit cassandra startup to supported JDKs, allow higher JDKs by setting
CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688)
+ * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104)
+ * Make nodetool tablestats use number of significant digits for time and
average values consistently (CASSANDRA-19015)
+ * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875)
+ * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330)
+ * 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:
+ * Fix storage_compatibility_mode for streaming (CASSANDRA-19126)
* Add support of vector type to cqlsh COPY command (CASSANDRA-19118)
* Make CQLSSTableWriter to support building of SAI indexes (CASSANDRA-18714)
* Append additional JVM options when using JDK17+ (CASSANDRA-19001)
diff --cc src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
index ed92ee6a41,b3d0b52abe..5177fb09fb
--- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
+++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
@@@ -588,6 -554,15 +580,14 @@@ public enum CassandraRelevantPropertie
TEST_SIMULATOR_PRINT_ASM_TYPES("cassandra.test.simulator.print_asm_types", ""),
TEST_SKIP_CRYPTO_PROVIDER_INSTALLATION("cassandra.test.security.skip.provider.installation",
"false"),
TEST_SSTABLE_FORMAT_DEVELOPMENT("cassandra.test.sstableformatdevelopment"),
+ /**
- * {@link StorageCompatibilityMode} mode sets how the node will behave,
sstable or messaging versions to use etc.
- * according to a yaml setting. But many tests don't load the config
hence we need to force it otherwise they would
- * run always under the default. Config is null for junits that don't
load the config. Get from env var that
- * CI/build.xml sets.
++ * {@link StorageCompatibilityMode} mode sets how the node will behave,
sstable or messaging versions to use etc according to a yaml setting.
++ * But many tests don't load the config hence we need to force it
otherwise they would run always under the default. Config is null for junits
++ * that don't load the config. Get from env var that CI/build.xml sets.
+ *
+ * This is a dev/CI only property. Do not use otherwise.
+ */
-
TEST_STORAGE_COMPATIBILITY_MODE("cassandra.test.storage_compatibility_mode",
StorageCompatibilityMode.CASSANDRA_4.toString()),
++
TEST_STORAGE_COMPATIBILITY_MODE("cassandra.test.storage_compatibility_mode",
StorageCompatibilityMode.NONE.toString()),
TEST_STRICT_LCS_CHECKS("cassandra.test.strict_lcs_checks"),
/** Turns some warnings into exceptions for testing. */
TEST_STRICT_RUNTIME_CHECKS("cassandra.strict.runtime.checks"),
diff --cc src/java/org/apache/cassandra/config/Config.java
index d62d836815,9c3c941c5e..4db252917d
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -1279,21 -1269,5 +1279,21 @@@ public class Confi
public double severity_during_decommission = 0;
+// TODO Revisit MessagingService::current_version
- public StorageCompatibilityMode storage_compatibility_mode =
StorageCompatibilityMode.NONE;
+ public StorageCompatibilityMode storage_compatibility_mode;
+
+/**
+ * For the purposes of progress barrier we only support ALL, EACH_QUORUM,
QUORUM,
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 1e44a0850b8589e5dce3d9750f2c11add713d3f8 Merge: 46b90364da c76b32492f Author: Andrés de la Peña AuthorDate: Mon Jan 22 14:37:38 2024 + Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + pylib/cqlshlib/copyutil.py | 9 +- .../apache/cassandra/tools/cqlsh/CqlshTest.java| 126 - 3 files changed, 132 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index 290185e085,1d71cb52c3..eefc85784f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ -5.0-beta2 +5.1 + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Add support of vector type to cqlsh COPY command (CASSANDRA-19118) * Make CQLSSTableWriter to support building of SAI indexes (CASSANDRA-18714) * Append additional JVM options when using JDK17+ (CASSANDRA-19001) * Upgrade Python driver to 3.29.0 (CASSANDRA-19245) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 e81b2f54b4cb05ea25720a8a481ec951a20b809a Merge: aa644c9dfa 016dd6ca37 Author: Stefan Miklosovic AuthorDate: Mon Jan 22 12:44:59 2024 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt|1 + src/java/org/apache/cassandra/config/Config.java | 18 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 88 +- .../cassandra/db/ColumnFamilyStoreMBean.java | 41 +- .../org/apache/cassandra/db/SSTableImporter.java | 72 +- .../apache/cassandra/db/memtable/TrieMemtable.java | 19 +- .../db/streaming/CassandraStreamReceiver.java |2 +- src/java/org/apache/cassandra/index/Index.java | 13 +- .../cassandra/index/SecondaryIndexManager.java |7 +- .../cassandra/index/sai/SSTableContextManager.java |2 +- .../index/sai/StorageAttachedIndexBuilder.java |2 +- .../index/sai/StorageAttachedIndexGroup.java | 12 +- .../index/sai/disk/format/IndexDescriptor.java | 35 +- .../sai/disk/v1/segment/SegmentTrieBuffer.java |4 +- .../cassandra/index/sai/view/IndexViewManager.java |2 +- .../io/sstable/AbstractSSTableSimpleWriter.java| 13 +- .../cassandra/io/sstable/CQLSSTableWriter.java | 171 ++- src/java/org/apache/cassandra/tools/NodeProbe.java | 12 +- .../apache/cassandra/tools/nodetool/Import.java| 15 +- test/unit/org/apache/cassandra/db/ImportTest.java | 222 +++- .../org/apache/cassandra/index/sai/SAITester.java |4 +- .../io/sstable/CQLSSTableWriterClientTest.java | 78 +- .../sstable/CQLSSTableWriterConcurrencyTest.java |2 +- .../io/sstable/CQLSSTableWriterDaemonTest.java | 44 + .../cassandra/io/sstable/CQLSSTableWriterTest.java | 1209 25 files changed, 1406 insertions(+), 682 deletions(-) diff --cc CHANGES.txt index ebf48c2315,a7859ee9ec..290185e085 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ -5.0-beta2 +5.1 + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Make CQLSSTableWriter to support building of SAI indexes (CASSANDRA-18714) * Append additional JVM options when using JDK17+ (CASSANDRA-19001) * Upgrade Python driver to 3.29.0 (CASSANDRA-19245) * Creating a SASI index after creating an SAI index does not break secondary index queries (CASSANDRA-18939) diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 1dc2687c40,bcf4dc7073..be6136dd4a --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -389,20 -383,22 +391,21 @@@ public class ColumnFamilyStore implemen // only update these runtime-modifiable settings if they have not been modified. if (!minCompactionThreshold.isModified()) for (ColumnFamilyStore cfs : concatWithIndexes()) -cfs.minCompactionThreshold = new DefaultValue(metadata().params.compaction.minCompactionThreshold()); +cfs.minCompactionThreshold = new DefaultValue<>(tableMetadata.params.compaction.minCompactionThreshold()); if (!maxCompactionThreshold.isModified()) for (ColumnFamilyStore cfs : concatWithIndexes()) -cfs.maxCompactionThreshold = new DefaultValue(metadata().params.compaction.maxCompactionThreshold()); +cfs.maxCompactionThreshold = new DefaultValue<>(tableMetadata.params.compaction.maxCompactionThreshold()); if (!crcCheckChance.isModified()) for (ColumnFamilyStore cfs : concatWithIndexes()) -cfs.crcCheckChance = new DefaultValue(metadata().params.crcCheckChance); - - compactionStrategyManager.maybeReloadParamsFromSchema(metadata().params.compaction); +cfs.crcCheckChance = new DefaultValue<>(tableMetadata.params.crcCheckChance); -indexManager.reload(); + compactionStrategyManager.maybeReloadParamsFromSchema(tableMetadata.params.compaction); -memtableFactory = metadata().params.memtable.factory(); +indexManager.reload(tableMetadata); +memtableFactory = tableMetadata.params.memtable.factory(); -
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit aa644c9dfa6680c73a9400f295f450b623dee784 Merge: 03f0d37cb0 9f5e45e5a2 Author: Ekaterina Dimitrova AuthorDate: Fri Jan 19 18:59:00 2024 -0500 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + bin/cassandra.in.sh| 8 conf/jvm17-clients.options | 4 conf/jvm17-server.options | 3 --- tools/bin/cassandra.in.sh | 8 5 files changed, 17 insertions(+), 7 deletions(-) diff --cc CHANGES.txt index 565b1d80b6,268bfa42b3..ebf48c2315 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ -5.0-beta2 +5.1 + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Append additional JVM options when using JDK17+ (CASSANDRA-19001) * Upgrade Python driver to 3.29.0 (CASSANDRA-19245) * Creating a SASI index after creating an SAI index does not break secondary index queries (CASSANDRA-18939) * Optionally fail when a non-partition-restricted query is issued against an index (CASSANDRA-18796) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 03f0d37cb0120625db25d0aec52bbc6b49c3982c Merge: 89e33a16ea 8fd44ca8fc Author: Andrés de la Peña AuthorDate: Fri Jan 19 17:33:55 2024 + Merge branch 'cassandra-5.0' into trunk .build/build-resolver.xml | 2 - .build/docker/run-tests.sh | 4 +- .build/docker/ubuntu2004_test.docker | 24 +- .build/run-python-dtests.sh| 2 +- .circleci/config.yml | 877 ++-- .circleci/config.yml.FREE | 877 ++-- .circleci/config.yml.PAID | 879 ++--- .circleci/config_template.yml | 170 +--- .circleci/config_template.yml.PAID.patch | 104 +-- CHANGES.txt| 1 + NEWS.txt | 4 +- bin/cqlsh | 6 +- bin/cqlsh.py | 6 +- .../cassandra/pages/installing/installing.adoc | 2 +- lib/cassandra-driver-internal-only-3.28.0.zip | Bin 356837 -> 0 bytes lib/cassandra-driver-internal-only-3.29.0.zip | Bin 0 -> 396496 bytes pylib/Dockerfile.ubuntu.py3| 2 +- ...kerfile.ubuntu.py37 => Dockerfile.ubuntu.py311} | 2 +- pylib/README.asc | 2 +- pylib/cassandra-cqlsh-tests.sh | 2 +- pylib/cqlshlib/test/run_cqlsh.py | 2 +- pylib/requirements.txt | 2 +- 22 files changed, 298 insertions(+), 2672 deletions(-) diff --cc .circleci/config_template.yml.PAID.patch index 422dddc650,a07902b350..8b4da040d0 --- a/.circleci/config_template.yml.PAID.patch +++ b/.circleci/config_template.yml.PAID.patch @@@ -1,5 -1,5 +1,5 @@@ - --- config_template.yml 2023-11-10 16:50:30.517080584 + - +++ config_template.yml.PAID 2023-11-10 16:51:58.40394 + config_template.yml 2024-01-05 00:32:24.148600479 + -+++ config_template.yml.PAID 2024-01-05 00:32:40.861079981 + ++--- config_template.yml 2024-01-05 12:06:28.009687781 + + config_template.yml.PAID 2024-01-05 12:09:25.083221646 + @@ -157,20 +157,20 @@ j11_par_executor: _par_executor executor: diff --cc CHANGES.txt index d1ed33baee,336edfb09f..565b1d80b6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ -5.0-beta2 +5.1 + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * 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: + * Upgrade Python driver to 3.29.0 (CASSANDRA-19245) * Creating a SASI index after creating an SAI index does not break secondary index queries (CASSANDRA-18939) * Optionally fail when a non-partition-restricted query is issued against an index (CASSANDRA-18796) * Add a startup check to fail startup when using invalid configuration with certain Kernel and FS type (CASSANDRA-19196) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
