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

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

commit 064d0db0fd195f2f1512d5dacfb801ae0d45084f
Merge: 9e7135c666 f0699bca74
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Thu May 25 09:25:49 2023 -0500

    Merge branch 'cassandra-4.0' into cassandra-4.1

 test/conf/cassandra.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --cc test/conf/cassandra.yaml
index 80de239390,017797f349..89c5685a9d
--- a/test/conf/cassandra.yaml
+++ b/test/conf/cassandra.yaml
@@@ -39,67 -39,18 +39,69 @@@ server_encryption_options
      truststore_password: cassandra
  incremental_backups: true
  concurrent_compactors: 4
 -compaction_throughput_mb_per_sec: 0
 +compaction_throughput: 0MiB/s
  row_cache_class_name: org.apache.cassandra.cache.OHCProvider
 -row_cache_size_in_mb: 16
 -enable_user_defined_functions: true
 -enable_scripted_user_defined_functions: true
 -prepared_statements_cache_size_mb: 1
 +row_cache_size: 16MiB
 +user_defined_functions_enabled: true
 +scripted_user_defined_functions_enabled: true
 +prepared_statements_cache_size: 1MiB
  corrupted_tombstone_strategy: exception
  stream_entire_sstables: true
 -stream_throughput_outbound_megabits_per_sec: 200000000
 -enable_sasi_indexes: true
 -enable_materialized_views: true
 -enable_drop_compact_storage: true
 +stream_throughput_outbound: 23841858MiB/s
 +sasi_indexes_enabled: true
 +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
 +
 +read_thresholds_enabled: true
 +coordinator_read_size_warn_threshold: 1024KiB
 +coordinator_read_size_fail_threshold: 4096KiB
 +local_read_size_warn_threshold: 4096KiB
 +local_read_size_fail_threshold: 8192KiB
 +row_index_read_size_warn_threshold: 4096KiB
 +row_index_read_size_fail_threshold: 8192KiB
 +
 +memtable:
 +    configurations:
 +        skiplist:
 +            inherits: default
 +            class_name: SkipListMemtable
 +        skiplist_sharded:
 +            class_name: ShardedSkipListMemtable
 +            parameters:
 +                serialize_writes: false
 +                shards: 4
 +        skiplist_sharded_locking:
 +            inherits: skiplist_sharded
 +            parameters:
 +                serialize_writes: true
 +        skiplist_remapped:
 +            inherits: skiplist
 +        test_fullname:
 +            inherits: default
 +            class_name: org.apache.cassandra.db.memtable.TestMemtable
 +        test_shortname:
 +            class_name: TestMemtable
 +            parameters:
 +                skiplist: true  # note: YAML must interpret this as string, 
not a boolean
 +        test_empty_class:
 +            class_name: ""
 +        test_missing_class:
 +            parameters:
 +        test_unknown_class:
 +            class_name: NotExisting
 +        test_invalid_param:
 +            class_name: SkipListMemtable
 +            parameters:
 +                invalid: throw
 +        test_invalid_extra_param:
 +            inherits: test_shortname
 +            parameters:
 +                invalid: throw
 +        test_invalid_factory_method:
 +            class_name: 
org.apache.cassandra.cql3.validation.operations.CreateTest$InvalidMemtableFactoryMethod
 +        test_invalid_factory_field:
 +            class_name: 
org.apache.cassandra.cql3.validation.operations.CreateTest$InvalidMemtableFactoryField


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

Reply via email to