[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit fe9ad77fd7842f69a03c7991b96274a7fdb3e90f Merge: 087e92724e b94436c783 Author: Stefan Miklosovic AuthorDate: Wed Aug 2 18:36:36 2023 +0200 Merge branch 'cassandra-4.1' into trunk src/java/org/apache/cassandra/config/Config.java | 2 +- .../org/apache/cassandra/config/Converters.java| 1 + test/data/config/version=3.0.0-alpha1.yml | 3 + test/data/config/version=4.0-alpha1.yml| 3 + test/data/config/version=4.1-alpha1.yml| 424 + ...e.java => ConfigCompatibilityTestGenerate.java} | 12 +- ...ilityTest.java => ConfigCompatibilityTest.java} | 19 +- 7 files changed, 452 insertions(+), 12 deletions(-) diff --cc src/java/org/apache/cassandra/config/Config.java index 34a173c8c6,8a59ca2cda..831bf93cfc --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@@ -876,16 -837,6 +876,16 @@@ public class Confi public volatile boolean compact_tables_enabled = true; public volatile boolean read_before_write_list_operations_enabled = true; public volatile boolean allow_filtering_enabled = true; +public volatile boolean simplestrategy_enabled = true; +@Replaces(oldName = "compaction_large_partition_warning_threshold_mb", converter = Converters.LONG_BYTES_DATASTORAGE_MEBIBYTES_INT, deprecated = true) +@Replaces(oldName = "compaction_large_partition_warning_threshold", converter = Converters.LONG_BYTES_DATASTORAGE_MEBIBYTES_DATASTORAGE, deprecated = true) +public volatile DataStorageSpec.LongBytesBound partition_size_warn_threshold = null; +public volatile DataStorageSpec.LongBytesBound partition_size_fail_threshold = null; - @Replaces(oldName = "compaction_tombstone_warning_threshold", converter = Converters.IDENTITY, deprecated = true) ++@Replaces(oldName = "compaction_tombstone_warning_threshold", converter = Converters.INTEGER_PRIMITIVE_LONG, deprecated = true) +public volatile long partition_tombstones_warn_threshold = -1; +public volatile long partition_tombstones_fail_threshold = -1; +public volatile DataStorageSpec.LongBytesBound column_value_size_warn_threshold = null; +public volatile DataStorageSpec.LongBytesBound column_value_size_fail_threshold = null; public volatile DataStorageSpec.LongBytesBound collection_size_warn_threshold = null; public volatile DataStorageSpec.LongBytesBound collection_size_fail_threshold = null; public volatile int items_per_collection_warn_threshold = -1; diff --cc src/java/org/apache/cassandra/config/Converters.java index 74ff7a2476,c898c08d64..c3983652e6 --- a/src/java/org/apache/cassandra/config/Converters.java +++ b/src/java/org/apache/cassandra/config/Converters.java @@@ -42,6 -40,6 +42,7 @@@ public enum Converter * able to still use the old name too. No units involved. */ IDENTITY(null, null, o -> o, o -> o), ++INTEGER_PRIMITIVE_LONG(Integer.class, long.class, Integer::longValue, Long::intValue), MILLIS_DURATION_LONG(Long.class, DurationSpec.LongMillisecondsBound.class, DurationSpec.LongMillisecondsBound::new, o -> o == null ? null : o.toMilliseconds()), diff --cc test/data/config/version=4.1-alpha1.yml index 00,00..1b53159afc new file mode 100644 --- /dev/null +++ b/test/data/config/version=4.1-alpha1.yml @@@ -1,0 -1,0 +1,424 @@@ ++--- ++columns_per_table_warn_threshold: "java.lang.Integer" ++repaired_data_tracking_for_range_reads_enabled: "java.lang.Boolean" ++cdc_block_writes: "java.lang.Boolean" ++block_for_peers_timeout_in_secs: "java.lang.Integer" ++flush_compression: "org.apache.cassandra.config.Config.FlushCompression" ++commitlog_total_space: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound" ++audit_logging_options: ++ audit_logs_dir: "java.lang.String" ++ included_users: "java.lang.String" ++ logger: ++class_name: "java.lang.String" ++parameters: "java.util.Map" ++ excluded_categories: "java.lang.String" ++ roll_cycle: "java.lang.String" ++ enabled: "java.lang.Boolean" ++ included_categories: "java.lang.String" ++ max_archive_retries: "java.lang.Integer" ++ excluded_keyspaces: "java.lang.String" ++ archive_command: "java.lang.String" ++ included_keyspaces: "java.lang.String" ++ max_log_size: "java.lang.Long" ++ allow_nodetool_archive_command: "java.lang.Boolean" ++ block: "java.lang.Boolean" ++ excluded_users: "java.lang.String" ++ max_queue_weight: "java.lang.Integer" ++row_cache_save_period: "org.apache.cassandra.config.DurationSpec.IntSecondsBound" ++snapshot_links_per_second: "java.lang.Long" ++disk_optimization_estimate_percentile: "java.lang.Double" ++roles_update_interval:
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 087e92724e5ca01fe740c039bb235fbb121043be Merge: 09d9067121 2f0adfac2b Author: Brandon Williams AuthorDate: Wed Aug 2 10:46:59 2023 -0500 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 7665f7bca8,6bb86a057a..4f1749eb25 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,186 -1,7 +1,187 @@@ -4.1.4 +5.0 + * Fix for (unsupported) big endian unaligned architecture, eg s390x (CASSANDRA-17723) + * CIDR filtering authorizer (CASSANDRA-18592) + * Remove 3.x from the versions checked for prepared statement behaviour (CASSANDRA-18695) + * Add vector similarity functions (CASSANDRA-18640) + * Lift MessagingService.minimum_version to 40 (CASSANDRA-18314) + * Introduce pluggable crypto providers and default to AmazonCorrettoCryptoProvider (CASSANDRA-18624) + * Improved DeletionTime serialization (CASSANDRA-18648) + * CEP-7: Storage Attached Indexes (CASSANDRA-16052) + * Add equals/hashCode override for ServerEncryptionOptions (CASSANDRA-18428) + * Upgrade ECJ to version 3.33.0 (CASSANDRA-18190) + * Fix ClassCastException from jdk GaloisCounterMode when using JDK17 provider (CASSANDRA-18180) + * Drop JDK8, add JDK17 (CASSANDRA-18255) + * Remove WaitingOnFreeMemtableSpace and DroppedMutations metrics (CASSANDRA-18298) + * Upgrade Jamm version to 0.4.0 (CASSANDRA-17884, CASSANDRA-16304, CASSANDRA-18329) + * Remove legacy 3.0/3.11 buffer pool metrics (CASSANDRA-18313) + * Add AzureSnitch (CASSANDRA-18646) + * Implementation of the Unified Compaction Strategy as described in CEP-26 (CASSANDRA-18397) + * Upgrade commons cli to 1.5.0 (CASSANDRA-18659) + * Disable the deprecated keyspace/table thresholds and convert them to guardrails (CASSANDRA-18617) + * Deprecate CloudstackSnitch and remove duplicate code in snitches (CASSANDRA-18438) + * Add support for vectors in UDFs (CASSANDRA-18613) + * Improve vector value validation errors (CASSANDRA-18652) + * Upgrade Guava to 32.0.1 (CASSANDRA-18645) + * Add duration and count of partition keys to sstablemetadata (CASSANDRA-18639) + * Remove deprecated compaction_tombstone_warning_threshold and compaction_large_partition_warning_threshold from yaml (CASSANDRA-18626) + * Enhance nodetool compactionstats with additional metrics (CASSANDRA-18305) + * Added support for type VECTOR (CASSANDRA-18504) + * Expose bootstrap and decommission state to nodetool info (CASSANDRA-18555) + * Fix SSTabledump errors when dumping data from index (CASSANDRA-17698) + * Avoid unnecessary deserialization of terminal arguments when executing CQL functions (CASSANDRA-18566) + * Remove dependency on pytz library for setting CQLSH timezones on Python version >= 3.9 (CASSANDRA-17433) + * Extend maximum expiration date (CASSANDRA-14227) + * Add guardrail for partition tombstones and deprecate compaction_tombstone_warning_threshold (CASSANDRA-17194) + * Print header and statistics for cassandra-stress output with arbitrary frequency (CASSANDRA-12972) + * CEP-25: Trie-indexed SSTable format (CASSANDRA-18398) + * Make cassandra-stress able to read all credentials from a file (CASSANDRA-18544) + * Add guardrail for partition size and deprecate compaction_large_partition_warning_threshold (CASSANDRA-18500) + * Add HISTORY command for CQLSH (CASSANDRA-15046) + * Fix sstable formats configuration (CASSANDRA-18441) + * Add guardrail to bound timestamps (CASSANDRA-18352) + * Add keyspace_name column to system_views.clients (CASSANDRA-18525) + * Moved system properties and envs to CassandraRelevantProperties and CassandraRelevantEnv respectively (CASSANDRA-17797) + * Add sstablepartitions offline tool to find large partitions in sstables (CASSANDRA-8720) + * Replace usages of json-simple dependency by Jackson (CASSANDRA-16855) + * When decommissioning should set Severity to limit traffic (CASSANDRA-18430) + * For Java11 and Java17 remove -XX:-UseBiasedLocking as it is the default already (CASSANDRA-17869) + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
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 09d906712124420d74a14494a23fc2b3ac710591 Merge: 1c7e7db2d0 9c796dfb27 Author: Yifan Cai AuthorDate: Tue Aug 1 13:18:06 2023 -0700 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 2 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../db/ColumnFamilyStoreClientModeTest.java| 95 ++ 3 files changed, 98 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index cc40181f4c,5ce92be10e..7665f7bca8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,183 -1,5 +1,185 @@@ -4.1.4 +5.0 + * Fix for (unsupported) big endian unaligned architecture, eg s390x (CASSANDRA-17723) + * CIDR filtering authorizer (CASSANDRA-18592) + * Remove 3.x from the versions checked for prepared statement behaviour (CASSANDRA-18695) + * Add vector similarity functions (CASSANDRA-18640) + * Lift MessagingService.minimum_version to 40 (CASSANDRA-18314) + * Introduce pluggable crypto providers and default to AmazonCorrettoCryptoProvider (CASSANDRA-18624) + * Improved DeletionTime serialization (CASSANDRA-18648) + * CEP-7: Storage Attached Indexes (CASSANDRA-16052) + * Add equals/hashCode override for ServerEncryptionOptions (CASSANDRA-18428) + * Upgrade ECJ to version 3.33.0 (CASSANDRA-18190) + * Fix ClassCastException from jdk GaloisCounterMode when using JDK17 provider (CASSANDRA-18180) + * Drop JDK8, add JDK17 (CASSANDRA-18255) + * Remove WaitingOnFreeMemtableSpace and DroppedMutations metrics (CASSANDRA-18298) + * Upgrade Jamm version to 0.4.0 (CASSANDRA-17884, CASSANDRA-16304, CASSANDRA-18329) + * Remove legacy 3.0/3.11 buffer pool metrics (CASSANDRA-18313) + * Add AzureSnitch (CASSANDRA-18646) + * Implementation of the Unified Compaction Strategy as described in CEP-26 (CASSANDRA-18397) + * Upgrade commons cli to 1.5.0 (CASSANDRA-18659) + * Disable the deprecated keyspace/table thresholds and convert them to guardrails (CASSANDRA-18617) + * Deprecate CloudstackSnitch and remove duplicate code in snitches (CASSANDRA-18438) + * Add support for vectors in UDFs (CASSANDRA-18613) + * Improve vector value validation errors (CASSANDRA-18652) + * Upgrade Guava to 32.0.1 (CASSANDRA-18645) + * Add duration and count of partition keys to sstablemetadata (CASSANDRA-18639) + * Remove deprecated compaction_tombstone_warning_threshold and compaction_large_partition_warning_threshold from yaml (CASSANDRA-18626) + * Enhance nodetool compactionstats with additional metrics (CASSANDRA-18305) + * Added support for type VECTOR (CASSANDRA-18504) + * Expose bootstrap and decommission state to nodetool info (CASSANDRA-18555) + * Fix SSTabledump errors when dumping data from index (CASSANDRA-17698) + * Avoid unnecessary deserialization of terminal arguments when executing CQL functions (CASSANDRA-18566) + * Remove dependency on pytz library for setting CQLSH timezones on Python version >= 3.9 (CASSANDRA-17433) + * Extend maximum expiration date (CASSANDRA-14227) + * Add guardrail for partition tombstones and deprecate compaction_tombstone_warning_threshold (CASSANDRA-17194) + * Print header and statistics for cassandra-stress output with arbitrary frequency (CASSANDRA-12972) + * CEP-25: Trie-indexed SSTable format (CASSANDRA-18398) + * Make cassandra-stress able to read all credentials from a file (CASSANDRA-18544) + * Add guardrail for partition size and deprecate compaction_large_partition_warning_threshold (CASSANDRA-18500) + * Add HISTORY command for CQLSH (CASSANDRA-15046) + * Fix sstable formats configuration (CASSANDRA-18441) + * Add guardrail to bound timestamps (CASSANDRA-18352) + * Add keyspace_name column to system_views.clients (CASSANDRA-18525) + * Moved system properties and envs to CassandraRelevantProperties and CassandraRelevantEnv respectively (CASSANDRA-17797) + * Add sstablepartitions offline tool to find large partitions in sstables (CASSANDRA-8720) + * Replace usages of json-simple dependency by Jackson (CASSANDRA-16855) + * When decommissioning should set Severity to limit traffic (CASSANDRA-18430) + * For Java11 and Java17 remove -XX:-UseBiasedLocking as it is the default already (CASSANDRA-17869) + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads)
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 57269bbbc15d509e076343decadd101b1feaceb6 Merge: cdefe1e8f9 fb7e4e7c48 Author: Ekaterina Dimitrova AuthorDate: Tue Aug 1 14:00:49 2023 -0400 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit e24e591753f0edcee856ae8d3df6422794007e72 Merge: 98680e8708 a3e7558ebb Author: Ekaterina Dimitrova AuthorDate: Fri Jul 28 15:17:04 2023 -0400 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c2d42500a88d9cb0c707b86e78f1de412203ba35 Merge: 5a82c04fd3 778f9f3ed5 Author: Stefan Miklosovic AuthorDate: Fri Jul 28 17:12:10 2023 +0200 Merge branch 'cassandra-4.1' into trunk .build/cassandra-build-deps-template.xml | 4 .build/cassandra-deps-template.xml | 4 .build/parent-pom-template.xml | 2 +- src/java/org/apache/cassandra/hints/Hint.java| 2 +- src/java/org/apache/cassandra/net/BufferPoolAllocator.java | 3 ++- src/java/org/apache/cassandra/service/reads/range/RangeCommands.java | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --cc .build/cassandra-build-deps-template.xml index 7ccfc9062f,00..357325f8be mode 100644,00..100644 --- a/.build/cassandra-build-deps-template.xml +++ b/.build/cassandra-build-deps-template.xml @@@ -1,143 -1,0 +1,147 @@@ + + +http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns="http://maven.apache.org/POM/4.0.0; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;> + 4.0.0 + +cassandra-parent +org.apache.cassandra +@version@ +@final.n...@-parent.pom + + org.apache.cassandra + cassandra-build-deps + @version@ + ++ ++ org.assertj ++ assertj-core ++ + + junit + junit + + + commons-io + commons-io + + + org.mockito + mockito-core + + + org.mockito + mockito-inline + + + org.ow2.asm + asm + + + org.ow2.asm + asm-tree + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-util + + + com.google.jimfs + jimfs + + + com.puppycrawl.tools + checkstyle + + + org.quicktheories + quicktheories + + + org.reflections + reflections + + + com.google.code.java-allocation-instrumenter + java-allocation-instrumenter + + + org.apache.cassandra + dtest-api + + + org.openjdk.jmh + jmh-core + + + org.openjdk.jmh + jmh-generator-annprocess + + + net.ju-n.compile-command-annotations + compile-command-annotations + + + org.apache.ant + ant-junit + + + org.apache.cassandra + harry-core + + + org.junit + junit-bom + pom + + + org.awaitility + awaitility + + + org.hamcrest + hamcrest + + + org.jacoco + org.jacoco.agent + + + org.jacoco + org.jacoco.ant + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + com.github.tomakehurst + wiremock-jre8 + + + de.jflex + jflex + + + com.carrotsearch.randomizedtesting + randomizedtesting-runner + + + diff --cc .build/cassandra-deps-template.xml index 5e3ebc0e58,00..85e6609b69 mode 100644,00..100644 --- a/.build/cassandra-deps-template.xml +++ b/.build/cassandra-deps-template.xml @@@ -1,380 -1,0 +1,376 @@@ + + +http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns="http://maven.apache.org/POM/4.0.0; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;> + 4.0.0 + +cassandra-parent +org.apache.cassandra +@version@ +@final.n...@-parent.pom + + org.apache.cassandra + cassandra-all + @version@ + Apache Cassandra + The Apache Cassandra Project develops a highly scalable second-generation distributed database, bringing together Dynamo's fully distributed design and Bigtable's ColumnFamily-based data model. + https://cassandra.apache.org + 2009 + + + The Apache Software License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + scm:https://gitbox.apache.org/repos/asf/cassandra.git + scm:https://gitbox.apache.org/repos/asf/cassandra.git +https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree + + + + org.xerial.snappy + snappy-java + + + org.lz4 + lz4-java + + + com.ning + compress-lzf + + + com.google.guava + guava + + + commons-cli + commons-cli + + + commons-codec + commons-codec + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-math3 + + + org.antlr + antlr + + + org.antlr +
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c6cb1cd2455f7237f8081ba2cfd6e2df01676378 Merge: 738dfde735 efba69dbe1 Author: Jacek Lewandowski AuthorDate: Thu Jul 27 11:25:55 2023 +0200 Merge branch 'cassandra-4.1' into trunk ide/idea-iml-file.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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ac26b44f9db71a5125f3ce8384203fbe0568ff9d Merge: b61bd93e57 4a46992724 Author: Stefan Miklosovic AuthorDate: Tue Jul 25 10:02:27 2023 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + pylib/README.asc| 6 +- pylib/cqlshlib/cqlshmain.py | 188 pylib/cqlshlib/test/basecase.py | 2 +- 4 files changed, 103 insertions(+), 94 deletions(-) diff --cc CHANGES.txt index 8f45c74136,afb333441a..65b945a9ee --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,175 -1,6 +1,176 @@@ +5.0 + * Upgrade ECJ to version 3.33.0 (CASSANDRA-18190) + * Fix ClassCastException from jdk GaloisCounterMode when using JDK17 provider (CASSANDRA-18180) + * Drop JDK8, add JDK17 (CASSANDRA-18255) + * Remove WaitingOnFreeMemtableSpace and DroppedMutations metrics (CASSANDRA-18298) + * Upgrade Jamm version to 0.4.0 (CASSANDRA-17884, CASSANDRA-16304, CASSANDRA-18329) + * Remove legacy 3.0/3.11 buffer pool metrics (CASSANDRA-18313) + * Add AzureSnitch (CASSANDRA-18646) + * Implementation of the Unified Compaction Strategy as described in CEP-26 (CASSANDRA-18397) + * Upgrade commons cli to 1.5.0 (CASSANDRA-18659) + * Disable the deprecated keyspace/table thresholds and convert them to guardrails (CASSANDRA-18617) + * Deprecate CloudstackSnitch and remove duplicate code in snitches (CASSANDRA-18438) + * Add support for vectors in UDFs (CASSANDRA-18613) + * Improve vector value validation errors (CASSANDRA-18652) + * Upgrade Guava to 32.0.1 (CASSANDRA-18645) + * Add duration and count of partition keys to sstablemetadata (CASSANDRA-18639) + * Remove deprecated compaction_tombstone_warning_threshold and compaction_large_partition_warning_threshold from yaml (CASSANDRA-18626) + * Enhance nodetool compactionstats with additional metrics (CASSANDRA-18305) + * Added support for type VECTOR (CASSANDRA-18504) + * Expose bootstrap and decommission state to nodetool info (CASSANDRA-18555) + * Fix SSTabledump errors when dumping data from index (CASSANDRA-17698) + * Avoid unnecessary deserialization of terminal arguments when executing CQL functions (CASSANDRA-18566) + * Remove dependency on pytz library for setting CQLSH timezones on Python version >= 3.9 (CASSANDRA-17433) + * Extend maximum expiration date (CASSANDRA-14227) + * Add guardrail for partition tombstones and deprecate compaction_tombstone_warning_threshold (CASSANDRA-17194) + * Print header and statistics for cassandra-stress output with arbitrary frequency (CASSANDRA-12972) + * CEP-25: Trie-indexed SSTable format (CASSANDRA-18398) + * Make cassandra-stress able to read all credentials from a file (CASSANDRA-18544) + * Add guardrail for partition size and deprecate compaction_large_partition_warning_threshold (CASSANDRA-18500) + * Add HISTORY command for CQLSH (CASSANDRA-15046) + * Fix sstable formats configuration (CASSANDRA-18441) + * Add guardrail to bound timestamps (CASSANDRA-18352) + * Add keyspace_name column to system_views.clients (CASSANDRA-18525) + * Moved system properties and envs to CassandraRelevantProperties and CassandraRelevantEnv respectively (CASSANDRA-17797) + * Add sstablepartitions offline tool to find large partitions in sstables (CASSANDRA-8720) + * Replace usages of json-simple dependency by Jackson (CASSANDRA-16855) + * When decommissioning should set Severity to limit traffic (CASSANDRA-18430) + * For Java11 and Java17 remove -XX:-UseBiasedLocking as it is the default already (CASSANDRA-17869) + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 08a9dd805e5c27de78950130133ed914da60b7d8 Merge: 8faa2a2c69 9bc0f89308 Author: Stefan Miklosovic AuthorDate: Mon Jul 24 13:33:44 2023 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 6 ++ 1 file changed, 6 insertions(+) diff --cc CHANGES.txt index 25c861080f,32d34e713f..ab2676fc5c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,171 -1,11 +1,177 @@@ +5.0 + * Remove WaitingOnFreeMemtableSpace and DroppedMutations metrics (CASSANDRA-18298) + * Upgrade Jamm version to 0.4.0 (CASSANDRA-17884, CASSANDRA-16304, CASSANDRA-18329) + * Remove legacy 3.0/3.11 buffer pool metrics (CASSANDRA-18313) + * Add AzureSnitch (CASSANDRA-18646) + * Implementation of the Unified Compaction Strategy as described in CEP-26 (CASSANDRA-18397) + * Upgrade commons cli to 1.5.0 (CASSANDRA-18659) + * Disable the deprecated keyspace/table thresholds and convert them to guardrails (CASSANDRA-18617) + * Deprecate CloudstackSnitch and remove duplicate code in snitches (CASSANDRA-18438) + * Add support for vectors in UDFs (CASSANDRA-18613) + * Improve vector value validation errors (CASSANDRA-18652) + * Upgrade Guava to 32.0.1 (CASSANDRA-18645) + * Add duration and count of partition keys to sstablemetadata (CASSANDRA-18639) + * Remove deprecated compaction_tombstone_warning_threshold and compaction_large_partition_warning_threshold from yaml (CASSANDRA-18626) + * Enhance nodetool compactionstats with additional metrics (CASSANDRA-18305) + * Added support for type VECTOR (CASSANDRA-18504) + * Expose bootstrap and decommission state to nodetool info (CASSANDRA-18555) + * Fix SSTabledump errors when dumping data from index (CASSANDRA-17698) + * Avoid unnecessary deserialization of terminal arguments when executing CQL functions (CASSANDRA-18566) + * Remove dependency on pytz library for setting CQLSH timezones on Python version >= 3.9 (CASSANDRA-17433) + * Extend maximum expiration date (CASSANDRA-14227) + * Add guardrail for partition tombstones and deprecate compaction_tombstone_warning_threshold (CASSANDRA-17194) + * Print header and statistics for cassandra-stress output with arbitrary frequency (CASSANDRA-12972) + * CEP-25: Trie-indexed SSTable format (CASSANDRA-18398) + * Make cassandra-stress able to read all credentials from a file (CASSANDRA-18544) + * Add guardrail for partition size and deprecate compaction_large_partition_warning_threshold (CASSANDRA-18500) + * Add HISTORY command for CQLSH (CASSANDRA-15046) + * Fix sstable formats configuration (CASSANDRA-18441) + * Add guardrail to bound timestamps (CASSANDRA-18352) + * Add keyspace_name column to system_views.clients (CASSANDRA-18525) + * Moved system properties and envs to CassandraRelevantProperties and CassandraRelevantEnv respectively (CASSANDRA-17797) + * Add sstablepartitions offline tool to find large partitions in sstables (CASSANDRA-8720) + * Replace usages of json-simple dependency by Jackson (CASSANDRA-16855) + * When decommissioning should set Severity to limit traffic (CASSANDRA-18430) + * For Java11 and Java17 remove -XX:-UseBiasedLocking as it is the default already (CASSANDRA-17869) + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 707da8c69fee48b52b25219fa3253760c8b5415f Merge: 00e5431d64 2a4cd36475 Author: Stefan Miklosovic AuthorDate: Wed Jul 19 15:55:04 2023 +0200 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b2f08da641ec30ddb316f876a34cda5340a1da23 Merge: d6b305421a 292e26842a Author: Stefan Miklosovic AuthorDate: Tue Jul 18 11:31:56 2023 +0200 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d6b305421ad7cbb28ce35f7994f79cefc3937464 Merge: aac070681b 7524ed5bfe Author: Brandon Williams AuthorDate: Mon Jul 17 11:34:29 2023 -0500 Merge branch 'cassandra-4.1' into trunk build.xml | 3 +++ 1 file changed, 3 insertions(+) diff --cc build.xml index d69e192ae1,d2d5974cd6..b217781a2e --- a/build.xml +++ b/build.xml @@@ -1845,6 -2124,9 +1845,9 @@@ - ++ + + - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6f486f584737fb06f80f32844603e5c68f0a7f06 Merge: 0910901d7b 2af60dced2 Author: Bereng AuthorDate: Fri Jul 14 08:21:42 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Test failure: org.apache.cassandra.distributed.test.ByteBuddyExamplesTest.countTest .../cassandra/distributed/test/ByteBuddyExamplesTest.java | 13 ++--- 1 file changed, 10 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 0910901d7b94ec56d864c4e99b84cd9555063711 Merge: f038059e89 17afd5e6be Author: Jacek Lewandowski AuthorDate: Thu Jul 13 15:33:12 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Moved jflex from runtime to build dependencies .build/cassandra-build-deps-template.xml | 4 .build/cassandra-deps-template.xml | 4 CHANGES.txt | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --cc .build/cassandra-build-deps-template.xml index b5db6846da,00..6c6eb78fd2 mode 100644,00..100644 --- a/.build/cassandra-build-deps-template.xml +++ b/.build/cassandra-build-deps-template.xml @@@ -1,131 -1,0 +1,135 @@@ + + +http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns="http://maven.apache.org/POM/4.0.0; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;> + 4.0.0 + +cassandra-parent +org.apache.cassandra +@version@ +@final.n...@-parent.pom + + org.apache.cassandra + cassandra-build-deps + @version@ + + + junit + junit + + + commons-io + commons-io + + + org.mockito + mockito-core + + + org.mockito + mockito-inline + + + org.ow2.asm + asm + + + org.ow2.asm + asm-tree + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-util + + + com.google.jimfs + jimfs + + + org.quicktheories + quicktheories + + + org.reflections + reflections + + + com.google.code.java-allocation-instrumenter + java-allocation-instrumenter + + + org.apache.cassandra + dtest-api + + + org.openjdk.jmh + jmh-core + + + org.openjdk.jmh + jmh-generator-annprocess + + + net.ju-n.compile-command-annotations + compile-command-annotations + + + org.apache.ant + ant-junit + + + org.apache.cassandra + harry-core + + + org.junit + junit-bom + pom + + + org.awaitility + awaitility + + + org.hamcrest + hamcrest + + + org.jacoco + org.jacoco.agent + + + org.jacoco + org.jacoco.ant + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + com.github.tomakehurst + wiremock-jre8 + ++ ++ de.jflex ++ jflex ++ + + diff --cc .build/cassandra-deps-template.xml index e907bffa82,00..4041a54195 mode 100644,00..100644 --- a/.build/cassandra-deps-template.xml +++ b/.build/cassandra-deps-template.xml @@@ -1,380 -1,0 +1,376 @@@ + + +http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns="http://maven.apache.org/POM/4.0.0; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;> + 4.0.0 + +cassandra-parent +org.apache.cassandra +@version@ +@final.n...@-parent.pom + + org.apache.cassandra + cassandra-all + @version@ + Apache Cassandra + The Apache Cassandra Project develops a highly scalable second-generation distributed database, bringing together Dynamo's fully distributed design and Bigtable's ColumnFamily-based data model. + https://cassandra.apache.org + 2009 + + + The Apache Software License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + scm:https://gitbox.apache.org/repos/asf/cassandra.git + scm:https://gitbox.apache.org/repos/asf/cassandra.git +https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree + + + + org.xerial.snappy + snappy-java + + + org.lz4 + lz4-java + + + com.ning + compress-lzf + + + com.google.guava + guava + + + commons-cli + commons-cli + + + commons-codec + commons-codec + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-math3 + + + org.antlr + antlr + + + org.antlr + ST4 + + + org.antlr + antlr-runtime + + + org.slf4j + slf4j-api + + + org.slf4j + log4j-over-slf4j + + + org.slf4j + jcl-over-slf4j + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations +
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit bf11c9ae03c203b23cf222c8748ce213c2bc81f3 Merge: e1175aa6dc d320cef8f9 Author: Stefan Miklosovic AuthorDate: Wed Jul 12 12:21:57 2023 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/functions/CastFcts.java | 5 - test/unit/org/apache/cassandra/cql3/functions/CastFctsTest.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit e1175aa6dc3f7863fde7dea0c6096116415091a7 Merge: c95e5a5567 461987627b Author: Brandon Williams AuthorDate: Mon Jul 10 10:05:33 2023 -0500 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/EndpointState.java| 5 - src/java/org/apache/cassandra/gms/Gossiper.java | 17 - .../cassandra/locator/ReconnectableSnitchHelper.java| 8 ++-- src/java/org/apache/cassandra/net/MessagingService.java | 7 --- .../cassandra/net/OutboundConnectionSettings.java | 4 ++-- 6 files changed, 5 insertions(+), 37 deletions(-) diff --cc CHANGES.txt index e3c591378b,eaf53682b8..adaa51f6a2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,163 -1,7 +1,164 @@@ -4.1.3 +5.0 + * Improve vector value validation errors (CASSANDRA-18652) + * Upgrade Guava to 32.0.1 (CASSANDRA-18645) + * Add duration and count of partition keys to sstablemetadata (CASSANDRA-18639) + * Remove deprecated compaction_tombstone_warning_threshold and compaction_large_partition_warning_threshold from yaml (CASSANDRA-18626) + * Enhance nodetool compactionstats with additional metrics (CASSANDRA-18305) + * Added support for type VECTOR (CASSANDRA-18504) + * Expose bootstrap and decommission state to nodetool info (CASSANDRA-18555) + * Fix SSTabledump errors when dumping data from index (CASSANDRA-17698) + * Avoid unnecessary deserialization of terminal arguments when executing CQL functions (CASSANDRA-18566) + * Remove dependency on pytz library for setting CQLSH timezones on Python version >= 3.9 (CASSANDRA-17433) + * Extend maximum expiration date (CASSANDRA-14227) + * Add guardrail for partition tombstones and deprecate compaction_tombstone_warning_threshold (CASSANDRA-17194) + * Print header and statistics for cassandra-stress output with arbitrary frequency (CASSANDRA-12972) + * CEP-25: Trie-indexed SSTable format (CASSANDRA-18398) + * Make cassandra-stress able to read all credentials from a file (CASSANDRA-18544) + * Add guardrail for partition size and deprecate compaction_large_partition_warning_threshold (CASSANDRA-18500) + * Add HISTORY command for CQLSH (CASSANDRA-15046) + * Fix sstable formats configuration (CASSANDRA-18441) + * Add guardrail to bound timestamps (CASSANDRA-18352) + * Add keyspace_name column to system_views.clients (CASSANDRA-18525) + * Moved system properties and envs to CassandraRelevantProperties and CassandraRelevantEnv respectively (CASSANDRA-17797) + * Add sstablepartitions offline tool to find large partitions in sstables (CASSANDRA-8720) + * Replace usages of json-simple dependency by Jackson (CASSANDRA-16855) + * When decommissioning should set Severity to limit traffic (CASSANDRA-18430) + * For Java11 and Java17 remove -XX:-UseBiasedLocking as it is the default already (CASSANDRA-17869) + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c5ebc2243c0f67293e3cd9cb8735ed33d017fc19 Merge: 992ad25b96 2b2732450c Author: Brandon Williams AuthorDate: Fri Jul 7 10:48:25 2023 -0500 Merge branch 'cassandra-4.1' into trunk .build/build-owasp.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 8a955e70402a53363e705032bd90b385fea388e1 Merge: 087f75d3aa 78ad91313f Author: Brandon Williams AuthorDate: Thu Jul 6 10:07:35 2023 -0500 Merge branch 'cassandra-4.1' into trunk .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 1 + 2 files changed, 2 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 087f75d3aaf04b7986e24853ed7dd38632ddcad9 Merge: a75b35d791 cc09dd3e2b Author: Brandon Williams AuthorDate: Thu Jul 6 09:51:53 2023 -0500 Merge branch 'cassandra-4.1' into trunk .build/dependency-check-suppressions.xml | 6 ++ CHANGES.txt | 1 + 2 files changed, 7 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a75b35d7912f851208ede5c61d08b2e089cbed56 Merge: ac25943876 4a9fafb310 Author: Brandon Williams AuthorDate: Wed Jul 5 10:08:26 2023 -0500 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 5735a9ccaa3199c772eec4f9970d9bac64796039 Merge: c579faa488 d2ad51c2f6 Author: Stefan Miklosovic AuthorDate: Tue Jul 4 13:47:21 2023 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + .../cassandra/db/compaction/CompactionManager.java | 33 ++-- .../apache/cassandra/cql3/GcCompactionTest.java| 58 ++ 3 files changed, 78 insertions(+), 14 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit e4c55bf3c1c8a639f4cf1e3172ac60386e2425c0 Merge: ea5291c2ca c3327855e4 Author: Caleb Rackliffe AuthorDate: Wed Jun 28 14:30:14 2023 -0500 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Add a virtual table that exposes currently running queries - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ea5291c2ca2566c6d8ccbb37dab3280bf5f5c5bc
Merge: cf5d5fec6e a57f0396fa
Author: Stefan Miklosovic
AuthorDate: Wed Jun 28 16:34:56 2023 +0200
Merge branch 'cassandra-4.1' into trunk
.build/cassandra-build-deps-template.xml | 4 +
.build/parent-pom-template.xml | 6 +
CHANGES.txt| 1 +
NEWS.txt | 5 +
conf/cassandra-rackdc.properties | 6 +
.../AbstractCloudMetadataServiceConnector.java | 99 ++
.../locator/Ec2MetadataServiceConnector.java | 215 +
.../cassandra/locator/Ec2MultiRegionSnitch.java| 26 ++-
.../org/apache/cassandra/locator/Ec2Snitch.java| 66 +++
.../apache/cassandra/locator/SnitchProperties.java | 8 +
.../apache/cassandra/locator/Ec2ConnectorTest.java | 106 ++
.../{EC2SnitchTest.java => Ec2SnitchTest.java} | 155 +--
.../locator/Ec2V2ConnectorMockingTest.java | 169
13 files changed, 761 insertions(+), 105 deletions(-)
diff --cc .build/cassandra-build-deps-template.xml
index cbf2f8c59d,00..b5db6846da
mode 100644,00..100644
--- a/.build/cassandra-build-deps-template.xml
+++ b/.build/cassandra-build-deps-template.xml
@@@ -1,127 -1,0 +1,131 @@@
+
+
+http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
xmlns="http://maven.apache.org/POM/4.0.0;
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
+ 4.0.0
+
+cassandra-parent
+org.apache.cassandra
+@version@
+@final.n...@-parent.pom
+
+ org.apache.cassandra
+ cassandra-build-deps
+ @version@
+
+
+ junit
+ junit
+
+
+ commons-io
+ commons-io
+
+
+ org.mockito
+ mockito-core
+
+
+ org.mockito
+ mockito-inline
+
+
+ org.ow2.asm
+ asm
+
+
+ org.ow2.asm
+ asm-tree
+
+
+ org.ow2.asm
+ asm-commons
+
+
+ org.ow2.asm
+ asm-util
+
+
+ com.google.jimfs
+ jimfs
+
+
+ org.quicktheories
+ quicktheories
+
+
+ org.reflections
+ reflections
+
+
+ com.google.code.java-allocation-instrumenter
+ java-allocation-instrumenter
+
+
+ org.apache.cassandra
+ dtest-api
+
+
+ org.openjdk.jmh
+ jmh-core
+
+
+ org.openjdk.jmh
+ jmh-generator-annprocess
+
+
+ net.ju-n.compile-command-annotations
+ compile-command-annotations
+
+
+ org.apache.ant
+ ant-junit
+
+
+ org.apache.cassandra
+ harry-core
+
+
+ org.junit
+ junit-bom
+ pom
+
+
+ org.awaitility
+ awaitility
+
+
+ org.hamcrest
+ hamcrest
+
+
+ org.jacoco
+ org.jacoco.agent
+
+
+ org.jacoco
+ org.jacoco.ant
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-yaml
+
++
++ com.github.tomakehurst
++ wiremock-jre8
++
+
+
diff --cc .build/parent-pom-template.xml
index 9203d4ad89,00..a88764ee75
mode 100644,00..100644
--- a/.build/parent-pom-template.xml
+++ b/.build/parent-pom-template.xml
@@@ -1,1052 -1,0 +1,1058 @@@
+
+
+http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
xmlns="http://maven.apache.org/POM/4.0.0;
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
+ 4.0.0
+
+apache
+org.apache
+22
+
+ org.apache.cassandra
+ cassandra-parent
+ @version@
+ pom
+ Apache Cassandra
+ The Apache Cassandra Project develops a highly scalable
second-generation distributed database, bringing together Dynamo's fully
distributed design and Bigtable's ColumnFamily-based data model.
+ https://cassandra.apache.org
+ 2009
+
+
+ The Apache Software License, Version 2.0
+ https://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+
+1.12.13
+4.0.20
+0.5.1
+
+
+@asm.version@
+@jamm.version@
+
@allocation-instrumenter.version@
+@ecj.version@
+@jacoco.version@
+@jflex.version@
+
+
+
+ adelapena
+ Andres de la Peña
+
+
+ alakshman
+ Avinash Lakshman
+
+
+ aleksey
+ Aleksey Yeschenko
+
+
+ amorton
+ Aaron Morton
+
+
+ aweisberg
+ Ariel Weisberg
+
+
+ bdeggleston
+ Blake Eggleston
+
+
+ benedict
+ Benedict Elliott Smith
+
+
+ benjamin
+ Benjamin
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit cf5d5fec6e3da6bc72741546146c9a35d5951a06 Merge: eda0bcbefa e5aa88a138 Author: Brandon Williams AuthorDate: Wed Jun 28 06:06:22 2023 -0500 Merge branch 'cassandra-4.1' into trunk .build/dependency-check-suppressions.xml | 6 +- CHANGES.txt | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit eda0bcbefaf38e4069ac6db3a00937d778090083
Merge: 81026b95c4 0dd69ab854
Author: Stefan Miklosovic
AuthorDate: Mon Jun 26 14:15:45 2023 +0200
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt| 1 +
.../org/apache/cassandra/db/SystemKeyspace.java| 6 ++--
.../cassandra/db/compaction/CompactionTask.java| 6 ++--
.../db/compaction/CompactionTaskTest.java | 37 ++
4 files changed, 44 insertions(+), 6 deletions(-)
diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java
index 3c8690d657,a5baecefd4..5d81a151ab
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@@ -614,9 -620,9 +614,9 @@@ public final class SystemKeyspac
// don't write anything when the history table itself is compacted,
since that would in turn cause new compactions
if (ksname.equals("system") && cfname.equals(COMPACTION_HISTORY))
return;
-String req = "INSERT INTO system.%s (id, keyspace_name,
columnfamily_name, compacted_at, bytes_in, bytes_out, rows_merged) VALUES (?,
?, ?, ?, ?, ?, ?)";
+String req = "INSERT INTO system.%s (id, keyspace_name,
columnfamily_name, compacted_at, bytes_in, bytes_out, rows_merged,
compaction_properties) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
executeInternal(format(req, COMPACTION_HISTORY),
- nextTimeUUID(),
+ taskId,
ksname,
cfname,
ByteBufferUtil.bytes(compactedAt),
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index ed240c10ad,82139ced51..1f28ee07f2
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@@ -252,8 -248,7 +252,8 @@@ public class CompactionTask extends Abs
for (int i = 0; i < mergedRowCounts.length; i++)
totalSourceRows += mergedRowCounts[i] * (i + 1);
- String mergeSummary =
updateCompactionHistory(cfs.keyspace.getName(), cfs.getTableName(),
mergedRowCounts, startsize, endsize,
-String mergeSummary = updateCompactionHistory(taskId,
cfs.keyspace.getName(), cfs.getTableName(), mergedRowCounts, startsize,
endsize);
++String mergeSummary = updateCompactionHistory(taskId,
cfs.keyspace.getName(), cfs.getTableName(), mergedRowCounts, startsize, endsize,
+
ImmutableMap.of(COMPACTION_TYPE_PROPERTY, compactionType.type));
logger.info(String.format("Compacted (%s) %d sstables to [%s] to
level=%d. %s to %s (~%d%% of original) in %,dms. Read Throughput = %s, Write
Throughput = %s, Row Throughput = ~%,d/s. %,d total partitions merged to %,d.
Partition merge counts were {%s}. Time spent writing keys = %,dms",
taskId,
@@@ -292,7 -287,7 +292,7 @@@
return new DefaultCompactionWriter(cfs, directories, transaction,
nonExpiredSSTables, keepOriginals, getLevel());
}
- public static String updateCompactionHistory(String keyspaceName, String
columnFamilyName, long[] mergedRowCounts, long startSize, long endSize,
Map compactionProperties)
-public static String updateCompactionHistory(TimeUUID taskId, String
keyspaceName, String columnFamilyName, long[] mergedRowCounts, long startSize,
long endSize)
++public static String updateCompactionHistory(TimeUUID taskId, String
keyspaceName, String columnFamilyName, long[] mergedRowCounts, long startSize,
long endSize, Map compactionProperties)
{
StringBuilder mergeSummary = new StringBuilder(mergedRowCounts.length
* 10);
Map mergedRows = new HashMap<>();
@@@ -306,7 -301,7 +306,7 @@@
mergeSummary.append(String.format("%d:%d, ", rows, count));
mergedRows.put(rows, count);
}
- SystemKeyspace.updateCompactionHistory(keyspaceName,
columnFamilyName, currentTimeMillis(), startSize, endSize, mergedRows,
compactionProperties);
-SystemKeyspace.updateCompactionHistory(taskId, keyspaceName,
columnFamilyName, currentTimeMillis(), startSize, endSize, mergedRows);
++SystemKeyspace.updateCompactionHistory(taskId, keyspaceName,
columnFamilyName, currentTimeMillis(), startSize, endSize, mergedRows,
compactionProperties);
return mergeSummary.toString();
}
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 81026b95c4bdeeffd9b2eb4469ed4e1bcec84536 Merge: 9026f96234 41e62e6147 Author: Brandon Williams AuthorDate: Mon Jun 26 06:09:54 2023 -0500 Merge branch 'cassandra-4.1' into trunk .build/parent-pom-template.xml | 2 +- CHANGES.txt| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --cc .build/parent-pom-template.xml index e4b63bf3a8,00..9203d4ad89 mode 100644,00..100644 --- a/.build/parent-pom-template.xml +++ b/.build/parent-pom-template.xml @@@ -1,1052 -1,0 +1,1052 @@@ + + +http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns="http://maven.apache.org/POM/4.0.0; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;> + 4.0.0 + +apache +org.apache +22 + + org.apache.cassandra + cassandra-parent + @version@ + pom + Apache Cassandra + The Apache Cassandra Project develops a highly scalable second-generation distributed database, bringing together Dynamo's fully distributed design and Bigtable's ColumnFamily-based data model. + https://cassandra.apache.org + 2009 + + + The Apache Software License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + +1.12.13 +4.0.20 +0.5.1 + + +@asm.version@ +@jamm.version@ + @allocation-instrumenter.version@ +@ecj.version@ +@jacoco.version@ +@jflex.version@ + + + + adelapena + Andres de la Peña + + + alakshman + Avinash Lakshman + + + aleksey + Aleksey Yeschenko + + + amorton + Aaron Morton + + + aweisberg + Ariel Weisberg + + + bdeggleston + Blake Eggleston + + + benedict + Benedict Elliott Smith + + + benjamin + Benjamin Lerer + + + blambov + Branimir Lambov + + + brandonwilliams + Brandon Williams + + + carl + Carl Yeksigian + + + dbrosius + David Brosiusd + + + dikang + Dikang Gu + + + eevans + Eric Evans + + + edimitrova + Ekaterina Dimitrova + + + gdusbabek + Gary Dusbabek + + + goffinet + Chris Goffinet + + + ifesdjeen + Alex Petrov + + + jaakko + Laine Jaakko Olavi + + + jake + T Jake Luciani + + + jasonbrown + Jason Brown + + + jbellis + Jonathan Ellis + + + jfarrell + Jake Farrell + + + jjirsa + Jeff Jirsa + + + jkni + Joel Knighton + + + jmckenzie + Josh McKenzie + + + johan + Johan Oskarsson + + + junrao + Jun Rao + + + jzhuang + Jay Zhuang + + + kohlisankalp + Sankalp Kohli + + + marcuse + Marcus Eriksson + + + mck + Michael Semb Wever + + + mishail + Mikhail Stepura + + + mshuler + Michael Shuler + + + paulo + Paulo Motta + + + pmalik + Prashant Malik + + + rstupp + Robert Stupp + + + scode + Peter Schuller + + + beobal + Sam Tunnicliffe + + + slebresne + Sylvain Lebresne + + + stefania + Stefania Alborghetti + + + tylerhobbs + Tyler Hobbs + + + vijay + Vijay Parthasarathy + + + xedin + Pavel Yaskevich + + + yukim + Yuki Morishita + + + zznate + Nate McCall + + + + scm:https://gitbox.apache.org/repos/asf/cassandra.git + scm:https://gitbox.apache.org/repos/asf/cassandra.git +https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree + + + + + +org.xerial.snappy +snappy-java - 1.1.8.4 ++1.1.10.1 + + +org.lz4 +lz4-java +1.8.0 + + +com.ning +compress-lzf +0.8.4 +provided + + +com.github.luben +zstd-jni +1.5.5-1 + + +com.google.guava +guava +27.0-jre + + +jsr305 +com.google.code.findbugs + + +animal-sniffer-annotations +org.codehaus.mojo + + +listenablefuture +
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9026f962345e62bdaffd750f2684e120dd7c7ea8 Merge: 7998e22127 f7b952387a Author: Bereng AuthorDate: Mon Jun 26 10:09:40 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Move checkstyle files into .build checkstyle.xml => .build/checkstyle.xml | 0 .../checkstyle_suppressions.xml | 0 checkstyle_test.xml => .build/checkstyle_test.xml | 0 build.xml | 17 + 4 files changed, 9 insertions(+), 8 deletions(-) diff --cc build.xml index c58839e52a,2756baecd1..818761a30e --- a/build.xml +++ b/build.xml @@@ -37,17 -38,9 +37,18 @@@ https://gitbox.apache.org/repos/asf/cassandra.git"/> https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/> + + + + + @@@ -2101,8 -2400,7 +2102,8 @@@ - - - - + + + ++ - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit f11dcb069ef419f1b797e37bc755da31281bdcb5 Merge: b96e8d946c 868df97d78 Author: Brandon Williams AuthorDate: Wed Jun 21 18:00:26 2023 -0500 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b96e8d946c87c50eddd7dd689feed2ef1b353feb Merge: e2a6c99310 fb6dd1f61c Author: Brandon Williams AuthorDate: Wed Jun 21 06:27:08 2023 -0500 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6482d2ec89d1fc7d791a94966512eac24855174b Merge: cc3e742c73 579c724adf Author: Stefan Miklosovic AuthorDate: Mon Jun 19 17:15:45 2023 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + .../cassandra/cql3/statements/DescribeStatement.java| 2 +- .../org/apache/cassandra/schema/KeyspaceMetadata.java | 6 ++ .../cql3/statements/DescribeStatementTest.java | 17 + 4 files changed, 25 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 8014ca6f70,a0a3faaf6e..6437d2796d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,156 -1,6 +1,157 @@@ +5.0 + * Fix SSTabledump errors when dumping data from index (CASSANDRA-17698) + * Avoid unnecessary deserialization of terminal arguments when executing CQL functions (CASSANDRA-18566) + * Remove dependency on pytz library for setting CQLSH timezones on Python version >= 3.9 (CASSANDRA-17433) + * Extend maximum expiration date (CASSANDRA-14227) + * Add guardrail for partition tombstones and deprecate compaction_tombstone_warning_threshold (CASSANDRA-17194) + * Print header and statistics for cassandra-stress output with arbitrary frequency (CASSANDRA-12972) + * CEP-25: Trie-indexed SSTable format (CASSANDRA-18398) + * Make cassandra-stress able to read all credentials from a file (CASSANDRA-18544) + * Add guardrail for partition size and deprecate compaction_large_partition_warning_threshold (CASSANDRA-18500) + * Add HISTORY command for CQLSH (CASSANDRA-15046) + * Fix sstable formats configuration (CASSANDRA-18441) + * Add guardrail to bound timestamps (CASSANDRA-18352) + * Add keyspace_name column to system_views.clients (CASSANDRA-18525) + * Moved system properties and envs to CassandraRelevantProperties and CassandraRelevantEnv respectively (CASSANDRA-17797) + * Add sstablepartitions offline tool to find large partitions in sstables (CASSANDRA-8720) + * Replace usages of json-simple dependency by Jackson (CASSANDRA-16855) + * When decommissioning should set Severity to limit traffic (CASSANDRA-18430) + * For Java11 and Java17 remove -XX:-UseBiasedLocking as it is the default already (CASSANDRA-17869) + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c7260399d65dd84936a3ca85586b20a6b7ef009d
Merge: a55d4183f5 2b98d487d0
Author: Stefan Miklosovic
AuthorDate: Thu Jun 15 13:23:47 2023 +0200
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt| 1 +
.../config/CassandraRelevantProperties.java| 16 +++
src/java/org/apache/cassandra/gms/Gossiper.java| 55 +++---
3 files changed, 65 insertions(+), 7 deletions(-)
diff --cc src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
index 8eaaa7a9e0,23f9598964..fbb20766fa
--- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
+++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
@@@ -161,153 -120,77 +161,169 @@@ public enum CassandraRelevantPropertie
* This property indicates whether SSL client authentication is enabled -
com.sun.management.jmxremote.ssl.need.client.auth.
* Default is set to false.
*/
-COM_SUN_MANAGEMENT_JMXREMOTE_SSL_NEED_CLIENT_AUTH
("com.sun.management.jmxremote.ssl.need.client.auth"),
-
+
COM_SUN_MANAGEMENT_JMXREMOTE_SSL_NEED_CLIENT_AUTH("com.sun.management.jmxremote.ssl.need.client.auth"),
+/** Defaults to false for 4.1 but plan to switch to true in a later
release the thinking is that environments
+ * may not work right off the bat so safer to add this feature disabled
by default */
+
CONFIG_ALLOW_SYSTEM_PROPERTIES("cassandra.config.allow_system_properties"),
+CONFIG_LOADER("cassandra.config.loader"),
+CONSISTENT_DIRECTORY_LISTINGS("cassandra.consistent_directory_listings"),
+CONSISTENT_RANGE_MOVEMENT("cassandra.consistent.rangemovement", "true"),
+
CONSISTENT_SIMULTANEOUS_MOVES_ALLOW("cassandra.consistent.simultaneousmoves.allow"),
+
CUSTOM_GUARDRAILS_CONFIG_PROVIDER_CLASS("cassandra.custom_guardrails_config_provider_class"),
+CUSTOM_QUERY_HANDLER_CLASS("cassandra.custom_query_handler_class"),
+CUSTOM_TRACING_CLASS("cassandra.custom_tracing_class"),
+/** Controls the type of bufffer (heap/direct) used for shared scratch
buffers */
+DATA_OUTPUT_BUFFER_ALLOCATE_TYPE("cassandra.dob.allocate_type"),
+
DATA_OUTPUT_STREAM_PLUS_TEMP_BUFFER_SIZE("cassandra.data_output_stream_plus_temp_buffer_size",
"8192"),
+
DECAYING_ESTIMATED_HISTOGRAM_RESERVOIR_STRIPE_COUNT("cassandra.dehr_stripe_count",
"2"),
+
DEFAULT_PROVIDE_OVERLAPPING_TOMBSTONES("default.provide.overlapping.tombstones"),
+/** determinism properties for testing */
+
DETERMINISM_SSTABLE_COMPRESSION_DEFAULT("cassandra.sstable_compression_default",
"true"),
+DETERMINISM_UNSAFE_UUID_NODE("cassandra.unsafe.deterministicuuidnode"),
+
DIAGNOSTIC_SNAPSHOT_INTERVAL_NANOS("cassandra.diagnostic_snapshot_interval_nanos",
"600"),
+
DISABLE_AUTH_CACHES_REMOTE_CONFIGURATION("cassandra.disable_auth_caches_remote_configuration"),
+/** properties to disable certain behaviours for testing */
+
DISABLE_GOSSIP_ENDPOINT_REMOVAL("cassandra.gossip.disable_endpoint_removal"),
+DISABLE_PAXOS_AUTO_REPAIRS("cassandra.disable_paxos_auto_repairs"),
+DISABLE_PAXOS_STATE_FLUSH("cassandra.disable_paxos_state_flush"),
+DISABLE_SSTABLE_ACTIVITY_TRACKING("cassandra.sstable_activity_tracking",
"true"),
+DISABLE_STCS_IN_L0("cassandra.disable_stcs_in_l0"),
+DISABLE_TCACTIVE_OPENSSL("cassandra.disable_tcactive_openssl"),
+/** property for the rate of the scheduled task that monitors disk usage
*/
+
DISK_USAGE_MONITOR_INTERVAL_MS("cassandra.disk_usage.monitor_interval_ms",
convertToString(TimeUnit.SECONDS.toMillis(30))),
+/** property for the interval on which the repeated client warnings and
diagnostic events about disk usage are ignored */
+DISK_USAGE_NOTIFY_INTERVAL_MS("cassandra.disk_usage.notify_interval_ms",
convertToString(TimeUnit.MINUTES.toMillis(30))),
+DOB_DOUBLING_THRESHOLD_MB("cassandra.DOB_DOUBLING_THRESHOLD_MB", "64"),
+DOB_MAX_RECYCLE_BYTES("cassandra.dob_max_recycle_bytes",
convertToString(1024 * 1024)),
/**
- * This property indicates the location for the access file. If
com.sun.management.jmxremote.authenticate is false,
- * then this property and the password and access files, are ignored.
Otherwise, the access file must exist and
- * be in the valid format. If the access file is empty or nonexistent,
then no access is allowed.
+ * When draining, how long to wait for mutating executors to shutdown.
*/
-COM_SUN_MANAGEMENT_JMXREMOTE_ACCESS_FILE
("com.sun.management.jmxremote.access.file"),
-
-/** This property indicates the path to the password file -
com.sun.management.jmxremote.password.file */
-COM_SUN_MANAGEMENT_JMXREMOTE_PASSWORD_FILE
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a55d4183f507fab7b254a827af0ee6cc821c5674 Merge: 4f5cb2a6fa 622397e7e5 Author: Ekaterina Dimitrova AuthorDate: Wed Jun 14 14:09:32 2023 -0400 Merge branch 'cassandra-4.1' into trunk .../test/InternodeEncryptionOptionsTest.java | 19 +++ .../test/NativeTransportEncryptionOptionsTest.java| 17 ++--- 2 files changed, 29 insertions(+), 7 deletions(-) diff --cc test/distributed/org/apache/cassandra/distributed/test/NativeTransportEncryptionOptionsTest.java index 5f2caaf695,e5f1a2174a..c8e9de69f0 --- a/test/distributed/org/apache/cassandra/distributed/test/NativeTransportEncryptionOptionsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/NativeTransportEncryptionOptionsTest.java @@@ -18,25 -18,14 +18,26 @@@ package org.apache.cassandra.distributed.test; +import java.io.FileInputStream; +import java.io.InputStream; import java.net.InetAddress; +import java.security.KeyStore; import java.util.Collections; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.TrustManagerFactory; + + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import org.junit.Assert; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ExpectedException; +import com.datastax.driver.core.SSLOptions; +import com.datastax.driver.core.exceptions.NoHostAvailableException; +import com.datastax.shaded.netty.handler.ssl.SslContext; +import com.datastax.shaded.netty.handler.ssl.SslContextBuilder; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 4f5cb2a6fa287ab2d388c636655d6e764c648084
Merge: 1d961679a0 1f6b37d189
Author: Brandon Williams
AuthorDate: Wed Jun 14 11:36:02 2023 -0500
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt| 1 +
.../statements/schema/CreateTableStatement.java| 10 +++-
.../schema/CreateTableValidationTest.java | 59 ++
3 files changed, 68 insertions(+), 2 deletions(-)
diff --cc
src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java
index 45f23e9bfc,3799178747..6e93929d78
---
a/src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java
+++
b/src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java
@@@ -18,9 -18,8 +18,10 @@@
package org.apache.cassandra.cql3.statements.schema;
import java.util.*;
+ import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+
import com.google.common.collect.ImmutableSet;
import org.apache.commons.lang3.StringUtils;
@@@ -255,13 -244,18 +256,18 @@@ public final class CreateTableStatemen
clusteringColumns.forEach(column ->
{
-CQL3Type type = columns.remove(column);
+ColumnProperties columnProperties = columns.remove(column);
boolean reverse = !clusteringOrder.getOrDefault(column, true);
-clusteringTypes.add(reverse ?
ReversedType.getInstance(type.getType()) : type.getType());
+clusteringColumnProperties.add(reverse ?
columnProperties.withReversedType() : columnProperties);
});
- if (clusteringOrder.size() > clusteringColumns.size())
- throw ire("Only clustering columns can be defined in CLUSTERING
ORDER directive");
+ List nonClusterColumn =
clusteringOrder.keySet().stream()
+ .filter((id)
-> !clusteringColumns.contains(id))
+
.collect(Collectors.toList());
+ if (!nonClusterColumn.isEmpty())
+ {
+ throw ire("Only clustering key columns can be defined in
CLUSTERING ORDER directive: " + nonClusterColumn + " are not clustering
columns");
+ }
int n = 0;
for (ColumnIdentifier id : clusteringOrder.keySet())
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 43d90928a8cc0f83bba7eede051890981a65fc72 Merge: 41a669a100 b7c00d7d13 Author: Bereng AuthorDate: Wed Jun 14 10:15:02 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Slow builds due to checkstyle checkstyle.xml | 2 ++ checkstyle_test.xml | 2 ++ 2 files changed, 4 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ba3ad7487a165a7ca652eff28713e89e1397 Merge: dcb763ec2c b0cf9ba219 Author: Jacek Lewandowski AuthorDate: Mon Jun 12 11:26:03 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Track the amount of read data per row CHANGES.txt| 3 +- src/java/org/apache/cassandra/db/TypeSizes.java| 1 + .../cassandra/db/rows/UnfilteredSerializer.java| 9 +- .../cassandra/io/util/TrackedDataInputPlus.java| 62 -- .../db/rows/UnfilteredSerializerTest.java | 135 + 5 files changed, 195 insertions(+), 15 deletions(-) diff --cc CHANGES.txt index adea342a69,2fa8158637..b3af28ac01 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,154 -1,6 +1,155 @@@ +5.0 + * Remove dependency on pytz library for setting CQLSH timezones on Python version >= 3.9 (CASSANDRA-17433) + * Extend maximum expiration date (CASSANDRA-14227) + * Add guardrail for partition tombstones and deprecate compaction_tombstone_warning_threshold (CASSANDRA-17194) + * Print header and statistics for cassandra-stress output with arbitrary frequency (CASSANDRA-12972) + * CEP-25: Trie-indexed SSTable format (CASSANDRA-18398) + * Make cassandra-stress able to read all credentials from a file (CASSANDRA-18544) + * Add guardrail for partition size and deprecate compaction_large_partition_warning_threshold (CASSANDRA-18500) + * Add HISTORY command for CQLSH (CASSANDRA-15046) + * Fix sstable formats configuration (CASSANDRA-18441) + * Add guardrail to bound timestamps (CASSANDRA-18352) + * Add keyspace_name column to system_views.clients (CASSANDRA-18525) + * Moved system properties and envs to CassandraRelevantProperties and CassandraRelevantEnv respectively (CASSANDRA-17797) + * Add sstablepartitions offline tool to find large partitions in sstables (CASSANDRA-8720) + * Replace usages of json-simple dependency by Jackson (CASSANDRA-16855) + * When decommissioning should set Severity to limit traffic (CASSANDRA-18430) + * For Java11 and Java17 remove -XX:-UseBiasedLocking as it is the default already (CASSANDRA-17869) + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit dcb763ec2c1f9ec9807d1f84ed4dc2e075e09de1
Merge: 70389abcf7 2973a7bdcd
Author: Bereng
AuthorDate: Mon Jun 12 10:02:58 2023 +0200
Merge branch 'cassandra-4.1' into trunk
* cassandra-4.1:
Generate.sh -s param to skip autodetection of tests
.circleci/generate.sh | 12 +---
.circleci/generate_11_and_17.sh | 12 +---
.circleci/readme.md | 3 +++
3 files changed, 21 insertions(+), 6 deletions(-)
diff --cc .circleci/generate.sh
index 0c8f4b8223,6e50dec945..1cd8fa09ea
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@@ -96,10 -102,10 +100,12 @@@ while getopts "e:afpib:s" opt; d
fi
has_env_vars=true
;;
+ b ) BASE_BRANCH="$OPTARG"
+ ;;
i ) check_env_vars=false
;;
+ s ) detect_changed_tests=false
+ ;;
\?) die "Invalid option: -$OPTARG"
;;
esac
diff --cc .circleci/generate_11_and_17.sh
index c9c190c4ef,00..4f17017e8d
mode 100755,00..100755
--- a/.circleci/generate_11_and_17.sh
+++ b/.circleci/generate_11_and_17.sh
@@@ -1,321 -1,0 +1,327 @@@
+#!/bin/bash
+#
+# 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.
+#
+
+BASEDIR=`dirname $0`
+BASE_BRANCH=trunk
+set -e
+
+die ()
+{
+ echo "ERROR: $*"
+ print_help
+ exit 1
+}
+
+print_help()
+{
- echo "Usage: $0 [-f|-p|-a|-e|-i|-b]"
++ echo "Usage: $0 [-f|-p|-a|-e|-i|-b|-s]"
+ echo " -a Generate the config_11_and_17.yml, config_11_and_17.yml.FREE
and config_11_and_17.yml.PAID expanded configuration"
+ echo " files from the main config_template.yml reusable configuration
file."
+ echo " Use this for permanent changes in config_11_and_17.yml that
will be committed to the main repo."
+ echo " -f Generate config.yml for tests compatible with the CircleCI free
tier resources"
+ echo " -p Generate config.yml for tests compatible with the CircleCI paid
tier resources"
+ echo " -b Specify the base git branch for comparison when determining
changed tests to"
+ echo " repeat. Defaults to ${BASE_BRANCH}. Note that this option is
not used when"
+ echo " the '-a' option is specified."
++ echo " -s Skip automatic detection of changed tests. Useful when you need
to repeat a few ones,"
++ echo " or when there are too many changed tests for CircleCI."
+ echo " -e Environment variables to be used in the generated
config_11_and_17.yml, e.g.:"
+ echo " -e DTEST_BRANCH=CASSANDRA-8272"
+ echo " -e
DTEST_REPO=https://github.com/adelapena/cassandra-dtest.git;
+ echo " -e REPEATED_TESTS_STOP_ON_FAILURE=false"
+ echo " -e
REPEATED_UTESTS=org.apache.cassandra.cql3.ViewTest#testCountersTable"
+ echo " -e REPEATED_UTESTS_COUNT=500"
+ echo " -e
REPEATED_UTESTS_FQLTOOL=org.apache.cassandra.fqltool.FQLCompareTest"
+ echo " -e REPEATED_UTESTS_FQLTOOL_COUNT=500"
+ echo " -e
REPEATED_UTESTS_LONG=org.apache.cassandra.db.commitlog.CommitLogStressTest"
+ echo " -e REPEATED_UTESTS_LONG_COUNT=100"
+ echo " -e
REPEATED_UTESTS_STRESS=org.apache.cassandra.stress.generate.DistributionGaussianTest"
+ echo " -e REPEATED_UTESTS_STRESS_COUNT=500"
+ echo " -e
REPEATED_SIMULATOR_DTESTS=org.apache.cassandra.simulator.test.TrivialSimulationTest"
+ echo " -e REPEATED_SIMULATOR_DTESTS_COUNT=500"
+ echo " -e
REPEATED_JVM_DTESTS=org.apache.cassandra.distributed.test.PagingTest"
+ echo " -e REPEATED_JVM_DTESTS_COUNT=500"
+ echo " -e REPEATED_DTESTS=cdc_test.py
cqlsh_tests/test_cqlsh.py::TestCqlshSmoke"
+ echo " -e REPEATED_DTESTS_COUNT=500"
+ echo " -e
REPEATED_LARGE_DTESTS=replace_address_test.py::TestReplaceAddress::test_replace_stopped_node"
+ echo "
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e4f31b73c21b04966269c5ac2d3bd2562e5f6c63
Merge: 984f519bd9 2b2d9f9b72
Author: Andrés de la Peña
AuthorDate: Wed Jun 7 11:07:20 2023 +0100
Merge branch 'cassandra-4.1' into trunk
.circleci/generate.sh | 19 ---
.circleci/generate_11_and_17.sh | 19 ---
2 files changed, 32 insertions(+), 6 deletions(-)
diff --cc .circleci/generate.sh
index 300660f384,2046362370..0c8f4b8223
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@@ -93,6 -98,6 +96,8 @@@ while getopts "e:afpib:" opt; d
fi
has_env_vars=true
;;
++ b ) BASE_BRANCH="$OPTARG"
++ ;;
i ) check_env_vars=false
;;
\?) die "Invalid option: -$OPTARG"
@@@ -183,6 -188,13 +188,14 @@@ f
# add new or modified tests to the sets of tests to be repeated
if (! ($all)); then
+ # Sanity check that the referenced branch exists
+ if ! git show ${BASE_BRANCH} -- >&/dev/null; then
+ echo -e "\n\nUnknown base branch: ${BASE_BRANCH}. Unable to detect
changed tests.\n"
+ echo"Please use the '-b' option to choose an existing branch name"
+ echo"(e.g. origin/${BASE_BRANCH}, apache/${BASE_BRANCH}, etc.)."
+ exit 2
+ fi
++
add_diff_tests ()
{
dir="${BASEDIR}/../${2}"
diff --cc .circleci/generate_11_and_17.sh
index 029d4a11cb,00..c9c190c4ef
mode 100755,00..100755
--- a/.circleci/generate_11_and_17.sh
+++ b/.circleci/generate_11_and_17.sh
@@@ -1,308 -1,0 +1,321 @@@
- #!/bin/sh
++#!/bin/bash
+#
+# 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.
+#
+
+BASEDIR=`dirname $0`
+BASE_BRANCH=trunk
+set -e
+
+die ()
+{
+ echo "ERROR: $*"
+ print_help
+ exit 1
+}
+
+print_help()
+{
- echo "Usage: $0 [-f|-p|-a|-e|-i]"
++ echo "Usage: $0 [-f|-p|-a|-e|-i|-b]"
+ echo " -a Generate the config_11_and_17.yml, config_11_and_17.yml.FREE
and config_11_and_17.yml.PAID expanded configuration"
+ echo " files from the main config_template.yml reusable configuration
file."
+ echo " Use this for permanent changes in config_11_and_17.yml that
will be committed to the main repo."
+ echo " -f Generate config.yml for tests compatible with the CircleCI free
tier resources"
+ echo " -p Generate config.yml for tests compatible with the CircleCI paid
tier resources"
++ echo " -b Specify the base git branch for comparison when determining
changed tests to"
++ echo " repeat. Defaults to ${BASE_BRANCH}. Note that this option is
not used when"
++ echo " the '-a' option is specified."
+ echo " -e Environment variables to be used in the generated
config_11_and_17.yml, e.g.:"
+ echo " -e DTEST_BRANCH=CASSANDRA-8272"
+ echo " -e
DTEST_REPO=https://github.com/adelapena/cassandra-dtest.git;
+ echo " -e REPEATED_TESTS_STOP_ON_FAILURE=false"
+ echo " -e
REPEATED_UTESTS=org.apache.cassandra.cql3.ViewTest#testCountersTable"
+ echo " -e REPEATED_UTESTS_COUNT=500"
+ echo " -e
REPEATED_UTESTS_FQLTOOL=org.apache.cassandra.fqltool.FQLCompareTest"
+ echo " -e REPEATED_UTESTS_FQLTOOL_COUNT=500"
+ echo " -e
REPEATED_UTESTS_LONG=org.apache.cassandra.db.commitlog.CommitLogStressTest"
+ echo " -e REPEATED_UTESTS_LONG_COUNT=100"
+ echo " -e
REPEATED_UTESTS_STRESS=org.apache.cassandra.stress.generate.DistributionGaussianTest"
+ echo " -e REPEATED_UTESTS_STRESS_COUNT=500"
+ echo " -e
REPEATED_SIMULATOR_DTESTS=org.apache.cassandra.simulator.test.TrivialSimulationTest"
+ echo " -e REPEATED_SIMULATOR_DTESTS_COUNT=500"
+ echo " -e
REPEATED_JVM_DTESTS=org.apache.cassandra.distributed.test.PagingTest"
+ echo " -e REPEATED_JVM_DTESTS_COUNT=500"
+ echo " -e REPEATED_DTESTS=cdc_test.py
cqlsh_tests/test_cqlsh.py::TestCqlshSmoke"
+
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ed58b0ffc32c8730ac6a6e1822eb2f02ca4d8924 Merge: 60200ba613 aa7ed179d3 Author: Stefan Miklosovic AuthorDate: Mon Jun 5 15:58:36 2023 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 2 +- src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index d27b503a0a,efea7c44ba..d337577fe2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,153 -1,6 +1,154 @@@ -4.1.3 +5.0 + * Extend maximum expiration date (CASSANDRA-14227) + * Add guardrail for partition tombstones and deprecate compaction_tombstone_warning_threshold (CASSANDRA-17194) + * Print header and statistics for cassandra-stress output with arbitrary frequency (CASSANDRA-12972) + * CEP-25: Trie-indexed SSTable format (CASSANDRA-18398) + * Make cassandra-stress able to read all credentials from a file (CASSANDRA-18544) + * Add guardrail for partition size and deprecate compaction_large_partition_warning_threshold (CASSANDRA-18500) + * Add HISTORY command for CQLSH (CASSANDRA-15046) + * Fix sstable formats configuration (CASSANDRA-18441) + * Add guardrail to bound timestamps (CASSANDRA-18352) + * Add keyspace_name column to system_views.clients (CASSANDRA-18525) + * Moved system properties and envs to CassandraRelevantProperties and CassandraRelevantEnv respectively (CASSANDRA-17797) + * Add sstablepartitions offline tool to find large partitions in sstables (CASSANDRA-8720) + * Replace usages of json-simple dependency by Jackson (CASSANDRA-16855) + * When decommissioning should set Severity to limit traffic (CASSANDRA-18430) + * For Java11 and Java17 remove -XX:-UseBiasedLocking as it is the default already (CASSANDRA-17869) + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 60200ba613a71353a8738951ffb9b3f7b885e7b7 Merge: c32a848008 6b99db84ba Author: Brandon Williams AuthorDate: Mon Jun 5 05:59:24 2023 -0500 Merge branch 'cassandra-4.1' into trunk .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 2 ++ 2 files changed, 3 insertions(+) diff --cc CHANGES.txt index aa7c989d76,30d96a0948..d27b503a0a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -151,11 -3,11 +151,13 @@@ Merged from 4.0 * Remove unnecessary shuffling of GossipDigests in Gossiper#makeRandomGossipDigest (CASSANDRA-18546) Merged from 3.11: Merged from 3.0: + 3.0.30 + * Suppress CVE-2023-2976 (CASSANDRA-18562) * Remove dh_python use in Debian packaging (CASSANDRA-18558) + 4.1.2 + * NPE when deserializing malformed collections from client (CASSANDRA-18505) * Allow keystore and trustrore passwords to be nullable (CASSANDRA-18124) * Return snapshots with dots in their name in nodetool listsnapshots (CASSANDRA-18371) * Fix NPE when loading snapshots and data directory is one directory from root (CASSANDRA-18359) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6cea0cd448d11dc633237ceb1f73f36c2eafb368 Merge: 91bb1c3b47 cdcf9bb5a6 Author: Brandon Williams AuthorDate: Thu Jun 1 15:30:12 2023 -0500 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 91bb1c3b47e78dcbf042b7b7d69eb040a55f4d5f Merge: b72da02611 60b26fdfb4 Author: Brandon Williams AuthorDate: Thu Jun 1 15:03:12 2023 -0500 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + debian/rules | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --cc CHANGES.txt index 0882bbaa77,72eef1ddae..649fcc0d7d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -150,10 -3,9 +150,11 @@@ Merged from 4.0 * Remove unnecessary shuffling of GossipDigests in Gossiper#makeRandomGossipDigest (CASSANDRA-18546) Merged from 3.11: Merged from 3.0: + * Remove dh_python use in Debian packaging (CASSANDRA-18558) + 4.1.2 + * NPE when deserializing malformed collections from client (CASSANDRA-18505) * Allow keystore and trustrore passwords to be nullable (CASSANDRA-18124) * Return snapshots with dots in their name in nodetool listsnapshots (CASSANDRA-18371) * Fix NPE when loading snapshots and data directory is one directory from root (CASSANDRA-18359) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 4bcadc6bfb96e2d1693f74d5135c8408211beede Merge: 46cb23 208a71c008 Author: Jon Meredith AuthorDate: Wed May 31 12:27:36 2023 -0600 Merge branch 'cassandra-4.1' into trunk .build/parent-pom-template.xml | 2 +- build.xml | 27 ++- .../config/CassandraRelevantProperties.java| 12 ++ .../org/apache/cassandra/service/GCInspector.java | 8 +- .../apache/cassandra/service/StorageService.java | 3 +- .../org/apache/cassandra/utils/JMXServerUtils.java | 28 ++- .../org/apache/cassandra/utils/MBeanWrapper.java | 208 ++- .../utils/RMIClientSocketFactoryImpl.java | 62 ++ .../apache/cassandra/utils/ReflectionUtils.java| 11 +- .../distributed/impl/AbstractCluster.java | 2 + .../impl/CollectingRMIServerSocketFactoryImpl.java | 88 .../distributed/impl/INodeProvisionStrategy.java | 11 + .../cassandra/distributed/impl/Instance.java | 22 ++ .../cassandra/distributed/impl/InstanceConfig.java | 16 +- .../cassandra/distributed/impl/IsolatedJmx.java| 230 + .../distributed/test/ResourceLeakTest.java | 62 +- .../distributed/test/VirtualTableLogsTest.java | 14 +- .../distributed/test/jmx/JMXFeatureTest.java | 113 ++ .../distributed/test/jmx/JMXGetterCheckTest.java | 26 +-- .../distributed/test/metric/TableMetricTest.java | 29 ++- 20 files changed, 921 insertions(+), 53 deletions(-) diff --cc .build/parent-pom-template.xml index 7200bb43ee,00..e4b63bf3a8 mode 100644,00..100644 --- a/.build/parent-pom-template.xml +++ b/.build/parent-pom-template.xml @@@ -1,1052 -1,0 +1,1052 @@@ + + +http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns="http://maven.apache.org/POM/4.0.0; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;> + 4.0.0 + +apache +org.apache +22 + + org.apache.cassandra + cassandra-parent + @version@ + pom + Apache Cassandra + The Apache Cassandra Project develops a highly scalable second-generation distributed database, bringing together Dynamo's fully distributed design and Bigtable's ColumnFamily-based data model. + https://cassandra.apache.org + 2009 + + + The Apache Software License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + +1.12.13 +4.0.20 +0.5.1 + + +@asm.version@ +@jamm.version@ + @allocation-instrumenter.version@ +@ecj.version@ +@jacoco.version@ +@jflex.version@ + + + + adelapena + Andres de la Peña + + + alakshman + Avinash Lakshman + + + aleksey + Aleksey Yeschenko + + + amorton + Aaron Morton + + + aweisberg + Ariel Weisberg + + + bdeggleston + Blake Eggleston + + + benedict + Benedict Elliott Smith + + + benjamin + Benjamin Lerer + + + blambov + Branimir Lambov + + + brandonwilliams + Brandon Williams + + + carl + Carl Yeksigian + + + dbrosius + David Brosiusd + + + dikang + Dikang Gu + + + eevans + Eric Evans + + + edimitrova + Ekaterina Dimitrova + + + gdusbabek + Gary Dusbabek + + + goffinet + Chris Goffinet + + + ifesdjeen + Alex Petrov + + + jaakko + Laine Jaakko Olavi + + + jake + T Jake Luciani + + + jasonbrown + Jason Brown + + + jbellis + Jonathan Ellis + + + jfarrell + Jake Farrell + + + jjirsa + Jeff Jirsa + + + jkni + Joel Knighton + + + jmckenzie + Josh McKenzie + + + johan + Johan Oskarsson + + + junrao + Jun Rao + + + jzhuang + Jay Zhuang + + + kohlisankalp + Sankalp Kohli + + + marcuse + Marcus Eriksson + + + mck + Michael Semb Wever + + + mishail + Mikhail Stepura + + + mshuler + Michael Shuler + + + paulo + Paulo Motta + + + pmalik + Prashant Malik + + + rstupp + Robert Stupp + + + scode + Peter Schuller + + + beobal + Sam Tunnicliffe + + + slebresne + Sylvain Lebresne + + + stefania +
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit f0abf77e64993e02f5f6fdaf67d3681c10ca2926 Merge: 4d2ee09ffa 2101ce947e Author: Mick Semb Wever AuthorDate: Mon May 29 13:48:49 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Increment version to 4.0.11 and 4.1.3 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 01726747cc7a74344f83d14bf52e31d95d13eb5a Merge: d2f6b8acb6 22d74c7116 Author: Mick Semb Wever AuthorDate: Fri May 26 15:59:04 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: ninja-fix FullQueryLoggerTest, requires allow_nodetool_archive_command false to begin with CASSANDRA-18550 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 61d2193c336a84fe863a6e4bd2da12d7218f1ed5 Merge: b50c3511ef cbe8b39f39 Author: Mick Semb Wever AuthorDate: Thu May 25 17:11:08 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Prepare debian changelog for 4.1.2 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b50c3511ef8c4a9a99973629f4c32b5ae1ecd538 Merge: 4f75659654 064d0db0fd Author: Brandon Williams AuthorDate: Thu May 25 09:27:56 2023 -0500 Merge branch 'cassandra-4.1' into trunk test/conf/cassandra.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --cc test/conf/cassandra.yaml index f98207879c,89c5685a9d..6e3059a635 --- a/test/conf/cassandra.yaml +++ b/test/conf/cassandra.yaml @@@ -52,11 -52,10 +52,13 @@@ sasi_indexes_enabled: tru materialized_views_enabled: true drop_compact_storage_enabled: true file_cache_enabled: true + full_query_logging_options: + allow_nodetool_archive_command: true auto_hints_cleanup_enabled: true +heap_dump_path: build/test +dump_heap_on_uncaught_exception: true + read_thresholds_enabled: true coordinator_read_size_warn_threshold: 1024KiB coordinator_read_size_fail_threshold: 4096KiB - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 4f7565965485763e4887a2f53892b9240021 Merge: f36fd33e33 9e7135c666 Author: Mick Semb Wever AuthorDate: Thu May 25 15:17:28 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Prepare debian changelog for 4.0.10 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
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 f36fd33e33ff88e07fdb5e3c5df7385d3fa8d688 Merge: 2dc1639d4f 72fc04d238 Author: Marcus Eriksson AuthorDate: Thu May 25 08:43:27 2023 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + conf/cassandra.yaml| 2 ++ .../cassandra/config/DatabaseDescriptor.java | 5 .../apache/cassandra/service/StorageService.java | 8 +- .../cassandra/tools/nodetool/EnableAuditLog.java | 4 ++- .../tools/nodetool/EnableFullQueryLog.java | 3 ++- .../cassandra/utils/binlog/BinLogOptions.java | 7 ++ .../apache/cassandra/audit/AuditLoggerTest.java| 29 ++ .../apache/cassandra/fql/FullQueryLoggerTest.java | 27 9 files changed, 83 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 2dc1639d4fb689d65b1ffd660547b8e649b6d495 Merge: 61333964f4 93efe0ee04 Author: Brandon Williams AuthorDate: Wed May 24 09:39:26 2023 -0500 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 2 ++ .../cassandra/metrics/BufferPoolMetrics.java | 5 +++ src/java/org/apache/cassandra/tools/NodeProbe.java | 38 -- .../org/apache/cassandra/tools/nodetool/Info.java | 16 + 4 files changed, 59 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index 12741fad68,0f46880950..f4e006751f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -149,8 -6,11 +149,10 @@@ Merged from 4.0 * Fix COPY ... TO STDOUT behavior in cqlsh (CASSANDRA-18353) * Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354) Merged from 4.0: + * Report network cache info in nodetool (CASSANDRa-18400) + * Partial compaction can resurrect deleted data (CASSANDRA-18507) * Allow internal address to change with reconnecting snitches (CASSANDRA-16718) * Fix quoting in toCqlString methods of UDTs and aggregates (CASSANDRA-17918) - * NPE when deserializing malformed collections from client (CASSANDRA-18505) * Improve 'Not enough space for compaction' logging messages (CASSANDRA-18260) * Incremental repairs fail on mixed IPv4/v6 addresses serializing SyncRequest (CASSANDRA-18474) * Deadlock updating sstable metadata if disk boundaries need reloading (CASSANDRA-18443) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit edd35badaf6e25726b0e46a4cddf9cfe42f0c11a Merge: 0352dbe920 f416a94125 Author: Stefan Miklosovic AuthorDate: Fri May 19 15:16:27 2023 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + .../cassandra/stress/settings/StressSettings.java | 3 +-- .../cassandra/stress/util/JavaDriverClient.java| 27 -- 3 files changed, 22 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 0352dbe920957928fca0238bc667fb251eba7799 Merge: 8aaaf21127 621faf7740 Author: Stefan Miklosovic AuthorDate: Thu May 18 22:38:23 2023 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + src/java/org/apache/cassandra/cql3/QueryProcessor.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. dcapwell pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 8aaaf21127207818fba154d2034f352635b3f381 Merge: fe0e04c231 446a9d1d01 Author: David Capwell AuthorDate: Thu May 18 10:38:07 2023 -0700 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 2 + src/java/org/apache/cassandra/db/Directories.java | 4 +- .../db/compaction/CompactionController.java| 2 +- .../cassandra/db/compaction/CompactionTask.java| 26 ++- .../test/CompactionOverlappingSSTableTest.java | 117 +++ .../org/apache/cassandra/db/DirectoriesTest.java | 2 +- .../db/compaction/PartialCompactionsTest.java | 233 + 7 files changed, 374 insertions(+), 12 deletions(-) diff --cc CHANGES.txt index 5fdc11b760,6167e04416..f648f5fafc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,144 -1,4 +1,146 @@@ +5.0 + * Fix sstable formats configuration (CASSANDRA-18441) + * Add guardrail to bound timestamps (CASSANDRA-18352) + * Add keyspace_name column to system_views.clients (CASSANDRA-18525) + * Moved system properties and envs to CassandraRelevantProperties and CassandraRelevantEnv respectively (CASSANDRA-17797) + * Add sstablepartitions offline tool to find large partitions in sstables (CASSANDRA-8720) + * Replace usages of json-simple dependency by Jackson (CASSANDRA-16855) + * When decommissioning should set Severity to limit traffic (CASSANDRA-18430) + * For Java11 and Java17 remove -XX:-UseBiasedLocking as it is the default already (CASSANDRA-17869) + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d4e41592592304e4f2a36b58bd8b79b7576c852a Merge: 6a2d3702ef 67d73469b4 Author: Brandon Williams AuthorDate: Tue May 16 09:01:48 2023 -0500 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/EndpointState.java| 5 + src/java/org/apache/cassandra/gms/Gossiper.java | 17 + .../cassandra/locator/ReconnectableSnitchHelper.java| 8 ++-- src/java/org/apache/cassandra/net/MessagingService.java | 7 +++ .../cassandra/net/OutboundConnectionSettings.java | 4 ++-- 6 files changed, 38 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index 4937943c78,77b725fa3c..e4263c80a0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -144,7 -6,9 +144,8 @@@ * Fix COPY ... TO STDOUT behavior in cqlsh (CASSANDRA-18353) * Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354) Merged from 4.0: + * Allow internal address to change with reconnecting snitches (CASSANDRA-16718) * Fix quoting in toCqlString methods of UDTs and aggregates (CASSANDRA-17918) - * NPE when deserializing malformed collections from client (CASSANDRA-18505) * Improve 'Not enough space for compaction' logging messages (CASSANDRA-18260) * Incremental repairs fail on mixed IPv4/v6 addresses serializing SyncRequest (CASSANDRA-18474) * Deadlock updating sstable metadata if disk boundaries need reloading (CASSANDRA-18443) diff --cc src/java/org/apache/cassandra/net/OutboundConnectionSettings.java index 6a2543f783,5b246e3c5a..4721e61ce9 --- a/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java +++ b/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java @@@ -23,11 -23,11 +23,11 @@@ import com.google.common.base.Precondit import io.netty.channel.WriteBufferWaterMark; import org.apache.cassandra.auth.IInternodeAuthenticator; +import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions; - import org.apache.cassandra.db.SystemKeyspace; + import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.locator.IEndpointSnitch; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.utils.FBUtilities; - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6a2d3702ef600ed3833f10c5956eea0208e82211 Merge: 0bcf4a1992 29ca06ef9d Author: Brandon Williams AuthorDate: Mon May 15 11:22:44 2023 -0500 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 290bd0d337dfc1d669344ec4b59098db79ef9b04
Merge: f650908648 d7917a5144
Author: Stefan Miklosovic
AuthorDate: Thu May 11 15:59:14 2023 +0200
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt| 1 +
.../cassandra/cql3/functions/UDAggregate.java | 4 +-
.../org/apache/cassandra/db/marshal/UserType.java | 2 +-
.../cql3/statements/DescribeStatementTest.java | 130 +
4 files changed, 134 insertions(+), 3 deletions(-)
diff --cc CHANGES.txt
index abeb753658,52510028bf..e495dda4f2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -143,6 -6,8 +143,7 @@@
* Fix COPY ... TO STDOUT behavior in cqlsh (CASSANDRA-18353)
* Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354)
Merged from 4.0:
+ * Fix quoting in toCqlString methods of UDTs and aggregates (CASSANDRA-17918)
- * NPE when deserializing malformed collections from client (CASSANDRA-18505)
* Improve 'Not enough space for compaction' logging messages
(CASSANDRA-18260)
* Incremental repairs fail on mixed IPv4/v6 addresses serializing
SyncRequest (CASSANDRA-18474)
* Deadlock updating sstable metadata if disk boundaries need reloading
(CASSANDRA-18443)
diff --cc
test/unit/org/apache/cassandra/cql3/statements/DescribeStatementTest.java
index 6bf7008a69,52bb3c3d5e..422fcd4cdc
--- a/test/unit/org/apache/cassandra/cql3/statements/DescribeStatementTest.java
+++ b/test/unit/org/apache/cassandra/cql3/statements/DescribeStatementTest.java
@@@ -759,56 -789,104 +791,154 @@@ public class DescribeStatementTest exte
row(KEYSPACE_PER_TEST, "index", indexWithOptions,
expectedIndexStmtWithOptions));
}
+@Test
+public void testDescribeTableWithColumnMasks() throws Throwable
+{
+requireNetwork();
+DatabaseDescriptor.setDynamicDataMaskingEnabled(true);
+
+String table = createTable(KEYSPACE_PER_TEST,
+ "CREATE TABLE %s (" +
+ " pk1 text, " +
+ " pk2 int MASKED WITH DEFAULT, " +
+ " ck1 int, " +
+ " ck2 int MASKED WITH mask_default()," +
+ " s1 decimal static, " +
+ " s2 decimal static MASKED WITH
mask_null(), " +
+ " v1 text, " +
+ " v2 text MASKED WITH mask_inner(1,
null), " +
+ "PRIMARY KEY ((pk1, pk2), ck1, ck2 ))");
+
+TableMetadata tableMetadata =
Schema.instance.getTableMetadata(KEYSPACE_PER_TEST, table);
+assertNotNull(tableMetadata);
+
+String tableCreateStatement = "CREATE TABLE " + KEYSPACE_PER_TEST +
"." + table + " (\n" +
+ "pk1 text,\n" +
+ "pk2 int MASKED WITH
system.mask_default(),\n" +
+ "ck1 int,\n" +
+ "ck2 int MASKED WITH
system.mask_default(),\n" +
+ "s1 decimal static,\n" +
+ "s2 decimal static MASKED WITH
system.mask_null(),\n" +
+ "v1 text,\n" +
+ "v2 text MASKED WITH
system.mask_inner(1, null),\n" +
+ "PRIMARY KEY ((pk1, pk2), ck1,
ck2)\n" +
+ ") WITH ID = " + tableMetadata.id +
"\n" +
+ "AND CLUSTERING ORDER BY (ck1 ASC,
ck2 ASC)\n" +
+ "AND " + tableParametersCql();
+
+assertRowsNet(executeDescribeNet("DESCRIBE TABLE " +
KEYSPACE_PER_TEST + "." + table + " WITH INTERNALS"),
+ row(KEYSPACE_PER_TEST,
+ "table",
+ table,
+ tableCreateStatement));
+
+// masks should be listed even if DDM is disabled
+DatabaseDescriptor.setDynamicDataMaskingEnabled(false);
+assertRowsNet(executeDescribeNet("DESCRIBE TABLE " +
KEYSPACE_PER_TEST + "." + table + " WITH INTERNALS"),
+ row(KEYSPACE_PER_TEST,
+ "table",
+ table,
+ tableCreateStatement));
+}
+
+ @Test
+ public void testUsingReservedInCreateType() throws Throwable
+ {
+ String type = createType(KEYSPACE_PER_TEST, "CREATE TYPE %s
(\"token\" text, \"desc\" text);");
+
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit f54ef5e824daf758087ff4efa94041467d46f8eb Merge: 4759a7353f 7f4e9bb67b Author: Jon Meredith AuthorDate: Tue May 9 17:57:43 2023 -0600 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + .../serializers/CollectionSerializer.java | 8 ++ .../cassandra/serializers/ListSerializer.java | 9 -- .../cassandra/serializers/MapSerializer.java | 8 +++--- .../cassandra/serializers/SetSerializer.java | 4 +-- .../cql3/validation/entities/CollectionsTest.java | 4 +-- .../apache/cassandra/transport/SerDeserTest.java | 33 ++ 7 files changed, 57 insertions(+), 10 deletions(-) diff --cc CHANGES.txt index 13a42f24c5,08da17a5a3..656508064d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,139 -1,4 +1,140 @@@ +5.0 + * Add sstablepartitions offline tool to find large partitions in sstables (CASSANDRA-8720) + * Replace usages of json-simple dependency by Jackson (CASSANDRA-16855) + * When decommissioning should set Severity to limit traffic (CASSANDRA-18430) + * For Java11 and Java17 remove -XX:-UseBiasedLocking as it is the default already (CASSANDRA-17869) + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change (CASSANDRA-17874) + * CEP-10: Simulator Java11 Support (CASSANDRA-17178) + * Set the major compaction type correctly for compactionstats (CASSANDRA-18055) + * Print exception message without stacktrace when nodetool commands fail on probe.getOwnershipWithPort() (CASSANDRA-18079) + * Add option to print level
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d22112c2934e4c5b0c7ff387512941fc29b72cf2 Merge: 9948753c84 933af9b2db Author: Stefan Miklosovic AuthorDate: Fri May 5 13:39:45 2023 +0200 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9948753c84bb64586187ca86bbdc61a751d5ad82 Merge: 42dac9b950 7e4fd3653b Author: Brandon Williams AuthorDate: Fri May 5 06:09:52 2023 -0500 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 42dac9b9500259286d5c9508c08d5e618cf7119c Merge: e72ec4e828 462934a84b Author: Brandon Williams AuthorDate: Thu May 4 10:26:10 2023 -0500 Merge branch 'cassandra-4.1' into trunk .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 14 ++ 2 files changed, 15 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 5acfde21fef39dfc7cd2700323429ba9e982aac1 Merge: ccf3789219 82dc54c3a8 Author: Mick Semb Wever AuthorDate: Thu May 4 12:34:53 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Improve 'Not enough space for compaction' logging messages CHANGES.txt| 7 +- src/java/org/apache/cassandra/db/Directories.java | 11 +- .../org/apache/cassandra/db/DirectoriesTest.java | 118 + 3 files changed, 131 insertions(+), 5 deletions(-) diff --cc CHANGES.txt index a6c69faef2,a775ce8ff3..862755286a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,139 -1,3 +1,137 @@@ +5.0 + * Replace usages of json-simple dependency by Jackson (CASSANDRA-16855) + * When decommissioning should set Severity to limit traffic (CASSANDRA-18430) + * For Java11 and Java17 remove -XX:-UseBiasedLocking as it is the default already (CASSANDRA-17869) + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change (CASSANDRA-17874) + * CEP-10: Simulator Java11 Support (CASSANDRA-17178) + * Set the major compaction type correctly for compactionstats (CASSANDRA-18055) + * Print exception message without stacktrace when nodetool commands fail on probe.getOwnershipWithPort() (CASSANDRA-18079) + * Add option to print level in nodetool getsstables output (CASSANDRA-18023) + * Implement a guardrail for not having zero default_time_to_live on tables with TWCS (CASSANDRA-18042) + * Add CQL scalar functions for collection aggregation (CASSANDRA-18060) + * Make
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ccf37892199d76c1bebcaa98e0e1b15400bd8a91
Merge: 73da05f83b 602ffcbf3e
Author: Jon Meredith
AuthorDate: Wed May 3 14:42:57 2023 -0600
Merge branch 'cassandra-4.1' into trunk
.../distributed/test/PaxosRepair2Test.java | 246 ++---
1 file changed, 122 insertions(+), 124 deletions(-)
diff --cc
test/distributed/org/apache/cassandra/distributed/test/PaxosRepair2Test.java
index a66bf1bd32,574b84f2eb..804353028b
---
a/test/distributed/org/apache/cassandra/distributed/test/PaxosRepair2Test.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/PaxosRepair2Test.java
@@@ -66,10 -63,8 +63,9 @@@ import org.apache.cassandra.distributed
import org.apache.cassandra.distributed.api.ConsistencyLevel;
import org.apache.cassandra.distributed.api.Feature;
import org.apache.cassandra.distributed.api.IInvokableInstance;
+import org.apache.cassandra.distributed.shared.ClusterUtils;
import org.apache.cassandra.exceptions.CasWriteTimeoutException;
import org.apache.cassandra.gms.FailureDetector;
- import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.net.Verb;
import org.apache.cassandra.repair.RepairParallelism;
@@@ -256,14 -239,12 +240,12 @@@ public class PaxosRepair2Test extends T
)
{
cluster.schemaChange("CREATE TABLE " + KEYSPACE + '.' + TABLE + "
(k int primary key, v int)");
-cluster.get(3).shutdown().get();
+ClusterUtils.stopUnchecked(cluster.get(3));
InetAddressAndPort node3 =
InetAddressAndPort.getByAddress(cluster.get(3).broadcastAddress());
- for (int i = 0; i < 10; i++)
- {
- if (!cluster.get(1).callOnInstance(() ->
FailureDetector.instance.isAlive(node3)))
- break;
- }
+ // make sure node1 knows node3 is down
+ Awaitility.waitAtMost(1,TimeUnit.MINUTES).until(
+ () -> !cluster.get(1).callOnInstance(() ->
FailureDetector.instance.isAlive(node3)));
repair(cluster, KEYSPACE, TABLE, true);
for (int i = 0; i < cluster.size() - 1; i++)
@@@ -356,8 -338,13 +339,13 @@@
.set("truncate_request_timeout_in_ms", 1000L)))
)
{
+ cluster.forEach(i -> {
+
Assert.assertFalse(CassandraRelevantProperties.CLOCK_GLOBAL.isPresent());
+ Assert.assertEquals("1",
System.getProperty("cassandra.auto_repair_frequency_seconds"));
+ Assert.assertEquals("true",
System.getProperty("cassandra.disable_paxos_auto_repairs"));
+ });
cluster.schemaChange("CREATE TABLE " + KEYSPACE + '.' + TABLE + "
(pk int, ck int, v int, PRIMARY KEY (pk, ck))");
-cluster.get(3).shutdown().get();
+ClusterUtils.stopUnchecked(cluster.get(3));
cluster.verbs(Verb.PAXOS_COMMIT_REQ).drop();
try
{
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d7314a5988581dd5a8d505b1d66bd1ff1ba647f0 Merge: 998a98eae8 cfabddcfb0 Author: Mick Semb Wever AuthorDate: Sat Apr 29 19:12:51 2023 +0200 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 63ab8e09286e4b2076695f62e08a7f39cb6860d1 Merge: cf48c04c00 1a72fbd9c6 Author: Stefan Miklosovic AuthorDate: Fri Apr 28 12:41:39 2023 +0200 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 16643c007801faa235a7c3e314bd276962a4e8db
Merge: 2e5fb2ea1d 30220bc723
Author: Stefan Miklosovic
AuthorDate: Thu Apr 27 09:08:54 2023 +0200
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt| 1 +
src/antlr/Lexer.g | 21 ++--
test/unit/org/apache/cassandra/cql3/CQLTester.java | 14 ++--
.../cql3/validation/operations/CreateTest.java | 17 ++
.../cql3/validation/operations/DropTest.java | 9 +
.../cql3/validation/operations/InsertTest.java | 38 ++
6 files changed, 96 insertions(+), 4 deletions(-)
diff --cc
test/unit/org/apache/cassandra/cql3/validation/operations/InsertTest.java
index de9c67bd29,4e33ae3461..f6e71ae3a5
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertTest.java
@@@ -31,15 -30,43 +32,52 @@@ import org.apache.cassandra.exceptions.
public class InsertTest extends CQLTester
{
+ @Test
+ public void testInsertZeroDuration() throws Throwable
+ {
+ Duration expectedDuration = Duration.newInstance(0, 0, 0);
+ createTable(KEYSPACE, "CREATE TABLE %s (a INT PRIMARY KEY, b
DURATION);");
+ execute("INSERT INTO %s (a, b) VALUES (1, P0Y)");
+ execute("INSERT INTO %s (a, b) VALUES (2, P0M)");
+ execute("INSERT INTO %s (a, b) VALUES (3, P0W)");
+ execute("INSERT INTO %s (a, b) VALUES (4, P0D)");
+ execute("INSERT INTO %s (a, b) VALUES (5, P0Y0M0D)");
+ execute("INSERT INTO %s (a, b) VALUES (6, PT0H)");
+ execute("INSERT INTO %s (a, b) VALUES (7, PT0M)");
+ execute("INSERT INTO %s (a, b) VALUES (8, PT0S)");
+ execute("INSERT INTO %s (a, b) VALUES (9, PT0H0M0S)");
+ execute("INSERT INTO %s (a, b) VALUES (10, P0YT0H)");
+ execute("INSERT INTO %s (a, b) VALUES (11, P0MT0M)");
+ execute("INSERT INTO %s (a, b) VALUES (12, P0DT0S)");
+ execute("INSERT INTO %s (a, b) VALUES (13, P0M0DT0H0S)");
+ execute("INSERT INTO %s (a, b) VALUES (14, P0Y0M0DT0H0M0S)");
+ assertRowsIgnoringOrder(execute("SELECT * FROM %s"),
+ row(1, expectedDuration),
+ row(2, expectedDuration),
+ row(3, expectedDuration),
+ row(4, expectedDuration),
+ row(5, expectedDuration),
+ row(6, expectedDuration),
+ row(7, expectedDuration),
+ row(8, expectedDuration),
+ row(9, expectedDuration),
+ row(10, expectedDuration),
+ row(11, expectedDuration),
+ row(12, expectedDuration),
+ row(13, expectedDuration),
+ row(14, expectedDuration));
+ assertInvalidMessage("no viable alternative at input ')' (... b)
VALUES (15, [P]))","INSERT INTO %s (a, b) VALUES (15, P)");
+ }
+
+@Test
+public void testEmptyTTL() throws Throwable
+{
+createTable("CREATE TABLE %s (k int PRIMARY KEY, v int)");
+execute("INSERT INTO %s (k, v) VALUES (0, 0) USING TTL ?", (Object)
null);
+execute("INSERT INTO %s (k, v) VALUES (1, 1) USING TTL ?",
ByteBuffer.wrap(new byte[0]));
+assertRows(execute("SELECT k, v, ttl(v) FROM %s"), row(1, 1, null),
row(0, 0, null));
+}
+
@Test
public void testInsertWithUnset() throws Throwable
{
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 2e5fb2ea1d3765b728e224d949f9cfff5e2ef27d Merge: 28b7fdafa2 1a5302608f Author: Jon Meredith AuthorDate: Wed Apr 26 15:24:05 2023 -0600 Merge branch 'cassandra-4.1' into trunk .../distributed/test/HintsDisabledTest.java| 29 +- 1 file changed, 17 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 28b7fdafa2f790c525f55368cdda51ab90a335dc Merge: b028ac9e87 e733edb6cc Author: Stefan Miklosovic AuthorDate: Wed Apr 26 13:44:11 2023 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 5 +- .../distributed/test/IndexDroppingTest.java| 122 + 3 files changed, 127 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 3277e0c108,2180b75432..80fcd5fb0d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -148,8 -15,9 +148,9 @@@ Merged from 3.11 * Suppress CVE-2022-45688 (CASSANDRA-18389) * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013) Merged from 3.0: + * Do not remove truncated_at entry in system.local while dropping an index (CASSANDRA-18105) * Save host id to system.local and flush immediately after startup (CASSANDRA-18153) - + 4.1.1 * Deprecate org.apache.cassandra.hadoop code (CASSANDRA-16984) * Fix too early schema version change in sysem local table (CASSANDRA-18291) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b028ac9e87b95032a80e22c355d71b3e2b85e0aa Merge: 8b0dc8ad6b 1d926e8c6f Author: Jon Meredith AuthorDate: Tue Apr 25 12:09:08 2023 -0600 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + src/java/org/apache/cassandra/repair/messages/SyncRequest.java | 8 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index e8ea78cf9e,489f39fa3c..3277e0c108 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,137 -1,3 +1,138 @@@ +5.0 + * When decommissioning should set Severity to limit traffic (CASSANDRA-18430) + * For Java11 and Java17 remove -XX:-UseBiasedLocking as it is the default already (CASSANDRA-17869) + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change (CASSANDRA-17874) + * CEP-10: Simulator Java11 Support (CASSANDRA-17178) + * Set the major compaction type correctly for compactionstats (CASSANDRA-18055) + * Print exception message without stacktrace when nodetool commands fail on probe.getOwnershipWithPort() (CASSANDRA-18079) + * Add option to print level in nodetool getsstables output (CASSANDRA-18023) + * Implement a guardrail for not having zero default_time_to_live on tables with TWCS (CASSANDRA-18042) + * Add CQL scalar functions for collection aggregation (CASSANDRA-18060) + * Make cassandra.replayList property for CommitLogReplayer possible to react on keyspaces only (CASSANDRA-18044) + * Add Mathematical functions (CASSANDRA-17221) + * Make incremental backup configurable per table (CASSANDRA-15402) + *
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 8df072e104f6ae5391de12d58e9f973f08cb2c57 Merge: 976b8395f9 4c13df58cb Author: Jon Meredith AuthorDate: Fri Apr 21 10:57:29 2023 -0600 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 2 ++ .../org/apache/cassandra/db/compaction/CompactionStrategyManager.java | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index 2d57dd07a0,1c9a38a6aa..4e3192321a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,133 -1,3 +1,135 @@@ +5.0 + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change (CASSANDRA-17874) + * CEP-10: Simulator Java11 Support (CASSANDRA-17178) + * Set the major compaction type correctly for compactionstats (CASSANDRA-18055) + * Print exception message without stacktrace when nodetool commands fail on probe.getOwnershipWithPort() (CASSANDRA-18079) + * Add option to print level in nodetool getsstables output (CASSANDRA-18023) + * Implement a guardrail for not having zero default_time_to_live on tables with TWCS (CASSANDRA-18042) + * Add CQL scalar functions for collection aggregation (CASSANDRA-18060) + * Make cassandra.replayList property for CommitLogReplayer possible to react on keyspaces only (CASSANDRA-18044) + * Add Mathematical functions (CASSANDRA-17221) + * Make incremental backup configurable per table (CASSANDRA-15402) + * Change shebangs of Python scripts to resolve Python 3 from env command (CASSANDRA-17832) + * Add reasons to guardrail messages and consider guardrails in the error message
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 976b8395f981c5956ef617ea90b483e8e15d576d
Merge: 531b4cde43 2208235ce9
Author: Andrés de la Peña
AuthorDate: Mon Apr 17 14:52:40 2023 +0100
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt| 1 +
.../tools/nodetool/stats/TableStatsHolder.java | 2 +
.../cassandra/tools/nodetool/TableStatsTest.java | 29 +
.../nodetool/stats/TableStatsPrinterTest.java | 141 -
4 files changed, 171 insertions(+), 2 deletions(-)
diff --cc
src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java
index d9eece9afa,60132d1fed..80660611d2
--- a/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java
@@@ -117,10 -119,10 +117,12 @@@ public class TableStatsHolder implement
private Map convertStatsTableToMap(StatsTable table)
{
Map mpTable = new HashMap<>();
+ mpTable.put("sstable_count", table.sstableCount);
+ mpTable.put("old_sstable_count", table.oldSSTableCount);
mpTable.put("sstables_in_each_level", table.sstablesInEachLevel);
mpTable.put("sstable_bytes_in_each_level",
table.sstableBytesInEachLevel);
+mpTable.put("max_sstable_size", table.maxSSTableSize);
+mpTable.put("twcs", table.twcs);
mpTable.put("space_used_live", table.spaceUsedLive);
mpTable.put("space_used_total", table.spaceUsedTotal);
mpTable.put("space_used_by_snapshots_total",
table.spaceUsedBySnapshotsTotal);
diff --cc
test/unit/org/apache/cassandra/tools/nodetool/stats/TableStatsPrinterTest.java
index 0bf4e1ce28,81687ba7c0..3ac83850a1
---
a/test/unit/org/apache/cassandra/tools/nodetool/stats/TableStatsPrinterTest.java
+++
b/test/unit/org/apache/cassandra/tools/nodetool/stats/TableStatsPrinterTest.java
@@@ -394,6 -382,136 +395,142 @@@ public class TableStatsPrinterTest exte
}
}
+ @Test
+ public void testJsonPrinter() throws Exception
+ {
+ TestTableStatsHolder holder = new
TestTableStatsHolder(testKeyspaces.subList(2, 3), "", 0); // kesypace3
+ StatsPrinter printer = TableStatsPrinter.from("json",
false);
+ try (ByteArrayOutputStream byteStream = new ByteArrayOutputStream())
+ {
+ printer.print(holder, new PrintStream(byteStream));
+ Assertions.assertThat(byteStream.toString())
+ .isEqualTo("{\n" +
+ " \"keyspace3\" : {\n" +
+ "\"write_latency_ms\" : \"NaN\",\n" +
+ "\"tables\" : {\n" +
+ " \"table6\" : {\n" +
+ "
\"average_tombstones_per_slice_last_five_minutes\" : 6.0,\n" +
+ "\"top_tombstone_partitions\" :
null,\n" +
+ "
\"bloom_filter_off_heap_memory_used\" : \"667408\",\n" +
++ "\"twcs\" : null,\n" +
+ "\"bytes_pending_repair\" : 0,\n" +
+ "\"memtable_switch_count\" : 6,\n" +
+ "
\"maximum_tombstones_per_slice_last_five_minutes\" : 6,\n" +
+ "\"memtable_cell_count\" : ,\n" +
+ "\"memtable_data_size\" :
\"100\",\n" +
+ "
\"average_live_cells_per_slice_last_five_minutes\" : 5.0,\n" +
+ "\"local_read_latency_ms\" :
\"1.000\",\n" +
+ "\"sstable_count\" : 1000,\n" +
+ "\"local_write_latency_ms\" :
\"0.500\",\n" +
+ "\"pending_flushes\" : 66,\n" +
+ "
\"compacted_partition_minimum_bytes\" : 6,\n" +
+ "\"local_read_count\" : 5,\n" +
+ "\"sstable_compression_ratio\" :
0.68,\n" +
++ "\"max_sstable_size\" : 0,\n" +
+ "\"dropped_mutations\" :
\"66\",\n" +
+ "\"top_size_partitions\" : null,\n" +
+ "\"bloom_filter_false_positives\" :
400,\n" +
+ "\"off_heap_memory_used_total\" :
\"162470810\",\n" +
+ "\"memtable_off_heap_memory_used\" :
\"161803398\",\n" +
+
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 531b4cde431c8521f4031811cebba5e7ee9750ed Merge: b7ec523aa9 bd49f6ff26 Author: Stefan Miklosovic AuthorDate: Mon Apr 17 10:22:31 2023 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + NEWS.txt | 4 + conf/cassandra.yaml| 16 +- .../KubernetesSecretsPEMSslContextFactory.java | 4 +- .../KubernetesSecretsSslContextFactory.java| 25 +-- .../KubernetesSecretsPEMSslContextFactoryTest.java | 10 +- .../KubernetesSecretsSslContextFactoryTest.java| 32 ++-- .../apache/cassandra/config/EncryptionOptions.java | 9 +- .../security/FileBasedSslContextFactory.java | 34 +++- .../security/PEMBasedSslContextFactory.java| 5 - .../org/apache/cassandra/security/PEMReader.java | 3 +- ...em-sslcontextfactory-mismatching-passwords.yaml | 154 + ...ndra-pem-sslcontextfactory-unencryptedkeys.yaml | 148 + .../security/DefaultSslContextFactoryTest.java | 4 +- .../security/FileBasedSslContextFactoryTest.java | 182 + ...tFactoryConfigWithMismatchingPasswordsTest.java | 92 +++ ...ontextFactoryConfigWithUnencryptedKeysTest.java | 79 + 17 files changed, 755 insertions(+), 47 deletions(-) diff --cc CHANGES.txt index 48ad6d5463,79d3e8b287..49f52402cf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,134 -1,5 +1,135 @@@ +5.0 + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364) + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373) + * Use snake case for the names of CQL native functions (CASSANDRA-18037) + * Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262) + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 3155497486fa7217cd35428a469dd170f24f64fc Merge: ca6450bda4 5ec792a184 Author: Stefan Miklosovic AuthorDate: Tue Apr 11 09:45:13 2023 +0200 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit e6e9a78d7eb21459264879e328d808aae377419f Merge: dc4e1fa942 edb34e2f62 Author: Brandon Williams AuthorDate: Fri Apr 7 13:44:27 2023 -0500 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --cc CHANGES.txt index 64542882a9,718fe56ff1..d960691b5b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -136,9 -8,10 +136,10 @@@ Merged from 4.0 * Update zstd-jni library to version 1.5.5 (CASSANDRA-18429) Merged from 3.11: * Suppress CVE-2022-45688 (CASSANDRA-18389) + * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013) Merged from 3.0: * Save host id to system.local and flush immediately after startup (CASSANDRA-18153) - + 4.1.1 * Deprecate org.apache.cassandra.hadoop code (CASSANDRA-16984) * Fix too early schema version change in sysem local table (CASSANDRA-18291) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 40f653396f8f6e027afaae7bd220cc5c6249498c Merge: e96c20e815 3c2df9f1bd Author: Stefan Miklosovic AuthorDate: Tue Apr 4 09:43:04 2023 +0200 Merge branch 'cassandra-4.1' 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.1' into trunk
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 e96c20e8150fd81716d203aa40301c09db0bc04a Merge: 6cf93f3192 085765a07c Author: Josh McKenzie AuthorDate: Mon Apr 3 16:18:33 2023 -0400 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 2 ++ src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java | 9 + src/java/org/apache/cassandra/utils/concurrent/Ref.java| 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --cc src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java index e64c57a9a7,f203bd8e15..6d248742ce --- a/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java @@@ -32,8 -27,10 +32,10 @@@ import java.util.concurrent.ConcurrentL import java.util.concurrent.TimeUnit; import java.util.function.Predicate; -import com.codahale.metrics.Counter; import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.Runnables; + ++import com.codahale.metrics.Counter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6cf93f31920af1e17241e08a46acf467b83cfce2 Merge: a9911afe9a f53b4149d0 Author: Mick Semb Wever AuthorDate: Mon Apr 3 15:09:08 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Fix the number of running trees per thread for LongBTreeTest hanging test test/burn/org/apache/cassandra/utils/LongBTreeTest.java | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a9911afe9a2787636cf9a39b564b1256e6285f86 Merge: 4effa4efbe fc36817033 Author: Brandon Williams AuthorDate: Mon Apr 3 06:08:52 2023 -0500 Merge branch 'cassandra-4.1' into trunk .build/dependency-check-suppressions.xml | 5 + CHANGES.txt | 1 + 2 files changed, 6 insertions(+) diff --cc CHANGES.txt index 5c8a04819f,c0a6b14f57..2a6f675ddb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -133,9 -6,10 +133,10 @@@ * Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354) Merged from 4.0: Merged from 3.11: + * Suppress CVE-2022-45688 (CASSANDRA-18389) -Merged from 3.0: +Merged from 3.0: * Save host id to system.local and flush immediately after startup (CASSANDRA-18153) - + 4.1.1 * Deprecate org.apache.cassandra.hadoop code (CASSANDRA-16984) * Fix too early schema version change in sysem local table (CASSANDRA-18291) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9f078090e9e07d0917716e395e770b766a327fc7 Merge: e07b8dfe8d 03806f95e4 Author: Caleb Rackliffe AuthorDate: Fri Mar 31 11:59:19 2023 -0500 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Avoid loading the preferred IP for BulkLoader streaming - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 549bf38a073e9b467b1f95223ed0c05f2496c40a Merge: 297825773a 780f8b94ff Author: Brandon Williams AuthorDate: Wed Mar 29 06:32:26 2023 -0500 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 297825773a3c72e7555c1dd7ac5f06487e77cfbc Merge: 6a5f84d0f4 5fa2f87741 Author: Brandon Williams AuthorDate: Wed Mar 29 06:26:54 2023 -0500 Merge branch 'cassandra-4.1' into trunk .asf.yaml | 3 +++ 1 file changed, 3 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6a5f84d0f44f5562776a12a678c7d68168d2c7e7 Merge: eca75a42ef 6f401a8725 Author: Stefan Miklosovic AuthorDate: Tue Mar 28 19:02:50 2023 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + .../org/apache/cassandra/distributed/test/SnapshotsTest.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 6d80b2972e,dec7f680f2..a2102acc56 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,130 -1,5 +1,131 @@@ +5.0 + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change (CASSANDRA-17874) + * CEP-10: Simulator Java11 Support (CASSANDRA-17178) + * Set the major compaction type correctly for compactionstats (CASSANDRA-18055) + * Print exception message without stacktrace when nodetool commands fail on probe.getOwnershipWithPort() (CASSANDRA-18079) + * Add option to print level in nodetool getsstables output (CASSANDRA-18023) + * Implement a guardrail for not having zero default_time_to_live on tables with TWCS (CASSANDRA-18042) + * Add CQL scalar functions for collection aggregation (CASSANDRA-18060) + * Make cassandra.replayList property for CommitLogReplayer possible to react on keyspaces only (CASSANDRA-18044) + * Add Mathematical functions (CASSANDRA-17221) + * Make incremental backup configurable per table (CASSANDRA-15402) + * Change shebangs of Python scripts to resolve Python 3 from env command (CASSANDRA-17832) + * Add reasons to guardrail messages and consider guardrails in the error message for needed ALLOW FILTERING (CASSANDRA-17967) + * Add support for CQL functions on collections, tuples and UDTs (CASSANDRA-17811) + * Add flag to exclude nodes from local DC when running nodetool rebuild (CASSANDRA-17870) + * Adding endpoint verification option to
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit eca75a42ef5a75744df68be8eae38513af1c66f6 Merge: 721b6d 4ac89e6451 Author: Stefan Miklosovic AuthorDate: Sun Mar 26 23:29:46 2023 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + src/java/org/apache/cassandra/service/snapshot/SnapshotLoader.java | 4 2 files changed, 5 insertions(+) diff --cc CHANGES.txt index 01918fe861,0b8e597f1a..6d80b2972e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,130 -1,5 +1,131 @@@ +5.0 + * Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199) + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change (CASSANDRA-17874) + * CEP-10: Simulator Java11 Support (CASSANDRA-17178) + * Set the major compaction type correctly for compactionstats (CASSANDRA-18055) + * Print exception message without stacktrace when nodetool commands fail on probe.getOwnershipWithPort() (CASSANDRA-18079) + * Add option to print level in nodetool getsstables output (CASSANDRA-18023) + * Implement a guardrail for not having zero default_time_to_live on tables with TWCS (CASSANDRA-18042) + * Add CQL scalar functions for collection aggregation (CASSANDRA-18060) + * Make cassandra.replayList property for CommitLogReplayer possible to react on keyspaces only (CASSANDRA-18044) + * Add Mathematical functions (CASSANDRA-17221) + * Make incremental backup configurable per table (CASSANDRA-15402) + * Change shebangs of Python scripts to resolve Python 3 from env command (CASSANDRA-17832) + * Add reasons to guardrail messages and consider guardrails in the error message for needed ALLOW FILTERING (CASSANDRA-17967) + * Add support for CQL functions on collections, tuples and UDTs (CASSANDRA-17811) + * Add flag to exclude nodes from local DC when running nodetool rebuild (CASSANDRA-17870) + * Adding endpoint verification option to client_encryption_options (CASSANDRA-18034)
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
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 ffe669106b7092296a035c0525a57fcd72fa2a56 Merge: 2e2a49fcdc 7c2f97cd29 Author: Paulo Motta AuthorDate: Fri Mar 24 12:17:44 2023 -0400 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + .../apache/cassandra/batchlog/BatchlogManager.java | 2 +- .../org/apache/cassandra/net/MessagingService.java | 4 +- .../org/apache/cassandra/net/RequestCallbacks.java | 69 + .../service/AbstractWriteResponseHandler.java | 2 +- .../org/apache/cassandra/service/StorageProxy.java | 10 +- .../distributed/test/HintsDisabledTest.java| 74 ++ .../cassandra/net/WriteCallbackInfoTest.java | 107 - 8 files changed, 88 insertions(+), 181 deletions(-) diff --cc CHANGES.txt index 062fa500b6,1cb56d160f..edacdfc568 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,129 -1,5 +1,130 @@@ +5.0 + * CEP-20: Dynamic Data Masking (CASSANDRA-17940) + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change (CASSANDRA-17874) + * CEP-10: Simulator Java11 Support (CASSANDRA-17178) + * Set the major compaction type correctly for compactionstats (CASSANDRA-18055) + * Print exception message without stacktrace when nodetool commands fail on probe.getOwnershipWithPort() (CASSANDRA-18079) + * Add option to print level in nodetool getsstables output (CASSANDRA-18023) + * Implement a guardrail for not having zero default_time_to_live on tables with TWCS (CASSANDRA-18042) + * Add CQL scalar functions for collection aggregation (CASSANDRA-18060) + * Make cassandra.replayList property for CommitLogReplayer possible to react on keyspaces only (CASSANDRA-18044) + * Add Mathematical functions (CASSANDRA-17221) + * Make incremental backup configurable per table (CASSANDRA-15402) + * Change shebangs of Python scripts to resolve Python 3 from env command (CASSANDRA-17832) + * Add reasons to guardrail messages and consider guardrails in the error message for needed
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b4d4cf716b9596120f565d0286cd7dfbbe0a84f1 Merge: 080ad4963c 70b95d8098 Author: Brandon Williams AuthorDate: Wed Mar 22 13:29:20 2023 -0500 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + pylib/cqlshlib/copyutil.py | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 00b5933aad,7c7290f133..be048ff248 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,130 -1,8 +1,131 @@@ +5.0 + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change (CASSANDRA-17874) + * CEP-10: Simulator Java11 Support (CASSANDRA-17178) + * Set the major compaction type correctly for compactionstats (CASSANDRA-18055) + * Print exception message without stacktrace when nodetool commands fail on probe.getOwnershipWithPort() (CASSANDRA-18079) + * Add option to print level in nodetool getsstables output (CASSANDRA-18023) + * Implement a guardrail for not having zero default_time_to_live on tables with TWCS (CASSANDRA-18042) + * Add CQL scalar functions for collection aggregation (CASSANDRA-18060) + * Make cassandra.replayList property for CommitLogReplayer possible to react on keyspaces only (CASSANDRA-18044) + * Add Mathematical functions (CASSANDRA-17221) + * Make incremental backup configurable per table (CASSANDRA-15402) + * Change shebangs of Python scripts to resolve Python 3 from env command (CASSANDRA-17832) + * Add reasons to guardrail messages and consider guardrails in the error message for needed ALLOW FILTERING (CASSANDRA-17967) + * Add support for CQL functions on collections, tuples and UDTs (CASSANDRA-17811) + * Add flag to exclude nodes from local DC when running nodetool rebuild (CASSANDRA-17870) + * Adding endpoint verification option to client_encryption_options (CASSANDRA-18034) + * Replace 'wcwidth.py' with pypi module (CASSANDRA-17287) + * Add nodetool forcecompact to remove tombstoned or ttl'd data ignoring GC grace for given table and partition keys
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 080ad4963c62f402cf3e3342971719917d89ac0b Merge: 4138dd697a a6f8dd10cd Author: Brandon Williams AuthorDate: Wed Mar 22 10:20:08 2023 -0500 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 4 ++-- pylib/cqlshlib/saferscanner.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index 27a15725ca,27e7d998f2..00b5933aad --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,130 -1,7 +1,130 @@@ +5.0 + * Add system_views.snapshots virtual table (CASSANDRA-18102) + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049) + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323) + * Remove deprecated CQL functions dateOf and unixTimestampOf (CASSANDRA-18328) + * Remove DateTieredCompactionStrategy (CASSANDRA-18043) + * Add system_views.max_sstable_size and system_views.max_sstable_duration tables (CASSANDRA-18333) + * Extend implicit allow-filtering for virtual tables to clustering columns (CASSANDRA-18331) + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build (CASSANDRA-18136) + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change (CASSANDRA-17874) + * CEP-10: Simulator Java11 Support (CASSANDRA-17178) + * Set the major compaction type correctly for compactionstats (CASSANDRA-18055) + * Print exception message without stacktrace when nodetool commands fail on probe.getOwnershipWithPort() (CASSANDRA-18079) + * Add option to print level in nodetool getsstables output (CASSANDRA-18023) + * Implement a guardrail for not having zero default_time_to_live on tables with TWCS (CASSANDRA-18042) + * Add CQL scalar functions for collection aggregation (CASSANDRA-18060) + * Make cassandra.replayList property for CommitLogReplayer possible to react on keyspaces only (CASSANDRA-18044) + * Add Mathematical functions (CASSANDRA-17221) + * Make incremental backup configurable per table (CASSANDRA-15402) + * Change shebangs of Python scripts to resolve Python 3 from env command (CASSANDRA-17832) + * Add reasons to guardrail messages and consider guardrails in the error message for needed ALLOW FILTERING (CASSANDRA-17967) + * Add support for CQL functions on collections, tuples and UDTs (CASSANDRA-17811) + * Add flag to exclude nodes from local DC when running nodetool rebuild (CASSANDRA-17870) + * Adding endpoint verification option to client_encryption_options (CASSANDRA-18034) + * Replace 'wcwidth.py' with pypi module (CASSANDRA-17287) + * Add nodetool forcecompact to remove tombstoned or ttl'd data ignoring GC grace for given table and partition keys
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 01363745456693d72bd20e208a36bf16e393 Merge: 11ea405952 3021c33cab Author: Brandon Williams AuthorDate: Tue Mar 21 07:00:40 2023 -0500 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 11ea405952dea41bac3573eea5d54991dfd9a094 Merge: 0dea9c268a fb9699c231 Author: Jacek Lewandowski AuthorDate: Tue Mar 21 10:12:30 2023 +0100 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Fix RepairJob unnecessarily reporting cancellation error - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 92c90cd4ef385cab0bd7acfbd9a10261110f85ee
Merge: a76286795f d5b1483703
Author: David Capwell
AuthorDate: Wed Mar 15 16:19:05 2023 -0700
Merge branch 'cassandra-4.1' into trunk
checkstyle.xml | 2 +-
.../apache/cassandra/audit/AuditLogOptions.java| 4 +--
.../org/apache/cassandra/audit/BinAuditLogger.java | 4 +--
.../cassandra/config/DatabaseDescriptor.java | 11 +++
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 6 ++--
.../io/sstable/format/SortedTableScrubber.java | 3 +-
src/java/org/apache/cassandra/io/util/File.java| 12 ---
.../security/FileBasedSslContextFactory.java | 5 ++-
.../apache/cassandra/security/JKSKeyProvider.java | 4 +--
.../security/PEMBasedSslContextFactory.java| 3 +-
.../apache/cassandra/service/CassandraDaemon.java | 5 ++-
.../service/FileSystemOwnershipCheck.java | 3 +-
.../apache/cassandra/service/StartupChecks.java| 7 ++--
.../apache/cassandra/service/StorageService.java | 3 +-
.../cassandra/service/snapshot/SnapshotLoader.java | 3 +-
.../cassandra/service/snapshot/TableSnapshot.java | 3 +-
.../org/apache/cassandra/tools/HashPassword.java | 5 +--
.../cassandra/tools/SSTableRepairedAtSetter.java | 3 +-
src/java/org/apache/cassandra/utils/HeapUtils.java | 3 +-
.../cassandra/simulator/SimulationException.java | 37 ++
.../cassandra/simulator/SimulationRunner.java | 7 +++-
21 files changed, 84 insertions(+), 49 deletions(-)
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index e314f0a677,d2c529c3d4..46b16db90c
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -27,8 -25,6 +27,7 @@@ import java.net.NetworkInterface
import java.net.SocketException;
import java.net.UnknownHostException;
import java.nio.file.FileStore;
+import java.nio.file.Path;
- import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
@@@ -4585,96 -4398,4 +4584,96 @@@ public class DatabaseDescripto
{
conf.min_tracked_partition_tombstone_count = value;
}
+
+public static boolean getDumpHeapOnUncaughtException()
+{
+return conf.dump_heap_on_uncaught_exception;
+}
+
+/**
+ * @return Whether the path exists (be it created now or already prior)
+ */
+private static boolean maybeCreateHeapDumpPath()
+{
+if (!conf.dump_heap_on_uncaught_exception)
+return false;
+
+Path heap_dump_path = getHeapDumpPath();
+if (heap_dump_path == null)
+{
+logger.warn("Neither -XX:HeapDumpPath nor
cassandra.yaml:heap_dump_path are set; unable to create a directory to hold the
output.");
+return false;
+}
- if (PathUtils.exists(Paths.get(conf.heap_dump_path)))
++if (PathUtils.exists(File.getPath(conf.heap_dump_path)))
+return true;
- return
PathUtils.createDirectoryIfNotExists(Paths.get(conf.heap_dump_path));
++return
PathUtils.createDirectoryIfNotExists(File.getPath(conf.heap_dump_path));
+}
+
+/**
+ * As this is at its heart a debug operation (getting a one-shot heapdump
from an uncaught exception), we support
+ * both the more evolved cassandra.yaml approach but also the -XX param
to override it on a one-off basis so you don't
+ * have to change the full config of a node or a cluster in order to get
a heap dump from a single node that's
+ * misbehaving.
+ * @return the absolute path of the -XX param if provided, else the
heap_dump_path in cassandra.yaml
+ */
+public static Path getHeapDumpPath()
+{
+RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();
+Optional pathArg =
runtimeMxBean.getInputArguments().stream().filter(s ->
s.startsWith("-XX:HeapDumpPath=")).findFirst();
+
+if (pathArg.isPresent())
+{
+Pattern HEAP_DUMP_PATH_SPLITTER =
Pattern.compile("HeapDumpPath=");
+String fullHeapPathString =
HEAP_DUMP_PATH_SPLITTER.split(pathArg.get())[1];
- Path absolutePath =
Paths.get(fullHeapPathString).toAbsolutePath();
++Path absolutePath =
File.getPath(fullHeapPathString).toAbsolutePath();
+Path basePath = fullHeapPathString.endsWith(".hprof") ?
absolutePath.subpath(0, absolutePath.getNameCount() - 1) : absolutePath;
- return Paths.get("/").resolve(basePath);
++return File.getPath("/").resolve(basePath);
+}
+if (conf.heap_dump_path == null)
+throw new ConfigurationException("Attempted to get
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 034e009e93b2d2e63a469022f02f085f86bf9ba8 Merge: fb95112427 8d91b469af Author: Stefan Miklosovic AuthorDate: Wed Mar 15 09:34:00 2023 +0100 Merge branch 'cassandra-4.1' 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.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d1ba381d96cf1f864f1f9d0c59c5efa4cf660f49
Merge: 7ad746cc83 deb8abd2fd
Author: Jacek Lewandowski
AuthorDate: Tue Mar 14 15:19:22 2023 +0100
Merge branch 'cassandra-4.1' into trunk
* cassandra-4.1:
Fix the ordering of sstables when running sstableupgrade tool
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Directories.java | 13 +
src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 4 ++--
3 files changed, 16 insertions(+), 2 deletions(-)
diff --cc src/java/org/apache/cassandra/db/Directories.java
index cf07e995ac,9f80ce0619..e7c2535a6e
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@@ -59,17 -49,11 +59,18 @@@ import org.apache.cassandra.db.lifecycl
import org.apache.cassandra.io.FSDiskFullWriteError;
import org.apache.cassandra.io.FSError;
import org.apache.cassandra.io.FSNoDiskAvailableForWriteError;
+import org.apache.cassandra.io.FSReadError;
import org.apache.cassandra.io.FSWriteError;
+import org.apache.cassandra.io.sstable.Component;
+import org.apache.cassandra.io.sstable.Descriptor;
+import org.apache.cassandra.io.sstable.SSTable;
+import org.apache.cassandra.io.sstable.SSTableId;
++import org.apache.cassandra.io.sstable.SSTableIdFactory;
+import org.apache.cassandra.io.util.File;
+import org.apache.cassandra.io.util.FileStoreUtils;
import org.apache.cassandra.io.util.FileUtils;
-import org.apache.cassandra.io.sstable.*;
-import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.io.util.PathUtils;
+import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.service.snapshot.SnapshotManifest;
import org.apache.cassandra.service.snapshot.TableSnapshot;
diff --cc src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
index 657ec05d65,a7c099c7e5..a7a9dcdbb4
--- a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
@@@ -84,11 -76,11 +84,11 @@@ public class StandaloneUpgrade
Collection readers = new ArrayList<>();
- // Upgrade sstables
- for (Map.Entry> entry :
lister.list().entrySet())
+ // Upgrade sstables in id order
+ for (Map.Entry> entry :
lister.sortedList())
{
Set components = entry.getValue();
-if (!components.contains(Component.DATA) ||
!components.contains(Component.PRIMARY_INDEX))
+if
(!components.containsAll(entry.getKey().getFormat().primaryComponents()))
continue;
try
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 3eff9e755c46ca1e0011f2c91f8cb48e48cec025 Merge: 6eeb61d504 8ba3888fcf Author: Jacek Lewandowski AuthorDate: Mon Mar 13 09:57:48 2023 +0100 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + .../apache/cassandra/utils/memory/BufferPool.java | 6 ++-- .../cassandra/utils/memory/BufferPoolTest.java | 32 ++ 3 files changed, 37 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6eeb61d504510392a89879ad40d100505958645b Merge: 4e3447ae17 b7eaa2d209 Author: Stefan Miklosovic AuthorDate: Sun Mar 12 21:35:18 2023 +0100 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + .../org/apache/cassandra/hadoop/package-info.java | 23 ++ 2 files changed, 24 insertions(+) diff --cc CHANGES.txt index a4752f4c08,50836a9004..2851719bea --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,120 -1,6 +1,121 @@@ -4.1.1 +5.0 + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971) + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change (CASSANDRA-17874) + * CEP-10: Simulator Java11 Support (CASSANDRA-17178) + * Set the major compaction type correctly for compactionstats (CASSANDRA-18055) + * Print exception message without stacktrace when nodetool commands fail on probe.getOwnershipWithPort() (CASSANDRA-18079) + * Add option to print level in nodetool getsstables output (CASSANDRA-18023) + * Implement a guardrail for not having zero default_time_to_live on tables with TWCS (CASSANDRA-18042) + * Add CQL scalar functions for collection aggregation (CASSANDRA-18060) + * Make cassandra.replayList property for CommitLogReplayer possible to react on keyspaces only (CASSANDRA-18044) + * Add Mathematical functions (CASSANDRA-17221) + * Make incremental backup configurable per table (CASSANDRA-15402) + * Change shebangs of Python scripts to resolve Python 3 from env command (CASSANDRA-17832) + * Add reasons to guardrail messages and consider guardrails in the error message for needed ALLOW FILTERING (CASSANDRA-17967) + * Add support for CQL functions on collections, tuples and UDTs (CASSANDRA-17811) + * Add flag to exclude nodes from local DC when running nodetool rebuild (CASSANDRA-17870) + * Adding endpoint verification option to client_encryption_options (CASSANDRA-18034) + * Replace 'wcwidth.py' with pypi module (CASSANDRA-17287) + * Add nodetool forcecompact to remove tombstoned or ttl'd data ignoring GC grace for given table and partition keys (CASSANDRA-17711) + * Offer IF (NOT) EXISTS in cqlsh completion for CREATE TYPE, DROP TYPE, CREATE ROLE and DROP ROLE (CASSANDRA-16640) + * Nodetool bootstrap resume will now return an error if the operation fails (CASSANDRA-16491) + * Disable resumable bootstrap by default (CASSANDRA-17679) + * Include Git SHA in --verbose flag for nodetool version (CASSANDRA-17753) + * Update Byteman to 4.0.20 and Jacoco to 0.8.8 (CASSANDRA-16413) + * Add memtable option among possible tab completions for a table (CASSANDRA-17982) + * Adds a trie-based memtable implementation (CASSANDRA-17240) + * Further improves precision of memtable heap tracking
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6d62d2f4f2efb144824a433c0f8048c8a0eeed22
Merge: 91193e0fdf bfc7621c8c
Author: Andrés de la Peña
AuthorDate: Fri Mar 10 11:53:47 2023 +
Merge branch 'cassandra-4.1' into trunk
.circleci/config-2_1.yml.high_res.patch| 149 -
.circleci/{config.yml.LOWRES => config.yml.FREE} | 0
.circleci/config.yml.HIGHRES | 10917 ---
.circleci/{config.yml.MIDRES => config.yml.PAID} | 0
.circleci/{config-2_1.yml => config_template.yml} | 0
...id_res.patch => config_template.yml.PAID.patch} | 4 +-
.circleci/generate.sh | 107 +-
.circleci/readme.md|98 +-
8 files changed, 95 insertions(+), 11180 deletions(-)
diff --cc .circleci/config_template.yml.PAID.patch
index f5c890c15e,098ccd25a8..0deece2f33
--- a/.circleci/config_template.yml.PAID.patch
+++ b/.circleci/config_template.yml.PAID.patch
@@@ -1,6 -1,6 +1,6 @@@
- --- config-2_1.yml2023-02-02 21:26:13.0 -0500
- +++ config-2_1.yml.MIDRES 2023-02-02 21:27:09.0 -0500
config-2_1.yml2023-02-02 21:24:39.0 -0500
-+++ config-2_1.yml.MIDRES 2023-02-02 21:25:05.0 -0500
-@@ -157,14 +157,14 @@
++--- config_template.yml 2023-02-02 21:26:13.0 -0500
+ config_template.yml.MIDRES2023-02-02 21:27:09.0 -0500
+@@ -158,14 +158,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.1' into trunk
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 91193e0fdf42ffdfcc351763855d356f3458c3f2 Merge: 414f4143e6 af82b941a8 Author: Mick Semb Wever AuthorDate: Thu Mar 9 20:55:49 2023 +0100 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Restore 4.1's doc update for virtual table system_views.clients - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit bace51ce8e24a8c6a97ac35309536e8b1c8132be
Merge: f14fa978e4 0ea1d384d4
Author: Brandon Williams
AuthorDate: Thu Mar 9 10:04:52 2023 -0600
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt| 1 +
.../cassandra/service/DefaultFSErrorHandler.java | 2 +
...ava => JVMStabilityInspectorThrowableTest.java} | 71 ---
.../service/DefaultFSErrorHandlerTest.java | 121 ++
.../cassandra/service/DiskFailurePolicyTest.java | 135 +
.../org/apache/cassandra/utils/KillerForTests.java | 5 +
6 files changed, 320 insertions(+), 15 deletions(-)
diff --cc
test/distributed/org/apache/cassandra/distributed/test/JVMStabilityInspectorThrowableTest.java
index 4ca4f707d7,665d58c12a..b63179b70e
---
a/test/distributed/org/apache/cassandra/distributed/test/JVMStabilityInspectorThrowableTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/JVMStabilityInspectorThrowableTest.java
@@@ -40,10 -45,13 +44,12 @@@ import org.apache.cassandra.distributed
import org.apache.cassandra.distributed.shared.AbstractBuilder;
import org.apache.cassandra.distributed.shared.NetworkTopology;
import org.apache.cassandra.gms.Gossiper;
+ import org.apache.cassandra.io.FSError;
+ import org.apache.cassandra.io.FSReadError;
import org.apache.cassandra.io.sstable.CorruptSSTableException;
+import org.apache.cassandra.io.sstable.SSTableReadsListener;
import org.apache.cassandra.io.sstable.format.ForwardingSSTableReader;
import org.apache.cassandra.io.sstable.format.SSTableReader;
-import org.apache.cassandra.io.sstable.format.SSTableReadsListener;
-import org.apache.cassandra.io.util.FileDataInput;
import org.apache.cassandra.service.CassandraDaemon;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.Throwables;
@@@ -190,12 -226,27 +224,19 @@@ public class JVMStabilityInspectorThrow
@Override
public UnfilteredRowIterator rowIterator(DecoratedKey key, Slices
slices, ColumnFilter selectedColumns, boolean reversed, SSTableReadsListener
listener)
{
- throw throwCorrupted();
+ if (shouldThrowCorrupted)
+ throw throwCorrupted();
+ throw throwFSError();
}
-@Override
-public UnfilteredRowIterator rowIterator(FileDataInput file,
DecoratedKey key, RowIndexEntry indexEntry, Slices slices, ColumnFilter
selectedColumns, boolean reversed)
-{
-if (shouldThrowCorrupted)
-throw throwCorrupted();
-throw throwFSError();
-}
-
private CorruptSSTableException throwCorrupted()
{
-throw new CorruptSSTableException(new IOException("failed to get
position"), descriptor.baseFilename());
+throw new CorruptSSTableException(new IOException("failed to get
position"), descriptor.baseFile());
}
+
+ private FSError throwFSError()
+ {
-throw new FSReadError(new IOException("failed to get position"),
descriptor.baseFilename());
++throw new FSReadError(new IOException("failed to get position"),
descriptor.baseFile());
+ }
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 065c671e6500a06829712ab6e2504dc33ac76ca2 Merge: 4841794028 5f7175d59d Author: Jacek Lewandowski AuthorDate: Thu Mar 9 08:13:40 2023 +0100 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/schema/Schema.java | 20 2 files changed, 9 insertions(+), 12 deletions(-) diff --cc CHANGES.txt index b6e94ec67d,ae1a1a46e9..dd8a775565 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,118 -1,5 +1,119 @@@ -4.1.1 - * Fix too early schema version change in sysem local table (CASSANDRA-18291) +5.0 + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them together with local read/write ratio to tablestats (CASSANDRA-18283) + * Add more logging around CompactionManager operations (CASSANDRA-18268) + * Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212) + * CEP-17: SSTable API (CASSANDRA-17056) + * Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292) + * Snapshot only sstables containing mismatching ranges on preview repair mismatch (CASSANDRA-17561) + * More accurate skipping of sstables in read path (CASSANDRA-18134) + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change (CASSANDRA-17874) + * CEP-10: Simulator Java11 Support (CASSANDRA-17178) + * Set the major compaction type correctly for compactionstats (CASSANDRA-18055) + * Print exception message without stacktrace when nodetool commands fail on probe.getOwnershipWithPort() (CASSANDRA-18079) + * Add option to print level in nodetool getsstables output (CASSANDRA-18023) + * Implement a guardrail for not having zero default_time_to_live on tables with TWCS (CASSANDRA-18042) + * Add CQL scalar functions for collection aggregation (CASSANDRA-18060) + * Make cassandra.replayList property for CommitLogReplayer possible to react on keyspaces only (CASSANDRA-18044) + * Add Mathematical functions (CASSANDRA-17221) + * Make incremental backup configurable per table (CASSANDRA-15402) + * Change shebangs of Python scripts to resolve Python 3 from env command (CASSANDRA-17832) + * Add reasons to guardrail messages and consider guardrails in the error message for needed ALLOW FILTERING (CASSANDRA-17967) + * Add support for CQL functions on collections, tuples and UDTs (CASSANDRA-17811) + * Add flag to exclude nodes from local DC when running nodetool rebuild (CASSANDRA-17870) + * Adding endpoint verification option to client_encryption_options (CASSANDRA-18034) + * Replace 'wcwidth.py' with pypi module (CASSANDRA-17287) + * Add nodetool forcecompact to remove tombstoned or ttl'd data ignoring GC grace for given table and partition keys (CASSANDRA-17711) + * Offer IF (NOT) EXISTS in cqlsh completion for CREATE TYPE, DROP TYPE, CREATE ROLE and DROP ROLE (CASSANDRA-16640) + * Nodetool bootstrap resume will now return an error if the operation fails (CASSANDRA-16491) + * Disable resumable bootstrap by default (CASSANDRA-17679) + * Include Git SHA in --verbose flag for nodetool version (CASSANDRA-17753) + * Update Byteman to 4.0.20 and Jacoco to 0.8.8 (CASSANDRA-16413) + * Add memtable option among possible tab completions for a table (CASSANDRA-17982) + * Adds a trie-based memtable implementation (CASSANDRA-17240) + * Further
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0bed1967fdd1caeb2bbc38645c2a0cb7e728725c
Merge: 7ca806c60a 6adcff8f30
Author: Jon Meredith
AuthorDate: Tue Mar 7 10:41:05 2023 -0700
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt| 1 +
.../db/memtable/AbstractAllocatorMemtable.java | 12 +-
.../db/partitions/AtomicBTreePartition.java| 19 -
.../db/partitions/BTreePartitionUpdater.java | 14 +-
.../org/apache/cassandra/db/rows/ArrayCell.java| 2 +-
.../org/apache/cassandra/db/rows/BufferCell.java | 2 +-
.../org/apache/cassandra/db/rows/ColumnData.java | 51 ++-
.../cassandra/db/rows/ComplexColumnData.java | 4 +-
.../org/apache/cassandra/db/rows/NativeCell.java | 19 +-
.../org/apache/cassandra/utils/btree/BTree.java| 17 +-
.../cassandra/utils/memory/MemtablePool.java | 2 +-
...AtomicBTreePartitionMemtableAccountingTest.java | 421 +
12 files changed, 511 insertions(+), 53 deletions(-)
diff --cc
src/java/org/apache/cassandra/db/memtable/AbstractAllocatorMemtable.java
index c39b561a16,ae1251646e..8526dace39
--- a/src/java/org/apache/cassandra/db/memtable/AbstractAllocatorMemtable.java
+++ b/src/java/org/apache/cassandra/db/memtable/AbstractAllocatorMemtable.java
@@@ -73,9 -67,9 +74,10 @@@ public abstract class AbstractAllocator
private final long creationNano = Clock.Global.nanoTime();
-private static MemtablePool createMemtableAllocatorPool()
+@VisibleForTesting
+static MemtablePool createMemtableAllocatorPool()
{
+ Config.MemtableAllocationType allocationType =
DatabaseDescriptor.getMemtableAllocationType();
long heapLimit = DatabaseDescriptor.getMemtableHeapSpaceInMiB() << 20;
long offHeapLimit = DatabaseDescriptor.getMemtableOffheapSpaceInMiB()
<< 20;
float memtableCleanupThreshold =
DatabaseDescriptor.getMemtableCleanupThreshold();
diff --cc src/java/org/apache/cassandra/db/partitions/AtomicBTreePartition.java
index 6cbb985f51,986e70774f..c9035befbd
--- a/src/java/org/apache/cassandra/db/partitions/AtomicBTreePartition.java
+++ b/src/java/org/apache/cassandra/db/partitions/AtomicBTreePartition.java
@@@ -18,8 -18,10 +18,7 @@@
package org.apache.cassandra.db.partitions;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
--import java.util.NavigableSet;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
@@@ -217,26 -231,26 +216,8 @@@ public final class AtomicBTreePartitio
return allocator.ensureOnHeap().applyToRow(super.lastRow());
}
- @Override
- public UnfilteredRowIterator unfilteredIterator(ColumnFilter selection,
Slices slices, boolean reversed)
- {
- return
allocator.ensureOnHeap().applyToPartition(super.unfilteredIterator(selection,
slices, reversed));
- }
-
- @Override
- public UnfilteredRowIterator unfilteredIterator(ColumnFilter selection,
NavigableSet> clusteringsInQueryOrder, boolean reversed)
- {
- return
allocator.ensureOnHeap().applyToPartition(super.unfilteredIterator(selection,
clusteringsInQueryOrder, reversed));
- }
-
- @Override
- public UnfilteredRowIterator unfilteredIterator()
- {
- return
allocator.ensureOnHeap().applyToPartition(super.unfilteredIterator());
- }
-
@Override
-public UnfilteredRowIterator unfilteredIterator(ColumnFilter selection,
Slices slices, boolean reversed)
-{
-return
allocator.ensureOnHeap().applyToPartition(super.unfilteredIterator(selection,
slices, reversed));
-}
-
-@Override
-public UnfilteredRowIterator unfilteredIterator(ColumnFilter selection,
NavigableSet> clusteringsInQueryOrder, boolean reversed)
-{
-return
allocator.ensureOnHeap().applyToPartition(super.unfilteredIterator(selection,
clusteringsInQueryOrder, reversed));
-}
-
-@Override
-public UnfilteredRowIterator unfilteredIterator()
-{
-return
allocator.ensureOnHeap().applyToPartition(super.unfilteredIterator());
-}
-
-@Override
-public UnfilteredRowIterator unfilteredIterator(Holder current,
ColumnFilter selection, Slices slices, boolean reversed)
+public UnfilteredRowIterator unfilteredIterator(BTreePartitionData
current, ColumnFilter selection, Slices slices, boolean reversed)
{
return
allocator.ensureOnHeap().applyToPartition(super.unfilteredIterator(current,
selection, slices, reversed));
}
diff --cc src/java/org/apache/cassandra/db/partitions/BTreePartitionUpdater.java
index 7c09ae81f7,00..023019242d
mode 100644,00..100644
---
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 98a055e51c8eb6b788d3d0fe94f3d2576ab14d39 Merge: 03996ecc6d 426829cf57 Author: Brandon Williams AuthorDate: Fri Feb 24 12:32:45 2023 -0600 Merge branch 'cassandra-4.1' into trunk .build/dependency-check-suppressions.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 03996ecc6dcaa865f2a625f30912fcd61103a085 Merge: ece0c4a44c 474e778bcc Author: Brandon Williams AuthorDate: Wed Feb 22 10:25:39 2023 -0600 Merge branch 'cassandra-4.1' into trunk NOTICE.txt | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9a08062f1bf12b745b755f72a290af359d8bfeee Merge: 8d54835d5b 9860c1e9d9 Author: Stefan Miklosovic AuthorDate: Fri Feb 17 16:38:44 2023 +0100 Merge branch 'cassandra-4.1' into trunk .gitignore | 2 + CHANGES.txt| 1 + examples/ssl-factory/README.adoc | 22 examples/ssl-factory/README.txt| 19 --- examples/triggers/README.adoc | 63 ++ examples/triggers/README.txt | 36 - examples/triggers/build.xml| 5 ++ .../apache/cassandra/triggers/AuditTrigger.java| 22 +--- ide/idea/workspace.xml | 2 +- .../cassandra/triggers/CustomClassLoader.java | 11 ++-- 10 files changed, 114 insertions(+), 69 deletions(-) diff --cc CHANGES.txt index 76f6d41c83,1ca7c2f89a..deb3a64a23 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,111 -1,5 +1,112 @@@ -4.1.1 +4.2 + * Prepare for JDK17 experimental support (CASSANDRA-18179) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change (CASSANDRA-17874) + * CEP-10: Simulator Java11 Support (CASSANDRA-17178) + * Set the major compaction type correctly for compactionstats (CASSANDRA-18055) + * Print exception message without stacktrace when nodetool commands fail on probe.getOwnershipWithPort() (CASSANDRA-18079) + * Add option to print level in nodetool getsstables output (CASSANDRA-18023) + * Implement a guardrail for not having zero default_time_to_live on tables with TWCS (CASSANDRA-18042) + * Add CQL scalar functions for collection aggregation (CASSANDRA-18060) + * Make cassandra.replayList property for CommitLogReplayer possible to react on keyspaces only (CASSANDRA-18044) + * Add Mathematical functions (CASSANDRA-17221) + * Make incremental backup configurable per table (CASSANDRA-15402) + * Change shebangs of Python scripts to resolve Python 3 from env command (CASSANDRA-17832) + * Add reasons to guardrail messages and consider guardrails in the error message for needed ALLOW FILTERING (CASSANDRA-17967) + * Add support for CQL functions on collections, tuples and UDTs (CASSANDRA-17811) + * Add flag to exclude nodes from local DC when running nodetool rebuild (CASSANDRA-17870) + * Adding endpoint verification option to client_encryption_options (CASSANDRA-18034) + * Replace 'wcwidth.py' with pypi module (CASSANDRA-17287) + * Add nodetool forcecompact to remove tombstoned or ttl'd data ignoring GC grace for given table and partition keys (CASSANDRA-17711) + * Offer IF (NOT) EXISTS in cqlsh completion for CREATE TYPE, DROP TYPE, CREATE ROLE and DROP ROLE (CASSANDRA-16640) + * Nodetool bootstrap resume will now return an error if the operation fails (CASSANDRA-16491) + * Disable resumable bootstrap by default (CASSANDRA-17679) + * Include Git SHA in --verbose flag for nodetool version (CASSANDRA-17753) + * Update Byteman to 4.0.20 and Jacoco to 0.8.8 (CASSANDRA-16413) + * Add memtable option among possible tab completions for a table (CASSANDRA-17982) + * Adds a trie-based memtable implementation (CASSANDRA-17240) + * Further improves precision of memtable heap tracking (CASSANDRA-17240) + * Fix formatting of metrics documentation (CASSANDRA-17961) + * Keep sstable level when streaming for decommission and move (CASSANDRA-17969) + * Add Unavailables metric for CASWrite in the docs (CASSANDRA-16357) + * Make
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 8d54835d5b84f8afe1e97be65f8cc1897b0a9c5f Merge: d7352209b2 cfe9641fbe Author: Stefan Miklosovic AuthorDate: Fri Feb 17 15:44:17 2023 +0100 Merge branch 'cassandra-4.1' into trunk CHANGES.txt| 1 + src/java/org/apache/cassandra/db/Directories.java | 6 +- .../org/apache/cassandra/io/util/FileUtils.java| 12 ++ .../apache/cassandra/service/StorageService.java | 20 +-- .../cassandra/service/snapshot/SnapshotLoader.java | 152 +++-- .../service/snapshot/SnapshotManager.java | 53 +++ .../cassandra/distributed/impl/Instance.java | 1 + .../cassandra/distributed/test/SnapshotsTest.java | 55 .../service/snapshot/SnapshotLoaderTest.java | 2 +- .../service/snapshot/SnapshotManagerTest.java | 82 +-- 10 files changed, 242 insertions(+), 142 deletions(-) diff --cc CHANGES.txt index 1b90fee599,decc10dd72..76f6d41c83 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,111 -1,5 +1,112 @@@ -4.1.1 +4.2 + * Prepare for JDK17 experimental support (CASSANDRA-18179) + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 (CASSANDRA-18252) + * Update JNA to 5.13.0 (CASSANDRA-18050) + * Make virtual tables decide if they implicitly enable ALLOW FILTERING (CASSANDRA-18238) + * Add row, tombstone, and sstable count to nodetool profileload (CASSANDRA-18022) + * Coordinator level metrics for read response and mutation row and column counts (CASSANDRA-18155) + * Add CQL functions for dynamic data masking (CASSANDRA-17941) + * Print friendly error when nodetool attempts to connect to uninitialized server (CASSANDRA-11537) + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027) + * SimpleSeedProvider can resolve multiple IP addresses per DNS record (CASSANDRA-14361) + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean (CASSANDRA-18152) + * Add compaction_properties column to system.compaction_history table and nodetool compactionhistory command (CASSANDRA-18061) + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem (CASSANDRA-18114) + * Fix serialization error in new getsstables --show-levels option (CASSANDRA-18140) + * Use checked casts when reading vints as ints (CASSANDRA-18099) + * Add Mutation Serialization Caching (CASSANDRA-17998) + * Only reload compaction strategies if disk boundaries change (CASSANDRA-17874) + * CEP-10: Simulator Java11 Support (CASSANDRA-17178) + * Set the major compaction type correctly for compactionstats (CASSANDRA-18055) + * Print exception message without stacktrace when nodetool commands fail on probe.getOwnershipWithPort() (CASSANDRA-18079) + * Add option to print level in nodetool getsstables output (CASSANDRA-18023) + * Implement a guardrail for not having zero default_time_to_live on tables with TWCS (CASSANDRA-18042) + * Add CQL scalar functions for collection aggregation (CASSANDRA-18060) + * Make cassandra.replayList property for CommitLogReplayer possible to react on keyspaces only (CASSANDRA-18044) + * Add Mathematical functions (CASSANDRA-17221) + * Make incremental backup configurable per table (CASSANDRA-15402) + * Change shebangs of Python scripts to resolve Python 3 from env command (CASSANDRA-17832) + * Add reasons to guardrail messages and consider guardrails in the error message for needed ALLOW FILTERING (CASSANDRA-17967) + * Add support for CQL functions on collections, tuples and UDTs (CASSANDRA-17811) + * Add flag to exclude nodes from local DC when running nodetool rebuild (CASSANDRA-17870) + * Adding endpoint verification option to client_encryption_options (CASSANDRA-18034) + * Replace 'wcwidth.py' with pypi module (CASSANDRA-17287) + * Add nodetool forcecompact to remove tombstoned or ttl'd data ignoring GC grace for given table and partition keys (CASSANDRA-17711) + * Offer IF (NOT) EXISTS in cqlsh completion for CREATE TYPE, DROP TYPE, CREATE ROLE and DROP ROLE (CASSANDRA-16640) + * Nodetool bootstrap resume will now return an error if the operation fails (CASSANDRA-16491) + * Disable resumable bootstrap by default (CASSANDRA-17679) + * Include Git SHA in --verbose flag for nodetool version (CASSANDRA-17753) + * Update Byteman to 4.0.20 and Jacoco to 0.8.8 (CASSANDRA-16413) + * Add memtable option among possible tab completions for a table (CASSANDRA-17982) + * Adds a trie-based memtable implementation (CASSANDRA-17240) + * Further improves precision of memtable heap tracking (CASSANDRA-17240) + * Fix formatting of metrics documentation (CASSANDRA-17961) + * Keep sstable level when streaming for decommission and move (CASSANDRA-17969) + * Add Unavailables metric for CASWrite in the docs (CASSANDRA-16357) + * Make
