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 ff47de11d6238ac78b796f565904c600b7a20e92 Merge: f4b69ba0e8 5d3c747719 Author: Stefan Miklosovic <[email protected]> AuthorDate: Mon Sep 26 22:25:18 2022 +0200 Merge branch 'cassandra-4.1' into trunk build.xml | 6 +++--- checkstyle.xml | 3 +++ checkstyle_test.xml | 3 +++ .../org/apache/cassandra/batchlog/BatchlogManager.java | 1 - src/java/org/apache/cassandra/cache/CaffeineCache.java | 2 -- .../org/apache/cassandra/cache/SerializingCache.java | 2 -- src/java/org/apache/cassandra/cql3/WhereClause.java | 1 - .../cql3/restrictions/SingleColumnRestriction.java | 1 - .../cassandra/cql3/selection/ResultSetBuilder.java | 4 ---- .../cql3/statements/schema/AlterTableStatement.java | 1 - .../cql3/statements/schema/TableAttributes.java | 1 - src/java/org/apache/cassandra/db/NativeDecoratedKey.java | 2 -- src/java/org/apache/cassandra/db/ReadResponse.java | 2 -- .../apache/cassandra/db/SnapshotDetailsTabularData.java | 1 - src/java/org/apache/cassandra/db/SystemKeyspace.java | 1 - .../apache/cassandra/db/SystemKeyspaceMigrator41.java | 1 - .../db/compaction/CompactionHistoryTabularData.java | 1 - .../cassandra/db/filter/ClusteringIndexFilter.java | 1 - .../cassandra/db/filter/ClusteringIndexSliceFilter.java | 1 - .../cassandra/db/memtable/SkipListMemtableFactory.java | 2 -- .../db/repair/CassandraKeyspaceRepairManager.java | 1 - .../cassandra/db/repair/CassandraValidationIterator.java | 1 - .../org/apache/cassandra/db/rows/ComplexColumnData.java | 3 --- .../cassandra/db/virtual/StreamingVirtualTable.java | 2 -- src/java/org/apache/cassandra/hints/HintsStore.java | 1 - .../org/apache/cassandra/hints/PendingHintsInfo.java | 1 - .../index/sasi/analyzer/filter/StemmerFactory.java | 2 -- .../index/sasi/analyzer/filter/StopWordFactory.java | 2 -- .../apache/cassandra/io/sstable/CQLSSTableWriter.java | 1 - .../apache/cassandra/io/util/DataIntegrityMetadata.java | 1 - .../org/apache/cassandra/io/util/RandomAccessReader.java | 1 - .../apache/cassandra/metrics/HintedHandoffMetrics.java | 2 -- .../apache/cassandra/metrics/HintsServiceMetrics.java | 1 - .../apache/cassandra/net/AsyncStreamingInputPlus.java | 1 - .../apache/cassandra/net/InboundConnectionSettings.java | 1 - .../org/apache/cassandra/net/OutboundConnections.java | 1 - src/java/org/apache/cassandra/net/ParamType.java | 1 - src/java/org/apache/cassandra/net/RequestCallbacks.java | 1 - .../apache/cassandra/repair/IncrementalRepairTask.java | 1 - .../org/apache/cassandra/repair/PreviewRepairTask.java | 1 - src/java/org/apache/cassandra/repair/RepairJobDesc.java | 2 -- src/java/org/apache/cassandra/repair/RepairRunnable.java | 1 - .../org/apache/cassandra/repair/state/SessionState.java | 1 - .../apache/cassandra/schema/SchemaPullVerbHandler.java | 5 ----- .../apache/cassandra/schema/SchemaPushVerbHandler.java | 2 -- .../org/apache/cassandra/security/CipherFactory.java | 1 - .../cassandra/service/AbstractWriteResponseHandler.java | 2 -- .../apache/cassandra/service/ActiveRepairService.java | 3 --- src/java/org/apache/cassandra/service/ClientState.java | 1 - src/java/org/apache/cassandra/service/paxos/Paxos.java | 3 --- .../cassandra/service/paxos/PaxosCommitAndPrepare.java | 1 - .../cassandra/service/paxos/PaxosPrepareRefresh.java | 1 - .../cassandra/service/paxos/PaxosRepairHistory.java | 1 - .../cassandra/service/paxos/TablePaxosRepairHistory.java | 1 - .../paxos/cleanup/PaxosCleanupLocalCoordinator.java | 1 - .../service/paxos/cleanup/PaxosCleanupRequest.java | 1 - .../service/paxos/uncommitted/UncommittedDataFile.java | 1 - .../service/paxos/uncommitted/UncommittedTableData.java | 1 - .../service/reads/FixedSpeculativeRetryPolicy.java | 1 - .../service/reads/repair/BlockingReadRepair.java | 1 - .../apache/cassandra/transport/ExceptionHandlers.java | 1 - .../cassandra/transport/messages/BatchMessage.java | 5 ----- .../org/apache/cassandra/utils/CloseableIterator.java | 1 - src/java/org/apache/cassandra/utils/IntervalTree.java | 1 - src/java/org/apache/cassandra/utils/Isolated.java | 2 -- src/java/org/apache/cassandra/utils/NativeLibrary.java | 1 - src/java/org/apache/cassandra/utils/UUIDGen.java | 1 - .../cassandra/utils/concurrent/IntrusiveStack.java | 1 - src/java/org/apache/cassandra/utils/concurrent/Ref.java | 1 - .../org/apache/cassandra/distributed/Cluster.java | 1 - .../cassandra/distributed/action/GossipHelper.java | 1 - .../cassandra/distributed/fuzz/SSTableGenerator.java | 1 - .../cassandra/distributed/impl/AbstractCluster.java | 1 - .../org/apache/cassandra/distributed/impl/Instance.java | 1 - .../cassandra/distributed/impl/InstanceMetrics.java | 1 - .../cassandra/distributed/impl/UnsafeGossipHelper.java | 2 -- .../cassandra/distributed/shared/ClusterUtils.java | 1 - .../distributed/test/AbstractEncryptionOptionsImpl.java | 1 - .../apache/cassandra/distributed/test/CASAddTest.java | 2 -- .../apache/cassandra/distributed/test/CASTestBase.java | 1 - .../distributed/test/FailingTruncationTest.java | 1 - .../cassandra/distributed/test/GossipShutdownTest.java | 2 -- .../cassandra/distributed/test/NativeProtocolTest.java | 8 -------- .../apache/cassandra/distributed/test/RepairTest.java | 1 - .../distributed/test/ReplicaFilteringProtectionTest.java | 2 -- .../distributed/upgrade/MixedModeConsistencyV30Test.java | 2 -- .../distributed/upgrade/MixedModeConsistencyV3XTest.java | 2 -- .../upgrade/MixedModeFrom3LoggedBatchTest.java | 2 -- .../upgrade/MixedModeFrom3UnloggedBatchTest.java | 2 -- .../upgrade/RepairRequestTimeoutUpgradeTest.java | 5 ----- .../btree/AtomicBTreePartitionUpdateBench.java | 1 - .../apache/cassandra/simulator/asm/InterceptAgent.java | 2 -- .../org/apache/cassandra/simulator/asm/MethodLogger.java | 1 - .../apache/cassandra/simulator/ClusterSimulation.java | 1 - .../cassandra/simulator/cluster/OnInstanceBootstrap.java | 1 - .../simulator/cluster/OnInstanceGossipWith.java | 1 - .../org/apache/cassandra/simulator/debug/Reconcile.java | 1 - .../simulator/paxos/PairOfSequencesPaxosSimulation.java | 2 -- .../simulator/paxos/PaxosTopologyChangeVerifier.java | 1 - .../simulator/systems/InterceptingExecutor.java | 2 -- .../simulator/systems/InterceptingExecutorFactory.java | 5 ----- .../simulator/systems/InterceptorOfGlobalMethods.java | 3 --- .../cassandra/simulator/systems/NetworkConfig.java | 1 - .../cassandra/simulator/systems/NonInterceptible.java | 2 -- .../org/apache/cassandra/simulator/utils/IntRange.java | 3 --- .../org/apache/cassandra/simulator/utils/LongRange.java | 2 -- .../cassandra/simulator/utils/SafeCollections.java | 1 - .../simulator/test/ShortPaxosSimulationTest.java | 16 +++++++--------- .../cassandra/simulator/test/TrivialSimulationTest.java | 1 - .../cassandra/config/FailStartupDuplicateParamsTest.java | 4 ---- .../cql3/validation/entities/TupleTypeTest.java | 1 - .../cassandra/cql3/validation/operations/DeleteTest.java | 1 - .../operations/InsertUpdateIfConditionTest.java | 2 -- .../cassandra/cql3/validation/operations/TTLTest.java | 1 - test/unit/org/apache/cassandra/db/CellTest.java | 3 --- test/unit/org/apache/cassandra/db/DirectoriesTest.java | 1 - .../db/commitlog/CommitLogFailurePolicyTest.java | 1 - .../apache/cassandra/db/compaction/TTLExpiryTest.java | 1 - .../db/compaction/TimeWindowCompactionStrategyTest.java | 1 - .../org/apache/cassandra/db/marshal/DecimalTypeTest.java | 1 - .../cassandra/db/virtual/LocalRepairTablesTest.java | 1 - .../cassandra/db/virtual/SSTableTasksTableTest.java | 1 - .../org/apache/cassandra/locator/SimpleStrategyTest.java | 1 - .../org/apache/cassandra/net/ChunkedInputPlusTest.java | 2 -- .../org/apache/cassandra/net/PrunableArrayQueueTest.java | 2 -- test/unit/org/apache/cassandra/repair/RepairJobTest.java | 1 - .../org/apache/cassandra/repair/ValidationTaskTest.java | 1 - .../org/apache/cassandra/schema/SchemaKeyspaceTest.java | 1 - .../security/PEMBasedSslContextFactoryConfigTest.java | 1 - .../cassandra/service/ActiveRepairServiceTest.java | 2 -- .../apache/cassandra/service/PartitionDenylistTest.java | 1 - .../org/apache/cassandra/service/PaxosStateTest.java | 1 - .../apache/cassandra/service/paxos/PaxosStateTest.java | 1 - .../service/paxos/uncommitted/PaxosUncommittedTests.java | 1 - .../PaxosUncommittedTrackerIntegrationTest.java | 1 - .../tools/StandaloneSplitterWithCQLTesterTest.java | 2 -- .../org/apache/cassandra/tools/nodetool/CompactTest.java | 1 - .../tools/nodetool/GetDefaultKeyspaceRFTest.java | 1 - .../apache/cassandra/triggers/TriggerExecutorTest.java | 1 - .../unit/org/apache/cassandra/utils/FBUtilitiesTest.java | 1 - test/unit/org/apache/cassandra/utils/KeyGenerator.java | 1 - .../org/apache/cassandra/utils/MergeIteratorTest.java | 1 - .../utils/concurrent/AbstractTestAsyncPromise.java | 1 - .../utils/memory/MemtableCleanerThreadTest.java | 4 ---- 144 files changed, 16 insertions(+), 227 deletions(-) diff --cc build.xml index a18fb6b72a,1800c09dc2..e96c559bed --- a/build.xml +++ b/build.xml @@@ -1842,7 -2257,7 +1842,7 @@@ </java> </target> - <target name="init-checkstyle" depends="resolver-retrieve-build,build-project"> - <target name="init-checkstyle" depends="maven-ant-tasks-retrieve-build,build-project" unless="no-checkstyle"> ++ <target name="init-checkstyle" depends="resolver-retrieve-build,build-project" unless="no-checkstyle"> <path id="checkstyle.lib.path"> <fileset dir="${test.lib}/jars" includes="*.jar"/> </path> @@@ -1852,7 -2267,7 +1852,7 @@@ classpathref="checkstyle.lib.path"/> </target> - <target name="checkstyle" depends="init-checkstyle,build-project" description="Run custom checkstyle code analysis" if="java.version.8"> - <target name="checkstyle" depends="init-checkstyle,maven-ant-tasks-retrieve-build,build-project" description="Run custom checkstyle code analysis" if="java.version.8" unless="no-checkstyle"> ++ <target name="checkstyle" depends="init-checkstyle,build-project" description="Run custom checkstyle code analysis" if="java.version.8" unless="no-checkstyle"> <property name="checkstyle.log.dir" value="${build.dir}/checkstyle" /> <property name="checkstyle.report.file" value="${checkstyle.log.dir}/checkstyle_report.xml"/> <mkdir dir="${checkstyle.log.dir}" /> @@@ -1868,7 -2283,7 +1868,7 @@@ </checkstyle> </target> - <target name="checkstyle-test" depends="init-checkstyle,resolver-retrieve-build,build-project" description="Run custom checkstyle code analysis on tests" if="java.version.8"> - <target name="checkstyle-test" depends="init-checkstyle,maven-ant-tasks-retrieve-build,build-project" description="Run custom checkstyle code analysis on tests" if="java.version.8" unless="no-checkstyle"> ++ <target name="checkstyle-test" depends="init-checkstyle,resolver-retrieve-build,build-project" description="Run custom checkstyle code analysis on tests" if="java.version.8" unless="no-checkstyle"> <property name="checkstyle.log.dir" value="${build.dir}/checkstyle" /> <property name="checkstyle_test.report.file" value="${checkstyle.log.dir}/checkstyle_report_test.xml"/> <mkdir dir="${checkstyle.log.dir}" /> diff --cc src/java/org/apache/cassandra/cql3/selection/ResultSetBuilder.java index 37e8772616,22566b26d7..1051cf292a --- a/src/java/org/apache/cassandra/cql3/selection/ResultSetBuilder.java +++ b/src/java/org/apache/cassandra/cql3/selection/ResultSetBuilder.java @@@ -31,10 -28,6 +28,9 @@@ import org.apache.cassandra.db.Clusteri import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.aggregation.GroupMaker; import org.apache.cassandra.db.rows.Cell; +import org.apache.cassandra.db.rows.ColumnData; - import org.apache.cassandra.db.rows.ComplexColumnData; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.transport.ProtocolVersion; public final class ResultSetBuilder { diff --cc src/java/org/apache/cassandra/db/NativeDecoratedKey.java index e9a564a509,add5218977..35f31150df --- a/src/java/org/apache/cassandra/db/NativeDecoratedKey.java +++ b/src/java/org/apache/cassandra/db/NativeDecoratedKey.java @@@ -20,11 -20,7 +20,9 @@@ package org.apache.cassandra.db import java.nio.ByteBuffer; import java.nio.ByteOrder; +import net.nicoulaj.compilecommand.annotations.Inline; - import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Token; - import org.apache.cassandra.utils.bytecomparable.ByteComparable; +import org.apache.cassandra.utils.bytecomparable.ByteSource; import org.apache.cassandra.utils.concurrent.OpOrder; import org.apache.cassandra.utils.memory.MemoryUtil; import org.apache.cassandra.utils.memory.NativeAllocator; diff --cc src/java/org/apache/cassandra/db/SnapshotDetailsTabularData.java index 8e69071b45,4e6ab116c4..c5debe43f4 --- a/src/java/org/apache/cassandra/db/SnapshotDetailsTabularData.java +++ b/src/java/org/apache/cassandra/db/SnapshotDetailsTabularData.java @@@ -19,7 -19,7 +19,6 @@@ package org.apache.cassandra.db import javax.management.openmbean.*; --import com.google.common.base.Throwables; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.service.snapshot.TableSnapshot; diff --cc src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java index f483e3a19b,485f1a0908..bc4ac5a580 --- a/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java @@@ -21,7 -21,7 +21,6 @@@ import javax.management.openmbean.* import java.util.Map; import java.util.UUID; --import com.google.common.base.Throwables; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.LongType; diff --cc src/java/org/apache/cassandra/net/InboundConnectionSettings.java index 44c2c4962f,2eab9bcb21..448da62cbb --- a/src/java/org/apache/cassandra/net/InboundConnectionSettings.java +++ b/src/java/org/apache/cassandra/net/InboundConnectionSettings.java @@@ -18,7 -18,7 +18,6 @@@ package org.apache.cassandra.net; --import java.net.InetAddress; import java.util.function.Function; import com.google.common.base.Preconditions; diff --cc src/java/org/apache/cassandra/service/paxos/PaxosRepairHistory.java index 5e9fad1308,1627fdba8c..c8e2c217e4 --- a/src/java/org/apache/cassandra/service/paxos/PaxosRepairHistory.java +++ b/src/java/org/apache/cassandra/service/paxos/PaxosRepairHistory.java @@@ -29,9 -29,7 +29,8 @@@ import com.google.common.collect.Immuta import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.TypeSizes; +import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.BytesType; - import org.apache.cassandra.db.marshal.TimeUUIDType; import org.apache.cassandra.db.marshal.TupleType; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; diff --cc test/unit/org/apache/cassandra/cql3/validation/entities/TupleTypeTest.java index f325655542,9f53db4966..8e83fd2fb8 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/TupleTypeTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/TupleTypeTest.java @@@ -33,8 -33,6 +33,7 @@@ import org.junit.Test import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.UntypedResultSet; - import org.apache.cassandra.db.SchemaCQLHelper; +import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.TupleType; import org.apache.cassandra.utils.AbstractTypeGenerators.TypeSupport; import org.quicktheories.core.Gen; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
