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 <[email protected]>
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-16666)
 + * 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:
+  * Update ant-junit to version 1.10.12 (CASSANDRA-17218)
   * Add droppable tombstone metrics to nodetool tablestats (CASSANDRA-16308)
   * Fix disk failure triggered when enabling FQL on an unclean directory 
(CASSANDRA-17136)
   * Fixed broken classpath when multiple jars in build directory 
(CASSANDRA-17129)
diff --cc build.xml
index 54fa104,9ea71f7..3165fd8
--- a/build.xml
+++ b/build.xml
@@@ -725,23 -715,16 +725,23 @@@
                  artifactId="cassandra-parent"
                  version="${version}"
                  relativePath="${final.name}-parent.pom"/>
 -        <dependency groupId="junit" artifactId="junit"/>
 -        <dependency groupId="commons-io" artifactId="commons-io"/>
 -        <dependency groupId="org.mockito" artifactId="mockito-core"/>
 -        <dependency groupId="org.quicktheories" artifactId="quicktheories"/>
 -        <dependency groupId="org.reflections" artifactId="reflections"/>
 -        <dependency groupId="com.google.code.java-allocation-instrumenter" 
artifactId="java-allocation-instrumenter" 
version="${allocation-instrumenter.version}"/>
 -        <dependency groupId="org.apache.cassandra" artifactId="dtest-api"/>
 -        <dependency groupId="org.openjdk.jmh" artifactId="jmh-core"/>
 -        <dependency groupId="org.openjdk.jmh" 
artifactId="jmh-generator-annprocess"/>
 -        <dependency groupId="org.apache.ant" artifactId="ant-junit"/>
 +        <dependency groupId="junit" artifactId="junit" scope="test"/>
 +        <dependency groupId="commons-io" artifactId="commons-io" 
scope="test"/>
 +        <dependency groupId="org.mockito" artifactId="mockito-core" 
scope="test"/>
 +        <dependency groupId="org.ow2.asm" artifactId="asm" 
version="${asm.version}"/>
 +        <dependency groupId="org.ow2.asm" artifactId="asm-tree" 
version="${asm.version}" scope="test"/>
 +        <dependency groupId="org.ow2.asm" artifactId="asm-commons" 
version="${asm.version}" scope="test"/>
 +        <dependency groupId="org.ow2.asm" artifactId="asm-util" 
version="${asm.version}" scope="test"/>
 +        <dependency groupId="com.google.jimfs" artifactId="jimfs" 
version="1.1" scope="test"/>
 +        <dependency groupId="com.puppycrawl.tools" artifactId="checkstyle" 
scope="test"/>
 +        <dependency groupId="org.quicktheories" artifactId="quicktheories" 
scope="test"/>
 +        <dependency groupId="org.reflections" artifactId="reflections" 
scope="test"/>
 +        <dependency groupId="com.google.code.java-allocation-instrumenter" 
artifactId="java-allocation-instrumenter" 
version="${allocation-instrumenter.version}" scope="test"/>
 +        <dependency groupId="org.apache.cassandra" artifactId="dtest-api" 
scope="test"/>
 +        <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" 
scope="test"/>
 +        <dependency groupId="org.openjdk.jmh" 
artifactId="jmh-generator-annprocess" scope="test"/>
 +        <dependency groupId="net.ju-n.compile-command-annotations" 
artifactId="compile-command-annotations" scope="test"/>
-         <dependency groupId="org.apache.ant" artifactId="ant-junit" 
version="1.9.7" scope="test"/>
++        <dependency groupId="org.apache.ant" artifactId="ant-junit" 
scope="test"/>
          <!-- adding this dependency is necessary for assertj. When updating 
assertj, need to also update the version of
               this that the new assertj's `assertj-parent-pom` depends on. -->
          <dependency groupId="org.junit" artifactId="junit-bom" type="pom"/>

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

Reply via email to