This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from da47849 Remove Windows-specific classes and related code new db9f7a6 Add new custom types and unit tests for configuration patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe, David Capwell, Michael Semb Wever and Benjamin Lerer for CASSANDRA-15234 new 9c6b382 Backward compatibility framework for configuration parameters patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe, David Capwell, Michael Semb Wever and Benjamin Lerer for CASSANDRA-15234 new 5bb4bab DataRate parameters transition to the new framework Fix the DB descriptorRefTest which failed on the previous commit patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe, David Capwell, Michael Semb Wever and Benjamin Lerer for CASSANDRA-15234 new a3258d6 Transfer parameters to the newly introduced configuration framework (1) patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe, David Capwell, Michael Semb Wever and Benjamin Lerer for CASSANDRA-15234 new b9e2ab7 Extend DurationSpec and DataStorageSpec for smallest unit and transfer denylist parameters to the new framework patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe, David Capwell, Michael Semb Wever and Benjamin Lerer for CASSANDRA-15234 new d85f7f7 Transfer parameters to the newly introduced configuration framework (2) patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe, David Capwell, Michael Semb Wever and Benjamin Lerer for CASSANDRA-15234 new 755fd94 Transfer parameters to the newly introduced configuration framework (3) patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe, David Capwell, Michael Semb Wever and Benjamin Lerer for CASSANDRA-15234 new ed48f3c Transfer parameters to the newly introduced configuration framework (4) patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe, David Capwell, Michael Semb Wever and Benjamin Lerer for CASSANDRA-15234 new 1315d0c Transfer parameters to the newly introduced configuration framework (5) patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe, David Capwell, Michael Semb Wever and Benjamin Lerer for CASSANDRA-15234 new 2313825 Transfer parameters to the newly introduced configuration framework (6) patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe, David Capwell, Michael Semb Wever and Benjamin Lerer for CASSANDRA-15234 new 6d52036 Transfer parameters to the newly introduced configuration framework (7) patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe, David Capwell, Michael Semb Wever and Benjamin Lerer for CASSANDRA-15234 new c51a7c6 Bulk change of units around the code to support the move to the new configuration framework patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe, David Capwell, Michael Semb Wever and Benjamin Lerer for CASSANDRA-15234 new 9f56bf4 Remove old Duration class in favor of DurationSpec class patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe, David Capwell, Michael Semb Wever and Benjamin Lerer for CASSANDRA-15234 The 13 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .build/build-rat.xml | 2 +- CHANGES.txt | 1 + NEWS.txt | 6 + conf/cassandra.yaml | 462 +++++------ doc/native_protocol_v4.spec | 4 +- doc/native_protocol_v5.spec | 4 +- pylib/cassandra-cqlsh-tests.sh | 4 +- src/java/org/apache/cassandra/auth/AuthConfig.java | 6 +- .../apache/cassandra/auth/AuthenticatedUser.java | 2 +- src/java/org/apache/cassandra/auth/Roles.java | 2 +- .../apache/cassandra/batchlog/BatchlogManager.java | 10 +- .../apache/cassandra/cache/AutoSavingCache.java | 2 +- .../org/apache/cassandra/cache/CaffeineCache.java | 2 +- .../org/apache/cassandra/cache/ChunkCache.java | 5 +- .../org/apache/cassandra/cache/OHCProvider.java | 2 +- .../apache/cassandra/cache/SerializingCache.java | 2 +- .../cassandra/cache/SerializingCacheProvider.java | 2 +- src/java/org/apache/cassandra/config/Config.java | 315 +++++--- .../org/apache/cassandra/config/Converters.java | 138 ++++ .../org/apache/cassandra/config/DataRateSpec.java | 378 +++++++++ .../apache/cassandra/config/DataStorageSpec.java | 438 ++++++++++ .../cassandra/config/DatabaseDescriptor.java | 888 +++++++++++---------- src/java/org/apache/cassandra/config/Duration.java | 276 ------- .../org/apache/cassandra/config/DurationSpec.java | 387 +++++++++ .../apache/cassandra/config/EncryptionOptions.java | 41 +- src/java/org/apache/cassandra/config/Replaces.java | 9 +- .../org/apache/cassandra/config/ReplacesList.java | 2 +- .../config/SmallestDataStorageKibibytes.java | 55 ++ .../config/SmallestDataStorageMebibytes.java | 66 ++ .../config/SmallestDurationMilliseconds.java | 57 ++ .../cassandra/config/SmallestDurationMinutes.java | 57 ++ .../cassandra/config/SmallestDurationSeconds.java | 86 ++ .../cassandra/config/YamlConfigurationLoader.java | 135 +++- .../org/apache/cassandra/cql3/QueryProcessor.java | 15 +- .../cassandra/cql3/functions/UDFunction.java | 4 +- .../cassandra/cql3/statements/BatchStatement.java | 4 +- .../statements/schema/CreateIndexStatement.java | 2 +- .../statements/schema/CreateViewStatement.java | 2 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 9 +- src/java/org/apache/cassandra/db/ColumnIndex.java | 12 +- src/java/org/apache/cassandra/db/Keyspace.java | 8 +- src/java/org/apache/cassandra/db/Memtable.java | 4 +- .../org/apache/cassandra/db/RowIndexEntry.java | 20 +- .../commitlog/AbstractCommitLogSegmentManager.java | 2 +- .../db/commitlog/CommitLogSegmentManagerCDC.java | 2 +- .../db/commitlog/GroupCommitLogService.java | 2 +- .../cassandra/db/compaction/CompactionManager.java | 10 +- .../cassandra/db/compaction/CompactionTask.java | 4 +- .../db/compaction/LeveledCompactionStrategy.java | 8 +- .../cassandra/db/compaction/SSTableSplitter.java | 6 +- .../SplittingSizeTieredCompactionWriter.java | 4 +- .../apache/cassandra/db/marshal/AbstractType.java | 2 +- .../db/partitions/AtomicBTreePartition.java | 2 +- .../rows/UnfilteredRowIteratorWithLowerBound.java | 2 +- .../apache/cassandra/db/virtual/SettingsTable.java | 31 +- .../org/apache/cassandra/hadoop/ConfigHelper.java | 10 +- .../cassandra/hadoop/cql3/CqlBulkRecordWriter.java | 2 +- .../cassandra/hadoop/cql3/CqlInputFormat.java | 4 +- .../cassandra/hints/HintsDispatchExecutor.java | 2 +- .../org/apache/cassandra/hints/HintsReader.java | 2 +- .../apache/cassandra/hints/HintsWriteExecutor.java | 4 +- .../org/apache/cassandra/hints/HintsWriter.java | 4 +- .../cassandra/index/sasi/conf/IndexMode.java | 2 +- .../cassandra/io/sstable/CQLSSTableWriter.java | 15 +- .../org/apache/cassandra/io/sstable/IndexInfo.java | 2 +- .../cassandra/io/sstable/IndexSummaryBuilder.java | 2 +- .../cassandra/io/sstable/IndexSummaryManager.java | 4 +- .../io/sstable/IndexSummaryManagerMBean.java | 2 +- .../io/sstable/IndexSummaryRedistribution.java | 6 +- .../org/apache/cassandra/io/sstable/SSTable.java | 2 +- .../cassandra/io/sstable/SSTableRewriter.java | 6 +- .../io/sstable/format/big/BigTableWriter.java | 2 +- .../org/apache/cassandra/io/util/FileUtils.java | 32 +- .../cassandra/io/util/SequentialWriterOption.java | 6 +- .../cassandra/net/AsyncStreamingOutputPlus.java | 4 +- .../org/apache/cassandra/net/InboundSockets.java | 2 +- .../apache/cassandra/net/OutboundConnection.java | 2 +- .../apache/cassandra/repair/ValidationManager.java | 2 +- .../apache/cassandra/schema/CompressionParams.java | 2 +- .../apache/cassandra/schema/PartitionDenylist.java | 6 +- .../cassandra/service/ActiveRepairService.java | 20 +- .../service/ActiveRepairServiceMBean.java | 5 + .../org/apache/cassandra/service/CacheService.java | 12 +- .../org/apache/cassandra/service/StorageProxy.java | 16 +- .../apache/cassandra/service/StorageService.java | 115 ++- .../cassandra/service/StorageServiceMBean.java | 25 +- .../service/snapshot/SnapshotManifest.java | 4 +- .../apache/cassandra/streaming/StreamManager.java | 36 +- .../apache/cassandra/streaming/StreamSession.java | 4 +- .../streaming/StreamingDataOutputPlus.java | 2 +- .../org/apache/cassandra/tools/LoaderOptions.java | 12 +- src/java/org/apache/cassandra/tools/NodeProbe.java | 22 +- .../apache/cassandra/tools/StandaloneScrubber.java | 4 +- .../tools/nodetool/GetColumnIndexSize.java | 2 +- .../tools/nodetool/GetCompactionThroughput.java | 4 +- .../tools/nodetool/GetInterDCStreamThroughput.java | 6 +- .../tools/nodetool/GetStreamThroughput.java | 6 +- .../org/apache/cassandra/tools/nodetool/Info.java | 4 +- .../tools/nodetool/SetBatchlogReplayThrottle.java | 2 +- .../tools/nodetool/SetColumnIndexSize.java | 6 +- .../tools/nodetool/SetCompactionThroughput.java | 4 +- .../nodetool/SetHintedHandoffThrottleInKB.java | 4 +- .../tools/nodetool/SetInterDCStreamThroughput.java | 4 +- .../tools/nodetool/SetStreamThroughput.java | 4 +- .../apache/cassandra/tools/nodetool/Snapshot.java | 4 +- .../apache/cassandra/utils/memory/BufferPools.java | 4 +- .../cassandra/utils/memory/NativeAllocator.java | 4 +- .../cassandra/utils/memory/SlabAllocator.java | 4 +- test/conf/cassandra-murmur.yaml | 16 +- ...ed_parameters_names.yaml => cassandra-old.yaml} | 7 +- test/conf/cassandra-seeds.yaml | 12 +- ...dra-sslcontextfactory-invalidconfiguration.yaml | 20 +- test/conf/cassandra-sslcontextfactory.yaml | 20 +- test/conf/cassandra.yaml | 22 +- test/conf/cassandra_encryption.yaml | 26 +- test/conf/unit-test-conf/test-native-port.yaml | 16 +- .../cassandra/distributed/impl/InstanceConfig.java | 10 +- .../test/AbstractNetstatsBootstrapStreaming.java | 8 +- .../test/BootstrapBinaryDisabledTest.java | 4 +- .../cassandra/distributed/test/CASAddTest.java | 4 +- .../apache/cassandra/distributed/test/CASTest.java | 53 +- .../cassandra/distributed/test/CountersTest.java | 2 +- .../cassandra/distributed/test/GroupByTest.java | 6 +- .../test/HintedHandoffNodetoolTest.java | 8 +- .../test/InternodeEncryptionOptionsTest.java | 6 +- .../distributed/test/LargeColumnTest.java | 14 +- .../distributed/test/MessageFiltersTest.java | 2 +- ...WithEntireSSTablesCompressionStreamingTest.java | 2 +- .../test/NetstatsRepairStreamingTest.java | 4 +- .../cassandra/distributed/test/NodeToolTest.java | 2 +- .../distributed/test/PartitionDenylistTest.java | 8 +- .../test/ReadRepairEmptyRangeTombstonesTest.java | 5 +- .../distributed/test/ReadRepairQueryTypesTest.java | 5 +- .../cassandra/distributed/test/ReadRepairTest.java | 2 +- .../test/ring/ReadsDuringBootstrapTest.java | 4 +- .../trackwarnings/RowIndexSizeWarningTest.java | 4 +- .../upgrade/CompactStorageUpgradeTest.java | 2 +- .../upgrade/MixedModeAvailabilityTestBase.java | 5 +- .../upgrade/MixedModeConsistencyTestBase.java | 5 +- .../upgrade/MixedModeMessageForwardTest.java | 3 +- .../LongLeveledCompactionStrategyTest.java | 8 +- .../io/sstable/CQLSSTableWriterLongTest.java | 2 +- .../cassandra/streaming/LongStreamingTest.java | 20 +- .../microbench/ZeroCopyStreamingBenchmark.java | 2 +- .../cassandra/simulator/ClusterSimulation.java | 12 +- .../apache/cassandra/config/DataRateSpecTest.java | 136 ++++ .../cassandra/config/DataStorageSpecTest.java | 141 ++++ .../config/DatabaseDescriptorRefTest.java | 19 +- .../cassandra/config/DatabaseDescriptorTest.java | 116 +-- .../apache/cassandra/config/DurationSpecTest.java | 160 ++++ .../org/apache/cassandra/config/DurationTest.java | 60 -- .../LoadOldYAMLBackwardCompatibilityTest.java | 94 ++- .../cassandra/config/ParseAndConvertUnitsTest.java | 111 +++ .../config/SmallestDataStorageKibibytesTest.java | 27 +- .../config/SmallestDataStorageMebibytesTest.java | 27 +- .../config/SmallestDurationMillisecondsTest.java | 48 ++ .../config/SmallestDurationMinutesTest.java | 52 ++ .../config/SmallestDurationSecondsTest.java | 50 ++ .../config/YamlConfigurationLoaderTest.java | 8 +- test/unit/org/apache/cassandra/cql3/CQLTester.java | 7 +- test/unit/org/apache/cassandra/cql3/ViewTest.java | 6 +- .../cql3/validation/entities/JsonTest.java | 4 +- .../validation/entities/SecondaryIndexTest.java | 10 +- .../miscellaneous/CrcCheckChanceTest.java | 2 +- .../org/apache/cassandra/db/DirectoriesTest.java | 7 +- .../unit/org/apache/cassandra/db/KeyCacheTest.java | 8 +- .../unit/org/apache/cassandra/db/RowCacheTest.java | 10 +- .../commitlog/CommitLogSegmentManagerCDCTest.java | 8 +- .../cassandra/db/commitlog/CommitLogTest.java | 4 +- .../db/compaction/CompactionsCQLTest.java | 8 +- .../compaction/LeveledCompactionStrategyTest.java | 10 +- .../db/streaming/CassandraStreamManagerTest.java | 4 +- .../db/virtual/CredentialsCacheKeysTableTest.java | 2 +- .../virtual/JmxPermissionsCacheKeysTableTest.java | 2 +- .../NetworkPermissionsCacheKeysTableTest.java | 2 +- .../db/virtual/PermissionsCacheKeysTableTest.java | 2 +- .../db/virtual/RolesCacheKeysTableTest.java | 2 +- .../apache/cassandra/index/sasi/SASICQLTest.java | 6 +- .../CompressedSequentialWriterReopenTest.java | 2 +- .../cassandra/io/sstable/CQLSSTableWriterTest.java | 10 +- .../cassandra/io/sstable/IndexSummaryTest.java | 4 +- .../cassandra/io/sstable/LargePartitionsTest.java | 34 +- .../cassandra/io/sstable/SSTableLoaderTest.java | 4 +- .../io/sstable/SSTableWriterTestBase.java | 2 +- .../apache/cassandra/io/util/FileUtilsTest.java | 20 +- .../cassandra/io/util/RandomAccessReaderTest.java | 4 +- .../net/AsyncStreamingOutputPlusTest.java | 8 +- .../apache/cassandra/net/MessagingServiceTest.java | 4 +- .../org/apache/cassandra/repair/ValidatorTest.java | 16 +- .../cassandra/service/ClientWarningsTest.java | 2 +- .../cassandra/service/PartitionDenylistTest.java | 8 +- .../cassandra/service/ProtocolBetaVersionTest.java | 2 +- .../service/snapshot/SnapshotManifestTest.java | 4 +- .../cassandra/streaming/StreamManagerTest.java | 92 +-- .../cassandra/streaming/StreamRateLimiterTest.java | 32 +- .../tools/StandaloneSplitterWithCQLTesterTest.java | 6 +- .../tools/nodetool/SetGetColumnIndexSizeTest.java | 14 +- ...st.java => SetGetCompactionThroughputTest.java} | 41 +- ...etEntireSSTableInterDCStreamThroughputTest.java | 12 +- .../SetGetEntireSSTableStreamThroughputTest.java | 12 +- .../SetGetInterDCStreamThroughputTest.java | 26 +- .../tools/nodetool/SetGetStreamThroughputTest.java | 26 +- .../cassandra/transport/CQLConnectionTest.java | 4 +- .../org/apache/cassandra/utils/MerkleTreeTest.java | 10 +- .../cassandra/utils/memory/BufferPoolTest.java | 6 +- .../io/sstable/StressCQLSSTableWriter.java | 12 +- .../apache/cassandra/stress/CompactionStress.java | 16 +- .../operations/userdefined/SchemaInsert.java | 2 +- 208 files changed, 4406 insertions(+), 2000 deletions(-) create mode 100644 src/java/org/apache/cassandra/config/Converters.java create mode 100644 src/java/org/apache/cassandra/config/DataRateSpec.java create mode 100644 src/java/org/apache/cassandra/config/DataStorageSpec.java delete mode 100644 src/java/org/apache/cassandra/config/Duration.java create mode 100644 src/java/org/apache/cassandra/config/DurationSpec.java create mode 100644 src/java/org/apache/cassandra/config/SmallestDataStorageKibibytes.java create mode 100644 src/java/org/apache/cassandra/config/SmallestDataStorageMebibytes.java create mode 100644 src/java/org/apache/cassandra/config/SmallestDurationMilliseconds.java create mode 100644 src/java/org/apache/cassandra/config/SmallestDurationMinutes.java create mode 100644 src/java/org/apache/cassandra/config/SmallestDurationSeconds.java rename test/conf/{cassandra_deprecated_parameters_names.yaml => cassandra-old.yaml} (93%) create mode 100644 test/unit/org/apache/cassandra/config/DataRateSpecTest.java create mode 100644 test/unit/org/apache/cassandra/config/DataStorageSpecTest.java create mode 100644 test/unit/org/apache/cassandra/config/DurationSpecTest.java delete mode 100644 test/unit/org/apache/cassandra/config/DurationTest.java create mode 100644 test/unit/org/apache/cassandra/config/ParseAndConvertUnitsTest.java copy src/java/org/apache/cassandra/config/ConfigurationLoader.java => test/unit/org/apache/cassandra/config/SmallestDataStorageKibibytesTest.java (59%) copy src/java/org/apache/cassandra/config/ConfigurationLoader.java => test/unit/org/apache/cassandra/config/SmallestDataStorageMebibytesTest.java (59%) create mode 100644 test/unit/org/apache/cassandra/config/SmallestDurationMillisecondsTest.java create mode 100644 test/unit/org/apache/cassandra/config/SmallestDurationMinutesTest.java create mode 100644 test/unit/org/apache/cassandra/config/SmallestDurationSecondsTest.java copy test/unit/org/apache/cassandra/tools/nodetool/{SetGetStreamThroughputTest.java => SetGetCompactionThroughputTest.java} (61%) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org