(cassandra) 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 3b8c48024ed07a30bb8ccd338f0eee0f83eb89dc
Merge: 049160e70a c6017aca77
Author: Brandon Williams
AuthorDate: Wed May 8 10:28:21 2024 -0500
Merge branch 'cassandra-4.1' into cassandra-5.0
CHANGES.txt| 1 +
conf/jvm-server.options| 4 ++
.../config/CassandraRelevantProperties.java| 2 +
src/java/org/apache/cassandra/gms/Gossiper.java| 46 --
.../org/apache/cassandra/gms/VersionedValue.java | 2 +-
5 files changed, 51 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index 8af3d01ac9,2f31f4a2e2..370971fcea
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -40,10 -10,7 +40,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)
Merged from 4.0:
++ * Add timeout specifically for bootstrapping nodes (CASSANDRA-15439)
+ * 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)
diff --cc conf/jvm-server.options
index c50f3631f5,d529a2b9e2..c9a9336683
--- a/conf/jvm-server.options
+++ b/conf/jvm-server.options
@@@ -71,6 -74,10 +71,10 @@@
# before joining the ring.
#-Dcassandra.ring_delay_ms=ms
+ # Allows overriding the timeout after which an unresponsive bootstrapping
node is considered failed
-# and is removed from gossip state and bootstrapTokens. (Default:
cassandra.ring_delay * 2)
++# and is removed from gossip state and bootstrapTokens. (Default:
cassandra.ring_delay * 10)
+ #-Dcassandra.failed_bootstrap_timeout_ms=ms
+
# Set the SSL port for encrypted communication. (Default: 7001)
#-Dcassandra.ssl_storage_port=port
diff --cc src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
index e0dfeb19ff,4ee11ec591..336f68838f
--- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
+++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
@@@ -145,191 -107,92 +145,193 @@@ public enum CassandraRelevantPropertie
* if there is no port specified, if the port does not have the correct
numeric format,
* or if the specified name is empty or null.
*/
-COM_SUN_MANAGEMENT_JMXREMOTE_RMI_PORT
("com.sun.management.jmxremote.rmi.port", "0"),
-
-/** Cassandra jmx remote and local port */
-CASSANDRA_JMX_REMOTE_PORT("cassandra.jmx.remote.port"),
-CASSANDRA_JMX_LOCAL_PORT("cassandra.jmx.local.port"),
-
+
COM_SUN_MANAGEMENT_JMXREMOTE_RMI_PORT("com.sun.management.jmxremote.rmi.port",
"0"),
/** This property indicates whether SSL is enabled for monitoring
remotely. Default is set to false. */
-COM_SUN_MANAGEMENT_JMXREMOTE_SSL ("com.sun.management.jmxremote.ssl"),
-
+COM_SUN_MANAGEMENT_JMXREMOTE_SSL("com.sun.management.jmxremote.ssl"),
/**
- * This property indicates whether SSL client authentication is enabled -
com.sun.management.jmxremote.ssl.need.client.auth.
- * Default is set to false.
- */
-COM_SUN_MANAGEMENT_JMXREMOTE_SSL_NEED_CLIENT_AUTH
("com.sun.management.jmxremote.ssl.need.client.auth"),
-
-/**
- * This property indicates the location for the access file. If
com.sun.management.jmxremote.authenticate is false,
- * then this property and the password and access files, are ignored.
Otherwise, the access file must exist and
- * be in the valid format. If the access file is empty or nonexistent,
then no access is allowed.
+ * A comma-delimited list of SSL/TLS cipher suites to enable.
+ * Used in conjunction with com.sun.management.jmxremote.ssl -
com.sun.management.jmxremote.ssl.enabled.cipher.suites
*/
-COM_SUN_MANAGEMENT_JMXREMOTE_ACCESS_FILE
("com.sun.management.jmxremote.access.file"),
-
-/** This property indicates the path to the password file -
com.sun.management.jmxremote.password.file */
-COM_SUN_MANAGEMENT_JMXREMOTE_PASSWORD_FILE
("com.sun.management.jmxremote.password.file"),
-
-/** Port number to enable JMX RMI connections -
com.sun.management.jmxremote.port */
-COM_SUN_MANAGEMENT_JMXREMOTE_PORT ("com.sun.management.jmxremote.port"),
+
(cassandra) 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 1902195d651ba6405665a79da92c10bb881f Merge: 326bf4b3f5 103e9cca1a Author: Brandon Williams AuthorDate: Mon May 6 08:37:01 2024 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 CHANGES.txt | 1 + redhat/cassandra.spec | 11 --- 2 files changed, 5 insertions(+), 7 deletions(-) diff --cc CHANGES.txt index 5a53faf257,0095e2d078..45500b642e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -39,9 -9,7 +39,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) 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7402bcb8f73b8b5b3a77acfd717a0a2683eb8de1 Merge: d7aa3c60f9 6b13426562 Author: Brandon Williams AuthorDate: Thu May 2 10:47:01 2024 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 - 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d7aa3c60f9428a2e8f7bb3e3970df7adbb26dfaf Merge: 3262847ad7 5cf8a4cbbb Author: Brandon Williams AuthorDate: Thu May 2 10:14:11 2024 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 - 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 1b1f88e38a363b7937e8472b6863f9168b687659
Merge: a9da19c311 7c79d91b6f
Author: ci worker
AuthorDate: Wed May 1 14:34:24 2024 -0700
Merge branch 'cassandra-4.1' into cassandra-5.0
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 | 36 --
15 files changed, 143 insertions(+), 5 deletions(-)
diff --cc CHANGES.txt
index 7e18e40c97,17257d606a..ac41c7c180
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -38,9 -4,8 +38,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)
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 src/java/org/apache/cassandra/db/compaction/PendingRepairHolder.java
index 534bf3ae82,86c40e8958..0c5d53c1d8
--- a/src/java/org/apache/cassandra/db/compaction/PendingRepairHolder.java
+++ b/src/java/org/apache/cassandra/db/compaction/PendingRepairHolder.java
@@@ -285,12 -289,8 +292,17 @@@ public class PendingRepairHolder extend
return Iterables.any(managers, prm -> prm.containsSSTable(sstable));
}
+@Override
+public int getEstimatedRemainingTasks()
+{
+int tasks = 0;
+for (PendingRepairManager manager : managers)
+tasks += manager.getEstimatedRemainingTasks();
+return tasks;
+}
++
+ public boolean hasPendingRepairSSTable(TimeUUID sessionID, SSTableReader
sstable)
+ {
+ return Iterables.any(managers, prm ->
prm.hasPendingRepairSSTable(sessionID, sstable));
+ }
}
diff --cc src/java/org/apache/cassandra/repair/RepairCoordinator.java
index 27dd3a73b5,00..82664f2d3c
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/repair/RepairCoordinator.java
+++ b/src/java/org/apache/cassandra/repair/RepairCoordinator.java
@@@ -1,635 -1,0 +1,650 @@@
+/*
+ * 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.repair;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import com.google.common.base.Preconditions;
+import
(cassandra) 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a9da19c311f7a9e386be4f522bbe2b96771cf199 Merge: ae9be29918 428fa1f445 Author: Caleb Rackliffe AuthorDate: Wed May 1 14:38:41 2024 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 * cassandra-4.1: 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 a5016cd004,e4de315818..7e18e40c97 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,38 -1,5 +1,39 @@@ -4.1.5 +5.0-beta2 + * 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) + * 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) + * 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) + * 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) + * 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) + * 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) + * 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) + * 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) + * UCS min_sstable_size should not be lower than target_sstable_size lower bound (CASSANDRA-19112) + * Fix the correspondingMessagingVersion of SSTable format and improve TTL overflow tests coverage (CASSANDRA-19197) + * 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) - 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ae9be29918c2b449742a28c5bb70f1e8768468aa Merge: 3c85def5cc a6e80317de Author: Brandon Williams AuthorDate: Tue Apr 30 17:01:23 2024 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 CHANGES.txt| 1 + .../cassandra/schema/DefaultSchemaUpdateHandler.java | 5 +++-- test/unit/org/apache/cassandra/schema/SchemaTest.java | 18 ++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index ee0696f40a,801c6f2e48..a5016cd004 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,38 -1,5 +1,39 @@@ -4.1.5 +5.0-beta2 + * 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) + * 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) + * 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) + * 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) + * 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) + * 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) + * 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) + * 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) + * UCS min_sstable_size should not be lower than target_sstable_size lower bound (CASSANDRA-19112) + * Fix the correspondingMessagingVersion of SSTable format and improve TTL overflow tests coverage (CASSANDRA-19197) + * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) + * Suppress CVE-2023-6481 (CASSANDRA-19184) +Merged from 4.1: + * 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6559983d6c00e964de4316a571df9482d4af854e
Merge: 93692a4b17 858a2b2321
Author: Jon Meredith
AuthorDate: Thu Apr 25 14:00:52 2024 -0600
Merge branch 'cassandra-4.1' into cassandra-5.0
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 | 22 ++-
.../streaming/StreamFailedWhileReceivingTest.java | 208 +
.../cassandra/db/lifecycle/LogTransactionTest.java | 40 +++-
7 files changed, 333 insertions(+), 16 deletions(-)
diff --cc CHANGES.txt
index 1d51d2d27d,23dbee1941..ee0696f40a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -36,11 -2,11 +36,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)
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)
- * Optionally avoid hint transfer during decommission (CASSANDRA-19525)
* 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 src/java/org/apache/cassandra/db/lifecycle/LogFile.java
index abfb55a601,9db3cb477c..9decc248b9
--- a/src/java/org/apache/cassandra/db/lifecycle/LogFile.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/LogFile.java
@@@ -35,8 -26,12 +35,10 @@@ import java.util.regex.Matcher
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+ import javax.annotation.concurrent.NotThreadSafe;
+
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Iterables;
-
-import org.apache.cassandra.io.util.File;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --cc src/java/org/apache/cassandra/streaming/StreamSession.java
index d76f1f6d25,17ceca137c..a942b9ee9a
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@@ -50,18 -47,15 +50,19 @@@ import io.netty.util.concurrent.Future
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.cassandra.concurrent.ScheduledExecutors;
+import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamilyStore;
+import org.apache.cassandra.db.Directories;
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.Range;
import org.apache.cassandra.dht.Token;
-import org.apache.cassandra.gms.*;
+import org.apache.cassandra.io.util.File;
import org.apache.cassandra.locator.InetAddressAndPort;
+import org.apache.cassandra.locator.RangesAtEndpoint;
import org.apache.cassandra.locator.Replica;
import org.apache.cassandra.metrics.StreamingMetrics;
import org.apache.cassandra.schema.TableId;
@@@ -703,20 -684,29 +714,29 @@@ public class StreamSessio
planId(),
peer.getHostAddressAndPort(),
e);
-
-return closeSession(State.FAILED);
+return closeSession(State.FAILED, "Failed because there was
an " + e.getClass().getCanonicalName() + " with state=" + state.name());
}
}
+ else if (e instanceof TransactionAlreadyCompletedException &&
isFailedOrAborted())
+ {
+ // StreamDeserializer threads may actively be writing SSTables
when the stream
+ // is failed or canceled, which aborts the lifecycle transaction
and throws an exception
+ // when any new SSTable is added. Since the stream has already
failed, suppress
+ // extra streaming log failure messages.
+ logger.debug("Stream lifecycle
(cassandra) 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 0c34234f67edc954695237df6c79295a017551a2 Merge: e127ddf7dd 643d7f1751 Author: Brandon Williams AuthorDate: Tue Apr 16 13:27:24 2024 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 - 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit e127ddf7dd26143701f20d65328ec87c009731fc Merge: 42498a14fa a6209d0cfc Author: Brandon Williams AuthorDate: Mon Apr 15 11:25:34 2024 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 - 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 42498a14fa2aa7e2c852076ff9d461965a588845 Merge: a620a9df86 b525f5fff4 Author: Brandon Williams AuthorDate: Fri Apr 12 13:50:57 2024 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 - 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a620a9df86e06d56c260533d40a86212a73c0215 Merge: cada1a13c8 b3bca0ad6a Author: Brandon Williams AuthorDate: Thu Apr 11 13:51:29 2024 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 - 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7c29439cef3d3649b8e75bd0e716feed832b1999 Merge: 9752ceb439 39bd3c2261 Author: Caleb Rackliffe AuthorDate: Mon Apr 8 15:29:17 2024 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 * cassandra-4.1: 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 00dccf25ab3b587ba4efb6e50d0a7ca256a8193d Merge: f7c11bdcd4 659e41db9a Author: Brandon Williams AuthorDate: Thu Apr 4 11:00:24 2024 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 CHANGES.txt | 1 + src/java/org/apache/cassandra/transport/ServerConnection.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 5cd68dd179,6345b3e6dd..7fcb87292f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,41 -1,8 +1,42 @@@ -4.1.5 +5.0-beta2 + * 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) + * 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) + * 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) + * 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) + * 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) + * 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) + * 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) + * UCS min_sstable_size should not be lower than target_sstable_size lower bound (CASSANDRA-19112) + * Fix the correspondingMessagingVersion of SSTable format and improve TTL overflow tests coverage (CASSANDRA-19197) + * 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) 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 973aad7b68f92e5c936052144357ae1592c9b3a3
Merge: be507c6e99 7cbf59e9a1
Author: Brandon Williams
AuthorDate: Wed Apr 3 17:01:21 2024 -0500
Merge branch 'cassandra-4.1' into cassandra-5.0
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,62ed5d4ff7..a1d64eaf0a
--- 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 41x main" | sudo tee -a
/etc/apt/sources.list.d/cassandra.sources.list
-deb https://debian.cassandra.apache.org 41x 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
diff --cc doc/modules/cassandra/partials/package_versions.adoc
index 17ca41dce3,b968ebb9ff..4457d7ae19
--- a/doc/modules/cassandra/partials/package_versions.adoc
+++ b/doc/modules/cassandra/partials/package_versions.adoc
@@@ -1,9 -1,9 +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 {41_version} and the corresponding distribution
name is `41x` (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).
For older releases use:
- * `311x` for C* {3x_version} series
- * `30x` for {30_version}
- * `22x` for {22_version}
- * `21x` for {21_version}
++* `50x` for C* {50_version} series
+ * `41x` for C* {41_version} series
+ * `40x` for C* {40_version} series
-* `311x` for C* {311_version} series
-* `30x` for C* {30_version} series
- For example, to add the repository for version {40_version} (`40x`):
-For example, to add the repository for version {41_version} (`41x`):
++For example, to add the repository for version {50_version} (`50x`):
-
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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit bd2803307eb5e8c0bfbd7e9477ce1756a7d77bde
Merge: 2f836fa596 8502da494c
Author: Brandon Williams
AuthorDate: Thu Mar 14 10:26:30 2024 -0500
Merge branch 'cassandra-4.1' into cassandra-5.0
CHANGES.txt| 1 +
.../cassandra/repair/consistent/LocalSessions.java | 36 +++---
2 files changed, 19 insertions(+), 18 deletions(-)
diff --cc CHANGES.txt
index 2e543f1120,a091edb379..4533e86b1c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,6 +1,34 @@@
-4.1.5
+5.0-beta2
+ * 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)
+ * 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)
+ * 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)
+ * 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)
+ * 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)
+ * 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)
+ * UCS min_sstable_size should not be lower than target_sstable_size lower
bound (CASSANDRA-19112)
+ * Fix the correspondingMessagingVersion of SSTable format and improve TTL
overflow tests coverage (CASSANDRA-19197)
+ * 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)
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)
diff --cc src/java/org/apache/cassandra/repair/consistent/LocalSessions.java
index 75c50e5dce,5fcfe986c5..cc6b168461
--- a/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java
+++ b/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java
@@@ -841,12 -818,10 +841,12 @@@ public class LocalSession
}
LocalSession session = createSessionUnsafe(sessionID, parentSession,
peers);
-putSessionUnsafe(session);
+sendAck(ctx, message);
+if (!putSessionUnsafe(session))
+return;
- logger.info("Beginning local incremental repair session {}", session);
+ logger.debug("Beginning local incremental repair session {}",
session);
-ExecutorService executor = executorFactory().pooled("Repair-" +
sessionID, parentSession.getColumnFamilyStores().size());
+ExecutorService executor = ctx.executorFactory().pooled("Repair-" +
sessionID, parentSession.getColumnFamilyStores().size());
KeyspaceRepairManager repairManager =
parentSession.getKeyspace().getRepairManager();
RangesAtEndpoint tokenRanges =
filterLocalRanges(parentSession.getKeyspace().getName(),
parentSession.getRanges());
@@@ -859,10 -834,13 +859,10 @@@
{
try
{
- logger.info("Prepare phase for incremental repair session
{} completed", sessionID);
+ logger.debug("Prepare phase for incremental repair
session {} completed", sessionID);
(cassandra) 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 939fbfa63f890608d1c83d28166909141a2474a2 Merge: 53cd2d8286 612c9638dc Author: Bereng AuthorDate: Mon Feb 26 07:46:34 2024 +0100 Merge branch 'cassandra-4.1' into cassandra-5.0 * cassandra-4.1: 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 5b9321eee1552a519fbefc2e07be2da8a3a9c20a Merge: 78dca99973 89a8155916 Author: Andrés de la Peña AuthorDate: Thu Feb 8 11:33:23 2024 + Merge branch 'cassandra-4.1' into cassandra-5.0 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 1549165f6c,44ca779885..4f223e469a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,14 +1,24 @@@ -4.1.4 +5.0-beta2 + * 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) + * 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) + * 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) + * UCS min_sstable_size should not be lower than target_sstable_size lower bound (CASSANDRA-19112) + * Fix the correspondingMessagingVersion of SSTable format and improve TTL overflow tests coverage (CASSANDRA-19197) + * 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) - * Fixed the inconsistency between distributedKeyspaces and distributedAndLocalKeyspaces (CASSANDRA-18747) - * Internode legacy SSL storage port certificate is not hot reloaded on update (CASSANDRA-18681) - * Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466) - * Waiting indefinitely on ReceivedMessage response in StreamSession#receive() can cause deadlock (CASSANDRA-18733) - * Allow empty keystore_password in encryption_options (CASSANDRA-18778) - * Skip ColumnFamilyStore#topPartitions initialization when client or tool mode (CASSANDRA-18697) 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) diff --cc conf/cassandra.yaml index 0d2c711608,1986d6fa29..cc3f404d85 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@@ -750,17 -658,27 +753,38 @@@ memtable_allocation_type: heap_buffer # Min unit: MiB # repair_session_space: + # The number of simultaneous Merkle tree requests during repairs that can + # be performed by a repair command. The size of each validation request is + # limited by the repair_session_space property, so setting this to 1 will make + # sure that a repair command doesn't exceed that limit, even if the repair + # command is repairing multiple tables or multiple
(cassandra) 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. paulo pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit e04a3176ffbcb1192ac9081cd980d1e4592ba3f5 Merge: 14c773d8bc 3d1b981d89 Author: Paulo Motta AuthorDate: Wed Jan 10 11:20:54 2024 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 Closes #3004 CHANGES.txt| 1 + src/java/org/apache/cassandra/gms/Gossiper.java| 14 +++--- .../schema/SystemDistributedKeyspace.java | 2 +- .../apache/cassandra/tracing/TraceKeyspace.java| 4 +- test/unit/org/apache/cassandra/Util.java | 2 +- .../org/apache/cassandra/gms/GossiperTest.java | 50 +- 6 files changed, 61 insertions(+), 12 deletions(-) diff --cc CHANGES.txt index 0e2306dc68,ec0e7c60d7..95047150c0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,42 -1,15 +1,43 @@@ -4.1.4 +5.0-beta2 + * 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) + * UCS min_sstable_size should not be lower than target_sstable_size lower bound (CASSANDRA-19112) + * Fix the correspondingMessagingVersion of SSTable format and improve TTL overflow tests coverage (CASSANDRA-19197) + * 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) - * Fixed the inconsistency between distributedKeyspaces and distributedAndLocalKeyspaces (CASSANDRA-18747) - * Internode legacy SSL storage port certificate is not hot reloaded on update (CASSANDRA-18681) - * Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466) - * Waiting indefinitely on ReceivedMessage response in StreamSession#receive() can cause deadlock (CASSANDRA-18733) - * Allow empty keystore_password in encryption_options (CASSANDRA-18778) - * Skip ColumnFamilyStore#topPartitions initialization when client or tool mode (CASSANDRA-18697) Merged from 4.0: + * 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: + + +5.0-beta1 + * Fix SAI intersection queries (CASSANDRA-19011) + * Clone EndpointState before sending GossipShutdown message (CASSANDRA-19115) + * SAI indexes are marked queryable during truncation (CASSANDRA-19032) + * Enable Direct-IO feature for CommitLog files using Java native API's. (CASSANDRA-18464) + * SAI fixes for composite partitions, and static and non-static rows intersections (CASSANDRA-19034) + * Improve SAI IndexContext handling of indexed and non-indexed columns in queries (CASSANDRA-18166) + * Fixed bug where UnifiedCompactionTask constructor was calling the wrong base constructor of CompactionTask (CASSANDRA-18757) + * Fix SAI unindexed contexts not considering CONTAINS KEY (CASSANDRA-19040) + * Ensure that empty SAI column indexes do not fail on validation after full-SSTable streaming (CASSANDRA-19017) + * SAI in-memory index should check max term size (CASSANDRA-18926) + * Set default disk_access_mode to mmap_index_only (CASSANDRA-19021) + * Exclude net.java.dev.jna:jna dependency from dependencies of org.caffinitas.ohc:ohc-core (CASSANDRA-18992) + * Add UCS sstable_growth and min_sstable_size options (CASSANDRA-18945) + * Make cqlsh's min required Python version 3.7+ instead of 3.6+ (CASSANDRA-18960) + * Fix incorrect seeking through the sstable iterator by IndexState (CASSANDRA-18932) + * Upgrade Python driver to 3.28.0 (CASSANDRA-18960) + * Add retries to IR messages (CASSANDRA-18962) + * Add metrics and logging to repair retries (CASSANDRA-18952) + * Remove deprecated code in Cassandra 1.x and 2.x (CASSANDRA-18959) + * ClientRequestSize metrics should not treat CONTAINS restrictions as being equality-based (CASSANDRA-18896) +Merged from 4.0: * Support max SSTable size in sorted CQLSSTableWriter (CASSANDRA-18941) * Fix nodetool repair_admin summarize-pending command to not throw exception (CASSANDRA-19014) * Fix cassandra-stress in simplenative mode with prepared statements (CASSANDRA-18744) diff --cc src/java/org/apache/cassandra/gms/Gossiper.java index b5b0caec77,018e20542d..5a616a4eae --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@@ -229,15 -219,14 +230,15 @@@ public class Gossiper
(cassandra) 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 14c773d8bcc3c7e1e9fe69ba7178c0914a532b91 Merge: ad642d5e25 4dd69dc62d Author: Caleb Rackliffe AuthorDate: Tue Jan 9 14:59:32 2024 -0600 Merge branch 'cassandra-4.1' into cassandra-5.0 * cassandra-4.1: Revert unnecessary read lock acquisition when reading ring version in TokenMetadata introduced in CASSANDRA-16286 CHANGES.txt | 1 + src/java/org/apache/cassandra/locator/TokenMetadata.java| 13 ++--- .../org/apache/cassandra/locator/TokenMetadataTest.java | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --cc CHANGES.txt index fa6b00a1d7,66144ce1e6..0e2306dc68 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,41 -1,14 +1,42 @@@ -4.1.4 +5.0-beta2 + * 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) + * UCS min_sstable_size should not be lower than target_sstable_size lower bound (CASSANDRA-19112) + * Fix the correspondingMessagingVersion of SSTable format and improve TTL overflow tests coverage (CASSANDRA-19197) + * 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) - * Fixed the inconsistency between distributedKeyspaces and distributedAndLocalKeyspaces (CASSANDRA-18747) - * Internode legacy SSL storage port certificate is not hot reloaded on update (CASSANDRA-18681) - * Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466) - * Waiting indefinitely on ReceivedMessage response in StreamSession#receive() can cause deadlock (CASSANDRA-18733) - * Allow empty keystore_password in encryption_options (CASSANDRA-18778) - * Skip ColumnFamilyStore#topPartitions initialization when client or tool mode (CASSANDRA-18697) Merged from 4.0: + * 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: + + +5.0-beta1 + * Fix SAI intersection queries (CASSANDRA-19011) + * Clone EndpointState before sending GossipShutdown message (CASSANDRA-19115) + * SAI indexes are marked queryable during truncation (CASSANDRA-19032) + * Enable Direct-IO feature for CommitLog files using Java native API's. (CASSANDRA-18464) + * SAI fixes for composite partitions, and static and non-static rows intersections (CASSANDRA-19034) + * Improve SAI IndexContext handling of indexed and non-indexed columns in queries (CASSANDRA-18166) + * Fixed bug where UnifiedCompactionTask constructor was calling the wrong base constructor of CompactionTask (CASSANDRA-18757) + * Fix SAI unindexed contexts not considering CONTAINS KEY (CASSANDRA-19040) + * Ensure that empty SAI column indexes do not fail on validation after full-SSTable streaming (CASSANDRA-19017) + * SAI in-memory index should check max term size (CASSANDRA-18926) + * Set default disk_access_mode to mmap_index_only (CASSANDRA-19021) + * Exclude net.java.dev.jna:jna dependency from dependencies of org.caffinitas.ohc:ohc-core (CASSANDRA-18992) + * Add UCS sstable_growth and min_sstable_size options (CASSANDRA-18945) + * Make cqlsh's min required Python version 3.7+ instead of 3.6+ (CASSANDRA-18960) + * Fix incorrect seeking through the sstable iterator by IndexState (CASSANDRA-18932) + * Upgrade Python driver to 3.28.0 (CASSANDRA-18960) + * Add retries to IR messages (CASSANDRA-18962) + * Add metrics and logging to repair retries (CASSANDRA-18952) + * Remove deprecated code in Cassandra 1.x and 2.x (CASSANDRA-18959) + * ClientRequestSize metrics should not treat CONTAINS restrictions as being equality-based (CASSANDRA-18896) +Merged from 4.0: * Support max SSTable size in sorted CQLSSTableWriter (CASSANDRA-18941) * Fix nodetool repair_admin summarize-pending command to not throw exception (CASSANDRA-19014) * Fix cassandra-stress in simplenative mode with prepared statements (CASSANDRA-18744) - 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit fdfc5e614d6d7e3e84f0200870d6ac34917f601d Merge: fe7997884d 13e5956285 Author: Brandon Williams AuthorDate: Wed Dec 6 06:33:36 2023 -0600 Merge branch 'cassandra-4.1' into cassandra-5.0 .build/dependency-check-suppressions.xml | 10 ++ CHANGES.txt | 5 + 2 files changed, 15 insertions(+) diff --cc CHANGES.txt index 9b4900eb03,79e8ee7a84..2602ec4b23 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -64,10 -19,17 +64,15 @@@ Merged from 4.0 * Improve performance of compactions when table does not have an index (CASSANDRA-18773) * JMH improvements - faster build and async profiler (CASSANDRA-18871) * Enable 3rd party JDK installations for Debian package (CASSANDRA-18844) - * Fix NTS log message when an unrecognized strategy option is passed (CASSANDRA-18679) - * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582) - * Migrate Python optparse to argparse (CASSANDRA-17914) Merged from 3.11: - * Fix delayed SSTable release with unsafe_aggressive_sstable_expiration (CASSANDRA-18756) - * Revert CASSANDRA-18543 (CASSANDRA-18854) - * Fix NPE when using udfContext in UDF after a restart of a node (CASSANDRA-18739) Merged from 3.0: ++<<< HEAD ++=== + * Suppress CVE-2023-6378 (CASSANDRA-19142) + * Do not set RPC_READY to false on transports shutdown in order to not fail counter updates for deployments with coordinator and storage nodes with transports turned off (CASSANDRA-18935) ++>>> cassandra-4.1 * Suppress CVE-2023-44487 (CASSANDRA-18943) + * Implement the logic in bin/stop-server (CASSANDRA-18838) * Fix nodetool enable/disablebinary to correctly set rpc readiness in gossip (CASSANDRA-18935) * Implement the logic in bin/stop-server (CASSANDRA-18838) * Upgrade snappy-java to 1.1.10.4 (CASSANDRA-18878) - 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit f48de8343cd8be5ba6ba970251ddb8520b489611 Merge: b7b2aa5de5 6cac24f581 Author: Bereng AuthorDate: Mon Nov 20 07:37:14 2023 +0100 Merge branch 'cassandra-4.1' into cassandra-5.0 * cassandra-4.1: Test failure: org.apache.cassandra.db.commitlog.CommitLogSegmentManagerCDCTest - 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 127f718797826726bcb3b1fac65db41ebc9f3ee4
Merge: bd4e7d7824 5c44922a5a
Author: Brandon Williams
AuthorDate: Mon Nov 13 14:17:19 2023 -0600
Merge branch 'cassandra-4.1' into cassandra-5.0
pylib/cqlshlib/cqlshmain.py | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --cc pylib/cqlshlib/cqlshmain.py
index 29bf17da86,00..f4f4146c96
mode 100755,00..100755
--- a/pylib/cqlshlib/cqlshmain.py
+++ b/pylib/cqlshlib/cqlshmain.py
@@@ -1,2392 -1,0 +1,2395 @@@
+# 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.
+
+import cmd
+import codecs
+import configparser
+import csv
+import getpass
+import argparse
+import os
+import re
+import subprocess
+import sys
+import traceback
+import warnings
+import webbrowser
+from contextlib import contextmanager
+from enum import Enum
+from io import StringIO
+from uuid import UUID
+
+import cassandra
+from cassandra.auth import PlainTextAuthProvider
+from cassandra.cluster import Cluster
+from cassandra.cqltypes import cql_typename
+from cassandra.marshal import int64_unpack
+from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
TableMetadata)
+from cassandra.policies import WhiteListRoundRobinPolicy
+from cassandra.query import SimpleStatement, ordered_dict_factory,
TraceUnavailable
+from cassandra.util import datetime_from_timestamp
+
+from cqlshlib import cql3handling, pylexotron, sslhandling, cqlshhandling,
authproviderhandling
+from cqlshlib.copyutil import ExportTask, ImportTask
+from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
+ RED, WHITE, FormattedValue, colorme)
+from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT,
+ DEFAULT_TIMESTAMP_FORMAT, CqlType,
DateTimeFormat,
+ format_by_type)
+from cqlshlib.tracing import print_trace, print_trace_session
+from cqlshlib.util import get_file_encoding_bomsize, is_file_secure
- from cqlshlib.serverversion import version as build_version
++try:
++from cqlshlib.serverversion import version as build_version
++except ImportError:
++build_version = 'UNKNOWN'
+
+
+UTF8 = 'utf-8'
+
+description = "CQL Shell for Apache Cassandra"
+version = "6.2.0"
+
+readline = None
+try:
+# Check if tty first, as readline doesn't check and only cares about
$TERM.
+# We don't want the funky escape code stuff to be output if not a tty.
+if sys.stdin.isatty():
+import readline
+except ImportError:
+pass
+
+# On Linux, the Python webbrowser module uses the 'xdg-open' executable
+# to open a file/URL. But that only works, if the current session has been
+# opened from _within_ a desktop environment. I.e. 'xdg-open' will fail,
+# if the session's been opened via ssh to a remote box.
+#
+try:
+webbrowser.register_standard_browsers() # registration is otherwise lazy
in Python3
+except AttributeError:
+pass
+if webbrowser._tryorder and webbrowser._tryorder[0] == 'xdg-open' and
os.environ.get('XDG_DATA_DIRS', '') == '':
+# only on Linux (some OS with xdg-open)
+webbrowser._tryorder.remove('xdg-open')
+webbrowser._tryorder.append('xdg-open')
+
+warnings.filterwarnings("ignore", r".*blist.*")
+
+DEFAULT_HOST = '127.0.0.1'
+DEFAULT_PORT = 9042
+DEFAULT_SSL = False
+DEFAULT_CONNECT_TIMEOUT_SECONDS = 5
+DEFAULT_REQUEST_TIMEOUT_SECONDS = 10
+
+DEFAULT_FLOAT_PRECISION = 5
+DEFAULT_DOUBLE_PRECISION = 5
+DEFAULT_MAX_TRACE_WAIT = 10
+
+if readline is not None and readline.__doc__ is not None and 'libedit' in
readline.__doc__:
+DEFAULT_COMPLETEKEY = '\t'
+else:
+DEFAULT_COMPLETEKEY = 'tab'
+
+cqldocs = None
+cqlruleset = None
+CASSANDRA_CQL_HTML = None
+
+epilog = """Connects to %(DEFAULT_HOST)s:%(DEFAULT_PORT)d by default. These
+defaults can be changed by setting $CQLSH_HOST and/or $CQLSH_PORT. When a
+host (and optional port number) are given on the command line, they take
+precedence
(cassandra) 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 51ca9c964e377f1bcb43e8e7844610303aea3dd9 Merge: ea76d148c3 d5b6331d6e Author: Brandon Williams AuthorDate: Mon Oct 30 08:15:57 2023 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 .../apache/cassandra/distributed/impl/RowUtil.java | 8 ++-- .../distributed/test/DistributedRowUtilTest.java | 46 ++ 2 files changed, 50 insertions(+), 4 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 210ced3b7b6718b515631b8b1579aa6f6fc2dea3
Merge: 3b9881bfa6 1920571861
Author: David Capwell
AuthorDate: Tue Oct 10 14:15:08 2023 -0700
Merge branch 'cassandra-4.1' into cassandra-5.0
CHANGES.txt| 1 +
.../org/apache/cassandra/gms/EndpointState.java| 5 +
.../org/apache/cassandra/gms/GossipShutdown.java | 66 +
.../cassandra/gms/GossipShutdownVerbHandler.java | 7 +-
src/java/org/apache/cassandra/gms/Gossiper.java| 31 +-
src/java/org/apache/cassandra/net/Verb.java| 5 +-
.../test/gossip/GossipShutdownTest.java| 106 +
7 files changed, 214 insertions(+), 7 deletions(-)
diff --cc CHANGES.txt
index 1e0fe54855,c5f2a1b92c..f40b4020d7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,12 +1,25 @@@
-4.1.4
+5.0-alpha2
+ * Fix vector type to support DDM's mask_default function (CASSANDRA-18889)
+ * Remove unnecessary reporter-config3 dependency (CASSANDRA-18907)
+ * Remove support for empty values on the vector data type (CASSANDRA-18876)
+ * Upgrade Dropwizard Metrics to 4.2.19 (CASSANDRA-14667)
+ * Upgrade caffeine cache and fix CIDR permissions cache invalidation
(CASSANDRA-18805)
+ * Remove deprecated properties in CompressionParams (CASSANDRA-18742)
+ * Add support for repair coordinator to retry messages that timeout
(CASSANDRA-18816)
+ * Upgrade slf4j-api to 1.7.36 (CASSANDRA-18882)
+ * Make the output of ON/OFF commands in cqlsh consistent (CASSANDRA-18547)
+ * Do not create sstable files before registering in txn (CASSANDRA-18737)
+ * Do not log stacktrace on mismatched cache and schema version and checksum
error in AutoSavingCache (CASSANDRA-18862)
+ * Remove wrong assertion in SSTableLoader (CASSANDRA-18840)
+ * Fix accessing java.nio.Bits.TOTAL_CAPACITY in Java17 (CASSANDRA-18848)
+ * Remove metrics-reporter-config dependency (CASSANDRA-18743)
+ * Fix SAI's SegmentMetadata min and max primary keys (CASSANDRA-18734)
+ * Remove commons-codec dependency (CASSANDRA-18772)
+Merged from 4.1:
* Internode legacy SSL storage port certificate is not hot reloaded on
update (CASSANDRA-18681)
* Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466)
- * Waiting indefinitely on ReceivedMessage response in
StreamSession#receive() can cause deadlock (CASSANDRA-18733)
- * Allow empty keystore_password in encryption_options (CASSANDRA-18778)
- * Skip ColumnFamilyStore#topPartitions initialization when client or tool
mode (CASSANDRA-18697)
Merged from 4.0:
+ * Gossip NPE due to shutdown event corrupting empty statuses
(CASSANDRA-18913)
- * Fix closing iterator in SecondaryIndexBuilder (CASSANDRA-18361)
* Update hdrhistogram to 2.1.12 (CASSANDRA-18893)
* Improve performance of compactions when table does not have an index
(CASSANDRA-18773)
* JMH improvements - faster build and async profiler (CASSANDRA-18871)
diff --cc src/java/org/apache/cassandra/gms/GossipShutdown.java
index 00,00..02f0f375c4
new file mode 100644
--- /dev/null
+++ b/src/java/org/apache/cassandra/gms/GossipShutdown.java
@@@ -1,0 -1,0 +1,66 @@@
++/*
++ * 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.gms;
++
++import java.io.IOException;
++
++import javax.annotation.Nullable;
++
++import org.apache.cassandra.io.IVersionedSerializer;
++import org.apache.cassandra.io.util.DataInputPlus;
++import org.apache.cassandra.io.util.DataOutputPlus;
++import org.apache.cassandra.net.MessagingService;
++
++public class GossipShutdown
++{
++public static final Serializer serializer = new Serializer();
++
++public final EndpointState state;
++
++public GossipShutdown(EndpointState state)
++{
++this.state = state;
++}
++
++public static final class Serializer implements
IVersionedSerializer
++{
++
++@Override
++public void serialize(GossipShutdown t, DataOutputPlus out, int
version) throws IOException
++{
++if
[cassandra] 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit bd6e9a004c96fdbb98168d39512ac6502ba0fbbf Merge: 7e65d04e9c b5bfd1e314 Author: Bereng AuthorDate: Thu Oct 5 09:24:56 2023 +0200 Merge branch 'cassandra-4.1' into cassandra-5.0 * cassandra-4.1: Test failure: junit.framework.TestSuite.org.apache.cassandra.distributed.test.CASMultiDCTest .../cassandra/distributed/impl/AbstractCluster.java | 17 +++-- 1 file changed, 15 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a4be70930f4d1bd24ac30b79cf146265da5f3c2f Merge: d16e8d3653 b9586501a6 Author: Jon Meredith AuthorDate: Mon Sep 25 14:25:31 2023 -0600 Merge branch 'cassandra-4.1' into cassandra-5.0 CHANGES.txt| 1 + examples/ssl-factory/build.xml | 2 +- .../cassandra/net/InboundConnectionInitiator.java | 4 +- .../org/apache/cassandra/net/InboundSockets.java | 12 +++ .../cassandra/net/InternodeConnectionUtils.java| 1 + .../cassandra/net/MessagingServiceMBeanImpl.java | 10 +- .../cassandra/net/OutboundConnectionInitiator.java | 3 +- .../org/apache/cassandra/security/SSLFactory.java | 82 +--- .../cassandra/transport/PipelineConfigurator.java | 8 +- .../apache/cassandra/transport/SimpleClient.java | 3 +- .../test/AbstractEncryptionOptionsImpl.java| 2 +- .../security/DefaultSslContextFactoryTest.java | 2 +- .../security/PEMBasedSslContextFactoryTest.java| 4 +- .../apache/cassandra/security/SSLFactoryTest.java | 105 ++--- 14 files changed, 153 insertions(+), 86 deletions(-) diff --cc CHANGES.txt index e5f38dbd9a,d902ca1e1c..c0ffd79145 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,211 -1,6 +1,212 @@@ -4.1.4 +5.0-alpha2 + * Do not create sstable files before registering in txn (CASSANDRA-18737) + * Do not log stacktrace on mismatched cache and schema version and checksum error in AutoSavingCache (CASSANDRA-18862) + * Remove wrong assertion in SSTableLoader (CASSANDRA-18840) + * Fix accessing java.nio.Bits.TOTAL_CAPACITY in Java17 (CASSANDRA-18848) + * Remove metrics-reporter-config dependency (CASSANDRA-18743) + * Fix SAI's SegmentMetadata min and max primary keys (CASSANDRA-18734) + * Remove commons-codec dependency (CASSANDRA-18772) +Merged from 4.1: + * Internode legacy SSL storage port certificate is not hot reloaded on update (CASSANDRA-18681) * Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466) +Merged from 4.0: + * JMH improvements - faster build and async profiler (CASSANDRA-18871) + * Enable 3rd party JDK installations for Debian package (CASSANDRA-18844) +Merged from 3.11: +Merged from 3.0: + * Add cqlshrc.sample and credentials.sample into Debian package (CASSANDRA-18818) + + +5.0-alpha1 + * Fix rpm installations to work with jdk17 (CASSANDRA-18817) + * Fix Depends and Build-Depends for Java for Debian packages (CASSANDRA-18809) + * Update command line flags --add-exports and --add-opens for JDK17 (CASSANDRA-18439) + * Update commons-lang3 to 3.13.0 (CASSANDRA-18789) + * Forbid SAI indexes with analysis options on primary key columns (CASSANDRA-18782) + * Expose bootstrap failure state via JMX and nodetool info (CASSANDRA-18749) + * Reduce size of per-SSTable index components for SAI (CASSANDRA-18673) + * Remove unnecessary Netty dependencies after upgrade to version 4.1.96 (CASSANDRA-18729) + * Prevent InaccessibleObjectException when the Leak Detector is traversing objects (CASSANDRA-18708) + * Remove legacy command line options from cassandra-stress (CASSANDRA-18529) + * Remove commitlog_sync_batch_window_in_ms (CASSANDRA-17161) + * Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696) + * Add guardrail for vector dimensions (CASSANDRA-18730) + * Upgraded Netty to 4.1.96, added BouncyCastle dependency (CASSANDRA-17992) + * Fix for (unsupported) big endian unaligned architecture, eg s390x (CASSANDRA-17723) + * CIDR filtering authorizer (CASSANDRA-18592) + * Remove 3.x from the versions checked for prepared statement behaviour (CASSANDRA-18695) + * Add vector similarity functions (CASSANDRA-18640) + * Lift MessagingService.minimum_version to 40 (CASSANDRA-18314) + * Introduce pluggable crypto providers and default to AmazonCorrettoCryptoProvider (CASSANDRA-18624) + * Improved DeletionTime serialization (CASSANDRA-18648) + * CEP-7: Storage Attached Indexes (CASSANDRA-16052) + * Add equals/hashCode override for ServerEncryptionOptions (CASSANDRA-18428) + * Upgrade ECJ to version 3.33.0 (CASSANDRA-18190) + * Fix ClassCastException from jdk GaloisCounterMode when using JDK17 provider (CASSANDRA-18180) + * Drop JDK8, add JDK17 (CASSANDRA-18255) + * Remove WaitingOnFreeMemtableSpace and DroppedMutations metrics (CASSANDRA-18298) + * Upgrade Jamm version to 0.4.0 (CASSANDRA-17884, CASSANDRA-16304, CASSANDRA-18329) + * Remove legacy 3.0/3.11 buffer pool metrics (CASSANDRA-18313) + * Add AzureSnitch (CASSANDRA-18646) + * Implementation of the Unified Compaction Strategy as described in CEP-26 (CASSANDRA-18397) + * Upgrade commons cli to 1.5.0 (CASSANDRA-18659) + * Disable the deprecated keyspace/table thresholds and convert them to guardrails (CASSANDRA-18617) + * Deprecate CloudstackSnitch
[cassandra] 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository.
blambov pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a23f4c0b15c684240ef0bcd55875610e8bd7179b
Merge: 07768674ac db6641fbb6
Author: Branimir Lambov
AuthorDate: Thu Sep 21 17:01:16 2023 +0300
Merge branch 'cassandra-4.1' into cassandra-5.0
CHANGES.txt| 1 +
.../db/compaction/CompactionController.java| 12 +-
.../db/compaction/CompactionControllerTest.java| 141 +
3 files changed, 147 insertions(+), 7 deletions(-)
diff --cc CHANGES.txt
index 3f0fecbb6b,bb5cc728c9..f4c57d0444
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -208,8 -4,12 +208,9 @@@ Merged from 4.1
* Allow empty keystore_password in encryption_options (CASSANDRA-18778)
* Skip ColumnFamilyStore#topPartitions initialization when client or tool
mode (CASSANDRA-18697)
Merged from 4.0:
- * Enable 3rd party JDK installations for Debian package (CASSANDRA-18844)
- * Fix NTS log message when an unrecognized strategy option is passed
(CASSANDRA-18679)
- * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582)
- * Migrate Python optparse to argparse (CASSANDRA-17914)
+ * Partial compaction can resurrect deleted data (CASSANDRA-18507)
Merged from 3.11:
+ * Fix delayed SSTable release with unsafe_aggressive_sstable_expiration
(CASSANDRA-18756)
* Revert CASSANDRA-18543 (CASSANDRA-18854)
* Fix NPE when using udfContext in UDF after a restart of a node
(CASSANDRA-18739)
Merged from 3.0:
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionController.java
index eadd85c3fd,279a1c4e6f..c01da7000d
--- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
@@@ -79,8 -70,10 +79,10 @@@ public class CompactionController exten
cfs.getCompactionStrategyManager().getCompactionParams().tombstoneOption());
}
-public CompactionController(ColumnFamilyStore cfs, Set
compacting, int gcBefore, RateLimiter limiter, TombstoneOption tombstoneOption)
+public CompactionController(ColumnFamilyStore cfs, Set
compacting, long gcBefore, RateLimiter limiter, TombstoneOption tombstoneOption)
{
+ //When making changes to the method, be aware that some of the state
of the controller may still be uninitialized
+ //(e.g. TWCS sets up the value of ignoreOverlaps() after this
completes)
super(cfs, gcBefore, tombstoneOption);
this.compacting = compacting;
this.limiter = limiter;
@@@ -101,15 -95,9 +103,9 @@@
return;
}
- if (ignoreOverlaps())
- {
- logger.debug("not refreshing overlaps - running with
ignoreOverlaps activated");
- return;
- }
-
if (cfs.getNeverPurgeTombstones())
{
-logger.debug("not refreshing overlaps for {}.{} -
neverPurgeTombstones is enabled", cfs.keyspace.getName(), cfs.getTableName());
+logger.debug("not refreshing overlaps for {}.{} -
neverPurgeTombstones is enabled", cfs.getKeyspaceName(), cfs.getTableName());
return;
}
diff --cc
test/unit/org/apache/cassandra/db/compaction/CompactionControllerTest.java
index 3154a16ac3,d1a8d01b92..ff76ce2575
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionControllerTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionControllerTest.java
@@@ -28,6 -35,6 +35,7 @@@ import org.junit.runner.RunWith
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
++import org.apache.cassandra.config.CassandraRelevantProperties;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DecoratedKey;
@@@ -182,6 -199,124 +200,124 @@@ public class CompactionControllerTest e
assertEquals(1, expired.size());
}
+ @Test
+ @BMRules(rules = {
+ @BMRule(name = "Pause compaction",
+ targetClass = "CompactionTask",
+ targetMethod = "runMayThrow",
+ targetLocation = "INVOKE getCompactionAwareWriter",
+ condition = "Thread.currentThread().getName().equals(\"compaction1\")",
+ action =
"org.apache.cassandra.db.compaction.CompactionControllerTest.createCompactionControllerLatch.countDown();"
+
+
"com.google.common.util.concurrent.Uninterruptibles.awaitUninterruptibly" +
+
"(org.apache.cassandra.db.compaction.CompactionControllerTest.compaction2FinishLatch);"),
+ @BMRule(name = "Check overlaps",
+ targetClass = "CompactionTask",
+ targetMethod = "
[cassandra] 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 871e42cf97507f4536e4a4873cf4f8e9a68ff1a3 Merge: dcfacad116 8bfe0e5878 Author: Jon Meredith AuthorDate: Fri Sep 15 14:07:45 2023 -0600 Merge branch 'cassandra-4.1' into cassandra-5.0 test/distributed/org/apache/cassandra/distributed/impl/Instance.java | 4 +++- 1 file changed, 3 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 1ac31a64a9d02372f59938592aff283ed7c0b438 Merge: 15f355a006 b8209a06fb Author: Brandon Williams AuthorDate: Fri Sep 15 12:29:25 2023 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 46 ++--- 2 files changed, 4 insertions(+), 43 deletions(-) diff --cc CHANGES.txt index 27cb4923dd,2134d0b77b..57e2b39d23 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -206,10 -4,14 +206,11 @@@ Merged from 4.1 * Allow empty keystore_password in encryption_options (CASSANDRA-18778) * Skip ColumnFamilyStore#topPartitions initialization when client or tool mode (CASSANDRA-18697) Merged from 4.0: - * Fix NTS log message when an unrecognized strategy option is passed (CASSANDRA-18679) - * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582) - * Migrate Python optparse to argparse (CASSANDRA-17914) + * Partial compaction can resurrect deleted data (CASSANDRA-18507) Merged from 3.11: + * Revert CASSANDRA-18543 (CASSANDRA-18854) * Fix NPE when using udfContext in UDF after a restart of a node (CASSANDRA-18739) Merged from 3.0: - * Add cqlshrc.sample and credentials.sample into Debian package (CASSANDRA-18818) * Refactor validation logic in StorageService.rebuild (CASSANDRA-18803) * Make alternation of a user type validate the same way as creation of a user type does (CASSANDRA-18585) * CQLSH emits a warning when the server version doesn't match (CASSANDRA-18745) - 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 00c0cbb958db570e759e685da85dc840de7dd739 Merge: 30d540d797 3d220b5a6e Author: Brandon Williams AuthorDate: Tue Sep 12 06:13:30 2023 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 test/unit/org/apache/cassandra/cql3/CQLTester.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --cc test/unit/org/apache/cassandra/cql3/CQLTester.java index a1dcd1c5a0,9f01746393..246d658f16 --- a/test/unit/org/apache/cassandra/cql3/CQLTester.java +++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java @@@ -259,7 -190,8 +259,6 @@@ public abstract class CQLTeste checkProtocolVersion(); nativeAddr = InetAddress.getLoopbackAddress(); - nativePort = getAutomaticallyAllocatedPort(nativeAddr); - -ServerTestUtils.daemonInitialization(); } private List keyspaces = new ArrayList<>(); - 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 865954fd99d190bc6359fd25503beb5684f93312 Merge: 3d5b5343e0 20125c5053 Author: Mick Semb Wever AuthorDate: Thu Aug 31 22:42:49 2023 +0200 Merge branch 'cassandra-4.1' into cassandra-5.0 * cassandra-4.1: Missing license info and headers .build/build-rat.xml | 97 -- .jenkins/Jenkinsfile | 13 ++- LICENSE.txt| 18 +++- build.properties.default | 19 + conf/cassandra-jaas.config | 16 conf/jvm-clients.options | 18 conf/jvm-server.options| 18 conf/jvm11-clients.options | 18 conf/jvm11-server.options | 18 debian/cassandra.conf | 17 debian/cassandra.postinst | 19 + debian/default | 18 debian/init| 18 debian/nodetool-completion | 17 debian/rules | 19 - pylib/Dockerfile.ubuntu.py3| 16 pylib/Dockerfile.ubuntu.py37 | 11 +++ pylib/Dockerfile.ubuntu.py38 | 11 +++ pylib/requirements.txt | 19 + redhat/cassandra | 17 redhat/cassandra.conf | 17 redhat/default | 17 ...ssandra.io.sstable.format.SSTableFormat$Factory | 17 .../cassandra/cql3/functions/JavaSourceUDF.txt | 17 test/conf/harry-generic.yaml | 17 test/data/config/version=3.0.0-alpha1.yml | 17 test/data/config/version=3.11.0.yml| 17 test/data/config/version=4.0-alpha1.yml| 17 test/data/config/version=4.1-alpha1.yml| 17 test/data/config/version=5.0-alpha1.yml| 17 30 files changed, 531 insertions(+), 56 deletions(-) diff --cc src/resources/META-INF/services/org.apache.cassandra.io.sstable.format.SSTableFormat$Factory index 79037c5f1a,00..e227edcdbe mode 100644,00..100644 --- a/src/resources/META-INF/services/org.apache.cassandra.io.sstable.format.SSTableFormat$Factory +++ b/src/resources/META-INF/services/org.apache.cassandra.io.sstable.format.SSTableFormat$Factory @@@ -1,2 -1,0 +1,19 @@@ ++# 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. ++# ++# +org.apache.cassandra.io.sstable.format.big.BigFormat$BigFormatFactory +org.apache.cassandra.io.sstable.format.bti.BtiFormat$BtiFormatFactory diff --cc test/data/config/version=4.1-alpha1.yml index 1b53159afc,00..6351ab4619 mode 100644,00..100644 --- a/test/data/config/version=4.1-alpha1.yml +++ b/test/data/config/version=4.1-alpha1.yml @@@ -1,424 -1,0 +1,441 @@@ ++# 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. ++# ++# +--- +columns_per_table_warn_threshold: "java.lang.Integer" +repaired_data_tracking_for_range_reads_enabled: "java.lang.Boolean" +cdc_block_writes: "java.lang.Boolean"
[cassandra] 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d4d0abcd0326277e8ea5805cbd335e65ebefaefb Merge: 24cfe27ea5 bde4fa0013 Author: Jon Meredith AuthorDate: Tue Aug 29 10:42:08 2023 -0600 Merge branch 'cassandra-4.1' into cassandra-5.0 CHANGES.txt| 1 + .../apache/cassandra/streaming/StreamSession.java | 70 ++-- .../async/StreamingMultiplexedChannel.java | 8 ++ .../StreamDisconnectedWhileReceivingTest.java | 117 + 4 files changed, 166 insertions(+), 30 deletions(-) diff --cc CHANGES.txt index 6ac699d84a,b52bcfd634..2c6624abbc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,201 -1,11 +1,202 @@@ -4.1.4 +5.0-alpha2 + * Update commons-lang3 to 3.13.0 (CASSANDRA-18789) + * Forbid SAI indexes with analysis options on primary key columns (CASSANDRA-18782) +Merged from 4.1: + * Waiting indefinitely on ReceivedMessage response in StreamSession#receive() can cause deadlock (CASSANDRA-18733) * Allow empty keystore_password in encryption_options (CASSANDRA-18778) +Merged from 4.0: +Merged from 3.11: +Merged from 3.0: + * Make alternation of a user type validate the same way as creation of a user type does (CASSANDRA-18585) + +5.0-alpha1 + * Expose bootstrap failure state via JMX and nodetool info (CASSANDRA-18749) + * Reduce size of per-SSTable index components for SAI (CASSANDRA-18673) + * Remove unnecessary Netty dependencies after upgrade to version 4.1.96 (CASSANDRA-18729) + * Prevent InaccessibleObjectException when the Leak Detector is traversing objects (CASSANDRA-18708) + * Remove legacy command line options from cassandra-stress (CASSANDRA-18529) + * Remove commitlog_sync_batch_window_in_ms (CASSANDRA-17161) + * Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696) + * Add guardrail for vector dimensions (CASSANDRA-18730) + * Upgraded Netty to 4.1.96, added BouncyCastle dependency (CASSANDRA-17992) + * Fix for (unsupported) big endian unaligned architecture, eg s390x (CASSANDRA-17723) + * CIDR filtering authorizer (CASSANDRA-18592) + * Remove 3.x from the versions checked for prepared statement behaviour (CASSANDRA-18695) + * Add vector similarity functions (CASSANDRA-18640) + * Lift MessagingService.minimum_version to 40 (CASSANDRA-18314) + * Introduce pluggable crypto providers and default to AmazonCorrettoCryptoProvider (CASSANDRA-18624) + * Improved DeletionTime serialization (CASSANDRA-18648) + * CEP-7: Storage Attached Indexes (CASSANDRA-16052) + * Add equals/hashCode override for ServerEncryptionOptions (CASSANDRA-18428) + * Upgrade ECJ to version 3.33.0 (CASSANDRA-18190) + * Fix ClassCastException from jdk GaloisCounterMode when using JDK17 provider (CASSANDRA-18180) + * Drop JDK8, add JDK17 (CASSANDRA-18255) + * Remove WaitingOnFreeMemtableSpace and DroppedMutations metrics (CASSANDRA-18298) + * Upgrade Jamm version to 0.4.0 (CASSANDRA-17884, CASSANDRA-16304, CASSANDRA-18329) + * Remove legacy 3.0/3.11 buffer pool metrics (CASSANDRA-18313) + * Add AzureSnitch (CASSANDRA-18646) + * Implementation of the Unified Compaction Strategy as described in CEP-26 (CASSANDRA-18397) + * Upgrade commons cli to 1.5.0 (CASSANDRA-18659) + * Disable the deprecated keyspace/table thresholds and convert them to guardrails (CASSANDRA-18617) + * Deprecate CloudstackSnitch and remove duplicate code in snitches (CASSANDRA-18438) + * Add support for vectors in UDFs (CASSANDRA-18613) + * Improve vector value validation errors (CASSANDRA-18652) + * Upgrade Guava to 32.0.1 (CASSANDRA-18645) + * Add duration and count of partition keys to sstablemetadata (CASSANDRA-18639) + * Remove deprecated compaction_tombstone_warning_threshold and compaction_large_partition_warning_threshold from yaml (CASSANDRA-18626) + * Enhance nodetool compactionstats with additional metrics (CASSANDRA-18305) + * Added support for type VECTOR (CASSANDRA-18504) + * Expose bootstrap and decommission state to nodetool info (CASSANDRA-18555) + * Fix SSTabledump errors when dumping data from index (CASSANDRA-17698) + * Avoid unnecessary deserialization of terminal arguments when executing CQL functions (CASSANDRA-18566) + * Remove dependency on pytz library for setting CQLSH timezones on Python version >= 3.9 (CASSANDRA-17433) + * Extend maximum expiration date (CASSANDRA-14227) + * Add guardrail for partition tombstones and deprecate compaction_tombstone_warning_threshold (CASSANDRA-17194) + * Print header and statistics for cassandra-stress output with arbitrary frequency (CASSANDRA-12972) + * CEP-25: Trie-indexed SSTable format (CASSANDRA-18398) + * Make cassandra-stress able to read all credentials from a file (CASSANDRA-18544) + * Add guardrail for partition size and deprecate compaction_large_partition_warning_threshold (CASSANDRA-18500) + *
[cassandra] 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 24cfe27ea539cfd4c40aaa33662a76523f62ddb5 Merge: b670b7b0c8 251ae80bb0 Author: Jon Meredith AuthorDate: Mon Aug 28 15:36:29 2023 -0600 Merge branch 'cassandra-4.1' into cassandra-5.0 .../distributed/impl/AbstractCluster.java | 31 +++- .../distributed/impl/INodeProvisionStrategy.java | 89 ++ .../cassandra/distributed/impl/InstanceConfig.java | 2 +- .../distributed/test/jmx/JMXFeatureTest.java | 3 +- .../unit/org/apache/cassandra/net/SocketUtils.java | 53 - 5 files changed, 138 insertions(+), 40 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit b670b7b0c8921ff6debca87491de1e0b80555255
Merge: 046c8447ec 5e2985f10e
Author: Brandon Williams
AuthorDate: Mon Aug 28 09:48:06 2023 -0500
Merge branch 'cassandra-4.1' into cassandra-5.0
.build/checkstyle_test.xml | 7 +++
build.xml | 7 ++-
.../apache/cassandra/audit/AuditLoggerTest.java| 59 +-
.../org/apache/cassandra/db/DirectoriesTest.java | 20 +---
.../cassandra/db/DiskBoundaryManagerTest.java | 19 ---
test/unit/org/apache/cassandra/db/ImportTest.java | 8 +--
.../writers/CompactionAwareWriterTest.java | 19 ---
.../apache/cassandra/fql/FullQueryLoggerTest.java | 7 ++-
.../cassandra/io/sstable/DescriptorTest.java | 44
.../cassandra/io/sstable/SSTableReaderTest.java| 4 +-
.../apache/cassandra/io/util/FileUtilsTest.java| 10 ++--
.../cassandra/service/StartupChecksTest.java | 2 +-
.../cassandra/streaming/StreamSessionTest.java | 11 ++--
13 files changed, 132 insertions(+), 85 deletions(-)
diff --cc .build/checkstyle_test.xml
index afd9d3d3a6,5b6e16e8b2..ba56c9727d
--- a/.build/checkstyle_test.xml
+++ b/.build/checkstyle_test.xml
@@@ -56,77 -56,16 +56,84 @@@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --cc build.xml
index c77afcb88b,c639748150..ea6cfac5ad
--- a/build.xml
+++ b/build.xml
@@@ -88,9 -80,11 +88,12 @@@
+
-
+
+
+
diff --cc test/unit/org/apache/cassandra/db/DiskBoundaryManagerTest.java
index adca700b62,518f8c5c44..9fa8245771
--- a/test/unit/org/apache/cassandra/db/DiskBoundaryManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/DiskBoundaryManagerTest.java
@@@ -18,12 -18,12 +18,15 @@@
package org.apache.cassandra.db;
+ import java.io.IOException;
import java.net.UnknownHostException;
+ import java.nio.file.Files;
+ import java.nio.file.Path;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import org.junit.Assert;
import org.junit.Before;
@@@ -55,10 -49,10 +58,11 @@@ public class DiskBoundaryManagerTest ex
private MockCFS mock;
private Directories dirs;
private List datadirs;
+private List tableDirs;
+ private Path tmpDir;
@Before
- public void setup()
+ public void setup() throws IOException
{
DisallowedDirectories.clearUnwritableUnsafe();
TokenMetadata metadata = StorageService.instance.getTokenMetadata();
diff --cc test/unit/org/apache/cassandra/streaming/StreamSessionTest.java
index 7ef3ff99ee,00..44491d55e5
mode 100644,00..100644
--- a/test/unit/org/apache/cassandra/streaming/StreamSessionTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamSessionTest.java
@@@ -1,203 -1,0 +1,206 @@@
+/*
+ * 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.streaming;
+
+import java.io.IOException;
+import java.nio.file.FileStore;
++import java.nio.file.Files;
++import java.nio.file.Path;
+import java.nio.file.attribute.FileAttributeView;
+import java.nio.file.attribute.FileStoreAttributeView;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
[cassandra] 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d2f8e8e10546a229d7280e3bf70780ccdbcb7320 Merge: 410018ab16 ac3b356063 Author: Jon Meredith AuthorDate: Thu Aug 24 16:44:04 2023 -0600 Merge branch 'cassandra-4.1' into cassandra-5.0 .build/parent-pom-template.xml | 2 +- build.xml | 1 + .../utils/RMIClientSocketFactoryImpl.java | 21 +- .../apache/cassandra/utils/ReflectionUtils.java| 44 ++- .../cassandra/distributed/impl/Instance.java | 5 +- .../cassandra/distributed/impl/IsolatedJmx.java| 87 +- .../cassandra/distributed/shared/ClusterUtils.java | 34 +++-- .../distributed/test/ResourceLeakTest.java | 54 -- .../distributed/test/jmx/JMXFeatureTest.java | 85 ++--- .../distributed/test/jmx/JMXGetterCheckTest.java | 46 +--- .../commitlog/CommitLogSegmentManagerCDCTest.java | 2 +- 11 files changed, 259 insertions(+), 122 deletions(-) diff --cc .build/parent-pom-template.xml index 7d80e5160d,00..ba1e2bb5a9 mode 100644,00..100644 --- a/.build/parent-pom-template.xml +++ b/.build/parent-pom-template.xml @@@ -1,1209 -1,0 +1,1209 @@@ + + +http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns="http://maven.apache.org/POM/4.0.0; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;> + 4.0.0 + +apache +org.apache +22 + + org.apache.cassandra + cassandra-parent + @version@ + pom + Apache Cassandra + The Apache Cassandra Project develops a highly scalable second-generation distributed database, bringing together Dynamo's fully distributed design and Bigtable's ColumnFamily-based data model. + https://cassandra.apache.org + 2009 + + + The Apache Software License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + +1.12.13 +4.0.20 +0.5.1 + + +@asm.version@ +@jamm.version@ + @allocation-instrumenter.version@ +@ecj.version@ +@jacoco.version@ +@jflex.version@ + + + + adelapena + Andres de la Peña + + + alakshman + Avinash Lakshman + + + aleksey + Aleksey Yeschenko + + + amorton + Aaron Morton + + + aweisberg + Ariel Weisberg + + + bdeggleston + Blake Eggleston + + + benedict + Benedict Elliott Smith + + + benjamin + Benjamin Lerer + + + blambov + Branimir Lambov + + + brandonwilliams + Brandon Williams + + + carl + Carl Yeksigian + + + dbrosius + David Brosiusd + + + dikang + Dikang Gu + + + eevans + Eric Evans + + + edimitrova + Ekaterina Dimitrova + + + gdusbabek + Gary Dusbabek + + + goffinet + Chris Goffinet + + + ifesdjeen + Alex Petrov + + + jaakko + Laine Jaakko Olavi + + + jake + T Jake Luciani + + + jasonbrown + Jason Brown + + + jbellis + Jonathan Ellis + + + jfarrell + Jake Farrell + + + jjirsa + Jeff Jirsa + + + jkni + Joel Knighton + + + jmckenzie + Josh McKenzie + + + johan + Johan Oskarsson + + + junrao + Jun Rao + + + jzhuang + Jay Zhuang + + + kohlisankalp + Sankalp Kohli + + + marcuse + Marcus Eriksson + + + mck + Michael Semb Wever + + + mishail + Mikhail Stepura + + + mshuler + Michael Shuler + + + paulo + Paulo Motta + + + pmalik + Prashant Malik + + + rstupp + Robert Stupp + + + scode + Peter Schuller + + + beobal + Sam Tunnicliffe + + + slebresne + Sylvain Lebresne + + + stefania + Stefania Alborghetti + + + tylerhobbs + Tyler Hobbs + + + vijay + Vijay Parthasarathy + + + xedin + Pavel Yaskevich + + + yukim + Yuki Morishita + + + zznate + Nate McCall + + + smiklosovic + Stefan Miklosovic + + + + scm:https://gitbox.apache.org/repos/asf/cassandra.git + scm:https://gitbox.apache.org/repos/asf/cassandra.git +
[cassandra] 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ef2903f20f1eee4dc4a419342703ee20d5b545e0
Merge: efad24e997 a2af87de8a
Author: Brandon Williams
AuthorDate: Fri Aug 18 13:58:09 2023 -0500
Merge branch 'cassandra-4.1' into cassandra-5.0
pylib/cqlshlib/cqlshmain.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc pylib/cqlshlib/cqlshmain.py
index b5536084a9,00..a9d726cadd
mode 100755,00..100755
--- a/pylib/cqlshlib/cqlshmain.py
+++ b/pylib/cqlshlib/cqlshmain.py
@@@ -1,2404 -1,0 +1,2404 @@@
+# 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.
+
+import cmd
+import codecs
+import configparser
+import csv
+import getpass
+import argparse
+import os
+import re
+import subprocess
+import sys
+import traceback
+import warnings
+import webbrowser
+from contextlib import contextmanager
+from io import StringIO
+from uuid import UUID
+
+UTF8 = 'utf-8'
+
+description = "CQL Shell for Apache Cassandra"
+version = "6.2.0"
+
+readline = None
+try:
+# check if tty first, cause readline doesn't check, and only cares
+# about $TERM. we don't want the funky escape code stuff to be
+# output if not a tty.
+if sys.stdin.isatty():
+import readline
+except ImportError:
+pass
+
+# On Linux, the Python webbrowser module uses the 'xdg-open' executable
+# to open a file/URL. But that only works, if the current session has been
+# opened from _within_ a desktop environment. I.e. 'xdg-open' will fail,
+# if the session's been opened via ssh to a remote box.
+#
+try:
+webbrowser.register_standard_browsers() # registration is otherwise lazy
in Python3
+except AttributeError:
+pass
+if webbrowser._tryorder and webbrowser._tryorder[0] == 'xdg-open' and
os.environ.get('XDG_DATA_DIRS', '') == '':
+# only on Linux (some OS with xdg-open)
+webbrowser._tryorder.remove('xdg-open')
+webbrowser._tryorder.append('xdg-open')
+
+warnings.filterwarnings("ignore", r".*blist.*")
+
+import cassandra
+from cassandra.auth import PlainTextAuthProvider
+from cassandra.cluster import Cluster
+from cassandra.cqltypes import cql_typename
+from cassandra.marshal import int64_unpack
+from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
TableMetadata)
+from cassandra.policies import WhiteListRoundRobinPolicy
+from cassandra.query import SimpleStatement, ordered_dict_factory,
TraceUnavailable
+from cassandra.util import datetime_from_timestamp
+
+from cqlshlib import cql3handling, pylexotron, sslhandling, cqlshhandling,
authproviderhandling
+from cqlshlib.copyutil import ExportTask, ImportTask
+from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
+ RED, WHITE, FormattedValue, colorme)
+from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT,
+ DEFAULT_TIMESTAMP_FORMAT, CqlType,
DateTimeFormat,
+ format_by_type)
+from cqlshlib.tracing import print_trace, print_trace_session
+from cqlshlib.util import get_file_encoding_bomsize, is_file_secure
+from cqlshlib.serverversion import version as build_version
+
+DEFAULT_HOST = '127.0.0.1'
+DEFAULT_PORT = 9042
+DEFAULT_SSL = False
+DEFAULT_CONNECT_TIMEOUT_SECONDS = 5
+DEFAULT_REQUEST_TIMEOUT_SECONDS = 10
+
+DEFAULT_FLOAT_PRECISION = 5
+DEFAULT_DOUBLE_PRECISION = 5
+DEFAULT_MAX_TRACE_WAIT = 10
+
+if readline is not None and readline.__doc__ is not None and 'libedit' in
readline.__doc__:
+DEFAULT_COMPLETEKEY = '\t'
+else:
+DEFAULT_COMPLETEKEY = 'tab'
+
+cqldocs = None
+cqlruleset = None
+CASSANDRA_CQL_HTML = None
+
+epilog = """Connects to %(DEFAULT_HOST)s:%(DEFAULT_PORT)d by default. These
+defaults can be changed by setting $CQLSH_HOST and/or $CQLSH_PORT. When a
+host (and optional port number) are given on the command line, they take
+precedence over any defaults.""" % globals()
+
+
+parser = argparse.ArgumentParser(description=description, epilog=epilog,
+
[cassandra] 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 87620d4693be6609236605dc7c18fa03b3bd1998 Merge: 9e0ccf0f95 e231dd5b83 Author: Brandon Williams AuthorDate: Fri Aug 18 10:41:43 2023 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 .gitignore | 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-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 0b593776d57d85341f869604ae8ea416cbee672d Merge: aa84b19112 cd3e564fb2 Author: Brandon Williams AuthorDate: Fri Aug 18 05:11:53 2023 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 CHANGES.txt | 1 + .../org/apache/cassandra/tools/nodetool/stats/StatsTable.java | 1 + .../apache/cassandra/tools/nodetool/stats/TableStatsHolder.java | 2 ++ .../apache/cassandra/tools/nodetool/stats/TableStatsPrinter.java | 1 + .../cassandra/tools/nodetool/stats/TableStatsPrinterTest.java | 8 .../apache/cassandra/tools/nodetool/stats/TableStatsTestBase.java | 1 + 6 files changed, 14 insertions(+) diff --cc CHANGES.txt index adf6371512,e7b058cfa2..435fcea0fa --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,191 -1,12 +1,192 @@@ -4.1.4 +5.0-alpha1 + * Remove unnecessary Netty dependencies after upgrade to version 4.1.96 (CASSANDRA-18729) + * Prevent InaccessibleObjectException when the Leak Detector is traversing objects (CASSANDRA-18708) + * Remove legacy command line options from cassandra-stress (CASSANDRA-18529) + * Remove commitlog_sync_batch_window_in_ms (CASSANDRA-17161) + * Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696) + * Add guardrail for vector dimensions (CASSANDRA-18730) + * Upgraded Netty to 4.1.96, added BouncyCastle dependency (CASSANDRA-17992) + * Fix for (unsupported) big endian unaligned architecture, eg s390x (CASSANDRA-17723) + * CIDR filtering authorizer (CASSANDRA-18592) + * Remove 3.x from the versions checked for prepared statement behaviour (CASSANDRA-18695) + * Add vector similarity functions (CASSANDRA-18640) + * Lift MessagingService.minimum_version to 40 (CASSANDRA-18314) + * Introduce pluggable crypto providers and default to AmazonCorrettoCryptoProvider (CASSANDRA-18624) + * Improved DeletionTime serialization (CASSANDRA-18648) + * CEP-7: Storage Attached Indexes (CASSANDRA-16052) + * Add equals/hashCode override for ServerEncryptionOptions (CASSANDRA-18428) + * Upgrade ECJ to version 3.33.0 (CASSANDRA-18190) + * Fix ClassCastException from jdk GaloisCounterMode when using JDK17 provider (CASSANDRA-18180) + * Drop JDK8, add JDK17 (CASSANDRA-18255) + * Remove WaitingOnFreeMemtableSpace and DroppedMutations metrics (CASSANDRA-18298) + * Upgrade Jamm version to 0.4.0 (CASSANDRA-17884, CASSANDRA-16304, CASSANDRA-18329) + * Remove legacy 3.0/3.11 buffer pool metrics (CASSANDRA-18313) + * Add AzureSnitch (CASSANDRA-18646) + * Implementation of the Unified Compaction Strategy as described in CEP-26 (CASSANDRA-18397) + * Upgrade commons cli to 1.5.0 (CASSANDRA-18659) + * Disable the deprecated keyspace/table thresholds and convert them to guardrails (CASSANDRA-18617) + * Deprecate CloudstackSnitch and remove duplicate code in snitches (CASSANDRA-18438) + * Add support for vectors in UDFs (CASSANDRA-18613) + * Improve vector value validation errors (CASSANDRA-18652) + * Upgrade Guava to 32.0.1 (CASSANDRA-18645) + * Add duration and count of partition keys to sstablemetadata (CASSANDRA-18639) + * Remove deprecated compaction_tombstone_warning_threshold and compaction_large_partition_warning_threshold from yaml (CASSANDRA-18626) + * Enhance nodetool compactionstats with additional metrics (CASSANDRA-18305) + * Added support for type VECTOR (CASSANDRA-18504) + * Expose bootstrap and decommission state to nodetool info (CASSANDRA-18555) + * Fix SSTabledump errors when dumping data from index (CASSANDRA-17698) + * Avoid unnecessary deserialization of terminal arguments when executing CQL functions (CASSANDRA-18566) + * Remove dependency on pytz library for setting CQLSH timezones on Python version >= 3.9 (CASSANDRA-17433) + * Extend maximum expiration date (CASSANDRA-14227) + * Add guardrail for partition tombstones and deprecate compaction_tombstone_warning_threshold (CASSANDRA-17194) + * Print header and statistics for cassandra-stress output with arbitrary frequency (CASSANDRA-12972) + * CEP-25: Trie-indexed SSTable format (CASSANDRA-18398) + * Make cassandra-stress able to read all credentials from a file (CASSANDRA-18544) + * Add guardrail for partition size and deprecate compaction_large_partition_warning_threshold (CASSANDRA-18500) + * Add HISTORY command for CQLSH (CASSANDRA-15046) + * Fix sstable formats configuration (CASSANDRA-18441) + * Add guardrail to bound timestamps (CASSANDRA-18352) + * Add keyspace_name column to system_views.clients (CASSANDRA-18525) + * Moved system properties and envs to CassandraRelevantProperties and CassandraRelevantEnv respectively (CASSANDRA-17797) + * Add sstablepartitions offline tool to find large partitions in sstables (CASSANDRA-8720) + * Replace usages of json-simple dependency by Jackson (CASSANDRA-16855) +
[cassandra] 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 3dd2665f12a81f55f82eddb5f054b39ca94140c9 Merge: 53d1644ff4 d850cd7372 Author: Brandon Williams AuthorDate: Tue Aug 8 10:28:16 2023 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 .build/dependency-check-suppressions.xml | 52 CHANGES.txt | 3 ++ 2 files changed, 3 insertions(+), 52 deletions(-) diff --cc .build/dependency-check-suppressions.xml index d7a66cb3bf,b7ebb45e57..6c2e52c3ca --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -44,42 -35,26 +35,6 @@@ CVE-2021-4235 CVE-2017-18640 - - - ^pkg:maven/net\.openhft/chronicle\-wire@.*$ - cpe:/a:wire:wire - - - - ^pkg:maven/org\.apache\.commons.*$ - CVE-2021-37533 - - - ^pkg:maven/commons-io/.*$ - CVE-2021-37533 - - - ^pkg:maven/commons-cli/.*$ - CVE-2021-37533 - -- - ^pkg:maven/commons-codec/.*$ - CVE-2021-37533 - -^pkg:maven/com\.google\.guava/guava@.*$ -CVE-2020-8908 -CVE-2023-2976 -- -- -- --^pkg:maven/io\.netty/netty\-all@.*$ --CVE-2021-21290 --CVE-2021-21295 --CVE-2021-21409 --CVE-2021-37136 --CVE-2021-37137 --CVE-2021-43797 --CVE-2022-24823 --CVE-2022-41881 --CVE-2022-41915 --CVE-2023-34462 -- ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ @@@ -87,11 -62,5 +42,4 @@@ CVE-2022-42004 CVE-2023-35116 - - - - ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-core@.*$ - CVE-2022-45688 - -- diff --cc CHANGES.txt index 921ad41f4d,0f33ba0e2e..278b93387d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,186 -1,5 +1,189 @@@ -4.1.4 +5.0 + * Upgraded Netty to 4.1.96, added BouncyCastle dependency (CASSANDRA-17992) + * Fix for (unsupported) big endian unaligned architecture, eg s390x (CASSANDRA-17723) + * CIDR filtering authorizer (CASSANDRA-18592) + * Remove 3.x from the versions checked for prepared statement behaviour (CASSANDRA-18695) + * Add vector similarity functions (CASSANDRA-18640) + * Lift MessagingService.minimum_version to 40 (CASSANDRA-18314) + * Introduce pluggable crypto providers and default to AmazonCorrettoCryptoProvider (CASSANDRA-18624) + * Improved DeletionTime serialization (CASSANDRA-18648) + * CEP-7: Storage Attached Indexes (CASSANDRA-16052) + * Add equals/hashCode override for ServerEncryptionOptions (CASSANDRA-18428) + * Upgrade ECJ to version 3.33.0 (CASSANDRA-18190) + * Fix ClassCastException from jdk GaloisCounterMode when using JDK17 provider (CASSANDRA-18180) + * Drop JDK8, add JDK17 (CASSANDRA-18255) + * Remove WaitingOnFreeMemtableSpace and DroppedMutations metrics (CASSANDRA-18298) + * Upgrade Jamm version to 0.4.0 (CASSANDRA-17884, CASSANDRA-16304, CASSANDRA-18329) + * Remove legacy 3.0/3.11 buffer pool metrics (CASSANDRA-18313) + * Add AzureSnitch (CASSANDRA-18646) + * Implementation of the Unified Compaction Strategy as described in CEP-26 (CASSANDRA-18397) + * Upgrade commons cli to 1.5.0 (CASSANDRA-18659) + * Disable the deprecated keyspace/table thresholds and convert them to guardrails (CASSANDRA-18617) + * Deprecate CloudstackSnitch and remove duplicate code in snitches (CASSANDRA-18438) + * Add support for vectors in UDFs (CASSANDRA-18613) + * Improve vector value validation errors (CASSANDRA-18652) + * Upgrade Guava to 32.0.1 (CASSANDRA-18645) + * Add duration and count of partition keys to sstablemetadata (CASSANDRA-18639) + * Remove deprecated compaction_tombstone_warning_threshold and compaction_large_partition_warning_threshold from yaml (CASSANDRA-18626) + * Enhance nodetool compactionstats with additional metrics (CASSANDRA-18305) + * Added support for type VECTOR (CASSANDRA-18504) + * Expose bootstrap and decommission state to nodetool info (CASSANDRA-18555) + * Fix SSTabledump errors when dumping data from index (CASSANDRA-17698) + * Avoid unnecessary deserialization of terminal arguments when executing CQL functions (CASSANDRA-18566) + * Remove dependency on pytz library for setting CQLSH timezones on Python version >= 3.9 (CASSANDRA-17433) + * Extend maximum expiration date (CASSANDRA-14227) + * Add guardrail for partition tombstones and deprecate compaction_tombstone_warning_threshold (CASSANDRA-17194) + * Print header and statistics for cassandra-stress output with arbitrary frequency (CASSANDRA-12972) + * CEP-25: Trie-indexed SSTable format (CASSANDRA-18398) + * Make cassandra-stress able to read all credentials from a file (CASSANDRA-18544)
