[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit bb3749f2bb8282f67375c67712d8e3ca1f085879
Merge: 2180a34bbb eac7b1de35
Author: Brandon Williams 
AuthorDate: Thu Apr 28 09:10:47 2022 -0500

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt | 5 +
 build.xml   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index a1250b714a,03e25a8410..b069eacb4a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,157 -1,17 +1,158 @@@
 -4.0.5
 +4.1
 + * Add guardrail to disallow TRUNCATE and DROP TABLE commands 
(CASSANDRA-17558)
 + * Add plugin support for CQLSH (CASSANDRA-16456)
 + * Add guardrail to disallow querying with ALLOW FILTERING (CASSANDRA-17370)
 + * Enhance SnakeYAML properties to be reusable outside of YAML parsing, 
support camel case conversion to snake case, and add support to ignore 
properties (CASSANDRA-17166)
 + * nodetool compact should support using a key string to find the range to 
avoid operators having to manually do this (CASSANDRA-17537)
 + * Add guardrail for data disk usage (CASSANDRA-17150)
 + * Tool to list data paths of existing tables (CASSANDRA-17568)
 + * Migrate track_warnings to more standard naming conventions and use latest 
configuration types rather than long (CASSANDRA-17560)
 + * Add support for CONTAINS and CONTAINS KEY in conditional UPDATE and DELETE 
statement (CASSANDRA-10537)
 + * Migrate advanced config parameters to the new Config types 
(CASSANDRA-17431)
 + * Make null to be meaning disabled and leave 0 as a valid value for 
permissions_update_interval, roles_update_interval, credentials_update_interval 
(CASSANDRA-17431)
 + * Fix typo in Config annotation (CASSANDRA-17431)
 + * Made Converters type safe and fixed a few cases where converters used the 
wrong type (CASSANDRA-17431)
 + * Fix null bug in DataStorageSpec and DurationSpec and require units to be 
added when providing 0 value (CASSANDRA-17431)
 + * Shutdown ScheduledExecutors as part of node drainage (CASSANDRA-17493)
 + * Provide JMX endpoint to allow transient logging of blocking read repairs 
(CASSANDRA-17471)
 + * Add guardrail for GROUP BY queries (CASSANDRA-17509)
 + * make pylib PEP and pylint compliant (CASSANDRA-17546)
 + * Add support for vnodes in jvm-dtest (CASSANDRA-17332)
 + * Remove guardrails global enable flag (CASSANDRA-17499)
 + * Clients using JMX are unable to handle non-standard java types but we leak 
this into our interfaces (CASSANDRA-17527)
 + * Remove stress server functionality (CASSANDRA-17535)
 + * Reduce histogram snapshot long[] allocation overhead during speculative 
read and write threshold updates (CASSANDRA-17523)
 + * Add guardrail for creation of secondary indexes (CASSANDRA-17498)
 + * Add guardrail to disallow creation of uncompressed tables (CASSANDRA-17504)
 + * Add guardrail to disallow creation of new COMPACT STORAGE tables 
(CASSANDRA-17522)
 + * repair vtables should expose a completed field due to lack of filtering 
options in CQL (CASSANDRA-17520)
 + * remove outdated code from cqlsh (CASSANDRA-17490)
 + * remove support for deprecated version specific TLS in Python 3.6 
(CASSANDRA-17365)
 + * Add support for IF EXISTS and IF NOT EXISTS in ALTER statements 
(CASSANDRA-16916)
 + * resolve several pylint issues in cqlsh.py and pylib (CASSANDRA-17480)
 + * Streaming sessions longer than 3 minutes fail with timeout 
(CASSANDRA-17510)
 + * Add ability to track state in repair (CASSANDRA-15399)
 + * Remove unused 'parse' module (CASSANDRA-17484)
 + * change six functions in cqlshlib to native Python 3 (CASSANDRA-17417)
 + * reduce hot-path object allocations required to record local/remote 
requests against the client request metrics (CASSANDRA-17424)
 + * Disallow removing DC from system_auth while nodes are active in the DC 
(CASSANDRA-17478)
 + * Add guardrail for the number of fields per UDT (CASSANDRA-17385)
 + * Allow users to change cqlsh history location using env variable 
(CASSANDRA-17448)
 + * Add required -f option to use nodetool verify and standalone sstableverify 
(CASSANDRA-17017)
 + * Add support for UUID based sstable generation identifiers (CASSANDRA-17048)
 + * Log largest memtable flush at info instead of debug (CASSANDRA-17472)
 + * Add native transport rate limiter options to example cassandra.yaml, and 
expose metric for dispatch rate (CASSANDRA-17423)
 + * Add diagnostic events for guardrails (CASSANDRA-17197)
 + * Pre hashed passwords in CQL (CASSANDRA-17334)
 + * Increase cqlsh version (CASSANDRA-17432)
 + * Update SUPPORTED_UPGRADE_PATHS to include 3.0 and 3.x to 4.1 paths and 
remove obsolete tests (CASSANDRA-17362)
 + * Support DELETE in CQLSSTableWriter (CASSANDRA-14797)
 + * Failed inbound internode authentication failures generate ugly warning 
with stack trace (CASSANDRA-17068)
 + * Expose gossip information in system_views.gossip_info virtual table 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[jonmeredith]

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

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

commit 0c37176673ca71a75990a26e421b5991db6eefe1
Merge: 6bd373f5d2 2405d523fa
Author: Jon Meredith 
AuthorDate: Wed Apr 27 12:03:44 2022 -0600

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../org/apache/cassandra/concurrent/Stage.java | 55 --
 .../config/CassandraRelevantProperties.java|  5 ++
 .../apache/cassandra/service/StorageService.java   | 19 ++--
 .../distributed/test/ring/AutoBootstrapTest.java   |  5 +-
 5 files changed, 55 insertions(+), 30 deletions(-)

diff --cc CHANGES.txt
index 8a4e661719,8b59569491..3f3a782cc3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -216,25 -75,7 +216,26 @@@ Merged from 3.11
   * Add key validation to ssstablescrub (CASSANDRA-16969)
   * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
   * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
 + * Validate SASI tokenizer options before adding index to schema 
(CASSANDRA-15135)
 + * Fixup scrub output when no data post-scrub and clear up old use of row, 
which really means partition (CASSANDRA-16835)
 + * Reduce thread contention in CommitLogSegment and HintsBuffer 
(CASSANDRA-16072)
 + * Make cqlsh use the same set of reserved keywords than the server uses 
(CASSANDRA-15663)
 + * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
 + * Enable tombstone compactions when unchecked_tombstone_compaction is set in 
TWCS (CASSANDRA-14496)
 + * Read only the required SSTables for single partition queries 
(CASSANDRA-16737)
  Merged from 3.0:
++ * Schema mutations may not be completed on drain (CASSANDRA-17524)
 + * Fix data corruption in AbstractCompositeType due to static boolean byte 
buffers (CASSANDRA-14752)
 + * Add procps dependency to RPM/Debian packages (CASSANDRA-17516)
 + * Suppress CVE-2021-44521 (CASSANDRA-17492)
 + * ConnectionLimitHandler may leaks connection count if remote connection 
drops (CASSANDRA-17252)
 + * Require ant >= 1.10 (CASSANDRA-17428)
 + * Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266)
 + * Suppress inapplicable CVEs (CASSANDRA-17368)
 + * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion 
(CASSANDRA-17338)
 + * Fixed TestCqlshOutput failing tests (CASSANDRA-17386)
 + * Lazy transaction log replica creation allows incorrect replica content 
divergence during anticompaction (CASSANDRA-17273)
 + * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272)
   * Fix conversion from megabits to bytes in streaming rate limiter 
(CASSANDRA-17243)
   * Upgrade logback to 1.2.9 (CASSANDRA-17204)
   * Avoid race in AbstractReplicationStrategy endpoint caching 
(CASSANDRA-16673)
diff --cc src/java/org/apache/cassandra/concurrent/Stage.java
index 1c15e4505a,5efaf16cf6..ac609aa774
--- a/src/java/org/apache/cassandra/concurrent/Stage.java
+++ b/src/java/org/apache/cassandra/concurrent/Stage.java
@@@ -42,29 -49,35 +42,36 @@@ import static org.apache.cassandra.conc
  
  public enum Stage
  {
- READ  ("ReadStage", "request",  
DatabaseDescriptor::getConcurrentReaders,
DatabaseDescriptor::setConcurrentReaders,
Stage::multiThreadedLowSignalStage),
- MUTATION  ("MutationStage", "request",  
DatabaseDescriptor::getConcurrentWriters,
DatabaseDescriptor::setConcurrentWriters,
Stage::multiThreadedLowSignalStage),
- COUNTER_MUTATION  ("CounterMutationStage",  "request",  
DatabaseDescriptor::getConcurrentCounterWriters, 
DatabaseDescriptor::setConcurrentCounterWriters, 
Stage::multiThreadedLowSignalStage),
- VIEW_MUTATION ("ViewMutationStage", "request",  
DatabaseDescriptor::getConcurrentViewWriters,
DatabaseDescriptor::setConcurrentViewWriters,
Stage::multiThreadedLowSignalStage),
- GOSSIP("GossipStage",   "internal", () -> 1,  
   null,
Stage::singleThreadedStage),
- REQUEST_RESPONSE  ("RequestResponseStage",  "request",  
FBUtilities::getAvailableProcessors, null,  
  Stage::multiThreadedLowSignalStage),
- ANTI_ENTROPY  ("AntiEntropyStage",  "internal", () -> 1,  
   null,
Stage::singleThreadedStage),
- MIGRATION ("MigrationStage","internal", () -> 1,  
   null,
Stage::migrationStage),
- MISC  ("MiscStage", "internal", () -> 1,  
   null,
Stage::singleThreadedStage),
- TRACING   ("TracingStage",  

[cassandra] 01/01: Merge branch cassandra-4.0 into trunk

[blerer]

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

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

commit 003a96b6a6f649f99138b94c52d28b73c2c3547a
Merge: 2723c91878 018c8e0d5e
Author: Benjamin Lerer 
AuthorDate: Fri Apr 22 19:28:32 2022 +0200

Merge branch cassandra-4.0 into trunk



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[adelapena]

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

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

commit 2723c91878cfd7005a53f6118015c484dacc0f32
Merge: b3842de5cf 2873c91269
Author: Andrés de la Peña 
AuthorDate: Fri Apr 22 17:30:22 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 .../test/ReadRepairCollectionQueriesTest.java  |  236 
 .../distributed/test/ReadRepairInQueriesTest.java  |  247 
 .../test/ReadRepairPointQueriesTest.java   |   79 ++
 .../distributed/test/ReadRepairQueryTester.java|  279 +
 .../distributed/test/ReadRepairQueryTypesTest.java | 1191 
 .../test/ReadRepairRangeQueriesTest.java   |  261 +
 .../test/ReadRepairSliceQueriesTest.java   |  145 +++
 .../test/ReadRepairUnrestrictedQueriesTest.java|  116 ++
 8 files changed, 1363 insertions(+), 1191 deletions(-)

diff --cc 
test/distributed/org/apache/cassandra/distributed/test/ReadRepairQueryTester.java
index 00,10bf05021b..26516104fb
mode 00,100644..100644
--- 
a/test/distributed/org/apache/cassandra/distributed/test/ReadRepairQueryTester.java
+++ 
b/test/distributed/org/apache/cassandra/distributed/test/ReadRepairQueryTester.java
@@@ -1,0 -1,280 +1,279 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ 
+ package org.apache.cassandra.distributed.test;
+ 
+ import java.io.IOException;
+ import java.util.ArrayList;
+ import java.util.Collection;
+ import java.util.List;
+ 
+ import org.junit.AfterClass;
+ import org.junit.BeforeClass;
+ import org.junit.runner.RunWith;
+ import org.junit.runners.Parameterized;
+ 
+ import org.apache.cassandra.distributed.Cluster;
+ import org.apache.cassandra.service.reads.repair.ReadRepairStrategy;
+ 
 -import static java.util.concurrent.TimeUnit.MINUTES;
+ import static 
org.apache.cassandra.distributed.shared.AssertUtils.assertEquals;
+ import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows;
+ import static 
org.apache.cassandra.service.reads.repair.ReadRepairStrategy.NONE;
+ 
+ /**
+  * Base class for tests around read repair functionality with different query 
types and schemas.
+  * 
+  * Each test verifies that its tested query triggers read repair propagating 
mismatched rows/columns and row/column
+  * deletions. They also verify that the selected rows and columns are 
propagated through read repair on missmatch,
+  * and that unselected rows/columns are not repaired.
+  * 
+  * The tests are parameterized for:
+  * 
+  * 
+  * Data to be repaired residing on the query coordinator or a 
replica
+  * Data to be repaired residing on memtables or flushed to 
sstables
+  * 
+  * 
+  * All derived tests follow a similar pattern:
+  * 
+  * Create a keyspace with RF=2 and a table
+  * Insert some data in only one of the nodes
+  * Run the tested read query selecting a subset of the inserted 
columns with CL=ALL
+  * Verify that the previous read has triggered read repair 
propagating only the queried columns
+  * Run the tested read query again but this time selecting all the 
columns
+  * Verify that the previous read has triggered read repair 
propagating the rest of the queried rows
+  * Delete one of the involved columns in just one node
+  * Run the tested read query again but this time selecting a column 
different to the deleted one
+  * Verify that the previous read hasn't propagated the column 
deletion
+  * Run the tested read query again selecting all the columns
+  * Verify that the previous read has triggered read repair 
propagating the column deletion
+  * Delete one of the involved rows in just one node
+  * Run the tested read query again selecting all the columns
+  * Verify that the previous read has triggered read repair 
propagating the row deletions
+  * Verify the final status of each node and drop the table
+  * 
+  */
+ @RunWith(Parameterized.class)
+ public abstract class ReadRepairQueryTester extends TestBaseImpl
+ {
+ private static final int NUM_NODES = 2;
+ 
+ /**
+  * The read repair strategy to be used
+  */
+ 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[edimitrova]

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

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

commit 03ef67c9d54a8cd52e120ffceb033fc49403dc2b
Merge: 74bb6d8496 a46e467737
Author: Ekaterina Dimitrova 
AuthorDate: Sun Apr 17 14:38:37 2022 -0400

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../db/marshal/AbstractCompositeType.java  |  6 +--
 .../cassandra/distributed/test/BooleanTest.java| 45 ++
 .../apache/cassandra/db/SchemaCQLHelperTest.java   |  2 +-
 4 files changed, 50 insertions(+), 4 deletions(-)

diff --cc CHANGES.txt
index 09f097c22e,67985868f0..ed00f8bca7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -202,24 -70,7 +202,25 @@@ Merged from 3.11
   * Add key validation to ssstablescrub (CASSANDRA-16969)
   * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
   * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
 + * Validate SASI tokenizer options before adding index to schema 
(CASSANDRA-15135)
 + * Fixup scrub output when no data post-scrub and clear up old use of row, 
which really means partition (CASSANDRA-16835)
 + * Reduce thread contention in CommitLogSegment and HintsBuffer 
(CASSANDRA-16072)
 + * Make cqlsh use the same set of reserved keywords than the server uses 
(CASSANDRA-15663)
 + * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
 + * Enable tombstone compactions when unchecked_tombstone_compaction is set in 
TWCS (CASSANDRA-14496)
 + * Read only the required SSTables for single partition queries 
(CASSANDRA-16737)
  Merged from 3.0:
++ * Fix data corruption in AbstractCompositeType due to static boolean byte 
buffers (CASSANDRA-14752)
 + * Add procps dependency to RPM/Debian packages (CASSANDRA-17516)
 + * Suppress CVE-2021-44521 (CASSANDRA-17492)
 + * ConnectionLimitHandler may leaks connection count if remote connection 
drops (CASSANDRA-17252)
 + * Require ant >= 1.10 (CASSANDRA-17428)
 + * Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266)
 + * Suppress inapplicable CVEs (CASSANDRA-17368)
 + * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion 
(CASSANDRA-17338)
 + * Fixed TestCqlshOutput failing tests (CASSANDRA-17386)
 + * Lazy transaction log replica creation allows incorrect replica content 
divergence during anticompaction (CASSANDRA-17273)
 + * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272)
   * Fix conversion from megabits to bytes in streaming rate limiter 
(CASSANDRA-17243)
   * Upgrade logback to 1.2.9 (CASSANDRA-17204)
   * Avoid race in AbstractReplicationStrategy endpoint caching 
(CASSANDRA-16673)


-
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.0' into trunk

[jonmeredith]

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

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

commit e3b3a59c6c2832bcbd3850340f0138e876cfcb5d
Merge: 2fde9af74f ce6a65cb29
Author: Jon Meredith 
AuthorDate: Fri Apr 8 14:39:37 2022 -0600

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../config/CassandraRelevantProperties.java|  4 ++
 .../schema/DefaultSchemaUpdateHandler.java |  3 +-
 .../cassandra/schema/MigrationCoordinator.java | 44 --
 .../cassandra/distributed/action/GossipHelper.java |  3 +-
 .../cassandra/distributed/impl/Instance.java   | 18 ++---
 .../distributed/test/MigrationCoordinatorTest.java | 12 +++---
 .../cluster/OnInstanceSyncSchemaForBootstrap.java  |  3 +-
 8 files changed, 63 insertions(+), 25 deletions(-)

diff --cc CHANGES.txt
index 8a52c9b32e,32fdd68552..d450f81726
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,138 -1,5 +1,139 @@@
 -4.0.4
 +4.1
 + * Clients using JMX are unable to handle non-standard java types but we leak 
this into our interfaces (CASSANDRA-17527)
 + * Remove stress server functionality (CASSANDRA-17535)
 + * Reduce histogram snapshot long[] allocation overhead during speculative 
read and write threshold updates (CASSANDRA-17523)
 + * Add guardrail for creation of secondary indexes (CASSANDRA-17498)
 + * Add guardrail to disallow creation of uncompressed tables (CASSANDRA-17504)
 + * Add guardrail to disallow creation of new COMPACT STORAGE tables 
(CASSANDRA-17522)
 + * repair vtables should expose a completed field due to lack of filtering 
options in CQL (CASSANDRA-17520)
 + * remove outdated code from cqlsh (CASSANDRA-17490)
 + * remove support for deprecated version specific TLS in Python 3.6 
(CASSANDRA-17365)
 + * Add support for IF EXISTS and IF NOT EXISTS in ALTER statements 
(CASSANDRA-16916)
 + * resolve several pylint issues in cqlsh.py and pylib (CASSANDRA-17480)
 + * Streaming sessions longer than 3 minutes fail with timeout 
(CASSANDRA-17510)
 + * Add ability to track state in repair (CASSANDRA-15399)
 + * Remove unused 'parse' module (CASSANDRA-17484)
 + * change six functions in cqlshlib to native Python 3 (CASSANDRA-17417)
 + * reduce hot-path object allocations required to record local/remote 
requests against the client request metrics (CASSANDRA-17424)
 + * Disallow removing DC from system_auth while nodes are active in the DC 
(CASSANDRA-17478)
 + * Add guardrail for the number of fields per UDT (CASSANDRA-17385)
 + * Allow users to change cqlsh history location using env variable 
(CASSANDRA-17448)
 + * Add required -f option to use nodetool verify and standalone sstableverify 
(CASSANDRA-17017)
 + * Add support for UUID based sstable generation identifiers (CASSANDRA-17048)
 + * Log largest memtable flush at info instead of debug (CASSANDRA-17472)
 + * Add native transport rate limiter options to example cassandra.yaml, and 
expose metric for dispatch rate (CASSANDRA-17423)
 + * Add diagnostic events for guardrails (CASSANDRA-17197)
 + * Pre hashed passwords in CQL (CASSANDRA-17334)
 + * Increase cqlsh version (CASSANDRA-17432)
 + * Update SUPPORTED_UPGRADE_PATHS to include 3.0 and 3.x to 4.1 paths and 
remove obsolete tests (CASSANDRA-17362)
 + * Support DELETE in CQLSSTableWriter (CASSANDRA-14797)
 + * Failed inbound internode authentication failures generate ugly warning 
with stack trace (CASSANDRA-17068)
 + * Expose gossip information in system_views.gossip_info virtual table 
(CASSANDRA-17002)
 + * Add guardrails for collection items and size (CASSANDRA-17153)
 + * Improve guardrails messages (CASSANDRA-17430)
 + * Remove all usages of junit.framework and ban them via Checkstyle 
(CASSANDRA-17316)
 + * Add guardrails for read/write consistency levels (CASSANDRA-17188)
 + * Add guardrail for SELECT IN terms and their cartesian product 
(CASSANDRA-17187)
 + * remove unused imports in cqlsh.py and cqlshlib (CASSANDRA-17413)
 + * deprecate property windows_timer_interval (CASSANDRA-17404)
 + * Expose streaming as a vtable (CASSANDRA-17390)
 + * Expose all client options via system_views.clients and nodetool 
clientstats (CASSANDRA-16378)
 + * Make startup checks configurable (CASSANDRA-17220)
 + * Add guardrail for number of partition keys on IN queries (CASSANDRA-17186)
 + * update Python test framework from nose to pytest (CASSANDRA-17293)
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit d44f527d70f0a8d254b7f76a8aa1b262618da5d5
Merge: 9808a4d c22accc
Author: Brandon Williams 
AuthorDate: Thu Mar 31 07:22:09 2022 -0500

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit c6cf374c9636020bb6ee428aa88a8736d4a9f115
Merge: 7b58b79 897a251
Author: Brandon Williams 
AuthorDate: Tue Mar 29 07:15:59 2022 -0500

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[maedhroz]

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

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

commit 7b58b79fe24c612f8bbf7984c325e88496f482d6
Merge: 813e6ae 0089858
Author: Caleb Rackliffe 
AuthorDate: Mon Mar 28 15:35:25 2022 -0500

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|   1 +
 .../org/apache/cassandra/repair/LocalSyncTask.java |  70 +---
 .../org/apache/cassandra/repair/RepairJob.java |  23 ++--
 .../apache/cassandra/repair/RepairRunnable.java|   2 +-
 .../org/apache/cassandra/repair/RepairSession.java |  25 -
 .../org/apache/cassandra/repair/SnapshotTask.java  |   3 +-
 src/java/org/apache/cassandra/repair/SyncTask.java |   4 +-
 .../cassandra/service/ActiveRepairService.java |   6 ++
 .../apache/cassandra/streaming/SessionInfo.java|   5 +
 .../cassandra/streaming/StreamCoordinator.java |   3 +-
 .../cassandra/streaming/StreamResultFuture.java|   6 ++
 .../apache/cassandra/streaming/StreamSession.java  |  80 +-
 .../apache/cassandra/streaming/StreamState.java|  14 ++-
 .../distributed/test/RepairErrorsTest.java | 119 +++--
 14 files changed, 288 insertions(+), 73 deletions(-)

diff --cc CHANGES.txt
index 75a6475,8fcebb0..3e59bc0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,122 -1,5 +1,123 @@@
 -4.0.4
 +4.1
 + * Disallow removing DC from system_auth while nodes are active in the DC 
(CASSANDRA-17478)
 + * Add guardrail for the number of fields per UDT (CASSANDRA-17385)
 + * Allow users to change cqlsh history location using env variable 
(CASSANDRA-17448)
 + * Add required -f option to use nodetool verify and standalone sstableverify 
(CASSANDRA-17017)
 + * Add support for UUID based sstable generation identifiers (CASSANDRA-17048)
 + * Log largest memtable flush at info instead of debug (CASSANDRA-17472)
 + * Add native transport rate limiter options to example cassandra.yaml, and 
expose metric for dispatch rate (CASSANDRA-17423)
 + * Add diagnostic events for guardrails (CASSANDRA-17197)
 + * Pre hashed passwords in CQL (CASSANDRA-17334)
 + * Increase cqlsh version (CASSANDRA-17432)
 + * Update SUPPORTED_UPGRADE_PATHS to include 3.0 and 3.x to 4.1 paths and 
remove obsolete tests (CASSANDRA-17362)
 + * Support DELETE in CQLSSTableWriter (CASSANDRA-14797)
 + * Failed inbound internode authentication failures generate ugly warning 
with stack trace (CASSANDRA-17068)
 + * Expose gossip information in system_views.gossip_info virtual table 
(CASSANDRA-17002)
 + * Add guardrails for collection items and size (CASSANDRA-17153)
 + * Improve guardrails messages (CASSANDRA-17430)
 + * Remove all usages of junit.framework and ban them via Checkstyle 
(CASSANDRA-17316)
 + * Add guardrails for read/write consistency levels (CASSANDRA-17188)
 + * Add guardrail for SELECT IN terms and their cartesian product 
(CASSANDRA-17187)
 + * remove unused imports in cqlsh.py and cqlshlib (CASSANDRA-17413)
 + * deprecate property windows_timer_interval (CASSANDRA-17404)
 + * Expose streaming as a vtable (CASSANDRA-17390)
 + * Expose all client options via system_views.clients and nodetool 
clientstats (CASSANDRA-16378)
 + * Make startup checks configurable (CASSANDRA-17220)
 + * Add guardrail for number of partition keys on IN queries (CASSANDRA-17186)
 + * update Python test framework from nose to pytest (CASSANDRA-17293)
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[smiklosovic]

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

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

commit 7c1ed6c4092baf34bbfeda5c71b5b2ac25961ff1
Merge: cd5f215 d0458ab
Author: Stefan Miklosovic 
AuthorDate: Mon Mar 28 14:18:31 2022 +0200

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../statements/schema/CreateViewStatement.java |  3 +-
 .../org/apache/cassandra/schema/TableMetadata.java |  2 +-
 .../org/apache/cassandra/schema/TableParams.java   | 18 +
 .../org/apache/cassandra/cql3/ViewTimesTest.java   | 47 --
 .../cql3/statements/DescribeStatementTest.java | 34 +++-
 6 files changed, 90 insertions(+), 15 deletions(-)

diff --cc CHANGES.txt
index 2916838,9fb1729..04c9340
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,120 -1,5 +1,121 @@@
 -4.0.4
 +4.1
 + * Allow users to change cqlsh history location using env variable 
(CASSANDRA-17448)
 + * Add required -f option to use nodetool verify and standalone sstableverify 
(CASSANDRA-17017)
 + * Add support for UUID based sstable generation identifiers (CASSANDRA-17048)
 + * Log largest memtable flush at info instead of debug (CASSANDRA-17472)
 + * Add native transport rate limiter options to example cassandra.yaml, and 
expose metric for dispatch rate (CASSANDRA-17423)
 + * Add diagnostic events for guardrails (CASSANDRA-17197)
 + * Pre hashed passwords in CQL (CASSANDRA-17334)
 + * Increase cqlsh version (CASSANDRA-17432)
 + * Update SUPPORTED_UPGRADE_PATHS to include 3.0 and 3.x to 4.1 paths and 
remove obsolete tests (CASSANDRA-17362)
 + * Support DELETE in CQLSSTableWriter (CASSANDRA-14797)
 + * Failed inbound internode authentication failures generate ugly warning 
with stack trace (CASSANDRA-17068)
 + * Expose gossip information in system_views.gossip_info virtual table 
(CASSANDRA-17002)
 + * Add guardrails for collection items and size (CASSANDRA-17153)
 + * Improve guardrails messages (CASSANDRA-17430)
 + * Remove all usages of junit.framework and ban them via Checkstyle 
(CASSANDRA-17316)
 + * Add guardrails for read/write consistency levels (CASSANDRA-17188)
 + * Add guardrail for SELECT IN terms and their cartesian product 
(CASSANDRA-17187)
 + * remove unused imports in cqlsh.py and cqlshlib (CASSANDRA-17413)
 + * deprecate property windows_timer_interval (CASSANDRA-17404)
 + * Expose streaming as a vtable (CASSANDRA-17390)
 + * Expose all client options via system_views.clients and nodetool 
clientstats (CASSANDRA-16378)
 + * Make startup checks configurable (CASSANDRA-17220)
 + * Add guardrail for number of partition keys on IN queries (CASSANDRA-17186)
 + * update Python test framework from nose to pytest (CASSANDRA-17293)
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit dc521cca432a4a7f05cbd3c852c029536c123589
Merge: cd870fe 4e19c94
Author: Brandon Williams 
AuthorDate: Fri Mar 25 15:02:15 2022 -0500

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[adelapena]

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

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

commit cd870fe645305d934c5f1799c4c7c9e6b8b7d1e3
Merge: 298abb4 05fa924
Author: Andrés de la Peña 
AuthorDate: Fri Mar 25 13:13:42 2022 +

Merge branch 'cassandra-4.0' into trunk

 .../legacy_na_clust/na-1-bti-CompressionInfo.db  | Bin 83 -> 0 bytes
 .../na/legacy_tables/legacy_na_clust/na-1-bti-Data.db| Bin 5315 -> 0 bytes
 .../legacy_tables/legacy_na_clust/na-1-bti-Digest.crc32  |   1 -
 .../na/legacy_tables/legacy_na_clust/na-1-bti-Filter.db  | Bin 24 -> 0 bytes
 .../legacy_tables/legacy_na_clust/na-1-bti-Partitions.db | Bin 63 -> 0 bytes
 .../na/legacy_tables/legacy_na_clust/na-1-bti-Rows.db| Bin 738 -> 0 bytes
 .../legacy_tables/legacy_na_clust/na-1-bti-Statistics.db | Bin 7086 -> 0 bytes
 .../na/legacy_tables/legacy_na_clust/na-1-bti-TOC.txt|   8 
 .../legacy_na_clust_compact/na-1-bti-CompressionInfo.db  | Bin 83 -> 0 bytes
 .../legacy_na_clust_compact/na-1-bti-Data.db | Bin 5398 -> 0 bytes
 .../legacy_na_clust_compact/na-1-bti-Digest.crc32|   1 -
 .../legacy_na_clust_compact/na-1-bti-Filter.db   | Bin 24 -> 0 bytes
 .../legacy_na_clust_compact/na-1-bti-Partitions.db   | Bin 63 -> 0 bytes
 .../legacy_na_clust_compact/na-1-bti-Rows.db | Bin 738 -> 0 bytes
 .../legacy_na_clust_compact/na-1-bti-Statistics.db   | Bin 7086 -> 0 bytes
 .../legacy_na_clust_compact/na-1-bti-TOC.txt |   8 
 .../legacy_na_clust_counter/na-1-bti-CompressionInfo.db  | Bin 75 -> 0 bytes
 .../legacy_na_clust_counter/na-1-bti-Data.db | Bin 5950 -> 0 bytes
 .../legacy_na_clust_counter/na-1-bti-Digest.crc32|   1 -
 .../legacy_na_clust_counter/na-1-bti-Filter.db   | Bin 24 -> 0 bytes
 .../legacy_na_clust_counter/na-1-bti-Partitions.db   | Bin 63 -> 0 bytes
 .../legacy_na_clust_counter/na-1-bti-Rows.db | Bin 738 -> 0 bytes
 .../legacy_na_clust_counter/na-1-bti-Statistics.db   | Bin 7095 -> 0 bytes
 .../legacy_na_clust_counter/na-1-bti-TOC.txt |   8 
 .../na-1-bti-CompressionInfo.db  | Bin 75 -> 0 bytes
 .../legacy_na_clust_counter_compact/na-1-bti-Data.db | Bin 5947 -> 0 bytes
 .../na-1-bti-Digest.crc32|   1 -
 .../legacy_na_clust_counter_compact/na-1-bti-Filter.db   | Bin 24 -> 0 bytes
 .../na-1-bti-Partitions.db   | Bin 63 -> 0 bytes
 .../legacy_na_clust_counter_compact/na-1-bti-Rows.db | Bin 738 -> 0 bytes
 .../na-1-bti-Statistics.db   | Bin 7095 -> 0 bytes
 .../legacy_na_clust_counter_compact/na-1-bti-TOC.txt |   8 
 .../legacy_na_simple/na-1-bti-CompressionInfo.db | Bin 43 -> 0 bytes
 .../na/legacy_tables/legacy_na_simple/na-1-bti-Data.db   | Bin 89 -> 0 bytes
 .../legacy_tables/legacy_na_simple/na-1-bti-Digest.crc32 |   1 -
 .../na/legacy_tables/legacy_na_simple/na-1-bti-Filter.db | Bin 24 -> 0 bytes
 .../legacy_na_simple/na-1-bti-Partitions.db  | Bin 60 -> 0 bytes
 .../na/legacy_tables/legacy_na_simple/na-1-bti-Rows.db   |   0
 .../legacy_na_simple/na-1-bti-Statistics.db  | Bin 4639 -> 0 bytes
 .../na/legacy_tables/legacy_na_simple/na-1-bti-TOC.txt   |   8 
 .../legacy_na_simple_compact/na-1-bti-CompressionInfo.db | Bin 43 -> 0 bytes
 .../legacy_na_simple_compact/na-1-bti-Data.db| Bin 91 -> 0 bytes
 .../legacy_na_simple_compact/na-1-bti-Digest.crc32   |   1 -
 .../legacy_na_simple_compact/na-1-bti-Filter.db  | Bin 24 -> 0 bytes
 .../legacy_na_simple_compact/na-1-bti-Partitions.db  | Bin 60 -> 0 bytes
 .../legacy_na_simple_compact/na-1-bti-Rows.db|   0
 .../legacy_na_simple_compact/na-1-bti-Statistics.db  | Bin 4680 -> 0 bytes
 .../legacy_na_simple_compact/na-1-bti-TOC.txt|   8 
 .../legacy_na_simple_counter/na-1-bti-CompressionInfo.db | Bin 43 -> 0 bytes
 .../legacy_na_simple_counter/na-1-bti-Data.db| Bin 145 -> 0 bytes
 .../legacy_na_simple_counter/na-1-bti-Digest.crc32   |   1 -
 .../legacy_na_simple_counter/na-1-bti-Filter.db  | Bin 24 -> 0 bytes
 .../legacy_na_simple_counter/na-1-bti-Partitions.db  | Bin 61 -> 0 bytes
 .../legacy_na_simple_counter/na-1-bti-Rows.db|   0
 .../legacy_na_simple_counter/na-1-bti-Statistics.db  | Bin 4648 -> 0 bytes
 .../legacy_na_simple_counter/na-1-bti-TOC.txt|   8 
 .../na-1-bti-CompressionInfo.db  | Bin 43 -> 0 bytes
 .../legacy_na_simple_counter_compact/na-1-bti-Data.db| Bin 140 -> 0 bytes
 .../na-1-bti-Digest.crc32|   1 -
 .../legacy_na_simple_counter_compact/na-1-bti-Filter.db  | Bin 24 -> 0 bytes
 .../na-1-bti-Partitions.db   | Bin 61 -> 0 bytes
 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit 298abb458638a1ec41463e934d3dff2f4124ad69
Merge: e9ca465 60269bf
Author: Brandon Williams 
AuthorDate: Fri Mar 25 06:17:17 2022 -0500

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit a64e218d0f2403cb3e5e45eb9e1455138226e5c1
Merge: 0040fea 4f5feac
Author: Brandon Williams 
AuthorDate: Wed Mar 23 09:22:47 2022 -0500

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/serializers/TimestampSerializer.java   | 5 +++--
 .../org/apache/cassandra/serializers/TimestampSerializerTest.java| 4 
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --cc CHANGES.txt
index ab72cd3,1bdf518..b363a96
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,118 -1,5 +1,119 @@@
 -4.0.4
 +4.1
 + * Add support for UUID based sstable generation identifiers (CASSANDRA-17048)
 + * Log largest memtable flush at info instead of debug (CASSANDRA-17472)
 + * Add native transport rate limiter options to example cassandra.yaml, and 
expose metric for dispatch rate (CASSANDRA-17423)
 + * Add diagnostic events for guardrails (CASSANDRA-17197)
 + * Pre hashed passwords in CQL (CASSANDRA-17334)
 + * Increase cqlsh version (CASSANDRA-17432)
 + * Update SUPPORTED_UPGRADE_PATHS to include 3.0 and 3.x to 4.1 paths and 
remove obsolete tests (CASSANDRA-17362)
 + * Support DELETE in CQLSSTableWriter (CASSANDRA-14797)
 + * Failed inbound internode authentication failures generate ugly warning 
with stack trace (CASSANDRA-17068)
 + * Expose gossip information in system_views.gossip_info virtual table 
(CASSANDRA-17002)
 + * Add guardrails for collection items and size (CASSANDRA-17153)
 + * Improve guardrails messages (CASSANDRA-17430)
 + * Remove all usages of junit.framework and ban them via Checkstyle 
(CASSANDRA-17316)
 + * Add guardrails for read/write consistency levels (CASSANDRA-17188)
 + * Add guardrail for SELECT IN terms and their cartesian product 
(CASSANDRA-17187)
 + * remove unused imports in cqlsh.py and cqlshlib (CASSANDRA-17413)
 + * deprecate property windows_timer_interval (CASSANDRA-17404)
 + * Expose streaming as a vtable (CASSANDRA-17390)
 + * Expose all client options via system_views.clients and nodetool 
clientstats (CASSANDRA-16378)
 + * Make startup checks configurable (CASSANDRA-17220)
 + * Add guardrail for number of partition keys on IN queries (CASSANDRA-17186)
 + * update Python test framework from nose to pytest (CASSANDRA-17293)
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit 305cb940c3be63f2eb74a745d60d70abaa0d2e2c
Merge: 94c2ad5 592cee3
Author: Brandon Williams 
AuthorDate: Tue Mar 22 07:42:08 2022 -0500

Merge branch 'cassandra-4.0' into trunk

 .build/dependency-check-suppressions.xml | 1 +
 CHANGES.txt  | 1 +
 2 files changed, 2 insertions(+)

diff --cc CHANGES.txt
index cc23bc3,5b13f9b..e8bc60b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,115 -1,5 +1,116 @@@
 -4.0.4
 +4.1
 + * Add native transport rate limiter options to example cassandra.yaml, and 
expose metric for dispatch rate (CASSANDRA-17423)
 + * Add diagnostic events for guardrails (CASSANDRA-17197)
 + * Increase cqlsh version (CASSANDRA-17432)
 + * Update SUPPORTED_UPGRADE_PATHS to include 3.0 and 3.x to 4.1 paths and 
remove obsolete tests (CASSANDRA-17362)
 + * Support DELETE in CQLSSTableWriter (CASSANDRA-14797)
 + * Failed inbound internode authentication failures generate ugly warning 
with stack trace (CASSANDRA-17068)
 + * Expose gossip information in system_views.gossip_info virtual table 
(CASSANDRA-17002)
 + * Add guardrails for collection items and size (CASSANDRA-17153)
 + * Improve guardrails messages (CASSANDRA-17430)
 + * Remove all usages of junit.framework and ban them via Checkstyle 
(CASSANDRA-17316)
 + * Add guardrails for read/write consistency levels (CASSANDRA-17188)
 + * Add guardrail for SELECT IN terms and their cartesian product 
(CASSANDRA-17187)
 + * remove unused imports in cqlsh.py and cqlshlib (CASSANDRA-17413)
 + * deprecate property windows_timer_interval (CASSANDRA-17404)
 + * Expose streaming as a vtable (CASSANDRA-17390)
 + * Expose all client options via system_views.clients and nodetool 
clientstats (CASSANDRA-16378)
 + * Make startup checks configurable (CASSANDRA-17220)
 + * Add guardrail for number of partition keys on IN queries (CASSANDRA-17186)
 + * update Python test framework from nose to pytest (CASSANDRA-17293)
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit 94c2ad5304b687cf78a7ddbc660a2651c9d04dc1
Merge: 6a3edec b465fec
Author: Brandon Williams 
AuthorDate: Tue Mar 22 07:32:13 2022 -0500

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt | 1 +
 build.xml   | 8 
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --cc CHANGES.txt
index 6244eef,1e710a3..cc23bc3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,115 -1,5 +1,116 @@@
 -4.0.4
 +4.1
 + * Add native transport rate limiter options to example cassandra.yaml, and 
expose metric for dispatch rate (CASSANDRA-17423)
 + * Add diagnostic events for guardrails (CASSANDRA-17197)
 + * Increase cqlsh version (CASSANDRA-17432)
 + * Update SUPPORTED_UPGRADE_PATHS to include 3.0 and 3.x to 4.1 paths and 
remove obsolete tests (CASSANDRA-17362)
 + * Support DELETE in CQLSSTableWriter (CASSANDRA-14797)
 + * Failed inbound internode authentication failures generate ugly warning 
with stack trace (CASSANDRA-17068)
 + * Expose gossip information in system_views.gossip_info virtual table 
(CASSANDRA-17002)
 + * Add guardrails for collection items and size (CASSANDRA-17153)
 + * Improve guardrails messages (CASSANDRA-17430)
 + * Remove all usages of junit.framework and ban them via Checkstyle 
(CASSANDRA-17316)
 + * Add guardrails for read/write consistency levels (CASSANDRA-17188)
 + * Add guardrail for SELECT IN terms and their cartesian product 
(CASSANDRA-17187)
 + * remove unused imports in cqlsh.py and cqlshlib (CASSANDRA-17413)
 + * deprecate property windows_timer_interval (CASSANDRA-17404)
 + * Expose streaming as a vtable (CASSANDRA-17390)
 + * Expose all client options via system_views.clients and nodetool 
clientstats (CASSANDRA-16378)
 + * Make startup checks configurable (CASSANDRA-17220)
 + * Add guardrail for number of partition keys on IN queries (CASSANDRA-17186)
 + * update Python test framework from nose to pytest (CASSANDRA-17293)
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[erickramirezau]

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

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

commit 6a3edecd21eba5001ebe5ffcf5397fc8a6c7c1e3
Merge: 952263d a14700b
Author: Erick Ramirez 
AuthorDate: Tue Mar 22 11:13:23 2022 +

Merge branch 'cassandra-4.0' into trunk

 .../pages/configuration/cass_cl_archive_file.adoc  | 40 ++
 .../pages/configuration/cass_topo_file.adoc|  5 ++-
 .../cassandra/pages/configuration/index.adoc   |  2 +-
 3 files changed, 29 insertions(+), 18 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.0' into trunk

[smiklosovic]

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

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

commit 8714f926857ac1507b69957139fe0429e4979c39
Merge: e417fea d48df91
Author: Stefan Miklosovic 
AuthorDate: Sun Mar 20 15:30:08 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../org/apache/cassandra/tools/LoaderOptions.java  | 69 +++---
 .../apache/cassandra/tools/LoaderOptionsTest.java  | 18 +-
 3 files changed, 52 insertions(+), 36 deletions(-)

diff --cc CHANGES.txt
index e00f628,2ed1fba..db8d987
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,113 -1,5 +1,114 @@@
 -4.0.4
 +4.1
 + * Increase cqlsh version (CASSANDRA-17432)
 + * Update SUPPORTED_UPGRADE_PATHS to include 3.0 and 3.x to 4.1 paths and 
remove obsolete tests (CASSANDRA-17362)
 + * Support DELETE in CQLSSTableWriter (CASSANDRA-14797)
 + * Failed inbound internode authentication failures generate ugly warning 
with stack trace (CASSANDRA-17068)
 + * Expose gossip information in system_views.gossip_info virtual table 
(CASSANDRA-17002)
 + * Add guardrails for collection items and size (CASSANDRA-17153)
 + * Improve guardrails messages (CASSANDRA-17430)
 + * Remove all usages of junit.framework and ban them via Checkstyle 
(CASSANDRA-17316)
 + * Add guardrails for read/write consistency levels (CASSANDRA-17188)
 + * Add guardrail for SELECT IN terms and their cartesian product 
(CASSANDRA-17187)
 + * remove unused imports in cqlsh.py and cqlshlib (CASSANDRA-17413)
 + * deprecate property windows_timer_interval (CASSANDRA-17404)
 + * Expose streaming as a vtable (CASSANDRA-17390)
 + * Expose all client options via system_views.clients and nodetool 
clientstats (CASSANDRA-16378)
 + * Make startup checks configurable (CASSANDRA-17220)
 + * Add guardrail for number of partition keys on IN queries (CASSANDRA-17186)
 + * update Python test framework from nose to pytest (CASSANDRA-17293)
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[jonmeredith]

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

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

commit e417fea126f940b6d1f2a2fa22274aa4cf63b24f
Merge: d67be0d f8be6ea
Author: Jon Meredith 
AuthorDate: Sat Mar 19 08:03:59 2022 -0600

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../transport/ConnectionLimitHandler.java  | 44 --
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --cc CHANGES.txt
index 22f4759,52d0bbb..e00f628
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -164,21 -60,7 +164,22 @@@ Merged from 3.11
   * Add key validation to ssstablescrub (CASSANDRA-16969)
   * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
   * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
 + * Validate SASI tokenizer options before adding index to schema 
(CASSANDRA-15135)
 + * Fixup scrub output when no data post-scrub and clear up old use of row, 
which really means partition (CASSANDRA-16835)
 + * Reduce thread contention in CommitLogSegment and HintsBuffer 
(CASSANDRA-16072)
 + * Make cqlsh use the same set of reserved keywords than the server uses 
(CASSANDRA-15663)
 + * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
 + * Enable tombstone compactions when unchecked_tombstone_compaction is set in 
TWCS (CASSANDRA-14496)
 + * Read only the required SSTables for single partition queries 
(CASSANDRA-16737)
  Merged from 3.0:
++ * ConnectionLimitHandler may leaks connection count if remote connection 
drops (CASSANDRA-17252)
 + * Require ant >= 1.10 (CASSANDRA-17428)
 + * Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266)
 + * Suppress inapplicable CVEs (CASSANDRA-17368)
 + * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion 
(CASSANDRA-17338)
 + * Fixed TestCqlshOutput failing tests (CASSANDRA-17386)
 + * Lazy transaction log replica creation allows incorrect replica content 
divergence during anticompaction (CASSANDRA-17273)
 + * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272)
   * Fix conversion from megabits to bytes in streaming rate limiter 
(CASSANDRA-17243)
   * Upgrade logback to 1.2.9 (CASSANDRA-17204)
   * Avoid race in AbstractReplicationStrategy endpoint caching 
(CASSANDRA-16673)

-
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.0 into trunk

[blerer]

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

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

commit 34a7eba4b8d1813ad782fe2432cdfd85fa24e6c1
Merge: 96cecdb e773bbd
Author: Benjamin Lerer 
AuthorDate: Fri Mar 18 15:03:38 2022 +0100

Merge branch cassandra-4.0 into trunk

 CHANGES.txt|   1 +
 .../apache/cassandra/tools/nodetool/Snapshot.java  |  19 ++-
 .../cassandra/tools/nodetool/SnapshotTest.java | 169 +
 3 files changed, 182 insertions(+), 7 deletions(-)

diff --cc CHANGES.txt
index e2575ff,5c0477b..22f4759
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,113 -1,5 +1,114 @@@
 -4.0.4
 +4.1
 + * Increase cqlsh version (CASSANDRA-17432)
 + * Update SUPPORTED_UPGRADE_PATHS to include 3.0 and 3.x to 4.1 paths and 
remove obsolete tests (CASSANDRA-17362)
 + * Support DELETE in CQLSSTableWriter (CASSANDRA-14797)
 + * Failed inbound internode authentication failures generate ugly warning 
with stack trace (CASSANDRA-17068)
 + * Expose gossip information in system_views.gossip_info virtual table 
(CASSANDRA-17002)
 + * Add guardrails for collection items and size (CASSANDRA-17153)
 + * Improve guardrails messages (CASSANDRA-17430)
 + * Remove all usages of junit.framework and ban them via Checkstyle 
(CASSANDRA-17316)
 + * Add guardrails for read/write consistency levels (CASSANDRA-17188)
 + * Add guardrail for SELECT IN terms and their cartesian product 
(CASSANDRA-17187)
 + * remove unused imports in cqlsh.py and cqlshlib (CASSANDRA-17413)
 + * deprecate property windows_timer_interval (CASSANDRA-17404)
 + * Expose streaming as a vtable (CASSANDRA-17390)
 + * Expose all client options via system_views.clients and nodetool 
clientstats (CASSANDRA-16378)
 + * Make startup checks configurable (CASSANDRA-17220)
 + * Add guardrail for number of partition keys on IN queries (CASSANDRA-17186)
 + * update Python test framework from nose to pytest (CASSANDRA-17293)
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[paulo]

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

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

commit 951645a1fc4486f2b941c4eb72c429780badca07
Merge: 3b1ce69 5f50c79
Author: Paulo Motta 
AuthorDate: Mon Mar 14 17:21:51 2022 -0300

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 src/java/org/apache/cassandra/db/Directories.java  |  6 +--
 .../apache/cassandra/db/ColumnFamilyStoreTest.java | 41 ++
 .../apache/cassandra/index/sasi/SASIIndexTest.java | 48 +-
 4 files changed, 74 insertions(+), 22 deletions(-)

diff --cc CHANGES.txt
index c57742f,86eae2b..ea1826a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -133,26 -46,15 +133,27 @@@ Merged from 4.0
   * Avoid rewriting all sstables during cleanup when transient replication is 
enabled (CASSANDRA-16966)
   * Prevent CQLSH from failure on Python 3.10 (CASSANDRA-16987)
   * Avoid trying to acquire 0 permits from the rate limiter when taking 
snapshot (CASSANDRA-16872)
 - * Upgrade Caffeine to 2.5.6 (CASSANDRA-15153)
 - * Include SASI components to snapshots (CASSANDRA-15134)
 - * Fix missed wait latencies in the output of `nodetool tpstats -F` 
(CASSANDRA-16938)
   * Remove all the state pollution between tests in SSTableReaderTest 
(CASSANDRA-16888)
   * Delay auth setup until after gossip has settled to avoid unavailables on 
startup (CASSANDRA-16783)
 - * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898)
   * org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData 
includes data twice (CASSANDRA-16900)
 + * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898)
   * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
 + * Tolerate missing DNS entry when completing a host replacement 
(CASSANDRA-16873)
 + * Harden PrunableArrayQueue against Pruner implementations that might throw 
exceptions (CASSANDRA-16866)
 + * Move RepairedDataInfo to the execution controller rather than the 
ReadCommand to avoid unintended sharing (CASSANDRA-16721)
 + * Bump zstd-jni version to 1.5.0-4 (CASSANDRA-16884)
 + * Remove assumption that all urgent messages are small (CASSANDRA-16877)
 + * ArrayClustering.unsharedHeapSize does not include the data so undercounts 
the heap size (CASSANDRA-16845)
 + * Improve help, doc and error messages about sstabledump -k and -x arguments 
(CASSANDRA-16818)
 + * Add repaired/unrepaired bytes back to nodetool (CASSANDRA-15282)
 + * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753)
 + * Improve DiagnosticEventService.publish(event) logging message of events 
(CASSANDRA-16749)
 + * Cleanup dependency scopes (CASSANDRA-16704)
 + * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() 
thread-safe (CASSANDRA-16707)
  Merged from 3.11:
++ * Fix snapshot true size calculation (CASSANDRA-17267)
 + * dropping of a materialized view creates a snapshot with dropped- prefix 
(CASSANDRA-17415)
 + * Validate existence of DCs when repairing (CASSANDRA-17407)
   * Add key validation to ssstablescrub (CASSANDRA-16969)
   * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
   * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
diff --cc src/java/org/apache/cassandra/db/Directories.java
index 5a9c563,f09cdae..1cc350d
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@@ -1224,7 -1162,7 +1224,7 @@@ public class Directorie
  SSTableSizeSummer(File path, List files)
  {
  super(path);
- toSkip = new HashSet<>(files);
 -toSkip = files.stream().map(f -> 
f.getName()).collect(Collectors.toSet());
++toSkip = files.stream().map(f -> 
f.name()).collect(Collectors.toSet());
  }
  
  @Override
@@@ -1235,7 -1173,7 +1235,7 @@@
  return desc != null
  && desc.ksname.equals(metadata.keyspace)
  && desc.cfname.equals(metadata.name)
- && !toSkip.contains(file);
 -&& !toSkip.contains(file.getName());
++&& !toSkip.contains(file.name());
  }
  }
  
diff --cc test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index e7c7e22,266b37d..d970b12
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@@ -29,10 -31,16 +29,11 @@@ import org.junit.Before
  import org.junit.BeforeClass;
  import org.junit.Test;
  
+ import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
 -import org.apache.cassandra.utils.Pair;
 -import org.json.simple.JSONArray;
 -import org.json.simple.JSONObject;
 -import org.json.simple.parser.JSONParser;
 -
 -import static org.assertj.core.api.Assertions.assertThat;
 -import static org.junit.Assert.assertEquals;
 -import 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit 3b1ce69fc1609538be8eac81c4ac4da12af49bff
Merge: 0ecd480 d9bd035
Author: Brandon Williams 
AuthorDate: Mon Mar 14 14:09:31 2022 -0500

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt | 1 +
 build.xml   | 9 +
 2 files changed, 10 insertions(+)

diff --cc CHANGES.txt
index 0726f04,e9b5b43..c57742f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -156,20 -57,7 +156,21 @@@ Merged from 3.11
   * Add key validation to ssstablescrub (CASSANDRA-16969)
   * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
   * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
 + * Validate SASI tokenizer options before adding index to schema 
(CASSANDRA-15135)
 + * Fixup scrub output when no data post-scrub and clear up old use of row, 
which really means partition (CASSANDRA-16835)
 + * Reduce thread contention in CommitLogSegment and HintsBuffer 
(CASSANDRA-16072)
 + * Make cqlsh use the same set of reserved keywords than the server uses 
(CASSANDRA-15663)
 + * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
 + * Enable tombstone compactions when unchecked_tombstone_compaction is set in 
TWCS (CASSANDRA-14496)
 + * Read only the required SSTables for single partition queries 
(CASSANDRA-16737)
  Merged from 3.0:
++ * Require ant >= 1.10 (CASSANDRA-17428)
 + * Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266)
 + * Suppress inapplicable CVEs (CASSANDRA-17368)
 + * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion 
(CASSANDRA-17338)
 + * Fixed TestCqlshOutput failing tests (CASSANDRA-17386)
 + * Lazy transaction log replica creation allows incorrect replica content 
divergence during anticompaction (CASSANDRA-17273)
 + * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272)
   * Fix conversion from megabits to bytes in streaming rate limiter 
(CASSANDRA-17243)
   * Upgrade logback to 1.2.9 (CASSANDRA-17204)
   * Avoid race in AbstractReplicationStrategy endpoint caching 
(CASSANDRA-16673)

-
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.0' into trunk

[adelapena]

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

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

commit eb960b19170e36bd9c52365ef15514a4d1ed9419
Merge: 852d7b6 bdeafa0
Author: Andrés de la Peña 
AuthorDate: Thu Mar 10 13:28:47 2022 +

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../cql3/restrictions/StatementRestrictions.java   |  6 
 .../validation/operations/CompactStorageTest.java  | 10 +++
 .../cql3/validation/operations/DeleteTest.java | 33 ++
 .../cql3/validation/operations/UpdateTest.java | 31 
 5 files changed, 65 insertions(+), 16 deletions(-)

diff --cc CHANGES.txt
index 1b396b9,41c6574..8a7f5d5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -153,19 -56,7 +153,20 @@@ Merged from 3.11
   * Add key validation to ssstablescrub (CASSANDRA-16969)
   * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
   * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
 + * Validate SASI tokenizer options before adding index to schema 
(CASSANDRA-15135)
 + * Fixup scrub output when no data post-scrub and clear up old use of row, 
which really means partition (CASSANDRA-16835)
 + * Reduce thread contention in CommitLogSegment and HintsBuffer 
(CASSANDRA-16072)
 + * Make cqlsh use the same set of reserved keywords than the server uses 
(CASSANDRA-15663)
 + * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
 + * Enable tombstone compactions when unchecked_tombstone_compaction is set in 
TWCS (CASSANDRA-14496)
 + * Read only the required SSTables for single partition queries 
(CASSANDRA-16737)
  Merged from 3.0:
++ * Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266)
 + * Suppress inapplicable CVEs (CASSANDRA-17368)
 + * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion 
(CASSANDRA-17338)
 + * Fixed TestCqlshOutput failing tests (CASSANDRA-17386)
 + * Lazy transaction log replica creation allows incorrect replica content 
divergence during anticompaction (CASSANDRA-17273)
 + * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272)
   * Fix conversion from megabits to bytes in streaming rate limiter 
(CASSANDRA-17243)
   * Upgrade logback to 1.2.9 (CASSANDRA-17204)
   * Avoid race in AbstractReplicationStrategy endpoint caching 
(CASSANDRA-16673)

-
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.0' into trunk

[brandonwilliams]

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

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

commit ca218cc012dd8a345259bd75e945eeebdf77eef1
Merge: da2b35b 04c1289
Author: Brandon Williams 
AuthorDate: Tue Mar 8 17:23:30 2022 -0600

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt   | 2 ++
 src/java/org/apache/cassandra/service/StorageService.java | 7 +++
 2 files changed, 9 insertions(+)

diff --cc CHANGES.txt
index b2cbe0f,af8983a..1b396b9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -130,24 -43,15 +130,26 @@@ Merged from 4.0
   * Avoid rewriting all sstables during cleanup when transient replication is 
enabled (CASSANDRA-16966)
   * Prevent CQLSH from failure on Python 3.10 (CASSANDRA-16987)
   * Avoid trying to acquire 0 permits from the rate limiter when taking 
snapshot (CASSANDRA-16872)
 - * Upgrade Caffeine to 2.5.6 (CASSANDRA-15153)
 - * Include SASI components to snapshots (CASSANDRA-15134)
 - * Fix missed wait latencies in the output of `nodetool tpstats -F` 
(CASSANDRA-16938)
   * Remove all the state pollution between tests in SSTableReaderTest 
(CASSANDRA-16888)
   * Delay auth setup until after gossip has settled to avoid unavailables on 
startup (CASSANDRA-16783)
 - * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898)
   * org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData 
includes data twice (CASSANDRA-16900)
 + * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898)
   * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
 + * Tolerate missing DNS entry when completing a host replacement 
(CASSANDRA-16873)
 + * Harden PrunableArrayQueue against Pruner implementations that might throw 
exceptions (CASSANDRA-16866)
 + * Move RepairedDataInfo to the execution controller rather than the 
ReadCommand to avoid unintended sharing (CASSANDRA-16721)
 + * Bump zstd-jni version to 1.5.0-4 (CASSANDRA-16884)
 + * Remove assumption that all urgent messages are small (CASSANDRA-16877)
 + * ArrayClustering.unsharedHeapSize does not include the data so undercounts 
the heap size (CASSANDRA-16845)
 + * Improve help, doc and error messages about sstabledump -k and -x arguments 
(CASSANDRA-16818)
 + * Add repaired/unrepaired bytes back to nodetool (CASSANDRA-15282)
 + * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753)
 + * Improve DiagnosticEventService.publish(event) logging message of events 
(CASSANDRA-16749)
 + * Cleanup dependency scopes (CASSANDRA-16704)
 + * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() 
thread-safe (CASSANDRA-16707)
  Merged from 3.11:
++ * dropping of a materialized view creates a snapshot with dropped- prefix 
(CASSANDRA-17415)
++ * Validate existence of DCs when repairing (CASSANDRA-17407)
   * Add key validation to ssstablescrub (CASSANDRA-16969)
   * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
   * Make assassinate more resilient to missing tokens (CASSANDRA-16847)

-
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.0' into trunk

[smiklosovic]

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

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

commit da2b35b776fe5304611707b4fe3f65462346755f
Merge: c0c0f61 59ea4f8
Author: Stefan Miklosovic 
AuthorDate: Tue Mar 8 21:49:26 2022 +0100

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[smiklosovic]

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

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

commit c0c0f6186929068b87b5e0e3018e931f11fff3f1
Merge: 3233c82 d9766f5
Author: Stefan Miklosovic 
AuthorDate: Tue Mar 8 17:19:18 2022 +0100

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[adelapena]

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

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

commit 0d8126dd143898588f4efcdc40b8e2bb10597185
Merge: ac4cd09 a690f33
Author: Andrés de la Peña 
AuthorDate: Mon Mar 7 16:30:02 2022 +

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|   1 +
 .../apache/cassandra/cql3/ColumnIdentifier.java|   2 +-
 .../org/apache/cassandra/db/rows/ArrayCell.java|   2 +-
 .../org/apache/cassandra/db/rows/BufferCell.java   |   2 +-
 .../org/apache/cassandra/db/rows/CellPath.java |   2 +-
 .../org/apache/cassandra/fql/FullQueryLogger.java  |  49 
 .../org/apache/cassandra/utils/ObjectSizes.java| 121 ++--
 .../unit/org/apache/cassandra/db/CellSpecTest.java |   9 +-
 .../apache/cassandra/utils/ObjectSizesTest.java| 123 +++--
 9 files changed, 231 insertions(+), 80 deletions(-)

diff --cc CHANGES.txt
index 206ab5b,9320244..ff1d989
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,100 -1,5 +1,101 @@@
 -4.0.4
 +4.1
 + * Expose streaming as a vtable (CASSANDRA-17390)
 + * Make startup checks configurable (CASSANDRA-17220)
 + * Add guardrail for number of partition keys on IN queries (CASSANDRA-17186)
 + * update Python test framework from nose to pytest (CASSANDRA-17293)
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[ycai]

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

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

commit df9586da3323bcd817b658ed7cab8dc94a66c20d
Merge: c408931 fd5e2ad
Author: Yifan Cai 
AuthorDate: Fri Mar 4 10:43:49 2022 -0800

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../cassandra/repair/consistent/LocalSessions.java | 24 ++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --cc CHANGES.txt
index f08ccaa,d9d4a77..206ab5b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,100 -1,5 +1,101 @@@
 -4.0.4
 +4.1
 + * Expose streaming as a vtable (CASSANDRA-17390)
 + * Make startup checks configurable (CASSANDRA-17220)
 + * Add guardrail for number of partition keys on IN queries (CASSANDRA-17186)
 + * update Python test framework from nose to pytest (CASSANDRA-17293)
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit 2f3923a44f662bb9664c34711f847dc9970f10ea
Merge: 7daa656 0e249fd
Author: Brandon Williams 
AuthorDate: Wed Mar 2 11:21:13 2022 -0600

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit 445e49a0c8e2fb52bf9e4370efd7f0495bc8e00a
Merge: e780b5a 4fa5417
Author: Brandon Williams 
AuthorDate: Mon Feb 28 07:47:20 2022 -0600

Merge branch 'cassandra-4.0' into trunk

 .build/dependency-check-suppressions.xml | 3 +++
 CHANGES.txt  | 8 
 2 files changed, 11 insertions(+)

diff --cc CHANGES.txt
index 39a0f64,ea4960b..5580102
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,101 -1,14 +1,109 @@@
 -4.0.4
 +4.1
 + * Make startup checks configurable (CASSANDRA-17220)
 + * Add guardrail for number of partition keys on IN queries (CASSANDRA-17186)
 + * update Python test framework from nose to pytest (CASSANDRA-17293)
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[edimitrova]

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

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

commit 769f6b3122629d8422b347d13d7f573c56173c55
Merge: 08331f4 22a4ae1
Author: Ekaterina Dimitrova 
AuthorDate: Fri Feb 25 11:50:44 2022 -0500

Merge branch 'cassandra-4.0' into trunk

 NEWS.txt |  3 ++-
 doc/modules/cassandra/pages/cql/functions.adoc   | 12 ++--
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java |  7 +--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --cc NEWS.txt
index e71d682,1dbc5b4..ae56953
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -395,7 -351,7 +395,8 @@@ Upgradin
  
  Deprecation
  ---
--
++- JavaScript user-defined functions have been deprecated. They are 
planned for removal
++  in the next major release. (CASSANDRA-17280)
  - The JMX MBean 
org.apache.cassandra.metrics:type=Streaming,name=ActiveOutboundStreams has been
deprecated and will be removed in a subsequent major version. This 
metric was not updated since several version
already.
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 50cda68,0bfb18e..ed2f0a1
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -749,17 -761,20 +749,20 @@@ public class DatabaseDescripto
  if (conf.allow_extra_insecure_udfs)
  logger.warn("Allowing java.lang.System.* access in UDFs is 
dangerous and not recommended. Set allow_extra_insecure_udfs: false to 
disable.");
  
 -if(conf.enable_scripted_user_defined_functions)
++if(conf.scripted_user_defined_functions_enabled)
+ logger.warn("JavaScript user-defined functions have been 
deprecated. You can still use them but the plan is to remove them in the next 
major version. For more information - CASSANDRA-17280");
+ 
 -if (conf.commitlog_segment_size_in_mb <= 0)
 -throw new ConfigurationException("commitlog_segment_size_in_mb 
must be positive, but was "
 -+ conf.commitlog_segment_size_in_mb, false);
 -else if (conf.commitlog_segment_size_in_mb >= 2048)
 -throw new ConfigurationException("commitlog_segment_size_in_mb 
must be smaller than 2048, but was "
 -+ conf.commitlog_segment_size_in_mb, false);
 +if (conf.commitlog_segment_size.toMebibytes() == 0)
 +throw new ConfigurationException("commitlog_segment_size must be 
positive, but was "
- + conf.commitlog_segment_size.toString(), false);
++ + 
conf.commitlog_segment_size.toString(), false);
 +else if (conf.commitlog_segment_size.toMebibytes() >= 2048)
 +throw new ConfigurationException("commitlog_segment_size must be 
smaller than 2048, but was "
- + conf.commitlog_segment_size.toString(), false);
++ + 
conf.commitlog_segment_size.toString(), false);
  
 -if (conf.max_mutation_size_in_kb == null)
 -conf.max_mutation_size_in_kb = conf.commitlog_segment_size_in_mb 
* 1024 / 2;
 -else if (conf.commitlog_segment_size_in_mb * 1024 < 2 * 
conf.max_mutation_size_in_kb)
 -throw new ConfigurationException("commitlog_segment_size_in_mb 
must be at least twice the size of max_mutation_size_in_kb / 1024", false);
 +if (conf.max_mutation_size == null)
 +conf.max_mutation_size = 
SmallestDataStorageKibibytes.inKibibytes(conf.commitlog_segment_size.toKibibytes()
 / 2);
 +else if (conf.commitlog_segment_size.toKibibytes() < 2 * 
conf.max_mutation_size.toKibibytes())
 +throw new ConfigurationException("commitlog_segment_size must be 
at least twice the size of max_mutation_size / 1024", false);
  
  // native transport encryption options
  if (conf.client_encryption_options != null)

-
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.0' into trunk

[azotcsit]

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

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

commit d96c32b0b36d732df898f1d1a732c9398c2d775b
Merge: c08baf2 5bc9f7c
Author: Aleksei Zotov 
AuthorDate: Sat Feb 19 13:39:52 2022 +0400

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --cc CHANGES.txt
index 9bbb57e,9378003..ab0ff4d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -138,17 -46,7 +138,18 @@@ Merged from 3.11
   * Add key validation to ssstablescrub (CASSANDRA-16969)
   * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
   * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
 + * Validate SASI tokenizer options before adding index to schema 
(CASSANDRA-15135)
 + * Fixup scrub output when no data post-scrub and clear up old use of row, 
which really means partition (CASSANDRA-16835)
 + * Reduce thread contention in CommitLogSegment and HintsBuffer 
(CASSANDRA-16072)
 + * Make cqlsh use the same set of reserved keywords than the server uses 
(CASSANDRA-15663)
 + * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
 + * Enable tombstone compactions when unchecked_tombstone_compaction is set in 
TWCS (CASSANDRA-14496)
 + * Read only the required SSTables for single partition queries 
(CASSANDRA-16737)
  Merged from 3.0:
++ * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion 
(CASSANDRA-17338)
 + * Fixed TestCqlshOutput failing tests (CASSANDRA-17386)
 + * Lazy transaction log replica creation allows incorrect replica content 
divergence during anticompaction (CASSANDRA-17273)
 + * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272)
   * Fix conversion from megabits to bytes in streaming rate limiter 
(CASSANDRA-17243)
   * Upgrade logback to 1.2.9 (CASSANDRA-17204)
   * Avoid race in AbstractReplicationStrategy endpoint caching 
(CASSANDRA-16673)

-
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.0' into trunk

[mck]

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

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

commit f5f804527e0587216b438b4be60ac87c799e9f1f
Merge: adf2f4c 85fd49f
Author: Mick Semb Wever 
AuthorDate: Fri Feb 18 11:19:07 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt |  1 +
 NEWS.txt| 18 ++
 2 files changed, 19 insertions(+)


-
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.0' into trunk

[azotcsit]

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

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

commit adf2f4c83a2766ef8ebd20b35b49df50957bdf5e
Merge: c69e37e f8b3f60
Author: Aleksei Zotov 
AuthorDate: Thu Feb 17 23:03:03 2022 +0400

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --cc CHANGES.txt
index 85204fc,92efa8d..1be1d0a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,98 -1,6 +1,97 @@@
 -4.0.4
 +4.1
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[marcuse]

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

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

commit c69e37eca76d96c331807ea23280945afecad1e9
Merge: 9a8dc6d 702824a
Author: Marcus Eriksson 
AuthorDate: Thu Feb 17 10:39:33 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|   2 +
 .../cassandra/db/compaction/CompactionTask.java|   6 +-
 .../db/compaction/LeveledCompactionTask.java   |  45 +-
 .../compaction/writers/CompactionAwareWriter.java  |   7 +-
 .../writers/MajorLeveledCompactionWriter.java  |   6 +
 .../compaction/writers/MaxSSTableSizeWriter.java   |   6 +
 .../SplittingSizeTieredCompactionWriter.java   |   8 +-
 .../compaction/LeveledCompactionStrategyTest.java  | 161 -
 .../{ => writers}/CompactionAwareWriterTest.java   |  48 +-
 9 files changed, 271 insertions(+), 18 deletions(-)

diff --cc CHANGES.txt
index 6a43be1,4fa9ba3..85204fc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,98 -1,7 +1,100 @@@
 +4.1
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[mck]

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

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

commit 9a8dc6d75fd1a4b6e50751ec7ee96114ba5772e9
Merge: 8327744 894d33c
Author: Mick Semb Wever 
AuthorDate: Thu Feb 17 09:27:07 2022 +0100

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit d70e004975e47de750449557a714b1db799c10a1
Merge: e56bf10 b837a58
Author: Brandon Williams 
AuthorDate: Wed Feb 16 17:28:09 2022 -0600

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[marcuse]

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

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

commit e56bf105a161b1d9677ea4c9c70436f3169edb9c
Merge: 81922c5 2687cf1
Author: Marcus Eriksson 
AuthorDate: Wed Feb 16 11:09:55 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  8 +-
 .../org/apache/cassandra/db/lifecycle/LogFile.java | 22 +++---
 .../cassandra/db/lifecycle/LogTransactionTest.java | 91 +++---
 3 files changed, 82 insertions(+), 39 deletions(-)

diff --cc CHANGES.txt
index 51e39bf,c64b602..9043898
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,95 -1,9 +1,101 @@@
 +4.1
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[mck]

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

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

commit 598d608f0f6b37a4e2ca547d94fc6f78aba0ab8f
Merge: 0c87f26 a87055d
Author: Mick Semb Wever 
AuthorDate: Sun Feb 13 23:03:10 2022 +0100

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[edimitrova]

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

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

commit 0108dd259390fd6e0c855adac16a91879d2c24d4
Merge: 5cf62c6 537ad9e
Author: Ekaterina Dimitrova 
AuthorDate: Sat Feb 12 20:18:16 2022 -0500

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[marcuse]

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

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

commit 9649cb1358a08f5f98413c556ef2f69fb7806c91
Merge: ab0a9fd c60ad61
Author: Marcus Eriksson 
AuthorDate: Fri Feb 11 14:09:43 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|   4 +-
 .../cassandra/repair/consistent/LocalSessions.java |  29 +++-
 .../cassandra/repair/consistent/RepairedState.java |  27 +---
 .../repair/consistent/BulkRepairStateTest.java | 162 +
 4 files changed, 193 insertions(+), 29 deletions(-)

diff --cc CHANGES.txt
index 444625f,d41d293..2a313ab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,96 -1,6 +1,96 @@@
 -4.0.3
 +4.1
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[mck]

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

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

commit ab0a9fdd3f37e31bc335fcc075a4dec0bd721eed
Merge: 4094e9c f207460
Author: Mick Semb Wever 
AuthorDate: Fri Feb 11 11:09:50 2022 +0100

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[jmckenzie]

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

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

commit 72302adec8d4ffd8d7fe1c1a3542babe9b117196
Merge: 86de770 f2816f5
Author: Josh McKenzie 
AuthorDate: Mon Feb 7 12:47:57 2022 -0500

Merge branch 'cassandra-4.0' into trunk

 .../cassandra/io/sstable/SSTableReaderTest.java| 75 +-
 1 file changed, 29 insertions(+), 46 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.0' into trunk

[mck]

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

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

commit 86de77049b3cdf394f8a7d2df3ff96182e2c220b
Merge: 210793f 1923b54
Author: Mick Semb Wever 
AuthorDate: Mon Feb 7 15:09:24 2022 +0100

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[marcuse]

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

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

commit 210793f943dc522161fd26b6192f38a5c83fa131
Merge: e256b98 66d792a
Author: Marcus Eriksson 
AuthorDate: Mon Feb 7 13:00:57 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 src/java/org/apache/cassandra/config/Config.java  | 13 +
 .../apache/cassandra/config/DatabaseDescriptor.java   | 16 
 .../apache/cassandra/cql3/functions/UDFunction.java   | 19 ++-
 .../security/ThreadAwareSecurityManager.java  |  5 +
 4 files changed, 52 insertions(+), 1 deletion(-)

diff --cc src/java/org/apache/cassandra/config/Config.java
index d3e6783,80c8435..1d01581
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -497,17 -396,26 +497,30 @@@ public class Confi
   * "tell" a user that there's something really wrong with the UDF.
   * When you disable async UDF execution, users MUST pay attention to 
read-timeouts since these may indicate
   * UDFs that run too long or forever - and this can destabilize the 
cluster.
+  *
+  * This requires allow_insecure_udfs to be true
   */
 -public boolean enable_user_defined_functions_threads = true;
 +// Below parameter is not presented in cassandra.yaml but to be on the 
safe side that no one was directly using it
 +// I still added backward compatibility (CASSANDRA-15234)
 +@Replaces(oldName = "enable_user_defined_functions_threads", converter = 
Converters.IDENTITY, deprecated = true)
 +public boolean user_defined_functions_threads_enabled = true;
+ 
+ /**
+  * Set this to true to allow running insecure UDFs.
+  */
+ public boolean allow_insecure_udfs = false;
+ 
+ /**
+  * Set this to allow UDFs accessing java.lang.System.* methods, which 
basically allows UDFs to execute any arbitrary code on the system.
+  */
+ public boolean allow_extra_insecure_udfs = false;
+ 
  /**
   * Time in milliseconds after a warning will be emitted to the log and to 
the client that a UDF runs too long.
 - * (Only valid, if enable_user_defined_functions_threads==true)
 + * (Only valid, if user_defined_functions_threads_enabled==true)
   */
 -public long user_defined_function_warn_timeout = 500;
 +//No need of unit conversion as this parameter is not exposed in the yaml 
file
 +public long user_defined_function_warn_timeout_in_ms = 500;
  /**
   * Time in milliseconds after a fatal UDF run-time situation is detected 
and action according to
   * user_function_timeout_policy will take place.
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 59cc169,6958422..cfa3945
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -724,33 -739,39 +724,39 @@@ public class DatabaseDescripto
  }
  
  // if set to empty/"auto" then use 5% of Heap size
 -indexSummaryCapacityInMB = (conf.index_summary_capacity_in_mb == null)
 +indexSummaryCapacityInMiB = (conf.index_summary_capacity == null)
 ? Math.max(1, (int) 
(Runtime.getRuntime().totalMemory() * 0.05 / 1024 / 1024))
 -   : conf.index_summary_capacity_in_mb;
 +   : 
conf.index_summary_capacity.toMebibytes();
  
 -if (indexSummaryCapacityInMB < 0)
 -throw new ConfigurationException("index_summary_capacity_in_mb 
option was set incorrectly to '"
 - + 
conf.index_summary_capacity_in_mb + "', it should be a non-negative integer.", 
false);
 +if (indexSummaryCapacityInMiB < 0)
 +throw new ConfigurationException("index_summary_capacity option 
was set incorrectly to '"
 + + 
conf.index_summary_capacity.toString() + "', it should be a non-negative 
integer.", false);
  
 -if (conf.user_defined_function_fail_timeout < 0)
 -throw new 
ConfigurationException("user_defined_function_fail_timeout must not be 
negative", false);
 -if (conf.user_defined_function_warn_timeout < 0)
 -throw new 
ConfigurationException("user_defined_function_warn_timeout must not be 
negative", false);
 +if (conf.user_defined_function_fail_timeout_in_ms < 0)
 +throw new 
ConfigurationException("user_defined_function_fail_timeout_in_ms must not be 
negative", false);
 +if (conf.user_defined_function_warn_timeout_in_ms < 0)
 +throw new 
ConfigurationException("user_defined_function_warn_timeout_in_ms must not be 
negative", false);
  
 -if (conf.user_defined_function_fail_timeout < 
conf.user_defined_function_warn_timeout)
 -

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[ifesdjeen]

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

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

commit e256b981728153e13fe273c5410e46c66a4c30b4
Merge: 9f56bf4 371add4
Author: Alex Petrov 
AuthorDate: Mon Feb 7 11:55:39 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 .../driver/core/PreparedStatementHelper.java   | 119 +
 src/java/org/apache/cassandra/config/Config.java   |   2 +
 .../cassandra/config/DatabaseDescriptor.java   |  14 +
 .../org/apache/cassandra/cql3/QueryHandler.java|  11 +-
 .../org/apache/cassandra/cql3/QueryProcessor.java  | 212 +++--
 .../apache/cassandra/cql3/UntypedResultSet.java|  10 +
 .../cassandra/cql3/statements/BatchStatement.java  |  17 +
 .../cql3/statements/QualifiedStatement.java|   5 +
 .../org/apache/cassandra/db/SystemKeyspace.java|  35 +-
 src/java/org/apache/cassandra/gms/Gossiper.java|   2 +-
 .../apache/cassandra/service/CassandraDaemon.java  |   2 +-
 .../org/apache/cassandra/service/ClientState.java  |  15 +
 .../apache/cassandra/service/StorageService.java   |  27 ++
 .../cassandra/transport/messages/BatchMessage.java |  11 +-
 .../transport/messages/ExecuteMessage.java |  21 +
 .../transport/messages/PrepareMessage.java |  13 +
 .../apache/cassandra/utils/CassandraVersion.java   |   8 +
 .../distributed/test/MixedModeFuzzTest.java| 486 +
 .../test/PrepareBatchStatementsTest.java   | 101 +
 .../distributed/test/ReprepareFuzzTest.java| 351 +++
 .../test/ReprepareNewBehaviourTest.java|  55 +++
 .../distributed/test/ReprepareTestBase.java|  13 +-
 test/unit/org/apache/cassandra/cql3/CQLTester.java |   2 +-
 .../cassandra/cql3/PstmtPersistenceTest.java   |   4 +-
 .../validation/entities/SecondaryIndexTest.java|   4 +-
 .../cassandra/cql3/validation/entities/UFTest.java |  20 +-
 .../validation/operations/AggregationTest.java |   4 +-
 .../org/apache/cassandra/tools/ToolRunner.java |   3 +-
 .../cassandra/transport/MessagePayloadTest.java|   2 +-
 29 files changed, 1477 insertions(+), 92 deletions(-)

diff --cc src/java/org/apache/cassandra/config/Config.java
index 369fe04,f06c24e..d3e6783
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -80,11 -72,11 +80,13 @@@ public class Confi
  public boolean auto_bootstrap = true;
  public volatile boolean hinted_handoff_enabled = true;
  public Set hinted_handoff_disabled_datacenters = 
Sets.newConcurrentHashSet();
 -public volatile int max_hint_window_in_ms = 3 * 3600 * 1000; // three 
hours
 +@Replaces(oldName = "max_hint_window_in_ms", converter = 
Converters.MILLIS_DURATION, deprecated = true)
 +public volatile SmallestDurationMilliseconds max_hint_window = new 
SmallestDurationMilliseconds("3h");
  public String hints_directory;
 +public boolean hint_window_persistent_enabled = true;
  
+ public volatile boolean force_new_prepared_statement_behaviour = false;
+ 
  public ParameterizedClass seed_provider;
  public DiskAccessMode disk_access_mode = DiskAccessMode.auto;
  
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index ef9dd43,3b7301c..59cc169
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -3588,236 -3392,17 +3588,250 @@@ public class DatabaseDescripto
  conf.consecutive_message_errors_threshold = value;
  }
  
 +public static boolean getPartitionDenylistEnabled()
 +{
 +return conf.partition_denylist_enabled;
 +}
 +
 +public static void setPartitionDenylistEnabled(boolean enabled)
 +{
 +conf.partition_denylist_enabled = enabled;
 +}
 +
 +public static boolean getDenylistWritesEnabled()
 +{
 +return conf.denylist_writes_enabled;
 +}
 +
 +public static void setDenylistWritesEnabled(boolean enabled)
 +{
 +conf.denylist_writes_enabled = enabled;
 +}
 +
 +public static boolean getDenylistReadsEnabled()
 +{
 +return conf.denylist_reads_enabled;
 +}
 +
 +public static void setDenylistReadsEnabled(boolean enabled)
 +{
 +conf.denylist_reads_enabled = enabled;
 +}
 +
 +public static boolean getDenylistRangeReadsEnabled()
 +{
 +return conf.denylist_range_reads_enabled;
 +}
 +
 +public static void setDenylistRangeReadsEnabled(boolean enabled)
 +{
 +conf.denylist_range_reads_enabled = enabled;
 +}
 +
 +public static int getDenylistRefreshSeconds()
 +{
 +return conf.denylist_refresh.toSecondsAsInt();
 +}
 +
 +public static void setDenylistRefreshSeconds(int seconds)
 +{
 +if (seconds <= 0)
 +throw new IllegalArgumentException("denylist_refresh must be a 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[mck]

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

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

commit b968dd49e12617c23ec0a5c019b397aa165cf419
Merge: 6614c08 02f58d7
Author: Mick Semb Wever 
AuthorDate: Fri Feb 4 14:47:08 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 doc/modules/cassandra/pages/operating/hints.adoc | 1 -
 1 file changed, 1 deletion(-)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[jonmeredith]

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

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

commit 6614c08c6446079a8bd23eeb98dee1e5ca3debad
Merge: 35dbcc2 965fe0d
Author: Jon Meredith 
AuthorDate: Thu Feb 3 14:27:24 2022 -0700

Merge branch 'cassandra-4.0' into trunk

 .../org/apache/cassandra/io/util/PathUtils.java| 55 -
 .../apache/cassandra/service/StorageService.java   | 17 +--
 .../cassandra/utils/NativeLibraryDarwin.java   |  1 +
 .../apache/cassandra/utils/NativeLibraryLinux.java |  1 +
 .../cassandra/utils/NativeLibraryWindows.java  |  1 +
 .../cassandra/utils/NativeLibraryWrapper.java  |  3 +-
 .../cassandra/distributed/impl/Instance.java   | 21 +++-
 .../distributed/test/ring/AutoBootstrapTest.java   | 56 ++
 .../distributed/test/ring/BootstrapTest.java   | 20 
 .../cassandra/streaming/StreamingTransferTest.java |  2 +-
 10 files changed, 148 insertions(+), 29 deletions(-)

diff --cc src/java/org/apache/cassandra/io/util/PathUtils.java
index effd6fe,000..9f62d67
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/io/util/PathUtils.java
+++ b/src/java/org/apache/cassandra/io/util/PathUtils.java
@@@ -1,729 -1,0 +1,782 @@@
 +/*
 + * 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.io.util;
 +
 +import java.io.*;
 +import java.nio.channels.FileChannel;
 +import java.nio.file.*;
 +import java.nio.file.attribute.*;
 +import java.util.*;
 +import java.util.concurrent.TimeUnit;
 +import java.util.function.*;
 +import java.util.stream.Stream;
 +
 +import javax.annotation.Nullable;
 +
++import com.google.common.annotations.VisibleForTesting;
 +import com.google.common.base.Preconditions;
 +import com.google.common.util.concurrent.RateLimiter;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import org.apache.cassandra.config.CassandraRelevantProperties;
 +import org.apache.cassandra.io.FSError;
 +import org.apache.cassandra.io.FSReadError;
 +import org.apache.cassandra.io.FSWriteError;
 +import org.apache.cassandra.service.StorageService;
 +import org.apache.cassandra.utils.NoSpamLogger;
 +
 +import static java.nio.file.StandardOpenOption.*;
 +import static java.util.Collections.unmodifiableSet;
 +import static org.apache.cassandra.utils.Throwables.merge;
 +
 +/**
 + * Vernacular: tryX means return false or 0L on any failure; XIfNotY means 
propagate any exceptions besides those caused by Y
 + *
 + * This class tries to apply uniform IOException handling, and does not 
propagate IOException except for NoSuchFileException.
 + * Any harmless/application error exceptions are propagated as 
UncheckedIOException, and anything else as an FSReadError or FSWriteError.
 + * Semantically this is a little incoherent throughout the codebase, as we 
intercept IOException haphazardly and treaat
 + * it inconsistently - we should ideally migrate to using {@link 
#propagate(IOException, Path, boolean)} et al globally.
 + */
 +public final class PathUtils
 +{
 +private static final boolean consistentDirectoryListings = 
CassandraRelevantProperties.DETERMINISM_CONSISTENT_DIRECTORY_LISTINGS.getBoolean();
 +
 +private static final Set READ_OPTIONS = 
unmodifiableSet(EnumSet.of(READ));
 +private static final Set WRITE_OPTIONS = 
unmodifiableSet(EnumSet.of(WRITE, CREATE));
 +private static final Set WRITE_APPEND_OPTIONS = 
unmodifiableSet(EnumSet.of(WRITE, CREATE, APPEND));
 +private static final Set READ_WRITE_OPTIONS = 
unmodifiableSet(EnumSet.of(READ, WRITE, CREATE));
 +private static final FileAttribute[] NO_ATTRIBUTES = new 
FileAttribute[0];
 +
 +private static final Logger logger = 
LoggerFactory.getLogger(PathUtils.class);
 +private static final NoSpamLogger nospam1m = 
NoSpamLogger.getLogger(logger, 1, TimeUnit.MINUTES);
 +
 +private static Consumer onDeletion = path -> {
 +if (StorageService.instance.isDaemonSetupCompleted())
 +setDeletionListener(ignore -> {});
 +else
 +logger.info("Deleting file during startup: {}", path);
 +};
 +
 +

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[adelapena]

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

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

commit ecfe7e809baf342b33fae1d6497f32f90c2eda18
Merge: 02dad36 67f913a
Author: Andrés de la Peña 
AuthorDate: Wed Jan 26 11:50:33 2022 +

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt| 1 +
 NEWS.txt   | 6 ++
 src/java/org/apache/cassandra/streaming/StreamManager.java | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --cc NEWS.txt
index 560b56c,1649ccd..ff166df
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -81,20 -44,21 +81,26 @@@ New feature
  
  Upgrading
  -
 +- Before you upgrade, if you are using 
`cassandra.auth_bcrypt_gensalt_log2_rounds` property,
 +  confirm it is set to value lower than 31 otherwise Cassandra will fail 
to start. See CASSANDRA-9384
 +  for further details. You also need to regenerate passwords for users 
for who the password
 +  was created while the above property was set to be more than 30 
otherwise they will not be able to log in.
 +- JNA library was updated from 5.6.0 to 5.9.0. In version 5.7.0, Darwin 
support for M1 devices
 +  was fixed but prebuild native library for Darwin x86 (32bit Java on Mac 
OS) was removed.
+ - The config properties for setting the streaming throughput 
`stream_throughput_outbound_megabits_per_sec` and
+   `inter_dc_stream_throughput_outbound_megabits_per_sec` were incorrectly 
interpreted as mebibits. This has
+   been fixed by CASSANDRA-17243, so the values for these properties will 
now indicate a throughput ~4.6% lower than
+   what was actually applied in previous versions. This also affects the 
setters and getters for these properties in
+   the JMX MBean `org.apache.cassandra.db:type=StorageService` and the 
nodetool commands `set/getstreamthroughput`
+   and `set/getinterdcstreamthroughput`.
 -- Before you upgrade, if you are using 
`cassandra.auth_bcrypt_gensalt_log2_rounds` property,
 -  confirm it is set to value lower than 31 otherwise Cassandra will fail 
to start. See CASSANDRA-9384
 -  for further details. You also need to regenerate passwords for users 
for who the password
 -  was created while the above property was set to be more than 30 
otherwise they will not be able to log in.
 -- As part of the Internode Messaging improvement work in CASSANDRA-15066, 
internode_send_buff_size_in_bytes and
 -  internode_recv_buff_size_in_bytes were renamed to 
internode_socket_send_buffer_size_in_bytes and
 -  internode_socket_receive_buffer_size_in_bytes. To support upgrades 
pre-4.0, we add backward compatibility and
 -  currently both old and new names should work. Cassandra 4.0.0 and 
Cassandra 4.0.1 work ONLY with the new names
 -  (They weren't updated in cassandra.yaml though).
 +
 +Deprecation
 +---
 +- The properties `keyspace_count_warn_threshold` and 
`table_count_warn_threshold` in cassandra.yaml have been
 +  deprecated in favour of the new `guardrails.keyspaces` and 
`guardrails.tables` properties and will be removed
 +  in a subsequent major version. This also affects the setters and 
getters for those properties in the JMX MBean
 +  `org.apache.cassandra.db:type=StorageService`, which are equally 
deprecated in favour of the analogous methods
 +  in the JMX MBean `org.apache.cassandra.db:type=Guardrails`. See 
CASSANDRA-17195 for further details.
  
  4.0
  ===
diff --cc src/java/org/apache/cassandra/streaming/StreamManager.java
index 8cc9494,849f7b5..59f8821
--- a/src/java/org/apache/cassandra/streaming/StreamManager.java
+++ b/src/java/org/apache/cassandra/streaming/StreamManager.java
@@@ -57,55 -58,21 +57,55 @@@ public class StreamManager implements S
   */
  public static StreamRateLimiter getRateLimiter(InetAddressAndPort peer)
  {
 -return new StreamRateLimiter(peer);
 +return new StreamRateLimiter(peer,
 + StreamRateLimiter.LIMITER,
 + StreamRateLimiter.INTER_DC_LIMITER,
 + 
DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec(),
 + 
DatabaseDescriptor.getInterDCStreamThroughputOutboundMegabitsPerSec());
  }
  
 -public static class StreamRateLimiter
 +/**
 + * Get streaming rate limiter for entire SSTable operations.
 + * When {@code entire_sstable_stream_throughput_outbound_megabits_per_sec}
 + * is less than or equal ot {@code 0}, this returns rate limiter with the
 + * rate of {@link Double.MAX_VALUE} bytes per second.
 + * Rate unit is bytes per sec.
 + *
 + * @param peer the peer location
 + * @return {@link  StreamRateLimiter} with entire SSTable rate limit set 
based on peer location
 + 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[bereng]

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

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

commit 02dad368f1dbf38363cfe1a48f089cb2a7f24262
Merge: ff4d63d 95257c0
Author: Bereng 
AuthorDate: Wed Jan 26 08:12:46 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 .gitignore |   1 +
 .../apache/cassandra/tools/StandaloneVerifier.java |  40 +++-
 test/unit/org/apache/cassandra/db/VerifyTest.java  |  40 ++--
 .../apache/cassandra/tools/OfflineToolUtils.java   |   3 -
 .../tools/StandaloneVerifierOnSSTablesTest.java| 220 +
 .../cassandra/tools/StandaloneVerifierTest.java|  30 ++-
 6 files changed, 300 insertions(+), 34 deletions(-)

diff --cc test/unit/org/apache/cassandra/db/VerifyTest.java
index 01baf97,b2f4344..571d5ef
--- a/test/unit/org/apache/cassandra/db/VerifyTest.java
+++ b/test/unit/org/apache/cassandra/db/VerifyTest.java
@@@ -18,8 -18,27 +18,25 @@@
   */
  package org.apache.cassandra.db;
  
+ import java.io.BufferedWriter;
 -import java.io.File;
 -import java.io.FileInputStream;
+ import java.io.IOException;
+ import java.io.RandomAccessFile;
+ import java.net.UnknownHostException;
+ import java.nio.file.Files;
+ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.List;
+ import java.util.UUID;
+ import java.util.concurrent.ExecutionException;
+ import java.util.zip.CRC32;
+ import java.util.zip.CheckedInputStream;
+ 
  import com.google.common.base.Charsets;
+ import org.apache.commons.lang3.StringUtils;
+ import org.junit.BeforeClass;
+ import org.junit.Test;
  
+ import org.apache.cassandra.UpdateBuilder;
  import org.apache.cassandra.Util;
  import org.apache.cassandra.batchlog.Batch;
  import org.apache.cassandra.batchlog.BatchlogManager;
@@@ -46,22 -63,7 +62,8 @@@ import org.apache.cassandra.schema.Comp
  import org.apache.cassandra.schema.KeyspaceParams;
  import org.apache.cassandra.service.StorageService;
  import org.apache.cassandra.utils.ByteBufferUtil;
- import org.apache.commons.lang3.StringUtils;
- import org.junit.BeforeClass;
- import org.junit.Test;
- 
- import java.io.*;
- import java.net.UnknownHostException;
- import java.nio.file.Files;
- import java.util.ArrayList;
- import java.util.Collections;
- import java.util.List;
- import java.util.UUID;
- import java.util.concurrent.ExecutionException;
- import java.util.zip.CRC32;
- import java.util.zip.CheckedInputStream;
  
 +import org.apache.cassandra.io.util.File;
  import static org.apache.cassandra.SchemaLoader.counterCFMD;
  import static org.apache.cassandra.SchemaLoader.createKeyspace;
  import static org.apache.cassandra.SchemaLoader.loadSchema;
diff --cc test/unit/org/apache/cassandra/tools/OfflineToolUtils.java
index 58c3836,7bd1143..7cabef5
--- a/test/unit/org/apache/cassandra/tools/OfflineToolUtils.java
+++ b/test/unit/org/apache/cassandra/tools/OfflineToolUtils.java
@@@ -31,12 -32,8 +31,9 @@@ import java.util.Set
  import java.util.regex.Pattern;
  import java.util.stream.Collectors;
  
 +import org.apache.cassandra.io.util.File;
  import org.apache.commons.io.FileUtils;
- 
- import org.junit.AfterClass;
  import org.junit.BeforeClass;
- 
  import org.slf4j.LoggerFactory;
  
  import static 
org.apache.cassandra.utils.FBUtilities.preventIllegalAccessWarnings;
diff --cc 
test/unit/org/apache/cassandra/tools/StandaloneVerifierOnSSTablesTest.java
index 000,7df28d2..4a77a1c
mode 00,100644..100644
--- a/test/unit/org/apache/cassandra/tools/StandaloneVerifierOnSSTablesTest.java
+++ b/test/unit/org/apache/cassandra/tools/StandaloneVerifierOnSSTablesTest.java
@@@ -1,0 -1,222 +1,220 @@@
+ /*
+  * 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.tools;
+ 
+ import java.io.File;
+ import java.io.RandomAccessFile;
+ 
+ import org.apache.commons.io.FileUtils;
+ import org.apache.commons.lang3.StringUtils;
+ import org.junit.AfterClass;
+ import org.junit.BeforeClass;
+ import org.junit.Test;
+ 
+ import org.apache.cassandra.SchemaLoader;
+ import org.apache.cassandra.UpdateBuilder;
+ import org.apache.cassandra.db.ColumnFamilyStore;
+ import 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[bereng]

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

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

commit ff4d63d392c89e27ca6e02e38457a5199a24f6a9
Merge: 8ace479 85248da
Author: Bereng 
AuthorDate: Tue Jan 25 07:10:41 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|   1 +
 NEWS.txt   |   1 +
 doc/modules/cassandra/pages/new/auditlogging.adoc  |  13 +-
 .../apache/cassandra/audit/AuditLogManager.java|  32 -
 .../apache/cassandra/cql3/PasswordObfuscator.java  |  41 +-
 .../org/apache/cassandra/cql3/QueryEvents.java |  42 +++---
 .../cql3/statements/AlterRoleStatement.java|   7 +
 .../cql3/statements/AuthenticationStatement.java   |   5 +
 .../cql3/statements/CreateRoleStatement.java   |   7 +
 .../cassandra/audit/AuditLoggerAuthTest.java   |  73 --
 .../cassandra/cql3/PasswordObfuscatorTest.java | 156 +++--
 11 files changed, 293 insertions(+), 85 deletions(-)

diff --cc NEWS.txt
index a41c470,749b531..560b56c
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -38,45 -39,8 +38,46 @@@ using the provided 'sstableupgrade' too
  
  New features
  
 -- Full support for Java 11, it is not experimental anymore.
 +- Added ability to configure auth caches through corresponding `nodetool` 
commands.
 +- CDC data flushing now can be configured to be non-blocking with the 
configuration cdc_block_writes. Setting to true,
 +  any writes to the CDC-enabled tables will be blocked when reaching to 
the limit for CDC data on disk, which is the
 +  existing and the default behavior. Setting to false, the writes to the 
CDC-enabled tables will be accepted and
 +  the oldest CDC data on disk will be deleted to ensure the size 
constraint.
 +- New native functions to convert unix time values into C* native types: 
toDate(bigint), toTimestamp(bigint),
 +  mintimeuuid(bigint) and maxtimeuuid(bigint)
 +- Support for multiple permission in a single GRANT/REVOKE/LIST statement 
has been added. It allows to
 +  grant/revoke/list multiple permissions using a single statement by 
providing a list of comma-separated
 +  permissions.
 +- A new ALL TABLES IN KEYSPACE resource has been added. It allows to 
grant permissions for all tables and user types
 +  in a keyspace while preventing the user to use those permissions on the 
keyspace itself.
 +- Added support for type casting in the WHERE clause components and in 
the values of INSERT and UPDATE statements.
 +- Warn/abort thresholds added to read queries notifying clients when 
these thresholds trigger (by
 +  emitting a client warning or aborting the query).  This feature is 
disabled by default, scheduled
 +  to be enabled in 4.2; it is controlled with the configuration 
track_warnings.enabled,
 +  setting to true will enable this feature.  Each check has its own 
warn/abort thresholds, currently
 +  tombstones (tombstone_warn_threshold, and tombstone_failure_threshold), 
coordinator result set
 +  materialized size 
(track_warnings.coordinator_large_read.warn_threshold_kb, and
 +  track_warnings.coordinator_large_read.abort_threshold_kb), local read 
materialized heap size
 +  (track_warnings.local_read_size.warn_threshold_kb and 
track_warnings.local_read_size.abort_threshold_kb),
 +  and RowIndexEntry estimated memory size 
(track_warnings.row_index_size.warn_threshold_kb and
 +  track_warnings.row_index_size.abort_threshold_kb) are supported; more 
checks will be added over time.
 +- Prior to this version, the hint system was storing a window of hints as 
defined by
 +  configuration property max_hint_window_in_ms, however this window is 
not persistent across restarts.
 +  For example, if a node is restarted, it will be still eligible for a 
hint to be sent to it because it
 +  was down less than max_hint_window_in_ms. Hence if that node continues 
restarting without hint delivery completing,
 +  hints will be sent to that node indefinitely which would occupy more 
and more disk space.
 +  This behaviour was changed in CASSANDRA-14309. From now on, by default, 
if a node is not down longer than
 +  max_hint_window_in_ms, there is an additional check to see if there is 
a hint to be delivered which is older
 +  than max_window_in_ms. If there is, a hint is not persisted. If there 
is not, it is.
 +  This behaviour might be reverted as it was in previous version by 
property hint_window_persistent_enabled by
 +  setting it to false. This property is by default set to true.
 +- Added a new feature to allow denylisting (i.e. blocking read, write, or 
range read configurable) access to partition
 +  keys in configured keyspaces and tables. See 
doc/operating/denylisting_partitions.rst for details on using this new
 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[edimitrova]

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

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

commit 8ace479455baefeadd0f0df7e40b6b9c75967edf
Merge: 0a6be7e 2b63dc7
Author: Ekaterina Dimitrova 
AuthorDate: Mon Jan 24 12:11:57 2022 -0500

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt |  3 +++
 NEWS.txt|  1 +
 doc/modules/cassandra/pages/architecture/overview.adoc  |  2 +-
 doc/modules/cassandra/pages/getting_started/installing.adoc | 13 +++--
 doc/modules/cassandra/pages/new/java11.adoc |  6 ++
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --cc CHANGES.txt
index de77d25,2bb5f30..2068af2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,82 -1,5 +1,85 @@@
 +4.1
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[mck]

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

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

commit e6b589b833918afea097e746818b7a42dfe3f1ec
Merge: 9577fd3 e769d0d
Author: Mick Semb Wever 
AuthorDate: Sun Jan 23 13:06:03 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 NOTICE.txt   | 2 +-
 build.xml| 2 +-
 debian/copyright | 2 +-
 3 files changed, 3 insertions(+), 3 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.0' into trunk

[brandonwilliams]

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

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

commit 9577fd36d681266ea2d4758c51ed506e940d0d0e
Merge: fac84e0 bccb5ad
Author: Brandon Williams 
AuthorDate: Thu Jan 20 10:09:36 2022 -0600

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt  | 1 +
 bin/cqlsh.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index b1d749d,1bde0c9..de77d25
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,82 -1,5 +1,83 @@@
 -4.0.2
 +4.1
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to compactionstats output 
(CASSANDRA-16844)
 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153)
 + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation 
allows it (CASSANDRA-16806)
 + * 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit fac84e0a8098d562a4c3d59b026dfc925a9da9b7
Merge: add1d1d 8c8d9b8
Author: Brandon Williams 
AuthorDate: Thu Jan 20 10:02:42 2022 -0600

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt| 1 +
 pylib/requirements.txt | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --cc CHANGES.txt
index d3c4dc0,c176a47..b1d749d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,82 -1,5 +1,83 @@@
 -4.0.2
 +4.1
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to compactionstats output 
(CASSANDRA-16844)
 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153)
 + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation 
allows it 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit add1d1d75237d2ef51e7c53b88a66c80bde52550
Merge: 0dc5a28 cf9091a
Author: Brandon Williams 
AuthorDate: Thu Jan 20 09:50:08 2022 -0600

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt | 1 +
 build.xml   | 4 ++--
 2 files changed, 3 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.0' into trunk

[marcuse]

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

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

commit 96c80f0b89314dc805714c52dcf1846491c53cdc
Merge: df1a2d4 9a1bb62
Author: Marcus Eriksson 
AuthorDate: Mon Jan 17 14:13:41 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|   1 +
 .../locator/AbstractReplicationStrategy.java   |  92 -
 .../apache/cassandra/locator/TokenMetadata.java|   9 +-
 .../distributed/test/ring/BootstrapTest.java   |   6 +-
 .../test/ring/ReadsDuringBootstrapTest.java| 115 +
 .../locator/AbstractReplicationStrategyTest.java   |  45 
 6 files changed, 239 insertions(+), 29 deletions(-)

diff --cc 
test/distributed/org/apache/cassandra/distributed/test/ring/BootstrapTest.java
index c3e92f2,52d0f16..2dc7303
--- 
a/test/distributed/org/apache/cassandra/distributed/test/ring/BootstrapTest.java
+++ 
b/test/distributed/org/apache/cassandra/distributed/test/ring/BootstrapTest.java
@@@ -56,7 -56,7 +56,7 @@@ public class BootstrapTest extends Test
  .withConfig(config -> 
config.with(NETWORK, GOSSIP))
  .start())
  {
--populate(cluster,0, 100);
++populate(cluster, 0, 100);
  
  IInstanceConfig config = cluster.newInstanceConfig();
  IInvokableInstance newInstance = cluster.bootstrap(config);
@@@ -95,7 -95,7 +95,7 @@@
  
  cluster.forEach(statusToBootstrap(newInstance));
  
--populate(cluster,0, 100);
++populate(cluster, 0, 100);
  
  Assert.assertEquals(100, newInstance.executeInternal("SELECT 
*FROM " + KEYSPACE + ".tbl").length);
  }
@@@ -113,7 -113,7 +113,7 @@@
  .withConfig(config -> 
config.with(NETWORK, GOSSIP))
  .start())
  {
--populate(cluster,0, 100);
++populate(cluster, 0, 100);
  bootstrapAndJoinNode(cluster);
  
  for (Map.Entry e : count(cluster).entrySet())
diff --cc 
test/distributed/org/apache/cassandra/distributed/test/ring/ReadsDuringBootstrapTest.java
index 000,4898479..932dbdc
mode 00,100644..100644
--- 
a/test/distributed/org/apache/cassandra/distributed/test/ring/ReadsDuringBootstrapTest.java
+++ 
b/test/distributed/org/apache/cassandra/distributed/test/ring/ReadsDuringBootstrapTest.java
@@@ -1,0 -1,114 +1,115 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ 
+ package org.apache.cassandra.distributed.test.ring;
+ 
+ import java.io.IOException;
+ import java.util.concurrent.Callable;
+ import java.util.concurrent.CountDownLatch;
+ import java.util.concurrent.ExecutionException;
+ import java.util.concurrent.ExecutorService;
+ import java.util.concurrent.Executors;
+ import java.util.concurrent.Future;
+ import java.util.concurrent.TimeoutException;
+ import java.util.concurrent.atomic.AtomicBoolean;
+ 
+ import org.junit.Test;
+ 
+ import net.bytebuddy.ByteBuddy;
+ import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
+ import net.bytebuddy.implementation.MethodDelegation;
+ import net.bytebuddy.implementation.bind.annotation.FieldValue;
+ import net.bytebuddy.implementation.bind.annotation.SuperCall;
+ import org.apache.cassandra.dht.Token;
+ import org.apache.cassandra.distributed.Cluster;
+ import org.apache.cassandra.distributed.api.ConsistencyLevel;
+ import org.apache.cassandra.distributed.api.TokenSupplier;
+ import org.apache.cassandra.distributed.shared.NetworkTopology;
+ import org.apache.cassandra.distributed.test.TestBaseImpl;
+ import org.apache.cassandra.locator.AbstractReplicationStrategy;
+ import org.apache.cassandra.locator.EndpointsForRange;
+ 
+ import static net.bytebuddy.matcher.ElementMatchers.named;
+ import static org.apache.cassandra.distributed.api.Feature.GOSSIP;
+ import static org.apache.cassandra.distributed.api.Feature.NETWORK;
+ 
+ public class ReadsDuringBootstrapTest extends TestBaseImpl
+ {
++
+ @Test
+ public 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[marcuse]

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

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

commit df1a2d4c3db4ff016d03d5403ac68778a71d5759
Merge: 76f8333 98e798f
Author: Marcus Eriksson 
AuthorDate: Mon Jan 17 09:13:32 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|   1 +
 .../cassandra/repair/RepairMessageVerbHandler.java |   1 +
 .../schema/SystemDistributedKeyspace.java  |   2 +-
 .../cassandra/service/ActiveRepairService.java |  37 -
 .../distributed/test/ClearSnapshotTest.java| 170 +
 5 files changed, 206 insertions(+), 5 deletions(-)

diff --cc CHANGES.txt
index c3d1e81,0896d56..e5a1a8b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,82 -1,5 +1,83 @@@
 -4.0.2
 +4.1
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit ac1d9bca74533b8e0a852a4d3775a8bb08c1de1e
Merge: bc20bdd aecac82
Author: Brandon Williams 
AuthorDate: Tue Jan 11 08:26:08 2022 -0600

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 10 +-
 2 files changed, 10 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.0' into trunk

[edimitrova]

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

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

commit 7bd276496264fa0d81ccc6990bf8ca663a0f7612
Merge: 2043cb9 1a05fcf
Author: Ekaterina Dimitrova 
AuthorDate: Sat Jan 8 15:32:30 2022 -0500

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../cassandra/config/YamlConfigurationLoader.java  | 18 --
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --cc CHANGES.txt
index 336ae65,1d01ffb..9cf76fd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,80 -1,5 +1,81 @@@
 -4.0.2
 +4.1
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to compactionstats output 
(CASSANDRA-16844)
 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153)
 + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation 
allows it (CASSANDRA-16806)
 + * Include SASI components to snapshots (CASSANDRA-15134)
 + * Fix missed wait latencies in the output of 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[jonmeredith]

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

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

commit 837adcf0a26a704b10ece4e90db267c085021342
Merge: 54aee87 57a7b8a
Author: Jon Meredith 
AuthorDate: Thu Jan 6 14:33:33 2022 -0700

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[mck]

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

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

commit 54aee87c56a49a0b834b920aead7e0dbed5f5640
Merge: b83d722 0aad2e9
Author: Mick Semb Wever 
AuthorDate: Wed Jan 5 23:02:59 2022 +0100

Merge branch 'cassandra-4.0' into trunk

 .build/build-rat.xml   |3 +
 .gitignore |5 +-
 build.xml  |   11 +-
 doc/Dockerfile |   22 -
 doc/Makefile   |  316 +-
 doc/README.md  |   45 +-
 doc/antora.yml |9 +
 doc/docker-compose.yml |   29 -
 doc/make.bat   |  299 --
 doc/modules/ROOT/nav.adoc  |4 +
 doc/modules/ROOT/pages/index.adoc  |   50 +
 .../cassandra/assets/images}/Figure_1_backups.jpg  |  Bin
 .../assets}/images/Figure_1_data_model.jpg |  Bin
 .../assets/images}/Figure_1_guarantees.jpg |  Bin
 .../assets/images}/Figure_1_read_repair.jpg|  Bin
 .../assets}/images/Figure_2_data_model.jpg |  Bin
 .../assets/images}/Figure_2_read_repair.jpg|  Bin
 .../assets/images}/Figure_3_read_repair.jpg|  Bin
 .../assets/images}/Figure_4_read_repair.jpg|  Bin
 .../assets/images}/Figure_5_read_repair.jpg|  Bin
 .../assets/images}/Figure_6_read_repair.jpg|  Bin
 .../images/data_modeling_chebotko_logical.png  |  Bin
 .../images/data_modeling_chebotko_physical.png |  Bin
 .../images/data_modeling_hotel_bucketing.png   |  Bin
 .../assets}/images/data_modeling_hotel_erd.png |  Bin
 .../assets}/images/data_modeling_hotel_logical.png |  Bin
 .../images/data_modeling_hotel_physical.png|  Bin
 .../assets}/images/data_modeling_hotel_queries.png |  Bin
 .../images/data_modeling_hotel_relational.png  |  Bin
 .../images/data_modeling_reservation_logical.png   |  Bin
 .../images/data_modeling_reservation_physical.png  |  Bin
 .../cassandra/assets}/images/docs_commit.png   |  Bin
 .../assets}/images/docs_create_branch.png  |  Bin
 .../cassandra/assets}/images/docs_create_file.png  |  Bin
 .../cassandra/assets}/images/docs_editor.png   |  Bin
 .../cassandra/assets}/images/docs_fork.png |  Bin
 .../cassandra/assets}/images/docs_pr.png   |  Bin
 .../cassandra/assets}/images/docs_preview.png  |  Bin
 .../cassandra/assets}/images/eclipse_debug0.png|  Bin
 .../cassandra/assets}/images/eclipse_debug1.png|  Bin
 .../cassandra/assets}/images/eclipse_debug2.png|  Bin
 .../cassandra/assets}/images/eclipse_debug3.png|  Bin
 .../cassandra/assets}/images/eclipse_debug4.png|  Bin
 .../cassandra/assets}/images/eclipse_debug5.png|  Bin
 .../cassandra/assets}/images/eclipse_debug6.png|  Bin
 .../assets/images}/example-stress-graph.png|  Bin
 .../cassandra/assets/images}/generatetokens.rst|0
 .../cassandra/assets}/images/hints.svg |0
 .../cassandra/assets}/images/ring.svg  |0
 .../cassandra/assets}/images/vnodes.svg|0
 .../cassandra/assets}/license_compliance.rst   |0
 .../cassandra/examples/BASH/add_repo_keys.sh   |1 +
 .../cassandra/examples/BASH/apt-get_cass.sh|1 +
 .../cassandra/examples/BASH/apt-get_update.sh  |1 +
 .../cassandra/examples/BASH/check_backups.sh   |1 +
 .../cassandra/examples/BASH/cqlsh_localhost.sh |1 +
 .../cassandra/examples/BASH/curl_install.sh|1 +
 .../cassandra/examples/BASH/curl_verify_sha.sh |1 +
 .../cassandra/examples/BASH/docker_cqlsh.sh|1 +
 doc/modules/cassandra/examples/BASH/docker_pull.sh |1 +
 doc/modules/cassandra/examples/BASH/docker_run.sh  |1 +
 .../cassandra/examples/BASH/find_backups.sh|1 +
 .../cassandra/examples/BASH/find_snapshots.sh  |1 +
 .../cassandra/examples/BASH/find_sstables.sh   |1 +
 .../cassandra/examples/BASH/find_two_snapshots.sh  |1 +
 .../cassandra/examples/BASH/flush_and_check.sh |2 +
 .../cassandra/examples/BASH/get_deb_package.sh |2 +
 doc/modules/cassandra/examples/BASH/java_verify.sh |1 +
 .../examples/BASH/nodetool_clearsnapshot.sh|1 +
 .../examples/BASH/nodetool_clearsnapshot_all.sh|1 +
 .../cassandra/examples/BASH/nodetool_flush.sh  |3 +
 .../examples/BASH/nodetool_flush_table.sh  |1 +
 .../examples/BASH/nodetool_list_snapshots.sh   |1 +
 .../cassandra/examples/BASH/nodetool_snapshot.sh   |1 +
 .../cassandra/examples/BASH/nodetool_status.sh |1 +
 .../examples/BASH/nodetool_status_nobin.sh |1 +
 doc/modules/cassandra/examples/BASH/run_cqlsh.sh   |1 +
 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[edimitrova]

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

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

commit b83d722b99de79d131f58512564b901b11907182
Merge: 9b291f1 3ceaed1
Author: Ekaterina Dimitrova 
AuthorDate: Mon Jan 3 20:33:19 2022 -0500

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt | 1 +
 build.xml   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --cc CHANGES.txt
index eb773af,0fd51ec..983d9b6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,78 -1,5 +1,79 @@@
 -4.0.2
 +4.1
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to compactionstats output 
(CASSANDRA-16844)
 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153)
 + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation 
allows it (CASSANDRA-16806)
 + * Include SASI components to snapshots (CASSANDRA-15134)
 + * Fix missed wait latencies in the output of `nodetool tpstats -F` 
(CASSANDRA-16938)
 + * Reduce native transport max frame size to 16MB 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[paulo]

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

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

commit 481c103951ef8caa74a27dd474c94d9c9e819a46
Merge: 11952fa c420d75
Author: Paulo Motta 
AuthorDate: Mon Jan 3 11:57:42 2022 -0300

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +
 src/java/org/apache/cassandra/tools/nodetool/stats/StatsTable.java | 1 +
 .../apache/cassandra/tools/nodetool/stats/TableStatsHolder.java| 3 +++
 .../apache/cassandra/tools/nodetool/stats/TableStatsPrinter.java   | 1 +
 .../cassandra/tools/nodetool/stats/TableStatsPrinterTest.java  | 6 ++
 .../apache/cassandra/tools/nodetool/stats/TableStatsTestBase.java  | 7 +++
 7 files changed, 24 insertions(+)

diff --cc CHANGES.txt
index 6208963,aa3b707..f6918d9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,77 -1,5 +1,78 @@@
 -4.0.2
 +4.1
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit 1dd9f55a60e25822e947f04bc0b1906cb3ec922d
Merge: a41cdd6 aa82e3e
Author: Brandon Williams 
AuthorDate: Tue Dec 14 13:36:35 2021 -0600

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[jolynch]

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

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

commit 97b47c3b5f845097181130125752bd6efc1e1e47
Merge: 507c6f7 e73d05b
Author: Joseph Lynch 
AuthorDate: Thu Dec 9 10:30:15 2021 -0500

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|   1 +
 conf/cassandra.yaml|   5 +
 .../apache/cassandra/cache/AutoSavingCache.java|   8 +-
 src/java/org/apache/cassandra/config/Config.java   |   2 +
 .../cassandra/config/DatabaseDescriptor.java   |  11 ++
 .../org/apache/cassandra/db/lifecycle/View.java|   2 +-
 .../org/apache/cassandra/service/CacheService.java |  41 --
 .../test/microbench/CacheLoaderBench.java  | 137 
 .../unit/org/apache/cassandra/db/KeyCacheTest.java | 138 -
 9 files changed, 332 insertions(+), 13 deletions(-)

diff --cc src/java/org/apache/cassandra/cache/AutoSavingCache.java
index 0e022d4,430161f..d0b897e
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@@ -200,8 -209,9 +200,9 @@@ public class AutoSavingCache>> futures = new 
ArrayDeque>>();
- while (in.available() > 0)
+ ArrayDeque>> futures = new ArrayDeque<>();
+ long loadByNanos = start + 
TimeUnit.SECONDS.toNanos(DatabaseDescriptor.getCacheLoadTimeout());
 -while (System.nanoTime() < loadByNanos && in.available() > 0)
++while (nanoTime() < loadByNanos && in.available() > 0)
  {
  //tableId and indexName are serialized by the serializers 
in CacheService
  //That is delegated there because there are serializer 
specific conditions
diff --cc src/java/org/apache/cassandra/config/Config.java
index 9fb57797,c03bd96..f08da7a
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -332,8 -311,8 +332,10 @@@ public class Confi
  public volatile int counter_cache_save_period = 7200;
  public volatile int counter_cache_keys_to_save = Integer.MAX_VALUE;
  
+ public int cache_load_timeout_seconds = 30;
+ 
 +public Long paxos_cache_size_in_mb = null;
 +
  private static boolean isClientMode = false;
  private static Supplier overrideLoadConfig = null;
  
diff --cc src/java/org/apache/cassandra/service/CacheService.java
index 3636c13,0a281ad..1725d5f
--- a/src/java/org/apache/cassandra/service/CacheService.java
+++ b/src/java/org/apache/cassandra/service/CacheService.java
@@@ -20,10 -20,16 +20,13 @@@ package org.apache.cassandra.service
  import java.io.IOException;
  import java.nio.ByteBuffer;
  import java.util.ArrayList;
+ import java.util.HashMap;
  import java.util.Iterator;
  import java.util.List;
+ import java.util.Map;
  import java.util.concurrent.Callable;
+ import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ExecutionException;
 -import java.util.concurrent.Future;
 -
 -import com.google.common.util.concurrent.Futures;
  
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
@@@ -456,17 -485,12 +484,12 @@@ public class CacheService implements Ca

  reader.descriptor.version,

  reader.header);
  RowIndexEntry entry = 
indexSerializer.deserializeForCache(input);
 -return Futures.immediateFuture(Pair.create(new 
KeyCacheKey(cfs.metadata(), reader.descriptor, key), entry));
 +return ImmediateFuture.success(Pair.create(new 
KeyCacheKey(cfs.metadata(), reader.descriptor, key), entry));
  }
  
- private SSTableReader findDesc(int generation, 
Iterable collection)
+ public void cleanupAfterDeserialize()
  {
- for (SSTableReader sstable : collection)
- {
- if (sstable.descriptor.generation == generation)
- return sstable;
- }
- return null;
+ cachedSSTableReaders.clear();
  }
  }
  }

-
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.0' into trunk

[bereng]

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

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

commit 507c6f76072fea09d62dd941c929945b2544bba9
Merge: d9460a0 8cef32a
Author: Bereng 
AuthorDate: Thu Dec 9 07:43:26 2021 +0100

Merge branch 'cassandra-4.0' into trunk

 .../apache/cassandra/db/compaction/CompactionsBytemanTest.java| 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --cc 
test/unit/org/apache/cassandra/db/compaction/CompactionsBytemanTest.java
index 95069f1,1c02699..baa8206
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsBytemanTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsBytemanTest.java
@@@ -18,9 -18,9 +18,9 @@@
  
  package org.apache.cassandra.db.compaction;
  
--import java.util.concurrent.TimeUnit;
  import java.util.Collection;
  import java.util.Collections;
++import java.util.concurrent.TimeUnit;
  import java.util.function.Consumer;
  import java.util.stream.Collectors;
  

-
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.0' into trunk

[bereng]

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

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

commit 7fd20bff2b457ac50158db2bf71e1243fe9bb9be
Merge: 8e28dc0 15eaa95
Author: Bereng 
AuthorDate: Fri Dec 3 11:35:56 2021 +0100

Merge branch 'cassandra-4.0' into trunk

 .../cassandra/utils/RecomputingSupplierTest.java   | 43 +-
 1 file changed, 25 insertions(+), 18 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.0' into trunk

[mck]

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

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

commit ed8571fe6fd988976a3e7b91ecfc4077f4549c59
Merge: dcd7b0d aaffb3b
Author: Mick Semb Wever 
AuthorDate: Sun Nov 21 19:53:19 2021 +0100

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt |  1 +
 bin/cassandra.in.sh | 13 ++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --cc CHANGES.txt
index a362f78,fb9dfaf..c399c0d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,66 -1,5 +1,67 @@@
 -4.0.2
 +4.1
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to compactionstats output 
(CASSANDRA-16844)
 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153)
 + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation 
allows it (CASSANDRA-16806)
 + * Include SASI components to snapshots (CASSANDRA-15134)
 + * Fix missed wait latencies in the output of `nodetool tpstats -F` 
(CASSANDRA-16938)
 + * Reduce native transport max frame size to 16MB (CASSANDRA-16886)
 + * Add support for filtering using IN restrictions (CASSANDRA-14344)
 + * Provide a nodetool command to invalidate auth caches (CASSANDRA-16404)
 + * Catch read repair timeout exceptions and add metric (CASSANDRA-16880)
 + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
 + * Add client warnings and abort to tombstone and coordinator reads which go 
past a low/high watermark (CASSANDRA-16850)
 + * Add TTL support to nodetool snapshots (CASSANDRA-16789)
 + * Allow CommitLogSegmentReader to optionally skip sync marker CRC checks 
(CASSANDRA-16842)
 + * allow blocking IPs from updating metrics about traffic (CASSANDRA-16859)
 + * Request-Based Native Transport Rate-Limiting (CASSANDRA-16663)
 + * Implement nodetool getauditlog command (CASSANDRA-16725)
 + * Clean up repair code (CASSANDRA-13720)
 + * Background schedule to clean up 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[dcapwell]

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

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

commit 10c685222fc415586ae28a01e7896063a3f2f0d3
Merge: 33fd2dc 1bcfa08
Author: David Capwell 
AuthorDate: Thu Nov 18 17:29:23 2021 -0800

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|   1 +
 .../org/apache/cassandra/concurrent/Stage.java |   1 +
 .../statements/schema/AlterKeyspaceStatement.java  |   8 --
 .../statements/schema/CreateKeyspaceStatement.java |  13 +--
 .../org/apache/cassandra/service/ClientWarn.java   |   5 -
 .../DebuggableThreadPoolExecutorTest.java  |  97 +
 .../cassandra/concurrent/SEPExecutorTest.java  |  27 +
 .../schema/SchemaStatementWarningsTest.java| 117 +
 8 files changed, 244 insertions(+), 25 deletions(-)

diff --cc CHANGES.txt
index 676e92b,1d72c0f..316d14b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,5 +1,66 @@@
 -4.0.2
 +4.1
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to compactionstats output 
(CASSANDRA-16844)
 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153)
 + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation 
allows it (CASSANDRA-16806)
 + * Include SASI components to snapshots (CASSANDRA-15134)
 + * Fix missed wait latencies in the output of `nodetool tpstats -F` 
(CASSANDRA-16938)
 + * Reduce native transport max frame size to 16MB (CASSANDRA-16886)
 + * Add support for filtering using IN restrictions (CASSANDRA-14344)
 + * Provide a nodetool command to invalidate auth caches (CASSANDRA-16404)
 + * Catch read repair timeout exceptions and add metric (CASSANDRA-16880)
 + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
 + * Add client warnings and abort to tombstone and coordinator reads which go 
past a low/high watermark (CASSANDRA-16850)
 + * Add TTL support to nodetool snapshots (CASSANDRA-16789)
 + * Allow CommitLogSegmentReader to optionally skip sync marker CRC 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[bereng]

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

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

commit 5d781232ae9481bf6680eb644d838546c3f1df8e
Merge: a6cfd64 74b8015
Author: Bereng 
AuthorDate: Thu Nov 18 07:46:01 2021 +0100

Merge branch 'cassandra-4.0' into trunk

 .circleci/config-2_1.yml.high_res.patch |  6 +++---
 .circleci/config-2_1.yml.mid_res.patch  | 14 +++---
 .circleci/config.yml.HIGHRES|  2 +-
 .circleci/config.yml.MIDRES |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[mck]

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

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

commit a6cfd64bee636ab6ba2017d535d6324f742bb25f
Merge: 1c79c68 3f2066d
Author: Mick Semb Wever 
AuthorDate: Wed Nov 17 10:56:24 2021 +0100

Merge branch 'cassandra-4.0' into trunk

 .build/build-resolver.xml | 68 +++
 build.xml |  4 ++-
 2 files changed, 37 insertions(+), 35 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.0' into trunk

[edimitrova]

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

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

commit 670bcff596958839778562d2918b363c03ca5ec9
Merge: be9db09 44ace88
Author: Ekaterina Dimitrova 
AuthorDate: Tue Nov 16 14:35:48 2021 -0500

Merge branch 'cassandra-4.0' into trunk

 .build/build-rat.xml   |   1 +
 CHANGES.txt|   1 +
 NEWS.txt   |   5 +
 conf/cassandra.yaml|   4 +-
 src/java/org/apache/cassandra/config/Config.java   |   2 +
 src/java/org/apache/cassandra/config/Replaces.java |  45 ++
 .../org/apache/cassandra/config/ReplacesList.java  |  34 +
 .../cassandra/config/YamlConfigurationLoader.java  | 164 -
 .../cassandra_deprecated_parameters_names.yaml |  56 +++
 .../LoadOldYAMLBackwardCompatibilityTest.java  |  44 ++
 .../config/YamlConfigurationLoaderTest.java|  14 +-
 11 files changed, 359 insertions(+), 11 deletions(-)

diff --cc CHANGES.txt
index 7cc49c3,cb8a8a9..f533407
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,64 -1,5 +1,65 @@@
 -4.0.2
 +4.1
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to compactionstats output 
(CASSANDRA-16844)
 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153)
 + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation 
allows it (CASSANDRA-16806)
 + * Include SASI components to snapshots (CASSANDRA-15134)
 + * Fix missed wait latencies in the output of `nodetool tpstats -F` 
(CASSANDRA-16938)
 + * Reduce native transport max frame size to 16MB (CASSANDRA-16886)
 + * Add support for filtering using IN restrictions (CASSANDRA-14344)
 + * Provide a nodetool command to invalidate auth caches (CASSANDRA-16404)
 + * Catch read repair timeout exceptions and add metric (CASSANDRA-16880)
 + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
 + * Add client warnings and abort to tombstone and coordinator reads which go 
past a low/high watermark (CASSANDRA-16850)
 + * Add TTL support to nodetool snapshots 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[edimitrova]

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

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

commit f61d817cb5fc4c63d610cab83c5824361c008013
Merge: ad4d2b3 b6f61e8
Author: Ekaterina Dimitrova 
AuthorDate: Tue Nov 16 10:33:57 2021 -0500

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 conf/cassandra.yaml| 39 --
 src/java/org/apache/cassandra/config/Config.java   | 18 --
 .../cassandra/config/DatabaseDescriptor.java   |  6 
 4 files changed, 1 insertion(+), 63 deletions(-)

diff --cc CHANGES.txt
index 12848af,1a58cdf..7cc49c3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,64 -1,5 +1,65 @@@
 -4.0.2
 +4.1
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to compactionstats output 
(CASSANDRA-16844)
 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153)
 + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation 
allows it (CASSANDRA-16806)
 + * Include SASI components to snapshots (CASSANDRA-15134)
 + * Fix missed wait latencies in the output of `nodetool tpstats -F` 
(CASSANDRA-16938)
 + * Reduce native transport max frame size to 16MB (CASSANDRA-16886)
 + * Add support for filtering using IN restrictions (CASSANDRA-14344)
 + * Provide a nodetool command to invalidate auth caches (CASSANDRA-16404)
 + * Catch read repair timeout exceptions and add metric (CASSANDRA-16880)
 + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
 + * Add client warnings and abort to tombstone and coordinator reads which go 
past a low/high watermark (CASSANDRA-16850)
 + * Add TTL support to nodetool snapshots (CASSANDRA-16789)
 + * Allow CommitLogSegmentReader to optionally skip sync marker CRC checks 
(CASSANDRA-16842)
 + * allow blocking IPs from updating metrics about traffic (CASSANDRA-16859)
 + * Request-Based Native Transport Rate-Limiting (CASSANDRA-16663)
 + * Implement nodetool getauditlog command (CASSANDRA-16725)
 + * Clean up repair code (CASSANDRA-13720)
 + * Background schedule to clean up orphaned hints files (CASSANDRA-16815)
 + * Modify 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[aleksey]

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

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

commit 2ab6e14aea69aad61eaa44bfc7390083f1cfa3af
Merge: 28882ec 03e83f2
Author: Aleksey Yeschenko 
AuthorDate: Fri Nov 12 14:41:57 2021 +

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../apache/cassandra/batchlog/BatchlogManager.java | 46 ++
 .../org/apache/cassandra/hints/HintsService.java   |  4 +-
 3 files changed, 33 insertions(+), 18 deletions(-)

diff --cc src/java/org/apache/cassandra/batchlog/BatchlogManager.java
index 432858c,0f22b4b..147e7e9
--- a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
@@@ -32,11 -35,8 +32,10 @@@ import java.util.concurrent.TimeUnit
  import java.util.concurrent.TimeoutException;
  
  import com.google.common.annotations.VisibleForTesting;
- import com.google.common.collect.Collections2;
  import com.google.common.collect.Iterables;
  import com.google.common.util.concurrent.RateLimiter;
 +import org.apache.cassandra.concurrent.ScheduledExecutorPlus;
 +import org.apache.cassandra.utils.concurrent.Future;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
@@@ -76,9 -77,7 +75,8 @@@ import org.apache.cassandra.utils.FBUti
  import org.apache.cassandra.utils.MBeanWrapper;
  import org.apache.cassandra.utils.UUIDGen;
  
- import static com.google.common.collect.Iterables.transform;
  import static java.util.concurrent.TimeUnit.MILLISECONDS;
 +import static 
org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory;
  import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
  import static 
org.apache.cassandra.cql3.QueryProcessor.executeInternalWithPaging;
  import static org.apache.cassandra.net.Verb.MUTATION_REQ;
diff --cc src/java/org/apache/cassandra/hints/HintsService.java
index f3957a1,a02367f..e80865b
--- a/src/java/org/apache/cassandra/hints/HintsService.java
+++ b/src/java/org/apache/cassandra/hints/HintsService.java
@@@ -21,11 -22,9 +21,12 @@@ import java.net.UnknownHostException
  import java.util.Collection;
  import java.util.Collections;
  import java.util.List;
 +import java.util.Map;
+ import java.util.Objects;
  import java.util.UUID;
 -import java.util.concurrent.*;
 +import java.util.concurrent.ExecutionException;
 +import java.util.concurrent.ScheduledFuture;
 +import java.util.concurrent.TimeUnit;
  import java.util.concurrent.atomic.AtomicBoolean;
  import java.util.function.Supplier;
  import java.util.stream.Collectors;
@@@ -53,8 -49,8 +54,9 @@@ import org.apache.cassandra.dht.Token
  import org.apache.cassandra.service.StorageProxy;
  import org.apache.cassandra.service.StorageService;
  import org.apache.cassandra.utils.MBeanWrapper;
 +import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
  
+ import static com.google.common.collect.Iterables.filter;
  import static com.google.common.collect.Iterables.transform;
  
  /**

-
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.0' into trunk

[aleksey]

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

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

commit 28882ec33d57ee2a48f7073549fc767b6116b289
Merge: d8b2678 dd62420
Author: Aleksey Yeschenko 
AuthorDate: Fri Nov 12 11:39:20 2021 +

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../config/CassandraRelevantProperties.java|  5 ++
 .../org/apache/cassandra/cql3/QueryProcessor.java  | 69 ++---
 .../metrics/ClientRequestsMetricsHolder.java   | 54 +
 .../org/apache/cassandra/service/StorageProxy.java | 81 +--
 .../cassandra/cql3/NodeLocalConsistencyTest.java   | 90 ++
 6 files changed, 246 insertions(+), 54 deletions(-)

diff --cc CHANGES.txt
index c39e9f6,f23a16f..bd781fe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,5 +1,63 @@@
 -4.0.2
 +4.1
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to compactionstats output 
(CASSANDRA-16844)
 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153)
 + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation 
allows it (CASSANDRA-16806)
 + * Include SASI components to snapshots (CASSANDRA-15134)
 + * Fix missed wait latencies in the output of `nodetool tpstats -F` 
(CASSANDRA-16938)
 + * Reduce native transport max frame size to 16MB (CASSANDRA-16886)
 + * Add support for filtering using IN restrictions (CASSANDRA-14344)
 + * Provide a nodetool command to invalidate auth caches (CASSANDRA-16404)
 + * Catch read repair timeout exceptions and add metric (CASSANDRA-16880)
 + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
 + * Add client warnings and abort to tombstone and coordinator reads which go 
past a low/high watermark (CASSANDRA-16850)
 + * Add TTL support to nodetool snapshots (CASSANDRA-16789)
 + * Allow CommitLogSegmentReader to optionally skip sync marker CRC checks 
(CASSANDRA-16842)
 + * allow blocking IPs from updating metrics about traffic (CASSANDRA-16859)
 + * Request-Based Native Transport Rate-Limiting (CASSANDRA-16663)
 + * Implement nodetool getauditlog command (CASSANDRA-16725)
 + * Clean up repair code (CASSANDRA-13720)
 + * Background schedule to clean up orphaned hints files (CASSANDRA-16815)
 + * Modify SecondaryIndexManager#indexPartition() to retrieve 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[ifesdjeen]

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

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

commit d8b2678257284e6a714a7ef840563feebaa61d21
Merge: 1049a78 ddf5c58
Author: Alex Petrov 
AuthorDate: Fri Nov 12 07:22:26 2021 +0100

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[edimitrova]

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

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

commit 1049a787618642da6c4287f9cdd5c4134eb2c526
Merge: 9f46a48 5c5bf7d
Author: Ekaterina Dimitrova 
AuthorDate: Thu Nov 11 20:40:49 2021 -0500

Merge branch 'cassandra-4.0' into trunk

 .circleci/config-2_1.yml |  2 +-
 .circleci/config.yml | 48 ++--
 .circleci/config.yml.HIGHRES | 48 ++--
 .circleci/config.yml.LOWRES  | 48 ++--
 .circleci/config.yml.MIDRES  | 48 ++--
 5 files changed, 97 insertions(+), 97 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.0' into trunk

[ycai]

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

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

commit 9f46a489527c2440d563cef69038aac3e626148a
Merge: 4f112af 79bbb7d
Author: Yifan Cai 
AuthorDate: Thu Nov 11 16:23:51 2021 -0800

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../org/apache/cassandra/dht/RangeStreamer.java| 77 ++
 2 files changed, 37 insertions(+), 41 deletions(-)

diff --cc CHANGES.txt
index be50bde,6536924..c39e9f6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,5 +1,63 @@@
 -4.0.2
 +4.1
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to compactionstats output 
(CASSANDRA-16844)
 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153)
 + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation 
allows it (CASSANDRA-16806)
 + * Include SASI components to snapshots (CASSANDRA-15134)
 + * Fix missed wait latencies in the output of `nodetool tpstats -F` 
(CASSANDRA-16938)
 + * Reduce native transport max frame size to 16MB (CASSANDRA-16886)
 + * Add support for filtering using IN restrictions (CASSANDRA-14344)
 + * Provide a nodetool command to invalidate auth caches (CASSANDRA-16404)
 + * Catch read repair timeout exceptions and add metric (CASSANDRA-16880)
 + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
 + * Add client warnings and abort to tombstone and coordinator reads which go 
past a low/high watermark (CASSANDRA-16850)
 + * Add TTL support to nodetool snapshots (CASSANDRA-16789)
 + * Allow CommitLogSegmentReader to optionally skip sync marker CRC checks 
(CASSANDRA-16842)
 + * allow blocking IPs from updating metrics about traffic (CASSANDRA-16859)
 + * Request-Based Native Transport Rate-Limiting (CASSANDRA-16663)
 + * Implement nodetool getauditlog command (CASSANDRA-16725)
 + * Clean up repair code (CASSANDRA-13720)
 + * Background schedule to clean up orphaned hints files (CASSANDRA-16815)
 + * Modify SecondaryIndexManager#indexPartition() to retrieve only columns for 
which indexes are actually being built (CASSANDRA-16776)
 + * Batch the token metadata update to improve the speed (CASSANDRA-15291)
 + * Reduce the log level on "expected" repair exceptions (CASSANDRA-16775)
 + * Make JMXTimer expose attributes using consistent time unit 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[edimitrova]

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

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

commit 4f112af6156b0ed35eb85124eaa525e5e0b9a059
Merge: e0954fa 4bb6f41
Author: Ekaterina Dimitrova 
AuthorDate: Wed Nov 10 16:41:03 2021 -0500

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt |  1 +
 conf/cassandra.yaml | 28 ++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --cc CHANGES.txt
index d11c3af,3994ede..be50bde
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,5 +1,63 @@@
 -4.0.2
 +4.1
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to compactionstats output 
(CASSANDRA-16844)
 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153)
 + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation 
allows it (CASSANDRA-16806)
 + * Include SASI components to snapshots (CASSANDRA-15134)
 + * Fix missed wait latencies in the output of `nodetool tpstats -F` 
(CASSANDRA-16938)
 + * Reduce native transport max frame size to 16MB (CASSANDRA-16886)
 + * Add support for filtering using IN restrictions (CASSANDRA-14344)
 + * Provide a nodetool command to invalidate auth caches (CASSANDRA-16404)
 + * Catch read repair timeout exceptions and add metric (CASSANDRA-16880)
 + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
 + * Add client warnings and abort to tombstone and coordinator reads which go 
past a low/high watermark (CASSANDRA-16850)
 + * Add TTL support to nodetool snapshots (CASSANDRA-16789)
 + * Allow CommitLogSegmentReader to optionally skip sync marker CRC checks 
(CASSANDRA-16842)
 + * allow blocking IPs from updating metrics about traffic (CASSANDRA-16859)
 + * Request-Based Native Transport Rate-Limiting (CASSANDRA-16663)
 + * Implement nodetool getauditlog command (CASSANDRA-16725)
 + * Clean up repair code (CASSANDRA-13720)
 + * Background schedule to clean up orphaned hints files (CASSANDRA-16815)
 + * Modify SecondaryIndexManager#indexPartition() to retrieve only columns for 
which indexes are actually being built (CASSANDRA-16776)
 + * Batch the token metadata update to improve the speed (CASSANDRA-15291)
 + * Reduce the log level on "expected" repair exceptions (CASSANDRA-16775)
 + * Make JMXTimer expose attributes using consistent time unit 
(CASSANDRA-16760)
 + * Remove check on gossip 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[benedict]

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

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

commit cedde3d991da48039caee2afb421c73267f0
Merge: 6329229 07b908c
Author: Benedict Elliott Smith 
AuthorDate: Wed Nov 10 11:13:52 2021 +

Merge branch 'cassandra-4.0' into trunk

 build.xml  |  2 +-
 .../distributed/impl/AbstractCluster.java  |  9 +--
 .../distributed/impl/IsolatedExecutor.java | 29 +-
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --cc build.xml
index b8eabb8,60a6b7d..085211a
--- a/build.xml
+++ b/build.xml
@@@ -532,9 -531,8 +532,9 @@@

  

-   
+   

 +  

  
  
diff --cc 
test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
index be49daa,240f080..1cb7c13
--- 
a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
+++ 
b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
@@@ -18,14 -18,9 +18,15 @@@
  
  package org.apache.cassandra.distributed.impl;
  
 -import java.io.File;
  import java.lang.annotation.Annotation;
 +import java.lang.reflect.Field;
++import java.lang.reflect.InvocationTargetException;
 +import java.lang.reflect.Method;
 +import java.lang.reflect.Modifier;
  import java.net.InetSocketAddress;
 +import java.nio.file.FileSystem;
 +import java.nio.file.Files;
 +import java.nio.file.Path;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Collection;
@@@ -231,33 -212,11 +232,37 @@@ public abstract class AbstractCluster<
  
  private IInvokableInstance newInstance(int generation)
  {
 -ClassLoader classLoader = new InstanceClassLoader(generation, 
config.num(), version.classpath, sharedClassLoader, SHARED_PREDICATE);
 +ClassLoader classLoader = new InstanceClassLoader(generation, 
config.num(), version.classpath, sharedClassLoader, sharedClassPredicate, 
classTransformer);
 +ThreadGroup threadGroup = new ThreadGroup(clusterThreadGroup, 
"node" + config.num() + (generation > 1 ? "_" + generation : ""));
  if (instanceInitializer != null)
 -instanceInitializer.accept(classLoader, config.num());
 -return 
Instance.transferAdhoc((SerializableBiFunction)Instance::new, classLoader)
 -
.apply(config.forVersion(version.version), classLoader);
 +instanceInitializer.initialise(classLoader, threadGroup, 
config.num(), generation);
 +
 +IInvokableInstance instance;
 +try
 +{
- instance = 
Instance.transferAdhoc((SerializableTriFunction)Instance::new, classLoader)
++instance = 
Instance.transferAdhocPropagate((SerializableTriFunction)Instance::new, classLoader)
 +   .apply(config.forVersion(version.version), 
classLoader, root.getFileSystem());
 +}
- catch (NoSuchMethodError e)
++catch (InvocationTargetException e)
 +{
 +instance = 
Instance.transferAdhoc((SerializableBiFunction)Instance::new, classLoader)
 +   .apply(config.forVersion(version.version), 
classLoader);
 +}
++catch (IllegalAccessException e)
++{
++throw new RuntimeException(e);
++}
 +
 +if (instanceInitializer != null)
 +instanceInitializer.beforeStartup(instance);
 +
 +return instance;
 +}
 +
 +public Executor executorFor(int verb)
 +{
 +// this method must be lock-free to avoid Simulator deadlock
 +return delegate().executorFor(verb);
  }
  
  public IInstanceConfig config()
diff --cc 
test/distributed/org/apache/cassandra/distributed/impl/IsolatedExecutor.java
index 2779110,dd52b5d..38151be
--- 
a/test/distributed/org/apache/cassandra/distributed/impl/IsolatedExecutor.java
+++ 
b/test/distributed/org/apache/cassandra/distributed/impl/IsolatedExecutor.java
@@@ -159,52 -136,33 +159,57 @@@ public class IsolatedExecutor implement
  public  QuintFunction> async(QuintFunction f) { return (a, b, c, d, 
e) -> isolatedExecutor.submit(() -> f.apply(a, b, c, d, e)); }
  public  QuintFunction 
sync(QuintFunction f) { return (a, b, c, d,e ) -> 
waitOn(async(f).apply(a, b, c, d, e)); }
  
 -public  E transfer(E object)
 +public Executor executor()
  {
 -return (E) transferOneObject(object, classLoader, 
deserializeOnInstance);
 +return isolatedExecutor;
  }
  
 -static  E transferAdhoc(E object, ClassLoader 
classLoader)
 +public  T transfer(T in)
  {
 -return transferOneObject(object, classLoader, 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[samt]

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

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

commit a0f950f02d9713a390b1adc05ae5b1f389378a46
Merge: 2fc7206 c961310
Author: Sam Tunnicliffe 
AuthorDate: Fri Nov 5 07:58:56 2021 +

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../apache/cassandra/cql3/UntypedResultSet.java|  4 +++
 .../cassandra/cql3/functions/types/LocalDate.java  |  6 ++--
 .../cassandra/io/sstable/CQLSSTableWriter.java | 20 ---
 .../cassandra/io/sstable/CQLSSTableWriterTest.java | 40 ++
 5 files changed, 63 insertions(+), 8 deletions(-)

diff --cc CHANGES.txt
index c1259bc,3f6bacd..a0a1a04
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,57 -1,5 +1,58 @@@
 -4.0.2
 +4.1
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to compactionstats output 
(CASSANDRA-16844)
 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153)
 + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation 
allows it (CASSANDRA-16806)
 + * Include SASI components to snapshots (CASSANDRA-15134)
 + * Fix missed wait latencies in the output of `nodetool tpstats -F` 
(CASSANDRA-16938)
 + * Reduce native transport max frame size to 16MB (CASSANDRA-16886)
 + * Add support for filtering using IN restrictions (CASSANDRA-14344)
 + * Provide a nodetool command to invalidate auth caches (CASSANDRA-16404)
 + * Catch read repair timeout exceptions and add metric (CASSANDRA-16880)
 + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
 + * Add client warnings and abort to tombstone and coordinator reads which go 
past a low/high watermark (CASSANDRA-16850)
 + * Add TTL support to nodetool snapshots (CASSANDRA-16789)
 + * Allow CommitLogSegmentReader to optionally skip sync marker CRC checks 
(CASSANDRA-16842)
 + * allow blocking IPs from updating metrics about traffic (CASSANDRA-16859)
 + * Request-Based Native Transport Rate-Limiting (CASSANDRA-16663)
 + * Implement nodetool getauditlog command (CASSANDRA-16725)
 + * Clean up repair code (CASSANDRA-13720)
 + * Background schedule to clean up orphaned hints files (CASSANDRA-16815)
 + * Modify SecondaryIndexManager#indexPartition() to retrieve only columns for 
which indexes are actually being built (CASSANDRA-16776)
 + * Batch the token metadata update to improve the speed (CASSANDRA-15291)
 + * Reduce the log level on "expected" repair exceptions (CASSANDRA-16775)
 + * Make JMXTimer expose attributes using consistent time unit 
(CASSANDRA-16760)
 + * Remove check on gossip status from DynamicEndpointSnitch::updateScores 
(CASSANDRA-11671)
 + * Fix AbstractReadQuery::toCQLString not returning valid CQL 
(CASSANDRA-16510)
 + * Log when compacting many tombstones 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[bereng]

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

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

commit 185c5232a693a8e661926dfad3c0536327a4cb79
Merge: 5b4d369 8ba8f0b
Author: Bereng 
AuthorDate: Thu Nov 4 08:12:40 2021 +0100

Merge branch 'cassandra-4.0' into trunk

 .../cassandra/cql3/ViewComplexDeletionsTest.java   | 290 -
 .../cassandra/cql3/ViewComplexLivenessTest.java| 126 +++--
 .../apache/cassandra/cql3/ViewComplexTTLTest.java  | 138 --
 .../org/apache/cassandra/cql3/ViewComplexTest.java | 196 --
 .../apache/cassandra/cql3/ViewComplexTester.java   | 130 +
 .../cassandra/cql3/ViewComplexUpdatesTest.java | 204 ++-
 6 files changed, 452 insertions(+), 632 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.0' into trunk

[adelapena]

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

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

commit d21e0dd8461e7ab9ce41ad4ee58e75134dc918ab
Merge: 3783077 6c9d5ab
Author: Andrés de la Peña 
AuthorDate: Wed Oct 27 18:19:11 2021 +0100

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../apache/cassandra/auth/CassandraAuthorizer.java | 16 ++--
 .../org/apache/cassandra/auth/RoleResource.java|  3 +-
 .../cql3/statements/CreateRoleStatement.java   |  2 +-
 .../org/apache/cassandra/auth/AuthTestUtils.java   |  8 ++
 .../cassandra/auth/CassandraAuthorizerTest.java| 93 ++
 test/unit/org/apache/cassandra/cql3/CQLTester.java |  5 ++
 7 files changed, 120 insertions(+), 8 deletions(-)

diff --cc src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
index 60d5a1f,6397154..c808ebc
--- a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
+++ b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
@@@ -245,14 -236,13 +245,14 @@@ public class CassandraAuthorizer implem
SchemaConstants.AUTH_KEYSPACE_NAME,
AuthKeyspace.RESOURCE_ROLE_INDEX,
escape(resource.getName()),
 -  escape(role.getRoleName(;
 +  escape(role.getRoleName())),
 +authWriteConsistencyLevel());
  }
  
- // 'of' can be null - in that case everyone's permissions have been 
requested. Otherwise only single user's.
- // If the user requesting 'LIST PERMISSIONS' is not a superuser OR their 
username doesn't match 'of', we
- // throw UnauthorizedException. So only a superuser can view everybody's 
permissions. Regular users are only
- // allowed to see their own permissions.
+ // 'grantee' can be null - in that case everyone's permissions have been 
requested. Otherwise, only single user's.
+ // If the 'performer' requesting 'LIST PERMISSIONS' is not a superuser OR 
their username doesn't match 'grantee' OR
+ // they have no permission to describe all roles OR they have no 
permission to describe 'grantee', then we throw
+ // UnauthorizedException.
  public Set list(AuthenticatedUser performer,
 Set permissions,
 IResource resource,
diff --cc test/unit/org/apache/cassandra/auth/AuthTestUtils.java
index 64daca5,000..83bdf71
mode 100644,00..100644
--- a/test/unit/org/apache/cassandra/auth/AuthTestUtils.java
+++ b/test/unit/org/apache/cassandra/auth/AuthTestUtils.java
@@@ -1,150 -1,0 +1,158 @@@
 +/*
 + * 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.auth;
 +
 +import java.util.concurrent.Callable;
 +
 +import org.apache.cassandra.cql3.QueryOptions;
 +import org.apache.cassandra.cql3.QueryProcessor;
 +import org.apache.cassandra.cql3.UntypedResultSet;
 +import org.apache.cassandra.cql3.statements.BatchStatement;
 +import org.apache.cassandra.cql3.statements.SelectStatement;
 +import org.apache.cassandra.db.ColumnFamilyStore;
 +import org.apache.cassandra.db.ConsistencyLevel;
 +import org.apache.cassandra.db.Keyspace;
 +import org.apache.cassandra.exceptions.RequestExecutionException;
 +import org.apache.cassandra.schema.SchemaConstants;
 +import org.apache.cassandra.service.QueryState;
 +import org.apache.cassandra.transport.messages.ResultMessage;
 +
 +
 +public class AuthTestUtils
 +{
 +
 +public static final RoleResource ROLE_A = RoleResource.role("role_a");
 +public static final RoleResource ROLE_B = RoleResource.role("role_b");
 +public static final RoleResource ROLE_B_1 = RoleResource.role("role_b_1");
 +public static final RoleResource ROLE_B_2 = RoleResource.role("role_b_2");
 +public static final RoleResource ROLE_B_3 = RoleResource.role("role_b_3");
 +public static final RoleResource ROLE_C = RoleResource.role("role_c");
 +public static final RoleResource ROLE_C_1 = RoleResource.role("role_c_1");
 +public static final RoleResource ROLE_C_2 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[adelapena]

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

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

commit 37830770d1e54703c4b30a67c259b50317e3d4e3
Merge: 7d0cb20 530bc91
Author: Andrés de la Peña 
AuthorDate: Tue Oct 26 18:24:00 2021 +0100

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 src/java/org/apache/cassandra/net/InboundSink.java |  8 ++--
 .../apache/cassandra/service/AbstractWriteResponseHandler.java | 10 --
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --cc 
src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
index b3b6728,7128277..b249ca6
--- a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
@@@ -39,21 -41,12 +39,24 @@@ import org.apache.cassandra.exceptions.
  import org.apache.cassandra.locator.InetAddressAndPort;
  import org.apache.cassandra.net.RequestCallback;
  import org.apache.cassandra.net.Message;
 -import org.apache.cassandra.schema.Schema;
 -import org.apache.cassandra.utils.concurrent.SimpleCondition;
 +import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
  
 +import static java.lang.Long.MAX_VALUE;
 +import static java.lang.Math.min;
  import static java.util.concurrent.TimeUnit.NANOSECONDS;
++
 +import static org.apache.cassandra.utils.Clock.Global.nanoTime;
 +import static java.util.stream.Collectors.toList;
 +import static 
org.apache.cassandra.config.DatabaseDescriptor.getCounterWriteRpcTimeout;
 +import static 
org.apache.cassandra.config.DatabaseDescriptor.getWriteRpcTimeout;
 +import static org.apache.cassandra.db.WriteType.COUNTER;
 +import static org.apache.cassandra.locator.ReplicaPlan.ForTokenWrite;
 +import static org.apache.cassandra.schema.Schema.instance;
 +import static org.apache.cassandra.service.StorageProxy.WritePerformer;
 +import static 
org.apache.cassandra.utils.concurrent.Condition.newOneTimeCondition;
+ import static org.apache.cassandra.locator.Replicas.countInOurDc;
+ 
 +
  public abstract class AbstractWriteResponseHandler implements 
RequestCallback
  {
  protected static final Logger logger = 
LoggerFactory.getLogger(AbstractWriteResponseHandler.class);

-
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.0' into trunk

[bereng]

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

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

commit 7d0cb2015d76a82a9baf1c4769345ebb5194f212
Merge: 8e225c5 5aa2fb8
Author: Bereng 
AuthorDate: Tue Oct 26 07:44:20 2021 +0200

Merge branch 'cassandra-4.0' into trunk

 .../org/apache/cassandra/db/SystemKeyspace.java|   2 +-
 .../cassandra/io/sstable/CQLSSTableWriter.java |   2 +-
 .../apache/cassandra/schema/MigrationManager.java  |   2 +-
 src/java/org/apache/cassandra/schema/Schema.java   |  41 -
 .../apache/cassandra/schema/SchemaKeyspace.java|  43 +++--
 .../cassandra/schema/SchemaKeyspaceTables.java |  59 
 .../cassandra/schema/SchemaPullVerbHandler.java|   2 +-
 .../org/apache/cassandra/service/ClientState.java  |   4 +-
 .../cassandra/utils/NativeSSTableLoaderClient.java |  10 +-
 .../distributed/test/metric/TableMetricTest.java   |   2 +-
 .../cassandra/cql3/PstmtPersistenceTest.java   |   4 +-
 test/unit/org/apache/cassandra/cql3/ViewTest.java  |   4 +-
 .../cql3/validation/operations/AlterTest.java  |  16 ++--
 .../cql3/validation/operations/CreateTest.java |  20 ++--
 .../operations/InsertUpdateIfConditionTest.java|  12 +--
 .../org/apache/cassandra/db/DirectoriesTest.java   |   6 +-
 .../apache/cassandra/db/SystemKeyspaceTest.java|   3 +-
 .../cassandra/schema/SchemaKeyspaceTest.java   | 102 +
 .../service/StorageServiceServerTest.java  |   2 +-
 19 files changed, 242 insertions(+), 94 deletions(-)

diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index e8c22b1,b4a322f..6d5e331
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@@ -58,8 -61,11 +61,11 @@@ import static org.apache.cassandra.sche
  
  /**
   * system_schema.* tables and methods for manipulating them.
+  * 
+  * Please notice this class is _not_ thread safe. It should be accessed 
through {@link org.apache.cassandra.schema.Schema}. See CASSANDRA-16856/16996
   */
+ @NotThreadSafe
 -final class SchemaKeyspace
 +public final class SchemaKeyspace
  {
  private SchemaKeyspace()
  {
@@@ -101,7 -80,7 +80,7 @@@
   * The tables to which we added the cdc column. This is used in {@link 
#makeUpdateForSchema} below to make sure we skip that
   * column is cdc is disabled as the columns breaks pre-cdc to post-cdc 
upgrades (typically, 3.0 -> 3.X).
   */
--private static final Set TABLES_WITH_CDC_ADDED = 
ImmutableSet.of(TABLES, VIEWS);
++private static final Set TABLES_WITH_CDC_ADDED = 
ImmutableSet.of(SchemaKeyspaceTables.TABLES, SchemaKeyspaceTables.VIEWS);
  
  private static final TableMetadata Keyspaces =
  parse(KEYSPACES,
diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspaceTables.java
index 000,b6e825d..c00a4f7
mode 00,100644..100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspaceTables.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspaceTables.java
@@@ -1,0 -1,62 +1,59 @@@
+ /*
+  * 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.schema;
+ 
+ import com.google.common.collect.ImmutableList;
+ 
 -public final class SchemaKeyspaceTables
++public class SchemaKeyspaceTables
+ {
 -public static final String INDEXES = "indexes";
 -public static final String AGGREGATES = "aggregates";
 -public static final String FUNCTIONS = "functions";
 -public static final String TYPES = "types";
 -public static final String VIEWS = "views";
 -public static final String TRIGGERS = "triggers";
 -public static final String DROPPED_COLUMNS = "dropped_columns";
 -public static final String COLUMNS = "columns";
 -public static final String TABLES = "tables";
+ public static final String KEYSPACES = "keyspaces";
 -
++public static final String TABLES = "tables";
++public static final String COLUMNS = "columns";
++public static final String DROPPED_COLUMNS = "dropped_columns";
++public static final String TRIGGERS = "triggers";
++public static final String VIEWS = 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit ec04802e52aa2462756d438581761ddcb133dd25
Merge: fafd88e e8d905e
Author: Brandon Williams 
AuthorDate: Thu Oct 21 07:39:25 2021 -0500

Merge branch 'cassandra-4.0' into trunk

 ide/idea/workspace.xml | 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.0' into trunk

[brandonwilliams]

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

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

commit fafd88e717eec071559c3b141cde8eb9801a4234
Merge: b1c3755 4e77cc8
Author: Brandon Williams 
AuthorDate: Wed Oct 20 11:01:22 2021 -0500

Merge branch 'cassandra-4.0' into trunk

 src/java/org/apache/cassandra/transport/ExceptionHandlers.java | 6 ++
 1 file changed, 6 insertions(+)

diff --cc src/java/org/apache/cassandra/transport/ExceptionHandlers.java
index 377b640,1c5c976..e2c570d
--- a/src/java/org/apache/cassandra/transport/ExceptionHandlers.java
+++ b/src/java/org/apache/cassandra/transport/ExceptionHandlers.java
@@@ -34,8 -32,7 +34,9 @@@ import io.netty.channel.Channel
  import io.netty.channel.ChannelHandlerContext;
  import io.netty.channel.ChannelInboundHandlerAdapter;
  import io.netty.channel.ChannelPromise;
+ import io.netty.channel.unix.Errors;
 +import org.apache.cassandra.exceptions.OverloadedException;
 +import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.metrics.ClientMetrics;
  import org.apache.cassandra.net.FrameEncoder;
  import org.apache.cassandra.transport.messages.ErrorMessage;
@@@ -110,44 -118,6 +111,49 @@@ public class ExceptionHandler
  }
  }
  
 +static void logClientNetworkingExceptions(Throwable cause)
 +{
 +if (Throwables.anyCauseMatches(cause, t -> t instanceof 
ProtocolException))
 +{
 +// if any ProtocolExceptions is not silent, then handle
 +if (Throwables.anyCauseMatches(cause, t -> t instanceof 
ProtocolException && !((ProtocolException) t).isSilent()))
 +{
 +ClientMetrics.instance.markProtocolException();
 +// since protocol exceptions are expected to be client 
issues, not logging stack trace
 +// to avoid spamming the logs once a bad client shows up
 +NoSpamLogger.log(logger, NoSpamLogger.Level.WARN, 1, 
TimeUnit.MINUTES, "Protocol exception with client networking: " + 
cause.getMessage());
 +}
 +}
 +else if (Throwables.anyCauseMatches(cause, t -> t instanceof 
OverloadedException))
 +{
 +// Once the threshold for overload is breached, it will very 
likely spam the logs...
 +NoSpamLogger.log(logger, NoSpamLogger.Level.INFO, 1, 
TimeUnit.MINUTES, cause.getMessage());
 +}
++else if (Throwables.anyCauseMatches(cause, t -> t instanceof 
Errors.NativeIoException))
++{
++ClientMetrics.instance.markUnknownException();
++logger.trace("Native exception in client networking", cause);
++}
 +else
 +{
 +ClientMetrics.instance.markUnknownException();
 +logger.warn("Unknown exception in client networking", cause);
 +}
 +}
 +
 +static Predicate getUnexpectedExceptionHandler(Channel 
channel, boolean alwaysLogAtError)
 +{
 +SocketAddress address = channel.remoteAddress();
 +if 
(DatabaseDescriptor.getClientErrorReportingExclusions().contains(address))
 +{
 +return cause -> {
 +logger.debug("Excluding client exception for {}; address 
contained in client_error_reporting_exclusions", address, cause);
 +return true;
 +};
 +}
 +return new UnexpectedChannelExceptionHandler(channel, 
alwaysLogAtError);
 +}
 +
  /**
   * Include the channel info in the logged information for unexpected 
errors, and (if {@link #alwaysLogAtError} is
   * false then choose the log level based on the type of exception (some 
are clearly client issues and shouldn't be

-
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.0' into trunk

[brandonwilliams]

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

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

commit b1c3755f62a39b091c6c45cba3504eca165d678b
Merge: df6ecaa 71f7b6c
Author: Brandon Williams 
AuthorDate: Wed Oct 20 10:36:52 2021 -0500

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt | 1 +
 .../org/apache/cassandra/transport/InitialConnectionHandler.java| 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --cc CHANGES.txt
index 0bf931d,5393f7e..624ae44
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,5 +1,51 @@@
 -4.0.2
 +4.1
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
 + * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
 + * add credentials file support to CQLSH (CASSANDRA-16983)
 + * Skip remaining bytes in the Envelope buffer when a ProtocolException is 
thrown to avoid double decoding (CASSANDRA-17026)
 + * Allow reverse iteration of resources during permissions checking 
(CASSANDRA-17016)
 + * Add feature to verify correct ownership of attached locations on disk at 
startup (CASSANDRA-16879)
 + * Make SSLContext creation pluggable/extensible (CASSANDRA-1)
 + * Add soft/hard limits to local reads to protect against reading too much 
data in a single query (CASSANDRA-16896)
 + * Avoid token cache invalidation for removing a non-member node 
(CASSANDRA-15290)
 + * Allow configuration of consistency levels on auth operations 
(CASSANDRA-12988)
 + * Add number of sstables in a compaction to compactionstats output 
(CASSANDRA-16844)
 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153)
 + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation 
allows it (CASSANDRA-16806)
 + * Include SASI components to snapshots (CASSANDRA-15134)
 + * Fix missed wait latencies in the output of `nodetool tpstats -F` 
(CASSANDRA-16938)
 + * Reduce native transport max frame size to 16MB (CASSANDRA-16886)
 + * Add support for filtering using IN restrictions (CASSANDRA-14344)
 + * Provide a nodetool command to invalidate auth caches (CASSANDRA-16404)
 + * Catch read repair timeout exceptions and add metric (CASSANDRA-16880)
 + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
 + * Add client warnings and abort to tombstone and coordinator reads which go 
past a low/high watermark (CASSANDRA-16850)
 + * Add TTL support to nodetool snapshots (CASSANDRA-16789)
 + * Allow CommitLogSegmentReader to optionally skip sync marker CRC checks 
(CASSANDRA-16842)
 + * allow blocking IPs from updating metrics about traffic (CASSANDRA-16859)
 + * Request-Based Native Transport Rate-Limiting (CASSANDRA-16663)
 + * Implement nodetool getauditlog command (CASSANDRA-16725)
 + * Clean up repair code (CASSANDRA-13720)
 + * Background schedule to clean up orphaned hints files (CASSANDRA-16815)
 + * Modify SecondaryIndexManager#indexPartition() to retrieve only columns for 
which indexes are actually being built (CASSANDRA-16776)
 + * Batch the token metadata update to improve the speed (CASSANDRA-15291)
 + * Reduce the log level on "expected" repair exceptions (CASSANDRA-16775)
 + * Make JMXTimer expose attributes using consistent time unit 
(CASSANDRA-16760)
 + * Remove check on gossip status from DynamicEndpointSnitch::updateScores 
(CASSANDRA-11671)
 + * Fix AbstractReadQuery::toCQLString not returning valid CQL 
(CASSANDRA-16510)
 + * Log when compacting many tombstones (CASSANDRA-16780)
 + * Display bytes per level in tablestats for LCS tables (CASSANDRA-16799)
 + * Add isolated flush timer to CommitLogMetrics and ensure writes correspond 
to single WaitingOnCommit data points (CASSANDRA-16701)
 + * Add a system property to set hostId if not yet initialized 
(CASSANDRA-14582)
 + * GossiperTest.testHasVersion3Nodes didn't take into account trunk version 
changes, fixed to rely on latest version (CASSANDRA-16651)
 +Merged from 4.0:
+  * Push initial client connection messages to trace (CASSANDRA-17038)
   * Correct the internode message timestamp if sending node has wrapped 
(CASSANDRA-16997)
   * Avoid race causing us to return null in RangesAtEndpoint (CASSANDRA-16965)
   * Avoid rewriting all sstables during cleanup when transient replication is 
enabled (CASSANDRA-16966)
diff --cc 

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[adelapena]

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

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

commit 3a950b45c321e051a9744721408760c568c05617
Merge: 5a88bc8 72f3b79
Author: Andrés de la Peña 
AuthorDate: Tue Oct 19 11:44:40 2021 +0100

Merge branch 'cassandra-4.0' into trunk

 .circleci/config-2_1.yml| 42 ---
 .circleci/config-2_1.yml.high_res.patch | 48 -
 .circleci/config-2_1.yml.mid_res.patch  | 91 -
 .circleci/config.yml.MIDRES |  8 +--
 4 files changed, 153 insertions(+), 36 deletions(-)

diff --cc .circleci/config-2_1.yml.high_res.patch
index 1a0ba53,45c54b2..79fa6ab
--- a/.circleci/config-2_1.yml.high_res.patch
+++ b/.circleci/config-2_1.yml.high_res.patch
@@@ -1,4 -1,6 +1,6 @@@
- @@ -19,14 +19,14 @@ default_env_vars: _env_vars
  .circleci/config-2_1.yml  2021-10-18 11:48:35.0 +0100
 -+++ .circleci/config-2_1.yml.HIGHRES  2021-10-18 12:03:47.0 +0100
++--- .circleci/config-2_1.yml  2021-10-18 12:30:30.0 +0100
+ .circleci/config-2_1.yml.HIGHRES  2021-10-18 15:22:24.0 +0100
+ @@ -101,14 +101,14 @@
   j8_par_executor: _par_executor
 executor:
   name: java8-executor
diff --cc .circleci/config-2_1.yml.mid_res.patch
index 0c360d9,27df9cc..d843ea7
--- a/.circleci/config-2_1.yml.mid_res.patch
+++ b/.circleci/config-2_1.yml.mid_res.patch
@@@ -1,4 -1,6 +1,6 @@@
- @@ -19,14 +19,14 @@ default_env_vars: _env_vars
  .circleci/config-2_1.yml  2021-10-18 11:48:35.0 +0100
 -+++ .circleci/config-2_1.yml.MIDRES   2021-10-18 12:02:44.0 +0100
++--- .circleci/config-2_1.yml  2021-10-18 12:30:30.0 +0100
+ .circleci/config-2_1.yml.MIDRES   2021-10-18 15:22:00.0 +0100
+ @@ -101,14 +101,14 @@
   j8_par_executor: _par_executor
 executor:
   name: java8-executor

-
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.0' into trunk

[brandonwilliams]

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

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

commit 5a88bc8cd14c849850718d646e8c7c404e2f1e89
Merge: d9ca614 f646a7c
Author: Brandon Williams 
AuthorDate: Fri Oct 15 10:07:40 2021 -0500

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[ifesdjeen]

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

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

commit d9ca61404334f3bd94c08cf66ccd15e8c5287f52
Merge: ebce74e 25f67a7
Author: Alex Petrov 
AuthorDate: Fri Oct 15 11:27:39 2021 +0200

Merge branch 'cassandra-4.0' into trunk

 src/java/org/apache/cassandra/schema/Schema.java   |  8 +++
 .../distributed/test/ring/BootstrapTest.java   | 25 ++
 2 files changed, 33 insertions(+)


-
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.0 into trunk

[blerer]

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

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

commit ebce74ee2d186359bbd83c33b96f5b6c3ae1f856
Merge: d389620 be1684b
Author: Benjamin Lerer 
AuthorDate: Thu Oct 14 15:29:37 2021 +0200

Merge branch cassandra-4.0 into trunk

 CHANGES.txt|  1 +
 .../apache/cassandra/db/commitlog/CommitLog.java   | 31 --
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLog.java
index 5f386d1,d18f19b..a4be769
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@@ -17,11 -17,9 +17,12 @@@
   */
  package org.apache.cassandra.db.commitlog;
  
 -import java.io.*;
 +
 +import java.io.IOException;
  import java.nio.ByteBuffer;
++import java.nio.file.FileStore;
  import java.util.*;
 +import java.util.function.BiPredicate;
  import java.util.function.Function;
  import java.util.zip.CRC32;
  
@@@ -41,6 -38,6 +42,7 @@@ import org.apache.cassandra.io.util.Buf
  import org.apache.cassandra.io.util.DataOutputBuffer;
  import org.apache.cassandra.io.util.DataOutputBufferFixed;
  import org.apache.cassandra.io.util.FileUtils;
++import org.apache.cassandra.io.util.PathUtils;
  import org.apache.cassandra.metrics.CommitLogMetrics;
  import org.apache.cassandra.net.MessagingService;
  import org.apache.cassandra.schema.CompressionParams;
@@@ -492,6 -488,11 +494,11 @@@ public class CommitLog implements Commi
  return start().recoverSegmentsOnDisk();
  }
  
+ public static long freeDiskSpace()
+ {
 -return FileUtils.getFreeSpace(new 
File(DatabaseDescriptor.getCommitLogLocation()));
++return PathUtils.tryGetSpace(new 
File(DatabaseDescriptor.getCommitLogLocation()).toPath(), 
FileStore::getTotalSpace);
+ }
+ 
  @VisibleForTesting
  public static boolean handleCommitError(String message, Throwable t)
  {

-
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.0' into trunk

[adelapena]

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

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

commit 31b2d133df486e90862ee5e365cbb4a00462e2ea
Merge: 460ae34 2da2747
Author: Andrés de la Peña 
AuthorDate: Thu Oct 14 12:39:06 2021 +0100

Merge branch 'cassandra-4.0' into trunk

 .circleci/config-2_1.yml | 351 +++
 .circleci/config.yml | 293 
 .circleci/config.yml.HIGHRES | 293 
 .circleci/config.yml.LOWRES  | 293 
 .circleci/config.yml.MIDRES  | 293 
 5 files changed, 1334 insertions(+), 189 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.0' into trunk

[maedhroz]

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

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

commit 8f2bf50abece27432993f312df7ca7e34aff4a76
Merge: 243d220 96a5e0f
Author: Caleb Rackliffe 
AuthorDate: Tue Oct 12 16:47:35 2021 -0500

Merge branch 'cassandra-4.0' into trunk


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

[brandonwilliams]

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

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

commit c4254663f539069bac96b9314aed58f997724936
Merge: 917d74b e57a8dd
Author: Brandon Williams 
AuthorDate: Mon Oct 11 12:07:22 2021 -0500

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 17 ++---
 src/java/org/apache/cassandra/db/SystemKeyspace.java| 12 ++--
 3 files changed, 21 insertions(+), 9 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.0' into trunk

[smiklosovic]

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

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

commit f638f6a7810da970d6f8e8f6d175751be30d868d
Merge: b00b82a c4a07ae
Author: Stefan Miklosovic 
AuthorDate: Tue Oct 5 16:31:25 2021 +0200

Merge branch 'cassandra-4.0' into trunk

 .build/build-owasp.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 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.0' into trunk

[maedhroz]

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

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

commit b00b82a80f816aa06d876b6c861738847dd6f17b
Merge: 24dcc28 1aae946
Author: Caleb Rackliffe 
AuthorDate: Mon Oct 4 15:14:46 2021 -0500

Merge branch 'cassandra-4.0' into trunk

 .../cassandra/db/commitlog/AbstractCommitLogSegmentManager.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.0' into trunk

[ifesdjeen]

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

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

commit 72722e521f5d22fc630f76f6b43e1216597c841a
Merge: 0945002 0108061
Author: Alex Petrov 
AuthorDate: Fri Oct 1 18:14:59 2021 +0200

Merge branch 'cassandra-4.0' into trunk

 .../org/apache/cassandra/cql3/CQLStatement.java|   5 +
 .../org/apache/cassandra/cql3/QueryProcessor.java  |  58 -
 .../cql3/statements/ModificationStatement.java |   3 +-
 .../cassandra/cql3/statements/SelectStatement.java |   3 +-
 .../cassandra/cql3/statements/UseStatement.java|   5 +
 .../statements/schema/AlterSchemaStatement.java|   8 +-
 src/java/org/apache/cassandra/gms/Gossiper.java| 105 +++-
 .../gms/IEndpointStateChangeSubscriber.java|  14 +-
 .../net/StartupClusterConnectivityChecker.java |  24 --
 .../org/apache/cassandra/repair/RepairSession.java |   6 -
 .../apache/cassandra/service/LoadBroadcaster.java  |   8 -
 .../apache/cassandra/streaming/StreamSession.java  |   6 -
 .../cassandra/utils/RecomputingSupplier.java   | 122 +
 .../distributed/test/GossipShutdownTest.java   |   7 -
 .../distributed/test/NativeProtocolTest.java   |  14 +-
 .../test/ReprepareNewBehaviourTest.java|  38 +++
 .../distributed/test/ReprepareTestBase.java| 281 +
 .../test/ReprepareTestOldBehaviour.java| 129 ++
 .../cassandra/cql3/PreparedStatementsTest.java |   4 +-
 .../cassandra/cql3/PstmtPersistenceTest.java   |  36 +--
 .../apache/cassandra/metrics/CQLMetricsTest.java   |   5 +-
 .../cassandra/utils/RecomputingSupplierTest.java   | 150 +++
 22 files changed, 941 insertions(+), 90 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.0' into trunk

[brandonwilliams]

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

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

commit 0945002457738f4c256bc6a262a8d8aaadcdf392
Merge: bcdb575 b22749b
Author: Brandon Williams 
AuthorDate: Fri Oct 1 10:02:40 2021 -0500

Merge branch 'cassandra-4.0' into trunk

 pylib/requirements.txt | 1 -
 1 file changed, 1 deletion(-)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org