From 3dc33de6eaf34a7bef1d345d2ffb3bf07e6a5748 Mon Sep 17 00:00:00 2001 From: Maxim Muzafarov Date: Sun, 21 Dec 2025 13:51:03 +0100 Subject: [PATCH] Organize imports and standartize import order across entire codebase Patch by Maxim Muzafarov; Reviewed by Michael Semb Wever for CASSANDRA-17925 --- .../apache/cassandra/audit/AuditLogEntry.java | 2 + .../cassandra/audit/AuditLogFilter.java | 1 + .../cassandra/audit/AuditLogManager.java | 4 +- .../cassandra/audit/AuditLogOptions.java | 1 + .../audit/AuditLogOptionsCompositeData.java | 1 + .../cassandra/audit/BinAuditLogger.java | 4 +- .../org/apache/cassandra/auth/AuthCache.java | 13 ++-- .../cassandra/auth/AuthCacheService.java | 1 + .../org/apache/cassandra/auth/AuthEvents.java | 1 + .../apache/cassandra/auth/AuthKeyspace.java | 8 +- .../cassandra/auth/AuthenticatedUser.java | 1 + .../auth/CIDRGroupsMappingCache.java | 4 +- .../auth/CIDRPermissionsManager.java | 1 + .../cassandra/auth/CassandraAuthorizer.java | 26 +++++-- .../auth/CassandraCIDRAuthorizer.java | 1 + .../cassandra/auth/CassandraLoginModule.java | 7 +- .../auth/CassandraNetworkAuthorizer.java | 4 +- .../cassandra/auth/CassandraRoleManager.java | 3 +- .../apache/cassandra/auth/DataResource.java | 1 + .../cassandra/auth/FunctionResource.java | 5 +- .../apache/cassandra/auth/JMXResource.java | 2 + .../auth/MutualTlsAuthenticator.java | 1 + ...TlsCertificateValidityPeriodValidator.java | 1 + .../auth/MutualTlsInternodeAuthenticator.java | 2 + .../cassandra/auth/PasswordAuthenticator.java | 9 ++- .../cassandra/auth/PasswordSaltSupplier.java | 3 +- .../apache/cassandra/auth/RoleOptions.java | 3 +- .../apache/cassandra/auth/RoleResource.java | 1 + .../auth/jmx/AuthenticationProxy.java | 7 +- .../auth/jmx/AuthorizationProxy.java | 15 +++- .../org/apache/cassandra/batchlog/Batch.java | 4 +- .../cassandra/batchlog/BatchlogManager.java | 2 + .../cassandra/cache/AutoSavingCache.java | 1 + .../apache/cassandra/cache/CaffeineCache.java | 5 +- .../apache/cassandra/cache/ChunkCache.java | 6 +- .../cassandra/cache/CounterCacheKey.java | 11 ++- .../apache/cassandra/cache/OHCProvider.java | 5 +- .../cassandra/cache/SerializingCache.java | 11 +-- .../concurrent/ExecutionFailure.java | 2 +- .../cassandra/concurrent/ExecutorLocals.java | 3 +- .../concurrent/ImmediateExecutor.java | 10 +-- .../concurrent/InfiniteLoopExecutor.java | 10 +-- .../cassandra/concurrent/Interruptible.java | 2 +- .../concurrent/NamedThreadFactory.java | 3 +- .../cassandra/concurrent/SEPExecutor.java | 12 +-- .../cassandra/concurrent/SEPWorker.java | 3 +- .../ScheduledThreadPoolExecutorPlus.java | 13 +++- .../concurrent/ThreadPoolExecutorBase.java | 7 +- .../apache/cassandra/config/AccordSpec.java | 4 +- .../config/CassandraRelevantProperties.java | 2 + .../org/apache/cassandra/config/Config.java | 1 + .../cassandra/config/DatabaseDescriptor.java | 4 +- .../cassandra/config/DefaultLoader.java | 1 + .../apache/cassandra/config/DurationSpec.java | 1 - .../cassandra/config/EncryptionOptions.java | 2 + .../cassandra/config/GuardrailsOptions.java | 2 + .../config/YamlConfigurationLoader.java | 12 +-- .../org/apache/cassandra/cql3/Attributes.java | 5 +- .../cassandra/cql3/BatchQueryOptions.java | 6 +- .../org/apache/cassandra/cql3/CQL3Type.java | 34 +++++++- .../cassandra/cql3/CQLFragmentParser.java | 1 + .../cassandra/cql3/ColumnSpecification.java | 6 +- .../org/apache/cassandra/cql3/Duration.java | 4 +- .../apache/cassandra/cql3/ErrorCollector.java | 1 + .../org/apache/cassandra/cql3/Operator.java | 1 - .../apache/cassandra/cql3/QueryEvents.java | 1 + .../apache/cassandra/cql3/QueryOptions.java | 15 ++-- .../apache/cassandra/cql3/QueryProcessor.java | 10 +-- .../org/apache/cassandra/cql3/Relation.java | 6 +- .../org/apache/cassandra/cql3/ResultSet.java | 3 +- .../cassandra/cql3/UntypedResultSet.java | 3 +- .../apache/cassandra/cql3/WhereClause.java | 4 +- .../cql3/conditions/AbstractConditions.java | 2 +- .../cql3/conditions/ColumnCondition.java | 8 +- .../cql3/conditions/ColumnConditions.java | 5 +- .../cql3/functions/AbstractFunction.java | 4 +- .../cql3/functions/AggregateFcts.java | 12 ++- .../cassandra/cql3/functions/CastFcts.java | 7 +- .../cassandra/cql3/functions/FromJsonFct.java | 8 +- .../cassandra/cql3/functions/Function.java | 3 +- .../cql3/functions/FunctionCall.java | 10 ++- .../cql3/functions/FunctionParameter.java | 1 + .../cql3/functions/FunctionResolver.java | 2 +- .../cql3/functions/JavaBasedUDFunction.java | 47 +++++++---- .../cassandra/cql3/functions/MathFcts.java | 12 ++- .../cql3/functions/OperationFcts.java | 21 ++++- .../cassandra/cql3/functions/TimeFcts.java | 9 ++- .../cassandra/cql3/functions/ToJsonFct.java | 10 +-- .../cassandra/cql3/functions/TokenFct.java | 6 +- .../cassandra/cql3/functions/UDAggregate.java | 11 ++- .../cql3/functions/UDFContextImpl.java | 3 +- .../cassandra/cql3/functions/UDFDataType.java | 8 +- .../cql3/functions/UDFExecutorService.java | 2 +- .../cassandra/cql3/functions/UDFunction.java | 12 ++- .../cassandra/cql3/functions/UuidFcts.java | 2 +- .../cassandra/cql3/functions/VectorFcts.java | 1 + .../cql3/functions/masking/ColumnMask.java | 3 +- .../masking/HashMaskingFunction.java | 1 + .../masking/PartialMaskingFunction.java | 1 + .../types/AbstractAddressableByIndexData.java | 7 +- .../cql3/functions/types/AbstractData.java | 7 +- .../types/AbstractGettableByIndexData.java | 8 +- .../functions/types/AbstractGettableData.java | 6 +- .../cql3/functions/types/CodecRegistry.java | 42 +++++++++- .../cql3/functions/types/DataType.java | 6 +- .../types/DataTypeClassNameParser.java | 7 +- .../functions/types/GettableByIndexData.java | 6 +- .../functions/types/GettableByNameData.java | 6 +- .../cql3/functions/types/LocalDate.java | 5 +- .../cql3/functions/types/ParseUtils.java | 4 +- .../functions/types/SettableByIndexData.java | 6 +- .../functions/types/SettableByNameData.java | 6 +- .../cql3/functions/types/TupleType.java | 2 +- .../cql3/functions/types/TypeCodec.java | 17 +++- .../cql3/functions/types/TypeTokens.java | 4 +- .../cql3/functions/types/UserType.java | 5 +- .../ClusteringColumnRestrictions.java | 16 ++-- .../restrictions/CustomIndexExpression.java | 6 +- .../cql3/restrictions/IndexRestrictions.java | 7 +- .../PartitionKeyRestrictions.java | 8 +- .../cql3/restrictions/Restriction.java | 6 +- .../cql3/restrictions/RestrictionSet.java | 1 + .../cql3/restrictions/SimpleRestriction.java | 2 +- .../restrictions/StatementRestrictions.java | 5 +- .../selection/AbstractFunctionSelector.java | 14 ++-- .../cql3/selection/ElementsSelector.java | 8 +- .../cassandra/cql3/selection/MapSelector.java | 2 +- .../cassandra/cql3/selection/RawSelector.java | 2 +- .../cassandra/cql3/selection/Selection.java | 6 +- .../selection/SelectionColumnMapping.java | 10 ++- .../cql3/selection/SelectionColumns.java | 2 +- .../cql3/selection/SelectorFactories.java | 8 +- .../cql3/selection/SimpleSelector.java | 6 +- .../cql3/selection/TermSelector.java | 4 +- .../cql3/selection/UserTypeSelector.java | 6 +- .../cql3/selection/VectorSelector.java | 2 +- .../selection/WritetimeOrTTLSelector.java | 6 +- .../cql3/statements/AlterRoleStatement.java | 8 +- .../statements/AuthorizationStatement.java | 5 +- .../cql3/statements/BatchStatement.java | 1 + .../cql3/statements/CQL3CasRequest.java | 1 + .../cql3/statements/CreateRoleStatement.java | 7 +- .../cql3/statements/DescribeStatement.java | 22 +++++- .../cql3/statements/DropRoleStatement.java | 23 ++++-- .../cql3/statements/GrantRoleStatement.java | 5 +- .../statements/ListPermissionsStatement.java | 23 ++++-- .../cql3/statements/ListRolesStatement.java | 23 ++++-- .../cql3/statements/ListUsersStatement.java | 12 ++- .../statements/ModificationStatement.java | 2 + .../PermissionsManagementStatement.java | 9 ++- .../cql3/statements/PropertyDefinitions.java | 1 + .../RevokePermissionsStatement.java | 5 +- .../cql3/statements/RevokeRoleStatement.java | 5 +- .../statements/RoleManagementStatement.java | 5 +- .../cql3/statements/SelectStatement.java | 2 + .../cql3/statements/TransactionStatement.java | 4 +- .../cql3/statements/TruncateStatement.java | 14 +++- .../cql3/statements/UpdateStatement.java | 7 +- .../cql3/statements/UseStatement.java | 9 ++- .../schema/AlterSchemaStatement.java | 7 +- .../schema/AlterTableStatement.java | 4 +- .../statements/schema/AlterTypeStatement.java | 6 +- .../statements/schema/AlterViewStatement.java | 6 +- .../schema/CreateAggregateStatement.java | 10 +-- .../schema/CreateFunctionStatement.java | 6 +- .../schema/CreateIndexStatement.java | 15 +++- .../schema/CreateKeyspaceStatement.java | 6 +- .../schema/CreateTableStatement.java | 6 +- .../schema/CreateTriggerStatement.java | 7 +- .../schema/CreateTypeStatement.java | 8 +- .../schema/DropAggregateStatement.java | 9 ++- .../schema/DropFunctionStatement.java | 9 ++- .../statements/schema/DropIndexStatement.java | 6 +- .../statements/schema/DropTableStatement.java | 8 +- .../schema/DropTriggerStatement.java | 5 +- .../statements/schema/DropTypeStatement.java | 8 +- .../statements/schema/DropViewStatement.java | 5 +- .../statements/schema/IndexAttributes.java | 6 +- .../statements/schema/KeyspaceAttributes.java | 4 +- .../apache/cassandra/cql3/terms/Lists.java | 1 + .../org/apache/cassandra/cql3/terms/Sets.java | 4 +- .../apache/cassandra/cql3/terms/Terms.java | 10 ++- .../cassandra/cql3/terms/UserTypes.java | 10 ++- .../cql3/transactions/ConditionStatement.java | 2 +- .../cql3/transactions/ReferenceValue.java | 2 +- .../db/AbstractReadCommandBuilder.java | 21 +++-- .../org/apache/cassandra/db/Clustering.java | 6 +- .../db/ClusteringBoundOrBoundary.java | 4 +- .../cassandra/db/ClusteringComparator.java | 2 +- .../apache/cassandra/db/ClusteringPrefix.java | 10 ++- .../cassandra/db/ColumnFamilyStore.java | 2 + src/java/org/apache/cassandra/db/Columns.java | 7 +- .../apache/cassandra/db/ConsistencyLevel.java | 1 + .../apache/cassandra/db/CounterMutation.java | 1 + .../org/apache/cassandra/db/DataRange.java | 14 +++- .../org/apache/cassandra/db/Directories.java | 1 + .../cassandra/db/DisallowedDirectories.java | 6 +- .../db/DisallowedDirectoriesMBean.java | 2 +- .../cassandra/db/DiskBoundaryManager.java | 4 +- .../apache/cassandra/db/EmptyIterators.java | 10 ++- .../db/ExpirationDateOverflowHandling.java | 1 + .../org/apache/cassandra/db/IMutation.java | 1 + .../org/apache/cassandra/db/Keyspace.java | 1 + .../apache/cassandra/db/MessageParams.java | 3 +- .../org/apache/cassandra/db/Mutation.java | 2 + .../cassandra/db/NativeDecoratedKey.java | 1 + .../cassandra/db/PartitionPosition.java | 5 +- .../org/apache/cassandra/db/ReadCommand.java | 18 +++-- .../org/apache/cassandra/db/ReadQuery.java | 5 +- .../cassandra/db/RegularAndStaticColumns.java | 3 +- .../apache/cassandra/db/RepairedDataInfo.java | 2 +- .../apache/cassandra/db/SSTableImporter.java | 1 + .../apache/cassandra/db/SchemaCQLHelper.java | 5 +- .../cassandra/db/SerializationHeader.java | 9 ++- .../db/SinglePartitionReadCommand.java | 3 +- .../db/SinglePartitionReadQuery.java | 1 + .../cassandra/db/SizeEstimatesRecorder.java | 1 + src/java/org/apache/cassandra/db/Slices.java | 13 +++- .../apache/cassandra/db/SystemKeyspace.java | 4 +- .../db/SystemKeyspaceMigrator41.java | 1 + .../cassandra/db/UnfilteredDeserializer.java | 8 +- .../cassandra/db/UnfilteredValidation.java | 1 - .../AbstractCommitLogSegmentManager.java | 6 +- .../commitlog/AbstractCommitLogService.java | 2 +- .../cassandra/db/commitlog/CommitLog.java | 1 + .../db/commitlog/CommitLogArchiver.java | 1 + .../db/commitlog/CommitLogReader.java | 15 +++- .../db/commitlog/CommitLogReplayer.java | 5 +- .../db/commitlog/CommitLogSegment.java | 6 +- .../commitlog/CommitLogSegmentManagerCDC.java | 7 +- .../db/commitlog/CommitLogSegmentReader.java | 6 +- .../db/commitlog/CompressedSegment.java | 1 + .../db/commitlog/DirectIOSegment.java | 4 +- .../db/commitlog/EncryptedSegment.java | 4 +- .../db/commitlog/FileDirectSegment.java | 1 + .../cassandra/db/commitlog/IntervalSet.java | 6 +- .../db/commitlog/MemoryMappedSegment.java | 1 + .../AbstractCompactionPipeline.java | 8 +- .../AbstractCompactionStrategy.java | 1 + .../db/compaction/AbstractCompactionTask.java | 2 +- .../db/compaction/CompactionController.java | 1 + .../CompactionHistoryTabularData.java | 10 ++- .../db/compaction/CompactionIterator.java | 15 ++-- .../db/compaction/CompactionLogger.java | 9 ++- .../db/compaction/CompactionManager.java | 7 +- .../db/compaction/CompactionManagerMBean.java | 1 + .../compaction/CompactionStrategyManager.java | 1 + .../db/compaction/CompactionTask.java | 10 +-- .../compaction/CursorCompactionPipeline.java | 8 +- .../db/compaction/CursorCompactor.java | 31 ++++---- .../IteratorCompactionPipeline.java | 8 +- .../compaction/LeveledCompactionStrategy.java | 31 +++++--- .../db/compaction/LeveledCompactionTask.java | 2 +- .../db/compaction/LeveledManifest.java | 1 + .../db/compaction/PendingRepairManager.java | 1 + .../db/compaction/SSTableSplitter.java | 8 +- .../cassandra/db/compaction/ShardManager.java | 6 +- .../cassandra/db/compaction/ShardTracker.java | 1 + .../db/compaction/SingleSSTableLCSTask.java | 5 +- .../SizeTieredCompactionStrategy.java | 12 ++- .../db/compaction/StatefulCursor.java | 2 +- .../TimeWindowCompactionStrategy.java | 17 ++-- .../TimeWindowCompactionStrategyOptions.java | 4 +- .../compaction/UnifiedCompactionStrategy.java | 1 + .../db/compaction/unified/Controller.java | 2 +- .../unified/UnifiedCompactionTask.java | 1 + .../db/compression/CompressionDictionary.java | 1 + .../CompressionDictionaryCache.java | 10 ++- ...mpressionDictionaryDetailsTabularData.java | 2 + .../CompressionDictionaryEventHandler.java | 9 ++- .../CompressionDictionaryManager.java | 2 + .../CompressionDictionaryScheduler.java | 1 + .../ICompressionDictionaryTrainer.java | 2 +- .../db/compression/TrainingState.java | 1 + .../ZstdCompressionDictionary.java | 5 +- .../db/compression/ZstdDictionaryTrainer.java | 5 +- .../cassandra/db/context/CounterContext.java | 4 +- .../filter/AbstractClusteringIndexFilter.java | 7 +- .../db/filter/ClusteringIndexFilter.java | 7 +- .../db/filter/ClusteringIndexNamesFilter.java | 15 +++- .../db/filter/ClusteringIndexSliceFilter.java | 9 ++- .../cassandra/db/filter/ColumnFilter.java | 16 +++- .../cassandra/db/filter/DataLimits.java | 19 ++++- .../apache/cassandra/db/filter/RowFilter.java | 1 + .../TombstoneOverwhelmingException.java | 7 +- .../guardrails/AbstractCustomGuardrail.java | 1 + .../CassandraPasswordConfiguration.java | 3 +- .../CassandraPasswordGenerator.java | 4 +- .../CassandraPasswordValidator.java | 4 +- .../db/guardrails/CustomGuardrail.java | 1 + .../db/guardrails/CustomGuardrailConfig.java | 1 + .../cassandra/db/guardrails/EnableFlag.java | 1 + .../cassandra/db/guardrails/Guardrail.java | 2 + .../cassandra/db/guardrails/Guardrails.java | 4 +- .../db/guardrails/GuardrailsMBean.java | 1 + .../cassandra/db/guardrails/MaxThreshold.java | 1 + .../cassandra/db/guardrails/MinThreshold.java | 1 + .../db/guardrails/NoOpGenerator.java | 1 + .../guardrails/PasswordPolicyGuardrail.java | 1 + .../cassandra/db/guardrails/Predicates.java | 1 + .../guardrails/RoleNamePolicyGuardrail.java | 1 + .../cassandra/db/guardrails/Threshold.java | 1 + .../db/guardrails/UUIDRoleNameGenerator.java | 1 + .../db/guardrails/ValueGenerator.java | 1 + .../db/guardrails/ValueValidator.java | 1 + .../cassandra/db/guardrails/Values.java | 1 + .../db/lifecycle/LifecycleTransaction.java | 1 + .../db/lifecycle/LogAwareFileLister.java | 12 ++- .../cassandra/db/lifecycle/LogFile.java | 1 + .../cassandra/db/lifecycle/LogRecord.java | 1 + .../cassandra/db/lifecycle/LogReplica.java | 6 +- .../cassandra/db/lifecycle/LogReplicaSet.java | 3 +- .../db/lifecycle/LogTransaction.java | 2 +- .../cassandra/db/lifecycle/Tracker.java | 1 + .../apache/cassandra/db/lifecycle/View.java | 1 + .../db/marshal/AbstractTimeUUIDType.java | 2 +- .../cassandra/db/marshal/AbstractType.java | 5 +- .../cassandra/db/marshal/AsciiType.java | 12 +-- .../cassandra/db/marshal/BooleanType.java | 4 +- .../db/marshal/ByteArrayAccessor.java | 3 +- .../db/marshal/ByteArrayObjectFactory.java | 9 ++- .../db/marshal/ByteBufferAccessor.java | 2 +- .../db/marshal/ByteBufferObjectFactory.java | 9 ++- .../apache/cassandra/db/marshal/ByteType.java | 2 +- .../cassandra/db/marshal/BytesType.java | 4 +- .../cassandra/db/marshal/CollectionType.java | 4 +- .../db/marshal/CounterColumnType.java | 4 +- .../apache/cassandra/db/marshal/DateType.java | 8 +- .../cassandra/db/marshal/DecimalType.java | 4 +- .../cassandra/db/marshal/DoubleType.java | 4 +- .../cassandra/db/marshal/DurationType.java | 4 +- .../db/marshal/DynamicCompositeType.java | 1 + .../cassandra/db/marshal/EmptyType.java | 4 +- .../cassandra/db/marshal/FloatType.java | 4 +- .../cassandra/db/marshal/FrozenType.java | 4 +- .../cassandra/db/marshal/InetAddressType.java | 4 +- .../cassandra/db/marshal/Int32Type.java | 4 +- .../cassandra/db/marshal/IntegerType.java | 4 +- .../cassandra/db/marshal/LexicalUUIDType.java | 4 +- .../apache/cassandra/db/marshal/ListType.java | 2 +- .../apache/cassandra/db/marshal/LongType.java | 4 +- .../db/marshal/PartitionerDefinedOrder.java | 6 +- .../cassandra/db/marshal/ReversedType.java | 4 +- .../cassandra/db/marshal/ShortType.java | 2 +- .../cassandra/db/marshal/SimpleDateType.java | 2 +- .../apache/cassandra/db/marshal/TimeType.java | 8 +- .../cassandra/db/marshal/TimestampType.java | 10 +-- .../cassandra/db/marshal/TupleType.java | 7 +- .../cassandra/db/marshal/TxnIdUtf8Type.java | 1 + .../cassandra/db/marshal/TypeParser.java | 1 + .../apache/cassandra/db/marshal/UTF8Type.java | 5 +- .../apache/cassandra/db/marshal/UUIDType.java | 6 +- .../apache/cassandra/db/marshal/UserType.java | 15 +++- .../cassandra/db/marshal/ValueAccessor.java | 7 +- .../memtable/AbstractAllocatorMemtable.java | 3 +- .../db/memtable/AbstractMemtable.java | 3 +- .../db/memtable/AbstractShardedMemtable.java | 2 +- .../cassandra/db/memtable/Flushing.java | 1 + .../cassandra/db/memtable/Memtable.java | 1 + .../db/memtable/ShardedSkipListMemtable.java | 3 +- .../db/memtable/SkipListMemtable.java | 1 + .../cassandra/db/memtable/TrieMemtable.java | 3 +- .../db/monitoring/MonitoringTask.java | 9 ++- .../db/partitions/AtomicBTreePartition.java | 4 +- .../db/partitions/CachedBTreePartition.java | 10 ++- .../partitions/ImmutableBTreePartition.java | 6 +- .../cassandra/db/partitions/Partition.java | 12 ++- .../db/partitions/PartitionIterator.java | 2 +- .../PartitionStatisticsCollector.java | 3 +- .../db/partitions/PartitionUpdate.java | 2 + .../db/partitions/PurgeFunction.java | 10 ++- .../SingletonUnfilteredPartitionIterator.java | 2 +- .../UnfilteredPartitionIterator.java | 2 +- .../repair/CassandraTableRepairManager.java | 6 +- .../db/repair/PendingAntiCompaction.java | 12 +-- .../cassandra/db/rows/AbstractCell.java | 1 + .../db/rows/AbstractRangeTombstoneMarker.java | 2 +- .../apache/cassandra/db/rows/AbstractRow.java | 2 +- .../rows/AbstractUnfilteredRowIterator.java | 5 +- .../apache/cassandra/db/rows/BTreeRow.java | 1 + .../cassandra/db/rows/BaseRowIterator.java | 2 +- .../apache/cassandra/db/rows/BufferCell.java | 2 +- .../apache/cassandra/db/rows/CellPath.java | 2 +- .../org/apache/cassandra/db/rows/Cells.java | 4 +- .../apache/cassandra/db/rows/ColumnData.java | 1 + .../cassandra/db/rows/ComplexColumnData.java | 1 + .../db/rows/DeserializationHelper.java | 11 +-- .../cassandra/db/rows/EncodingStats.java | 13 +++- .../db/rows/RangeTombstoneBoundMarker.java | 7 +- .../db/rows/RangeTombstoneBoundaryMarker.java | 8 +- .../db/rows/RangeTombstoneMarker.java | 6 +- .../org/apache/cassandra/db/rows/Row.java | 1 + .../db/rows/RowAndDeletionMergeIterator.java | 8 +- .../cassandra/db/rows/RowDiffListener.java | 4 +- .../org/apache/cassandra/db/rows/Rows.java | 13 +++- .../apache/cassandra/db/rows/Unfiltered.java | 2 +- .../db/rows/UnfilteredRowIterator.java | 2 +- .../db/rows/UnfilteredSerializer.java | 11 ++- .../db/streaming/CassandraIncomingFile.java | 1 + .../db/streaming/CassandraStreamManager.java | 1 + .../db/streaming/CassandraStreamReader.java | 1 + .../db/streaming/CassandraStreamReceiver.java | 1 + .../db/streaming/CassandraStreamWriter.java | 5 +- .../db/streaming/CompressionInfo.java | 2 +- .../cassandra/db/transform/BaseIterator.java | 1 + .../cassandra/db/transform/BaseRows.java | 8 +- .../db/transform/DuplicateRowChecker.java | 10 ++- .../apache/cassandra/db/transform/Filter.java | 7 +- .../cassandra/db/transform/RTBoundCloser.java | 6 +- .../db/transform/StoppingTransformation.java | 1 + .../db/transform/Transformation.java | 6 +- .../db/transform/UnfilteredPartitions.java | 2 +- .../cassandra/db/tries/InMemoryReadTrie.java | 3 +- .../cassandra/db/tries/InMemoryTrie.java | 8 +- .../org/apache/cassandra/db/tries/Trie.java | 1 + .../db/tries/TriePathReconstructor.java | 1 + .../org/apache/cassandra/db/view/View.java | 2 + .../apache/cassandra/db/view/ViewBuilder.java | 1 + .../cassandra/db/view/ViewBuilderTask.java | 1 + .../apache/cassandra/db/view/ViewManager.java | 21 +++-- .../db/view/ViewUpdateGenerator.java | 21 +++-- .../apache/cassandra/db/view/ViewUtils.java | 1 + .../db/virtual/AbstractLazyVirtualTable.java | 1 + .../virtual/AbstractLoggerVirtualTable.java | 4 +- .../AbstractMutableLazyVirtualTable.java | 1 + .../virtual/AbstractSchemaMetadataTable.java | 12 +-- .../db/virtual/AccordDebugKeyspace.java | 47 +++++------ .../db/virtual/AccordVirtualTables.java | 1 + .../db/virtual/BatchMetricsTable.java | 1 + .../db/virtual/CIDRFilteringMetricsTable.java | 4 +- .../cassandra/db/virtual/CachesTable.java | 5 +- .../cassandra/db/virtual/GossipInfoTable.java | 1 + .../db/virtual/InternodeInboundTable.java | 2 +- .../db/virtual/LogMessagesTable.java | 3 +- .../db/virtual/PartitionKeyStatsTable.java | 1 + .../cassandra/db/virtual/QueriesTable.java | 1 - .../db/virtual/RemoteToLocalVirtualTable.java | 1 + .../db/virtual/SchemaCommentsTable.java | 2 +- .../db/virtual/SchemaSecurityLabelsTable.java | 2 +- .../cassandra/db/virtual/SettingsTable.java | 7 +- .../db/virtual/SlowQueriesTable.java | 4 +- .../db/virtual/StreamingVirtualTable.java | 3 +- .../db/virtual/SystemPropertiesTable.java | 2 +- .../db/virtual/TableMetricTables.java | 7 +- .../db/virtual/VirtualKeyspaceRegistry.java | 1 + .../cassandra/db/virtual/VirtualMutation.java | 2 + .../cassandra/db/virtual/model/MetricRow.java | 1 + .../cassandra/dht/AccordBytesSplitter.java | 1 + .../apache/cassandra/dht/AccordSplitter.java | 1 + .../apache/cassandra/dht/BootStrapper.java | 3 +- .../apache/cassandra/dht/BootstrapEvent.java | 1 + .../cassandra/dht/ByteOrderedPartitioner.java | 2 + .../apache/cassandra/dht/IPartitioner.java | 4 +- .../cassandra/dht/LocalPartitioner.java | 3 +- .../cassandra/dht/Murmur3Partitioner.java | 1 + .../dht/OrderPreservingPartitioner.java | 7 +- .../org/apache/cassandra/dht/OwnedRanges.java | 1 + .../cassandra/dht/RandomPartitioner.java | 1 + src/java/org/apache/cassandra/dht/Range.java | 1 + .../dht/RangeFetchMapCalculator.java | 21 +++-- .../apache/cassandra/dht/RangeStreamer.java | 3 +- .../dht/ReversedLongLocalPartitioner.java | 1 + src/java/org/apache/cassandra/dht/Token.java | 1 + .../tokenallocator/OfflineTokenAllocator.java | 1 + .../ReplicationAwareTokenAllocator.java | 5 +- .../dht/tokenallocator/TokenAllocation.java | 1 - .../tokenallocator/TokenAllocatorEvent.java | 1 + .../diag/LastEventIdBroadcaster.java | 1 + .../cassandra/exceptions/RequestFailure.java | 2 +- .../apache/cassandra/fql/FullQueryLogger.java | 12 +-- .../FullQueryLoggerOptionsCompositeData.java | 1 + .../apache/cassandra/gms/EndpointState.java | 10 ++- .../apache/cassandra/gms/FailureDetector.java | 2 + .../apache/cassandra/gms/GossipDigest.java | 2 +- .../cassandra/gms/GossipDigestAck2.java | 2 +- .../apache/cassandra/gms/GossipDigestSyn.java | 2 +- .../apache/cassandra/gms/GossipShutdown.java | 1 + .../gms/GossipShutdownVerbHandler.java | 6 +- .../org/apache/cassandra/gms/Gossiper.java | 36 +++++---- .../apache/cassandra/gms/GossiperEvent.java | 1 + .../apache/cassandra/gms/HeartBeatState.java | 2 +- .../org/apache/cassandra/gms/IGossiper.java | 1 + .../apache/cassandra/gms/TokenSerializer.java | 18 +++-- .../apache/cassandra/gms/VersionedValue.java | 1 + .../cassandra/hints/ChecksummedDataInput.java | 7 +- .../hints/CompressedChecksummedDataInput.java | 2 +- .../hints/CompressedHintsWriter.java | 1 - .../hints/EncryptedChecksummedDataInput.java | 6 +- .../cassandra/hints/EncryptedHintsWriter.java | 3 +- src/java/org/apache/cassandra/hints/Hint.java | 3 +- .../org/apache/cassandra/hints/HintEvent.java | 1 + .../apache/cassandra/hints/HintMessage.java | 3 +- .../apache/cassandra/hints/HintsCatalog.java | 2 + .../cassandra/hints/HintsDescriptor.java | 7 +- .../hints/HintsDispatchExecutor.java | 2 + .../cassandra/hints/HintsDispatcher.java | 2 + .../apache/cassandra/hints/HintsReader.java | 4 +- .../apache/cassandra/hints/HintsService.java | 1 + .../apache/cassandra/hints/HintsStore.java | 2 + .../cassandra/hints/HintsWriteExecutor.java | 4 +- .../org/apache/cassandra/index/Index.java | 1 + .../apache/cassandra/index/IndexRegistry.java | 7 +- .../cassandra/index/IndexStatusManager.java | 1 + .../index/SecondaryIndexManager.java | 47 +++++++++-- .../index/SingletonIndexQueryPlan.java | 1 + .../apache/cassandra/index/TargetParser.java | 4 +- .../accord/CheckpointIntervalArrayIndex.java | 1 + .../cassandra/index/accord/IndexMetrics.java | 1 + .../cassandra/index/accord/MemtableIndex.java | 1 + .../index/accord/MemtableIndexManager.java | 1 + .../index/accord/RangeMemoryIndex.java | 2 + .../index/accord/RouteIndexFormat.java | 1 + .../index/accord/RouteJournalIndex.java | 1 + .../accord/RouteMemtableIndexManager.java | 1 + .../index/accord/RouteSSTableManager.java | 1 + .../cassandra/index/accord/SSTableIndex.java | 1 + .../index/accord/SSTableManager.java | 1 + .../index/internal/CassandraIndex.java | 31 +++++++- .../composites/ClusteringColumnIndex.java | 6 +- .../composites/CollectionEntryIndex.java | 4 +- .../composites/CollectionKeyIndex.java | 2 +- .../composites/CollectionKeyIndexBase.java | 6 +- .../composites/CollectionValueIndex.java | 13 +++- .../composites/PartitionKeyIndex.java | 6 +- .../composites/RegularColumnIndex.java | 7 +- .../index/internal/keys/KeysIndex.java | 12 ++- .../cassandra/index/sai/QueryContext.java | 1 + .../index/sai/SSTableContextManager.java | 2 + .../index/sai/StorageAttachedIndex.java | 5 +- .../sai/StorageAttachedIndexBuilder.java | 3 +- .../index/sai/StorageAttachedIndexGroup.java | 2 + .../index/sai/VectorQueryContext.java | 3 +- .../sai/analyzer/NonTokenizingAnalyzer.java | 1 + .../sai/disk/IndexSearchResultIterator.java | 4 +- .../cassandra/index/sai/disk/RowMapping.java | 1 + .../index/sai/disk/SSTableIndex.java | 1 + .../sai/disk/StorageAttachedIndexWriter.java | 2 + .../sai/disk/format/IndexDescriptor.java | 7 +- .../disk/io/BufferedChecksumIndexInput.java | 6 +- .../index/sai/disk/io/IndexFileUtils.java | 5 +- .../index/sai/disk/io/IndexInputReader.java | 5 +- .../index/sai/disk/io/IndexOutputWriter.java | 4 +- .../disk/v1/ColumnCompletionMarkerUtil.java | 5 +- .../index/sai/disk/v1/IndexWriterConfig.java | 3 +- .../index/sai/disk/v1/LongArray.java | 1 + .../sai/disk/v1/MemtableIndexWriter.java | 3 +- .../index/sai/disk/v1/MetadataSource.java | 10 ++- .../index/sai/disk/v1/MetadataWriter.java | 4 +- .../index/sai/disk/v1/SAICodecUtils.java | 5 +- .../index/sai/disk/v1/SSTableIndexWriter.java | 2 + .../sai/disk/v1/SkinnyPrimaryKeyMap.java | 3 +- .../index/sai/disk/v1/V1OnDiskFormat.java | 5 +- .../index/sai/disk/v1/WidePrimaryKeyMap.java | 3 +- .../BlockBalancedTreePostingsIndex.java | 1 + .../BlockBalancedTreePostingsWriter.java | 10 ++- .../v1/bbtree/BlockBalancedTreeQueries.java | 3 +- .../v1/bbtree/BlockBalancedTreeReader.java | 17 ++-- .../v1/bbtree/BlockBalancedTreeWalker.java | 11 +-- .../v1/bbtree/BlockBalancedTreeWriter.java | 15 ++-- .../disk/v1/bbtree/NumericIndexWriter.java | 15 ++-- .../v1/bitpack/AbstractBlockPackedReader.java | 5 +- .../v1/bitpack/AbstractBlockPackedWriter.java | 3 +- .../disk/v1/bitpack/BlockPackedReader.java | 3 +- .../bitpack/MonotonicBlockPackedReader.java | 7 +- .../disk/v1/bitpack/NumericValuesWriter.java | 3 +- .../index/sai/disk/v1/keystore/KeyLookup.java | 6 +- .../sai/disk/v1/keystore/KeyStoreWriter.java | 10 ++- .../v1/postings/FilteringPostingList.java | 3 +- .../disk/v1/postings/MergePostingList.java | 1 + .../v1/postings/PackedLongsPostingList.java | 3 +- .../v1/postings/PostingListRangeIterator.java | 4 +- .../sai/disk/v1/postings/PostingsReader.java | 10 ++- .../sai/disk/v1/postings/PostingsWriter.java | 16 ++-- .../disk/v1/postings/VectorPostingList.java | 3 +- .../segment/LiteralIndexSegmentSearcher.java | 1 + .../LiteralIndexSegmentTermsReader.java | 5 +- .../segment/NumericIndexSegmentSearcher.java | 3 +- .../sai/disk/v1/segment/SegmentBuilder.java | 2 + .../sai/disk/v1/segment/SegmentMetadata.java | 5 +- .../disk/v1/segment/SegmentTrieBuffer.java | 6 +- .../segment/VectorIndexSegmentSearcher.java | 9 ++- .../sai/disk/v1/trie/LiteralIndexWriter.java | 7 +- .../v1/trie/TrieTermsDictionaryReader.java | 1 + .../v1/trie/TrieTermsDictionaryWriter.java | 3 +- .../v1/vector/CompactionVectorValues.java | 4 +- .../index/sai/disk/v1/vector/DiskAnn.java | 15 ++-- .../sai/disk/v1/vector/OnDiskOrdinalsMap.java | 3 +- .../index/sai/disk/v1/vector/OnHeapGraph.java | 29 +++---- .../v1/vector/RandomAccessReaderAdapter.java | 3 +- .../disk/v1/vector/VectorPostingsWriter.java | 1 + .../KeyRangeIntersectionIterator.java | 5 +- .../index/sai/iterators/KeyRangeIterator.java | 4 +- .../iterators/KeyRangeOrderingIterator.java | 1 + .../sai/memory/InMemoryKeyRangeIterator.java | 1 + .../index/sai/memory/MemoryIndex.java | 12 +-- .../index/sai/memory/MemtableIndex.java | 2 +- .../sai/memory/MemtableTermsIterator.java | 6 +- .../index/sai/memory/VectorMemoryIndex.java | 6 +- .../index/sai/metrics/AbstractMetrics.java | 1 + .../index/sai/metrics/ColumnQueryMetrics.java | 1 + .../index/sai/metrics/IndexGroupMetrics.java | 1 + .../index/sai/metrics/IndexMetrics.java | 1 + .../index/sai/metrics/TableQueryMetrics.java | 1 + .../index/sai/metrics/TableStateMetrics.java | 1 + .../plan/StorageAttachedIndexQueryPlan.java | 1 + .../plan/StorageAttachedIndexSearcher.java | 6 +- .../index/sai/plan/VectorTopKProcessor.java | 2 + .../index/sai/utils/IndexTermType.java | 2 +- .../index/sai/utils/NamedMemoryLimiter.java | 2 + .../index/sai/utils/PartitionInfo.java | 1 + .../index/sai/utils/TermsIterator.java | 1 + .../index/sai/view/IndexViewManager.java | 2 +- .../index/sai/view/RangeTermTree.java | 1 + .../cassandra/index/sasi/SASIIndex.java | 1 + .../cassandra/index/sasi/SSTableIndex.java | 1 + .../org/apache/cassandra/index/sasi/Term.java | 2 +- .../cassandra/index/sasi/TermIterator.java | 15 ++-- .../sasi/analyzer/DelimiterAnalyzer.java | 2 +- .../sasi/analyzer/NonTokenizingAnalyzer.java | 12 +-- .../index/sasi/analyzer/StandardAnalyzer.java | 16 ++-- .../sasi/analyzer/filter/StemmerFactory.java | 9 ++- .../sasi/analyzer/filter/StopWordFactory.java | 5 +- .../cassandra/index/sasi/conf/IndexMode.java | 16 ++-- .../index/sasi/conf/view/PrefixTermTree.java | 6 +- .../index/sasi/conf/view/RangeTermTree.java | 2 +- .../index/sasi/conf/view/TermTree.java | 2 +- .../cassandra/index/sasi/conf/view/View.java | 20 +++-- .../sasi/disk/AbstractTokenTreeBuilder.java | 8 +- .../sasi/disk/DynamicTokenTreeBuilder.java | 11 ++- .../index/sasi/disk/OnDiskBlock.java | 2 +- .../index/sasi/disk/OnDiskIndex.java | 2 +- .../index/sasi/disk/OnDiskIndexBuilder.java | 50 ++++++++---- .../sasi/disk/PerSSTableIndexWriter.java | 1 + .../sasi/disk/StaticTokenTreeBuilder.java | 6 +- .../cassandra/index/sasi/disk/Token.java | 3 +- .../cassandra/index/sasi/disk/TokenTree.java | 22 ++++-- .../index/sasi/disk/TokenTreeBuilder.java | 7 +- .../index/sasi/memory/IndexMemtable.java | 6 +- .../index/sasi/memory/KeyRangeIterator.java | 9 +-- .../cassandra/index/sasi/memory/MemIndex.java | 2 +- .../index/sasi/memory/SkipListMemIndex.java | 6 +- .../index/sasi/memory/TrieMemIndex.java | 25 +++--- .../cassandra/index/sasi/plan/Expression.java | 21 +++-- .../cassandra/index/sasi/plan/Operation.java | 20 +++-- .../index/sasi/plan/QueryController.java | 10 ++- .../index/sasi/plan/SASIIndexSearcher.java | 16 +++- .../cassandra/index/sasi/sa/ByteTerm.java | 2 +- .../cassandra/index/sasi/sa/CharTerm.java | 6 +- .../cassandra/index/sasi/sa/IntegralSA.java | 2 +- .../apache/cassandra/index/sasi/sa/SA.java | 2 +- .../cassandra/index/sasi/sa/SuffixSA.java | 6 +- .../apache/cassandra/index/sasi/sa/Term.java | 2 +- .../cassandra/index/sasi/sa/TermIterator.java | 4 +- .../index/sasi/utils/CombinedTerm.java | 10 ++- .../sasi/utils/CombinedTermIterator.java | 2 +- .../index/sasi/utils/MappedBuffer.java | 4 +- .../index/sasi/utils/OnDiskIndexIterator.java | 2 +- .../sasi/utils/RangeIntersectionIterator.java | 6 +- .../index/sasi/utils/RangeUnionIterator.java | 5 +- .../cassandra/index/sasi/utils/TypeUtil.java | 7 +- .../index/sasi/utils/trie/PatriciaTrie.java | 10 ++- .../compress/CompressedSequentialWriter.java | 1 + .../io/compress/CompressionMetadata.java | 1 + .../io/compress/DeflateCompressor.java | 7 +- .../cassandra/io/compress/LZ4Compressor.java | 6 +- .../io/compress/ZstdCompressorBase.java | 4 +- .../io/compress/ZstdDictionaryCompressor.java | 7 +- .../io/sstable/CQLSSTableWriter.java | 6 +- .../io/sstable/ClusteringDescriptor.java | 2 +- .../cassandra/io/sstable/Descriptor.java | 1 + .../cassandra/io/sstable/Downsampling.java | 6 +- .../cassandra/io/sstable/GaugeProvider.java | 1 + .../io/sstable/PartitionDescriptor.java | 4 +- .../apache/cassandra/io/sstable/SSTable.java | 3 +- .../io/sstable/SSTableCursorKeyReader.java | 4 +- .../io/sstable/SSTableCursorReader.java | 17 +++- .../io/sstable/SSTableCursorWriter.java | 8 +- .../io/sstable/SSTableSimpleIterator.java | 12 ++- .../sstable/SSTableSimpleUnsortedWriter.java | 3 +- .../io/sstable/SSTableZeroCopyWriter.java | 1 + .../io/sstable/SimpleGaugeProvider.java | 2 +- .../io/sstable/UUIDBasedSSTableId.java | 1 + .../io/sstable/format/SSTableFormat.java | 1 + .../io/sstable/format/SSTableReader.java | 5 +- .../format/SSTableReaderLoadingBuilder.java | 1 + .../io/sstable/format/SSTableWriter.java | 2 + .../sstable/format/SortedTableScrubber.java | 2 + .../sstable/format/SortedTableVerifier.java | 1 + .../io/sstable/format/SortedTableWriter.java | 1 + .../io/sstable/format/TOCComponent.java | 1 + .../sstable/format/big/BigTableKeyReader.java | 1 + .../io/sstable/format/big/BigTableReader.java | 19 ++++- .../io/sstable/format/big/BigTableWriter.java | 1 + .../io/sstable/format/big/RowIndexEntry.java | 4 +- .../io/sstable/format/bti/BtiFormat.java | 1 + .../io/sstable/format/bti/BtiTableWriter.java | 1 + .../io/sstable/format/bti/PartitionIndex.java | 1 + .../io/sstable/format/bti/RowIndexReader.java | 1 + .../format/bti/SSTableReversedIterator.java | 1 + .../io/sstable/indexsummary/IndexSummary.java | 1 + .../indexsummary/IndexSummaryManager.java | 3 +- .../IndexSummaryRedistribution.java | 1 + .../io/sstable/keycache/KeyCache.java | 1 + .../io/sstable/keycache/KeyCacheSupport.java | 1 + .../sstable/metadata/MetadataCollector.java | 5 +- .../sstable/metadata/MetadataSerializer.java | 1 + .../io/sstable/metadata/StatsMetadata.java | 1 - .../org/apache/cassandra/io/tries/Walker.java | 4 +- .../io/util/BufferedDataOutputStreamPlus.java | 1 + .../cassandra/io/util/DataOutputBuffer.java | 3 +- .../cassandra/io/util/DataOutputPlus.java | 8 +- .../io/util/DataOutputStreamPlus.java | 3 +- .../org/apache/cassandra/io/util/File.java | 2 + .../apache/cassandra/io/util/FileUtils.java | 1 + .../org/apache/cassandra/io/util/Memory.java | 1 + .../io/util/MmappedRegionsCache.java | 1 + .../apache/cassandra/io/util/PathUtils.java | 5 +- .../io/util/RebufferingInputStream.java | 1 + .../io/util/ResizableByteBuffer.java | 3 +- .../apache/cassandra/io/util/SafeMemory.java | 1 + .../io/util/SimpleCachedBufferPool.java | 3 +- .../io/util/TailOverridingRebufferer.java | 1 + .../io/util/ThreadLocalByteBufferHolder.java | 4 +- .../io/util/ThreadLocalReadAheadBuffer.java | 3 +- .../io/util/TrackedDataInputPlus.java | 1 + .../cassandra/io/util/WrappingRebufferer.java | 1 + .../cassandra/journal/ActiveSegment.java | 7 +- .../apache/cassandra/journal/Component.java | 1 + .../cassandra/journal/EntrySerializer.java | 11 +-- .../org/apache/cassandra/journal/Flusher.java | 4 +- .../org/apache/cassandra/journal/Journal.java | 11 ++- .../apache/cassandra/journal/Metadata.java | 6 +- .../org/apache/cassandra/journal/Metrics.java | 1 + .../apache/cassandra/journal/OnDiskIndex.java | 2 + .../org/apache/cassandra/journal/Segment.java | 1 + .../apache/cassandra/journal/Segments.java | 4 +- .../cassandra/journal/StaticSegment.java | 19 ++--- .../locator/AbstractReplicaCollection.java | 12 +-- .../locator/AbstractReplicationStrategy.java | 5 +- .../locator/AzureCloudLocationProvider.java | 2 +- .../locator/DynamicEndpointSnitch.java | 11 ++- .../locator/DynamicEndpointSnitchMBean.java | 2 +- .../apache/cassandra/locator/Endpoints.java | 6 +- .../cassandra/locator/EndpointsByRange.java | 5 +- .../cassandra/locator/EndpointsByReplica.java | 6 +- .../cassandra/locator/EndpointsForRange.java | 9 ++- .../cassandra/locator/EndpointsForToken.java | 6 +- .../cassandra/locator/InetAddressAndPort.java | 4 +- .../locator/NetworkTopologyProximity.java | 4 +- .../locator/NetworkTopologyStrategy.java | 1 + .../cassandra/locator/NoOpProximity.java | 4 +- .../cassandra/locator/NodeProximity.java | 4 +- .../cassandra/locator/RangesAtEndpoint.java | 15 ++-- .../cassandra/locator/RangesByEndpoint.java | 8 +- .../locator/ReconnectableSnitchHelper.java | 12 ++- .../cassandra/locator/ReplicaLayout.java | 6 +- .../cassandra/locator/ReplicaPlans.java | 7 +- .../apache/cassandra/locator/Replicas.java | 1 - .../cassandra/locator/SimpleSeedProvider.java | 6 +- .../cassandra/locator/SnitchProperties.java | 6 +- .../cassandra/locator/SystemReplicas.java | 1 + .../locator/TopologyFileLocationProvider.java | 2 +- .../metrics/AbstractCacheMetrics.java | 3 +- .../cassandra/metrics/AccordCacheMetrics.java | 1 + .../metrics/AccordCoordinatorMetrics.java | 11 ++- .../metrics/AccordExecutorMetrics.java | 1 + .../cassandra/metrics/AccordMetricUtils.java | 4 +- .../metrics/AccordReplicaMetrics.java | 4 +- .../metrics/AccordSystemMetrics.java | 8 +- .../cassandra/metrics/AutoRepairMetrics.java | 3 +- .../metrics/AutoRepairMetricsManager.java | 4 +- .../cassandra/metrics/BufferPoolMetrics.java | 1 + .../apache/cassandra/metrics/CQLMetrics.java | 1 + .../cassandra/metrics/CacheAccessMetrics.java | 3 +- .../cassandra/metrics/CacheMetrics.java | 1 + .../cassandra/metrics/CacheSizeMetrics.java | 1 + .../metrics/CassandraMetricsRegistry.java | 9 ++- .../cassandra/metrics/CassandraReservoir.java | 4 +- .../cassandra/metrics/ChunkCacheMetrics.java | 2 + .../metrics/ClientMessageSizeMetrics.java | 4 +- .../cassandra/metrics/ClientMetrics.java | 4 +- .../metrics/ClientRequestMetrics.java | 1 + .../cassandra/metrics/CommitLogMetrics.java | 3 +- .../cassandra/metrics/CompactionMetrics.java | 5 +- .../DecayingEstimatedHistogramReservoir.java | 11 +-- .../metrics/DroppedMessageMetrics.java | 5 +- .../cassandra/metrics/FrequencySampler.java | 4 +- .../metrics/HintedHandoffMetrics.java | 6 +- .../metrics/HintsServiceMetrics.java | 7 +- .../metrics/InternodeInboundMetrics.java | 3 +- .../metrics/InternodeOutboundMetrics.java | 4 +- .../cassandra/metrics/KeyspaceMetrics.java | 4 +- .../cassandra/metrics/LatencyMetrics.java | 3 +- .../metrics/LogLinearDecayingHistograms.java | 1 + .../cassandra/metrics/LogLinearHistogram.java | 2 +- .../cassandra/metrics/MessagingMetrics.java | 8 +- .../cassandra/metrics/OnDemandHistogram.java | 1 + .../cassandra/metrics/OverrideHistogram.java | 1 + .../cassandra/metrics/RatioGaugeSet.java | 1 + .../cassandra/metrics/RepairMetrics.java | 4 +- .../cassandra/metrics/RestorableMeter.java | 3 +- .../org/apache/cassandra/metrics/Sampler.java | 4 +- .../cassandra/metrics/SamplingManager.java | 1 + .../metrics/ShardedDecayingHistograms.java | 1 + .../cassandra/metrics/ShardedHistogram.java | 1 + .../cassandra/metrics/ShardedHitRate.java | 1 + .../cassandra/metrics/ShardedLongGauges.java | 4 +- .../cassandra/metrics/StorageMetrics.java | 1 + .../cassandra/metrics/StreamingMetrics.java | 4 +- .../apache/cassandra/metrics/TCMMetrics.java | 1 + .../cassandra/metrics/TableMetrics.java | 13 ++-- .../cassandra/metrics/ThreadLocalMeter.java | 2 +- .../cassandra/metrics/ThreadLocalMetrics.java | 3 +- .../cassandra/metrics/ThreadPoolMetrics.java | 2 +- .../org/apache/cassandra/metrics/Timer.java | 1 + .../metrics/UnweightedCacheMetrics.java | 1 + .../cassandra/metrics/ViewWriteMetrics.java | 6 +- .../cassandra/net/AbstractMessageHandler.java | 10 ++- .../cassandra/net/AsyncChannelOutputPlus.java | 5 +- .../cassandra/net/AsyncChannelPromise.java | 3 +- .../cassandra/net/AsyncMessageOutputPlus.java | 3 +- .../net/AsyncStreamingInputPlus.java | 5 +- .../net/AsyncStreamingOutputPlus.java | 14 ++-- .../cassandra/net/BufferPoolAllocator.java | 7 +- .../net/EndpointMessagingVersions.java | 1 - .../apache/cassandra/net/ForwardingInfo.java | 13 ++-- .../apache/cassandra/net/FrameDecoderCrc.java | 4 +- .../apache/cassandra/net/FrameDecoderLZ4.java | 7 +- .../apache/cassandra/net/FrameEncoder.java | 7 +- .../apache/cassandra/net/FrameEncoderCrc.java | 3 +- .../apache/cassandra/net/FrameEncoderLZ4.java | 9 ++- .../apache/cassandra/net/FutureResult.java | 2 +- .../net/GlobalBufferPoolAllocator.java | 3 +- .../cassandra/net/HandshakeProtocol.java | 12 +-- .../net/InboundConnectionInitiator.java | 35 +++++---- .../net/InboundConnectionSettings.java | 4 +- .../cassandra/net/InboundMessageHandler.java | 11 +-- .../cassandra/net/InboundMessageHandlers.java | 3 +- .../org/apache/cassandra/net/InboundSink.java | 5 +- .../apache/cassandra/net/InboundSockets.java | 14 ++-- .../net/InternodeConnectionUtils.java | 1 + .../net/LocalBufferPoolAllocator.java | 3 +- .../org/apache/cassandra/net/Message.java | 2 + .../apache/cassandra/net/MessageDelivery.java | 2 + .../cassandra/net/MessagingService.java | 4 +- .../cassandra/net/OutboundConnection.java | 42 ++++++---- .../net/OutboundConnectionInitiator.java | 39 +++++----- .../net/OutboundConnectionSettings.java | 3 +- .../cassandra/net/OutboundConnections.java | 19 +++-- .../cassandra/net/OutboundMessageQueue.java | 4 +- .../org/apache/cassandra/net/PingRequest.java | 4 +- .../cassandra/net/RequestCallbacks.java | 2 + .../apache/cassandra/net/ResourceLimits.java | 4 +- .../apache/cassandra/net/ResponseContext.java | 1 + .../net/SharedDefaultFileRegion.java | 3 +- .../apache/cassandra/net/SocketFactory.java | 21 ++--- .../StartupClusterConnectivityChecker.java | 5 +- src/java/org/apache/cassandra/net/Verb.java | 2 +- .../cassandra/repair/AbstractRepairTask.java | 1 + .../repair/AsymmetricRemoteSyncTask.java | 1 - .../cassandra/repair/LocalSyncTask.java | 1 + .../cassandra/repair/RepairCoordinator.java | 3 +- .../apache/cassandra/repair/RepairJob.java | 3 + .../repair/RepairMessageVerbHandler.java | 2 +- .../cassandra/repair/RepairSession.java | 2 + .../apache/cassandra/repair/Scheduler.java | 1 + .../cassandra/repair/StreamingRepairTask.java | 6 +- .../repair/SymmetricRemoteSyncTask.java | 1 + .../org/apache/cassandra/repair/SyncTask.java | 2 +- .../apache/cassandra/repair/Validator.java | 1 + .../IncomingRepairStreamTracker.java | 1 + .../repair/autorepair/AutoRepair.java | 11 ++- .../repair/autorepair/AutoRepairConfig.java | 2 +- .../repair/autorepair/AutoRepairState.java | 44 +++++------ .../repair/autorepair/AutoRepairUtils.java | 29 ++++--- .../FixedSplitTokenRangeSplitter.java | 4 +- .../repair/consistent/ConsistentSession.java | 3 +- .../repair/consistent/CoordinatorSession.java | 15 ++-- .../consistent/CoordinatorSessions.java | 6 +- .../repair/consistent/LocalSessions.java | 38 +++++---- .../repair/consistent/admin/PendingStat.java | 1 + .../repair/consistent/admin/PendingStats.java | 1 + .../repair/consistent/admin/RepairStats.java | 9 ++- .../repair/messages/RepairMessage.java | 8 +- .../repair/messages/RepairOption.java | 1 + .../cassandra/schema/AutoRepairParams.java | 1 + .../cassandra/schema/CQLTypeParser.java | 4 +- .../cassandra/schema/CachingParams.java | 1 + .../cassandra/schema/ColumnMetadata.java | 1 + .../cassandra/schema/CompactionParams.java | 1 + .../cassandra/schema/CompressionParams.java | 9 ++- .../cassandra/schema/DistributedSchema.java | 27 +++---- .../cassandra/schema/IndexMetadata.java | 3 +- .../org/apache/cassandra/schema/Indexes.java | 7 +- .../cassandra/schema/KeyspaceMetadata.java | 6 +- .../cassandra/schema/KeyspaceParams.java | 2 +- .../apache/cassandra/schema/Keyspaces.java | 2 +- .../cassandra/schema/PartitionDenylist.java | 11 +-- .../org/apache/cassandra/schema/Schema.java | 1 + .../apache/cassandra/schema/SchemaEvent.java | 1 + .../cassandra/schema/SchemaKeyspace.java | 77 +++++++++++++++---- .../cassandra/schema/SchemaProvider.java | 1 + .../schema/SchemaTransformation.java | 4 +- .../schema/SystemDistributedKeyspace.java | 3 +- .../org/apache/cassandra/schema/TableId.java | 4 +- .../cassandra/schema/TableMetadata.java | 9 ++- .../apache/cassandra/schema/TableParams.java | 2 +- .../org/apache/cassandra/schema/Tables.java | 7 +- .../org/apache/cassandra/schema/Types.java | 30 ++++++-- .../cassandra/schema/UserFunctions.java | 21 +++-- .../apache/cassandra/schema/ViewMetadata.java | 7 +- .../org/apache/cassandra/schema/Views.java | 5 +- .../security/AbstractCryptoProvider.java | 12 +-- .../security/AbstractSslContextFactory.java | 9 ++- .../cassandra/security/CipherFactory.java | 7 +- .../security/DefaultCryptoProvider.java | 1 + .../cassandra/security/EncryptionContext.java | 1 + .../cassandra/security/EncryptionUtils.java | 4 +- .../security/FileBasedSslContextFactory.java | 1 + .../security/ISslContextFactory.java | 4 +- .../cassandra/security/JKSKeyProvider.java | 4 +- .../security/PEMBasedSslContextFactory.java | 1 + .../apache/cassandra/security/PEMReader.java | 2 + .../apache/cassandra/security/SSLFactory.java | 9 ++- .../security/ThreadAwareSecurityManager.java | 3 +- .../serializers/BytesSerializer.java | 4 +- .../serializers/CollectionSerializer.java | 2 +- .../serializers/DecimalSerializer.java | 6 +- .../serializers/DurationSerializer.java | 6 +- .../serializers/InetAddressSerializer.java | 6 +- .../serializers/IntegerSerializer.java | 6 +- .../serializers/TimestampSerializer.java | 9 ++- .../service/AbstractWriteResponseHandler.java | 1 + .../service/ActiveRepairService.java | 4 +- .../service/ActiveRepairServiceMBean.java | 1 + .../cassandra/service/AutoRepairService.java | 18 ++--- .../apache/cassandra/service/CASRequest.java | 1 + .../cassandra/service/CassandraDaemon.java | 26 ++++--- .../apache/cassandra/service/ClientState.java | 23 +++--- .../apache/cassandra/service/ClientWarn.java | 2 +- .../service/DataResurrectionCheck.java | 5 +- .../DatacenterSyncWriteResponseHandler.java | 4 +- .../DatacenterWriteResponseHandler.java | 6 +- .../service/DefaultDiskErrorsHandler.java | 1 + .../service/DiskErrorsHandlerService.java | 1 + .../cassandra/service/EchoVerbHandler.java | 7 +- .../service/FileSystemOwnershipCheck.java | 7 +- .../apache/cassandra/service/GCInspector.java | 1 - .../cassandra/service/LoadBroadcaster.java | 13 +++- .../service/NativeTransportService.java | 11 +-- .../org/apache/cassandra/service/Rebuild.java | 2 + .../cassandra/service/RetryStrategy.java | 18 +++-- .../service/SSTablesGlobalTracker.java | 1 + .../cassandra/service/StartupChecks.java | 6 +- .../cassandra/service/StorageProxy.java | 3 + .../cassandra/service/StorageService.java | 4 +- .../service/StorageServiceMBean.java | 1 + .../cassandra/service/TimeoutStrategy.java | 3 +- .../apache/cassandra/service/TokenRange.java | 3 +- .../service/WriteResponseHandler.java | 8 +- .../AbstractAccordSegmentCompactor.java | 7 +- .../cassandra/service/accord/AccordCache.java | 5 +- .../service/accord/AccordCacheEntry.java | 1 + .../service/accord/AccordCommandStore.java | 2 + .../service/accord/AccordCommandStores.java | 1 + .../service/accord/AccordDataStore.java | 1 + .../service/accord/AccordDurableOnFlush.java | 3 +- .../service/accord/AccordEndpointMapper.java | 2 + .../service/accord/AccordExecutor.java | 3 +- .../AccordExecutorAbstractLockLoop.java | 1 + .../accord/AccordExecutorAsyncSubmit.java | 1 + .../service/accord/AccordExecutorLoops.java | 4 +- .../service/accord/AccordExecutorSimple.java | 1 + .../service/accord/AccordFastPath.java | 3 +- .../accord/AccordFastPathCoordinator.java | 16 ++-- .../accord/AccordFetchCoordinator.java | 1 + .../service/accord/AccordJournal.java | 7 +- .../service/accord/AccordJournalTable.java | 3 + .../accord/AccordJournalValueSerializers.java | 1 + .../service/accord/AccordKeyspace.java | 2 + .../service/accord/AccordMessageSink.java | 44 ++++++++++- .../service/accord/AccordObjectSizes.java | 7 +- .../service/accord/AccordOperations.java | 2 +- .../accord/AccordResponseVerbHandler.java | 1 + .../service/accord/AccordResult.java | 2 + .../service/accord/AccordSafeCommand.java | 1 + .../accord/AccordSafeCommandStore.java | 2 + .../service/accord/AccordSerializers.java | 1 + .../service/accord/AccordService.java | 30 ++++---- .../service/accord/AccordStaleReplicas.java | 1 + .../service/accord/AccordSyncPropagator.java | 6 +- .../cassandra/service/accord/AccordTask.java | 6 +- .../service/accord/AccordTopology.java | 1 + .../service/accord/AccordTopologyService.java | 8 +- .../service/accord/AccordTracing.java | 1 + .../service/accord/AccordVerbHandler.java | 1 + .../accord/ClientRequestBookkeeping.java | 1 + .../service/accord/CommandsForRanges.java | 5 +- .../service/accord/DebugBlockedTxns.java | 1 + .../service/accord/EndpointMapping.java | 1 + .../service/accord/IAccordService.java | 8 +- .../accord/ImmediateAsyncExecutor.java | 1 + .../cassandra/service/accord/JournalKey.java | 9 ++- .../service/accord/RangeSearcher.java | 1 + .../accord/RangeTreeRangeAccessor.java | 1 + .../service/accord/RequestBookkeeping.java | 2 + .../service/accord/RouteInMemoryIndex.java | 6 +- .../accord/TimeOnlyRequestBookkeeping.java | 1 + .../cassandra/service/accord/TokenRange.java | 1 + .../service/accord/WatermarkCollector.java | 4 +- .../service/accord/api/AccordAgent.java | 6 +- .../service/accord/api/AccordRoutableKey.java | 1 + .../service/accord/api/AccordScheduler.java | 1 + .../service/accord/api/AccordTimeService.java | 1 + .../accord/api/AccordTopologySorter.java | 1 + .../accord/api/AccordWaitStrategies.java | 1 + .../service/accord/api/PartitionKey.java | 1 + .../service/accord/api/TokenKey.java | 1 + .../accord/fastpath/FastPathStrategy.java | 1 + .../ParameterizedFastPathStrategy.java | 5 +- .../accord/interop/AccordInteropAdapter.java | 1 + .../accord/interop/AccordInteropApply.java | 4 +- .../interop/AccordInteropExecution.java | 1 + .../accord/interop/AccordInteropPersist.java | 1 + .../accord/interop/AccordInteropRead.java | 2 + .../interop/AccordInteropReadCallback.java | 1 + .../interop/AccordInteropReadRepair.java | 2 + .../interop/AccordInteropStableThenRead.java | 2 + .../accord/journal/AccordTopologyUpdate.java | 5 +- .../service/accord/repair/AccordRepair.java | 2 + .../accord/serializers/AcceptSerializers.java | 1 + .../accord/serializers/ApplySerializers.java | 1 + .../accord/serializers/AwaitSerializers.java | 1 + .../BeginInvalidationSerializers.java | 1 + .../serializers/CheckStatusSerializers.java | 1 + .../serializers/CommandSerializers.java | 1 + .../serializers/CommandStoreSerializers.java | 1 + .../accord/serializers/CommitSerializers.java | 1 + .../accord/serializers/DepsSerializers.java | 1 + .../accord/serializers/EnumSerializer.java | 1 + .../accord/serializers/FetchSerializers.java | 1 + .../GetDurableBeforeSerializers.java | 1 + .../GetEphmrlReadDepsSerializers.java | 1 + .../GetMaxConflictSerializers.java | 1 + .../IVersionedWithKeysSerializer.java | 6 +- .../accord/serializers/InformSerializers.java | 1 + .../accord/serializers/KeySerializers.java | 3 +- .../serializers/LatestDepsSerializers.java | 1 + .../serializers/PreacceptSerializers.java | 2 + .../serializers/ReadDataSerializer.java | 1 + .../serializers/RecoverySerializers.java | 2 + .../accord/serializers/ResultSerializers.java | 1 + .../accord/serializers/SerializePacked.java | 4 +- .../serializers/SetDurableSerializers.java | 1 + .../accord/serializers/TableMetadatas.java | 1 + .../serializers/TableMetadatasAndKeys.java | 1 + .../serializers/TopologySerializers.java | 4 +- .../serializers/TxnRequestSerializer.java | 1 + .../serializers/WaitingOnSerializer.java | 1 + .../service/accord/txn/AbstractKeySorted.java | 1 + ...actParameterisedUnversionedSerialized.java | 1 + ...tractParameterisedVersionedSerialized.java | 2 + .../accord/txn/AbstractSerialized.java | 1 + .../service/accord/txn/AccordUpdate.java | 2 + .../service/accord/txn/TxnCondition.java | 2 + .../cassandra/service/accord/txn/TxnData.java | 4 +- .../service/accord/txn/TxnDataKeyValue.java | 1 + .../service/accord/txn/TxnDataRangeValue.java | 2 + .../service/accord/txn/TxnDataValue.java | 1 + .../service/accord/txn/TxnNamedRead.java | 3 +- .../service/accord/txn/TxnQuery.java | 2 + .../cassandra/service/accord/txn/TxnRead.java | 2 + .../service/accord/txn/TxnReference.java | 1 + .../service/accord/txn/TxnUpdate.java | 2 + .../service/accord/txn/TxnWrite.java | 1 + .../accord/txn/UnrecoverableRepairUpdate.java | 2 + .../migration/ConsensusKeyMigrationState.java | 11 ++- .../migration/ConsensusMigratedAt.java | 1 + .../ConsensusMigrationMutationHelper.java | 3 + .../ConsensusMigrationRepairResult.java | 1 + .../migration/ConsensusMigrationState.java | 1 + .../migration/ConsensusRequestRouter.java | 2 + .../migration/ConsensusTableMigration.java | 6 +- .../migration/TableMigrationState.java | 2 + .../disk/usage/DiskUsageBroadcaster.java | 1 + .../service/disk/usage/DiskUsageMonitor.java | 1 + .../service/pager/AbstractQueryPager.java | 16 +++- .../service/pager/AggregationQueryPager.java | 8 +- .../service/pager/MultiPartitionPager.java | 21 ++--- .../cassandra/service/pager/PagingState.java | 15 +++- .../pager/PartitionRangeQueryPager.java | 12 ++- .../cassandra/service/pager/QueryPager.java | 2 +- .../service/pager/SinglePartitionPager.java | 8 +- .../service/paxos/AbstractPaxosRepair.java | 2 + .../cassandra/service/paxos/Commit.java | 1 + .../service/paxos/ContentionStrategy.java | 26 ++++--- .../apache/cassandra/service/paxos/Paxos.java | 4 +- .../cassandra/service/paxos/PaxosPrepare.java | 1 + .../cassandra/service/paxos/PaxosPropose.java | 3 +- .../cassandra/service/paxos/PaxosRepair.java | 2 + .../service/paxos/PaxosRepairHistory.java | 5 +- .../service/paxos/PaxosRequestCallback.java | 2 +- .../cassandra/service/paxos/PaxosState.java | 4 +- .../service/paxos/cleanup/PaxosCleanup.java | 1 + .../cleanup/PaxosCleanupLocalCoordinator.java | 1 + .../paxos/cleanup/PaxosCleanupRequest.java | 1 + .../cleanup/PaxosStartPrepareCleanup.java | 2 +- .../paxos/uncommitted/PaxosBallotTracker.java | 1 + .../service/paxos/uncommitted/PaxosRows.java | 2 +- .../paxos/uncommitted/PaxosStateTracker.java | 1 + .../uncommitted/PaxosUncommittedTracker.java | 2 +- .../uncommitted/UncommittedTableData.java | 1 + .../paxos/v1/AbstractPaxosCallback.java | 2 +- .../paxos/v1/AbstractPaxosVerbHandler.java | 4 +- .../service/paxos/v1/PrepareCallback.java | 14 ++-- .../service/paxos/v1/ProposeCallback.java | 2 +- .../service/reads/AbstractReadExecutor.java | 1 + .../cassandra/service/reads/DataResolver.java | 1 + .../reads/HybridSpeculativeRetryPolicy.java | 2 +- .../PercentileSpeculativeRetryPolicy.java | 2 +- .../cassandra/service/reads/ReadCallback.java | 1 + .../reads/range/RangeCommandIterator.java | 1 + .../service/reads/range/RangeCommands.java | 1 + .../reads/repair/AbstractReadRepair.java | 3 +- .../reads/repair/BlockingReadRepair.java | 4 +- .../reads/repair/ReadOnlyReadRepair.java | 3 +- .../service/reads/repair/ReadRepair.java | 1 + .../reads/repair/ReadRepairStrategy.java | 2 +- .../repair/RowIteratorMergeListener.java | 3 +- .../reads/thresholds/CoordinatorWarnings.java | 3 +- .../reads/thresholds/WarningsSnapshot.java | 2 +- .../service/snapshot/ListSnapshotsTask.java | 1 + .../snapshot/SnapshotDetailsTabularData.java | 1 + .../service/snapshot/SnapshotLoader.java | 1 + .../service/snapshot/SnapshotManager.java | 2 + .../snapshot/SnapshotManagerMBean.java | 1 + .../service/snapshot/SnapshotManifest.java | 3 +- .../service/snapshot/SnapshotOptions.java | 1 + .../service/snapshot/TableSnapshot.java | 1 + .../streaming/StreamConnectionFactory.java | 3 +- .../streaming/StreamCoordinator.java | 11 ++- .../streaming/StreamDeserializingTask.java | 1 + .../cassandra/streaming/StreamManager.java | 3 +- .../streaming/StreamManagerMBean.java | 1 + .../cassandra/streaming/StreamPlan.java | 6 +- .../streaming/StreamReceiveTask.java | 1 + .../streaming/StreamResultFuture.java | 8 +- .../cassandra/streaming/StreamSession.java | 10 ++- .../cassandra/streaming/StreamSummary.java | 1 + .../streaming/StreamTransferTask.java | 1 + .../cassandra/streaming/StreamingChannel.java | 3 +- .../streaming/StreamingDataOutputPlus.java | 3 +- .../cassandra/streaming/StreamingState.java | 1 + .../async/NettyStreamingChannel.java | 13 ++-- .../NettyStreamingConnectionFactory.java | 11 +-- .../async/StreamCompressionSerializer.java | 6 +- .../async/StreamingMultiplexedChannel.java | 17 ++-- .../StreamCompressionInputStream.java | 10 ++- .../management/ProgressInfoCompositeData.java | 8 +- .../SessionCompleteEventCompositeData.java | 8 +- .../management/SessionInfoCompositeData.java | 14 +++- .../management/StreamEventJMXNotifier.java | 7 +- .../management/StreamStateCompositeData.java | 16 +++- .../StreamSummaryCompositeData.java | 1 + .../tcm/AtomicLongBackedProcessor.java | 1 + .../apache/cassandra/tcm/CMSOperations.java | 2 +- .../apache/cassandra/tcm/ClusterMetadata.java | 10 ++- .../cassandra/tcm/ClusterMetadataService.java | 19 +++-- src/java/org/apache/cassandra/tcm/Commit.java | 14 ++-- .../org/apache/cassandra/tcm/Discovery.java | 1 + .../cassandra/tcm/EpochAwareDebounce.java | 1 + .../cassandra/tcm/MultiStepOperation.java | 4 +- .../cassandra/tcm/PaxosBackedProcessor.java | 2 +- .../apache/cassandra/tcm/PeerLogFetcher.java | 3 +- .../org/apache/cassandra/tcm/Processor.java | 1 + .../apache/cassandra/tcm/RemoteProcessor.java | 3 +- src/java/org/apache/cassandra/tcm/Retry.java | 1 + .../org/apache/cassandra/tcm/Startup.java | 1 + .../apache/cassandra/tcm/Transformation.java | 2 +- .../tcm/compatibility/GossipHelper.java | 3 +- .../tcm/compatibility/TokenRingUtils.java | 1 + .../tcm/listeners/LegacyStateListener.java | 1 + .../apache/cassandra/tcm/log/LocalLog.java | 3 +- .../apache/cassandra/tcm/log/LogState.java | 2 + .../tcm/log/SystemKeyspaceStorage.java | 1 + .../cassandra/tcm/membership/Directory.java | 12 ++- .../cassandra/tcm/membership/NodeVersion.java | 1 + .../cassandra/tcm/migration/Election.java | 15 ++-- .../tcm/migration/GossipCMSListener.java | 2 +- .../tcm/migration/GossipProcessor.java | 6 +- .../ownership/PlacementTransitionPlan.java | 2 + .../tcm/ownership/ReplicaGroups.java | 11 ++- .../cassandra/tcm/ownership/TokenMap.java | 1 + .../tcm/ownership/UniformRangePlacement.java | 1 + .../tcm/sequences/BootstrapAndJoin.java | 8 +- .../tcm/sequences/BootstrapAndReplace.java | 3 +- .../tcm/sequences/DropAccordTable.java | 1 + .../tcm/sequences/InProgressSequences.java | 3 +- .../apache/cassandra/tcm/sequences/Move.java | 4 +- .../tcm/sequences/ProgressBarrier.java | 3 +- .../tcm/sequences/ReconfigureCMS.java | 1 + .../tcm/sequences/SingleNodeSequences.java | 2 +- .../tcm/sequences/UnbootstrapAndLeave.java | 3 +- .../AccordMarkHardRemoved.java | 1 + .../transformations/AccordMarkRejoining.java | 1 + .../tcm/transformations/AccordMarkStale.java | 1 + .../tcm/transformations/AlterSchema.java | 1 + .../transformations/ApplyPlacementDeltas.java | 8 +- ...ginConsensusMigrationForTableAndRange.java | 1 + .../transformations/CustomTransformation.java | 8 +- ...ishConsensusMigrationForTableAndRange.java | 1 + .../tcm/transformations/PrepareJoin.java | 1 + .../ReconfigureAccordFastPath.java | 1 + .../tcm/transformations/Register.java | 1 + .../transformations/cms/PreInitialize.java | 8 +- .../cassandra/tools/AuditLogViewer.java | 19 ++--- .../cassandra/tools/GenerateTokens.java | 5 +- .../apache/cassandra/tools/HashPassword.java | 2 +- .../org/apache/cassandra/tools/JMXTool.java | 11 ++- .../cassandra/tools/JsonTransformer.java | 7 +- .../org/apache/cassandra/tools/NodeProbe.java | 1 + .../org/apache/cassandra/tools/NodeTool.java | 2 + .../apache/cassandra/tools/RepairRunner.java | 1 + .../apache/cassandra/tools/SSTableExport.java | 1 - .../tools/SSTableMetadataViewer.java | 1 + .../cassandra/tools/SSTablePartitions.java | 1 + .../tools/StandaloneJournalUtil.java | 8 +- .../tools/StandaloneSSTableUtil.java | 20 +++-- .../cassandra/tools/StandaloneSplitter.java | 1 - .../tools/nodetool/AbortBootstrap.java | 1 + .../cassandra/tools/nodetool/AccordAdmin.java | 1 + .../tools/nodetool/AlterTopology.java | 2 + .../cassandra/tools/nodetool/Assassinate.java | 1 + .../tools/nodetool/AutoRepairStatus.java | 1 + .../tools/nodetool/BootstrapResume.java | 1 + .../tools/nodetool/CIDRFilteringStats.java | 1 + .../cassandra/tools/nodetool/CMSAdmin.java | 1 + .../cassandra/tools/nodetool/Cleanup.java | 1 + .../tools/nodetool/ClearSnapshot.java | 1 + .../cassandra/tools/nodetool/ClientStats.java | 1 + .../cassandra/tools/nodetool/Compact.java | 1 + .../tools/nodetool/CompactionHistory.java | 1 + .../tools/nodetool/CompactionStats.java | 1 + .../CompressionDictionaryCommandGroup.java | 4 +- .../nodetool/ConsensusMigrationAdmin.java | 1 + .../cassandra/tools/nodetool/DataPaths.java | 1 + .../tools/nodetool/Decommission.java | 1 + .../tools/nodetool/DescribeCluster.java | 1 + .../tools/nodetool/DescribeRing.java | 1 + .../tools/nodetool/DisableAuditLog.java | 1 + .../tools/nodetool/DisableAutoCompaction.java | 3 +- .../tools/nodetool/DisableBackup.java | 1 + .../tools/nodetool/DisableBinary.java | 1 + .../tools/nodetool/DisableFullQueryLog.java | 1 + .../tools/nodetool/DisableGossip.java | 1 + .../tools/nodetool/DisableHandoff.java | 1 + .../tools/nodetool/DisableHintsForDC.java | 2 +- .../nodetool/DisableOldProtocolVersions.java | 1 + .../cassandra/tools/nodetool/Drain.java | 1 + .../tools/nodetool/EnableAuditLog.java | 1 + .../tools/nodetool/EnableAutoCompaction.java | 4 +- .../tools/nodetool/EnableBackup.java | 1 + .../tools/nodetool/EnableBinary.java | 1 + .../tools/nodetool/EnableFullQueryLog.java | 1 + .../tools/nodetool/EnableGossip.java | 1 + .../tools/nodetool/EnableHandoff.java | 1 + .../nodetool/EnableOldProtocolVersions.java | 1 + .../tools/nodetool/FailureDetectorInfo.java | 2 + .../cassandra/tools/nodetool/Flush.java | 3 +- .../tools/nodetool/ForceCompact.java | 3 +- .../tools/nodetool/GarbageCollect.java | 6 +- .../cassandra/tools/nodetool/GcStats.java | 1 + .../cassandra/tools/nodetool/GetAuditLog.java | 1 + .../tools/nodetool/GetAuthCacheConfig.java | 1 + .../tools/nodetool/GetAutoRepairConfig.java | 1 + .../nodetool/GetBatchlogReplayTrottle.java | 1 + .../tools/nodetool/GetCIDRGroupsOfIP.java | 1 + .../tools/nodetool/GetColumnIndexSize.java | 1 + .../nodetool/GetCompactionThreshold.java | 7 +- .../nodetool/GetCompactionThroughput.java | 1 + .../tools/nodetool/GetConcurrency.java | 3 +- .../nodetool/GetConcurrentCompactors.java | 1 + .../nodetool/GetConcurrentViewBuilders.java | 1 + .../tools/nodetool/GetDefaultKeyspaceRF.java | 1 + .../tools/nodetool/GetEndpoints.java | 3 +- .../tools/nodetool/GetFullQueryLog.java | 1 + .../nodetool/GetInterDCStreamThroughput.java | 1 + .../tools/nodetool/GetLoggingLevels.java | 1 + .../tools/nodetool/GetMaxHintWindow.java | 1 + .../cassandra/tools/nodetool/GetSSTables.java | 1 + .../cassandra/tools/nodetool/GetSeeds.java | 1 + .../tools/nodetool/GetSnapshotThrottle.java | 1 + .../tools/nodetool/GetStreamThroughput.java | 1 + .../tools/nodetool/GetTraceProbability.java | 1 + .../cassandra/tools/nodetool/GossipInfo.java | 1 + .../apache/cassandra/tools/nodetool/Help.java | 1 + .../cassandra/tools/nodetool/History.java | 1 + .../cassandra/tools/nodetool/Import.java | 1 + .../apache/cassandra/tools/nodetool/Info.java | 2 + .../InvalidateCIDRPermissionsCache.java | 3 +- .../nodetool/InvalidateCounterCache.java | 1 + .../nodetool/InvalidateCredentialsCache.java | 1 + .../InvalidateJmxPermissionsCache.java | 1 + .../tools/nodetool/InvalidateKeyCache.java | 1 + .../InvalidateNetworkPermissionsCache.java | 1 + .../nodetool/InvalidatePermissionsCache.java | 3 +- .../tools/nodetool/InvalidateRolesCache.java | 1 + .../tools/nodetool/InvalidateRowCache.java | 1 + .../apache/cassandra/tools/nodetool/Join.java | 5 +- .../tools/nodetool/ListCIDRGroups.java | 1 + .../tools/nodetool/ListPendingHints.java | 1 + .../tools/nodetool/ListSnapshots.java | 2 + .../apache/cassandra/tools/nodetool/Move.java | 1 + .../cassandra/tools/nodetool/NetStats.java | 1 + .../tools/nodetool/PauseHandoff.java | 1 + .../cassandra/tools/nodetool/ProfileLoad.java | 2 + .../tools/nodetool/ProxyHistograms.java | 1 + .../tools/nodetool/RangeKeySample.java | 1 + .../cassandra/tools/nodetool/Rebuild.java | 1 + .../tools/nodetool/RebuildIndex.java | 1 + .../tools/nodetool/RecompressSSTables.java | 3 +- .../cassandra/tools/nodetool/Refresh.java | 1 + .../tools/nodetool/RefreshSizeEstimates.java | 1 + .../tools/nodetool/ReloadCIDRGroupsCache.java | 1 + .../tools/nodetool/ReloadLocalSchema.java | 1 + .../cassandra/tools/nodetool/ReloadSeeds.java | 1 + .../tools/nodetool/ReloadSslCertificates.java | 3 +- .../tools/nodetool/ReloadTriggers.java | 1 + .../tools/nodetool/RelocateSSTables.java | 3 +- .../cassandra/tools/nodetool/RemoveNode.java | 1 + .../cassandra/tools/nodetool/Repair.java | 2 + .../cassandra/tools/nodetool/RepairAdmin.java | 3 + .../tools/nodetool/ReplayBatchlog.java | 1 + .../tools/nodetool/ResetFullQueryLog.java | 1 + .../tools/nodetool/ResetLocalSchema.java | 1 + .../tools/nodetool/ResumeHandoff.java | 1 + .../apache/cassandra/tools/nodetool/Ring.java | 1 + .../tools/nodetool/SSTableRepairedSet.java | 1 + .../cassandra/tools/nodetool/Scrub.java | 1 + .../tools/nodetool/SetAuthCacheConfig.java | 1 + .../tools/nodetool/SetAutoRepairConfig.java | 10 +-- .../nodetool/SetBatchlogReplayThrottle.java | 1 + .../tools/nodetool/SetCacheCapacity.java | 1 + .../tools/nodetool/SetCacheKeysToSave.java | 1 + .../tools/nodetool/SetColumnIndexSize.java | 1 + .../nodetool/SetCompactionThreshold.java | 1 + .../nodetool/SetCompactionThroughput.java | 1 + .../tools/nodetool/SetConcurrency.java | 1 + .../nodetool/SetConcurrentCompactors.java | 1 + .../nodetool/SetConcurrentViewBuilders.java | 1 + .../tools/nodetool/SetDefaultKeyspaceRF.java | 1 + .../SetHintedHandoffThrottleInKB.java | 1 + .../nodetool/SetInterDCStreamThroughput.java | 1 + .../tools/nodetool/SetLoggingLevel.java | 1 + .../tools/nodetool/SetMaxHintWindow.java | 1 + .../tools/nodetool/SetSnapshotThrottle.java | 1 + .../tools/nodetool/SetStreamThroughput.java | 1 + .../cassandra/tools/nodetool/SetTimeout.java | 1 + .../tools/nodetool/SetTraceProbability.java | 1 + .../apache/cassandra/tools/nodetool/Sjk.java | 8 +- .../cassandra/tools/nodetool/Snapshot.java | 1 + .../cassandra/tools/nodetool/Status.java | 1 + .../tools/nodetool/StatusAutoCompaction.java | 3 +- .../tools/nodetool/StatusBackup.java | 1 + .../tools/nodetool/StatusBinary.java | 1 + .../tools/nodetool/StatusGossip.java | 1 + .../tools/nodetool/StatusHandoff.java | 1 + .../apache/cassandra/tools/nodetool/Stop.java | 1 + .../cassandra/tools/nodetool/StopDaemon.java | 1 + .../tools/nodetool/TableHistograms.java | 2 + .../cassandra/tools/nodetool/TableStats.java | 1 + .../cassandra/tools/nodetool/TpStats.java | 1 + .../tools/nodetool/TruncateHints.java | 1 + .../tools/nodetool/UpdateCIDRGroup.java | 1 + .../tools/nodetool/UpgradeSSTable.java | 3 +- .../cassandra/tools/nodetool/Verify.java | 3 +- .../cassandra/tools/nodetool/Version.java | 1 + .../tools/nodetool/ViewBuildStatus.java | 1 + .../nodetool/formatter/TableBuilder.java | 1 + .../layout/CassandraCliHelpLayout.java | 16 ++-- .../stats/CompactionHistoryHolder.java | 3 +- .../tools/nodetool/stats/DataPathsHolder.java | 4 +- .../tools/nodetool/stats/StatsPrinter.java | 3 +- .../nodetool/stats/TableStatsHolder.java | 23 ++++-- .../cassandra/tracing/TraceKeyspace.java | 6 +- .../apache/cassandra/tracing/TraceState.java | 1 + .../cassandra/tracing/TraceStateImpl.java | 1 + .../apache/cassandra/transport/CBUtil.java | 13 ++-- .../transport/CQLMessageHandler.java | 8 +- .../apache/cassandra/transport/Client.java | 15 +++- .../transport/ClientResourceLimits.java | 6 +- .../cassandra/transport/Compressor.java | 7 +- .../cassandra/transport/ConnectedClient.java | 3 +- .../transport/ConnectionLimitHandler.java | 25 +++--- .../apache/cassandra/transport/DataType.java | 36 ++++++++- .../cassandra/transport/Dispatcher.java | 8 +- .../apache/cassandra/transport/Envelope.java | 14 ++-- .../org/apache/cassandra/transport/Event.java | 3 +- .../transport/ExceptionHandlers.java | 13 ++-- .../apache/cassandra/transport/Flusher.java | 14 +++- .../transport/InitialConnectionHandler.java | 13 ++-- .../apache/cassandra/transport/Message.java | 26 +++++-- .../transport/PipelineConfigurator.java | 31 ++++++-- .../cassandra/transport/PreV5Handlers.java | 23 +++--- .../apache/cassandra/transport/Server.java | 35 +++++---- .../cassandra/transport/ServerConnection.java | 9 ++- .../cassandra/transport/SimpleClient.java | 63 +++++++++++---- .../transport/messages/AuthChallenge.java | 5 +- .../transport/messages/AuthResponse.java | 9 ++- .../transport/messages/AuthSuccess.java | 5 +- .../messages/AuthenticateMessage.java | 4 +- .../transport/messages/BatchMessage.java | 3 +- .../transport/messages/ErrorMessage.java | 37 ++++++++- .../transport/messages/EventMessage.java | 4 +- .../transport/messages/ExecuteMessage.java | 3 +- .../transport/messages/OptionsMessage.java | 4 +- .../transport/messages/PrepareMessage.java | 3 +- .../transport/messages/QueryMessage.java | 3 +- .../transport/messages/ReadyMessage.java | 4 +- .../transport/messages/RegisterMessage.java | 14 +++- .../transport/messages/ResultMessage.java | 10 ++- .../transport/messages/StartupMessage.java | 12 ++- .../transport/messages/SupportedMessage.java | 4 +- .../messages/UnsupportedMessageCodec.java | 3 +- .../cassandra/triggers/CustomClassLoader.java | 5 +- .../cassandra/triggers/TriggerExecutor.java | 6 +- .../utils/AbstractGuavaIterator.java | 4 +- .../apache/cassandra/utils/BloomFilter.java | 4 +- .../cassandra/utils/ByteBufferUtil.java | 1 + .../apache/cassandra/utils/ChecksumType.java | 4 +- .../utils/CollectionSerializers.java | 2 + .../utils/DiagnosticSnapshotService.java | 1 + .../cassandra/utils/EstimatedHistogram.java | 1 + .../apache/cassandra/utils/FBUtilities.java | 7 +- .../cassandra/utils/FastByteOperations.java | 4 +- .../org/apache/cassandra/utils/HeapUtils.java | 4 +- .../cassandra/utils/IntegerInterval.java | 3 +- .../apache/cassandra/utils/IntervalTree.java | 2 + .../cassandra/utils/JMXServerUtils.java | 2 + .../utils/JVMStabilityInspector.java | 5 +- .../cassandra/utils/JavaDriverUtils.java | 1 - .../utils/JmxInvocationListener.java | 1 + .../org/apache/cassandra/utils/JsonUtils.java | 1 + .../apache/cassandra/utils/MBeanWrapper.java | 3 +- .../apache/cassandra/utils/MergeIterator.java | 4 +- .../apache/cassandra/utils/MerkleTree.java | 10 ++- .../apache/cassandra/utils/MerkleTrees.java | 9 ++- .../cassandra/utils/MonotonicClock.java | 1 + .../apache/cassandra/utils/NativeLibrary.java | 10 +-- .../cassandra/utils/NativeLibraryDarwin.java | 6 +- .../cassandra/utils/NativeLibraryLinux.java | 6 +- .../apache/cassandra/utils/NoSpamLogger.java | 1 + .../cassandra/utils/OverlapIterator.java | 7 +- .../apache/cassandra/utils/PojoToString.java | 2 +- .../utils/RMIServerSocketFactoryImpl.java | 1 + .../org/apache/cassandra/utils/RTree.java | 1 + .../cassandra/utils/ResourceWatcher.java | 2 +- .../utils/SimpleBitSetSerializers.java | 1 + .../org/apache/cassandra/utils/SyncUtil.java | 11 ++- .../apache/cassandra/utils/SystemInfo.java | 4 +- .../apache/cassandra/utils/Throwables.java | 1 + .../apache/cassandra/utils/binlog/BinLog.java | 12 +-- .../utils/binlog/DeletingArchiver.java | 1 + .../utils/binlog/ExternalArchiver.java | 3 +- .../apache/cassandra/utils/btree/BTree.java | 9 ++- .../utils/btree/FullBTreeSearchIterator.java | 4 +- .../cassandra/utils/btree/IntervalBTree.java | 4 +- .../cassandra/utils/btree/NodeCursor.java | 10 ++- .../cassandra/utils/btree/TreeCursor.java | 4 +- .../utils/caching/TinyThreadLocalPool.java | 1 + .../utils/concurrent/AbstractFuture.java | 7 +- .../utils/concurrent/AsyncFuture.java | 5 +- .../cassandra/utils/concurrent/Awaitable.java | 4 +- .../cassandra/utils/concurrent/Future.java | 5 +- .../utils/concurrent/FutureCombiner.java | 6 +- .../utils/concurrent/IntrusiveStack.java | 4 +- .../utils/concurrent/ListenerList.java | 7 +- .../utils/concurrent/LoadingMap.java | 1 + .../concurrent/NonBlockingRateLimiter.java | 9 ++- .../cassandra/utils/concurrent/Promise.java | 3 +- .../cassandra/utils/concurrent/Ref.java | 43 ++++++++--- .../cassandra/utils/concurrent/Refs.java | 1 + .../utils/concurrent/SyncFuture.java | 1 + .../utils/concurrent/WeightedQueue.java | 1 + .../utils/jmx/AbstractJmxSocketFactory.java | 1 + .../utils/jmx/DefaultJmxSocketFactory.java | 1 + .../logging/AbstractVirtualTableAppender.java | 5 +- .../utils/logging/LogbackLoggingSupport.java | 4 +- .../utils/logging/SlowQueriesAppender.java | 3 +- .../utils/logging/VirtualTableAppender.java | 3 +- .../cassandra/utils/memory/BufferPool.java | 18 +++-- .../cassandra/utils/memory/EnsureOnHeap.java | 7 +- .../utils/memory/MemtableAllocator.java | 4 +- .../utils/memory/MemtableCleanerThread.java | 6 +- .../cassandra/utils/memory/MemtablePool.java | 6 +- .../utils/memory/NativeAllocator.java | 12 ++- .../cassandra/utils/obs/OffHeapBitSet.java | 4 +- .../jmx/JMXNotificationProgressListener.java | 1 + .../progress/jmx/JMXProgressSupport.java | 1 + .../cassandra/utils/vint/VIntCoding.java | 4 +- .../anttasks/EchoEclipseProjectLibs.java | 5 +- .../cassandra/anttasks/TestNameCheckTask.java | 1 - .../cassandra/concurrent/LongOpOrderTest.java | 2 +- .../LongSharedExecutorPoolTest.java | 1 + .../cassandra/net/ConnectionBurnTest.java | 12 +-- .../cassandra/net/MessageGenerator.java | 1 + .../org/apache/cassandra/net/Verifier.java | 13 ++-- .../cassandra/transport/BurnTestUtil.java | 1 + .../cassandra/transport/DriverBurnTest.java | 21 ++++- .../transport/SimpleClientBurnTest.java | 13 +++- .../transport/SimpleClientPerfTest.java | 13 +++- .../apache/cassandra/utils/LongBTreeTest.java | 28 +++++-- .../utils/memory/LongBufferPoolTest.java | 19 ++++- .../apache/cassandra/distributed/Cluster.java | 5 +- .../distributed/api/ICoordinator.java | 4 +- .../distributed/impl/AbstractCluster.java | 10 ++- .../distributed/impl/AbstractClusterTest.java | 4 +- .../distributed/impl/Coordinator.java | 1 + .../DirectStreamingConnectionFactory.java | 7 +- .../distributed/impl/FileLogAction.java | 4 +- .../impl/INodeProvisionStrategy.java | 1 + .../cassandra/distributed/impl/Instance.java | 6 +- .../distributed/impl/InstanceConfig.java | 1 + .../distributed/impl/InstanceIDDefiner.java | 3 +- .../distributed/impl/InstanceMetrics.java | 1 + .../distributed/impl/IsolatedExecutor.java | 5 +- .../distributed/impl/IsolatedJmx.java | 4 +- .../impl/IsolatedJmxSocketFactory.java | 1 + .../impl/JmxTestClientSslContextFactory.java | 1 + .../impl/JmxTestClientSslSocketFactory.java | 1 + .../cassandra/distributed/impl/RowUtil.java | 4 +- .../cassandra/distributed/shared/Byteman.java | 5 +- .../distributed/shared/ClusterUtils.java | 11 +-- .../test/AbstractEncryptionOptionsImpl.java | 15 ++-- .../test/AbstractHintWindowTest.java | 2 +- .../test/AbstractNetstatsStreaming.java | 3 +- .../cassandra/distributed/test/AlterTest.java | 1 + .../cassandra/distributed/test/AuthTest.java | 5 +- .../test/ByteBuddyExamplesTest.java | 5 +- .../distributed/test/CASAddTest.java | 2 +- .../distributed/test/CASContentionTest.java | 22 +++--- .../test/CasCriticalSectionTest.java | 1 + .../distributed/test/CasWriteTest.java | 5 +- .../distributed/test/ClearSnapshotTest.java | 9 ++- .../test/ClientNetworkStopStartTest.java | 3 +- .../test/ClusterStorageUsageTest.java | 5 +- .../test/ColumnConstraintsTest.java | 12 +-- .../distributed/test/ColumnMaskTest.java | 5 +- .../test/CompactionDiskSpaceTest.java | 10 ++- .../CompactionOverlappingSSTableTest.java | 4 +- .../distributed/test/CryptoProviderTest.java | 8 +- .../distributed/test/DecommissionTest.java | 7 +- .../distributed/test/DisableBinaryTest.java | 8 +- .../test/DistributedRepairUtils.java | 1 + .../distributed/test/DropColumnTest.java | 1 + .../distributed/test/DurableWritesTest.java | 2 +- .../test/EphemeralSnapshotTest.java | 2 + .../distributed/test/ExpandCQLTest.java | 5 +- .../distributed/test/FailingMoveTest.java | 4 +- .../distributed/test/FailingRepairTest.java | 3 +- .../test/FailingResponseDoesNotLogTest.java | 3 +- .../test/FailingTruncationTest.java | 5 +- .../distributed/test/ForBenchmarks.java | 4 +- .../distributed/test/GossipSettlesTest.java | 2 +- .../distributed/test/GossipShutdownTest.java | 3 +- .../distributed/test/GossipTest.java | 5 +- .../distributed/test/GroupByTest.java | 9 ++- .../test/HintDataReappearingTest.java | 27 +++---- .../test/HintedHandoffAddRemoveNodesTest.java | 2 +- .../test/HungBootstrapDoesNotHangTest.java | 7 +- .../distributed/test/IPMembershipTest.java | 3 +- .../distributed/test/IncRepairAdminTest.java | 1 + .../test/IncRepairTruncationTest.java | 4 +- ...entalRepairCleanupAfterNodeAddingTest.java | 3 +- .../distributed/test/IndexDroppingTest.java | 1 + .../distributed/test/IntegrationTestBase.java | 1 + .../InternodeEncryptionEnforcementTest.java | 6 +- .../test/InternodeEncryptionOptionsTest.java | 1 + .../test/InternodeErrorExclusionTest.java | 1 + .../distributed/test/JVMDTestTest.java | 9 ++- .../distributed/test/JavaDriverUtils.java | 1 + .../test/LeveledCompactionTaskTest.java | 5 +- .../distributed/test/MessageFiltersTest.java | 3 +- .../test/MessageForwardingTest.java | 2 +- .../test/MessageTimestampTest.java | 7 +- .../distributed/test/MetricsTest.java | 1 + .../distributed/test/MixedModeFuzzTest.java | 14 ++-- .../cassandra/distributed/test/MoveTest.java | 1 + .../test/NativeMixedVersionTest.java | 7 +- .../distributed/test/NativeProtocolTest.java | 19 ++--- .../NativeTransportEncryptionOptionsTest.java | 9 ++- .../test/NodeToolEnableDisableBinaryTest.java | 5 +- .../test/OptimiseStreamsRepairTest.java | 7 +- .../distributed/test/OverloadTest.java | 8 +- .../test/OversizedMutationTest.java | 2 +- .../distributed/test/PagingTest.java | 1 + .../test/PartitionDenylistTest.java | 1 + .../test/PaxosEpochSerializationTest.java | 9 ++- .../distributed/test/PaxosRepair2Test.java | 1 + .../distributed/test/PaxosRepairTest.java | 3 +- .../test/PrepareBatchStatementsTest.java | 7 +- ...PreparedStatementInvalidationRaceTest.java | 6 +- .../PreparedStatementInvalidationTest.java | 5 +- .../test/PreviewRepairSnapshotTest.java | 1 + .../distributed/test/PreviewRepairTest.java | 12 +-- .../distributed/test/ProfileLoadTest.java | 16 ++-- .../distributed/test/QueriesTableTest.java | 12 +-- .../distributed/test/ReadFailureTest.java | 14 ++-- .../distributed/test/ReadRepairTest.java | 12 +-- .../distributed/test/ReadRepairTester.java | 1 + .../distributed/test/ReadSpeculationTest.java | 12 +-- .../test/ReconnectToInternalIPTest.java | 2 +- .../distributed/test/RepairBoundaryTest.java | 4 +- .../test/RepairCoordinatorFast.java | 1 + .../test/RepairCoordinatorNeighbourDown.java | 1 + .../test/RepairDigestTrackingTest.java | 6 +- .../distributed/test/RepairErrorsTest.java | 8 +- .../test/RepairOperationalTest.java | 7 +- .../distributed/test/RepairTest.java | 6 +- .../distributed/test/ReprepareFuzzTest.java | 18 +++-- .../test/ReprepareNewBehaviourTest.java | 7 +- .../test/ReprepareOldBehaviourTest.java | 5 +- .../distributed/test/ReprepareTestBase.java | 8 +- .../distributed/test/ResourceLeakTest.java | 8 +- .../test/SSTableIdGenerationTest.java | 5 +- .../SSTableLoaderEncryptionOptionsTest.java | 10 +-- .../test/SSTableReadLogsQueryTest.java | 3 +- .../test/SSTableSkippingReadTest.java | 2 +- .../test/SchemaDisagreementTest.java | 2 +- .../distributed/test/SchemaTest.java | 4 +- .../test/ShortReadProtectionTest.java | 1 + .../distributed/test/SimpleReadWriteTest.java | 1 + .../distributed/test/SnapshotsTest.java | 4 +- .../test/StreamPrepareFailTest.java | 5 +- .../distributed/test/StreamingTest.java | 1 + .../test/StreamsDiskSpaceTest.java | 7 +- .../distributed/test/TableEstimatesTest.java | 2 +- .../distributed/test/TestBaseImpl.java | 5 +- .../distributed/test/TopPartitionsTest.java | 2 +- .../distributed/test/TopologyChangeTest.java | 5 +- .../test/TransientRangeMovementTest.java | 1 + ...rseClientMessageFromBlockedSubnetTest.java | 3 +- .../test/UnableToParseClientMessageTest.java | 7 +- .../test/UnifiedCompactionDensitiesTest.java | 3 +- .../UpdateSystemAuthAfterDCExpansionTest.java | 1 + .../distributed/test/UpgradeSSTablesTest.java | 7 +- .../test/VirtualTableFromInternodeTest.java | 1 + .../test/VirtualTableLogsTest.java | 3 +- .../test/accord/AccordBootstrapTest.java | 1 + .../test/accord/AccordBootstrapTestBase.java | 3 +- .../test/accord/AccordCQLTestBase.java | 7 +- ...rdCommandStoreTryExecuteListeningTest.java | 3 +- .../test/accord/AccordDropTableBase.java | 4 +- .../test/accord/AccordFeatureFlagTest.java | 2 +- .../accord/AccordIncrementalRepairTest.java | 20 +++-- .../accord/AccordInteroperabilityTest.java | 2 +- .../accord/AccordJournalIntegrationTest.java | 2 +- .../test/accord/AccordLoadTest.java | 1 + .../test/accord/AccordMetricsTest.java | 5 +- .../AccordMigrationReadRaceTestBase.java | 6 +- .../test/accord/AccordMigrationTest.java | 6 +- .../AccordMigrationWriteRaceTestBase.java | 6 +- .../test/accord/AccordMoveTest.java | 1 + .../test/accord/AccordNodetoolTest.java | 7 +- .../AccordReadInteroperabilityTest.java | 1 + ...AccordRecoverFromAvailabilityLossTest.java | 1 + .../test/accord/AccordSimpleFastPathTest.java | 17 ++-- .../test/accord/AccordTestBase.java | 14 ++-- .../AccordTimestampPreservationTest.java | 18 +++-- .../AccordWriteInteroperabilityTest.java | 2 + .../test/accord/InteropTokenRangeTest.java | 4 +- .../test/accord/NewSchemaTest.java | 2 +- .../journal/AccordJournalReplayTest.java | 3 +- ...rnalAccessRouteIndexOnStartupRaceTest.java | 11 +-- .../journal/StatefulJournalRestartTest.java | 1 + .../test/auth/AuthAuditLoggingTest.java | 5 +- .../test/auth/CIDRAuthorizerConfigTest.java | 1 + ...utualTlsCertificateValidityPeriodTest.java | 15 ++-- .../test/auth/RoleRevocationTest.java | 7 +- .../test/cdc/ToggleCDCOnRepair.java | 1 - .../AccordInteropMultiNodeTableWalkBase.java | 1 + ...cordInteropMultiNodeTokenConflictBase.java | 1 + .../test/cql3/CasMultiNodeTableWalkBase.java | 1 + ...llAccordInteropMultiNodeTableWalkTest.java | 1 + ...cordInteropMultiNodeTokenConflictTest.java | 1 + ...dsAccordInteropMultiNodeTableWalkTest.java | 1 + ...cordInteropMultiNodeTokenConflictTest.java | 1 + .../test/cql3/MultiNodeTableWalkBase.java | 4 +- .../MultiNodeTableWalkWithReadRepairTest.java | 1 + ...ltiNodeTableWalkWithoutReadRepairTest.java | 1 + .../test/cql3/MultiNodeTokenConflictTest.java | 1 + .../cql3/PaxosV1MultiNodeTableWalkTest.java | 1 + .../cql3/PaxosV2MultiNodeTableWalkTest.java | 1 + .../test/cql3/SingleNodeTableWalkTest.java | 4 +- .../cql3/SingleNodeTokenConflictTest.java | 3 +- .../test/cql3/StatefulASTBase.java | 11 ++- .../test/fql/FqlReplayDDLExclusionTest.java | 3 +- .../test/fql/FqlTombstoneHandlingTest.java | 11 +-- .../test/gossip/GossipExpiryTestBase.java | 11 +-- ...drailCollectionSizeOnSSTableWriteTest.java | 5 +- .../guardrails/GuardrailDiskUsageTest.java | 12 +-- ...rdrailNonPartitionRestrictedQueryTest.java | 7 +- .../GuardrailPasswordPolicyTest.java | 4 +- .../test/guardrails/GuardrailTester.java | 7 +- .../IntersectFilteringQueryTest.java | 10 +-- .../hostreplacement/FailedBootstrapTest.java | 9 ++- .../HostReplacementOfDownedClusterTest.java | 6 +- .../hostreplacement/HostReplacementTest.java | 2 +- ...ernatingNodeWithoutReplaceAddressTest.java | 9 ++- .../distributed/test/jmx/JMXFeatureTest.java | 1 + .../test/jmx/JMXSslConfigDistributedTest.java | 2 + .../distributed/test/jmx/JMXTestsUtil.java | 2 + .../test/jmx/StorageServiceJmxTest.java | 1 + .../test/log/AlterTopologyTest.java | 4 +- .../test/log/BounceGossipTest.java | 4 +- .../test/log/BounceIndexRebuildTest.java | 2 +- .../test/log/CMSMembershipMetricsTest.java | 2 +- ...terMetadataSerializationRoundTripTest.java | 5 +- .../test/log/ClusterMetadataTestHelper.java | 4 +- .../test/log/CoordinatorPathTestBase.java | 26 +++++-- .../distributed/test/log/DiscoverCMSTest.java | 5 +- .../test/log/DistributedLogTest.java | 2 +- .../distributed/test/log/FailedLeaveTest.java | 7 +- .../test/log/FetchLogFromPeersTest.java | 1 + .../test/log/GossipDeadlockTest.java | 6 +- .../log/MetadataChangeSimulationTest.java | 2 +- .../test/log/PlacementSimulator.java | 13 +++- .../log/QuorumIntersectionSimulatorTest.java | 7 +- .../ReconfigureCMSStreamingFailureTest.java | 5 +- .../distributed/test/log/RegisterTest.java | 2 +- .../test/log/ReplayPersistedTest.java | 1 + .../test/log/RequestCurrentEpochTest.java | 2 +- .../test/log/SimulatedOperation.java | 2 +- .../distributed/test/log/SnapshotTest.java | 2 +- .../test/log/SystemKeyspaceStorageTest.java | 13 ++-- .../distributed/test/log/TestProcessor.java | 5 +- .../test/log/TriggeredReconfigureCMSTest.java | 1 + .../test/metric/TableMetricTest.java | 6 +- .../test/metrics/HintsServiceMetricsTest.java | 7 +- .../test/metrics/RequestTimeoutTest.java | 21 ++--- .../test/metrics/StreamingMetricsTest.java | 4 +- ...allelReplicaRepairAcrossSchedulesTest.java | 7 +- .../AutoRepairSchedulerStatsHelper.java | 1 + .../test/repair/AutoRepairSchedulerTest.java | 13 ++-- .../ConcurrentValidationRequestsTest.java | 5 +- .../test/repair/ForceRepairTest.java | 5 +- .../test/repair/NoTombstonePurgingTest.java | 1 + .../distributed/test/ring/BootstrapTest.java | 8 +- .../test/ring/DecommissionTest.java | 5 +- .../ring/StopProcessingExceptionTest.java | 5 +- .../test/sai/ImportIndexedSSTablesTest.java | 10 +-- .../test/sai/IndexAvailabilityTest.java | 4 +- .../test/sai/IndexHintsDistributedTest.java | 7 +- .../test/sai/IndexStreamingFailureTest.java | 9 ++- .../test/sai/IndexStreamingTest.java | 2 +- .../test/sai/PartialUpdateHandlingTest.java | 3 +- .../test/sai/PartialWritesWithRepairTest.java | 15 ++-- .../distributed/test/sai/SAIUtil.java | 3 +- .../test/sai/StrictFilteringTest.java | 3 +- .../test/sai/VectorDistributedTest.java | 4 +- .../streaming/AbstractStreamFailureLogs.java | 9 ++- .../IndexBuildFailsAfterStreamingTest.java | 5 +- .../test/streaming/RebuildStreamingTest.java | 2 +- .../streaming/StreamCloseInMiddleTest.java | 9 ++- .../StreamDisconnectedWhileReceivingTest.java | 10 +-- .../StreamFailedAfterReceivingTest.java | 4 +- .../StreamFailedAfterTransferTest.java | 4 +- .../StreamFailedWhileReceivingTest.java | 5 +- ...ureLogsFailureDueToSessionTimeoutTest.java | 6 +- .../test/tcm/CMSPlacementAfterMoveTest.java | 1 + .../distributed/test/tcm/CMSShutdownTest.java | 5 +- .../tcm/FailureDetectorRecomputeTest.java | 6 +- .../distributed/test/tcm/SplitBrainTest.java | 2 +- .../thresholds/AbstractClientSizeWarning.java | 7 +- .../CoordinatorReadSizeWarningTest.java | 2 +- .../thresholds/TombstoneCountWarningTest.java | 20 ++--- .../topology/DecommissionAvoidTimeouts.java | 5 +- ...ClusterMetadataUpgradeAssassinateTest.java | 1 + ...rMetadataUpgradeDelayedInitializeTest.java | 11 +-- .../ClusterMetadataUpgradeHintsTest.java | 2 +- .../ClusterMetadataUpgradeHostIdTest.java | 1 + .../ClusterMetadataUpgradeJoinRingTest.java | 5 +- ...rMetadataUpgradeUnexpectedFailureTest.java | 5 +- ...ompactStoragePagingWithProtocolTester.java | 5 +- ...mpactionHistorySystemTableUpgradeTest.java | 1 + .../ConfigCompatibilityTestGenerate.java | 3 +- .../upgrade/MixedModeIndexTestBase.java | 1 + .../upgrade/MixedModeMessageForwardTest.java | 5 +- .../upgrade/MixedModeReadRepairTTLTest.java | 3 +- .../MixedModeTTLOverflowUpgradeTestBase.java | 5 +- .../upgrade/MixedModeWritetimeOrTTLTest.java | 4 +- .../upgrade/Pre40MessageFilterTest.java | 8 +- .../distributed/upgrade/UpgradeTest.java | 3 +- .../distributed/upgrade/UpgradeTestBase.java | 5 +- .../distributed/util/DriverUtils.java | 4 +- .../distributed/util/QueryResultUtil.java | 6 +- .../util/SingleHostLoadBalancingPolicy.java | 3 +- .../distributed/util/byterewrite/Undead.java | 1 + .../fuzz/ring/ConsistentLeaveTest.java | 1 + .../fuzz/ring/ConsistentMoveTest.java | 1 + .../fuzz/sai/SingleNodeSAITestBase.java | 1 + .../fuzz/snapshots/SnapshotsTest.java | 9 ++- .../fuzz/topology/AccordBounceTest.java | 15 +++- .../topology/AccordTopologyMixupTest.java | 4 +- .../HarryOnAccordTopologyMixupTest.java | 1 + .../fuzz/topology/HarryTopologyMixupTest.java | 5 +- .../fuzz/topology/JournalGCTest.java | 1 + .../fuzz/topology/TopologyMixupTestBase.java | 20 +++-- .../service/accord/AccordJournalBurnTest.java | 2 + .../accord/AccordJournalCompactionTest.java | 2 + .../accord/BurnTestKeySerializers.java | 1 + .../accord/NemesisAccordSegmentCompactor.java | 1 + .../apache/cassandra/harry/ColumnSpec.java | 1 + .../cassandra/harry/cql/DeleteHelper.java | 2 +- .../cassandra/harry/cql/SelectHelper.java | 2 +- .../cassandra/harry/cql/WriteHelper.java | 1 + .../cassandra/harry/dsl/HistoryBuilder.java | 2 +- .../dsl/SingleOperationVisitBuilder.java | 7 +- .../cassandra/harry/dsl/TestRunner.java | 2 +- .../execution/CQLTesterVisitExecutor.java | 11 ++- .../harry/execution/CQLVisitExecutor.java | 1 + .../harry/execution/DataTracker.java | 5 +- .../execution/InJvmDTestVisitExecutor.java | 4 +- .../execution/QueryBuildingVisitExecutor.java | 1 + .../harry/execution/ResultSetRow.java | 8 +- .../RingAwareInJvmDTestVisitExecutor.java | 5 +- .../cassandra/harry/gen/Generators.java | 1 + .../harry/gen/InvertibleGenerator.java | 4 +- .../cassandra/harry/gen/Surjections.java | 1 + .../harry/gen/rng/SeedableEntropySource.java | 3 +- .../harry/model/ASTSingleTableModel.java | 8 +- .../harry/model/ASTSingleTableModelTest.java | 1 + .../harry/model/BytesPartitionState.java | 1 + .../apache/cassandra/harry/model/Model.java | 2 +- .../cassandra/harry/model/PartitionState.java | 21 +++-- .../harry/model/PartitionStateBuilder.java | 8 +- .../harry/model/QuiescentChecker.java | 3 +- .../cassandra/harry/model/Reconciler.java | 2 +- .../harry/model/TokenPlacementModel.java | 14 +++- .../apache/cassandra/harry/op/Operations.java | 1 + .../harry/test/HarryCompactionTest.java | 1 + ...HarryCompactionWithRangeDeletionsTest.java | 1 + .../harry/test/HarrySSTableWriterTest.java | 1 + .../harry/test/SimpleBijectionTest.java | 12 +-- .../cassandra/harry/test/TestStateTest.java | 2 +- .../io/sstable/HarrySSTableWriter.java | 1 + .../apache/cassandra/cql3/CorruptionTest.java | 9 ++- .../apache/cassandra/cql3/ViewLongTest.java | 5 +- .../db/commitlog/CommitLogStressTest.java | 31 ++++++-- .../db/compaction/LongCompactionsTest.java | 25 ++++-- .../LongLeveledCompactionStrategyCQLTest.java | 1 + .../LongLeveledCompactionStrategyTest.java | 1 + ...actReplicationAwareTokenAllocatorTest.java | 10 ++- .../NoReplicationTokenAllocatorTest.java | 1 + .../hints/HintsWriteThenReadTest.java | 5 +- .../io/compress/CompressorPerformance.java | 4 +- .../io/sstable/CQLSSTableWriterLongTest.java | 3 +- .../DynamicEndpointSnitchLongTest.java | 3 +- .../streaming/LongStreamingTest.java | 4 +- .../compaction/CompactionAllocationTest.java | 10 +-- .../AbstractTypeByteSourceDecodingBench.java | 18 +++-- .../test/microbench/BTreeBuildBench.java | 5 +- .../microbench/BTreeSearchIteratorBench.java | 13 ++-- .../test/microbench/BatchStatementBench.java | 37 ++++----- .../BloomFilterSerializerBench.java | 21 ++--- .../test/microbench/CIDRAuthorizerBench.java | 11 +-- .../test/microbench/CacheLoaderBench.java | 28 +++---- .../test/microbench/CachingBenchTest.java | 1 + .../test/microbench/ChecksumBench.java | 10 ++- .../test/microbench/CompactionBench.java | 19 ++++- .../DecayingEstimatedHistogramBench.java | 5 +- .../microbench/DeletionTimeDeSerBench.java | 17 ++-- .../DiagnosticEventPersistenceBench.java | 13 ++-- .../DiagnosticEventServiceBench.java | 9 ++- .../test/microbench/DirectorySizerBench.java | 17 +++- .../test/microbench/FastThreadLocalBench.java | 3 +- .../FunctionWithTerminalArgsBench.java | 15 ++-- .../microbench/GcCompactionBenchTest.java | 4 +- .../test/microbench/LatencyTrackingBench.java | 9 ++- .../test/microbench/LocatorBench.java | 27 +++---- .../microbench/LongestMatchingCIDRBench.java | 5 +- .../test/microbench/MessageOutBench.java | 24 +++--- .../microbench/MetadataCollectorBench.java | 15 +++- .../test/microbench/MetersBench.java | 5 +- .../test/microbench/MutationBench.java | 29 +++---- .../test/microbench/OutputStreamBench.java | 23 ++++-- .../PreaggregatedByteBufsBench.java | 5 +- .../test/microbench/ReadWriteBench.java | 18 ++++- .../test/microbench/ReplicaGroupsBench.java | 39 +++++----- .../test/microbench/SampleBench.java | 24 ++++-- .../test/microbench/SnapshotListingBench.java | 3 +- .../microbench/SnapshotTrueSizeBench.java | 3 +- ...reamingTombstoneHistogramBuilderBench.java | 22 ++++-- .../test/microbench/StringsEncodeBench.java | 12 +-- .../microbench/ThreadLocalMetricsBench.java | 5 +- .../test/microbench/TimedMonitorBench.java | 16 +++- .../test/microbench/UTF8ValidatorBench.java | 7 +- .../test/microbench/VIntCodingBench.java | 24 ++++-- .../microbench/ZeroCopyStreamingBench.java | 36 +++++---- .../ZstdDictionaryCompressorBenchBase.java | 1 + .../AtomicBTreePartitionUpdateBench.java | 27 +++---- .../microbench/btree/BTreeBuildBench.java | 7 +- .../microbench/btree/BTreeTransformBench.java | 7 +- .../microbench/btree/BTreeUpdateBench.java | 7 +- .../microbench/instance/ReadBenchBase.java | 7 +- .../instance/SimpleTableWriter.java | 11 +-- .../test/microbench/instance/WriteBench.java | 15 +++- .../test/microbench/sai/KeyLookupBench.java | 27 +++---- .../sstable/CompactionLargeCellBench.java | 7 +- .../sstable/CompactionStringsBench.java | 7 +- .../sstable/CompactionWideRowBench.java | 7 +- .../sstable/SSTableAbstractBench.java | 15 ++-- .../sstable/SSTableAbstractPipeBench.java | 9 ++- .../sstable/SSTableCursorPipeUtil.java | 13 +++- .../microbench/sstable/SSTablePipeBench.java | 11 +-- .../sstable/SSTablePipeCursorBench.java | 13 ++-- .../sstable/SSTableRawVisitorBench.java | 13 ++-- .../sstable/SSTableReadingBench.java | 11 +-- .../sstable/SSTableReadingCursorBench.java | 5 +- .../sstable/SSTableReadingFileBench.java | 21 ++--- .../SSTableReadingFileCursorBench.java | 25 ++++-- .../microbench/tries/ComparisonReadBench.java | 17 ++-- .../tries/InMemoryTrieReadBench.java | 15 +++- .../tries/InMemoryTrieUnionBench.java | 15 +++- .../tries/InMemoryTrieWriteBench.java | 15 +++- .../apache/cassandra/simulator/Action.java | 20 +++-- .../cassandra/simulator/ActionSchedule.java | 8 +- .../org/apache/cassandra/simulator/Debug.java | 1 + .../cassandra/simulator/SimulationRunner.java | 4 +- .../cassandra/simulator/SimulatorUtils.java | 3 +- .../simulator/asm/NemesisFieldSelectors.java | 3 +- .../simulator/cluster/ClusterActions.java | 1 + .../cluster/ClusterReliableAction.java | 2 +- .../debug/SelfReconcilingRandom.java | 1 + .../simulator/logging/RunStartDefiner.java | 4 +- .../simulator/logging/SeedDefiner.java | 3 +- ...bstractPairOfSequencesPaxosSimulation.java | 1 + .../paxos/AccordSimulationRunner.java | 1 + .../paxos/LinearizabilityValidator.java | 1 + .../paxos/LoggingHistoryValidator.java | 1 + .../PairOfSequencesAccordSimulation.java | 8 +- .../paxos/PairOfSequencesPaxosSimulation.java | 1 + .../simulator/paxos/PaxosSimulation.java | 5 +- .../paxos/PaxosSimulationRunner.java | 2 + .../paxos/StrictSerializabilityValidator.java | 3 +- .../systems/InterceptibleThread.java | 3 +- .../systems/InterceptingAwaitable.java | 2 +- .../systems/InterceptingExecutor.java | 2 +- .../systems/InterceptingExecutorFactory.java | 8 +- .../systems/InterceptingMonitors.java | 3 +- .../systems/InterceptorOfGlobalMethods.java | 3 +- .../simulator/systems/SimulatedAction.java | 1 + ...actPairOfSequencesPaxosSimulationTest.java | 4 +- .../simulator/paxos/HistoryValidatorTest.java | 17 ++-- .../test/AccordJournalSimulationTest.java | 3 +- .../simulator/test/EpochStressTest.java | 3 +- .../simulator/test/HarrySimulatorTest.java | 2 + .../simulator/test/HarryValidatingQuery.java | 7 +- .../simulator/test/SimulationTestBase.java | 3 +- .../test/SingleNodeSingleTableASTTest.java | 1 + .../test/SingleTableASTSimulation.java | 3 +- .../AbstractSerializationsTester.java | 12 ++- .../CassandraBriefJUnitResultFormatter.java | 6 +- .../CassandraXMLJUnitResultFormatter.java | 8 +- .../cassandra/LogbackStatusListener.java | 5 +- .../apache/cassandra/MethodComparator.java | 6 +- .../org/apache/cassandra/SchemaLoader.java | 27 ++++++- .../org/apache/cassandra/ServerTestUtils.java | 3 +- .../org/apache/cassandra/UpdateBuilder.java | 9 ++- test/unit/org/apache/cassandra/Util.java | 11 +-- .../cassandra/audit/AuditLogEntryTest.java | 1 + .../cassandra/audit/AuditLogOptionsTest.java | 2 +- .../cassandra/audit/AuditLoggerAuthTest.java | 20 ++--- .../audit/AuditLoggerCleanupTest.java | 10 ++- .../cassandra/audit/AuditLoggerTest.java | 17 ++-- .../cassandra/audit/BinAuditLoggerTest.java | 10 ++- .../auth/AllowAllCIDRAuthorizerTest.java | 1 + .../apache/cassandra/auth/AuthTestUtils.java | 5 +- .../auth/CIDRGroupsMappingManagerTest.java | 1 + .../auth/CIDRGroupsMappingTableTest.java | 1 + .../cassandra/auth/CacheRefresherTest.java | 4 +- ...assandraCIDRAuthorizerEnforceModeTest.java | 3 +- .../auth/CassandraNetworkAuthorizerTest.java | 3 +- .../auth/CassandraRoleManagerTest.java | 16 +++- .../auth/CreateAndAlterRoleTest.java | 5 +- .../cassandra/auth/GrantAndRevokeTest.java | 3 +- ...ertificateValidityPeriodValidatorTest.java | 2 +- .../cassandra/auth/MutualTlsUtilTest.java | 3 +- .../auth/PasswordAuthenticatorTest.java | 12 +-- .../cassandra/auth/RoleOptionsTest.java | 12 ++- .../org/apache/cassandra/auth/RolesTest.java | 3 +- .../apache/cassandra/auth/StubAuthorizer.java | 5 +- .../apache/cassandra/auth/TxnAuthTest.java | 2 +- .../auth/jmx/AbstractJMXAuthTest.java | 4 +- .../auth/jmx/AuthorizationProxyTest.java | 14 +++- .../batchlog/BatchlogEndpointFilterTest.java | 6 +- .../batchlog/BatchlogManagerTest.java | 1 + .../cassandra/batchlog/BatchlogTest.java | 2 +- .../cassandra/cache/CacheProviderTest.java | 3 +- .../AdaptingScheduledExecutorPlus.java | 3 +- ...ggableScheduledThreadPoolExecutorTest.java | 3 +- .../DebuggableThreadPoolExecutorTest.java | 15 ++-- .../cassandra/concurrent/ManualExecutor.java | 11 +-- .../ManyToOneConcurrentLinkedQueueTest.java | 5 +- .../cassandra/concurrent/SEPExecutorTest.java | 2 +- .../concurrent/SimulatedExecutorFactory.java | 1 + .../cassandra/concurrent/WaitQueueTest.java | 12 +-- .../CassandraRelevantPropertiesTest.java | 2 +- .../config/ConfigCompatibilityTest.java | 15 ++-- .../cassandra/config/DataRateSpecTest.java | 4 +- .../cassandra/config/DataStorageSpecTest.java | 4 +- .../config/DatabaseDescriptorTest.java | 5 +- .../cassandra/config/DefaultLoaderTest.java | 4 +- .../cassandra/config/DurationSpecTest.java | 4 +- .../config/EncryptionOptionsTest.java | 5 +- .../FailStartupDuplicateParamsTest.java | 1 + .../apache/cassandra/config/LoaderTest.java | 3 +- .../cassandra/config/PropertiesTest.java | 2 +- .../cassandra/config/SnakeYamlLoader.java | 1 + .../cassandra/config/UnitConfigOverride.java | 1 + .../config/YamlConfigurationLoaderTest.java | 18 ++--- .../ConstraintsSatisfiabilityTest.java | 2 +- .../CqlConstraintValidationTester.java | 1 + ...WithColumnCqlConstraintValidationTest.java | 2 +- .../constraints/JsonConstraintTest.java | 2 +- .../constraints/RegexpConstraintTest.java | 2 +- .../cassandra/cql/jdbc/JdbcDecimalTest.java | 3 +- .../org/apache/cassandra/cql3/BatchTest.java | 11 +-- .../org/apache/cassandra/cql3/CIDRTest.java | 4 +- .../org/apache/cassandra/cql3/CQLTester.java | 64 +++++++-------- .../apache/cassandra/cql3/CQLTesterTest.java | 2 +- .../cassandra/cql3/ColumnIdentifierTest.java | 3 +- .../apache/cassandra/cql3/CqlParserTest.java | 7 +- .../cql3/CustomNowInSecondsTest.java | 3 +- .../org/apache/cassandra/cql3/DeleteTest.java | 8 +- .../apache/cassandra/cql3/DurationTest.java | 7 +- .../cql3/EarlyOpenCompactionTest.java | 2 +- .../cassandra/cql3/EmptyValuesTest.java | 6 +- .../cassandra/cql3/GcCompactionTest.java | 15 ++-- .../cassandra/cql3/IndexQueryPagingTest.java | 4 +- .../cql3/NodeLocalConsistencyTest.java | 3 +- .../apache/cassandra/cql3/OutOfSpaceTest.java | 2 +- .../cassandra/cql3/PagingQueryTest.java | 8 +- .../org/apache/cassandra/cql3/PagingTest.java | 13 ++-- .../cql3/PasswordObfuscatorTest.java | 3 +- .../cql3/PreparedStatementsTest.java | 15 ++-- .../cassandra/cql3/PstmtPersistenceTest.java | 6 +- .../cassandra/cql3/QueryEventsTest.java | 9 ++- .../cassandra/cql3/RandomSchemaTest.java | 9 ++- .../apache/cassandra/cql3/RelationTest.java | 5 +- .../cassandra/cql3/ReservedKeywordsTest.java | 5 +- .../cql3/SecondaryIndexSSTableExportTest.java | 13 ++-- .../cql3/SerializationMirrorTest.java | 3 +- .../cassandra/cql3/StatementSourceTest.java | 3 +- .../cql3/SystemKeyspaceTablesNamesTest.java | 1 + .../apache/cassandra/cql3/TraceCqlTest.java | 9 ++- .../cassandra/cql3/UntypedResultSetTest.java | 1 + .../cql3/ViewAbstractParameterizedTest.java | 3 +- .../cassandra/cql3/ViewComplexTest.java | 1 + .../org/apache/cassandra/cql3/ViewPKTest.java | 5 +- .../apache/cassandra/cql3/ViewSchemaTest.java | 5 +- .../org/apache/cassandra/cql3/ViewTest.java | 13 ++-- .../apache/cassandra/cql3/ViewTimesTest.java | 7 +- .../cql3/ast/CQLFormatterPrettyPrintTest.java | 2 +- .../cassandra/cql3/ast/ExpressionTest.java | 3 +- .../apache/cassandra/cql3/ast/Mutation.java | 1 + .../org/apache/cassandra/cql3/ast/Select.java | 1 + .../apache/cassandra/cql3/ast/Statement.java | 1 + .../cql3/conditions/ColumnConditionTest.java | 5 +- .../cql3/functions/CastFctsTest.java | 4 +- .../functions/ClusterMetadataFctsTest.java | 2 +- .../cql3/functions/FormatBytesFctTest.java | 1 + .../cql3/functions/FormatTimeFctTest.java | 3 +- .../cql3/functions/LengthFctsTest.java | 2 +- .../cql3/functions/MathFctsTest.java | 6 +- .../cql3/functions/NativeFunctionsTest.java | 2 +- .../cql3/functions/TimeFctsTest.java | 9 ++- .../cql3/functions/VectorFctsTest.java | 3 +- .../masking/ColumnMaskQueryTester.java | 4 +- .../functions/masking/ColumnMaskTest.java | 5 +- .../functions/masking/ColumnMaskTester.java | 1 + .../masking/ColumnMaskWithUDFTest.java | 7 +- .../masking/HashMaskingFunctionTest.java | 7 +- .../masking/MaskingFunctionTester.java | 1 + .../masking/PartialMaskingFunctionTest.java | 9 ++- .../masking/SelectMaskedPermissionTest.java | 2 +- .../ClusteringColumnRestrictionsTest.java | 20 +++-- .../restrictions/ClusteringElementsTest.java | 1 + .../selection/SelectionColumnMappingTest.java | 26 ++++++- .../selection/SelectorSerializationTest.java | 16 +++- .../cql3/selection/TermSelectionTest.java | 14 +++- .../statements/AlterRoleStatementTest.java | 1 + .../statements/CreateRoleStatementTest.java | 1 + .../statements/DescribeStatementTest.java | 23 +++--- .../ListSuperUsersStatementTest.java | 9 ++- .../statements/PropertyDefinitionsTest.java | 5 +- .../cql3/statements/TxnDataNameTest.java | 4 +- .../cassandra/cql3/terms/ListsTest.java | 1 + .../validation/entities/CollectionsTest.java | 12 ++- .../cql3/validation/entities/JsonTest.java | 39 ++++++---- .../SecondaryIndexOnStaticColumnTest.java | 1 + .../entities/SecondaryIndexTest.java | 4 +- .../entities/StaticColumnsTest.java | 2 +- .../validation/entities/TimestampTest.java | 2 +- .../validation/entities/TupleTypeTest.java | 4 +- .../cql3/validation/entities/TypeTest.java | 7 +- .../cql3/validation/entities/UFAuthTest.java | 26 +++++-- .../entities/UFIdentificationTest.java | 8 +- .../cql3/validation/entities/UFJavaTest.java | 7 +- .../cql3/validation/entities/UFTest.java | 3 +- .../cql3/validation/entities/UFTypesTest.java | 3 +- .../validation/entities/UFVerifierTest.java | 20 ++++- .../validation/entities/VirtualTableTest.java | 6 +- .../CommentAndSecurityLabelTest.java | 3 +- .../miscellaneous/CrcCheckChanceTest.java | 2 +- .../miscellaneous/OverflowTest.java | 2 +- .../validation/operations/AlterNTSTest.java | 5 +- .../operations/AutoSnapshotTest.java | 5 +- .../validation/operations/CQLVectorTest.java | 2 +- .../DropRecreateAndRestoreTest.java | 2 +- .../InsertInvalidateSizedRecordsTest.java | 5 +- .../validation/operations/InsertTest.java | 2 +- .../operations/SelectGroupByTest.java | 8 +- .../SelectMultiColumnRelationTest.java | 4 +- .../validation/operations/SelectTest.java | 6 +- .../cql3/validation/operations/TTLTest.java | 2 +- .../validation/operations/UpdateTest.java | 4 +- .../db/AbstractReadQueryToCQLStringTest.java | 1 + .../org/apache/cassandra/db/CellSpecTest.java | 2 +- .../org/apache/cassandra/db/CellTest.java | 4 +- .../org/apache/cassandra/db/CleanupTest.java | 1 + .../cassandra/db/ClusteringHeapSizeTest.java | 2 +- .../cassandra/db/ColumnFamilyMetricTest.java | 13 +++- .../db/ColumnFamilyStoreMBeanTest.java | 9 ++- .../cassandra/db/ColumnFamilyStoreTest.java | 5 +- .../org/apache/cassandra/db/ColumnsTest.java | 14 ++-- .../apache/cassandra/db/CounterCellTest.java | 11 ++- .../cassandra/db/CounterMutationTest.java | 6 +- ...nterMutationVerbHandlerOutOfRangeTest.java | 8 +- .../cassandra/db/DeletePartitionTest.java | 6 +- .../org/apache/cassandra/db/DigestTest.java | 1 + .../apache/cassandra/db/DirectoriesTest.java | 18 +++-- .../cassandra/db/DiskBoundaryManagerTest.java | 1 + .../org/apache/cassandra/db/ImportTest.java | 1 + .../org/apache/cassandra/db/KeyspaceTest.java | 2 +- .../apache/cassandra/db/LivenessInfoTest.java | 7 +- .../org/apache/cassandra/db/MmapFileTest.java | 7 +- .../cassandra/db/MultiKeyspaceTest.java | 4 +- .../MutationExceededMaxSizeExceptionTest.java | 2 +- .../db/MutationVerbHandlerOutOfRangeTest.java | 6 +- .../org/apache/cassandra/db/NameSortTest.java | 11 +-- .../apache/cassandra/db/NativeCellTest.java | 11 ++- .../db/PartitionRangeReadCommandCQLTest.java | 3 +- .../apache/cassandra/db/PartitionTest.java | 19 +++-- .../cassandra/db/RangeTombstoneTest.java | 19 ++++- .../cassandra/db/ReadCommandCQLTester.java | 3 +- .../apache/cassandra/db/ReadCommandTest.java | 22 +++++- .../ReadCommandVerbHandlerOutOfRangeTest.java | 1 + .../apache/cassandra/db/ReadMessageTest.java | 17 ++-- .../db/RecoveryManagerMissingHeaderTest.java | 4 +- .../db/RecoveryManagerTruncateTest.java | 16 ++-- .../cassandra/db/RepairedDataInfoTest.java | 7 +- .../db/RepairedDataTombstonesTest.java | 1 + .../apache/cassandra/db/RowCacheCQLTest.java | 1 + .../org/apache/cassandra/db/RowCacheTest.java | 1 + .../apache/cassandra/db/RowIterationTest.java | 2 +- .../unit/org/apache/cassandra/db/RowTest.java | 14 +++- .../apache/cassandra/db/RowUpdateBuilder.java | 9 ++- .../db/SSTableAndMemTableDigestMatchTest.java | 1 + .../cassandra/db/SchemaCQLHelperTest.java | 63 +++++++++------ .../cassandra/db/SerializationHeaderTest.java | 1 + .../db/SinglePartitionSliceCommandTest.java | 7 +- .../db/SystemKeyspaceMigrator41Test.java | 1 + .../cassandra/db/SystemKeyspaceTest.java | 7 +- .../org/apache/cassandra/db/TimeSortTest.java | 3 +- .../apache/cassandra/db/TransformerTest.java | 13 +++- .../db/aggregation/GroupMakerTest.java | 2 +- .../SSTableReverseIteratorTest.java | 1 + .../db/commitlog/BatchCommitLogTest.java | 2 +- .../db/commitlog/CDCTestReplayer.java | 2 +- .../db/commitlog/CommitLogArchiverTest.java | 4 +- .../CommitLogChainedMarkersTest.java | 4 +- .../db/commitlog/CommitLogDescriptorTest.java | 3 +- .../commitlog/CommitLogFailurePolicyTest.java | 1 + .../CommitLogInitWithExceptionTest.java | 7 +- .../db/commitlog/CommitLogReaderTest.java | 14 ++-- .../CommitLogSegmentBackpressureTest.java | 6 +- .../CommitLogSegmentManagerCDCTest.java | 11 ++- .../cassandra/db/commitlog/CommitLogTest.java | 11 ++- .../db/commitlog/CommitLogTestReplayer.java | 3 +- .../db/commitlog/CommitLogUpgradeTest.java | 1 + .../commitlog/CommitLogUpgradeTestMaker.java | 20 +++-- .../db/commitlog/CommitlogShutdownTest.java | 5 +- .../commitlog/DirectIOSegmentBytemanTest.java | 13 ++-- .../db/commitlog/DirectIOSegmentTest.java | 8 +- .../db/commitlog/SegmentReaderTest.java | 8 +- .../AbstractCompactionStrategyTest.java | 3 +- .../db/compaction/ActiveCompactionsTest.java | 1 + .../compaction/AntiCompactionBytemanTest.java | 9 ++- .../db/compaction/AntiCompactionTest.java | 39 ++++++---- .../db/compaction/CancelCompactionsTest.java | 1 + .../CompactionAccordIteratorsTest.java | 4 +- .../compaction/CompactionControllerTest.java | 11 +-- .../db/compaction/CompactionExecutorTest.java | 3 +- .../db/compaction/CompactionInfoTest.java | 2 +- .../db/compaction/CompactionIteratorTest.java | 10 +-- ...ctionStrategyManagerPendingRepairTest.java | 5 +- .../CompactionStrategyManagerTest.java | 1 + .../db/compaction/CompactionsBytemanTest.java | 6 +- .../db/compaction/CompactionsCQLTest.java | 41 ++++++---- .../db/compaction/CompactionsPurgeTest.java | 13 +++- .../CorruptedSSTablesCompactionsTest.java | 1 + .../LeveledCompactionStrategyTest.java | 3 +- .../db/compaction/LeveledGenerationsTest.java | 3 +- .../compaction/PendingRepairManagerTest.java | 1 + .../db/compaction/ShardManagerTest.java | 12 ++- .../compaction/SingleSSTableLCSTaskTest.java | 1 + .../db/compaction/TTLExpiryTest.java | 1 + .../TimeWindowCompactionStrategyTest.java | 1 + .../UnifiedCompactionStrategyTest.java | 11 +-- .../db/compaction/ValidationExecutorTest.java | 1 - .../BackgroundCompactionTrackingTest.java | 6 +- .../db/compaction/unified/ControllerTest.java | 5 +- .../unified/ParallelizedTasksTest.java | 2 +- .../unified/ShardedMultiWriterTest.java | 1 + .../writers/CompactionAwareWriterTest.java | 1 + .../cassandra/db/composites/CTypeTest.java | 12 ++- .../CompressionDictionaryCacheTest.java | 3 +- .../CompressionDictionaryDataObjectTest.java | 1 + .../CompressionDictionaryIntegrationTest.java | 2 +- .../ZstdCompressionDictionaryTest.java | 5 +- .../ZstdDictionaryTrainerTest.java | 3 +- .../db/context/CounterContextTest.java | 3 +- .../cassandra/db/filter/IndexHintsTest.java | 4 +- .../cassandra/db/filter/RowFilterTest.java | 1 + .../CassandraPasswordGeneratorTest.java | 3 +- .../CassandraPasswordValidatorTest.java | 2 +- .../GuardrailCollectionListSizeTest.java | 1 + .../GuardrailCollectionMapSizeTest.java | 1 + .../GuardrailCollectionSetSizeTest.java | 1 + .../GuardrailCollectionSizeTest.java | 1 + ...drailCollectionTypeSpecificSizeTester.java | 2 + .../GuardrailColumnAsciiValueSizeTest.java | 1 + .../db/guardrails/GuardrailDiskUsageTest.java | 7 +- .../GuardrailKeyspacePropertiesTest.java | 13 ++-- ...GuardrailMaximumReplicationFactorTest.java | 2 +- ...GuardrailMinimumReplicationFactorTest.java | 2 +- .../GuardrailPasswordPolicyTest.java | 2 +- .../GuardrailSaiVectorTermSizeTest.java | 1 + ...GuardrailSecondaryIndexesPerTableTest.java | 1 + .../GuardrailTablePropertiesTest.java | 2 + .../db/guardrails/GuardrailTester.java | 4 +- .../GuardrailsConfigProviderTest.java | 2 +- .../guardrails/InvalidRoleNameGenerator.java | 1 + .../db/guardrails/TestRoleNameValidator.java | 1 + .../db/guardrails/ThresholdTester.java | 3 +- .../db/guardrails/ValueGeneratorTest.java | 1 + .../db/guardrails/ValueValidatorTest.java | 1 + .../cassandra/db/lifecycle/HelpersTest.java | 3 +- .../lifecycle/LifecycleTransactionTest.java | 1 + .../db/lifecycle/LogTransactionTest.java | 5 +- .../db/lifecycle/RealTransactionsTest.java | 4 +- .../cassandra/db/lifecycle/TrackerTest.java | 1 + .../cassandra/db/lifecycle/ViewTest.java | 1 + .../db/marshal/AbstractCompositeTypeTest.java | 1 + .../db/marshal/AbstractTypeTest.java | 32 ++++---- .../cassandra/db/marshal/BytesTypeTest.java | 3 +- .../db/marshal/CollectionTypeTest.java | 18 ++++- .../db/marshal/CompositeTypeTest.java | 34 +++++--- .../cassandra/db/marshal/DecimalTypeTest.java | 8 +- .../db/marshal/DynamicCompositeTypeTest.java | 21 +++-- .../cassandra/db/marshal/EmptyTypeTest.java | 2 +- .../cassandra/db/marshal/IntegerTypeTest.java | 8 +- .../db/marshal/JsonConversionTest.java | 8 +- .../db/marshal/NativeAccessorTest.java | 1 + .../marshal/PartitionerDefinedOrderTest.java | 3 +- .../db/marshal/ReversedTypeTest.java | 2 +- .../cassandra/db/marshal/RoundTripTest.java | 19 +++-- .../db/marshal/SimpleDateTypeTest.java | 1 + .../cassandra/db/marshal/TimeTypeTest.java | 2 +- .../db/marshal/TimeUUIDTypeTest.java | 8 +- .../db/marshal/TimestampTypeTest.java | 2 +- .../cassandra/db/marshal/TypeCompareTest.java | 4 +- .../cassandra/db/marshal/TypeParserTest.java | 19 +++-- .../db/marshal/TypeValidationTest.java | 24 +++--- .../cassandra/db/marshal/UUIDTypeTest.java | 14 ++-- .../db/marshal/ValueAccessorTest.java | 4 +- .../cassandra/db/marshal/VectorTypeTest.java | 1 - .../db/memtable/MemtableQuickTest.java | 2 +- .../db/memtable/MemtableSizeTestBase.java | 6 +- .../memtable/ShardedMemtableConfigTest.java | 1 + .../TrieMemtableFlushSetTestBase.java | 1 + .../PartitionImplementationTest.java | 41 ++++++++-- .../db/partition/PartitionUpdateTest.java | 8 +- ...cBTreePartitionMemtableAccountingTest.java | 2 - .../db/partitions/PurgeFunctionTest.java | 18 ++++- .../AbstractPendingAntiCompactionTest.java | 1 + ...onManagerGetSSTablesForValidationTest.java | 13 ++-- .../PendingAntiCompactionBytemanTest.java | 8 +- .../db/repair/PendingAntiCompactionTest.java | 4 +- .../ColumnMetadataVersionComparatorTest.java | 14 +++- .../cassandra/db/rows/EncodingStatsTest.java | 1 + .../rows/RowAndDeletionMergeIteratorTest.java | 35 ++++++--- .../cassandra/db/rows/RowsMergingTest.java | 5 +- .../apache/cassandra/db/rows/RowsTest.java | 10 ++- .../rows/ThrottledUnfilteredIteratorTest.java | 12 ++- ...filteredRowIteratorWithLowerBoundTest.java | 2 +- .../rows/UnfilteredRowIteratorsMergeTest.java | 22 +++++- .../db/rows/UnfilteredRowIteratorsTest.java | 2 +- .../db/rows/UnfilteredRowsGenerator.java | 17 +++- ...assandraEntireSSTableStreamWriterTest.java | 15 ++-- .../streaming/CassandraStreamManagerTest.java | 7 +- .../CassandraStreamReceiverTest.java | 6 +- ...StreamConcurrentComponentMutationTest.java | 18 +++-- .../db/transform/DuplicateRowCheckerTest.java | 28 +++++-- .../db/transform/RTTransformationsTest.java | 29 +++++-- .../db/tries/CollectionMergeTrieTest.java | 7 +- .../db/tries/InMemoryTrieTestBase.java | 15 +++- .../cassandra/db/tries/MergeTrieTest.java | 6 +- .../cassandra/db/tries/SlicedTrieTest.java | 5 +- .../AbstractLoggerVirtualTableTest.java | 8 +- .../db/virtual/AccordDebugKeyspaceTest.java | 9 ++- .../db/virtual/AccordVirtualTablesTest.java | 3 +- .../db/virtual/BatchMetricsTableTest.java | 9 ++- .../CIDRFilteringMetricsTableTest.java | 3 +- .../db/virtual/CQLMetricsTableTest.java | 7 +- .../virtual/ClientsTableKeyspaceColTest.java | 7 +- .../db/virtual/ClientsTableTest.java | 6 +- .../CollectionVirtualTableAdapterTest.java | 5 +- .../CredentialsCacheKeysTableTest.java | 5 +- .../db/virtual/ExceptionsTableTest.java | 1 + .../JmxPermissionsCacheKeysTableTest.java | 2 + .../db/virtual/LazyVirtualTableTest.java | 6 +- .../db/virtual/LocalRepairTablesTest.java | 3 +- .../db/virtual/LogMessagesTableTest.java | 3 +- .../NetworkPermissionsCacheKeysTableTest.java | 1 + .../virtual/PartitionKeyStatsTableTest.java | 9 ++- .../PermissionsCacheKeysTableTest.java | 1 + .../db/virtual/RolesCacheKeysTableTest.java | 1 + .../db/virtual/SSTableTasksTableTest.java | 1 + .../db/virtual/SchemaMetadataTableTest.java | 7 +- .../db/virtual/SettingsTableTest.java | 15 ++-- .../db/virtual/SlowQueriesTableTest.java | 5 +- .../db/virtual/SnapshotsTableTest.java | 3 +- .../db/virtual/StreamingVirtualTableTest.java | 3 +- .../db/virtual/SystemPropertiesTableTest.java | 10 +-- .../cassandra/dht/AccordSplitterTest.java | 3 +- .../cassandra/dht/BootStrapperTest.java | 10 +-- .../cassandra/dht/IPartitionerTest.java | 9 ++- .../cassandra/dht/LengthPartitioner.java | 1 + .../cassandra/dht/PartitionerTestCase.java | 1 + .../dht/RangeFetchMapCalculatorTest.java | 3 +- .../org/apache/cassandra/dht/RangeTest.java | 1 + .../apache/cassandra/dht/SplitterTest.java | 2 +- .../OfflineTokenAllocatorTestUtils.java | 3 +- .../tokenallocator/TokenAllocationTest.java | 2 +- .../diag/DiagnosticEventServiceTest.java | 1 + .../cassandra/fql/FullQueryLoggerTest.java | 29 +++---- .../cassandra/gms/ArrivalWindowTest.java | 4 +- .../cassandra/gms/GossipDigestTest.java | 8 +- .../cassandra/gms/GossipShutdownTest.java | 2 +- .../apache/cassandra/gms/GossiperTest.java | 7 +- .../apache/cassandra/gms/NewGossiperTest.java | 7 +- .../cassandra/gms/VersionedValueTest.java | 1 + .../apache/cassandra/hints/AlteredHints.java | 9 ++- .../hints/ChecksummedDataInputTest.java | 24 ++++-- .../cassandra/hints/HintMessageTest.java | 4 +- .../hints/HintServiceBytemanTest.java | 8 +- .../cassandra/hints/HintWriteTTLTest.java | 2 +- .../cassandra/hints/HintsBufferPoolTest.java | 13 ++-- .../cassandra/hints/HintsBufferTest.java | 15 +++- .../cassandra/hints/HintsCatalogTest.java | 16 ++-- .../cassandra/hints/HintsCompressionTest.java | 1 + .../cassandra/hints/HintsDescriptorTest.java | 5 +- .../cassandra/hints/HintsEncryptionTest.java | 1 + .../cassandra/hints/HintsReaderTest.java | 11 ++- .../cassandra/hints/HintsServiceTest.java | 5 +- .../cassandra/hints/HintsStoreTest.java | 12 +-- .../cassandra/hints/HintsUpgradeTest.java | 1 + .../cassandra/index/CustomIndexTest.java | 11 +-- .../index/SecondaryIndexManagerTest.java | 1 + .../org/apache/cassandra/index/StubIndex.java | 21 ++++- .../cassandra/index/StubIndexGroup.java | 1 + .../index/accord/AccordIndexUtil.java | 1 + .../CheckpointIntervalArrayIndexTest.java | 4 +- .../index/accord/RangeMemoryIndexTest.java | 4 +- .../index/accord/RouteIndexTest.java | 25 +++--- .../index/internal/CassandraIndexTest.java | 1 + .../index/internal/CustomCassandraIndex.java | 1 + .../apache/cassandra/index/sai/SAITester.java | 16 ++-- .../sai/analyzer/filter/BasicFiltersTest.java | 2 +- .../index/sai/cql/AbstractQueryTester.java | 1 + .../sai/cql/AbstractSimpleEqTestBase.java | 7 +- .../index/sai/cql/AllTypesSimpleEqTest.java | 3 +- .../index/sai/cql/AllowFilteringTest.java | 2 +- .../index/sai/cql/DecimalLargeValueTest.java | 1 + .../sai/cql/DescClusteringRangeQueryTest.java | 3 +- .../index/sai/cql/DuplicateRowIDTest.java | 3 +- .../index/sai/cql/IndexQuerySupport.java | 6 +- .../sai/cql/IntraPartitionSkippingTest.java | 2 +- .../index/sai/cql/SingleNodeExecutor.java | 1 + .../sai/cql/StorageAttachedIndexDDLTest.java | 15 ++-- .../index/sai/cql/TokenRangeReadTest.java | 2 +- .../index/sai/cql/VectorInvalidQueryTest.java | 7 +- .../index/sai/cql/VectorLocalTest.java | 6 +- .../cassandra/index/sai/cql/VectorTester.java | 14 ++-- .../index/sai/cql/VectorUpdateDeleteTest.java | 4 +- .../TwoRegularOneStaticIntersectionTest.java | 6 +- ...larOneStaticPartitionIntersectionTest.java | 6 +- .../index/sai/disk/NodeStartupTest.java | 7 +- .../sai/disk/SelectiveIntersectionTest.java | 3 +- .../sai/disk/SingleNodeQueryFailureTest.java | 3 +- .../sai/disk/format/IndexDescriptorTest.java | 1 + .../sai/disk/io/TrackingIndexFileUtils.java | 3 +- .../v1/BalancedTreeIndexSearcherTest.java | 1 + .../sai/disk/v1/InvertedIndexBuilder.java | 1 + .../disk/v1/InvertedIndexSearcherTest.java | 3 +- .../index/sai/disk/v1/MetadataTest.java | 8 +- .../index/sai/disk/v1/SAICodecUtilsTest.java | 8 +- .../index/sai/disk/v1/SegmentFlushTest.java | 5 +- .../index/sai/disk/v1/SorterTest.java | 4 +- .../index/sai/disk/v1/TermsReaderTest.java | 7 +- .../index/sai/disk/v1/TermsScanner.java | 3 +- .../bbtree/BlockBalancedTreeIndexBuilder.java | 3 +- .../BlockBalancedTreePostingsWriterTest.java | 10 +-- .../bbtree/BlockBalancedTreeReaderTest.java | 6 +- .../disk/v1/bbtree/BlockBalancedTreeTest.java | 6 +- .../sai/disk/v1/bbtree/LeafOrderMapTest.java | 9 ++- .../v1/bbtree/NumericIndexWriterTest.java | 13 ++-- .../sai/disk/v1/keystore/KeyLookupTest.java | 2 +- .../v1/postings/MergePostingListTest.java | 1 + .../sai/disk/v1/postings/PostingsTest.java | 10 +-- .../v1/postings/ScanningPostingsReader.java | 5 +- .../index/sai/functional/CompactionTest.java | 5 +- .../index/sai/functional/DropTableTest.java | 1 + .../index/sai/functional/FlushingTest.java | 5 +- .../sai/functional/GroupComponentsTest.java | 1 + .../index/sai/functional/NodeRestartTest.java | 2 +- .../KeyRangeIntersectionIteratorTest.java | 5 +- .../memory/InMemoryKeyRangeIteratorTest.java | 2 +- .../PriorityInMemoryKeyRangeIteratorTest.java | 2 +- .../index/sai/memory/TrieMemoryIndexTest.java | 2 +- .../sai/memory/VectorMemoryIndexTest.java | 1 + .../index/sai/metrics/QueryMetricsTest.java | 4 +- .../metrics/SegmentFlushingFailureTester.java | 5 +- .../index/sai/metrics/StateMetricsTest.java | 4 +- .../sai/plan/FlushIndexWhileQueryingTest.java | 4 +- .../index/sai/plan/OperationTest.java | 1 + .../sai/utils/IndexInputLeakDetector.java | 4 +- .../index/sai/utils/ResourceLeakDetector.java | 3 +- .../index/sai/utils/SAIRandomizedTester.java | 3 +- .../sai/virtual/IndexesSystemViewTest.java | 1 + .../sai/virtual/SSTablesSystemViewTest.java | 3 +- .../sai/virtual/SegmentsSystemViewTest.java | 1 + .../cassandra/index/sasi/SASICQLTest.java | 6 +- .../cassandra/index/sasi/SASIIndexTest.java | 5 +- .../sasi/analyzer/DelimiterAnalyzerTest.java | 8 +- .../analyzer/NonTokenizingAnalyzerTest.java | 6 +- .../index/sasi/conf/IndexModeTest.java | 1 + .../index/sasi/disk/OnDiskIndexTest.java | 44 +++++++---- .../sasi/disk/PerSSTableIndexWriterTest.java | 1 + .../index/sasi/disk/TokenTreeTest.java | 36 +++++---- .../index/sasi/plan/ExpressionTest.java | 5 +- .../index/sasi/plan/OperationTest.java | 35 +++++++-- .../index/sasi/utils/LongIterator.java | 1 + .../index/sasi/utils/LongIteratorTest.java | 4 +- .../utils/RangeIntersectionIteratorTest.java | 16 ++-- .../sasi/utils/RangeUnionIteratorTest.java | 10 ++- .../apache/cassandra/inject/Injections.java | 7 +- .../cassandra/io/DiskSpaceMetricsTest.java | 1 + .../cassandra/io/FileSystemListeners.java | 1 + .../cassandra/io/IVersionedSerializers.java | 4 +- .../org/apache/cassandra/io/Serializers.java | 4 +- .../CompressedRandomAccessReaderTest.java | 2 +- .../CompressedSequentialWriterTest.java | 1 + .../cassandra/io/compress/CompressorTest.java | 10 ++- .../io/compress/ZstdCompressorTest.java | 6 +- .../ZstdDictionaryCompressorTest.java | 18 +++-- .../sstable/CQLSSTableWriterClientTest.java | 1 + .../CQLSSTableWriterConcurrencyTest.java | 2 +- .../io/sstable/CQLSSTableWriterTest.java | 5 +- .../cassandra/io/sstable/ComponentTest.java | 3 +- .../io/sstable/LegacySSTableTest.java | 4 +- .../io/sstable/SSTableFlushObserverTest.java | 2 +- .../io/sstable/SSTableFormatTest.java | 3 +- .../cassandra/io/sstable/SSTableIdTest.java | 3 +- .../io/sstable/SSTableLoaderTest.java | 14 ++-- .../io/sstable/SSTableReaderTest.java | 3 +- .../io/sstable/SSTableRewriterTest.java | 1 + .../io/sstable/SSTableScannerTest.java | 3 +- .../cassandra/io/sstable/SSTableUtils.java | 20 +++-- .../io/sstable/SSTableWriterTestBase.java | 2 +- .../io/sstable/SSTableZeroCopyWriterTest.java | 5 +- .../cassandra/io/sstable/ScrubTest.java | 8 +- .../cassandra/io/sstable/VerifyTest.java | 1 + .../AbstractTestVersionSupportedFeatures.java | 2 +- .../io/sstable/format/ColumnIndexTest.java | 11 +-- .../sstable/format/big/RowIndexEntryTest.java | 1 + .../format/bti/LoadingBuilderTest.java | 4 +- .../format/bti/PartitionIndexTest.java | 1 + .../io/sstable/format/bti/RowIndexTest.java | 1 + .../indexsummary/IndexSummaryManagerTest.java | 1 + .../indexsummary/IndexSummaryTest.java | 1 + .../io/sstable/keycache/KeyCacheTest.java | 11 +-- .../cassandra/io/tries/TrieNodeTest.java | 4 +- .../apache/cassandra/io/tries/WalkerTest.java | 2 +- .../io/util/BufferedDataOutputStreamTest.java | 30 +++++--- .../cassandra/io/util/ChecksumedDataTest.java | 3 +- .../ChecksummedRandomAccessReaderTest.java | 5 +- .../util/ChecksummedSequentialWriterTest.java | 2 +- .../io/util/CompressedChunkReaderTest.java | 17 ++-- .../io/util/DataOutputInputPlusTest.java | 2 +- .../io/util/FileSegmentInputStreamTest.java | 1 + .../apache/cassandra/io/util/FileTest.java | 5 +- .../cassandra/io/util/FileUtilsTest.java | 2 +- .../apache/cassandra/io/util/MemoryTest.java | 2 +- .../cassandra/io/util/MmappedRegionsTest.java | 1 + .../io/util/NIODataInputStreamTest.java | 23 ++++-- .../io/util/SequentialWriterTest.java | 6 +- .../io/util/TailOverridingRebuffererTest.java | 1 - .../util/ThreadLocalReadAheadBufferTest.java | 5 +- .../cassandra/journal/DescriptorTest.java | 4 +- .../apache/cassandra/journal/IndexTest.java | 8 +- .../apache/cassandra/journal/SegmentTest.java | 17 ++-- .../AssureSufficientLiveNodesTest.java | 11 ++- .../locator/AzureConnectorMockingTest.java | 3 +- .../locator/DynamicEndpointSnitchTest.java | 3 +- .../cassandra/locator/Ec2SnitchTest.java | 3 +- .../locator/Ec2V2ConnectorMockingTest.java | 5 +- .../GossipingPropertyFileSnitchTest.java | 2 +- .../cassandra/locator/MetaStrategyTest.java | 1 + .../locator/NetworkTopologyStrategyTest.java | 1 + .../cassandra/locator/PendingRangesTest.java | 1 + .../locator/ReplicaCollectionTest.java | 44 +++++++---- .../cassandra/locator/ReplicaLayoutTest.java | 11 ++- .../cassandra/locator/ReplicaPlansTest.java | 1 + .../cassandra/locator/ReplicaUtils.java | 10 ++- .../locator/ReplicationFactorTest.java | 2 +- .../locator/SimpleSeedProviderTest.java | 2 +- .../cassandra/locator/SimpleStrategyTest.java | 1 + .../cassandra/metrics/BatchMetricsTest.java | 9 ++- .../cassandra/metrics/CQLMetricsTest.java | 9 ++- .../metrics/CassandraMetricsRegistryTest.java | 7 +- .../cassandra/metrics/ClientMetricsTest.java | 7 +- .../metrics/ClientRequestMetricsTest.java | 9 ++- .../ClientRequestRowAndColumnMetricsTest.java | 1 + .../metrics/ClientRequestSizeMetricsTest.java | 9 ++- ...cayingEstimatedHistogramReservoirTest.java | 5 +- .../metrics/HintedHandOffMetricsTest.java | 6 +- .../apache/cassandra/metrics/HitRateTest.java | 3 +- .../metrics/JmxVirtualTableMetricsTest.java | 6 +- .../metrics/KeyspaceMetricsTest.java | 9 ++- .../LogLinearDecayingHistogramTest.java | 3 +- .../metrics/LogLinearHistogramTest.java | 4 +- .../cassandra/metrics/MaxSamplerTest.java | 3 +- .../apache/cassandra/metrics/SamplerTest.java | 13 ++-- .../cassandra/metrics/TableMetricsTest.java | 11 +-- .../metrics/ThreadLocalCounterTest.java | 1 - .../metrics/ThreadLocalMeterTest.java | 3 +- .../metrics/TopFrequencySamplerTest.java | 3 +- .../metrics/TrieMemtableMetricsTest.java | 11 +-- .../net/AsyncChannelPromiseTest.java | 4 +- .../net/AsyncMessageOutputPlusTest.java | 5 +- .../net/AsyncStreamingInputPlusTest.java | 3 +- .../net/AsyncStreamingOutputPlusTest.java | 5 +- .../net/BufferPoolAllocatorTest.java | 5 +- .../cassandra/net/ChunkedInputPlusTest.java | 6 +- .../apache/cassandra/net/ConnectionTest.java | 17 ++-- .../cassandra/net/ForwardingInfoTest.java | 1 + .../org/apache/cassandra/net/FramingTest.java | 6 +- .../apache/cassandra/net/HandshakeTest.java | 6 +- .../cassandra/net/MessageDeliveryTest.java | 4 +- .../net/MessageSerializationPropertyTest.java | 6 +- .../cassandra/net/MessagingServiceTest.java | 7 +- .../net/MockMessagingServiceTest.java | 2 +- .../cassandra/net/MockMessagingSpy.java | 1 + .../net/OutboundConnectionsTest.java | 1 + .../net/ProxyHandlerConnectionsTest.java | 4 +- .../cassandra/net/PrunableArrayQueueTest.java | 7 +- .../cassandra/net/ResourceLimitsTest.java | 14 ++-- .../net/SimulatedMessageDelivery.java | 1 + .../org/apache/cassandra/net/TestChannel.java | 3 +- .../ConcurrentIrWithPreviewFuzzTest.java | 3 +- .../cassandra/repair/FailedAckTest.java | 5 +- .../repair/FailingRepairFuzzTest.java | 6 +- .../apache/cassandra/repair/FuzzTestBase.java | 12 ++- .../cassandra/repair/HappyPathFuzzTest.java | 3 +- .../cassandra/repair/LocalSyncTaskTest.java | 9 ++- .../repair/NeighborsAndRangesTest.java | 1 + .../cassandra/repair/RepairJobTest.java | 3 +- ...epairMessageVerbHandlerOutOfRangeTest.java | 18 +++-- .../cassandra/repair/RepairSessionTest.java | 1 + .../cassandra/repair/SlowMessageFuzzTest.java | 1 + .../repair/SymmetricRemoteSyncTaskTest.java | 1 + .../cassandra/repair/ValidationTaskTest.java | 10 +-- .../cassandra/repair/ValidatorTest.java | 16 ++-- .../asymmetric/DifferenceHolderTest.java | 1 + .../asymmetric/RangeDenormalizerTest.java | 3 +- .../repair/asymmetric/ReduceHelperTest.java | 1 + .../asymmetric/StreamFromOptionsTest.java | 1 + .../autorepair/AutoRepairConfigTest.java | 2 +- .../autorepair/AutoRepairKeyspaceTest.java | 6 +- .../AutoRepairParameterizedTest.java | 49 ++++++------ .../autorepair/AutoRepairStateTest.java | 1 + .../repair/autorepair/AutoRepairTest.java | 4 +- .../autorepair/AutoRepairUtilsTest.java | 9 +-- .../autorepair/PrioritizedRepairPlanTest.java | 1 + .../RepairTokenRangeSplitterTest.java | 4 +- .../AbstractConsistentSessionTest.java | 2 +- .../consistent/BulkRepairStateTest.java | 8 +- .../consistent/CoordinatorMessagingTest.java | 12 +-- .../consistent/CoordinatorSessionTest.java | 6 +- .../consistent/CoordinatorSessionsTest.java | 15 ++-- .../repair/consistent/LocalSessionTest.java | 33 ++++---- .../consistent/PendingRepairStatTest.java | 3 +- .../repair/consistent/RepairStateTest.java | 1 + .../admin/SchemaArgsParserTest.java | 1 + .../RepairMessageSerializationsTest.java | 12 ++- .../repair/messages/RepairMessageTest.java | 8 +- .../schema/CreateTableValidationTest.java | 4 +- .../cassandra/schema/MemtableParamsTest.java | 7 +- .../apache/cassandra/schema/MockSchema.java | 1 + .../cassandra/schema/SchemaChangesTest.java | 8 +- .../cassandra/schema/SchemaKeyspaceTest.java | 3 +- .../schema/SchemaMutationsSerializerTest.java | 2 +- .../schema/SchemaStatementWarningsTest.java | 8 +- .../apache/cassandra/schema/TableIdTest.java | 3 +- .../cassandra/schema/TableParamsTest.java | 1 + .../cassandra/schema/ValidationTest.java | 7 +- .../schema/createlike/CreateLikeTest.java | 3 +- .../cassandra/security/CipherFactoryTest.java | 1 + .../security/CryptoProviderTest.java | 5 +- .../DefaultSslContextFactoryTest.java | 10 ++- .../security/DummySslContextFactoryImpl.java | 4 +- .../security/EncryptionUtilsTest.java | 3 +- .../FileBasedSslContextFactoryTest.java | 2 +- .../PEMBasedSslContextFactoryTest.java | 10 ++- .../cassandra/security/SSLFactoryTest.java | 12 +-- .../serializers/DecimalSerializerTest.java | 4 +- .../serializers/MapSerializerTest.java | 1 + .../serializers/SetSerializerTest.java | 4 +- .../serializers/SimpleDateSerializerTest.java | 13 +++- .../serializers/TimeSerializerTest.java | 4 +- .../serializers/TimestampSerializerTest.java | 7 +- .../service/ActiveRepairServiceTest.java | 3 +- .../AutoRepairServiceRepairTypeTest.java | 16 ++-- .../service/AutoRepairServiceSetterTest.java | 30 ++++---- .../service/BootstrapTransientTest.java | 1 + .../cassandra/service/GCInspectorTest.java | 4 +- .../cassandra/service/LegacyAuthFailTest.java | 1 + .../cassandra/service/PaxosStateTest.java | 33 ++++---- .../service/ProtocolBetaVersionTest.java | 12 ++- .../cassandra/service/QueryPagerTest.java | 41 +++++++--- .../service/SSTablesGlobalTrackerTest.java | 9 ++- .../cassandra/service/SerializationsTest.java | 1 + .../cassandra/service/StartupChecksTest.java | 3 +- .../cassandra/service/StorageProxyTest.java | 5 +- .../service/StorageServiceDrainTest.java | 2 +- .../service/StorageServiceServerTest.java | 3 +- .../service/WriteResponseHandlerTest.java | 3 +- .../WriteResponseHandlerTransientTest.java | 1 + .../service/accord/AccordAgentTest.java | 1 + .../accord/AccordAsyncConversionTest.java | 1 + .../service/accord/AccordCacheEntryTest.java | 2 +- .../service/accord/AccordCacheTest.java | 2 +- .../accord/AccordCommandStoreTest.java | 1 + .../service/accord/AccordCommandTest.java | 9 ++- .../accord/AccordFastPathCoordinatorTest.java | 11 ++- .../accord/AccordJournalOrderTest.java | 1 + .../service/accord/AccordJournalTest.java | 3 +- .../service/accord/AccordKeyspaceTest.java | 8 +- .../service/accord/AccordMessageSinkTest.java | 18 ++--- .../service/accord/AccordReadRepairTest.java | 1 + .../accord/AccordStaleReplicasTest.java | 1 + .../accord/AccordSyncPropagatorTest.java | 6 +- .../service/accord/AccordTaskTest.java | 20 ++--- .../service/accord/AccordTestUtils.java | 2 + .../service/accord/AccordTopologyTest.java | 2 + .../service/accord/AccordTopologyUtils.java | 1 + .../service/accord/CommandChangeTest.java | 8 +- .../service/accord/EndpointMappingTest.java | 9 ++- .../service/accord/EpochSyncTest.java | 12 +-- .../accord/RouteInMemoryIndexTest.java | 7 +- .../accord/SimpleAccordEndpointMapper.java | 1 + ...SimpleSimulatedAccordCommandStoreTest.java | 2 +- .../accord/SimulatedAccordCommandStore.java | 5 +- .../SimulatedAccordCommandStoreTestBase.java | 6 +- .../accord/SimulatedAccordTaskTest.java | 3 +- .../service/accord/SimulatedDepsTest.java | 22 +++--- .../accord/SimulatedMultiKeyAndRangeTest.java | 1 + ...ulatedRandomKeysWithRangeConflictTest.java | 8 +- .../accord/WatermarkCollectorTest.java | 3 +- .../accord/fastpath/FastPathParsingTest.java | 1 + .../ParameterizedFastPathStrategyTest.java | 2 + .../journal/AccordTopologyUpdateTest.java | 3 +- .../repair/RequiredResponseTrackerTest.java | 9 ++- .../CheckStatusSerializersTest.java | 5 +- .../serializers/CommandSerializersTest.java | 3 +- .../CommandStoreSerializersTest.java | 1 + .../CommandsForKeySerializerTest.java | 3 +- .../serializers/DepsSerializersTest.java | 3 +- .../serializers/EncodeAsVInt32Test.java | 1 + .../IVersionedWithKeysSerializerTest.java | 1 + .../serializers/JournalKeySerializerTest.java | 1 + .../serializers/KeySerializersTest.java | 1 + .../serializers/LatestDepsSerializerTest.java | 1 + .../serializers/SerializePackedTest.java | 5 +- .../TableMetadatasAndKeysTest.java | 1 + .../serializers/TableMetadatasTest.java | 7 +- .../accord/serializers/TokenKeyTest.java | 3 +- .../serializers/TopologySerializersTest.java | 4 +- .../serializers/WaitingOnSerializerTest.java | 3 +- .../accord/txn/AbstractKeySortedTest.java | 2 + .../service/accord/txn/AccordUpdateTest.java | 1 + .../service/accord/txn/TxnConditionTest.java | 24 +++--- .../accord/txn/TxnReferenceOperationTest.java | 8 +- .../service/accord/txn/TxnUpdateTest.java | 1 + .../paxos/AbstractPaxosRepairTest.java | 1 + .../service/paxos/PaxosProposeTest.java | 5 +- .../service/paxos/PaxosRepairHistoryTest.java | 33 ++++---- .../service/paxos/PaxosRepairTest.java | 10 ++- .../service/paxos/PaxosStateTest.java | 21 +++-- .../paxos/PaxosVerbHandlerOutOfRangeTest.java | 4 +- .../uncommitted/PaxosMockUpdateSupplier.java | 8 +- .../paxos/uncommitted/PaxosRowsTest.java | 15 +++- .../uncommitted/PaxosStateTrackerTest.java | 8 +- ...axosUncommittedTrackerIntegrationTest.java | 1 + .../PaxosUncommittedTrackerTest.java | 13 +++- .../uncommitted/UncommittedTableDataTest.java | 9 ++- .../service/reads/DataResolverTest.java | 5 +- .../service/reads/DigestResolverTest.java | 4 +- .../service/reads/ReadExecutorTest.java | 1 - .../reads/SpeculativeRetryParseTest.java | 3 +- .../reads/range/RangeCommandIteratorTest.java | 1 + .../reads/range/ReplicaPlanIteratorTest.java | 2 +- .../reads/repair/AbstractReadRepairTest.java | 7 +- .../reads/repair/BlockingReadRepairTest.java | 3 +- .../DiagEventsBlockingReadRepairTest.java | 2 +- .../reads/repair/ReadOnlyReadRepairTest.java | 2 +- .../service/reads/repair/ReadRepairTest.java | 12 +-- .../thresholds/WarningsSnapshotTest.java | 11 ++- .../service/snapshot/SnapshotLoaderTest.java | 2 +- .../service/snapshot/SnapshotManagerTest.java | 4 +- .../snapshot/SnapshotManifestTest.java | 13 ++-- .../service/snapshot/SnapshotOptionsTest.java | 1 + .../service/snapshot/TableSnapshotTest.java | 2 +- ...SSTableStreamingCorrectFilesCountTest.java | 13 ++-- .../cassandra/streaming/StreamReaderTest.java | 7 +- .../StreamSessionOwnedRangesTest.java | 10 ++- .../streaming/StreamSessionTest.java | 10 ++- .../streaming/StreamTransferTaskTest.java | 4 +- .../streaming/StreamingTransferTest.java | 34 ++++---- .../StreamCompressionSerializerTest.java | 16 ++-- .../async/StreamingInboundHandlerTest.java | 5 +- .../StreamingMultiplexedChannelTest.java | 3 +- .../messages/KeepAliveMessageTest.java | 2 +- .../streaming/messages/StreamMessageTest.java | 2 +- .../tcm/ClusterMetadataMetadataKeyTest.java | 3 +- .../tcm/ClusterMetadataSerializerTest.java | 3 +- .../cassandra/tcm/ClusterMetadataTest.java | 9 ++- .../ClusterMetadataTransformationTest.java | 13 +++- .../org/apache/cassandra/tcm/RetryTest.java | 4 +- .../apache/cassandra/tcm/UnregisterTest.java | 1 + .../tcm/ValidatingClusterMetadataService.java | 4 +- .../tcm/compatibility/GossipHelperTest.java | 19 ++++- .../ClientNotificationListenerTest.java | 11 ++- .../MetadataSnapshotListenerTest.java | 3 +- .../cassandra/tcm/log/LocalLogTest.java | 1 + .../tcm/log/LogListenerNotificationTest.java | 1 + .../tcm/membership/NodeVersionTest.java | 9 ++- .../cassandra/tcm/ownership/DeltaMapTest.java | 2 +- .../tcm/ownership/OwnershipUtils.java | 2 +- .../PlacementTransitionPlanTest.java | 1 + .../ownership/UniformRangePlacementTest.java | 1 + .../tcm/sequences/DropAccordTableTest.java | 7 +- .../InProgressSequenceCancellationTest.java | 8 +- .../AsymmetricMetadataSerializers.java | 1 + .../AccordMarkRejoiningTest.java | 1 + .../transformations/AccordMarkStaleTest.java | 1 + .../tcm/transformations/PrepareJoinTest.java | 2 +- .../tcm/transformations/PrepareLeaveTest.java | 1 + .../test/asserts/ExtendedAssertions.java | 1 + .../cassandra/tools/AuditLogViewerTest.java | 20 ++--- .../cassandra/tools/BulkLoaderTest.java | 5 +- .../cassandra/tools/GenerateTokensTest.java | 1 - .../cassandra/tools/HashPasswordTest.java | 2 +- .../cassandra/tools/JMXCompatibilityTest.java | 5 +- .../cassandra/tools/JMXStandardsTest.java | 10 +-- .../apache/cassandra/tools/JMXToolTest.java | 6 +- .../apache/cassandra/tools/NodeProbeTest.java | 2 +- .../cassandra/tools/NodeToolCommandTest.java | 4 +- .../cassandra/tools/OfflineToolUtils.java | 7 +- .../tools/SSTableExpiredBlockersTest.java | 4 +- .../tools/SSTableExportSchemaLoadingTest.java | 9 ++- .../cassandra/tools/SSTableExportTest.java | 2 +- .../tools/SSTableLevelResetterTest.java | 4 +- .../tools/SSTableMetadataViewerTest.java | 5 +- .../tools/SSTableOfflineRelevelTest.java | 4 +- .../tools/SSTablePartitionsTest.java | 4 +- .../tools/SSTableRepairedAtSetterTest.java | 10 +-- .../tools/StandaloneSSTableUtilTest.java | 5 +- .../tools/StandaloneScrubberTest.java | 4 +- .../tools/StandaloneSplitterTest.java | 5 +- .../StandaloneSplitterWithCQLTesterTest.java | 8 +- .../StandaloneUpgraderOnSStablesTest.java | 2 +- .../tools/StandaloneUpgraderTest.java | 4 +- .../StandaloneVerifierOnSSTablesTest.java | 2 +- .../tools/StandaloneVerifierTest.java | 4 +- .../apache/cassandra/tools/ToolRunner.java | 12 +-- .../cassandra/tools/ToolsEnvsConfigsTest.java | 1 + .../tools/ToolsSchemaLoadingTest.java | 3 +- .../cassandra/tools/TopPartitionsTest.java | 2 +- .../cassandrastress/CassandrastressTest.java | 2 +- .../tools/nodetool/AutoRepairStatusTest.java | 5 +- .../tools/nodetool/ClearSnapshotTest.java | 1 + .../tools/nodetool/ClientStatsTest.java | 16 ++-- .../tools/nodetool/CompactionHistoryTest.java | 1 + .../tools/nodetool/DataPathsTest.java | 2 +- ...rtImportListCompressionDictionaryTest.java | 5 +- .../cassandra/tools/nodetool/GcStatsTest.java | 4 +- .../tools/nodetool/GossipInfoTest.java | 2 +- .../InvalidateCIDRPermissionsCacheTest.java | 1 - .../InvalidateCredentialsCacheTest.java | 5 +- .../InvalidateJmxPermissionsCacheTest.java | 1 + .../nodetool/NodetoolClassHierarchyTest.java | 2 + .../tools/nodetool/NodetoolHelpGenerator.java | 5 +- .../nodetool/SSTableRepairedSetTest.java | 4 +- .../tools/nodetool/ScrubToolTest.java | 3 +- .../nodetool/SetAutoRepairConfigTest.java | 7 +- .../nodetool/SetGetStreamThroughputTest.java | 3 +- .../tools/nodetool/TableStatsTest.java | 2 +- .../cassandra/tools/nodetool/TpStatsTest.java | 2 +- .../cassandra/tools/nodetool/VerifyTest.java | 1 + .../nodetool/mock/AbortBootstrapMockTest.java | 2 +- .../nodetool/mock/AbstractNodetoolMock.java | 5 +- .../nodetool/mock/AccordAdminMockTest.java | 5 +- .../nodetool/mock/AssassinateMockTest.java | 2 +- .../mock/BootstrapResumeMockTest.java | 2 +- .../tools/nodetool/mock/CleanupMockTest.java | 2 +- .../nodetool/mock/DecommissionMockTest.java | 2 +- .../mock/DescribeClusterMockTest.java | 2 +- .../nodetool/mock/DescribeRingMockTest.java | 2 +- .../mock/DisableAuditLogMockTest.java | 2 +- .../mock/DisableAutoCompactionMockTest.java | 7 +- .../nodetool/mock/DisableBackupMockTest.java | 2 +- .../mock/DisableFullQueryLogMockTest.java | 2 +- .../DisableOldProtocolVersionsMockTest.java | 2 +- .../tools/nodetool/mock/DrainMockTest.java | 2 +- .../mock/EnableAutoCompactionMockTest.java | 2 +- .../nodetool/mock/EnableBackupMockTest.java | 2 +- .../EnableOldProtocolVersionsMockTest.java | 2 +- .../mock/FailureDetectorInfoMockTest.java | 2 +- .../nodetool/mock/GarbageCollectMockTest.java | 2 +- .../GetBatchlogReplayTrottleMockTest.java | 2 +- .../nodetool/mock/GetConcurrencyMockTest.java | 2 +- .../mock/GetConcurrentCompactorsMockTest.java | 2 +- .../GetConcurrentViewBuildersMockTest.java | 2 +- .../mock/GetLoggingLevelsMockTest.java | 2 +- .../nodetool/mock/GetSSTablesMockTest.java | 2 +- .../tools/nodetool/mock/GetSeedsTest.java | 2 +- .../mock/GetTraceProbabilityMockTest.java | 2 +- .../mock/InvalidateKeyCacheMockTest.java | 2 +- .../mock/InvalidateRowCacheMockTest.java | 2 +- .../nodetool/mock/RangeKeySampleMockTest.java | 2 +- .../nodetool/mock/RebuildIndexMockTest.java | 2 +- .../mock/ReloadLocalSchemaMockTest.java | 2 +- .../mock/ReloadSslCertificatesMockTest.java | 2 +- .../nodetool/mock/ReloadTriggersMockTest.java | 2 +- .../nodetool/mock/ReplayBatchlogMockTest.java | 2 +- .../mock/ResetLocalSchemaMockTest.java | 2 +- .../SetBatchlogReplayThrottleMockTest.java | 2 +- .../mock/SetCacheKeysToSaveMockTest.java | 2 +- .../mock/SetCompactionThresholdMockTest.java | 2 +- .../SetConcurrentViewBuildersMockTest.java | 2 +- .../mock/SetLoggingLevelMockTest.java | 2 +- .../mock/SetSnapshotThrottleMockTest.java | 2 +- .../mock/SetTraceProbabilityMockTest.java | 2 +- .../nodetool/mock/StopDaemonMockTest.java | 2 +- .../nodetool/mock/TruncateHintsMockTest.java | 2 +- .../tools/nodetool/mock/VersionMockTest.java | 2 +- .../nodetool/stats/TableStatsPrinterTest.java | 2 +- .../transport/AuthMessageSizeLimitTest.java | 9 ++- .../transport/AuthenticationTest.java | 8 +- .../cassandra/transport/CBUtilTest.java | 3 +- .../transport/CQLConnectionTest.java | 54 +++++++++---- .../cassandra/transport/CQLUserAuditTest.java | 14 ++-- .../transport/ClientResourceLimitsTest.java | 17 +++- .../transport/ConnectionTrackerTest.java | 10 ++- .../cassandra/transport/DataTypeTest.java | 6 +- .../transport/EarlyAuthenticationTest.java | 1 + .../transport/MessageDispatcherTest.java | 6 +- .../transport/MessagePayloadTest.java | 2 +- .../transport/MessageSizeLimitTest.java | 2 +- .../NativeProtocolLimitsTestBase.java | 1 + .../transport/ProtocolErrorTest.java | 16 ++-- .../transport/ProtocolNegotiationTest.java | 5 +- .../cassandra/transport/RateLimitingTest.java | 6 +- .../cassandra/transport/SerDeserTest.java | 16 ++-- .../SimpleClientSslContextFactory.java | 6 +- .../cassandra/transport/TlsTestUtils.java | 5 +- .../cassandra/transport/WriteBytesTest.java | 7 +- .../messages/EncodeAndDecodeTestBase.java | 5 +- .../triggers/TriggerExecutorTest.java | 21 ++++- .../cassandra/triggers/TriggersTest.java | 5 +- .../apache/cassandra/utils/ASTGenerators.java | 12 +-- .../cassandra/utils/AbstractIteratorTest.java | 6 +- .../utils/AbstractTypeGenerators.java | 10 ++- .../utils/AbstractTypeGeneratorsTest.java | 9 ++- .../cassandra/utils/AccordGenerators.java | 8 +- .../cassandra/utils/AssertionUtilsTest.java | 3 +- .../cassandra/utils/ByteArrayUtilTest.java | 1 - .../cassandra/utils/CassandraGenerators.java | 51 ++++++++---- .../utils/CassandraGeneratorsTest.java | 1 + .../cassandra/utils/CassandraVersionTest.java | 7 +- .../utils/CollectionSerializersTest.java | 1 + .../cassandra/utils/ConfigGenBuilder.java | 8 +- .../cassandra/utils/ConfigGenBuilderTest.java | 2 + .../cassandra/utils/FBUtilitiesTest.java | 1 + .../apache/cassandra/utils/Generators.java | 14 ++-- .../cassandra/utils/GeneratorsTest.java | 8 +- .../cassandra/utils/IntegerIntervalsTest.java | 6 +- .../cassandra/utils/IntervalTreeTest.java | 5 +- .../utils/JVMStabilityInspectorTest.java | 4 +- .../apache/cassandra/utils/JavaUtilsTest.java | 3 +- .../apache/cassandra/utils/KeyGenerator.java | 4 +- .../utils/MergeIteratorComparisonTest.java | 12 ++- .../cassandra/utils/MergeIteratorTest.java | 1 + .../cassandra/utils/MerkleTreeTest.java | 15 +++- .../cassandra/utils/MerkleTreesTest.java | 19 ++++- .../cassandra/utils/MonotonicClockTest.java | 6 +- .../cassandra/utils/NativeLibraryTest.java | 2 +- .../cassandra/utils/NoSpamLoggerTest.java | 11 ++- .../cassandra/utils/ObjectSizesTest.java | 3 +- .../cassandra/utils/OrderedKeysTest.java | 7 +- .../apache/cassandra/utils/OverlapsTest.java | 1 + .../apache/cassandra/utils/RangeTreeTest.java | 7 +- .../utils/SimpleBitSetSerializersTest.java | 3 +- .../cassandra/utils/SimpleGraphTest.java | 3 +- .../cassandra/utils/SimulatedMiniCluster.java | 5 +- .../utils/StatefulRangeTreeTest.java | 3 +- .../cassandra/utils/StatusLoggerTest.java | 4 +- .../utils/StorageCompatibilityModeTest.java | 2 +- .../cassandra/utils/SystemInfoTest.java | 3 +- .../org/apache/cassandra/utils/UUIDTest.java | 6 +- .../utils/asserts/SyncTaskAssert.java | 5 +- .../utils/asserts/SyncTaskListAssert.java | 3 +- .../cassandra/utils/binlog/BinLogTest.java | 17 ++-- .../utils/binlog/DeletingArchiverTest.java | 3 +- .../utils/binlog/ExternalArchiverTest.java | 6 +- .../cassandra/utils/btree/BTreeBiMapTest.java | 1 + .../utils/btree/BTreeMapGuavaTest.java | 3 +- .../utils/btree/BTreeMultimapTest.java | 1 + .../utils/btree/BTreeRemovalTest.java | 18 ++--- .../utils/btree/BTreeSearchIteratorTest.java | 13 ++-- .../cassandra/utils/btree/BTreeTest.java | 13 +++- .../utils/btree/IntervalBTreeTest.java | 1 + .../AbstractTypeByteSourceTest.java | 35 ++++++++- .../ByteSourceComparisonTest.java | 48 +++++++++++- .../ByteSourceConversionTest.java | 49 +++++++++++- .../bytecomparable/ByteSourceInverseTest.java | 40 ++++++---- .../ByteSourceSequenceTest.java | 16 +++- .../DecoratedKeyByteSourceTest.java | 1 + .../concurrent/AbstractTestAsyncPromise.java | 4 +- .../concurrent/AbstractTestAwaitable.java | 5 +- .../utils/concurrent/AbstractTestPromise.java | 7 +- .../concurrent/AbstractTransactionalTest.java | 3 +- .../utils/concurrent/AccumulatorTest.java | 6 +- .../utils/concurrent/AsyncPromiseTest.java | 13 ++-- .../utils/concurrent/LoadingMapTest.java | 5 +- .../NonBlockingRateLimiterTest.java | 9 ++- .../utils/concurrent/RefCountedTest.java | 2 +- .../cassandra/utils/jmx/JMXSslConfigTest.java | 1 + ...ithYamlFileOptionsAndPasswordFileTest.java | 1 + ...XSslConfiguredWithYamlFileOptionsTest.java | 1 + .../JMXSslDisabledEncryptionOptionsTest.java | 1 + .../utils/jmx/JMXSslPEMConfigTest.java | 1 + .../utils/memory/BufferPoolTest.java | 22 +++++- .../utils/memory/MemoryUtilTest.java | 3 +- .../memory/MemtableCleanerThreadTest.java | 4 +- .../utils/memory/NativeAllocatorTest.java | 7 +- .../utils/obs/OffHeapBitSetTest.java | 4 +- ...treamingTombstoneHistogramBuilderTest.java | 6 +- .../utils/tls/CertificateBuilder.java | 1 + .../cassandra/utils/vint/VIntCodingTest.java | 4 +- .../cassandra/fqltool/DriverResultSet.java | 4 +- .../apache/cassandra/fqltool/FQLQuery.java | 8 +- .../cassandra/fqltool/FQLQueryIterator.java | 1 + .../cassandra/fqltool/FQLQueryReader.java | 17 ++-- .../cassandra/fqltool/FullQueryLogTool.java | 1 + .../cassandra/fqltool/QueryReplayer.java | 12 +-- .../cassandra/fqltool/ResultHandler.java | 1 + .../apache/cassandra/fqltool/ResultStore.java | 3 +- .../cassandra/fqltool/StoredResultSet.java | 1 + .../cassandra/fqltool/commands/Compare.java | 2 + .../cassandra/fqltool/commands/Dump.java | 4 +- .../cassandra/fqltool/commands/Replay.java | 7 +- .../cassandra/fqltool/FQLCompareTest.java | 5 +- .../cassandra/fqltool/FQLReplayTest.java | 12 +-- .../cassandra/fqltool/commands/DumpTest.java | 9 ++- .../tools/BulkLoadConnectionFactory.java | 2 +- .../apache/cassandra/tools/BulkLoader.java | 7 +- .../apache/cassandra/tools/LoaderOptions.java | 5 +- .../utils/NativeSSTableLoaderClient.java | 38 ++++++--- .../cassandra/tools/LoaderOptionsTest.java | 1 + .../io/sstable/StressCQLSSTableWriter.java | 4 +- .../cassandra/stress/CompactionStress.java | 1 + .../org/apache/cassandra/stress/Stress.java | 6 +- .../apache/cassandra/stress/StressAction.java | 9 ++- .../apache/cassandra/stress/StressGraph.java | 7 +- .../cassandra/stress/StressProfile.java | 59 +++++++++++--- .../stress/generate/PartitionGenerator.java | 6 +- .../stress/generate/TokenRangeIterator.java | 1 + .../stress/generate/values/BigDecimals.java | 4 +- .../stress/generate/values/BigIntegers.java | 4 +- .../SampledOpDistributionFactory.java | 5 +- .../operations/predefined/CqlOperation.java | 4 +- .../predefined/PredefinedOperation.java | 8 +- .../operations/userdefined/CASQuery.java | 23 +++--- .../operations/userdefined/SchemaInsert.java | 9 ++- .../operations/userdefined/SchemaQuery.java | 7 +- .../userdefined/SchemaStatement.java | 1 + .../userdefined/TokenRangeQuery.java | 4 +- .../userdefined/ValidatingSchemaQuery.java | 14 +++- .../stress/report/StressMetrics.java | 4 +- .../settings/OptionAnyProbabilities.java | 6 +- .../stress/settings/OptionDistribution.java | 16 +++- .../stress/settings/OptionMulti.java | 7 +- .../stress/settings/SettingsColumn.java | 13 +++- .../stress/settings/SettingsCommand.java | 2 +- .../SettingsCommandPreDefinedMixed.java | 6 +- .../stress/settings/SettingsCommandUser.java | 3 +- .../stress/settings/SettingsInsert.java | 1 + .../stress/settings/SettingsLog.java | 5 +- .../stress/settings/SettingsMode.java | 1 + .../stress/settings/SettingsNode.java | 20 +++-- .../stress/settings/SettingsSchema.java | 5 +- .../stress/settings/StressSettings.java | 5 +- .../stress/util/JavaDriverClient.java | 26 +++++-- .../generate/DistributionGaussianTest.java | 3 +- .../generate/DistributionSequenceTest.java | 3 +- .../settings/OptionReplicationTest.java | 3 +- .../stress/settings/SettingsMiscTest.java | 5 +- .../stress/settings/SettingsNodeTest.java | 2 +- .../stress/util/MultiResultLoggerTest.java | 3 +- 3044 files changed, 11395 insertions(+), 5997 deletions(-) diff --git a/src/java/org/apache/cassandra/audit/AuditLogEntry.java b/src/java/org/apache/cassandra/audit/AuditLogEntry.java index 3f53611299..80d9a53bf5 100644 --- a/src/java/org/apache/cassandra/audit/AuditLogEntry.java +++ b/src/java/org/apache/cassandra/audit/AuditLogEntry.java @@ -21,9 +21,11 @@ import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.util.Map; import java.util.UUID; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.auth.AuthenticatedUser; diff --git a/src/java/org/apache/cassandra/audit/AuditLogFilter.java b/src/java/org/apache/cassandra/audit/AuditLogFilter.java index 1ef2c1b5c1..d8c8d4758a 100644 --- a/src/java/org/apache/cassandra/audit/AuditLogFilter.java +++ b/src/java/org/apache/cassandra/audit/AuditLogFilter.java @@ -20,6 +20,7 @@ package org.apache.cassandra.audit; import java.util.Set; import com.google.common.collect.ImmutableSet; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/audit/AuditLogManager.java b/src/java/org/apache/cassandra/audit/AuditLogManager.java index c453dcbb80..00f086d080 100644 --- a/src/java/org/apache/cassandra/audit/AuditLogManager.java +++ b/src/java/org/apache/cassandra/audit/AuditLogManager.java @@ -39,6 +39,7 @@ import javax.security.auth.Subject; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,9 +64,8 @@ import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.JmxInvocationListener; import org.apache.cassandra.utils.MBeanWrapper; -import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; - import static org.apache.cassandra.audit.AuditLogEntryType.JMX; +import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; /** * Central location for managing the logging of client/user-initated actions (like queries, log in commands, and so on). diff --git a/src/java/org/apache/cassandra/audit/AuditLogOptions.java b/src/java/org/apache/cassandra/audit/AuditLogOptions.java index 196bd9d0ef..2e2a9d226e 100644 --- a/src/java/org/apache/cassandra/audit/AuditLogOptions.java +++ b/src/java/org/apache/cassandra/audit/AuditLogOptions.java @@ -26,6 +26,7 @@ import java.util.Optional; import java.util.stream.Collectors; import com.google.common.base.Strings; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.config.CassandraRelevantProperties; diff --git a/src/java/org/apache/cassandra/audit/AuditLogOptionsCompositeData.java b/src/java/org/apache/cassandra/audit/AuditLogOptionsCompositeData.java index 6812e71ca0..7cf5b0675a 100644 --- a/src/java/org/apache/cassandra/audit/AuditLogOptionsCompositeData.java +++ b/src/java/org/apache/cassandra/audit/AuditLogOptionsCompositeData.java @@ -24,6 +24,7 @@ import java.util.Map; import java.util.function.BiConsumer; import java.util.function.Function; import java.util.stream.Collectors; + import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.CompositeType; diff --git a/src/java/org/apache/cassandra/audit/BinAuditLogger.java b/src/java/org/apache/cassandra/audit/BinAuditLogger.java index ee237c6021..48d8582f3c 100644 --- a/src/java/org/apache/cassandra/audit/BinAuditLogger.java +++ b/src/java/org/apache/cassandra/audit/BinAuditLogger.java @@ -21,10 +21,12 @@ import java.util.Map; import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Ints; + +import net.openhft.chronicle.wire.WireOut; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.openhft.chronicle.wire.WireOut; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.util.File; import org.apache.cassandra.utils.ObjectSizes; diff --git a/src/java/org/apache/cassandra/auth/AuthCache.java b/src/java/org/apache/cassandra/auth/AuthCache.java index 2a3eb1af4a..8c9df378fc 100644 --- a/src/java/org/apache/cassandra/auth/AuthCache.java +++ b/src/java/org/apache/cassandra/auth/AuthCache.java @@ -33,18 +33,19 @@ import java.util.function.IntConsumer; import java.util.function.IntSupplier; import java.util.function.Supplier; -import com.google.common.primitives.Ints; -import com.google.common.util.concurrent.Uninterruptibles; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.github.benmanes.caffeine.cache.Policy; import com.github.benmanes.caffeine.cache.RemovalCause; -import org.apache.cassandra.cache.UnweightedCacheSize; import com.github.benmanes.caffeine.cache.stats.CacheStats; import com.github.benmanes.caffeine.cache.stats.StatsCounter; +import com.google.common.primitives.Ints; +import com.google.common.util.concurrent.Uninterruptibles; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.cache.UnweightedCacheSize; import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.concurrent.Shutdownable; diff --git a/src/java/org/apache/cassandra/auth/AuthCacheService.java b/src/java/org/apache/cassandra/auth/AuthCacheService.java index 2ebc8a9924..8fddd1e0e9 100644 --- a/src/java/org/apache/cassandra/auth/AuthCacheService.java +++ b/src/java/org/apache/cassandra/auth/AuthCacheService.java @@ -26,6 +26,7 @@ import javax.annotation.concurrent.ThreadSafe; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/auth/AuthEvents.java b/src/java/org/apache/cassandra/auth/AuthEvents.java index e4b60489c0..c7f5df1eee 100644 --- a/src/java/org/apache/cassandra/auth/AuthEvents.java +++ b/src/java/org/apache/cassandra/auth/AuthEvents.java @@ -22,6 +22,7 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/auth/AuthKeyspace.java b/src/java/org/apache/cassandra/auth/AuthKeyspace.java index e973f5f455..bcc91e5ee6 100644 --- a/src/java/org/apache/cassandra/auth/AuthKeyspace.java +++ b/src/java/org/apache/cassandra/auth/AuthKeyspace.java @@ -23,13 +23,13 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.ImmutableSet; import org.apache.cassandra.config.CassandraRelevantProperties; -import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.schema.TableId; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.schema.SchemaConstants; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.SchemaConstants; +import org.apache.cassandra.schema.TableId; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.Tables; import static java.lang.String.format; diff --git a/src/java/org/apache/cassandra/auth/AuthenticatedUser.java b/src/java/org/apache/cassandra/auth/AuthenticatedUser.java index f8d8a9c790..fffc75f8f9 100644 --- a/src/java/org/apache/cassandra/auth/AuthenticatedUser.java +++ b/src/java/org/apache/cassandra/auth/AuthenticatedUser.java @@ -21,6 +21,7 @@ import java.net.InetSocketAddress; import java.util.Collections; import java.util.Map; import java.util.Set; + import com.google.common.base.Objects; import org.apache.cassandra.auth.IAuthenticator.AuthenticationMode; diff --git a/src/java/org/apache/cassandra/auth/CIDRGroupsMappingCache.java b/src/java/org/apache/cassandra/auth/CIDRGroupsMappingCache.java index 5f7546459f..7412f692eb 100644 --- a/src/java/org/apache/cassandra/auth/CIDRGroupsMappingCache.java +++ b/src/java/org/apache/cassandra/auth/CIDRGroupsMappingCache.java @@ -22,10 +22,10 @@ import java.net.InetAddress; import java.util.Set; import java.util.concurrent.TimeUnit; -import com.google.common.base.Preconditions; - import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; +import com.google.common.base.Preconditions; + import org.apache.cassandra.concurrent.ImmediateExecutor; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/src/java/org/apache/cassandra/auth/CIDRPermissionsManager.java b/src/java/org/apache/cassandra/auth/CIDRPermissionsManager.java index 0bad292f58..5b1f2efd50 100644 --- a/src/java/org/apache/cassandra/auth/CIDRPermissionsManager.java +++ b/src/java/org/apache/cassandra/auth/CIDRPermissionsManager.java @@ -27,6 +27,7 @@ import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java index 153ec0e5fe..245c87a91e 100644 --- a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java +++ b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java @@ -17,7 +17,14 @@ */ package org.apache.cassandra.auth; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.function.BiConsumer; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -27,23 +34,32 @@ import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import com.google.common.collect.Table; import com.google.common.collect.Sets; +import com.google.common.collect.Table; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.Attributes; +import org.apache.cassandra.cql3.BatchQueryOptions; +import org.apache.cassandra.cql3.CQLStatement; +import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.cql3.QueryProcessor; +import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.cql3.UntypedResultSet.Row; +import org.apache.cassandra.cql3.VariableSpecifications; import org.apache.cassandra.cql3.statements.BatchStatement; import org.apache.cassandra.cql3.statements.ModificationStatement; +import org.apache.cassandra.cql3.statements.SelectStatement; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.marshal.UTF8Type; -import org.apache.cassandra.exceptions.*; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.exceptions.RequestExecutionException; +import org.apache.cassandra.exceptions.RequestValidationException; +import org.apache.cassandra.exceptions.UnauthorizedException; import org.apache.cassandra.schema.SchemaConstants; -import org.apache.cassandra.cql3.statements.SelectStatement; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.Dispatcher; diff --git a/src/java/org/apache/cassandra/auth/CassandraCIDRAuthorizer.java b/src/java/org/apache/cassandra/auth/CassandraCIDRAuthorizer.java index 1e49c73acd..69283a640c 100644 --- a/src/java/org/apache/cassandra/auth/CassandraCIDRAuthorizer.java +++ b/src/java/org/apache/cassandra/auth/CassandraCIDRAuthorizer.java @@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/auth/CassandraLoginModule.java b/src/java/org/apache/cassandra/auth/CassandraLoginModule.java index d20830093d..6c648d4770 100644 --- a/src/java/org/apache/cassandra/auth/CassandraLoginModule.java +++ b/src/java/org/apache/cassandra/auth/CassandraLoginModule.java @@ -20,8 +20,13 @@ package org.apache.cassandra.auth; import java.io.IOException; import java.util.HashMap; import java.util.Map; + import javax.security.auth.Subject; -import javax.security.auth.callback.*; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.FailedLoginException; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; diff --git a/src/java/org/apache/cassandra/auth/CassandraNetworkAuthorizer.java b/src/java/org/apache/cassandra/auth/CassandraNetworkAuthorizer.java index 62e6b775af..7c4e29527f 100644 --- a/src/java/org/apache/cassandra/auth/CassandraNetworkAuthorizer.java +++ b/src/java/org/apache/cassandra/auth/CassandraNetworkAuthorizer.java @@ -26,8 +26,6 @@ import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; -import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.exceptions.RequestExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,8 +33,10 @@ import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.cql3.statements.SelectStatement; +import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.Dispatcher; diff --git a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java index 1544488b85..d7cdbfee94 100644 --- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java +++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java @@ -43,7 +43,9 @@ import java.util.stream.Stream; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; + import org.apache.commons.lang3.StringUtils; +import org.mindrot.jbcrypt.BCrypt; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -79,7 +81,6 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.MBeanWrapper; import org.apache.cassandra.utils.NoSpamLogger; -import org.mindrot.jbcrypt.BCrypt; import static org.apache.cassandra.service.QueryState.forInternalCalls; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; diff --git a/src/java/org/apache/cassandra/auth/DataResource.java b/src/java/org/apache/cassandra/auth/DataResource.java index 6776fc1449..b1819a31c7 100644 --- a/src/java/org/apache/cassandra/auth/DataResource.java +++ b/src/java/org/apache/cassandra/auth/DataResource.java @@ -21,6 +21,7 @@ import java.util.Set; import com.google.common.base.Objects; import com.google.common.collect.Sets; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.schema.Schema; diff --git a/src/java/org/apache/cassandra/auth/FunctionResource.java b/src/java/org/apache/cassandra/auth/FunctionResource.java index 86b15928fa..dd93c37d43 100644 --- a/src/java/org/apache/cassandra/auth/FunctionResource.java +++ b/src/java/org/apache/cassandra/auth/FunctionResource.java @@ -27,15 +27,16 @@ import com.google.common.base.Joiner; import com.google.common.base.Objects; import com.google.common.base.Splitter; import com.google.common.collect.Sets; + import org.apache.commons.lang3.StringUtils; -import org.apache.cassandra.cql3.functions.UserFunction; -import org.apache.cassandra.schema.Schema; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.functions.FunctionName; +import org.apache.cassandra.cql3.functions.UserFunction; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.TypeParser; import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaConstants; /** diff --git a/src/java/org/apache/cassandra/auth/JMXResource.java b/src/java/org/apache/cassandra/auth/JMXResource.java index cb0ac41efd..7d51b4cc1d 100644 --- a/src/java/org/apache/cassandra/auth/JMXResource.java +++ b/src/java/org/apache/cassandra/auth/JMXResource.java @@ -19,12 +19,14 @@ package org.apache.cassandra.auth; import java.lang.management.ManagementFactory; import java.util.Set; + import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import com.google.common.base.Objects; import com.google.common.collect.Sets; + import org.apache.commons.lang3.StringUtils; public class JMXResource implements IResource diff --git a/src/java/org/apache/cassandra/auth/MutualTlsAuthenticator.java b/src/java/org/apache/cassandra/auth/MutualTlsAuthenticator.java index 7c5a6654f7..e80e3156b1 100644 --- a/src/java/org/apache/cassandra/auth/MutualTlsAuthenticator.java +++ b/src/java/org/apache/cassandra/auth/MutualTlsAuthenticator.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/auth/MutualTlsCertificateValidityPeriodValidator.java b/src/java/org/apache/cassandra/auth/MutualTlsCertificateValidityPeriodValidator.java index b0c81f29fe..84aea96429 100644 --- a/src/java/org/apache/cassandra/auth/MutualTlsCertificateValidityPeriodValidator.java +++ b/src/java/org/apache/cassandra/auth/MutualTlsCertificateValidityPeriodValidator.java @@ -22,6 +22,7 @@ import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.time.temporal.ChronoUnit; import java.util.Date; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/java/org/apache/cassandra/auth/MutualTlsInternodeAuthenticator.java b/src/java/org/apache/cassandra/auth/MutualTlsInternodeAuthenticator.java index 91500cbeb2..1cac64dba0 100644 --- a/src/java/org/apache/cassandra/auth/MutualTlsInternodeAuthenticator.java +++ b/src/java/org/apache/cassandra/auth/MutualTlsInternodeAuthenticator.java @@ -32,9 +32,11 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; + import javax.annotation.Nonnull; import com.google.common.annotations.VisibleForTesting; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java b/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java index e294594f20..82c8f24c6f 100644 --- a/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java +++ b/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java @@ -29,25 +29,26 @@ import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; + +import org.mindrot.jbcrypt.BCrypt; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.exceptions.RequestExecutionException; -import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.cql3.statements.SelectStatement; +import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.exceptions.AuthenticationException; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.exceptions.RequestExecutionException; +import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.ByteBufferUtil; -import org.mindrot.jbcrypt.BCrypt; import static org.apache.cassandra.auth.CassandraRoleManager.consistencyForRoleRead; diff --git a/src/java/org/apache/cassandra/auth/PasswordSaltSupplier.java b/src/java/org/apache/cassandra/auth/PasswordSaltSupplier.java index 9c9bd1d0f8..3f3a9c2525 100644 --- a/src/java/org/apache/cassandra/auth/PasswordSaltSupplier.java +++ b/src/java/org/apache/cassandra/auth/PasswordSaltSupplier.java @@ -22,9 +22,10 @@ import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.exceptions.ConfigurationException; import org.mindrot.jbcrypt.BCrypt; +import org.apache.cassandra.exceptions.ConfigurationException; + import static org.apache.cassandra.config.CassandraRelevantProperties.AUTH_BCRYPT_GENSALT_LOG2_ROUNDS; public class PasswordSaltSupplier diff --git a/src/java/org/apache/cassandra/auth/RoleOptions.java b/src/java/org/apache/cassandra/auth/RoleOptions.java index 6fbecdcc47..d8c22c8959 100644 --- a/src/java/org/apache/cassandra/auth/RoleOptions.java +++ b/src/java/org/apache/cassandra/auth/RoleOptions.java @@ -21,11 +21,12 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; +import org.mindrot.jbcrypt.BCrypt; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.utils.FBUtilities; -import org.mindrot.jbcrypt.BCrypt; public class RoleOptions { diff --git a/src/java/org/apache/cassandra/auth/RoleResource.java b/src/java/org/apache/cassandra/auth/RoleResource.java index 6ffce2108e..f81ae38dd2 100644 --- a/src/java/org/apache/cassandra/auth/RoleResource.java +++ b/src/java/org/apache/cassandra/auth/RoleResource.java @@ -21,6 +21,7 @@ import java.util.Set; import com.google.common.base.Objects; import com.google.common.collect.Sets; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/src/java/org/apache/cassandra/auth/jmx/AuthenticationProxy.java b/src/java/org/apache/cassandra/auth/jmx/AuthenticationProxy.java index 0c13e3baab..334bdb7571 100644 --- a/src/java/org/apache/cassandra/auth/jmx/AuthenticationProxy.java +++ b/src/java/org/apache/cassandra/auth/jmx/AuthenticationProxy.java @@ -20,9 +20,14 @@ package org.apache.cassandra.auth.jmx; import java.security.AccessController; import java.security.PrivilegedAction; + import javax.management.remote.JMXAuthenticator; import javax.security.auth.Subject; -import javax.security.auth.callback.*; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; diff --git a/src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java b/src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java index 75576f6aef..183050b4c4 100644 --- a/src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java +++ b/src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java @@ -18,7 +18,9 @@ package org.apache.cassandra.auth.jmx; -import java.lang.reflect.*; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.security.AccessControlContext; import java.security.AccessController; import java.security.Principal; @@ -28,6 +30,7 @@ import java.util.function.BooleanSupplier; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; + import javax.management.InstanceNotFoundException; import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; @@ -36,11 +39,19 @@ import javax.security.auth.Subject; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.audit.AuditLogManager; -import org.apache.cassandra.auth.*; +import org.apache.cassandra.auth.AuthCache; +import org.apache.cassandra.auth.AuthCacheMBean; +import org.apache.cassandra.auth.AuthenticatedUser; +import org.apache.cassandra.auth.JMXResource; +import org.apache.cassandra.auth.Permission; +import org.apache.cassandra.auth.PermissionDetails; +import org.apache.cassandra.auth.RoleResource; +import org.apache.cassandra.auth.Roles; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.JmxInvocationListener; diff --git a/src/java/org/apache/cassandra/batchlog/Batch.java b/src/java/org/apache/cassandra/batchlog/Batch.java index 667263b25d..10ebe1d902 100644 --- a/src/java/org/apache/cassandra/batchlog/Batch.java +++ b/src/java/org/apache/cassandra/batchlog/Batch.java @@ -19,7 +19,9 @@ package org.apache.cassandra.batchlog; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import com.google.common.annotations.VisibleForTesting; diff --git a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java index 5be64ae884..773ad583f3 100644 --- a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java +++ b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java @@ -31,12 +31,14 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.RateLimiter; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java b/src/java/org/apache/cassandra/cache/AutoSavingCache.java index 0cfea0817d..3c3d9a8cdd 100644 --- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java +++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java @@ -27,6 +27,7 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; + import javax.annotation.concurrent.NotThreadSafe; import org.cliffc.high_scale_lib.NonBlockingHashSet; diff --git a/src/java/org/apache/cassandra/cache/CaffeineCache.java b/src/java/org/apache/cassandra/cache/CaffeineCache.java index 717fb78f6a..e4d936dbd2 100644 --- a/src/java/org/apache/cassandra/cache/CaffeineCache.java +++ b/src/java/org/apache/cassandra/cache/CaffeineCache.java @@ -17,16 +17,17 @@ */ package org.apache.cassandra.cache; -import static com.google.common.base.Preconditions.checkState; - import java.util.Iterator; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Policy.Eviction; import com.github.benmanes.caffeine.cache.Weigher; + import org.apache.cassandra.concurrent.ImmediateExecutor; +import static com.google.common.base.Preconditions.checkState; + /** * An adapter from a Caffeine cache to the ICache interface. This provides an on-heap cache using * the W-TinyLFU eviction policy (http://arxiv.org/pdf/1512.00727.pdf), which has a higher hit rate diff --git a/src/java/org/apache/cassandra/cache/ChunkCache.java b/src/java/org/apache/cassandra/cache/ChunkCache.java index 958007c504..66782ac48b 100644 --- a/src/java/org/apache/cassandra/cache/ChunkCache.java +++ b/src/java/org/apache/cassandra/cache/ChunkCache.java @@ -23,14 +23,14 @@ package org.apache.cassandra.cache; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicInteger; -import com.google.common.base.Throwables; -import com.google.common.collect.Iterables; - import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.github.benmanes.caffeine.cache.RemovalCause; import com.github.benmanes.caffeine.cache.RemovalListener; +import com.google.common.base.Throwables; +import com.google.common.collect.Iterables; + import org.apache.cassandra.concurrent.ImmediateExecutor; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.sstable.CorruptSSTableException; diff --git a/src/java/org/apache/cassandra/cache/CounterCacheKey.java b/src/java/org/apache/cassandra/cache/CounterCacheKey.java index 1015da54a7..e0159887e0 100644 --- a/src/java/org/apache/cassandra/cache/CounterCacheKey.java +++ b/src/java/org/apache/cassandra/cache/CounterCacheKey.java @@ -23,7 +23,11 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.ReadExecutionController; +import org.apache.cassandra.db.SinglePartitionReadCommand; import org.apache.cassandra.db.filter.ClusteringIndexFilter; import org.apache.cassandra.db.filter.ClusteringIndexNamesFilter; import org.apache.cassandra.db.filter.ColumnFilter; @@ -39,7 +43,10 @@ import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.TableMetadataRef; -import org.apache.cassandra.utils.*; +import org.apache.cassandra.utils.ByteArrayUtil; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.ObjectSizes; public final class CounterCacheKey extends CacheKey { diff --git a/src/java/org/apache/cassandra/cache/OHCProvider.java b/src/java/org/apache/cassandra/cache/OHCProvider.java index 3fd3579a61..611b4e4a16 100644 --- a/src/java/org/apache/cassandra/cache/OHCProvider.java +++ b/src/java/org/apache/cassandra/cache/OHCProvider.java @@ -21,6 +21,9 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.Iterator; +import org.caffinitas.ohc.OHCache; +import org.caffinitas.ohc.OHCacheBuilder; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.partitions.CachedPartition; @@ -29,8 +32,6 @@ import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.util.DataOutputBufferFixed; import org.apache.cassandra.io.util.RebufferingInputStream; import org.apache.cassandra.schema.TableId; -import org.caffinitas.ohc.OHCache; -import org.caffinitas.ohc.OHCacheBuilder; public class OHCProvider implements CacheProvider { diff --git a/src/java/org/apache/cassandra/cache/SerializingCache.java b/src/java/org/apache/cassandra/cache/SerializingCache.java index 6cd14c6704..a2814be3b1 100644 --- a/src/java/org/apache/cassandra/cache/SerializingCache.java +++ b/src/java/org/apache/cassandra/cache/SerializingCache.java @@ -17,21 +17,22 @@ */ package org.apache.cassandra.cache; +import java.io.IOException; +import java.util.Iterator; + import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Weigher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.concurrent.ImmediateExecutor; import org.apache.cassandra.io.ISerializer; import org.apache.cassandra.io.util.MemoryInputStream; import org.apache.cassandra.io.util.MemoryOutputStream; import org.apache.cassandra.io.util.WrappedDataOutputStreamPlus; import org.apache.cassandra.utils.FBUtilities; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.util.Iterator; /** * Serializes cache values off-heap. diff --git a/src/java/org/apache/cassandra/concurrent/ExecutionFailure.java b/src/java/org/apache/cassandra/concurrent/ExecutionFailure.java index dc1262b3c1..5b730ece7c 100644 --- a/src/java/org/apache/cassandra/concurrent/ExecutionFailure.java +++ b/src/java/org/apache/cassandra/concurrent/ExecutionFailure.java @@ -22,10 +22,10 @@ import java.util.concurrent.Callable; import java.util.concurrent.CancellationException; import java.util.concurrent.Future; -import org.apache.cassandra.concurrent.DebuggableTask.RunnableDebuggableTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.concurrent.DebuggableTask.RunnableDebuggableTask; import org.apache.cassandra.db.compaction.CompactionInterruptedException; import org.apache.cassandra.exceptions.RequestTimeoutException; import org.apache.cassandra.utils.Closeable; diff --git a/src/java/org/apache/cassandra/concurrent/ExecutorLocals.java b/src/java/org/apache/cassandra/concurrent/ExecutorLocals.java index 46174fe30a..a5720dd37c 100644 --- a/src/java/org/apache/cassandra/concurrent/ExecutorLocals.java +++ b/src/java/org/apache/cassandra/concurrent/ExecutorLocals.java @@ -18,12 +18,13 @@ package org.apache.cassandra.concurrent; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.service.ClientWarn; import org.apache.cassandra.tracing.TraceState; import org.apache.cassandra.utils.Closeable; import org.apache.cassandra.utils.WithResources; +import io.netty.util.concurrent.FastThreadLocal; + /* * This class only knows about Tracing and ClientWarn, so if any different executor locals are added, it must be * updated. diff --git a/src/java/org/apache/cassandra/concurrent/ImmediateExecutor.java b/src/java/org/apache/cassandra/concurrent/ImmediateExecutor.java index 5edc5be70a..48c61eb634 100644 --- a/src/java/org/apache/cassandra/concurrent/ImmediateExecutor.java +++ b/src/java/org/apache/cassandra/concurrent/ImmediateExecutor.java @@ -18,17 +18,17 @@ package org.apache.cassandra.concurrent; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; + import org.apache.cassandra.utils.Closeable; import org.apache.cassandra.utils.Shared; import org.apache.cassandra.utils.WithResources; import org.apache.cassandra.utils.concurrent.Future; import org.apache.cassandra.utils.concurrent.ImmediateFuture; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; - import static org.apache.cassandra.utils.Shared.Scope.SIMULATION; @Shared(scope = SIMULATION) // shared to support instanceof check in SimulatedAction diff --git a/src/java/org/apache/cassandra/concurrent/InfiniteLoopExecutor.java b/src/java/org/apache/cassandra/concurrent/InfiniteLoopExecutor.java index 9d8701cb88..8a3020d30f 100644 --- a/src/java/org/apache/cassandra/concurrent/InfiniteLoopExecutor.java +++ b/src/java/org/apache/cassandra/concurrent/InfiniteLoopExecutor.java @@ -18,16 +18,16 @@ package org.apache.cassandra.concurrent; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.concurrent.TimeUnit; - -import com.google.common.annotations.VisibleForTesting; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.function.BiFunction; import java.util.function.Consumer; +import com.google.common.annotations.VisibleForTesting; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.concurrent.ExecutorFactory.SimulatorThreadTag; import org.apache.cassandra.concurrent.ExecutorFactory.SystemThreadTag; import org.apache.cassandra.utils.Shared; diff --git a/src/java/org/apache/cassandra/concurrent/Interruptible.java b/src/java/org/apache/cassandra/concurrent/Interruptible.java index 8641ec8106..9ed5be5add 100644 --- a/src/java/org/apache/cassandra/concurrent/Interruptible.java +++ b/src/java/org/apache/cassandra/concurrent/Interruptible.java @@ -20,7 +20,7 @@ package org.apache.cassandra.concurrent; import org.apache.cassandra.utils.Shared; -import static org.apache.cassandra.concurrent.Interruptible.State.*; +import static org.apache.cassandra.concurrent.Interruptible.State.NORMAL; import static org.apache.cassandra.utils.Shared.Recursive.INTERFACES; import static org.apache.cassandra.utils.Shared.Scope.SIMULATION; diff --git a/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java b/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java index e732729299..de43f33e7e 100644 --- a/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java +++ b/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java @@ -23,10 +23,11 @@ import java.util.concurrent.atomic.AtomicInteger; import com.google.common.annotations.VisibleForTesting; -import io.netty.util.concurrent.FastThreadLocalThread; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.utils.JVMStabilityInspector; +import io.netty.util.concurrent.FastThreadLocalThread; + /** * This class is an implementation of the ThreadFactory interface. This * is useful to give Java threads meaningful names which is useful when using diff --git a/src/java/org/apache/cassandra/concurrent/SEPExecutor.java b/src/java/org/apache/cassandra/concurrent/SEPExecutor.java index a3bb216aee..32ac77afb4 100644 --- a/src/java/org/apache/cassandra/concurrent/SEPExecutor.java +++ b/src/java/org/apache/cassandra/concurrent/SEPExecutor.java @@ -27,16 +27,18 @@ import java.util.concurrent.atomic.AtomicLong; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.utils.WithResources; -import org.apache.cassandra.utils.concurrent.Future; -import org.apache.cassandra.utils.MBeanWrapper; -import org.apache.cassandra.utils.concurrent.Condition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.metrics.ThreadPoolMetrics; +import org.apache.cassandra.utils.MBeanWrapper; +import org.apache.cassandra.utils.WithResources; +import org.apache.cassandra.utils.concurrent.Condition; +import org.apache.cassandra.utils.concurrent.Future; -import static org.apache.cassandra.concurrent.SEPExecutor.TakeTaskPermitResult.*; +import static org.apache.cassandra.concurrent.SEPExecutor.TakeTaskPermitResult.NONE_AVAILABLE; +import static org.apache.cassandra.concurrent.SEPExecutor.TakeTaskPermitResult.RETURNED_WORK_PERMIT; +import static org.apache.cassandra.concurrent.SEPExecutor.TakeTaskPermitResult.TOOK_PERMIT; import static org.apache.cassandra.concurrent.SEPWorker.Work; import static org.apache.cassandra.utils.concurrent.Condition.newOneTimeCondition; diff --git a/src/java/org/apache/cassandra/concurrent/SEPWorker.java b/src/java/org/apache/cassandra/concurrent/SEPWorker.java index 01a8db45ee..27efbdbfa7 100644 --- a/src/java/org/apache/cassandra/concurrent/SEPWorker.java +++ b/src/java/org/apache/cassandra/concurrent/SEPWorker.java @@ -25,9 +25,10 @@ import java.util.concurrent.locks.LockSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.util.concurrent.FastThreadLocalThread; import org.apache.cassandra.utils.JVMStabilityInspector; +import io.netty.util.concurrent.FastThreadLocalThread; + import static org.apache.cassandra.concurrent.SEPExecutor.TakeTaskPermitResult.RETURNED_WORK_PERMIT; import static org.apache.cassandra.concurrent.SEPExecutor.TakeTaskPermitResult.TOOK_PERMIT; import static org.apache.cassandra.config.CassandraRelevantProperties.SET_SEP_THREAD_NAME; diff --git a/src/java/org/apache/cassandra/concurrent/ScheduledThreadPoolExecutorPlus.java b/src/java/org/apache/cassandra/concurrent/ScheduledThreadPoolExecutorPlus.java index 0ab09a4b72..e066a1d6c4 100644 --- a/src/java/org/apache/cassandra/concurrent/ScheduledThreadPoolExecutorPlus.java +++ b/src/java/org/apache/cassandra/concurrent/ScheduledThreadPoolExecutorPlus.java @@ -18,15 +18,20 @@ package org.apache.cassandra.concurrent; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.Callable; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.TimeUnit; -import org.apache.cassandra.utils.WithResources; -import org.apache.cassandra.utils.concurrent.Future; -import org.apache.cassandra.utils.concurrent.RunnableFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.service.StorageService; +import org.apache.cassandra.utils.WithResources; +import org.apache.cassandra.utils.concurrent.Future; +import org.apache.cassandra.utils.concurrent.RunnableFuture; import static com.google.common.primitives.Longs.max; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/src/java/org/apache/cassandra/concurrent/ThreadPoolExecutorBase.java b/src/java/org/apache/cassandra/concurrent/ThreadPoolExecutorBase.java index 9975952123..db6a81c16a 100644 --- a/src/java/org/apache/cassandra/concurrent/ThreadPoolExecutorBase.java +++ b/src/java/org/apache/cassandra/concurrent/ThreadPoolExecutorBase.java @@ -18,7 +18,12 @@ package org.apache.cassandra.concurrent; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.RunnableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; diff --git a/src/java/org/apache/cassandra/config/AccordSpec.java b/src/java/org/apache/cassandra/config/AccordSpec.java index 74fa27580b..2e4bc186a7 100644 --- a/src/java/org/apache/cassandra/config/AccordSpec.java +++ b/src/java/org/apache/cassandra/config/AccordSpec.java @@ -20,8 +20,10 @@ package org.apache.cassandra.config; import java.util.concurrent.TimeUnit; -import accord.utils.Invariants; import com.fasterxml.jackson.annotation.JsonIgnore; + +import accord.utils.Invariants; + import org.apache.cassandra.journal.Params; import org.apache.cassandra.service.accord.serializers.Version; import org.apache.cassandra.service.consensus.TransactionalMode; diff --git a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java index d1458d1bbb..ca79ff3727 100644 --- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java +++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java @@ -22,11 +22,13 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; import java.util.concurrent.TimeUnit; + import javax.annotation.Nullable; import com.google.common.primitives.Ints; import accord.utils.Invariants; + import org.apache.cassandra.db.virtual.LogMessagesTable; import org.apache.cassandra.db.virtual.SlowQueriesTable; import org.apache.cassandra.exceptions.ConfigurationException; diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index 2d517fc127..7489b29926 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.base.Joiner; diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 322fbf5ff4..8565f72be8 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -48,6 +48,7 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.regex.Pattern; import java.util.stream.Collectors; + import javax.annotation.Nullable; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; @@ -61,6 +62,7 @@ import com.google.common.collect.Sets; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; import com.google.common.util.concurrent.RateLimiter; +import com.googlecode.concurrenttrees.common.Iterables; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; @@ -68,7 +70,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.impl.progresslog.DefaultProgressLog; -import com.googlecode.concurrenttrees.common.Iterables; + import org.apache.cassandra.audit.AuditLogOptions; import org.apache.cassandra.auth.AllowAllInternodeAuthenticator; import org.apache.cassandra.auth.AuthConfig; diff --git a/src/java/org/apache/cassandra/config/DefaultLoader.java b/src/java/org/apache/cassandra/config/DefaultLoader.java index 6767d8aa61..51c36a375f 100644 --- a/src/java/org/apache/cassandra/config/DefaultLoader.java +++ b/src/java/org/apache/cassandra/config/DefaultLoader.java @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonIgnore; + import org.yaml.snakeyaml.error.YAMLException; import org.yaml.snakeyaml.introspector.FieldProperty; import org.yaml.snakeyaml.introspector.MethodProperty; diff --git a/src/java/org/apache/cassandra/config/DurationSpec.java b/src/java/org/apache/cassandra/config/DurationSpec.java index 8c90542eb8..b70dca1657 100644 --- a/src/java/org/apache/cassandra/config/DurationSpec.java +++ b/src/java/org/apache/cassandra/config/DurationSpec.java @@ -34,7 +34,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static java.util.concurrent.TimeUnit.SECONDS; - import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; /** diff --git a/src/java/org/apache/cassandra/config/EncryptionOptions.java b/src/java/org/apache/cassandra/config/EncryptionOptions.java index e66a44f324..2f399903ca 100644 --- a/src/java/org/apache/cassandra/config/EncryptionOptions.java +++ b/src/java/org/apache/cassandra/config/EncryptionOptions.java @@ -23,10 +23,12 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/config/GuardrailsOptions.java b/src/java/org/apache/cassandra/config/GuardrailsOptions.java index e5ab40d59e..d10a2490ef 100644 --- a/src/java/org/apache/cassandra/config/GuardrailsOptions.java +++ b/src/java/org/apache/cassandra/config/GuardrailsOptions.java @@ -23,9 +23,11 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java index 416995e71d..8398e8207e 100644 --- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java +++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java @@ -30,6 +30,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.TreeMap; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; @@ -37,13 +38,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.io.ByteStreams; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.io.util.File; -import org.apache.cassandra.utils.JsonUtils; -import org.apache.cassandra.utils.LocalizeString; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.TypeDescription; @@ -61,6 +58,11 @@ import org.yaml.snakeyaml.parser.ParserImpl; import org.yaml.snakeyaml.representer.Representer; import org.yaml.snakeyaml.resolver.Resolver; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.utils.JsonUtils; +import org.apache.cassandra.utils.LocalizeString; + import static org.apache.cassandra.config.CassandraRelevantEnv.CASSANDRA_ALLOW_CONFIG_ENVIRONMENT_VARIABLES; import static org.apache.cassandra.config.CassandraRelevantProperties.ALLOW_DUPLICATE_CONFIG_KEYS; import static org.apache.cassandra.config.CassandraRelevantProperties.ALLOW_NEW_OLD_CONFIG_KEYS; diff --git a/src/java/org/apache/cassandra/cql3/Attributes.java b/src/java/org/apache/cassandra/cql3/Attributes.java index 493193b400..2d3238f0bd 100644 --- a/src/java/org/apache/cassandra/cql3/Attributes.java +++ b/src/java/org/apache/cassandra/cql3/Attributes.java @@ -20,6 +20,9 @@ package org.apache.cassandra.cql3; import java.nio.ByteBuffer; import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.cql3.functions.Function; import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.db.ExpirationDateOverflowHandling; @@ -30,8 +33,6 @@ import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Utility class for the Parser to gather attributes for modification diff --git a/src/java/org/apache/cassandra/cql3/BatchQueryOptions.java b/src/java/org/apache/cassandra/cql3/BatchQueryOptions.java index 1e9ecc87e0..13143453bb 100644 --- a/src/java/org/apache/cassandra/cql3/BatchQueryOptions.java +++ b/src/java/org/apache/cassandra/cql3/BatchQueryOptions.java @@ -24,12 +24,12 @@ import java.util.List; import com.google.common.collect.ImmutableList; -import org.apache.cassandra.utils.MD5Digest; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.service.QueryState; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import org.apache.cassandra.utils.MD5Digest; import static org.apache.cassandra.utils.ByteArrayUtil.convertToByteBufferValue; diff --git a/src/java/org/apache/cassandra/cql3/CQL3Type.java b/src/java/org/apache/cassandra/cql3/CQL3Type.java index aba76c0fa3..336fe80268 100644 --- a/src/java/org/apache/cassandra/cql3/CQL3Type.java +++ b/src/java/org/apache/cassandra/cql3/CQL3Type.java @@ -27,10 +27,40 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.db.guardrails.Guardrails; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.BooleanType; +import org.apache.cassandra.db.marshal.ByteBufferAccessor; +import org.apache.cassandra.db.marshal.ByteType; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.CollectionType; import org.apache.cassandra.db.marshal.CollectionType.Kind; -import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.db.marshal.CounterColumnType; +import org.apache.cassandra.db.marshal.DecimalType; +import org.apache.cassandra.db.marshal.DoubleType; +import org.apache.cassandra.db.marshal.DurationType; +import org.apache.cassandra.db.marshal.EmptyType; +import org.apache.cassandra.db.marshal.FloatType; +import org.apache.cassandra.db.marshal.InetAddressType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.ListType; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.MapType; +import org.apache.cassandra.db.marshal.SetType; +import org.apache.cassandra.db.marshal.ShortType; +import org.apache.cassandra.db.marshal.SimpleDateType; +import org.apache.cassandra.db.marshal.TimeType; +import org.apache.cassandra.db.marshal.TimeUUIDType; +import org.apache.cassandra.db.marshal.TimestampType; +import org.apache.cassandra.db.marshal.TupleType; +import org.apache.cassandra.db.marshal.TypeParser; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.marshal.UUIDType; +import org.apache.cassandra.db.marshal.UserType; +import org.apache.cassandra.db.marshal.VectorType; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.Schema; diff --git a/src/java/org/apache/cassandra/cql3/CQLFragmentParser.java b/src/java/org/apache/cassandra/cql3/CQLFragmentParser.java index d6f4732bfe..1cad1c640c 100644 --- a/src/java/org/apache/cassandra/cql3/CQLFragmentParser.java +++ b/src/java/org/apache/cassandra/cql3/CQLFragmentParser.java @@ -23,6 +23,7 @@ import org.antlr.runtime.CharStream; import org.antlr.runtime.CommonTokenStream; import org.antlr.runtime.RecognitionException; import org.antlr.runtime.TokenStream; + import org.apache.cassandra.exceptions.SyntaxException; /** diff --git a/src/java/org/apache/cassandra/cql3/ColumnSpecification.java b/src/java/org/apache/cassandra/cql3/ColumnSpecification.java index 8cf869bd38..12a8442f72 100644 --- a/src/java/org/apache/cassandra/cql3/ColumnSpecification.java +++ b/src/java/org/apache/cassandra/cql3/ColumnSpecification.java @@ -17,15 +17,15 @@ */ package org.apache.cassandra.cql3; +import java.util.Collection; +import java.util.Iterator; + import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ReversedType; -import java.util.Collection; -import java.util.Iterator; - public class ColumnSpecification { public final String ksName; diff --git a/src/java/org/apache/cassandra/cql3/Duration.java b/src/java/org/apache/cassandra/cql3/Duration.java index 7eb6006581..1aaf173c4d 100644 --- a/src/java/org/apache/cassandra/cql3/Duration.java +++ b/src/java/org/apache/cassandra/cql3/Duration.java @@ -27,14 +27,14 @@ import com.google.common.base.Objects; import org.apache.cassandra.serializers.MarshalException; +import io.netty.util.concurrent.FastThreadLocal; + import static org.apache.cassandra.cql3.statements.RequestValidations.checkFalse; import static org.apache.cassandra.cql3.statements.RequestValidations.checkTrue; import static org.apache.cassandra.cql3.statements.RequestValidations.invalidRequest; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; import static org.apache.commons.lang3.time.DateUtils.MILLIS_PER_DAY; -import io.netty.util.concurrent.FastThreadLocal; - /** * Represents a duration. A durations store separately months, days, and seconds due to the fact that * the number of days in a month varies, and a day can have 23 or 25 hours if a daylight saving is involved. diff --git a/src/java/org/apache/cassandra/cql3/ErrorCollector.java b/src/java/org/apache/cassandra/cql3/ErrorCollector.java index f49cca41d1..2e5cd1b9fc 100644 --- a/src/java/org/apache/cassandra/cql3/ErrorCollector.java +++ b/src/java/org/apache/cassandra/cql3/ErrorCollector.java @@ -24,6 +24,7 @@ import org.antlr.runtime.Parser; import org.antlr.runtime.RecognitionException; import org.antlr.runtime.Token; import org.antlr.runtime.TokenStream; + import org.apache.cassandra.exceptions.SyntaxException; /** diff --git a/src/java/org/apache/cassandra/cql3/Operator.java b/src/java/org/apache/cassandra/cql3/Operator.java index 428ab0f533..7661bb7390 100644 --- a/src/java/org/apache/cassandra/cql3/Operator.java +++ b/src/java/org/apache/cassandra/cql3/Operator.java @@ -48,7 +48,6 @@ import org.apache.cassandra.serializers.ListSerializer; import org.apache.cassandra.utils.ByteBufferUtil; import static com.google.common.base.Preconditions.checkArgument; - import static org.apache.cassandra.cql3.statements.RequestValidations.checkFalse; import static org.apache.cassandra.cql3.statements.RequestValidations.checkTrue; import static org.apache.cassandra.cql3.statements.RequestValidations.invalidRequest; diff --git a/src/java/org/apache/cassandra/cql3/QueryEvents.java b/src/java/org/apache/cassandra/cql3/QueryEvents.java index 7b341ed200..638a1eca5c 100644 --- a/src/java/org/apache/cassandra/cql3/QueryEvents.java +++ b/src/java/org/apache/cassandra/cql3/QueryEvents.java @@ -28,6 +28,7 @@ import java.util.function.Supplier; import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/cql3/QueryOptions.java b/src/java/org/apache/cassandra/cql3/QueryOptions.java index fae5072460..b7003388af 100644 --- a/src/java/org/apache/cassandra/cql3/QueryOptions.java +++ b/src/java/org/apache/cassandra/cql3/QueryOptions.java @@ -18,19 +18,24 @@ package org.apache.cassandra.cql3; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; import com.google.common.collect.ImmutableList; -import io.netty.buffer.ByteBuf; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.cassandra.config.DataStorageSpec; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.service.pager.PagingState; import org.apache.cassandra.transport.CBCodec; @@ -40,8 +45,8 @@ import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteArrayUtil; import org.apache.cassandra.utils.CassandraUInt; import org.apache.cassandra.utils.Pair; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; + +import io.netty.buffer.ByteBuf; import static org.apache.cassandra.utils.ByteArrayUtil.convertToByteBufferValue; diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java b/src/java/org/apache/cassandra/cql3/QueryProcessor.java index 56fca66220..38a0f3545b 100644 --- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java @@ -30,19 +30,19 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; +import com.github.benmanes.caffeine.cache.RemovalCause; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; import com.google.common.primitives.Ints; + +import org.antlr.runtime.RecognitionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.github.benmanes.caffeine.cache.Cache; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.github.benmanes.caffeine.cache.RemovalCause; -import org.antlr.runtime.RecognitionException; - import org.apache.cassandra.concurrent.ImmediateExecutor; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/src/java/org/apache/cassandra/cql3/Relation.java b/src/java/org/apache/cassandra/cql3/Relation.java index 9447f04552..804b6e79e8 100644 --- a/src/java/org/apache/cassandra/cql3/Relation.java +++ b/src/java/org/apache/cassandra/cql3/Relation.java @@ -30,11 +30,13 @@ import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.CollectionType; import org.apache.cassandra.db.marshal.ListType; import org.apache.cassandra.db.marshal.MapType; +import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.exceptions.InvalidRequestException; -import static org.apache.cassandra.cql3.statements.RequestValidations.*; +import static org.apache.cassandra.cql3.statements.RequestValidations.checkFalse; +import static org.apache.cassandra.cql3.statements.RequestValidations.checkTrue; +import static org.apache.cassandra.cql3.statements.RequestValidations.invalidRequest; /** * The parsed version of a {@code SimpleRestriction} as outputed by the CQL parser. diff --git a/src/java/org/apache/cassandra/cql3/ResultSet.java b/src/java/org/apache/cassandra/cql3/ResultSet.java index ddb17634c1..82feba697e 100644 --- a/src/java/org/apache/cassandra/cql3/ResultSet.java +++ b/src/java/org/apache/cassandra/cql3/ResultSet.java @@ -30,7 +30,6 @@ import java.util.Objects; import com.google.common.annotations.VisibleForTesting; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.service.pager.PagingState; import org.apache.cassandra.transport.CBCodec; @@ -40,6 +39,8 @@ import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.MD5Digest; +import io.netty.buffer.ByteBuf; + public class ResultSet { public static final Codec codec = new Codec(); diff --git a/src/java/org/apache/cassandra/cql3/UntypedResultSet.java b/src/java/org/apache/cassandra/cql3/UntypedResultSet.java index f70c1211e9..e2349062c2 100644 --- a/src/java/org/apache/cassandra/cql3/UntypedResultSet.java +++ b/src/java/org/apache/cassandra/cql3/UntypedResultSet.java @@ -27,10 +27,11 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.annotation.Nonnull; import java.util.stream.Stream; import java.util.stream.StreamSupport; +import javax.annotation.Nonnull; + import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; diff --git a/src/java/org/apache/cassandra/cql3/WhereClause.java b/src/java/org/apache/cassandra/cql3/WhereClause.java index dc1a7cfde0..52e455d938 100644 --- a/src/java/org/apache/cassandra/cql3/WhereClause.java +++ b/src/java/org/apache/cassandra/cql3/WhereClause.java @@ -23,12 +23,12 @@ import java.util.Objects; import com.google.common.collect.ImmutableList; import org.antlr.runtime.RecognitionException; -import org.apache.cassandra.cql3.restrictions.CustomIndexExpression; -import static java.lang.String.join; +import org.apache.cassandra.cql3.restrictions.CustomIndexExpression; import static com.google.common.collect.Iterables.concat; import static com.google.common.collect.Iterables.transform; +import static java.lang.String.join; public final class WhereClause { diff --git a/src/java/org/apache/cassandra/cql3/conditions/AbstractConditions.java b/src/java/org/apache/cassandra/cql3/conditions/AbstractConditions.java index 0e2646effd..6ab7b49c9d 100644 --- a/src/java/org/apache/cassandra/cql3/conditions/AbstractConditions.java +++ b/src/java/org/apache/cassandra/cql3/conditions/AbstractConditions.java @@ -19,8 +19,8 @@ package org.apache.cassandra.cql3.conditions; import java.util.List; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.cql3.functions.Function; +import org.apache.cassandra.schema.ColumnMetadata; /** * Base class for Conditions classes. diff --git a/src/java/org/apache/cassandra/cql3/conditions/ColumnCondition.java b/src/java/org/apache/cassandra/cql3/conditions/ColumnCondition.java index b996f00e26..37e764afd5 100644 --- a/src/java/org/apache/cassandra/cql3/conditions/ColumnCondition.java +++ b/src/java/org/apache/cassandra/cql3/conditions/ColumnCondition.java @@ -19,7 +19,9 @@ package org.apache.cassandra.cql3.conditions; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; import com.google.common.annotations.VisibleForTesting; @@ -51,7 +53,9 @@ import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.accord.serializers.TableMetadatas; import org.apache.cassandra.utils.ByteBufferUtil; -import static org.apache.cassandra.cql3.statements.RequestValidations.*; +import static org.apache.cassandra.cql3.statements.RequestValidations.checkFalse; +import static org.apache.cassandra.cql3.statements.RequestValidations.checkNotNull; +import static org.apache.cassandra.cql3.statements.RequestValidations.invalidRequest; import static org.apache.cassandra.db.TypeSizes.sizeofUnsignedVInt; import static org.apache.cassandra.service.accord.AccordSerializers.columnMetadataSerializer; import static org.apache.cassandra.utils.ByteBufferUtil.nullableByteBufferSerializer; diff --git a/src/java/org/apache/cassandra/cql3/conditions/ColumnConditions.java b/src/java/org/apache/cassandra/cql3/conditions/ColumnConditions.java index 030d4a9719..4344d63326 100644 --- a/src/java/org/apache/cassandra/cql3/conditions/ColumnConditions.java +++ b/src/java/org/apache/cassandra/cql3/conditions/ColumnConditions.java @@ -24,13 +24,14 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.functions.Function; import org.apache.cassandra.cql3.statements.CQL3CasRequest; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * A set of ColumnConditions. diff --git a/src/java/org/apache/cassandra/cql3/functions/AbstractFunction.java b/src/java/org/apache/cassandra/cql3/functions/AbstractFunction.java index 1b62daddbb..da1177fdea 100644 --- a/src/java/org/apache/cassandra/cql3/functions/AbstractFunction.java +++ b/src/java/org/apache/cassandra/cql3/functions/AbstractFunction.java @@ -22,6 +22,8 @@ import java.util.List; import com.google.common.base.Objects; +import org.apache.commons.lang3.text.StrBuilder; + import org.apache.cassandra.cql3.AssignmentTestable; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.CQL3Type.Tuple; @@ -29,8 +31,6 @@ import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.CqlBuilder; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.commons.lang3.text.StrBuilder; - import static java.util.stream.Collectors.toList; /** diff --git a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java b/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java index 9942869a5f..4cc19c0824 100644 --- a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java +++ b/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java @@ -23,7 +23,17 @@ import java.math.RoundingMode; import java.nio.ByteBuffer; import java.util.List; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.ByteType; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.CounterColumnType; +import org.apache.cassandra.db.marshal.DecimalType; +import org.apache.cassandra.db.marshal.DoubleType; +import org.apache.cassandra.db.marshal.FloatType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.ShortType; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.transport.ProtocolVersion; diff --git a/src/java/org/apache/cassandra/cql3/functions/CastFcts.java b/src/java/org/apache/cassandra/cql3/functions/CastFcts.java index f32d4798e7..4f4936c66d 100644 --- a/src/java/org/apache/cassandra/cql3/functions/CastFcts.java +++ b/src/java/org/apache/cassandra/cql3/functions/CastFcts.java @@ -22,6 +22,8 @@ import java.math.BigInteger; import java.nio.ByteBuffer; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.AsciiType; @@ -44,11 +46,10 @@ import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.transport.ProtocolVersion; -import static org.apache.cassandra.cql3.functions.TimeFcts.*; +import static org.apache.cassandra.cql3.functions.TimeFcts.toDate; +import static org.apache.cassandra.cql3.functions.TimeFcts.toTimestamp; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; -import org.apache.commons.lang3.StringUtils; - /** * Casting functions * diff --git a/src/java/org/apache/cassandra/cql3/functions/FromJsonFct.java b/src/java/org/apache/cassandra/cql3/functions/FromJsonFct.java index 356003e8e8..172a353c7d 100644 --- a/src/java/org/apache/cassandra/cql3/functions/FromJsonFct.java +++ b/src/java/org/apache/cassandra/cql3/functions/FromJsonFct.java @@ -19,13 +19,15 @@ package org.apache.cassandra.cql3.functions; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.apache.cassandra.cql3.CQL3Type; - import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.FunctionExecutionException; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.serializers.MarshalException; diff --git a/src/java/org/apache/cassandra/cql3/functions/Function.java b/src/java/org/apache/cassandra/cql3/functions/Function.java index 5af03b2fd3..70fd4b48bf 100644 --- a/src/java/org/apache/cassandra/cql3/functions/Function.java +++ b/src/java/org/apache/cassandra/cql3/functions/Function.java @@ -21,11 +21,12 @@ import java.nio.ByteBuffer; import java.util.List; import java.util.Optional; +import org.github.jamm.Unmetered; + import org.apache.cassandra.cql3.AssignmentTestable; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.schema.Difference; import org.apache.cassandra.transport.ProtocolVersion; -import org.github.jamm.Unmetered; @Unmetered public interface Function extends AssignmentTestable diff --git a/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java b/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java index eb9bc3e8bb..2603680f90 100644 --- a/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java +++ b/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java @@ -24,13 +24,19 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.AssignmentTestable; +import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.ColumnSpecification; +import org.apache.cassandra.cql3.CqlBuilder; +import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.cql3.VariableSpecifications; import org.apache.cassandra.cql3.statements.RequestValidations; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.MultiElements; import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.terms.Terms; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.MultiElementType; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.schema.UserFunctions; import org.apache.cassandra.serializers.MarshalException; diff --git a/src/java/org/apache/cassandra/cql3/functions/FunctionParameter.java b/src/java/org/apache/cassandra/cql3/functions/FunctionParameter.java index 708e4fdd7d..544728b149 100644 --- a/src/java/org/apache/cassandra/cql3/functions/FunctionParameter.java +++ b/src/java/org/apache/cassandra/cql3/functions/FunctionParameter.java @@ -21,6 +21,7 @@ package org.apache.cassandra.cql3.functions; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; + import javax.annotation.Nullable; import org.apache.cassandra.cql3.AssignmentTestable; diff --git a/src/java/org/apache/cassandra/cql3/functions/FunctionResolver.java b/src/java/org/apache/cassandra/cql3/functions/FunctionResolver.java index 960f049d9a..eeff53e995 100644 --- a/src/java/org/apache/cassandra/cql3/functions/FunctionResolver.java +++ b/src/java/org/apache/cassandra/cql3/functions/FunctionResolver.java @@ -25,10 +25,10 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.apache.cassandra.cql3.terms.Marker; import org.apache.cassandra.cql3.AssignmentTestable; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.ColumnSpecification; +import org.apache.cassandra.cql3.terms.Marker; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.schema.UserFunctions; diff --git a/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java b/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java index 2dcddc3251..5dfe8948ee 100644 --- a/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java +++ b/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java @@ -26,11 +26,25 @@ import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.net.*; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; import java.nio.ByteBuffer; -import java.security.*; +import java.security.CodeSource; +import java.security.PermissionCollection; +import java.security.ProtectionDomain; +import java.security.SecureClassLoader; import java.security.cert.Certificate; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.StringTokenizer; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.ThreadLocalRandom; @@ -40,19 +54,14 @@ import java.util.regex.Pattern; import com.google.common.io.ByteStreams; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.apache.cassandra.concurrent.NamedThreadFactory; -import org.apache.cassandra.cql3.ColumnIdentifier; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.security.SecurityThreadGroup; -import org.apache.cassandra.security.ThreadAwareSecurityManager; import org.eclipse.jdt.core.compiler.IProblem; -import org.eclipse.jdt.internal.compiler.*; +import org.eclipse.jdt.internal.compiler.ClassFile; +import org.eclipse.jdt.internal.compiler.CompilationResult; import org.eclipse.jdt.internal.compiler.Compiler; +import org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies; +import org.eclipse.jdt.internal.compiler.ICompilerRequestor; +import org.eclipse.jdt.internal.compiler.IErrorHandlingPolicy; +import org.eclipse.jdt.internal.compiler.IProblemFactory; import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader; import org.eclipse.jdt.internal.compiler.classfmt.ClassFormatException; import org.eclipse.jdt.internal.compiler.env.ICompilationUnit; @@ -62,6 +71,16 @@ import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; import org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment; import org.eclipse.jdt.internal.compiler.lookup.ModuleBinding; import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.concurrent.NamedThreadFactory; +import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.security.SecurityThreadGroup; +import org.apache.cassandra.security.ThreadAwareSecurityManager; +import org.apache.cassandra.utils.FBUtilities; public final class JavaBasedUDFunction extends UDFunction { diff --git a/src/java/org/apache/cassandra/cql3/functions/MathFcts.java b/src/java/org/apache/cassandra/cql3/functions/MathFcts.java index 1f6ac2b7d1..7f2cc2db7f 100644 --- a/src/java/org/apache/cassandra/cql3/functions/MathFcts.java +++ b/src/java/org/apache/cassandra/cql3/functions/MathFcts.java @@ -24,7 +24,17 @@ import java.util.List; import java.util.function.BiFunction; import com.google.common.collect.ImmutableList; -import org.apache.cassandra.db.marshal.*; + +import org.apache.cassandra.db.marshal.ByteType; +import org.apache.cassandra.db.marshal.CounterColumnType; +import org.apache.cassandra.db.marshal.DecimalType; +import org.apache.cassandra.db.marshal.DoubleType; +import org.apache.cassandra.db.marshal.FloatType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.NumberType; +import org.apache.cassandra.db.marshal.ShortType; import org.apache.cassandra.exceptions.InvalidRequestException; public final class MathFcts diff --git a/src/java/org/apache/cassandra/cql3/functions/OperationFcts.java b/src/java/org/apache/cassandra/cql3/functions/OperationFcts.java index d0b7ac382c..f92a76a54c 100644 --- a/src/java/org/apache/cassandra/cql3/functions/OperationFcts.java +++ b/src/java/org/apache/cassandra/cql3/functions/OperationFcts.java @@ -21,9 +21,26 @@ import java.nio.ByteBuffer; import java.util.List; import org.apache.cassandra.cql3.Duration; -import org.apache.cassandra.schema.SchemaConstants; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.ByteType; +import org.apache.cassandra.db.marshal.CounterColumnType; +import org.apache.cassandra.db.marshal.DecimalType; +import org.apache.cassandra.db.marshal.DoubleType; +import org.apache.cassandra.db.marshal.DurationType; +import org.apache.cassandra.db.marshal.FloatType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.NumberType; +import org.apache.cassandra.db.marshal.ShortType; +import org.apache.cassandra.db.marshal.SimpleDateType; +import org.apache.cassandra.db.marshal.StringType; +import org.apache.cassandra.db.marshal.TemporalType; +import org.apache.cassandra.db.marshal.TimestampType; +import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.OperationExecutionException; +import org.apache.cassandra.schema.SchemaConstants; /** * Operation functions (Mathematics). diff --git a/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java b/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java index eb547f0f62..16b546afe2 100644 --- a/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java +++ b/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java @@ -25,7 +25,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.cql3.Duration; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.DurationType; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.SimpleDateType; +import org.apache.cassandra.db.marshal.TemporalType; +import org.apache.cassandra.db.marshal.TimeType; +import org.apache.cassandra.db.marshal.TimeUUIDType; +import org.apache.cassandra.db.marshal.TimestampType; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.TimeUUID; diff --git a/src/java/org/apache/cassandra/cql3/functions/ToJsonFct.java b/src/java/org/apache/cassandra/cql3/functions/ToJsonFct.java index a1182a9c9e..0f0e917ba5 100644 --- a/src/java/org/apache/cassandra/cql3/functions/ToJsonFct.java +++ b/src/java/org/apache/cassandra/cql3/functions/ToJsonFct.java @@ -17,17 +17,17 @@ */ package org.apache.cassandra.cql3.functions; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; -import java.nio.ByteBuffer; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - import static java.lang.String.format; public class ToJsonFct extends NativeScalarFunction diff --git a/src/java/org/apache/cassandra/cql3/functions/TokenFct.java b/src/java/org/apache/cassandra/cql3/functions/TokenFct.java index dd163b6b6d..a83ad4f7d9 100644 --- a/src/java/org/apache/cassandra/cql3/functions/TokenFct.java +++ b/src/java/org/apache/cassandra/cql3/functions/TokenFct.java @@ -22,12 +22,12 @@ import java.util.Arrays; import java.util.List; import org.apache.cassandra.cql3.AssignmentTestable; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.CBuilder; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.transport.ProtocolVersion; public class TokenFct extends NativeScalarFunction diff --git a/src/java/org/apache/cassandra/cql3/functions/UDAggregate.java b/src/java/org/apache/cassandra/cql3/functions/UDAggregate.java index 6a9419efd4..ccc24725ce 100644 --- a/src/java/org/apache/cassandra/cql3/functions/UDAggregate.java +++ b/src/java/org/apache/cassandra/cql3/functions/UDAggregate.java @@ -19,10 +19,15 @@ package org.apache.cassandra.cql3.functions; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Optional; import com.google.common.base.Objects; import com.google.common.collect.Lists; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,11 +38,11 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; -import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.schema.CQLTypeParser; import org.apache.cassandra.schema.Difference; -import org.apache.cassandra.schema.UserFunctions; import org.apache.cassandra.schema.Types; +import org.apache.cassandra.schema.UserFunctions; +import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/cql3/functions/UDFContextImpl.java b/src/java/org/apache/cassandra/cql3/functions/UDFContextImpl.java index 653f3c5c35..a0b79b4e60 100644 --- a/src/java/org/apache/cassandra/cql3/functions/UDFContextImpl.java +++ b/src/java/org/apache/cassandra/cql3/functions/UDFContextImpl.java @@ -26,13 +26,12 @@ import java.util.function.Supplier; import com.google.common.base.Suppliers; +import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.functions.types.DataType; import org.apache.cassandra.cql3.functions.types.TupleType; import org.apache.cassandra.cql3.functions.types.TupleValue; import org.apache.cassandra.cql3.functions.types.UDTValue; import org.apache.cassandra.cql3.functions.types.UserType; - -import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.schema.CQLTypeParser; import org.apache.cassandra.schema.KeyspaceMetadata; diff --git a/src/java/org/apache/cassandra/cql3/functions/UDFDataType.java b/src/java/org/apache/cassandra/cql3/functions/UDFDataType.java index a1aa202f87..8e7f2ce197 100644 --- a/src/java/org/apache/cassandra/cql3/functions/UDFDataType.java +++ b/src/java/org/apache/cassandra/cql3/functions/UDFDataType.java @@ -28,9 +28,13 @@ import com.google.common.reflect.TypeToken; import org.apache.cassandra.cql3.functions.types.DataType; import org.apache.cassandra.cql3.functions.types.TypeCodec; -import org.apache.cassandra.cql3.functions.types.TypeCodec.*; +import org.apache.cassandra.cql3.functions.types.TypeCodec.PrimitiveByteCodec; +import org.apache.cassandra.cql3.functions.types.TypeCodec.PrimitiveDoubleCodec; +import org.apache.cassandra.cql3.functions.types.TypeCodec.PrimitiveFloatCodec; +import org.apache.cassandra.cql3.functions.types.TypeCodec.PrimitiveIntCodec; +import org.apache.cassandra.cql3.functions.types.TypeCodec.PrimitiveLongCodec; +import org.apache.cassandra.cql3.functions.types.TypeCodec.PrimitiveShortCodec; import org.apache.cassandra.cql3.functions.types.exceptions.InvalidTypeException; - import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.JavaDriverUtils; diff --git a/src/java/org/apache/cassandra/cql3/functions/UDFExecutorService.java b/src/java/org/apache/cassandra/cql3/functions/UDFExecutorService.java index 19705451b7..16f9725c09 100644 --- a/src/java/org/apache/cassandra/cql3/functions/UDFExecutorService.java +++ b/src/java/org/apache/cassandra/cql3/functions/UDFExecutorService.java @@ -17,9 +17,9 @@ */ package org.apache.cassandra.cql3.functions; -import org.apache.cassandra.concurrent.ThreadPoolExecutorJMXAdapter; import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.concurrent.ThreadPoolExecutorBase; +import org.apache.cassandra.concurrent.ThreadPoolExecutorJMXAdapter; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.cassandra.config.CassandraRelevantProperties.UDF_EXECUTOR_THREAD_KEEPALIVE_MS; diff --git a/src/java/org/apache/cassandra/cql3/functions/UDFunction.java b/src/java/org/apache/cassandra/cql3/functions/UDFunction.java index ded2a1589e..3e6d20f9a3 100644 --- a/src/java/org/apache/cassandra/cql3/functions/UDFunction.java +++ b/src/java/org/apache/cassandra/cql3/functions/UDFunction.java @@ -29,8 +29,8 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.List; import java.util.Optional; -import java.util.concurrent.CompletableFuture; // checkstyle: permit this import import java.util.concurrent.Callable; +import java.util.concurrent.CompletableFuture; // checkstyle: permit this import import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; @@ -40,6 +40,7 @@ import java.util.stream.Collectors; import com.google.common.base.Objects; import com.google.common.collect.Lists; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,10 +56,13 @@ import org.apache.cassandra.exceptions.FunctionExecutionException; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.schema.CQLTypeParser; +import org.apache.cassandra.schema.Difference; +import org.apache.cassandra.schema.Types; +import org.apache.cassandra.schema.UserFunctions; +import org.apache.cassandra.service.ClientWarn; import org.apache.cassandra.tcm.serialization.UDTAwareMetadataSerializer; import org.apache.cassandra.tcm.serialization.Version; -import org.apache.cassandra.schema.*; -import org.apache.cassandra.service.ClientWarn; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.JVMStabilityInspector; @@ -66,7 +70,7 @@ import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; import static com.google.common.collect.Iterables.any; import static com.google.common.collect.Iterables.transform; -import static org.apache.cassandra.db.TypeSizes.*; +import static org.apache.cassandra.db.TypeSizes.sizeof; import static org.apache.cassandra.schema.SchemaKeyspace.bbToString; import static org.apache.cassandra.utils.Clock.Global.nanoTime; diff --git a/src/java/org/apache/cassandra/cql3/functions/UuidFcts.java b/src/java/org/apache/cassandra/cql3/functions/UuidFcts.java index 3e90deb683..1cb3ecb411 100644 --- a/src/java/org/apache/cassandra/cql3/functions/UuidFcts.java +++ b/src/java/org/apache/cassandra/cql3/functions/UuidFcts.java @@ -18,7 +18,7 @@ package org.apache.cassandra.cql3.functions; import java.nio.ByteBuffer; -import java.util.*; +import java.util.UUID; import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.serializers.UUIDSerializer; diff --git a/src/java/org/apache/cassandra/cql3/functions/VectorFcts.java b/src/java/org/apache/cassandra/cql3/functions/VectorFcts.java index ae219a529b..08403b5f94 100644 --- a/src/java/org/apache/cassandra/cql3/functions/VectorFcts.java +++ b/src/java/org/apache/cassandra/cql3/functions/VectorFcts.java @@ -27,6 +27,7 @@ import org.apache.cassandra.db.marshal.FloatType; import org.apache.cassandra.db.marshal.VectorType; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.transport.ProtocolVersion; + import io.github.jbellis.jvector.vector.VectorSimilarityFunction; public class VectorFcts diff --git a/src/java/org/apache/cassandra/cql3/functions/masking/ColumnMask.java b/src/java/org/apache/cassandra/cql3/functions/masking/ColumnMask.java index 644eeec611..642bd358ca 100644 --- a/src/java/org/apache/cassandra/cql3/functions/masking/ColumnMask.java +++ b/src/java/org/apache/cassandra/cql3/functions/masking/ColumnMask.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Objects; import com.google.common.collect.ImmutableList; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.config.DatabaseDescriptor; @@ -34,12 +35,12 @@ import org.apache.cassandra.cql3.AssignmentTestable; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.CqlBuilder; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.functions.Arguments; import org.apache.cassandra.cql3.functions.Function; import org.apache.cassandra.cql3.functions.FunctionName; import org.apache.cassandra.cql3.functions.FunctionResolver; import org.apache.cassandra.cql3.functions.ScalarFunction; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ReversedType; diff --git a/src/java/org/apache/cassandra/cql3/functions/masking/HashMaskingFunction.java b/src/java/org/apache/cassandra/cql3/functions/masking/HashMaskingFunction.java index 3291b156f0..4bd0d74ecf 100644 --- a/src/java/org/apache/cassandra/cql3/functions/masking/HashMaskingFunction.java +++ b/src/java/org/apache/cassandra/cql3/functions/masking/HashMaskingFunction.java @@ -24,6 +24,7 @@ import java.security.NoSuchAlgorithmException; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; diff --git a/src/java/org/apache/cassandra/cql3/functions/masking/PartialMaskingFunction.java b/src/java/org/apache/cassandra/cql3/functions/masking/PartialMaskingFunction.java index 8f5a794b8e..6fb2b9e797 100644 --- a/src/java/org/apache/cassandra/cql3/functions/masking/PartialMaskingFunction.java +++ b/src/java/org/apache/cassandra/cql3/functions/masking/PartialMaskingFunction.java @@ -25,6 +25,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import com.google.common.annotations.VisibleForTesting; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.cql3.CQL3Type; diff --git a/src/java/org/apache/cassandra/cql3/functions/types/AbstractAddressableByIndexData.java b/src/java/org/apache/cassandra/cql3/functions/types/AbstractAddressableByIndexData.java index 2b1fd84a9e..122ce4d789 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/AbstractAddressableByIndexData.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/AbstractAddressableByIndexData.java @@ -21,7 +21,12 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; import com.google.common.reflect.TypeToken; diff --git a/src/java/org/apache/cassandra/cql3/functions/types/AbstractData.java b/src/java/org/apache/cassandra/cql3/functions/types/AbstractData.java index 45ce309332..af1eb8751d 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/AbstractData.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/AbstractData.java @@ -21,7 +21,12 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; import com.google.common.reflect.TypeToken; diff --git a/src/java/org/apache/cassandra/cql3/functions/types/AbstractGettableByIndexData.java b/src/java/org/apache/cassandra/cql3/functions/types/AbstractGettableByIndexData.java index ca8827b0d7..0b78f4e30c 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/AbstractGettableByIndexData.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/AbstractGettableByIndexData.java @@ -21,12 +21,16 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import com.google.common.reflect.TypeToken; -import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.cql3.functions.types.exceptions.InvalidTypeException; +import org.apache.cassandra.transport.ProtocolVersion; abstract class AbstractGettableByIndexData implements GettableByIndexData { diff --git a/src/java/org/apache/cassandra/cql3/functions/types/AbstractGettableData.java b/src/java/org/apache/cassandra/cql3/functions/types/AbstractGettableData.java index f26abd296c..30ddf24553 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/AbstractGettableData.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/AbstractGettableData.java @@ -21,7 +21,11 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import com.google.common.reflect.TypeToken; diff --git a/src/java/org/apache/cassandra/cql3/functions/types/CodecRegistry.java b/src/java/org/apache/cassandra/cql3/functions/types/CodecRegistry.java index e7a496e997..abb61bec4c 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/CodecRegistry.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/CodecRegistry.java @@ -20,20 +20,56 @@ package org.apache.cassandra.cql3.functions.types; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.nio.ByteBuffer; -import java.util.*; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutionException; -import com.google.common.cache.*; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.cache.RemovalListener; +import com.google.common.cache.RemovalNotification; +import com.google.common.cache.Weigher; import com.google.common.reflect.TypeToken; import com.google.common.util.concurrent.UncheckedExecutionException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.cql3.functions.types.exceptions.CodecNotFoundException; import static com.google.common.base.Preconditions.checkNotNull; -import static org.apache.cassandra.cql3.functions.types.DataType.Name.*; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.ASCII; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.BIGINT; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.BLOB; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.BOOLEAN; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.COUNTER; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.DATE; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.DECIMAL; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.DOUBLE; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.DURATION; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.FLOAT; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.INET; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.INT; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.LIST; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.MAP; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.SET; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.SMALLINT; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.TEXT; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.TIME; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.TIMESTAMP; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.TIMEUUID; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.TINYINT; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.TUPLE; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.UDT; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.UUID; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.VARCHAR; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.VARINT; +import static org.apache.cassandra.cql3.functions.types.DataType.Name.VECTOR; /** * A registry for {@link TypeCodec}s. When the driver needs to serialize or deserialize a Java type diff --git a/src/java/org/apache/cassandra/cql3/functions/types/DataType.java b/src/java/org/apache/cassandra/cql3/functions/types/DataType.java index 8a5dfd7631..a965d69f37 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/DataType.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/DataType.java @@ -17,7 +17,11 @@ */ package org.apache.cassandra.cql3.functions.types; -import java.util.*; +import java.util.Collections; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import com.google.common.collect.ImmutableList; diff --git a/src/java/org/apache/cassandra/cql3/functions/types/DataTypeClassNameParser.java b/src/java/org/apache/cassandra/cql3/functions/types/DataTypeClassNameParser.java index 1d50edfd86..080539cf67 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/DataTypeClassNameParser.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/DataTypeClassNameParser.java @@ -17,16 +17,19 @@ */ package org.apache.cassandra.cql3.functions.types; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import com.google.common.collect.ImmutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.cql3.functions.types.exceptions.DriverInternalError; import org.apache.cassandra.cql3.functions.types.utils.Bytes; +import org.apache.cassandra.transport.ProtocolVersion; /* * Parse data types from schema tables, for Cassandra 3.0 and above. diff --git a/src/java/org/apache/cassandra/cql3/functions/types/GettableByIndexData.java b/src/java/org/apache/cassandra/cql3/functions/types/GettableByIndexData.java index abbe32b29b..c31fb2c0fe 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/GettableByIndexData.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/GettableByIndexData.java @@ -21,7 +21,11 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import com.google.common.reflect.TypeToken; diff --git a/src/java/org/apache/cassandra/cql3/functions/types/GettableByNameData.java b/src/java/org/apache/cassandra/cql3/functions/types/GettableByNameData.java index d65bf36d19..afe5b9033b 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/GettableByNameData.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/GettableByNameData.java @@ -21,7 +21,11 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import com.google.common.reflect.TypeToken; diff --git a/src/java/org/apache/cassandra/cql3/functions/types/LocalDate.java b/src/java/org/apache/cassandra/cql3/functions/types/LocalDate.java index a8b4236203..da35537a27 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/LocalDate.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/LocalDate.java @@ -17,7 +17,10 @@ */ package org.apache.cassandra.cql3.functions.types; -import java.util.*; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.TimeZone; import java.util.concurrent.TimeUnit; import static com.google.common.base.Preconditions.checkArgument; diff --git a/src/java/org/apache/cassandra/cql3/functions/types/ParseUtils.java b/src/java/org/apache/cassandra/cql3/functions/types/ParseUtils.java index 45bf720c0c..33b3f7293d 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/ParseUtils.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/ParseUtils.java @@ -17,7 +17,9 @@ */ package org.apache.cassandra.cql3.functions.types; -import java.text.*; +import java.text.ParseException; +import java.text.ParsePosition; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; import java.util.concurrent.TimeUnit; diff --git a/src/java/org/apache/cassandra/cql3/functions/types/SettableByIndexData.java b/src/java/org/apache/cassandra/cql3/functions/types/SettableByIndexData.java index 4e59a27550..ae6f5fdd7d 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/SettableByIndexData.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/SettableByIndexData.java @@ -21,7 +21,11 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import com.google.common.reflect.TypeToken; diff --git a/src/java/org/apache/cassandra/cql3/functions/types/SettableByNameData.java b/src/java/org/apache/cassandra/cql3/functions/types/SettableByNameData.java index 376cf471cd..afcaae25f6 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/SettableByNameData.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/SettableByNameData.java @@ -21,7 +21,11 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import com.google.common.reflect.TypeToken; diff --git a/src/java/org/apache/cassandra/cql3/functions/types/TupleType.java b/src/java/org/apache/cassandra/cql3/functions/types/TupleType.java index 8b8f452359..6712cfd98c 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/TupleType.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/TupleType.java @@ -22,8 +22,8 @@ import java.util.List; import com.google.common.collect.ImmutableList; -import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.cql3.functions.types.exceptions.InvalidTypeException; +import org.apache.cassandra.transport.ProtocolVersion; /** * A tuple type. diff --git a/src/java/org/apache/cassandra/cql3/functions/types/TypeCodec.java b/src/java/org/apache/cassandra/cql3/functions/types/TypeCodec.java index 9b2df91fbe..e7152f0e08 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/TypeCodec.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/TypeCodec.java @@ -28,7 +28,16 @@ import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.text.ParseException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import java.util.regex.Pattern; import com.google.common.io.ByteStreams; @@ -41,7 +50,11 @@ import org.apache.cassandra.utils.vint.VIntCoding; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import static org.apache.cassandra.cql3.functions.types.DataType.*; +import static org.apache.cassandra.cql3.functions.types.DataType.CollectionType; +import static org.apache.cassandra.cql3.functions.types.DataType.Name; +import static org.apache.cassandra.cql3.functions.types.DataType.smallint; +import static org.apache.cassandra.cql3.functions.types.DataType.timeuuid; +import static org.apache.cassandra.cql3.functions.types.DataType.tinyint; /** * A Codec that can serialize and deserialize to and from a given {@link #getCqlType() CQL type} and diff --git a/src/java/org/apache/cassandra/cql3/functions/types/TypeTokens.java b/src/java/org/apache/cassandra/cql3/functions/types/TypeTokens.java index 024c55e6c6..2a95323969 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/TypeTokens.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/TypeTokens.java @@ -17,7 +17,9 @@ */ package org.apache.cassandra.cql3.functions.types; -import java.util.*; +import java.util.List; +import java.util.Map; +import java.util.Set; import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; diff --git a/src/java/org/apache/cassandra/cql3/functions/types/UserType.java b/src/java/org/apache/cassandra/cql3/functions/types/UserType.java index 1a24e22e90..f3f57f7302 100644 --- a/src/java/org/apache/cassandra/cql3/functions/types/UserType.java +++ b/src/java/org/apache/cassandra/cql3/functions/types/UserType.java @@ -17,7 +17,10 @@ */ package org.apache.cassandra.cql3.functions.types; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterators; diff --git a/src/java/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictions.java b/src/java/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictions.java index b6775d0f1c..93b93a7c81 100644 --- a/src/java/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictions.java +++ b/src/java/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictions.java @@ -17,22 +17,26 @@ */ package org.apache.cassandra.cql3.restrictions; -import java.util.*; +import java.util.List; +import java.util.NavigableSet; import javax.annotation.Nullable; import com.google.common.collect.RangeSet; +import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringComparator; +import org.apache.cassandra.db.MultiCBuilder; +import org.apache.cassandra.db.Slices; import org.apache.cassandra.db.filter.IndexHints; +import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.db.guardrails.Guardrails; import org.apache.cassandra.dht.IPartitioner; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.index.IndexRegistry; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ClientState; import static org.apache.cassandra.cql3.statements.RequestValidations.checkFalse; diff --git a/src/java/org/apache/cassandra/cql3/restrictions/CustomIndexExpression.java b/src/java/org/apache/cassandra/cql3/restrictions/CustomIndexExpression.java index 8390d29a91..0f703e53c4 100644 --- a/src/java/org/apache/cassandra/cql3/restrictions/CustomIndexExpression.java +++ b/src/java/org/apache/cassandra/cql3/restrictions/CustomIndexExpression.java @@ -19,7 +19,11 @@ package org.apache.cassandra.cql3.restrictions; import java.util.Objects; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.cql3.ColumnSpecification; +import org.apache.cassandra.cql3.QualifiedName; +import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.cql3.VariableSpecifications; import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.db.marshal.AbstractType; diff --git a/src/java/org/apache/cassandra/cql3/restrictions/IndexRestrictions.java b/src/java/org/apache/cassandra/cql3/restrictions/IndexRestrictions.java index beac517301..3698228c9b 100644 --- a/src/java/org/apache/cassandra/cql3/restrictions/IndexRestrictions.java +++ b/src/java/org/apache/cassandra/cql3/restrictions/IndexRestrictions.java @@ -21,14 +21,15 @@ package org.apache.cassandra.cql3.restrictions; import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.cql3.QualifiedName; import org.apache.cassandra.db.filter.IndexHints; +import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.index.Index; import org.apache.cassandra.index.IndexRegistry; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; public class IndexRestrictions { diff --git a/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeyRestrictions.java b/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeyRestrictions.java index a33c32ae9a..c2b565196d 100644 --- a/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeyRestrictions.java +++ b/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeyRestrictions.java @@ -28,7 +28,11 @@ import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; +import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.functions.Function; +import org.apache.cassandra.db.ClusteringComparator; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.MultiCBuilder; import org.apache.cassandra.db.PartitionPosition; import org.apache.cassandra.db.guardrails.Guardrails; import org.apache.cassandra.dht.AbstractBounds; @@ -38,10 +42,6 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.dht.Token.TokenFactory; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.db.ClusteringComparator; -import org.apache.cassandra.db.ClusteringPrefix; -import org.apache.cassandra.db.MultiCBuilder; import org.apache.cassandra.service.ClientState; /** diff --git a/src/java/org/apache/cassandra/cql3/restrictions/Restriction.java b/src/java/org/apache/cassandra/cql3/restrictions/Restriction.java index 76a83fae92..e5b576332d 100644 --- a/src/java/org/apache/cassandra/cql3/restrictions/Restriction.java +++ b/src/java/org/apache/cassandra/cql3/restrictions/Restriction.java @@ -19,13 +19,13 @@ package org.apache.cassandra.cql3.restrictions; import java.util.List; -import org.apache.cassandra.db.filter.IndexHints; -import org.apache.cassandra.index.Index; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.functions.Function; +import org.apache.cassandra.db.filter.IndexHints; import org.apache.cassandra.db.filter.RowFilter; +import org.apache.cassandra.index.Index; import org.apache.cassandra.index.IndexRegistry; +import org.apache.cassandra.schema.ColumnMetadata; /** *

Implementation of this class must be immutable.

diff --git a/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java b/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java index a7ea0cb50c..9bd46f2afd 100644 --- a/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java +++ b/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java @@ -29,6 +29,7 @@ import java.util.Set; import java.util.TreeMap; import com.google.common.collect.AbstractIterator; + import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/src/java/org/apache/cassandra/cql3/restrictions/SimpleRestriction.java b/src/java/org/apache/cassandra/cql3/restrictions/SimpleRestriction.java index f3bb3bf4ee..310a82849c 100644 --- a/src/java/org/apache/cassandra/cql3/restrictions/SimpleRestriction.java +++ b/src/java/org/apache/cassandra/cql3/restrictions/SimpleRestriction.java @@ -22,6 +22,7 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import com.google.common.collect.RangeSet; @@ -43,7 +44,6 @@ import org.apache.cassandra.utils.ByteBufferUtil; import static org.apache.cassandra.cql3.statements.RequestValidations.checkFalse; import static org.apache.cassandra.cql3.statements.RequestValidations.invalidRequest; -import java.util.Optional; /** * A simple predicate on a columns expression (e.g. columnA = X). diff --git a/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java b/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java index 8373f3eb88..654c7cc0f9 100644 --- a/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java +++ b/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java @@ -29,11 +29,12 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.google.common.base.Joiner; import com.google.common.collect.Streams; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.cql3.Ordering; diff --git a/src/java/org/apache/cassandra/cql3/selection/AbstractFunctionSelector.java b/src/java/org/apache/cassandra/cql3/selection/AbstractFunctionSelector.java index d5403e4041..cd64e4ce9a 100644 --- a/src/java/org/apache/cassandra/cql3/selection/AbstractFunctionSelector.java +++ b/src/java/org/apache/cassandra/cql3/selection/AbstractFunctionSelector.java @@ -27,17 +27,12 @@ import com.google.common.collect.Iterables; import org.apache.commons.lang3.text.StrBuilder; -import org.apache.cassandra.cql3.functions.Arguments; -import org.apache.cassandra.cql3.functions.FunctionResolver; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.schema.UserFunctions; -import org.apache.cassandra.transport.ProtocolVersion; -import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.cql3.functions.Arguments; import org.apache.cassandra.cql3.functions.Function; import org.apache.cassandra.cql3.functions.FunctionName; +import org.apache.cassandra.cql3.functions.FunctionResolver; import org.apache.cassandra.cql3.functions.PartialScalarFunction; import org.apache.cassandra.cql3.functions.ScalarFunction; import org.apache.cassandra.cql3.statements.RequestValidations; @@ -47,6 +42,11 @@ import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.UserFunctions; +import org.apache.cassandra.transport.ProtocolVersion; +import org.apache.cassandra.utils.ByteBufferUtil; import static java.util.stream.Collectors.joining; diff --git a/src/java/org/apache/cassandra/cql3/selection/ElementsSelector.java b/src/java/org/apache/cassandra/cql3/selection/ElementsSelector.java index 1c4728a80d..da75884bb1 100644 --- a/src/java/org/apache/cassandra/cql3/selection/ElementsSelector.java +++ b/src/java/org/apache/cassandra/cql3/selection/ElementsSelector.java @@ -25,11 +25,15 @@ import com.google.common.collect.Range; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.selection.SimpleSelector.SimpleSelectorFactory; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.filter.ColumnFilter; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.CollectionType; +import org.apache.cassandra.db.marshal.MapType; +import org.apache.cassandra.db.marshal.ReversedType; +import org.apache.cassandra.db.marshal.SetType; import org.apache.cassandra.db.rows.CellPath; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/cql3/selection/MapSelector.java b/src/java/org/apache/cassandra/cql3/selection/MapSelector.java index 450b64a58b..0c6c6dd8e0 100644 --- a/src/java/org/apache/cassandra/cql3/selection/MapSelector.java +++ b/src/java/org/apache/cassandra/cql3/selection/MapSelector.java @@ -28,9 +28,9 @@ import java.util.stream.Collectors; import com.google.common.base.Objects; import org.apache.cassandra.cql3.ColumnSpecification; -import org.apache.cassandra.cql3.terms.Maps; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.functions.Function; +import org.apache.cassandra.cql3.terms.Maps; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.filter.ColumnFilter.Builder; import org.apache.cassandra.db.marshal.AbstractType; diff --git a/src/java/org/apache/cassandra/cql3/selection/RawSelector.java b/src/java/org/apache/cassandra/cql3/selection/RawSelector.java index 910b1d1b62..4b482e8e85 100644 --- a/src/java/org/apache/cassandra/cql3/selection/RawSelector.java +++ b/src/java/org/apache/cassandra/cql3/selection/RawSelector.java @@ -22,8 +22,8 @@ import java.util.List; import com.google.common.collect.Lists; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.schema.TableMetadata; public class RawSelector diff --git a/src/java/org/apache/cassandra/cql3/selection/Selection.java b/src/java/org/apache/cassandra/cql3/selection/Selection.java index 34d0bf9207..9d08166720 100644 --- a/src/java/org/apache/cassandra/cql3/selection/Selection.java +++ b/src/java/org/apache/cassandra/cql3/selection/Selection.java @@ -31,7 +31,11 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.ColumnSpecification; +import org.apache.cassandra.cql3.Json; +import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.cql3.ResultSet; +import org.apache.cassandra.cql3.VariableSpecifications; import org.apache.cassandra.cql3.functions.Function; import org.apache.cassandra.cql3.selection.Selector.InputRow; import org.apache.cassandra.db.filter.ColumnFilter; diff --git a/src/java/org/apache/cassandra/cql3/selection/SelectionColumnMapping.java b/src/java/org/apache/cassandra/cql3/selection/SelectionColumnMapping.java index 5d3727fce5..d8965b8cc9 100644 --- a/src/java/org/apache/cassandra/cql3/selection/SelectionColumnMapping.java +++ b/src/java/org/apache/cassandra/cql3/selection/SelectionColumnMapping.java @@ -20,14 +20,18 @@ */ package org.apache.cassandra.cql3.selection; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import java.util.stream.Collectors; import com.google.common.base.Objects; -import com.google.common.collect.*; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Lists; +import com.google.common.collect.Multimap; +import com.google.common.collect.Multimaps; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.cql3.ColumnSpecification; +import org.apache.cassandra.schema.ColumnMetadata; /** * Separately maintains the ColumnSpecifications and their mappings to underlying diff --git a/src/java/org/apache/cassandra/cql3/selection/SelectionColumns.java b/src/java/org/apache/cassandra/cql3/selection/SelectionColumns.java index f4a8593a83..0227533532 100644 --- a/src/java/org/apache/cassandra/cql3/selection/SelectionColumns.java +++ b/src/java/org/apache/cassandra/cql3/selection/SelectionColumns.java @@ -24,8 +24,8 @@ import java.util.List; import com.google.common.collect.Multimap; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.cql3.ColumnSpecification; +import org.apache.cassandra.schema.ColumnMetadata; /** * Represents a mapping between the actual columns used to satisfy a Selection diff --git a/src/java/org/apache/cassandra/cql3/selection/SelectorFactories.java b/src/java/org/apache/cassandra/cql3/selection/SelectorFactories.java index c5fbf44792..e9d62bef05 100644 --- a/src/java/org/apache/cassandra/cql3/selection/SelectorFactories.java +++ b/src/java/org/apache/cassandra/cql3/selection/SelectorFactories.java @@ -17,12 +17,12 @@ */ package org.apache.cassandra.cql3.selection; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import com.google.common.collect.Lists; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.VariableSpecifications; import org.apache.cassandra.cql3.functions.Function; @@ -30,6 +30,8 @@ import org.apache.cassandra.cql3.selection.Selector.Factory; import org.apache.cassandra.db.filter.ColumnFilter.Builder; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; /** * A set of {@code Selector} factories. diff --git a/src/java/org/apache/cassandra/cql3/selection/SimpleSelector.java b/src/java/org/apache/cassandra/cql3/selection/SimpleSelector.java index befbd2c04e..965f3a49f9 100644 --- a/src/java/org/apache/cassandra/cql3/selection/SimpleSelector.java +++ b/src/java/org/apache/cassandra/cql3/selection/SimpleSelector.java @@ -23,11 +23,9 @@ import java.nio.ByteBuffer; import com.google.common.base.Objects; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.functions.masking.ColumnMask; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.cql3.functions.masking.ColumnMask; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.filter.ColumnFilter.Builder; @@ -35,6 +33,8 @@ import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/cql3/selection/TermSelector.java b/src/java/org/apache/cassandra/cql3/selection/TermSelector.java index 24ed8c41b4..fd438821d2 100644 --- a/src/java/org/apache/cassandra/cql3/selection/TermSelector.java +++ b/src/java/org/apache/cassandra/cql3/selection/TermSelector.java @@ -22,8 +22,6 @@ import java.nio.ByteBuffer; import com.google.common.base.Objects; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.terms.Term; @@ -31,6 +29,8 @@ import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/cql3/selection/UserTypeSelector.java b/src/java/org/apache/cassandra/cql3/selection/UserTypeSelector.java index 6778cca964..3f6449a2d1 100644 --- a/src/java/org/apache/cassandra/cql3/selection/UserTypeSelector.java +++ b/src/java/org/apache/cassandra/cql3/selection/UserTypeSelector.java @@ -27,13 +27,11 @@ import java.util.Map.Entry; import com.google.common.base.Objects; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.FieldIdentifier; import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.cql3.terms.UserTypes; import org.apache.cassandra.cql3.functions.Function; +import org.apache.cassandra.cql3.terms.UserTypes; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.filter.ColumnFilter.Builder; @@ -41,6 +39,8 @@ import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/cql3/selection/VectorSelector.java b/src/java/org/apache/cassandra/cql3/selection/VectorSelector.java index f61d8d20d6..ceef630485 100644 --- a/src/java/org/apache/cassandra/cql3/selection/VectorSelector.java +++ b/src/java/org/apache/cassandra/cql3/selection/VectorSelector.java @@ -26,8 +26,8 @@ import java.util.Objects; import com.google.common.base.Preconditions; -import org.apache.cassandra.cql3.terms.Lists; import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.cql3.terms.Lists; import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.VectorType; diff --git a/src/java/org/apache/cassandra/cql3/selection/WritetimeOrTTLSelector.java b/src/java/org/apache/cassandra/cql3/selection/WritetimeOrTTLSelector.java index 9be0b45d6f..9772d242ef 100644 --- a/src/java/org/apache/cassandra/cql3/selection/WritetimeOrTTLSelector.java +++ b/src/java/org/apache/cassandra/cql3/selection/WritetimeOrTTLSelector.java @@ -22,15 +22,15 @@ import java.nio.ByteBuffer; import com.google.common.base.Objects; -import org.apache.cassandra.db.marshal.ListType; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.ColumnSpecification; +import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.ListType; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.transport.ProtocolVersion; final class WritetimeOrTTLSelector extends Selector diff --git a/src/java/org/apache/cassandra/cql3/statements/AlterRoleStatement.java b/src/java/org/apache/cassandra/cql3/statements/AlterRoleStatement.java index 9e8c2f3a5a..156e4c73f8 100644 --- a/src/java/org/apache/cassandra/cql3/statements/AlterRoleStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/AlterRoleStatement.java @@ -19,6 +19,9 @@ package org.apache.cassandra.cql3.statements; import java.util.Map; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.auth.AuthenticatedUser; @@ -39,9 +42,8 @@ import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.exceptions.UnauthorizedException; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.messages.ResultMessage; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import static org.apache.cassandra.cql3.statements.RequestValidations.*; + +import static org.apache.cassandra.cql3.statements.RequestValidations.checkTrue; public class AlterRoleStatement extends AuthenticationStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/AuthorizationStatement.java b/src/java/org/apache/cassandra/cql3/statements/AuthorizationStatement.java index 59c1739cd4..b80e3bb446 100644 --- a/src/java/org/apache/cassandra/cql3/statements/AuthorizationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/AuthorizationStatement.java @@ -17,6 +17,9 @@ */ package org.apache.cassandra.cql3.statements; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.auth.DataResource; import org.apache.cassandra.auth.IResource; import org.apache.cassandra.cql3.CQLStatement; @@ -28,8 +31,6 @@ import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.transport.messages.ResultMessage; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; public abstract class AuthorizationStatement extends CQLStatement.Raw implements CQLStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java index c2229b051c..39d36aa4a5 100644 --- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java @@ -37,6 +37,7 @@ import com.google.common.collect.HashMultiset; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.helpers.MessageFormatter; diff --git a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java index 9cc2b94c66..c2514d04ce 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java +++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java @@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory; import accord.api.Update; import accord.primitives.Keys; import accord.primitives.Txn; + import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.UpdateParameters; import org.apache.cassandra.cql3.conditions.ColumnCondition; diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateRoleStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateRoleStatement.java index c5a56eccde..dcd1395ab8 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CreateRoleStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateRoleStatement.java @@ -19,9 +19,11 @@ package org.apache.cassandra.cql3.statements; import java.util.Map; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; - import org.apache.cassandra.auth.AuthenticatedUser; import org.apache.cassandra.auth.CIDRPermissions; import org.apache.cassandra.auth.DCPermissions; @@ -40,9 +42,6 @@ import org.apache.cassandra.exceptions.UnauthorizedException; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.messages.ResultMessage; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - public class CreateRoleStatement extends AuthenticationStatement { private final RoleResource role; diff --git a/src/java/org/apache/cassandra/cql3/statements/DescribeStatement.java b/src/java/org/apache/cassandra/cql3/statements/DescribeStatement.java index 6ee6561cc1..e67f211f1b 100644 --- a/src/java/org/apache/cassandra/cql3/statements/DescribeStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/DescribeStatement.java @@ -19,7 +19,12 @@ package org.apache.cassandra.cql3.statements; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; import java.util.function.BiFunction; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -30,7 +35,12 @@ import com.google.common.collect.ImmutableList; import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.CQLStatement; +import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.cql3.ColumnSpecification; +import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.cql3.ResultSet; +import org.apache.cassandra.cql3.SchemaElement; import org.apache.cassandra.cql3.functions.FunctionName; import org.apache.cassandra.db.KeyspaceNotDefinedException; import org.apache.cassandra.db.marshal.ListType; @@ -44,7 +54,13 @@ import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.locator.NodeProximity; import org.apache.cassandra.locator.SnitchAdapter; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.IndexMetadata; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.Keyspaces; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.SchemaConstants; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.ViewMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.service.StorageService; diff --git a/src/java/org/apache/cassandra/cql3/statements/DropRoleStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropRoleStatement.java index 13ba54a52d..7a7b78da80 100644 --- a/src/java/org/apache/cassandra/cql3/statements/DropRoleStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/DropRoleStatement.java @@ -17,17 +17,24 @@ */ package org.apache.cassandra.cql3.statements; -import org.apache.cassandra.audit.AuditLogContext; -import org.apache.cassandra.audit.AuditLogEntryType; -import org.apache.cassandra.auth.*; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.RoleName; -import org.apache.cassandra.exceptions.*; -import org.apache.cassandra.service.ClientState; -import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import org.apache.cassandra.audit.AuditLogContext; +import org.apache.cassandra.audit.AuditLogEntryType; +import org.apache.cassandra.auth.AuthenticatedUser; +import org.apache.cassandra.auth.Permission; +import org.apache.cassandra.auth.RoleResource; +import org.apache.cassandra.auth.Roles; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.cql3.RoleName; +import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.exceptions.RequestExecutionException; +import org.apache.cassandra.exceptions.RequestValidationException; +import org.apache.cassandra.exceptions.UnauthorizedException; +import org.apache.cassandra.service.ClientState; +import org.apache.cassandra.transport.messages.ResultMessage; + public class DropRoleStatement extends AuthenticationStatement { private final RoleResource role; diff --git a/src/java/org/apache/cassandra/cql3/statements/GrantRoleStatement.java b/src/java/org/apache/cassandra/cql3/statements/GrantRoleStatement.java index d6240c5c5f..baa1632a12 100644 --- a/src/java/org/apache/cassandra/cql3/statements/GrantRoleStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/GrantRoleStatement.java @@ -17,6 +17,9 @@ */ package org.apache.cassandra.cql3.statements; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.config.DatabaseDescriptor; @@ -25,8 +28,6 @@ import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.messages.ResultMessage; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; public class GrantRoleStatement extends RoleManagementStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/ListPermissionsStatement.java b/src/java/org/apache/cassandra/cql3/statements/ListPermissionsStatement.java index 4b5aa601e2..eb581c3c96 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ListPermissionsStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ListPermissionsStatement.java @@ -17,22 +17,33 @@ */ package org.apache.cassandra.cql3.statements; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; -import org.apache.cassandra.auth.*; +import org.apache.cassandra.auth.IResource; +import org.apache.cassandra.auth.Permission; +import org.apache.cassandra.auth.PermissionDetails; +import org.apache.cassandra.auth.Resources; +import org.apache.cassandra.auth.RoleResource; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.schema.SchemaConstants; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.cql3.ColumnSpecification; +import org.apache.cassandra.cql3.ResultSet; +import org.apache.cassandra.cql3.RoleName; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.exceptions.RequestValidationException; +import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.messages.ResultMessage; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; public class ListPermissionsStatement extends AuthorizationStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/ListRolesStatement.java b/src/java/org/apache/cassandra/cql3/statements/ListRolesStatement.java index 8a75f8a6c3..3a592fec64 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ListRolesStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ListRolesStatement.java @@ -24,20 +24,31 @@ import java.util.Set; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; -import org.apache.cassandra.auth.*; +import org.apache.cassandra.auth.AuthKeyspace; +import org.apache.cassandra.auth.INetworkAuthorizer; +import org.apache.cassandra.auth.IRoleManager; +import org.apache.cassandra.auth.Permission; +import org.apache.cassandra.auth.RoleResource; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.schema.SchemaConstants; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.cql3.ColumnSpecification; +import org.apache.cassandra.cql3.ResultSet; +import org.apache.cassandra.cql3.RoleName; import org.apache.cassandra.db.marshal.BooleanType; import org.apache.cassandra.db.marshal.MapType; import org.apache.cassandra.db.marshal.UTF8Type; -import org.apache.cassandra.exceptions.*; +import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.exceptions.RequestExecutionException; +import org.apache.cassandra.exceptions.RequestValidationException; +import org.apache.cassandra.exceptions.UnauthorizedException; +import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.messages.ResultMessage; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; public class ListRolesStatement extends AuthorizationStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/ListUsersStatement.java b/src/java/org/apache/cassandra/cql3/statements/ListUsersStatement.java index be3e5879d8..db254fd19c 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ListUsersStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ListUsersStatement.java @@ -21,17 +21,21 @@ import java.util.List; import com.google.common.collect.ImmutableList; -import org.apache.cassandra.auth.*; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import org.apache.cassandra.auth.INetworkAuthorizer; +import org.apache.cassandra.auth.IRoleManager; +import org.apache.cassandra.auth.RoleResource; +import org.apache.cassandra.auth.Roles; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.ResultSet; import org.apache.cassandra.db.marshal.BooleanType; import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.transport.messages.ResultMessage; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; public class ListUsersStatement extends ListRolesStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java index dc434960a1..6f37effc5c 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java @@ -36,10 +36,12 @@ import com.google.common.collect.HashMultiset; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + import org.apache.cassandra.auth.Permission; import org.apache.cassandra.cql3.Attributes; import org.apache.cassandra.cql3.CQLStatement; diff --git a/src/java/org/apache/cassandra/cql3/statements/PermissionsManagementStatement.java b/src/java/org/apache/cassandra/cql3/statements/PermissionsManagementStatement.java index e809a27a45..81a9fe15c5 100644 --- a/src/java/org/apache/cassandra/cql3/statements/PermissionsManagementStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/PermissionsManagementStatement.java @@ -19,15 +19,18 @@ package org.apache.cassandra.cql3.statements; import java.util.Set; -import org.apache.cassandra.auth.*; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import org.apache.cassandra.auth.IResource; +import org.apache.cassandra.auth.Permission; +import org.apache.cassandra.auth.RoleResource; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.RoleName; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.exceptions.UnauthorizedException; import org.apache.cassandra.service.ClientState; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; public abstract class PermissionsManagementStatement extends AuthorizationStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/PropertyDefinitions.java b/src/java/org/apache/cassandra/cql3/statements/PropertyDefinitions.java index 9f16ae8692..e69fc6c78c 100644 --- a/src/java/org/apache/cassandra/cql3/statements/PropertyDefinitions.java +++ b/src/java/org/apache/cassandra/cql3/statements/PropertyDefinitions.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.regex.Pattern; + import javax.annotation.Nullable; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/cql3/statements/RevokePermissionsStatement.java b/src/java/org/apache/cassandra/cql3/statements/RevokePermissionsStatement.java index 4262285501..82f282332e 100644 --- a/src/java/org/apache/cassandra/cql3/statements/RevokePermissionsStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/RevokePermissionsStatement.java @@ -20,6 +20,9 @@ package org.apache.cassandra.cql3.statements; import java.util.Set; import java.util.stream.Collectors; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.auth.IAuthorizer; @@ -32,8 +35,6 @@ import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.ClientWarn; import org.apache.cassandra.transport.messages.ResultMessage; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; public class RevokePermissionsStatement extends PermissionsManagementStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/RevokeRoleStatement.java b/src/java/org/apache/cassandra/cql3/statements/RevokeRoleStatement.java index 651743fbf5..02bfcd0022 100644 --- a/src/java/org/apache/cassandra/cql3/statements/RevokeRoleStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/RevokeRoleStatement.java @@ -17,6 +17,9 @@ */ package org.apache.cassandra.cql3.statements; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.config.DatabaseDescriptor; @@ -25,8 +28,6 @@ import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.messages.ResultMessage; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; public class RevokeRoleStatement extends RoleManagementStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/RoleManagementStatement.java b/src/java/org/apache/cassandra/cql3/statements/RoleManagementStatement.java index a5274dd738..091ae4f4fd 100644 --- a/src/java/org/apache/cassandra/cql3/statements/RoleManagementStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/RoleManagementStatement.java @@ -17,6 +17,9 @@ */ package org.apache.cassandra.cql3.statements; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.auth.Permission; import org.apache.cassandra.auth.RoleResource; import org.apache.cassandra.config.DatabaseDescriptor; @@ -25,8 +28,6 @@ import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.exceptions.UnauthorizedException; import org.apache.cassandra.service.ClientState; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; public abstract class RoleManagementStatement extends AuthenticationStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index aa5500356d..1752fe0bc4 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@ -32,6 +32,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; + import javax.annotation.concurrent.ThreadSafe; import com.google.common.annotations.VisibleForTesting; @@ -40,6 +41,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; + import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/cql3/statements/TransactionStatement.java b/src/java/org/apache/cassandra/cql3/statements/TransactionStatement.java index 97482d994d..52039e7bef 100644 --- a/src/java/org/apache/cassandra/cql3/statements/TransactionStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/TransactionStatement.java @@ -30,6 +30,7 @@ import java.util.SortedSet; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; @@ -37,13 +38,14 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; +import org.agrona.collections.Int2ObjectHashMap; import org.slf4j.LoggerFactory; import accord.api.Key; import accord.primitives.Keys; import accord.primitives.Routable.Domain; import accord.primitives.Txn; -import org.agrona.collections.Int2ObjectHashMap; + import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java b/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java index 2d1d58c7aa..8799ffc971 100644 --- a/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java @@ -19,15 +19,23 @@ package org.apache.cassandra.cql3.statements; import java.util.concurrent.TimeoutException; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.auth.Permission; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.CQLStatement; +import org.apache.cassandra.cql3.QualifiedName; +import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.guardrails.Guardrails; import org.apache.cassandra.db.virtual.VirtualKeyspaceRegistry; -import org.apache.cassandra.exceptions.*; +import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.exceptions.TruncateException; +import org.apache.cassandra.exceptions.UnauthorizedException; +import org.apache.cassandra.exceptions.UnavailableException; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.schema.TableMetadata; @@ -36,8 +44,6 @@ import org.apache.cassandra.service.QueryState; import org.apache.cassandra.service.StorageProxy; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.transport.messages.ResultMessage; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; public class TruncateStatement extends QualifiedStatement implements CQLStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java index ca88394774..28ed1907cc 100644 --- a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java @@ -24,6 +24,7 @@ import java.util.Collections; import java.util.List; import com.google.common.base.Preconditions; + import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -31,15 +32,13 @@ import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.cql3.Attributes; import org.apache.cassandra.cql3.ColumnIdentifier; -import org.apache.cassandra.cql3.Relation; -import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.Json; import org.apache.cassandra.cql3.Operation; import org.apache.cassandra.cql3.Operations; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.cql3.QualifiedName; +import org.apache.cassandra.cql3.Relation; import org.apache.cassandra.cql3.StatementSource; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.UpdateParameters; import org.apache.cassandra.cql3.VariableSpecifications; import org.apache.cassandra.cql3.WhereClause; @@ -47,6 +46,8 @@ import org.apache.cassandra.cql3.conditions.ColumnCondition; import org.apache.cassandra.cql3.conditions.Conditions; import org.apache.cassandra.cql3.constraints.ColumnConstraint; import org.apache.cassandra.cql3.restrictions.StatementRestrictions; +import org.apache.cassandra.cql3.terms.Constants; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.transactions.ReferenceOperation; import org.apache.cassandra.cql3.transactions.ReferenceValue; import org.apache.cassandra.db.Clustering; diff --git a/src/java/org/apache/cassandra/cql3/statements/UseStatement.java b/src/java/org/apache/cassandra/cql3/statements/UseStatement.java index b3819b5cd2..319e148990 100644 --- a/src/java/org/apache/cassandra/cql3/statements/UseStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/UseStatement.java @@ -17,6 +17,9 @@ */ package org.apache.cassandra.cql3.statements; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.config.DatabaseDescriptor; @@ -25,12 +28,10 @@ import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.UnauthorizedException; -import org.apache.cassandra.transport.Dispatcher; -import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import org.apache.cassandra.transport.Dispatcher; +import org.apache.cassandra.transport.messages.ResultMessage; import static org.apache.cassandra.cql3.statements.RequestValidations.checkTrue; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/AlterSchemaStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/AlterSchemaStatement.java index e0e82591e8..59f4e5255d 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/AlterSchemaStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/AlterSchemaStatement.java @@ -34,9 +34,14 @@ import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.db.compaction.TimeWindowCompactionStrategy; import org.apache.cassandra.db.guardrails.Guardrails; import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.schema.*; import org.apache.cassandra.exceptions.SyntaxException; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.SchemaConstants; +import org.apache.cassandra.schema.SchemaTransformation; +import org.apache.cassandra.schema.TableParams; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.ClientWarn; import org.apache.cassandra.service.QueryState; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java index 74648b5ade..685d0c84cd 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java @@ -27,12 +27,13 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.concurrent.TimeUnit; + import javax.annotation.Nullable; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; -import org.apache.cassandra.tcm.serialization.Version; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,6 +75,7 @@ import org.apache.cassandra.service.reads.repair.ReadRepairStrategy; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.membership.Directory; +import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.transport.Event.SchemaChange; import org.apache.cassandra.transport.Event.SchemaChange.Change; import org.apache.cassandra.transport.Event.SchemaChange.Target; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/AlterTypeStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/AlterTypeStatement.java index f089605338..dd619af7a4 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/AlterTypeStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/AlterTypeStatement.java @@ -26,7 +26,10 @@ import java.util.Map; import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.auth.Permission; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.CQLStatement; +import org.apache.cassandra.cql3.FieldIdentifier; +import org.apache.cassandra.cql3.UTName; import org.apache.cassandra.db.guardrails.Guardrails; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.UserType; @@ -46,7 +49,6 @@ import static com.google.common.collect.Iterables.transform; import static java.lang.String.join; import static java.util.function.Predicate.isEqual; import static java.util.stream.Collectors.toList; - import static org.apache.cassandra.utils.ByteBufferUtil.bytes; public abstract class AlterTypeStatement extends AlterSchemaStatement diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/AlterViewStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/AlterViewStatement.java index 6c13f78f5a..0bce6f6f30 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/AlterViewStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/AlterViewStatement.java @@ -23,8 +23,12 @@ import org.apache.cassandra.auth.Permission; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QualifiedName; import org.apache.cassandra.db.guardrails.Guardrails; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.TableParams; +import org.apache.cassandra.schema.ViewMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.Version; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/CreateAggregateStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/CreateAggregateStatement.java index ff5fa8c02a..eaddab2af7 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/CreateAggregateStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/CreateAggregateStatement.java @@ -30,7 +30,8 @@ import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.auth.FunctionResource; import org.apache.cassandra.auth.IResource; import org.apache.cassandra.auth.Permission; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.functions.FunctionName; import org.apache.cassandra.cql3.functions.ScalarFunction; import org.apache.cassandra.cql3.functions.UDAggregate; @@ -39,11 +40,11 @@ import org.apache.cassandra.cql3.functions.UserFunction; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.schema.UserFunctions.FunctionsDiff; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.UserFunctions.FunctionsDiff; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; @@ -52,15 +53,14 @@ import org.apache.cassandra.transport.Event.SchemaChange; import org.apache.cassandra.transport.Event.SchemaChange.Change; import org.apache.cassandra.transport.Event.SchemaChange.Target; +import static com.google.common.collect.Iterables.concat; +import static com.google.common.collect.Iterables.transform; import static java.lang.String.format; import static java.lang.String.join; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static java.util.stream.Collectors.toList; -import static com.google.common.collect.Iterables.concat; -import static com.google.common.collect.Iterables.transform; - public final class CreateAggregateStatement extends AlterSchemaStatement { private final String aggregateName; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/CreateFunctionStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/CreateFunctionStatement.java index 7958d8e3e0..9505d7f436 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/CreateFunctionStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/CreateFunctionStatement.java @@ -26,7 +26,9 @@ import com.google.common.collect.Lists; import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; -import org.apache.cassandra.auth.*; +import org.apache.cassandra.auth.FunctionResource; +import org.apache.cassandra.auth.IResource; +import org.apache.cassandra.auth.Permission; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.ColumnIdentifier; @@ -34,11 +36,11 @@ import org.apache.cassandra.cql3.functions.FunctionName; import org.apache.cassandra.cql3.functions.UDFunction; import org.apache.cassandra.cql3.functions.UserFunction; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.schema.UserFunctions.FunctionsDiff; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.UserFunctions.FunctionsDiff; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.Version; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/CreateIndexStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/CreateIndexStatement.java index f36ec54262..332857a943 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/CreateIndexStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/CreateIndexStatement.java @@ -17,7 +17,11 @@ */ package org.apache.cassandra.cql3.statements.schema; -import java.util.*; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; @@ -32,13 +36,18 @@ import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.QualifiedName; import org.apache.cassandra.cql3.statements.schema.IndexTarget.Type; import org.apache.cassandra.db.guardrails.Guardrails; -import org.apache.cassandra.db.marshal.MapType; import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.MapType; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.index.internal.CassandraIndex; import org.apache.cassandra.index.sasi.SASIIndex; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.IndexMetadata; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; +import org.apache.cassandra.schema.SchemaConstants; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.Version; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/CreateKeyspaceStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/CreateKeyspaceStatement.java index a035da52da..a622b86192 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/CreateKeyspaceStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/CreateKeyspaceStatement.java @@ -32,9 +32,13 @@ import org.apache.cassandra.db.guardrails.Guardrails; import org.apache.cassandra.exceptions.AlreadyExistsException; import org.apache.cassandra.locator.LocalStrategy; import org.apache.cassandra.locator.SimpleStrategy; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.KeyspaceParams.Option; +import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; +import org.apache.cassandra.schema.ReplicationParams; +import org.apache.cassandra.schema.Schema; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.Version; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java index 328cb7542e..ef53578272 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java @@ -28,9 +28,11 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.stream.Collectors; + import javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.audit.AuditLogContext; @@ -39,14 +41,14 @@ import org.apache.cassandra.auth.DataResource; import org.apache.cassandra.auth.IResource; import org.apache.cassandra.auth.Permission; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.constraints.ColumnConstraint; -import org.apache.cassandra.cql3.constraints.ColumnConstraints; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.CQLFragmentParser; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.CqlParser; import org.apache.cassandra.cql3.QualifiedName; +import org.apache.cassandra.cql3.constraints.ColumnConstraint; +import org.apache.cassandra.cql3.constraints.ColumnConstraints; import org.apache.cassandra.cql3.constraints.NotNullConstraint; import org.apache.cassandra.cql3.constraints.UnaryFunctionColumnConstraint; import org.apache.cassandra.cql3.functions.masking.ColumnMask; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/CreateTriggerStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/CreateTriggerStatement.java index ccbd4852eb..fcf23af3e0 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/CreateTriggerStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/CreateTriggerStatement.java @@ -25,15 +25,18 @@ import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QualifiedName; import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.TriggerMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.Version; -import org.apache.cassandra.triggers.TriggerExecutor; import org.apache.cassandra.transport.Event.SchemaChange; import org.apache.cassandra.transport.Event.SchemaChange.Change; import org.apache.cassandra.transport.Event.SchemaChange.Target; +import org.apache.cassandra.triggers.TriggerExecutor; public final class CreateTriggerStatement extends AlterSchemaStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/CreateTypeStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/CreateTypeStatement.java index 375e7e832e..38d28443b6 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/CreateTypeStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/CreateTypeStatement.java @@ -17,7 +17,10 @@ */ package org.apache.cassandra.cql3.statements.schema; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; @@ -40,9 +43,8 @@ import org.apache.cassandra.transport.Event.SchemaChange; import org.apache.cassandra.transport.Event.SchemaChange.Change; import org.apache.cassandra.transport.Event.SchemaChange.Target; -import static org.apache.cassandra.utils.ByteBufferUtil.bytes; - import static java.util.stream.Collectors.toList; +import static org.apache.cassandra.utils.ByteBufferUtil.bytes; public final class CreateTypeStatement extends AlterSchemaStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/DropAggregateStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/DropAggregateStatement.java index 16beede039..6bc3964f33 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/DropAggregateStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/DropAggregateStatement.java @@ -32,20 +32,23 @@ import org.apache.cassandra.cql3.functions.FunctionName; import org.apache.cassandra.cql3.functions.UDAggregate; import org.apache.cassandra.cql3.functions.UserFunction; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.Types; +import org.apache.cassandra.schema.UserFunctions; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.transport.Event.SchemaChange; import org.apache.cassandra.transport.Event.SchemaChange.Change; +import static com.google.common.collect.Iterables.transform; import static java.lang.String.format; import static java.lang.String.join; import static java.util.stream.Collectors.toList; -import static com.google.common.collect.Iterables.transform; - public final class DropAggregateStatement extends AlterSchemaStatement { private final String aggregateName; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/DropFunctionStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/DropFunctionStatement.java index c157e42107..6c1dfeea7c 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/DropFunctionStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/DropFunctionStatement.java @@ -32,21 +32,24 @@ import org.apache.cassandra.cql3.functions.FunctionName; import org.apache.cassandra.cql3.functions.UDFunction; import org.apache.cassandra.cql3.functions.UserFunction; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.Types; +import org.apache.cassandra.schema.UserFunctions; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.transport.Event.SchemaChange; import org.apache.cassandra.transport.Event.SchemaChange.Change; +import static com.google.common.collect.Iterables.transform; import static java.lang.String.format; import static java.lang.String.join; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; -import static com.google.common.collect.Iterables.transform; - public final class DropFunctionStatement extends AlterSchemaStatement { private final String functionName; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/DropIndexStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/DropIndexStatement.java index 0fde7c8fc9..588171d788 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/DropIndexStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/DropIndexStatement.java @@ -22,9 +22,13 @@ import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.auth.Permission; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QualifiedName; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.Diff; +import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceMetadata.KeyspaceDiff; +import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.Version; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/DropTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/DropTableStatement.java index 79b416ad26..3ea85f2e29 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/DropTableStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/DropTableStatement.java @@ -23,8 +23,11 @@ import org.apache.cassandra.auth.Permission; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QualifiedName; import org.apache.cassandra.db.guardrails.Guardrails; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.ViewMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.ClusterMetadataService; @@ -36,10 +39,9 @@ import org.apache.cassandra.transport.Event.SchemaChange; import org.apache.cassandra.transport.Event.SchemaChange.Change; import org.apache.cassandra.transport.Event.SchemaChange.Target; -import static java.lang.String.join; - import static com.google.common.collect.Iterables.isEmpty; import static com.google.common.collect.Iterables.transform; +import static java.lang.String.join; public final class DropTableStatement extends AlterSchemaStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/DropTriggerStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/DropTriggerStatement.java index 77d003b9e5..a97b608ac2 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/DropTriggerStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/DropTriggerStatement.java @@ -21,8 +21,11 @@ import org.apache.cassandra.audit.AuditLogContext; import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QualifiedName; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.TriggerMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.Version; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/DropTypeStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/DropTypeStatement.java index ba904e4370..e9f1cc2a5b 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/DropTypeStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/DropTypeStatement.java @@ -27,21 +27,19 @@ import org.apache.cassandra.cql3.UTName; import org.apache.cassandra.cql3.functions.UserFunction; import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.schema.KeyspaceMetadata; -import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; import org.apache.cassandra.schema.Keyspaces; +import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.Version; +import org.apache.cassandra.transport.Event.SchemaChange; import org.apache.cassandra.transport.Event.SchemaChange.Change; import org.apache.cassandra.transport.Event.SchemaChange.Target; -import org.apache.cassandra.transport.Event.SchemaChange; - -import static java.lang.String.join; import static com.google.common.collect.Iterables.isEmpty; import static com.google.common.collect.Iterables.transform; - +import static java.lang.String.join; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; public final class DropTypeStatement extends AlterSchemaStatement diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/DropViewStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/DropViewStatement.java index 0c07dc7907..a96506ec94 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/DropViewStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/DropViewStatement.java @@ -22,8 +22,11 @@ import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.auth.Permission; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QualifiedName; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.ViewMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.Version; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/IndexAttributes.java b/src/java/org/apache/cassandra/cql3/statements/schema/IndexAttributes.java index f30c502ca8..9dc57ab4e9 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/IndexAttributes.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/IndexAttributes.java @@ -17,7 +17,11 @@ */ package org.apache.cassandra.cql3.statements.schema; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import org.apache.cassandra.cql3.statements.PropertyDefinitions; import org.apache.cassandra.exceptions.InvalidRequestException; diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/KeyspaceAttributes.java b/src/java/org/apache/cassandra/cql3/statements/schema/KeyspaceAttributes.java index 6e77535311..d4ca44cdcf 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/KeyspaceAttributes.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/KeyspaceAttributes.java @@ -17,7 +17,9 @@ */ package org.apache.cassandra.cql3.statements.schema; -import java.util.*; +import java.util.Collections; +import java.util.Map; +import java.util.Set; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; diff --git a/src/java/org/apache/cassandra/cql3/terms/Lists.java b/src/java/org/apache/cassandra/cql3/terms/Lists.java index d0b0a6eb80..b0f319e6f2 100644 --- a/src/java/org/apache/cassandra/cql3/terms/Lists.java +++ b/src/java/org/apache/cassandra/cql3/terms/Lists.java @@ -28,6 +28,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/cql3/terms/Sets.java b/src/java/org/apache/cassandra/cql3/terms/Sets.java index 1686f90769..885bf28cdf 100644 --- a/src/java/org/apache/cassandra/cql3/terms/Sets.java +++ b/src/java/org/apache/cassandra/cql3/terms/Sets.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.cql3.terms; -import static org.apache.cassandra.cql3.terms.Constants.UNSET_VALUE; - import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collections; @@ -47,6 +45,8 @@ import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.utils.ByteBufferUtil; +import static org.apache.cassandra.cql3.terms.Constants.UNSET_VALUE; + /** * Static helper methods and classes for sets. */ diff --git a/src/java/org/apache/cassandra/cql3/terms/Terms.java b/src/java/org/apache/cassandra/cql3/terms/Terms.java index 4a4e6b8442..3f411f901f 100644 --- a/src/java/org/apache/cassandra/cql3/terms/Terms.java +++ b/src/java/org/apache/cassandra/cql3/terms/Terms.java @@ -18,18 +18,22 @@ package org.apache.cassandra.cql3.terms; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; + import org.apache.cassandra.cql3.AssignmentTestable; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.VariableSpecifications; +import org.apache.cassandra.cql3.functions.Function; import org.apache.cassandra.cql3.terms.Term.NonTerminal; import org.apache.cassandra.cql3.terms.Term.Terminal; -import org.apache.cassandra.cql3.functions.Function; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.exceptions.InvalidRequestException; /** diff --git a/src/java/org/apache/cassandra/cql3/terms/UserTypes.java b/src/java/org/apache/cassandra/cql3/terms/UserTypes.java index 85b33efba2..d43a000736 100644 --- a/src/java/org/apache/cassandra/cql3/terms/UserTypes.java +++ b/src/java/org/apache/cassandra/cql3/terms/UserTypes.java @@ -18,7 +18,10 @@ package org.apache.cassandra.cql3.terms; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import org.apache.cassandra.cql3.AssignmentTestable; @@ -28,11 +31,12 @@ import org.apache.cassandra.cql3.FieldIdentifier; import org.apache.cassandra.cql3.Operation; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.UpdateParameters; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.db.rows.CellPath; import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.schema.ColumnMetadata; import static org.apache.cassandra.cql3.terms.Constants.UNSET_VALUE; diff --git a/src/java/org/apache/cassandra/cql3/transactions/ConditionStatement.java b/src/java/org/apache/cassandra/cql3/transactions/ConditionStatement.java index 2acf247724..46747a168e 100644 --- a/src/java/org/apache/cassandra/cql3/transactions/ConditionStatement.java +++ b/src/java/org/apache/cassandra/cql3/transactions/ConditionStatement.java @@ -22,8 +22,8 @@ import com.google.common.base.Preconditions; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.VariableSpecifications; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.service.accord.txn.TxnCondition; import org.apache.cassandra.service.accord.txn.TxnReference; diff --git a/src/java/org/apache/cassandra/cql3/transactions/ReferenceValue.java b/src/java/org/apache/cassandra/cql3/transactions/ReferenceValue.java index 0cd09e783b..3f81b785d4 100644 --- a/src/java/org/apache/cassandra/cql3/transactions/ReferenceValue.java +++ b/src/java/org/apache/cassandra/cql3/transactions/ReferenceValue.java @@ -20,8 +20,8 @@ package org.apache.cassandra.cql3.transactions; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.VariableSpecifications; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.schema.ColumnMetadata; diff --git a/src/java/org/apache/cassandra/db/AbstractReadCommandBuilder.java b/src/java/org/apache/cassandra/db/AbstractReadCommandBuilder.java index 30d1eda450..b83eccaab2 100644 --- a/src/java/org/apache/cassandra/db/AbstractReadCommandBuilder.java +++ b/src/java/org/apache/cassandra/db/AbstractReadCommandBuilder.java @@ -19,18 +19,29 @@ package org.apache.cassandra.db; import java.nio.ByteBuffer; -import java.util.*; +import java.util.NavigableSet; +import java.util.Set; +import java.util.TreeSet; import com.google.common.collect.Sets; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.Operator; -import org.apache.cassandra.db.filter.*; +import org.apache.cassandra.db.filter.ClusteringIndexFilter; +import org.apache.cassandra.db.filter.ClusteringIndexNamesFilter; +import org.apache.cassandra.db.filter.ClusteringIndexSliceFilter; +import org.apache.cassandra.db.filter.ColumnFilter; +import org.apache.cassandra.db.filter.DataLimits; +import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.CollectionType; -import org.apache.cassandra.dht.*; +import org.apache.cassandra.dht.AbstractBounds; +import org.apache.cassandra.dht.Bounds; +import org.apache.cassandra.dht.ExcludingBounds; +import org.apache.cassandra.dht.IncludingExcludingBounds; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.FBUtilities; public abstract class AbstractReadCommandBuilder diff --git a/src/java/org/apache/cassandra/db/Clustering.java b/src/java/org/apache/cassandra/db/Clustering.java index 8972161d20..9609aaab1f 100644 --- a/src/java/org/apache/cassandra/db/Clustering.java +++ b/src/java/org/apache/cassandra/db/Clustering.java @@ -23,14 +23,14 @@ import java.nio.ByteBuffer; import java.util.List; import org.apache.cassandra.cache.IMeasurableMemory; -import org.apache.cassandra.db.marshal.ByteArrayAccessor; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.ByteArrayAccessor; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.memory.ByteBufferCloner; import static org.apache.cassandra.db.AbstractBufferClusteringPrefix.EMPTY_VALUES_ARRAY; diff --git a/src/java/org/apache/cassandra/db/ClusteringBoundOrBoundary.java b/src/java/org/apache/cassandra/db/ClusteringBoundOrBoundary.java index 14a9158681..e419bfbf36 100644 --- a/src/java/org/apache/cassandra/db/ClusteringBoundOrBoundary.java +++ b/src/java/org/apache/cassandra/db/ClusteringBoundOrBoundary.java @@ -24,12 +24,12 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ByteArrayAccessor; import org.apache.cassandra.db.marshal.ByteBufferAccessor; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.memory.ByteBufferCloner; /** diff --git a/src/java/org/apache/cassandra/db/ClusteringComparator.java b/src/java/org/apache/cassandra/db/ClusteringComparator.java index 82be2a12e4..a8afb11ac6 100644 --- a/src/java/org/apache/cassandra/db/ClusteringComparator.java +++ b/src/java/org/apache/cassandra/db/ClusteringComparator.java @@ -26,11 +26,11 @@ import java.util.Objects; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; -import org.apache.cassandra.io.sstable.ClusteringDescriptor; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.io.sstable.ClusteringDescriptor; import org.apache.cassandra.io.sstable.IndexInfo; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/db/ClusteringPrefix.java b/src/java/org/apache/cassandra/db/ClusteringPrefix.java index e6e3c76c43..a200807045 100644 --- a/src/java/org/apache/cassandra/db/ClusteringPrefix.java +++ b/src/java/org/apache/cassandra/db/ClusteringPrefix.java @@ -19,18 +19,20 @@ package org.apache.cassandra.db; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.List; +import java.util.Objects; import java.util.function.ToIntFunction; import org.apache.cassandra.cache.IMeasurableMemory; -import org.apache.cassandra.config.*; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.constraints.ColumnConstraints; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ByteArrayAccessor; import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.db.marshal.ValueAccessor; -import org.apache.cassandra.db.rows.*; -import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredSerializer; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 089e5bf230..d93cf1b2c7 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -45,6 +45,7 @@ import java.util.function.Consumer; import java.util.function.Supplier; import java.util.regex.Pattern; import java.util.stream.Collectors; + import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import javax.management.openmbean.CompositeData; @@ -65,6 +66,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/Columns.java b/src/java/org/apache/cassandra/db/Columns.java index f5b5641852..f978b40717 100644 --- a/src/java/org/apache/cassandra/db/Columns.java +++ b/src/java/org/apache/cassandra/db/Columns.java @@ -19,7 +19,11 @@ package org.apache.cassandra.db; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.AbstractCollection; +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; +import java.util.Objects; import java.util.function.Consumer; import java.util.function.Predicate; @@ -27,6 +31,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; import net.nicoulaj.compilecommand.annotations.DontInline; + import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.constraints.ColumnConstraints; import org.apache.cassandra.db.marshal.SetType; diff --git a/src/java/org/apache/cassandra/db/ConsistencyLevel.java b/src/java/org/apache/cassandra/db/ConsistencyLevel.java index aa83742ac8..2a8c30d4c9 100644 --- a/src/java/org/apache/cassandra/db/ConsistencyLevel.java +++ b/src/java/org/apache/cassandra/db/ConsistencyLevel.java @@ -18,6 +18,7 @@ package org.apache.cassandra.db; import com.carrotsearch.hppc.ObjectIntHashMap; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.locator.AbstractReplicationStrategy; diff --git a/src/java/org/apache/cassandra/db/CounterMutation.java b/src/java/org/apache/cassandra/db/CounterMutation.java index c5ed2364be..6e94b038cc 100644 --- a/src/java/org/apache/cassandra/db/CounterMutation.java +++ b/src/java/org/apache/cassandra/db/CounterMutation.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.function.Predicate; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.base.Function; diff --git a/src/java/org/apache/cassandra/db/DataRange.java b/src/java/org/apache/cassandra/db/DataRange.java index 17728f2c37..2b9bd0acd8 100644 --- a/src/java/org/apache/cassandra/db/DataRange.java +++ b/src/java/org/apache/cassandra/db/DataRange.java @@ -20,14 +20,20 @@ import java.io.IOException; import java.nio.ByteBuffer; import org.apache.cassandra.cql3.CqlBuilder; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.filter.*; +import org.apache.cassandra.db.filter.ClusteringIndexFilter; +import org.apache.cassandra.db.filter.ClusteringIndexNamesFilter; +import org.apache.cassandra.db.filter.ClusteringIndexSliceFilter; +import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.CompositeType; -import org.apache.cassandra.dht.*; +import org.apache.cassandra.dht.AbstractBounds; +import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.bytecomparable.ByteComparable; /** diff --git a/src/java/org/apache/cassandra/db/Directories.java b/src/java/org/apache/cassandra/db/Directories.java index 87698df4b8..236b7186b2 100644 --- a/src/java/org/apache/cassandra/db/Directories.java +++ b/src/java/org/apache/cassandra/db/Directories.java @@ -48,6 +48,7 @@ import java.util.stream.StreamSupport; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/DisallowedDirectories.java b/src/java/org/apache/cassandra/db/DisallowedDirectories.java index e666bad785..42e1dbba0b 100644 --- a/src/java/org/apache/cassandra/db/DisallowedDirectories.java +++ b/src/java/org/apache/cassandra/db/DisallowedDirectories.java @@ -17,9 +17,6 @@ */ package org.apache.cassandra.db; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.atomic.AtomicInteger; @@ -27,6 +24,9 @@ import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.io.util.File; import org.apache.cassandra.utils.MBeanWrapper; diff --git a/src/java/org/apache/cassandra/db/DisallowedDirectoriesMBean.java b/src/java/org/apache/cassandra/db/DisallowedDirectoriesMBean.java index e75bebecf3..d7595af960 100644 --- a/src/java/org/apache/cassandra/db/DisallowedDirectoriesMBean.java +++ b/src/java/org/apache/cassandra/db/DisallowedDirectoriesMBean.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.db; -import java.io.File; //checkstyle: permit this import +import java.io.File; // checkstyle: permit this import import java.util.Set; public interface DisallowedDirectoriesMBean diff --git a/src/java/org/apache/cassandra/db/DiskBoundaryManager.java b/src/java/org/apache/cassandra/db/DiskBoundaryManager.java index 4aad348e4a..1b35423fe9 100644 --- a/src/java/org/apache/cassandra/db/DiskBoundaryManager.java +++ b/src/java/org/apache/cassandra/db/DiskBoundaryManager.java @@ -31,11 +31,11 @@ import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Splitter; import org.apache.cassandra.dht.Token; import org.apache.cassandra.locator.RangesAtEndpoint; -import org.apache.cassandra.tcm.ClusterMetadataService; -import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tcm.ClusterMetadata; +import org.apache.cassandra.tcm.ClusterMetadataService; +import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.ownership.DataPlacement; import org.apache.cassandra.utils.FBUtilities; diff --git a/src/java/org/apache/cassandra/db/EmptyIterators.java b/src/java/org/apache/cassandra/db/EmptyIterators.java index cd4979368f..c78544f120 100644 --- a/src/java/org/apache/cassandra/db/EmptyIterators.java +++ b/src/java/org/apache/cassandra/db/EmptyIterators.java @@ -20,11 +20,17 @@ package org.apache.cassandra.db; import java.util.NoSuchElementException; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.partitions.BasePartitionIterator; import org.apache.cassandra.db.partitions.PartitionIterator; import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.BaseRowIterator; +import org.apache.cassandra.db.rows.EncodingStats; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.RowIterator; +import org.apache.cassandra.db.rows.Rows; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.schema.TableMetadata; public class EmptyIterators { diff --git a/src/java/org/apache/cassandra/db/ExpirationDateOverflowHandling.java b/src/java/org/apache/cassandra/db/ExpirationDateOverflowHandling.java index 35c24805bc..47ffedffa8 100644 --- a/src/java/org/apache/cassandra/db/ExpirationDateOverflowHandling.java +++ b/src/java/org/apache/cassandra/db/ExpirationDateOverflowHandling.java @@ -21,6 +21,7 @@ package org.apache.cassandra.db; import java.util.concurrent.TimeUnit; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.helpers.MessageFormatter; diff --git a/src/java/org/apache/cassandra/db/IMutation.java b/src/java/org/apache/cassandra/db/IMutation.java index 282db28916..f497a2aea5 100644 --- a/src/java/org/apache/cassandra/db/IMutation.java +++ b/src/java/org/apache/cassandra/db/IMutation.java @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.function.Supplier; + import javax.annotation.Nullable; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/src/java/org/apache/cassandra/db/Keyspace.java b/src/java/org/apache/cassandra/db/Keyspace.java index 02b554fd7e..e0cdf8b5c2 100644 --- a/src/java/org/apache/cassandra/db/Keyspace.java +++ b/src/java/org/apache/cassandra/db/Keyspace.java @@ -34,6 +34,7 @@ import java.util.stream.Stream; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterables; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/MessageParams.java b/src/java/org/apache/cassandra/db/MessageParams.java index 137d3a6ec5..689e3673ab 100644 --- a/src/java/org/apache/cassandra/db/MessageParams.java +++ b/src/java/org/apache/cassandra/db/MessageParams.java @@ -21,10 +21,11 @@ package org.apache.cassandra.db; import java.util.EnumMap; import java.util.Map; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.ParamType; +import io.netty.util.concurrent.FastThreadLocal; + public class MessageParams { private static final FastThreadLocal> local = new FastThreadLocal<>(); diff --git a/src/java/org/apache/cassandra/db/Mutation.java b/src/java/org/apache/cassandra/db/Mutation.java index 441163c8bd..83036bee1d 100644 --- a/src/java/org/apache/cassandra/db/Mutation.java +++ b/src/java/org/apache/cassandra/db/Mutation.java @@ -29,11 +29,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLongFieldUpdater; import java.util.function.Predicate; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableMap; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.concurrent.Stage; diff --git a/src/java/org/apache/cassandra/db/NativeDecoratedKey.java b/src/java/org/apache/cassandra/db/NativeDecoratedKey.java index 76b2367ae2..b886764661 100644 --- a/src/java/org/apache/cassandra/db/NativeDecoratedKey.java +++ b/src/java/org/apache/cassandra/db/NativeDecoratedKey.java @@ -21,6 +21,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import net.nicoulaj.compilecommand.annotations.Inline; + import org.apache.cassandra.dht.Token; import org.apache.cassandra.utils.bytecomparable.ByteSource; import org.apache.cassandra.utils.concurrent.OpOrder; diff --git a/src/java/org/apache/cassandra/db/PartitionPosition.java b/src/java/org/apache/cassandra/db/PartitionPosition.java index fd7a1e948f..182a143129 100644 --- a/src/java/org/apache/cassandra/db/PartitionPosition.java +++ b/src/java/org/apache/cassandra/db/PartitionPosition.java @@ -20,7 +20,10 @@ package org.apache.cassandra.db; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.cassandra.dht.*; +import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.dht.IPartitionerDependentSerializer; +import org.apache.cassandra.dht.RingPosition; +import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java index beab17728c..91233572b5 100644 --- a/src/java/org/apache/cassandra/db/ReadCommand.java +++ b/src/java/org/apache/cassandra/db/ReadCommand.java @@ -28,18 +28,20 @@ import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.LongPredicate; import java.util.stream.Collectors; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.primitives.Seekable; import accord.utils.Invariants; -import io.netty.util.concurrent.FastThreadLocal; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DataStorageSpec; @@ -73,20 +75,20 @@ import org.apache.cassandra.exceptions.CoordinatorBehindException; import org.apache.cassandra.exceptions.QueryCancelledException; import org.apache.cassandra.exceptions.UnknownIndexException; import org.apache.cassandra.exceptions.UnknownTableException; -import org.apache.cassandra.index.IndexRegistry; -import org.apache.cassandra.metrics.TCMMetrics; -import org.apache.cassandra.net.MessageFlag; -import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.net.ParamType; -import org.apache.cassandra.net.Verb; import org.apache.cassandra.index.Index; +import org.apache.cassandra.index.IndexRegistry; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.locator.Replica; +import org.apache.cassandra.metrics.TCMMetrics; import org.apache.cassandra.metrics.TableMetrics; import org.apache.cassandra.net.Message; +import org.apache.cassandra.net.MessageFlag; +import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.net.ParamType; +import org.apache.cassandra.net.Verb; import org.apache.cassandra.schema.IndexMetadata; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaConstants; @@ -107,6 +109,8 @@ import org.apache.cassandra.utils.NoSpamLogger; import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.TimeUUID; +import io.netty.util.concurrent.FastThreadLocal; + import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Iterables.any; import static com.google.common.collect.Iterables.filter; diff --git a/src/java/org/apache/cassandra/db/ReadQuery.java b/src/java/org/apache/cassandra/db/ReadQuery.java index 0f189984a0..69bfc216ea 100644 --- a/src/java/org/apache/cassandra/db/ReadQuery.java +++ b/src/java/org/apache/cassandra/db/ReadQuery.java @@ -23,13 +23,14 @@ import org.apache.cassandra.cql3.statements.SelectOptions; import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.filter.DataLimits; import org.apache.cassandra.db.filter.RowFilter; -import org.apache.cassandra.db.partitions.*; +import org.apache.cassandra.db.partitions.PartitionIterator; +import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.index.Index; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ClientState; -import org.apache.cassandra.service.pager.QueryPager; import org.apache.cassandra.service.pager.PagingState; +import org.apache.cassandra.service.pager.QueryPager; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.FBUtilities; diff --git a/src/java/org/apache/cassandra/db/RegularAndStaticColumns.java b/src/java/org/apache/cassandra/db/RegularAndStaticColumns.java index 2032fe6fe9..b5bc0ab77b 100644 --- a/src/java/org/apache/cassandra/db/RegularAndStaticColumns.java +++ b/src/java/org/apache/cassandra/db/RegularAndStaticColumns.java @@ -17,7 +17,8 @@ */ package org.apache.cassandra.db; -import java.util.*; +import java.util.Iterator; +import java.util.Objects; import java.util.stream.Stream; import java.util.stream.StreamSupport; diff --git a/src/java/org/apache/cassandra/db/RepairedDataInfo.java b/src/java/org/apache/cassandra/db/RepairedDataInfo.java index 1f03654d25..dab0f14a23 100644 --- a/src/java/org/apache/cassandra/db/RepairedDataInfo.java +++ b/src/java/org/apache/cassandra/db/RepairedDataInfo.java @@ -19,8 +19,8 @@ package org.apache.cassandra.db; import java.nio.ByteBuffer; -import java.util.function.LongPredicate; import java.util.concurrent.TimeUnit; +import java.util.function.LongPredicate; import javax.annotation.concurrent.NotThreadSafe; diff --git a/src/java/org/apache/cassandra/db/SSTableImporter.java b/src/java/org/apache/cassandra/db/SSTableImporter.java index 09f4fb522e..c6361d6c72 100644 --- a/src/java/org/apache/cassandra/db/SSTableImporter.java +++ b/src/java/org/apache/cassandra/db/SSTableImporter.java @@ -28,6 +28,7 @@ import java.util.Set; import java.util.UUID; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/SchemaCQLHelper.java b/src/java/org/apache/cassandra/db/SchemaCQLHelper.java index 5e5f53c314..bac6c5319a 100644 --- a/src/java/org/apache/cassandra/db/SchemaCQLHelper.java +++ b/src/java/org/apache/cassandra/db/SchemaCQLHelper.java @@ -29,7 +29,10 @@ import com.google.common.annotations.VisibleForTesting; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.marshal.UserType; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.Types; +import org.apache.cassandra.schema.ViewMetadata; /** * Helper methods to represent TableMetadata and related objects in CQL format diff --git a/src/java/org/apache/cassandra/db/SerializationHeader.java b/src/java/org/apache/cassandra/db/SerializationHeader.java index 61d87c847c..b587470e26 100644 --- a/src/java/org/apache/cassandra/db/SerializationHeader.java +++ b/src/java/org/apache/cassandra/db/SerializationHeader.java @@ -19,11 +19,18 @@ package org.apache.cassandra.db; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import com.google.common.collect.ImmutableList; import accord.utils.Invariants; + import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.UTF8Type; diff --git a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java index f8a9c41010..e6c7d1ae62 100644 --- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java +++ b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java @@ -34,6 +34,7 @@ import com.google.common.collect.Sets; import accord.primitives.Seekable; import accord.primitives.Seekables; + import org.apache.cassandra.cache.IRowCacheEntry; import org.apache.cassandra.cache.RowCacheKey; import org.apache.cassandra.cache.RowCacheSentinel; @@ -86,8 +87,8 @@ import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.btree.BTreeSet; import org.apache.cassandra.utils.NoSpamLogger; +import org.apache.cassandra.utils.btree.BTreeSet; /** * A read command that selects a (part of a) single partition. diff --git a/src/java/org/apache/cassandra/db/SinglePartitionReadQuery.java b/src/java/org/apache/cassandra/db/SinglePartitionReadQuery.java index d28925e56a..8c497b4535 100644 --- a/src/java/org/apache/cassandra/db/SinglePartitionReadQuery.java +++ b/src/java/org/apache/cassandra/db/SinglePartitionReadQuery.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.stream.Collectors; import com.google.common.collect.Iterables; + import org.apache.commons.lang3.tuple.Pair; import org.apache.cassandra.cql3.statements.SelectOptions; diff --git a/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java b/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java index fe09073206..a633024a41 100644 --- a/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java +++ b/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java @@ -30,6 +30,7 @@ import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/Slices.java b/src/java/org/apache/cassandra/db/Slices.java index bae83d5980..2f2f6395dc 100644 --- a/src/java/org/apache/cassandra/db/Slices.java +++ b/src/java/org/apache/cassandra/db/Slices.java @@ -19,7 +19,14 @@ package org.apache.cassandra.db; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; import java.util.stream.Collectors; import com.google.common.base.Preconditions; @@ -27,11 +34,11 @@ import com.google.common.collect.Iterators; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.filter.RowFilter; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; /** * Represents the selection of multiple range of rows within a partition. diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java index a15b46665f..d4e4912264 100644 --- a/src/java/org/apache/cassandra/db/SystemKeyspace.java +++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java @@ -38,6 +38,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.StreamSupport; + import javax.management.openmbean.OpenDataException; import javax.management.openmbean.TabularData; @@ -50,6 +51,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.SetMultimap; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -113,8 +115,8 @@ import org.apache.cassandra.service.paxos.PaxosRepairHistory; import org.apache.cassandra.service.paxos.PaxosState; import org.apache.cassandra.service.paxos.uncommitted.PaxosRows; import org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedIndex; -import org.apache.cassandra.service.snapshot.SnapshotOptions; import org.apache.cassandra.service.snapshot.SnapshotManager; +import org.apache.cassandra.service.snapshot.SnapshotOptions; import org.apache.cassandra.service.snapshot.SnapshotType; import org.apache.cassandra.streaming.StreamOperation; import org.apache.cassandra.tcm.ClusterMetadata; diff --git a/src/java/org/apache/cassandra/db/SystemKeyspaceMigrator41.java b/src/java/org/apache/cassandra/db/SystemKeyspaceMigrator41.java index ab9f01f945..7a66853c68 100644 --- a/src/java/org/apache/cassandra/db/SystemKeyspaceMigrator41.java +++ b/src/java/org/apache/cassandra/db/SystemKeyspaceMigrator41.java @@ -25,6 +25,7 @@ import java.util.function.Function; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java index 856b27c0a3..968bc893a1 100644 --- a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java +++ b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java @@ -19,9 +19,13 @@ package org.apache.cassandra.db; import java.io.IOException; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.BTreeRow; +import org.apache.cassandra.db.rows.DeserializationHelper; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredSerializer; import org.apache.cassandra.io.util.DataInputPlus; +import org.apache.cassandra.schema.TableMetadata; /** * Helper class to deserialize Unfiltered object from disk efficiently. diff --git a/src/java/org/apache/cassandra/db/UnfilteredValidation.java b/src/java/org/apache/cassandra/db/UnfilteredValidation.java index 6d8bbfdaed..554d369810 100644 --- a/src/java/org/apache/cassandra/db/UnfilteredValidation.java +++ b/src/java/org/apache/cassandra/db/UnfilteredValidation.java @@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.rows.Unfiltered; - import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.schema.TableMetadata; diff --git a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java index 3348968881..0389954aa1 100644 --- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java +++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java @@ -29,12 +29,14 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.function.BooleanSupplier; +import com.codahale.metrics.Timer.Context; import com.google.common.annotations.VisibleForTesting; + +import net.nicoulaj.compilecommand.annotations.DontInline; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Timer.Context; -import net.nicoulaj.compilecommand.annotations.DontInline; import org.apache.cassandra.concurrent.Interruptible; import org.apache.cassandra.concurrent.Interruptible.TerminateException; import org.apache.cassandra.config.Config.DiskAccessMode; diff --git a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java index 7bba9c4911..1831ec866e 100644 --- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java +++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.commitlog; import java.util.concurrent.atomic.AtomicLong; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +37,6 @@ import static com.codahale.metrics.Timer.Context; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.NANOSECONDS; - import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; import static org.apache.cassandra.concurrent.ExecutorFactory.SystemThreadTag.NON_DAEMON; import static org.apache.cassandra.concurrent.InfiniteLoopExecutor.Interrupts.SYNCHRONIZED; diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java index 76cf38a804..b47bf7804b 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java @@ -36,6 +36,7 @@ import java.util.zip.CRC32; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java index ce084b9b7c..d49610d139 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java @@ -39,6 +39,7 @@ import java.util.regex.Pattern; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java index 934c0373b7..5d2cb1b31a 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java @@ -17,15 +17,21 @@ */ package org.apache.cassandra.db.commitlog; +import java.io.DataOutputStream; +import java.io.EOFException; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.io.*; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.zip.CRC32; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.io.util.File; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,9 +42,10 @@ import org.apache.cassandra.db.commitlog.CommitLogReadHandler.CommitLogReadError import org.apache.cassandra.db.commitlog.CommitLogReadHandler.CommitLogReadException; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.db.rows.DeserializationHelper; -import org.apache.cassandra.exceptions.UnknownTableException; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.exceptions.UnknownTableException; import org.apache.cassandra.io.util.DataInputBuffer; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.io.util.RebufferingInputStream; diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java index 8e26425ed5..427510258c 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java @@ -38,10 +38,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; import com.google.common.collect.Ordering; -import org.apache.cassandra.io.util.File; import org.apache.commons.lang3.StringUtils; - -import org.apache.cassandra.utils.concurrent.Future; import org.cliffc.high_scale_lib.NonBlockingHashSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,6 +51,7 @@ import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.schema.Schema; @@ -62,6 +60,7 @@ import org.apache.cassandra.schema.TableId; import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.WrappedRunnable; +import org.apache.cassandra.utils.concurrent.Future; import static java.lang.String.format; import static org.apache.cassandra.config.CassandraRelevantProperties.COMMITLOG_IGNORE_REPLAY_ERRORS; diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java index d3c8e40de3..ea9306c62c 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java @@ -34,11 +34,13 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.LockSupport; import java.util.zip.CRC32; +import com.codahale.metrics.Timer; import com.google.common.annotations.VisibleForTesting; + +import net.openhft.chronicle.core.util.ThrowingFunction; + import org.cliffc.high_scale_lib.NonBlockingHashMap; -import com.codahale.metrics.Timer; -import net.openhft.chronicle.core.util.ThrowingFunction; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.partitions.PartitionUpdate; diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDC.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDC.java index 7dfe7add8f..6847502dd3 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDC.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDC.java @@ -22,7 +22,10 @@ import java.io.IOException; import java.nio.file.Files; import java.util.Arrays; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; @@ -31,7 +34,6 @@ import com.google.common.base.Preconditions; import com.google.common.util.concurrent.RateLimiter; import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.cassandra.io.util.File; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,6 +41,7 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.commitlog.CommitLogSegment.CDCState; import org.apache.cassandra.exceptions.CDCWriteException; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.DirectorySizeCalculator; import org.apache.cassandra.utils.NoSpamLogger; diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentReader.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentReader.java index f58f5bab5f..8adf41f4cf 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentReader.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentReader.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.Iterator; import java.util.zip.CRC32; + import javax.crypto.Cipher; import com.google.common.annotations.VisibleForTesting; @@ -29,16 +30,17 @@ import com.google.common.collect.AbstractIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.db.commitlog.CommitLogReadHandler.CommitLogReadErrorReason; +import org.apache.cassandra.db.commitlog.CommitLogReadHandler.CommitLogReadException; import org.apache.cassandra.db.commitlog.EncryptedFileSegmentInputStream.ChunkProvider; -import org.apache.cassandra.db.commitlog.CommitLogReadHandler.*; import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.compress.ICompressor; import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.io.util.FileSegmentInputStream; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.schema.CompressionParams; -import org.apache.cassandra.security.EncryptionUtils; import org.apache.cassandra.security.EncryptionContext; +import org.apache.cassandra.security.EncryptionUtils; import org.apache.cassandra.utils.ByteBufferUtil; import static org.apache.cassandra.config.CassandraRelevantProperties.COMMITLOG_ALLOW_IGNORE_SYNC_CRC; diff --git a/src/java/org/apache/cassandra/db/commitlog/CompressedSegment.java b/src/java/org/apache/cassandra/db/commitlog/CompressedSegment.java index 3c7f360836..3f1377e4f6 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CompressedSegment.java +++ b/src/java/org/apache/cassandra/db/commitlog/CompressedSegment.java @@ -24,6 +24,7 @@ import java.nio.file.Path; import java.nio.file.StandardOpenOption; import net.openhft.chronicle.core.util.ThrowingFunction; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.compress.ICompressor; diff --git a/src/java/org/apache/cassandra/db/commitlog/DirectIOSegment.java b/src/java/org/apache/cassandra/db/commitlog/DirectIOSegment.java index fec799ce9d..b17847dbdf 100644 --- a/src/java/org/apache/cassandra/db/commitlog/DirectIOSegment.java +++ b/src/java/org/apache/cassandra/db/commitlog/DirectIOSegment.java @@ -24,9 +24,10 @@ import java.nio.file.Path; import java.nio.file.StandardOpenOption; import com.google.common.annotations.VisibleForTesting; - import com.sun.nio.file.ExtendedOpenOption; + import net.openhft.chronicle.core.util.ThrowingFunction; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.compress.BufferType; @@ -34,6 +35,7 @@ import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.SimpleCachedBufferPool; import org.apache.cassandra.utils.ByteBufferUtil; + import sun.nio.ch.DirectBuffer; /* diff --git a/src/java/org/apache/cassandra/db/commitlog/EncryptedSegment.java b/src/java/org/apache/cassandra/db/commitlog/EncryptedSegment.java index c7a8324efe..a5be4a4cef 100644 --- a/src/java/org/apache/cassandra/db/commitlog/EncryptedSegment.java +++ b/src/java/org/apache/cassandra/db/commitlog/EncryptedSegment.java @@ -23,12 +23,14 @@ import java.nio.channels.FileChannel; import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.util.Map; + import javax.crypto.Cipher; +import net.openhft.chronicle.core.util.ThrowingFunction; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.openhft.chronicle.core.util.ThrowingFunction; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.compress.BufferType; diff --git a/src/java/org/apache/cassandra/db/commitlog/FileDirectSegment.java b/src/java/org/apache/cassandra/db/commitlog/FileDirectSegment.java index 16e32ca448..6d1e78b401 100644 --- a/src/java/org/apache/cassandra/db/commitlog/FileDirectSegment.java +++ b/src/java/org/apache/cassandra/db/commitlog/FileDirectSegment.java @@ -23,6 +23,7 @@ import java.nio.channels.FileChannel; import java.nio.file.Path; import net.openhft.chronicle.core.util.ThrowingFunction; + import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.utils.SyncUtil; diff --git a/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java b/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java index 110873973e..fa6634837b 100644 --- a/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java +++ b/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java @@ -19,7 +19,11 @@ package org.apache.cassandra.db.commitlog; import java.io.IOException; -import java.util.*; +import java.util.Collection; +import java.util.Map; +import java.util.NavigableMap; +import java.util.Optional; +import java.util.TreeMap; import com.google.common.collect.ImmutableSortedMap; diff --git a/src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java b/src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java index 7cc7eea7f9..25a416e15a 100644 --- a/src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java +++ b/src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java @@ -25,6 +25,7 @@ import java.nio.file.Path; import java.nio.file.StandardOpenOption; import net.openhft.chronicle.core.util.ThrowingFunction; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.util.SimpleCachedBufferPool; diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionPipeline.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionPipeline.java index a01c154868..79b68fdefd 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionPipeline.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionPipeline.java @@ -18,6 +18,10 @@ package org.apache.cassandra.db.compaction; +import java.io.IOException; +import java.util.Collection; +import java.util.Set; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.AbstractCompactionController; import org.apache.cassandra.db.ColumnFamilyStore; @@ -26,10 +30,6 @@ import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.utils.TimeUUID; -import java.io.IOException; -import java.util.Collection; -import java.util.Set; - abstract class AbstractCompactionPipeline extends CompactionInfo.Holder implements AutoCloseable { static AbstractCompactionPipeline create( CompactionTask task, diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java index def444f9a9..f52d9f7b07 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java @@ -28,6 +28,7 @@ import java.util.Set; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java index d0b3dc498f..0dfd6da0ed 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java @@ -23,11 +23,11 @@ import java.util.Set; import com.google.common.base.Preconditions; import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; import org.apache.cassandra.io.FSDiskFullWriteError; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.WrappedRunnable; -import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; public abstract class AbstractCompactionTask extends WrappedRunnable { diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionController.java b/src/java/org/apache/cassandra/db/compaction/CompactionController.java index 1753d7e664..ef4497cc6e 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java @@ -31,6 +31,7 @@ import java.util.function.UnaryOperator; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.RateLimiter; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java b/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java index 182f34896a..9a445b035d 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java @@ -17,10 +17,18 @@ */ package org.apache.cassandra.db.compaction; -import javax.management.openmbean.*; import java.util.Map; import java.util.UUID; +import javax.management.openmbean.CompositeDataSupport; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.OpenDataException; +import javax.management.openmbean.OpenType; +import javax.management.openmbean.SimpleType; +import javax.management.openmbean.TabularData; +import javax.management.openmbean.TabularDataSupport; +import javax.management.openmbean.TabularType; + import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.LongType; diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java index be4ad3d921..7f97dc0663 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java @@ -28,14 +28,20 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.function.LongPredicate; import java.util.function.Supplier; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Ordering; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import accord.local.Cleanup; import accord.local.DurableBefore; import accord.local.RedundantBefore; import accord.utils.Invariants; import accord.utils.UnhandledEnum; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Ordering; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.AbstractCompactionController; @@ -105,9 +111,6 @@ import org.apache.cassandra.utils.NoSpamLogger.NoSpamLogStatement; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.btree.BTree; import org.apache.cassandra.utils.btree.UpdateFunction; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import static accord.local.Cleanup.ERASE; import static accord.local.Cleanup.Input.PARTIAL; diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionLogger.java b/src/java/org/apache/cassandra/db/compaction/CompactionLogger.java index dd4983ddda..aeb19e190d 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionLogger.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionLogger.java @@ -36,14 +36,15 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Function; -import com.google.common.collect.MapMaker; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; +import com.google.common.collect.MapMaker; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.io.sstable.format.SSTableReader; diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index e4d754fc48..0c0daa5f62 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -39,9 +39,11 @@ import java.util.function.BooleanSupplier; import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; + import javax.management.openmbean.OpenDataException; import javax.management.openmbean.TabularData; +import com.codahale.metrics.Meter; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.base.Predicates; @@ -57,11 +59,12 @@ import com.google.common.collect.Multiset; import com.google.common.collect.Sets; import com.google.common.util.concurrent.RateLimiter; import com.google.common.util.concurrent.Uninterruptibles; + +import net.openhft.chronicle.core.util.ThrowingSupplier; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Meter; -import net.openhft.chronicle.core.util.ThrowingSupplier; import org.apache.cassandra.cache.AutoSavingCache; import org.apache.cassandra.concurrent.ExecutorFactory; import org.apache.cassandra.concurrent.WrappedExecutorPlus; diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java b/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java index 07a7de99fa..8626a277a5 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.compaction; import java.util.List; import java.util.Map; + import javax.management.openmbean.TabularData; public interface CompactionManagerMBean diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java index c622582a07..04c386ea46 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java @@ -42,6 +42,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.primitives.Longs; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java index 74da90f24e..3e77b1c9df 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java @@ -32,11 +32,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.RateLimiter; -import org.apache.cassandra.db.compaction.unified.UnifiedCompactionTask; -import org.apache.cassandra.db.rows.Unfiltered; -import org.apache.cassandra.db.rows.UnfilteredRowIterator; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,10 +41,15 @@ import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.db.WriteContext; +import org.apache.cassandra.db.compaction.unified.UnifiedCompactionTask; import org.apache.cassandra.db.compaction.writers.CompactionAwareWriter; import org.apache.cassandra.db.compaction.writers.DefaultCompactionWriter; import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; import org.apache.cassandra.index.Index; import org.apache.cassandra.index.transactions.IndexTransaction; import org.apache.cassandra.io.sstable.ISSTableScanner; diff --git a/src/java/org/apache/cassandra/db/compaction/CursorCompactionPipeline.java b/src/java/org/apache/cassandra/db/compaction/CursorCompactionPipeline.java index 43a1040eb6..4cf173db19 100644 --- a/src/java/org/apache/cassandra/db/compaction/CursorCompactionPipeline.java +++ b/src/java/org/apache/cassandra/db/compaction/CursorCompactionPipeline.java @@ -18,6 +18,10 @@ package org.apache.cassandra.db.compaction; +import java.io.IOException; +import java.util.Collection; +import java.util.Set; + import org.apache.cassandra.db.AbstractCompactionController; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; @@ -26,10 +30,6 @@ import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.utils.TimeUUID; -import java.io.IOException; -import java.util.Collection; -import java.util.Set; - class CursorCompactionPipeline extends AbstractCompactionPipeline { final CursorCompactor cursorCompactor; final CompactionTask task; diff --git a/src/java/org/apache/cassandra/db/compaction/CursorCompactor.java b/src/java/org/apache/cassandra/db/compaction/CursorCompactor.java index fe67974f26..3b4819c156 100644 --- a/src/java/org/apache/cassandra/db/compaction/CursorCompactor.java +++ b/src/java/org/apache/cassandra/db/compaction/CursorCompactor.java @@ -28,24 +28,20 @@ import java.util.function.LongPredicate; import com.google.common.collect.ImmutableSet; import com.google.common.collect.UnmodifiableIterator; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.db.DeletionTime.ReusableDeletionTime; -import org.apache.cassandra.dht.ReusableDecoratedKey; -import org.apache.cassandra.io.sstable.UnfilteredDescriptor; -import org.apache.cassandra.io.sstable.PartitionDescriptor; -import org.apache.cassandra.db.ReusableLivenessInfo; -import org.apache.cassandra.io.sstable.SSTableCursorReader; -import org.apache.cassandra.io.sstable.SSTableCursorWriter; import org.apache.cassandra.db.AbstractCompactionController; import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.DeletionPurger; import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.DeletionTime.ReusableDeletionTime; import org.apache.cassandra.db.LivenessInfo; +import org.apache.cassandra.db.ReusableLivenessInfo; import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.db.compaction.writers.CompactionAwareWriter; @@ -57,7 +53,12 @@ import org.apache.cassandra.db.rows.RangeTombstoneMarker; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.rows.UnfilteredRowIterators; import org.apache.cassandra.db.rows.UnfilteredSerializer; +import org.apache.cassandra.dht.ReusableDecoratedKey; import org.apache.cassandra.io.sstable.ISSTableScanner; +import org.apache.cassandra.io.sstable.PartitionDescriptor; +import org.apache.cassandra.io.sstable.SSTableCursorReader; +import org.apache.cassandra.io.sstable.SSTableCursorWriter; +import org.apache.cassandra.io.sstable.UnfilteredDescriptor; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.io.sstable.format.SortedTableWriter; @@ -71,6 +72,12 @@ import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.TimeUUID; +import static org.apache.cassandra.db.ClusteringPrefix.Kind.EXCL_END_BOUND; +import static org.apache.cassandra.db.ClusteringPrefix.Kind.EXCL_END_INCL_START_BOUNDARY; +import static org.apache.cassandra.db.ClusteringPrefix.Kind.EXCL_START_BOUND; +import static org.apache.cassandra.db.ClusteringPrefix.Kind.INCL_END_BOUND; +import static org.apache.cassandra.db.ClusteringPrefix.Kind.INCL_END_EXCL_START_BOUNDARY; +import static org.apache.cassandra.db.ClusteringPrefix.Kind.INCL_START_BOUND; import static org.apache.cassandra.db.compaction.CursorCompactor.CellResolution.COMPARE; import static org.apache.cassandra.db.compaction.CursorCompactor.CellResolution.LEFT; import static org.apache.cassandra.db.compaction.CursorCompactor.CellResolution.RIGHT; @@ -78,19 +85,13 @@ import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.CELL_END import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.CELL_HEADER_START; import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.CELL_VALUE_START; import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.DONE; -import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.UNFILTERED_END; import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.PARTITION_END; import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.PARTITION_START; import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.ROW_START; import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.STATIC_ROW_START; import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.TOMBSTONE_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.UNFILTERED_END; import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.isState; -import static org.apache.cassandra.db.ClusteringPrefix.Kind.EXCL_END_BOUND; -import static org.apache.cassandra.db.ClusteringPrefix.Kind.EXCL_END_INCL_START_BOUNDARY; -import static org.apache.cassandra.db.ClusteringPrefix.Kind.EXCL_START_BOUND; -import static org.apache.cassandra.db.ClusteringPrefix.Kind.INCL_END_BOUND; -import static org.apache.cassandra.db.ClusteringPrefix.Kind.INCL_END_EXCL_START_BOUNDARY; -import static org.apache.cassandra.db.ClusteringPrefix.Kind.INCL_START_BOUND; /** * Compacts the contents of 1..n sstables into a 1..m sstables. The compaction is driven one output partition at a time diff --git a/src/java/org/apache/cassandra/db/compaction/IteratorCompactionPipeline.java b/src/java/org/apache/cassandra/db/compaction/IteratorCompactionPipeline.java index f049e9bab4..99bf714e19 100644 --- a/src/java/org/apache/cassandra/db/compaction/IteratorCompactionPipeline.java +++ b/src/java/org/apache/cassandra/db/compaction/IteratorCompactionPipeline.java @@ -18,6 +18,10 @@ package org.apache.cassandra.db.compaction; +import java.io.IOException; +import java.util.Collection; +import java.util.Set; + import org.apache.cassandra.db.AbstractCompactionController; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; @@ -26,10 +30,6 @@ import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.utils.TimeUUID; -import java.io.IOException; -import java.util.Collection; -import java.util.Set; - class IteratorCompactionPipeline extends AbstractCompactionPipeline { final CompactionIterator ci; final AbstractCompactionStrategy.ScannerList scanners; diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java index b424ec5e99..527a1e8c65 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java @@ -17,23 +17,33 @@ */ package org.apache.cassandra.db.compaction; -import java.util.*; import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; - +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.*; +import com.google.common.collect.AbstractIterator; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Multimap; import com.google.common.primitives.Doubles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.cassandra.io.sstable.metadata.StatsMetadata; -import org.apache.cassandra.schema.CompactionParams; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.db.rows.UnfilteredRowIterator; @@ -42,6 +52,9 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.ISSTableScanner; import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.sstable.metadata.StatsMetadata; +import org.apache.cassandra.schema.CompactionParams; +import org.apache.cassandra.schema.TableMetadata; import static org.apache.cassandra.config.CassandraRelevantProperties.TOLERATE_SSTABLE_SIZE; import static org.apache.cassandra.db.compaction.LeveledGenerations.MAX_LEVEL_COUNT; diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java index d5867410f1..7d29f61fbe 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java @@ -25,8 +25,8 @@ import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.compaction.writers.CompactionAwareWriter; import org.apache.cassandra.db.compaction.writers.MajorLeveledCompactionWriter; import org.apache.cassandra.db.compaction.writers.MaxSSTableSizeWriter; -import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; +import org.apache.cassandra.io.sstable.format.SSTableReader; public class LeveledCompactionTask extends CompactionTask { diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index a8cafeba22..5e85511726 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@ -36,6 +36,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.common.primitives.Ints; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java b/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java index 5adb829970..ad8a57af79 100644 --- a/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java +++ b/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java @@ -33,6 +33,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/compaction/SSTableSplitter.java b/src/java/org/apache/cassandra/db/compaction/SSTableSplitter.java index f35e1659be..d13b11f99b 100644 --- a/src/java/org/apache/cassandra/db/compaction/SSTableSplitter.java +++ b/src/java/org/apache/cassandra/db/compaction/SSTableSplitter.java @@ -17,14 +17,16 @@ */ package org.apache.cassandra.db.compaction; -import java.util.*; +import java.util.Set; import java.util.function.LongPredicate; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.compaction.writers.CompactionAwareWriter; import org.apache.cassandra.db.compaction.writers.MaxSSTableSizeWriter; -import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; +import org.apache.cassandra.io.sstable.format.SSTableReader; public class SSTableSplitter { diff --git a/src/java/org/apache/cassandra/db/compaction/ShardManager.java b/src/java/org/apache/cassandra/db/compaction/ShardManager.java index 7a5c65b228..8fa86eb309 100644 --- a/src/java/org/apache/cassandra/db/compaction/ShardManager.java +++ b/src/java/org/apache/cassandra/db/compaction/ShardManager.java @@ -18,7 +18,11 @@ package org.apache.cassandra.db.compaction; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.PriorityQueue; import java.util.function.BiFunction; import java.util.stream.Collectors; diff --git a/src/java/org/apache/cassandra/db/compaction/ShardTracker.java b/src/java/org/apache/cassandra/db/compaction/ShardTracker.java index 46b20638db..fdaeb42aa9 100644 --- a/src/java/org/apache/cassandra/db/compaction/ShardTracker.java +++ b/src/java/org/apache/cassandra/db/compaction/ShardTracker.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.compaction; import java.util.Set; + import javax.annotation.Nullable; import org.apache.cassandra.db.PartitionPosition; diff --git a/src/java/org/apache/cassandra/db/compaction/SingleSSTableLCSTask.java b/src/java/org/apache/cassandra/db/compaction/SingleSSTableLCSTask.java index 7a80451e2d..e8d28c7560 100644 --- a/src/java/org/apache/cassandra/db/compaction/SingleSSTableLCSTask.java +++ b/src/java/org/apache/cassandra/db/compaction/SingleSSTableLCSTask.java @@ -18,14 +18,15 @@ package org.apache.cassandra.db.compaction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.io.sstable.format.SSTableFormat.Components; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.metadata.StatsMetadata; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Special compaction task that does not do any compaction, instead it diff --git a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java index 1ed39ea562..ee22daf72a 100644 --- a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java @@ -17,12 +17,22 @@ */ package org.apache.cassandra.db.compaction; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/compaction/StatefulCursor.java b/src/java/org/apache/cassandra/db/compaction/StatefulCursor.java index e7bed313fe..c28d218ac3 100644 --- a/src/java/org/apache/cassandra/db/compaction/StatefulCursor.java +++ b/src/java/org/apache/cassandra/db/compaction/StatefulCursor.java @@ -21,10 +21,10 @@ package org.apache.cassandra.db.compaction; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.ReusableLivenessInfo; import org.apache.cassandra.db.UnfilteredValidation; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.sstable.PartitionDescriptor; -import org.apache.cassandra.db.ReusableLivenessInfo; import org.apache.cassandra.io.sstable.SSTableCursorReader; import org.apache.cassandra.io.sstable.UnfilteredDescriptor; import org.apache.cassandra.io.sstable.format.SSTableReader; diff --git a/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java index ef4d78a542..ab8249b41e 100644 --- a/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java @@ -22,25 +22,30 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; -import java.util.Objects; -import java.util.TreeSet; -import java.util.concurrent.TimeUnit; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.*; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.lifecycle.SSTableSet; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; +import org.apache.cassandra.db.lifecycle.SSTableSet; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.schema.CompactionParams; diff --git a/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyOptions.java b/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyOptions.java index b9312a02f1..e9205e1371 100644 --- a/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyOptions.java +++ b/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyOptions.java @@ -18,11 +18,11 @@ package org.apache.cassandra.db.compaction; -import com.google.common.collect.ImmutableList; - import java.util.Map; import java.util.concurrent.TimeUnit; +import com.google.common.collect.ImmutableList; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/compaction/UnifiedCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/UnifiedCompactionStrategy.java index d44a9f3288..61717b5e28 100644 --- a/src/java/org/apache/cassandra/db/compaction/UnifiedCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/UnifiedCompactionStrategy.java @@ -35,6 +35,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/compaction/unified/Controller.java b/src/java/org/apache/cassandra/db/compaction/unified/Controller.java index a5b89e6ae2..f7976ebccb 100644 --- a/src/java/org/apache/cassandra/db/compaction/unified/Controller.java +++ b/src/java/org/apache/cassandra/db/compaction/unified/Controller.java @@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.CassandraRelevantProperties; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.compaction.UnifiedCompactionStrategy; diff --git a/src/java/org/apache/cassandra/db/compaction/unified/UnifiedCompactionTask.java b/src/java/org/apache/cassandra/db/compaction/unified/UnifiedCompactionTask.java index 0b3e9a6f4a..e072652ccf 100644 --- a/src/java/org/apache/cassandra/db/compaction/unified/UnifiedCompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/unified/UnifiedCompactionTask.java @@ -23,6 +23,7 @@ import java.util.Set; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.compaction.CompactionTask; diff --git a/src/java/org/apache/cassandra/db/compression/CompressionDictionary.java b/src/java/org/apache/cassandra/db/compression/CompressionDictionary.java index a6c78da497..18c5f58a99 100644 --- a/src/java/org/apache/cassandra/db/compression/CompressionDictionary.java +++ b/src/java/org/apache/cassandra/db/compression/CompressionDictionary.java @@ -23,6 +23,7 @@ import java.io.DataOutput; import java.io.EOFException; import java.io.IOException; import java.util.Objects; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; diff --git a/src/java/org/apache/cassandra/db/compression/CompressionDictionaryCache.java b/src/java/org/apache/cassandra/db/compression/CompressionDictionaryCache.java index 126341e925..76b2b91783 100644 --- a/src/java/org/apache/cassandra/db/compression/CompressionDictionaryCache.java +++ b/src/java/org/apache/cassandra/db/compression/CompressionDictionaryCache.java @@ -21,15 +21,17 @@ package org.apache.cassandra.db.compression; import java.time.Duration; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Nullable; -import com.google.common.annotations.VisibleForTesting; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.RemovalCause; +import com.google.common.annotations.VisibleForTesting; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.compression.CompressionDictionary.DictId; import org.apache.cassandra.utils.concurrent.Ref; diff --git a/src/java/org/apache/cassandra/db/compression/CompressionDictionaryDetailsTabularData.java b/src/java/org/apache/cassandra/db/compression/CompressionDictionaryDetailsTabularData.java index af6c8bb4f4..3802c10aba 100644 --- a/src/java/org/apache/cassandra/db/compression/CompressionDictionaryDetailsTabularData.java +++ b/src/java/org/apache/cassandra/db/compression/CompressionDictionaryDetailsTabularData.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.compression; import java.util.Arrays; + import javax.management.openmbean.ArrayType; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; @@ -30,6 +31,7 @@ import javax.management.openmbean.TabularType; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; + import org.apache.cassandra.db.compression.CompressionDictionary.LightweightCompressionDictionary; import org.apache.cassandra.io.util.FileUtils; diff --git a/src/java/org/apache/cassandra/db/compression/CompressionDictionaryEventHandler.java b/src/java/org/apache/cassandra/db/compression/CompressionDictionaryEventHandler.java index f5e34dbdfe..c2b0a32a76 100644 --- a/src/java/org/apache/cassandra/db/compression/CompressionDictionaryEventHandler.java +++ b/src/java/org/apache/cassandra/db/compression/CompressionDictionaryEventHandler.java @@ -18,6 +18,11 @@ package org.apache.cassandra.db.compression; +import java.util.Collection; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.locator.InetAddressAndPort; @@ -27,10 +32,6 @@ import org.apache.cassandra.net.Verb; import org.apache.cassandra.schema.SystemDistributedKeyspace; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.utils.FBUtilities; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Collection; /** * Handles compression dictionary events including training completion and cluster notifications. diff --git a/src/java/org/apache/cassandra/db/compression/CompressionDictionaryManager.java b/src/java/org/apache/cassandra/db/compression/CompressionDictionaryManager.java index d640fe35e3..88bbc6c918 100644 --- a/src/java/org/apache/cassandra/db/compression/CompressionDictionaryManager.java +++ b/src/java/org/apache/cassandra/db/compression/CompressionDictionaryManager.java @@ -21,12 +21,14 @@ package org.apache.cassandra.db.compression; import java.nio.ByteBuffer; import java.util.List; import java.util.Set; + import javax.annotation.Nullable; import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/compression/CompressionDictionaryScheduler.java b/src/java/org/apache/cassandra/db/compression/CompressionDictionaryScheduler.java index 771c147c08..e757364711 100644 --- a/src/java/org/apache/cassandra/db/compression/CompressionDictionaryScheduler.java +++ b/src/java/org/apache/cassandra/db/compression/CompressionDictionaryScheduler.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/compression/ICompressionDictionaryTrainer.java b/src/java/org/apache/cassandra/db/compression/ICompressionDictionaryTrainer.java index 64810711ff..5612531a4f 100644 --- a/src/java/org/apache/cassandra/db/compression/ICompressionDictionaryTrainer.java +++ b/src/java/org/apache/cassandra/db/compression/ICompressionDictionaryTrainer.java @@ -22,10 +22,10 @@ import java.nio.ByteBuffer; import java.util.function.Consumer; import org.apache.cassandra.concurrent.ScheduledExecutors; -import org.apache.cassandra.utils.concurrent.Future; import org.apache.cassandra.io.compress.ICompressor; import org.apache.cassandra.io.compress.IDictionaryCompressor; import org.apache.cassandra.schema.CompressionParams; +import org.apache.cassandra.utils.concurrent.Future; /** * Interface for training compression dictionaries from sample data. diff --git a/src/java/org/apache/cassandra/db/compression/TrainingState.java b/src/java/org/apache/cassandra/db/compression/TrainingState.java index 279683c4f2..0480b64caf 100644 --- a/src/java/org/apache/cassandra/db/compression/TrainingState.java +++ b/src/java/org/apache/cassandra/db/compression/TrainingState.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.compression; import java.util.HashMap; import java.util.Map; + import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.CompositeType; diff --git a/src/java/org/apache/cassandra/db/compression/ZstdCompressionDictionary.java b/src/java/org/apache/cassandra/db/compression/ZstdCompressionDictionary.java index a1af1ce9cc..b39583a328 100644 --- a/src/java/org/apache/cassandra/db/compression/ZstdCompressionDictionary.java +++ b/src/java/org/apache/cassandra/db/compression/ZstdCompressionDictionary.java @@ -22,12 +22,13 @@ import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; +import com.github.luben.zstd.ZstdDictCompress; +import com.github.luben.zstd.ZstdDictDecompress; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.github.luben.zstd.ZstdDictCompress; -import com.github.luben.zstd.ZstdDictDecompress; import org.apache.cassandra.io.compress.ZstdCompressorBase; import org.apache.cassandra.utils.concurrent.Ref; import org.apache.cassandra.utils.concurrent.RefCounted; diff --git a/src/java/org/apache/cassandra/db/compression/ZstdDictionaryTrainer.java b/src/java/org/apache/cassandra/db/compression/ZstdDictionaryTrainer.java index 81e99c22bc..bd7c566dcc 100644 --- a/src/java/org/apache/cassandra/db/compression/ZstdDictionaryTrainer.java +++ b/src/java/org/apache/cassandra/db/compression/ZstdDictionaryTrainer.java @@ -23,12 +23,13 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; +import com.github.luben.zstd.Zstd; +import com.github.luben.zstd.ZstdDictTrainer; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.github.luben.zstd.Zstd; -import com.github.luben.zstd.ZstdDictTrainer; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.compression.CompressionDictionary.DictId; diff --git a/src/java/org/apache/cassandra/db/context/CounterContext.java b/src/java/org/apache/cassandra/db/context/CounterContext.java index 37bd3cac7e..10f20e3f55 100644 --- a/src/java/org/apache/cassandra/db/context/CounterContext.java +++ b/src/java/org/apache/cassandra/db/context/CounterContext.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.List; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +33,8 @@ import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.serializers.MarshalException; -import org.apache.cassandra.utils.*; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.CounterId; /** * An implementation of a partitioned counter context. diff --git a/src/java/org/apache/cassandra/db/filter/AbstractClusteringIndexFilter.java b/src/java/org/apache/cassandra/db/filter/AbstractClusteringIndexFilter.java index ddcaaed812..d55799a484 100644 --- a/src/java/org/apache/cassandra/db/filter/AbstractClusteringIndexFilter.java +++ b/src/java/org/apache/cassandra/db/filter/AbstractClusteringIndexFilter.java @@ -19,12 +19,13 @@ package org.apache.cassandra.db.filter; import java.io.IOException; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ClusteringComparator; +import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.marshal.ReversedType; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; public abstract class AbstractClusteringIndexFilter implements ClusteringIndexFilter { diff --git a/src/java/org/apache/cassandra/db/filter/ClusteringIndexFilter.java b/src/java/org/apache/cassandra/db/filter/ClusteringIndexFilter.java index 564ca1a223..2ed144a0d1 100644 --- a/src/java/org/apache/cassandra/db/filter/ClusteringIndexFilter.java +++ b/src/java/org/apache/cassandra/db/filter/ClusteringIndexFilter.java @@ -19,10 +19,13 @@ package org.apache.cassandra.db.filter; import java.io.IOException; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringComparator; +import org.apache.cassandra.db.Slice; +import org.apache.cassandra.db.Slices; import org.apache.cassandra.db.partitions.CachedPartition; import org.apache.cassandra.db.partitions.Partition; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.schema.TableMetadata; diff --git a/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java b/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java index f3a0904eee..6aa06ee789 100644 --- a/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java +++ b/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java @@ -18,12 +18,19 @@ package org.apache.cassandra.db.filter; import java.io.IOException; -import java.util.*; +import java.util.NavigableSet; +import java.util.Objects; import org.apache.cassandra.cql3.Operator; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.partitions.*; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringComparator; +import org.apache.cassandra.db.Slice; +import org.apache.cassandra.db.Slices; +import org.apache.cassandra.db.TypeSizes; +import org.apache.cassandra.db.partitions.CachedPartition; +import org.apache.cassandra.db.partitions.Partition; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.transform.Transformation; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/db/filter/ClusteringIndexSliceFilter.java b/src/java/org/apache/cassandra/db/filter/ClusteringIndexSliceFilter.java index 67aeeb7c56..c75c2ddb44 100644 --- a/src/java/org/apache/cassandra/db/filter/ClusteringIndexSliceFilter.java +++ b/src/java/org/apache/cassandra/db/filter/ClusteringIndexSliceFilter.java @@ -19,10 +19,15 @@ package org.apache.cassandra.db.filter; import java.io.IOException; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringComparator; +import org.apache.cassandra.db.Slice; +import org.apache.cassandra.db.Slices; import org.apache.cassandra.db.partitions.CachedPartition; import org.apache.cassandra.db.partitions.Partition; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.Rows; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.transform.Transformation; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/db/filter/ColumnFilter.java b/src/java/org/apache/cassandra/db/filter/ColumnFilter.java index 86d66c59ff..e28d1e0161 100644 --- a/src/java/org/apache/cassandra/db/filter/ColumnFilter.java +++ b/src/java/org/apache/cassandra/db/filter/ColumnFilter.java @@ -18,7 +18,17 @@ package org.apache.cassandra.db.filter; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.SortedSet; +import java.util.StringJoiner; import javax.annotation.Nullable; @@ -27,7 +37,9 @@ import com.google.common.collect.SortedSetMultimap; import com.google.common.collect.TreeMultimap; import org.apache.cassandra.cql3.ColumnIdentifier; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.Columns; +import org.apache.cassandra.db.RegularAndStaticColumns; +import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.rows.CellPath; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/db/filter/DataLimits.java b/src/java/org/apache/cassandra/db/filter/DataLimits.java index 60203c3047..6372f197e3 100644 --- a/src/java/org/apache/cassandra/db/filter/DataLimits.java +++ b/src/java/org/apache/cassandra/db/filter/DataLimits.java @@ -20,12 +20,23 @@ package org.apache.cassandra.db.filter; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringComparator; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.Slices; +import org.apache.cassandra.db.TypeSizes; +import org.apache.cassandra.db.aggregation.AggregationSpecification; import org.apache.cassandra.db.aggregation.GroupMaker; import org.apache.cassandra.db.aggregation.GroupingState; -import org.apache.cassandra.db.aggregation.AggregationSpecification; -import org.apache.cassandra.db.rows.*; -import org.apache.cassandra.db.partitions.*; +import org.apache.cassandra.db.partitions.CachedPartition; +import org.apache.cassandra.db.partitions.PartitionIterator; +import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; +import org.apache.cassandra.db.rows.BaseRowIterator; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.RowIterator; +import org.apache.cassandra.db.rows.Rows; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.transform.BasePartitions; import org.apache.cassandra.db.transform.BaseRows; import org.apache.cassandra.db.transform.StoppingTransformation; diff --git a/src/java/org/apache/cassandra/db/filter/RowFilter.java b/src/java/org/apache/cassandra/db/filter/RowFilter.java index 16ba694e14..53a3ce940e 100644 --- a/src/java/org/apache/cassandra/db/filter/RowFilter.java +++ b/src/java/org/apache/cassandra/db/filter/RowFilter.java @@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.base.Objects; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/filter/TombstoneOverwhelmingException.java b/src/java/org/apache/cassandra/db/filter/TombstoneOverwhelmingException.java index efca3ac4db..200f94f80a 100644 --- a/src/java/org/apache/cassandra/db/filter/TombstoneOverwhelmingException.java +++ b/src/java/org/apache/cassandra/db/filter/TombstoneOverwhelmingException.java @@ -20,9 +20,12 @@ package org.apache.cassandra.db.filter; import java.nio.ByteBuffer; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.RejectException; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.marshal.*; public class TombstoneOverwhelmingException extends RejectException { diff --git a/src/java/org/apache/cassandra/db/guardrails/AbstractCustomGuardrail.java b/src/java/org/apache/cassandra/db/guardrails/AbstractCustomGuardrail.java index c075f94329..bf47f1ae26 100644 --- a/src/java/org/apache/cassandra/db/guardrails/AbstractCustomGuardrail.java +++ b/src/java/org/apache/cassandra/db/guardrails/AbstractCustomGuardrail.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.guardrails; import java.util.function.Supplier; + import javax.annotation.Nullable; import org.apache.cassandra.service.ClientState; diff --git a/src/java/org/apache/cassandra/db/guardrails/CassandraPasswordConfiguration.java b/src/java/org/apache/cassandra/db/guardrails/CassandraPasswordConfiguration.java index 6799d83d84..10a974495f 100644 --- a/src/java/org/apache/cassandra/db/guardrails/CassandraPasswordConfiguration.java +++ b/src/java/org/apache/cassandra/db/guardrails/CassandraPasswordConfiguration.java @@ -20,9 +20,10 @@ package org.apache.cassandra.db.guardrails; import java.util.Arrays; +import org.passay.IllegalSequenceRule; + import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.util.File; -import org.passay.IllegalSequenceRule; import static java.lang.String.format; diff --git a/src/java/org/apache/cassandra/db/guardrails/CassandraPasswordGenerator.java b/src/java/org/apache/cassandra/db/guardrails/CassandraPasswordGenerator.java index 6e0a93322d..c76c7dc1cf 100644 --- a/src/java/org/apache/cassandra/db/guardrails/CassandraPasswordGenerator.java +++ b/src/java/org/apache/cassandra/db/guardrails/CassandraPasswordGenerator.java @@ -21,13 +21,15 @@ package org.apache.cassandra.db.guardrails; import java.util.Arrays; import java.util.List; import java.util.Map; + import javax.annotation.Nonnull; -import org.apache.cassandra.exceptions.ConfigurationException; import org.passay.CharacterRule; import org.passay.EnglishCharacterData; import org.passay.PasswordGenerator; +import org.apache.cassandra.exceptions.ConfigurationException; + import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_PASSWORD_GENERATOR_ATTEMTPS; import static org.passay.EnglishCharacterData.Digit; diff --git a/src/java/org/apache/cassandra/db/guardrails/CassandraPasswordValidator.java b/src/java/org/apache/cassandra/db/guardrails/CassandraPasswordValidator.java index e0d02919b6..319ac5a3c0 100644 --- a/src/java/org/apache/cassandra/db/guardrails/CassandraPasswordValidator.java +++ b/src/java/org/apache/cassandra/db/guardrails/CassandraPasswordValidator.java @@ -28,9 +28,9 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; + import javax.annotation.Nonnull; -import org.apache.cassandra.exceptions.ConfigurationException; import org.passay.CharacterCharacteristicsRule; import org.passay.CharacterData; import org.passay.CharacterRule; @@ -60,6 +60,8 @@ import org.passay.WhitespaceRule; import org.passay.dictionary.FileWordList; import org.passay.dictionary.WordListDictionary; +import org.apache.cassandra.exceptions.ConfigurationException; + import static java.util.Optional.empty; import static org.passay.EnglishCharacterData.Digit; diff --git a/src/java/org/apache/cassandra/db/guardrails/CustomGuardrail.java b/src/java/org/apache/cassandra/db/guardrails/CustomGuardrail.java index feaba2b4a3..4586ea55ff 100644 --- a/src/java/org/apache/cassandra/db/guardrails/CustomGuardrail.java +++ b/src/java/org/apache/cassandra/db/guardrails/CustomGuardrail.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.function.Supplier; + import javax.annotation.Nullable; import org.apache.cassandra.db.guardrails.ValueValidator.ValidationViolation; diff --git a/src/java/org/apache/cassandra/db/guardrails/CustomGuardrailConfig.java b/src/java/org/apache/cassandra/db/guardrails/CustomGuardrailConfig.java index c24dbd36c8..d5a66ae4a8 100644 --- a/src/java/org/apache/cassandra/db/guardrails/CustomGuardrailConfig.java +++ b/src/java/org/apache/cassandra/db/guardrails/CustomGuardrailConfig.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.guardrails; import java.util.HashMap; import java.util.Map; + import javax.annotation.Nullable; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/db/guardrails/EnableFlag.java b/src/java/org/apache/cassandra/db/guardrails/EnableFlag.java index dde09be8ff..2ae844e9c8 100644 --- a/src/java/org/apache/cassandra/db/guardrails/EnableFlag.java +++ b/src/java/org/apache/cassandra/db/guardrails/EnableFlag.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.guardrails; import java.util.function.Predicate; + import javax.annotation.Nullable; import org.apache.cassandra.service.ClientState; diff --git a/src/java/org/apache/cassandra/db/guardrails/Guardrail.java b/src/java/org/apache/cassandra/db/guardrails/Guardrail.java index a2d7d76a87..1bcb196899 100644 --- a/src/java/org/apache/cassandra/db/guardrails/Guardrail.java +++ b/src/java/org/apache/cassandra/db/guardrails/Guardrail.java @@ -19,9 +19,11 @@ package org.apache.cassandra.db.guardrails; import java.util.concurrent.TimeUnit; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/src/java/org/apache/cassandra/db/guardrails/Guardrails.java b/src/java/org/apache/cassandra/db/guardrails/Guardrails.java index d880657ac1..7de915190f 100644 --- a/src/java/org/apache/cassandra/db/guardrails/Guardrails.java +++ b/src/java/org/apache/cassandra/db/guardrails/Guardrails.java @@ -22,13 +22,15 @@ import java.util.Collections; import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; + import javax.annotation.Nullable; +import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; + import org.apache.commons.lang3.StringUtils; -import com.fasterxml.jackson.core.type.TypeReference; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DataStorageSpec; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/src/java/org/apache/cassandra/db/guardrails/GuardrailsMBean.java b/src/java/org/apache/cassandra/db/guardrails/GuardrailsMBean.java index 2bd3612225..108b721fa2 100644 --- a/src/java/org/apache/cassandra/db/guardrails/GuardrailsMBean.java +++ b/src/java/org/apache/cassandra/db/guardrails/GuardrailsMBean.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.guardrails; import java.util.Set; + import javax.annotation.Nullable; /** diff --git a/src/java/org/apache/cassandra/db/guardrails/MaxThreshold.java b/src/java/org/apache/cassandra/db/guardrails/MaxThreshold.java index 9f0d260818..9345773167 100644 --- a/src/java/org/apache/cassandra/db/guardrails/MaxThreshold.java +++ b/src/java/org/apache/cassandra/db/guardrails/MaxThreshold.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.guardrails; import java.util.function.ToLongFunction; + import javax.annotation.Nullable; import org.apache.cassandra.service.ClientState; diff --git a/src/java/org/apache/cassandra/db/guardrails/MinThreshold.java b/src/java/org/apache/cassandra/db/guardrails/MinThreshold.java index 72704cc51c..4debb140ba 100644 --- a/src/java/org/apache/cassandra/db/guardrails/MinThreshold.java +++ b/src/java/org/apache/cassandra/db/guardrails/MinThreshold.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.guardrails; import java.util.function.ToLongFunction; + import javax.annotation.Nullable; import org.apache.cassandra.service.ClientState; diff --git a/src/java/org/apache/cassandra/db/guardrails/NoOpGenerator.java b/src/java/org/apache/cassandra/db/guardrails/NoOpGenerator.java index c2383f7af2..52d60364ca 100644 --- a/src/java/org/apache/cassandra/db/guardrails/NoOpGenerator.java +++ b/src/java/org/apache/cassandra/db/guardrails/NoOpGenerator.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.guardrails; import java.util.Map; + import javax.annotation.Nonnull; import org.apache.cassandra.exceptions.ConfigurationException; diff --git a/src/java/org/apache/cassandra/db/guardrails/PasswordPolicyGuardrail.java b/src/java/org/apache/cassandra/db/guardrails/PasswordPolicyGuardrail.java index 24fa4a1dd9..d914a2a29a 100644 --- a/src/java/org/apache/cassandra/db/guardrails/PasswordPolicyGuardrail.java +++ b/src/java/org/apache/cassandra/db/guardrails/PasswordPolicyGuardrail.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.guardrails; import java.util.Map; import java.util.function.Supplier; + import javax.annotation.Nullable; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/db/guardrails/Predicates.java b/src/java/org/apache/cassandra/db/guardrails/Predicates.java index ab08560218..ddc221cc58 100644 --- a/src/java/org/apache/cassandra/db/guardrails/Predicates.java +++ b/src/java/org/apache/cassandra/db/guardrails/Predicates.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.guardrails; import java.util.function.Function; import java.util.function.Predicate; + import javax.annotation.Nullable; import org.apache.cassandra.service.ClientState; diff --git a/src/java/org/apache/cassandra/db/guardrails/RoleNamePolicyGuardrail.java b/src/java/org/apache/cassandra/db/guardrails/RoleNamePolicyGuardrail.java index 8eaa0b4d83..eaddbe809b 100644 --- a/src/java/org/apache/cassandra/db/guardrails/RoleNamePolicyGuardrail.java +++ b/src/java/org/apache/cassandra/db/guardrails/RoleNamePolicyGuardrail.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.guardrails; import java.util.Map; import java.util.function.Supplier; + import javax.annotation.Nullable; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/db/guardrails/Threshold.java b/src/java/org/apache/cassandra/db/guardrails/Threshold.java index 257ab013b7..5a6ef7e145 100644 --- a/src/java/org/apache/cassandra/db/guardrails/Threshold.java +++ b/src/java/org/apache/cassandra/db/guardrails/Threshold.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.guardrails; import java.util.function.ToLongFunction; + import javax.annotation.Nullable; import org.apache.cassandra.service.ClientState; diff --git a/src/java/org/apache/cassandra/db/guardrails/UUIDRoleNameGenerator.java b/src/java/org/apache/cassandra/db/guardrails/UUIDRoleNameGenerator.java index d81358aab5..96d095e005 100644 --- a/src/java/org/apache/cassandra/db/guardrails/UUIDRoleNameGenerator.java +++ b/src/java/org/apache/cassandra/db/guardrails/UUIDRoleNameGenerator.java @@ -23,6 +23,7 @@ import java.util.Random; import java.util.Set; import java.util.UUID; import java.util.regex.Pattern; + import javax.annotation.Nonnull; import org.apache.cassandra.exceptions.ConfigurationException; diff --git a/src/java/org/apache/cassandra/db/guardrails/ValueGenerator.java b/src/java/org/apache/cassandra/db/guardrails/ValueGenerator.java index 65b7e0975c..c01e18f679 100644 --- a/src/java/org/apache/cassandra/db/guardrails/ValueGenerator.java +++ b/src/java/org/apache/cassandra/db/guardrails/ValueGenerator.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.guardrails; import java.util.Map; import java.util.Set; + import javax.annotation.Nonnull; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/db/guardrails/ValueValidator.java b/src/java/org/apache/cassandra/db/guardrails/ValueValidator.java index 3890ac9bce..3aa9533ff5 100644 --- a/src/java/org/apache/cassandra/db/guardrails/ValueValidator.java +++ b/src/java/org/apache/cassandra/db/guardrails/ValueValidator.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.guardrails; import java.util.Optional; + import javax.annotation.Nonnull; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/db/guardrails/Values.java b/src/java/org/apache/cassandra/db/guardrails/Values.java index 9504a3d63b..9f8d72b4e3 100644 --- a/src/java/org/apache/cassandra/db/guardrails/Values.java +++ b/src/java/org/apache/cassandra/db/guardrails/Values.java @@ -22,6 +22,7 @@ import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; + import javax.annotation.Nullable; import com.google.common.collect.Sets; diff --git a/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java b/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java index 48b0bc1ffb..b6accd9878 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java @@ -35,6 +35,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/lifecycle/LogAwareFileLister.java b/src/java/org/apache/cassandra/db/lifecycle/LogAwareFileLister.java index 120f9bc42a..0b61ec4ea0 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/LogAwareFileLister.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogAwareFileLister.java @@ -24,20 +24,26 @@ import java.io.IOException; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.NavigableMap; +import java.util.Set; +import java.util.TreeMap; import java.util.function.BiPredicate; import java.util.stream.Collectors; import java.util.stream.StreamSupport; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.io.util.File; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.db.Directories; +import org.apache.cassandra.io.util.File; -import static org.apache.cassandra.db.Directories.*; +import static org.apache.cassandra.db.Directories.FileType; +import static org.apache.cassandra.db.Directories.OnTxnErr; /** * A class for listing files in a folder. diff --git a/src/java/org/apache/cassandra/db/lifecycle/LogFile.java b/src/java/org/apache/cassandra/db/lifecycle/LogFile.java index 08ba257f16..1092300838 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/LogFile.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogFile.java @@ -39,6 +39,7 @@ import javax.annotation.concurrent.NotThreadSafe; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterables; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java b/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java index d39b23bf9c..37ab2e2ff8 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java @@ -38,6 +38,7 @@ import java.util.stream.Collectors; import java.util.zip.CRC32; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/lifecycle/LogReplica.java b/src/java/org/apache/cassandra/db/lifecycle/LogReplica.java index 073ac7c61c..9ee713916d 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/LogReplica.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogReplica.java @@ -18,18 +18,18 @@ package org.apache.cassandra.db.lifecycle; +import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.io.IOException; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.io.util.File; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.FSError; import org.apache.cassandra.io.FSReadError; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.NativeLibrary; diff --git a/src/java/org/apache/cassandra/db/lifecycle/LogReplicaSet.java b/src/java/org/apache/cassandra/db/lifecycle/LogReplicaSet.java index 5076a960d3..dcc2d51810 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/LogReplicaSet.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogReplicaSet.java @@ -29,11 +29,12 @@ import java.util.stream.Collectors; import javax.annotation.concurrent.NotThreadSafe; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.io.util.File; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.io.FSError; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.Throwables; diff --git a/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java b/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java index b675ad238b..a0c95131b4 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java @@ -32,10 +32,10 @@ import java.util.concurrent.ConcurrentLinkedQueue; 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; diff --git a/src/java/org/apache/cassandra/db/lifecycle/Tracker.java b/src/java/org/apache/cassandra/db/lifecycle/Tracker.java index 73c18328a3..a443b38fff 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/Tracker.java +++ b/src/java/org/apache/cassandra/db/lifecycle/Tracker.java @@ -31,6 +31,7 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/lifecycle/View.java b/src/java/org/apache/cassandra/db/lifecycle/View.java index c6fd7ed52a..fe188e37c3 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/View.java +++ b/src/java/org/apache/cassandra/db/lifecycle/View.java @@ -23,6 +23,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; diff --git a/src/java/org/apache/cassandra/db/marshal/AbstractTimeUUIDType.java b/src/java/org/apache/cassandra/db/marshal/AbstractTimeUUIDType.java index 6326b2a8c0..04ca358bd6 100644 --- a/src/java/org/apache/cassandra/db/marshal/AbstractTimeUUIDType.java +++ b/src/java/org/apache/cassandra/db/marshal/AbstractTimeUUIDType.java @@ -21,8 +21,8 @@ import java.nio.ByteBuffer; import java.util.UUID; import org.apache.cassandra.cql3.CQL3Type; -import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.Duration; +import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.UUIDSerializer; diff --git a/src/java/org/apache/cassandra/db/marshal/AbstractType.java b/src/java/org/apache/cassandra/db/marshal/AbstractType.java index 42190e0c2e..62f65f28b6 100644 --- a/src/java/org/apache/cassandra/db/marshal/AbstractType.java +++ b/src/java/org/apache/cassandra/db/marshal/AbstractType.java @@ -30,14 +30,16 @@ import java.util.Objects; import javax.annotation.Nullable; +import org.github.jamm.Unmetered; + import org.apache.cassandra.cql3.AssignmentTestable; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.constraints.ColumnConstraint; import org.apache.cassandra.cql3.constraints.ColumnConstraints; import org.apache.cassandra.cql3.constraints.ConstraintViolationException; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.functions.ArgumentDeserializer; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.io.util.DataInputPlus; @@ -49,7 +51,6 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; import org.apache.cassandra.utils.bytecomparable.ByteSourceInverse; -import org.github.jamm.Unmetered; import static org.apache.cassandra.db.marshal.AbstractType.ComparisonType.CUSTOM; diff --git a/src/java/org/apache/cassandra/db/marshal/AsciiType.java b/src/java/org/apache/cassandra/db/marshal/AsciiType.java index 896f17e99c..0900f78da1 100644 --- a/src/java/org/apache/cassandra/db/marshal/AsciiType.java +++ b/src/java/org/apache/cassandra/db/marshal/AsciiType.java @@ -19,23 +19,23 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import java.nio.CharBuffer; -import java.nio.charset.CharsetEncoder; import java.nio.charset.CharacterCodingException; +import java.nio.charset.CharsetEncoder; import java.nio.charset.StandardCharsets; -import io.netty.util.concurrent.FastThreadLocal; -import org.apache.cassandra.cql3.terms.Constants; - import org.apache.cassandra.cql3.CQL3Type; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.functions.ArgumentDeserializer; +import org.apache.cassandra.cql3.terms.Constants; +import org.apache.cassandra.cql3.terms.Term; +import org.apache.cassandra.serializers.AsciiSerializer; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.TypeSerializer; -import org.apache.cassandra.serializers.AsciiSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.JsonUtils; +import io.netty.util.concurrent.FastThreadLocal; + public class AsciiType extends StringType { public static final AsciiType instance = new AsciiType(); diff --git a/src/java/org/apache/cassandra/db/marshal/BooleanType.java b/src/java/org/apache/cassandra/db/marshal/BooleanType.java index a273fe3ed4..171b239ad2 100644 --- a/src/java/org/apache/cassandra/db/marshal/BooleanType.java +++ b/src/java/org/apache/cassandra/db/marshal/BooleanType.java @@ -20,12 +20,12 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; -import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.BooleanSerializer; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; diff --git a/src/java/org/apache/cassandra/db/marshal/ByteArrayAccessor.java b/src/java/org/apache/cassandra/db/marshal/ByteArrayAccessor.java index 7035a25147..5ef2375191 100644 --- a/src/java/org/apache/cassandra/db/marshal/ByteArrayAccessor.java +++ b/src/java/org/apache/cassandra/db/marshal/ByteArrayAccessor.java @@ -26,16 +26,17 @@ import java.util.Arrays; import java.util.UUID; import accord.utils.Invariants; + import org.apache.cassandra.db.Digest; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.service.paxos.Ballot; -import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.ByteArrayUtil; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FastByteOperations; import org.apache.cassandra.utils.Hex; +import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.UUIDGen; public class ByteArrayAccessor implements ValueAccessor diff --git a/src/java/org/apache/cassandra/db/marshal/ByteArrayObjectFactory.java b/src/java/org/apache/cassandra/db/marshal/ByteArrayObjectFactory.java index 8877acbf5a..d4f490d62b 100644 --- a/src/java/org/apache/cassandra/db/marshal/ByteArrayObjectFactory.java +++ b/src/java/org/apache/cassandra/db/marshal/ByteArrayObjectFactory.java @@ -18,7 +18,14 @@ package org.apache.cassandra.db.marshal; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.AbstractArrayClusteringPrefix; +import org.apache.cassandra.db.ArrayClustering; +import org.apache.cassandra.db.ArrayClusteringBound; +import org.apache.cassandra.db.ArrayClusteringBoundary; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringBound; +import org.apache.cassandra.db.ClusteringBoundary; +import org.apache.cassandra.db.ClusteringPrefix; import org.apache.cassandra.db.rows.ArrayCell; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.CellPath; diff --git a/src/java/org/apache/cassandra/db/marshal/ByteBufferAccessor.java b/src/java/org/apache/cassandra/db/marshal/ByteBufferAccessor.java index 381bac4971..9cd0e22cf4 100644 --- a/src/java/org/apache/cassandra/db/marshal/ByteBufferAccessor.java +++ b/src/java/org/apache/cassandra/db/marshal/ByteBufferAccessor.java @@ -30,9 +30,9 @@ import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.service.paxos.Ballot; -import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FastByteOperations; +import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.UUIDGen; /** diff --git a/src/java/org/apache/cassandra/db/marshal/ByteBufferObjectFactory.java b/src/java/org/apache/cassandra/db/marshal/ByteBufferObjectFactory.java index 76e49b7271..66a707f075 100644 --- a/src/java/org/apache/cassandra/db/marshal/ByteBufferObjectFactory.java +++ b/src/java/org/apache/cassandra/db/marshal/ByteBufferObjectFactory.java @@ -20,7 +20,14 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.AbstractBufferClusteringPrefix; +import org.apache.cassandra.db.BufferClustering; +import org.apache.cassandra.db.BufferClusteringBound; +import org.apache.cassandra.db.BufferClusteringBoundary; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringBound; +import org.apache.cassandra.db.ClusteringBoundary; +import org.apache.cassandra.db.ClusteringPrefix; import org.apache.cassandra.db.rows.BufferCell; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.CellPath; diff --git a/src/java/org/apache/cassandra/db/marshal/ByteType.java b/src/java/org/apache/cassandra/db/marshal/ByteType.java index c03040d30e..25ae6bed73 100644 --- a/src/java/org/apache/cassandra/db/marshal/ByteType.java +++ b/src/java/org/apache/cassandra/db/marshal/ByteType.java @@ -22,9 +22,9 @@ import java.nio.ByteBuffer; import org.apache.commons.lang3.mutable.MutableByte; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.serializers.ByteSerializer; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.TypeSerializer; diff --git a/src/java/org/apache/cassandra/db/marshal/BytesType.java b/src/java/org/apache/cassandra/db/marshal/BytesType.java index 1fe8a9e73f..a8651c8a8b 100644 --- a/src/java/org/apache/cassandra/db/marshal/BytesType.java +++ b/src/java/org/apache/cassandra/db/marshal/BytesType.java @@ -20,12 +20,12 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; -import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.BytesSerializer; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Hex; diff --git a/src/java/org/apache/cassandra/db/marshal/CollectionType.java b/src/java/org/apache/cassandra/db/marshal/CollectionType.java index c54ad31e5e..9a4c298d07 100644 --- a/src/java/org/apache/cassandra/db/marshal/CollectionType.java +++ b/src/java/org/apache/cassandra/db/marshal/CollectionType.java @@ -17,12 +17,12 @@ */ package org.apache.cassandra.db.marshal; -import java.nio.ByteBuffer; import java.io.IOException; +import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collection; -import java.util.List; import java.util.Iterator; +import java.util.List; import java.util.Objects; import java.util.function.Consumer; diff --git a/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java b/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java index c8a3b6a49c..1e8f4af57f 100644 --- a/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java +++ b/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java @@ -20,13 +20,13 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import org.apache.cassandra.cql3.CQL3Type; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.functions.ArgumentDeserializer; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.db.context.CounterContext; import org.apache.cassandra.serializers.CounterSerializer; import org.apache.cassandra.serializers.MarshalException; -import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.serializers.TypeSerializer; +import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; public class CounterColumnType extends NumberType diff --git a/src/java/org/apache/cassandra/db/marshal/DateType.java b/src/java/org/apache/cassandra/db/marshal/DateType.java index 4d235683b4..87a31ade55 100644 --- a/src/java/org/apache/cassandra/db/marshal/DateType.java +++ b/src/java/org/apache/cassandra/db/marshal/DateType.java @@ -20,16 +20,16 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import java.util.Date; -import org.apache.cassandra.cql3.terms.Constants; -import org.apache.cassandra.cql3.terms.Term; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.functions.ArgumentDeserializer; -import org.apache.cassandra.serializers.TypeSerializer; -import org.apache.cassandra.serializers.TimestampSerializer; +import org.apache.cassandra.cql3.terms.Constants; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TimestampSerializer; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.bytecomparable.ByteComparable; diff --git a/src/java/org/apache/cassandra/db/marshal/DecimalType.java b/src/java/org/apache/cassandra/db/marshal/DecimalType.java index cbb849f366..a94ecff780 100644 --- a/src/java/org/apache/cassandra/db/marshal/DecimalType.java +++ b/src/java/org/apache/cassandra/db/marshal/DecimalType.java @@ -27,12 +27,12 @@ import java.util.Objects; import com.google.common.primitives.Ints; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; -import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.DecimalSerializer; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.bytecomparable.ByteComparable; diff --git a/src/java/org/apache/cassandra/db/marshal/DoubleType.java b/src/java/org/apache/cassandra/db/marshal/DoubleType.java index 988ebfc691..2d065e299d 100644 --- a/src/java/org/apache/cassandra/db/marshal/DoubleType.java +++ b/src/java/org/apache/cassandra/db/marshal/DoubleType.java @@ -22,12 +22,12 @@ import java.nio.ByteBuffer; import org.apache.commons.lang3.mutable.MutableDouble; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; -import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.DoubleSerializer; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.bytecomparable.ByteComparable; diff --git a/src/java/org/apache/cassandra/db/marshal/DurationType.java b/src/java/org/apache/cassandra/db/marshal/DurationType.java index 548088bd63..5089585741 100644 --- a/src/java/org/apache/cassandra/db/marshal/DurationType.java +++ b/src/java/org/apache/cassandra/db/marshal/DurationType.java @@ -20,10 +20,10 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import org.apache.cassandra.cql3.CQL3Type; -import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.Duration; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.functions.ArgumentDeserializer; +import org.apache.cassandra.cql3.terms.Constants; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.serializers.DurationSerializer; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.TypeSerializer; diff --git a/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java b/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java index 9317cdfa4e..ddee459609 100644 --- a/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java +++ b/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java @@ -33,6 +33,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/marshal/EmptyType.java b/src/java/org/apache/cassandra/db/marshal/EmptyType.java index 69ae2c2d4e..23553111f7 100644 --- a/src/java/org/apache/cassandra/db/marshal/EmptyType.java +++ b/src/java/org/apache/cassandra/db/marshal/EmptyType.java @@ -24,9 +24,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.serializers.EmptySerializer; @@ -34,9 +34,9 @@ import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.NoSpamLogger; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; -import org.apache.cassandra.utils.NoSpamLogger; import static org.apache.cassandra.config.CassandraRelevantProperties.SERIALIZATION_EMPTY_TYPE_NONEMPTY_BEHAVIOR; import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized; diff --git a/src/java/org/apache/cassandra/db/marshal/FloatType.java b/src/java/org/apache/cassandra/db/marshal/FloatType.java index ba48cf16c9..9ccb7fca18 100644 --- a/src/java/org/apache/cassandra/db/marshal/FloatType.java +++ b/src/java/org/apache/cassandra/db/marshal/FloatType.java @@ -22,12 +22,12 @@ import java.nio.ByteBuffer; import org.apache.commons.lang3.mutable.MutableFloat; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; -import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.FloatSerializer; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.bytecomparable.ByteComparable; diff --git a/src/java/org/apache/cassandra/db/marshal/FrozenType.java b/src/java/org/apache/cassandra/db/marshal/FrozenType.java index 003b7d93e3..765d62b901 100644 --- a/src/java/org/apache/cassandra/db/marshal/FrozenType.java +++ b/src/java/org/apache/cassandra/db/marshal/FrozenType.java @@ -20,12 +20,12 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import java.util.List; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.functions.ArgumentDeserializer; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.SyntaxException; -import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; /** diff --git a/src/java/org/apache/cassandra/db/marshal/InetAddressType.java b/src/java/org/apache/cassandra/db/marshal/InetAddressType.java index 3f31d0852b..250e1babac 100644 --- a/src/java/org/apache/cassandra/db/marshal/InetAddressType.java +++ b/src/java/org/apache/cassandra/db/marshal/InetAddressType.java @@ -22,12 +22,12 @@ import java.net.InetSocketAddress; import java.nio.ByteBuffer; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; -import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.InetAddressSerializer; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/db/marshal/Int32Type.java b/src/java/org/apache/cassandra/db/marshal/Int32Type.java index 339eedd182..a68255edd3 100644 --- a/src/java/org/apache/cassandra/db/marshal/Int32Type.java +++ b/src/java/org/apache/cassandra/db/marshal/Int32Type.java @@ -23,13 +23,13 @@ import java.util.Objects; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.serializers.Int32Serializer; import org.apache.cassandra.serializers.MarshalException; -import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.serializers.TypeSerializer; +import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; diff --git a/src/java/org/apache/cassandra/db/marshal/IntegerType.java b/src/java/org/apache/cassandra/db/marshal/IntegerType.java index 6d25dada24..a4438e00e9 100644 --- a/src/java/org/apache/cassandra/db/marshal/IntegerType.java +++ b/src/java/org/apache/cassandra/db/marshal/IntegerType.java @@ -23,12 +23,12 @@ import java.nio.ByteBuffer; import java.util.Objects; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; -import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.IntegerSerializer; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.bytecomparable.ByteComparable; diff --git a/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java b/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java index e30ef3361c..fab451b291 100644 --- a/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java +++ b/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java @@ -20,11 +20,11 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import java.util.UUID; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; -import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.UUIDSerializer; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.bytecomparable.ByteComparable; diff --git a/src/java/org/apache/cassandra/db/marshal/ListType.java b/src/java/org/apache/cassandra/db/marshal/ListType.java index cb40b1ae2d..7f578fecbd 100644 --- a/src/java/org/apache/cassandra/db/marshal/ListType.java +++ b/src/java/org/apache/cassandra/db/marshal/ListType.java @@ -36,8 +36,8 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.serializers.ListSerializer; import org.apache.cassandra.serializers.MarshalException; -import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.transport.ProtocolVersion; +import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.JsonUtils; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.bytecomparable.ByteComparable.Version; diff --git a/src/java/org/apache/cassandra/db/marshal/LongType.java b/src/java/org/apache/cassandra/db/marshal/LongType.java index d3a122c804..400b6ae836 100644 --- a/src/java/org/apache/cassandra/db/marshal/LongType.java +++ b/src/java/org/apache/cassandra/db/marshal/LongType.java @@ -23,12 +23,12 @@ import java.util.Objects; import org.apache.commons.lang3.mutable.MutableLong; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; -import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.LongSerializer; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.bytecomparable.ByteComparable; diff --git a/src/java/org/apache/cassandra/db/marshal/PartitionerDefinedOrder.java b/src/java/org/apache/cassandra/db/marshal/PartitionerDefinedOrder.java index 65f67154a7..2f7c0bdcf5 100644 --- a/src/java/org/apache/cassandra/db/marshal/PartitionerDefinedOrder.java +++ b/src/java/org/apache/cassandra/db/marshal/PartitionerDefinedOrder.java @@ -20,9 +20,11 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nullable; + import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.functions.ArgumentDeserializer; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.PartitionPosition; import org.apache.cassandra.dht.IPartitioner; @@ -33,8 +35,6 @@ import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteComparable.Version; import org.apache.cassandra.utils.bytecomparable.ByteSource; -import javax.annotation.Nullable; - /** for sorting columns representing row keys in the row ordering as determined by a partitioner. * Not intended for user-defined CFs, and will in fact error out if used with such. */ public class PartitionerDefinedOrder extends AbstractType diff --git a/src/java/org/apache/cassandra/db/marshal/ReversedType.java b/src/java/org/apache/cassandra/db/marshal/ReversedType.java index 1bf60844cf..5c81f0e558 100644 --- a/src/java/org/apache/cassandra/db/marshal/ReversedType.java +++ b/src/java/org/apache/cassandra/db/marshal/ReversedType.java @@ -18,13 +18,13 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; -import java.util.Map; import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.apache.cassandra.cql3.CQL3Type; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.functions.ArgumentDeserializer; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.TypeSerializer; diff --git a/src/java/org/apache/cassandra/db/marshal/ShortType.java b/src/java/org/apache/cassandra/db/marshal/ShortType.java index 247b083db7..3157c5b771 100644 --- a/src/java/org/apache/cassandra/db/marshal/ShortType.java +++ b/src/java/org/apache/cassandra/db/marshal/ShortType.java @@ -23,9 +23,9 @@ import java.util.Objects; import org.apache.commons.lang3.mutable.MutableShort; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.ShortSerializer; import org.apache.cassandra.serializers.TypeSerializer; diff --git a/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java b/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java index e7f23158b5..05f187eb79 100644 --- a/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java +++ b/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java @@ -20,8 +20,8 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import org.apache.cassandra.cql3.CQL3Type; -import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.Duration; +import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.SimpleDateSerializer; diff --git a/src/java/org/apache/cassandra/db/marshal/TimeType.java b/src/java/org/apache/cassandra/db/marshal/TimeType.java index 346b81c2a9..6239b6083e 100644 --- a/src/java/org/apache/cassandra/db/marshal/TimeType.java +++ b/src/java/org/apache/cassandra/db/marshal/TimeType.java @@ -21,13 +21,13 @@ import java.nio.ByteBuffer; import java.time.LocalTime; import java.time.ZoneOffset; +import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; -import org.apache.cassandra.serializers.TimeSerializer; -import org.apache.cassandra.cql3.CQL3Type; -import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TimeSerializer; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteComparable.Version; diff --git a/src/java/org/apache/cassandra/db/marshal/TimestampType.java b/src/java/org/apache/cassandra/db/marshal/TimestampType.java index f45fa2ee2c..b408fdda53 100644 --- a/src/java/org/apache/cassandra/db/marshal/TimestampType.java +++ b/src/java/org/apache/cassandra/db/marshal/TimestampType.java @@ -20,16 +20,16 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import java.util.Date; -import org.apache.cassandra.cql3.terms.Constants; -import org.apache.cassandra.cql3.Duration; -import org.apache.cassandra.cql3.terms.Term; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.cassandra.cql3.CQL3Type; -import org.apache.cassandra.serializers.TypeSerializer; +import org.apache.cassandra.cql3.Duration; +import org.apache.cassandra.cql3.terms.Constants; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.TimestampSerializer; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.bytecomparable.ByteComparable; diff --git a/src/java/org/apache/cassandra/db/marshal/TupleType.java b/src/java/org/apache/cassandra/db/marshal/TupleType.java index 8004507762..e39ad76285 100644 --- a/src/java/org/apache/cassandra/db/marshal/TupleType.java +++ b/src/java/org/apache/cassandra/db/marshal/TupleType.java @@ -29,7 +29,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Objects; import com.google.common.collect.Lists; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.MultiElements; import org.apache.cassandra.cql3.terms.Term; @@ -38,7 +38,10 @@ import org.apache.cassandra.db.rows.ComplexColumnData; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.SyntaxException; -import org.apache.cassandra.serializers.*; +import org.apache.cassandra.serializers.CollectionSerializer; +import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TupleSerializer; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteArrayUtil; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/db/marshal/TxnIdUtf8Type.java b/src/java/org/apache/cassandra/db/marshal/TxnIdUtf8Type.java index 1f333a0cd1..b947e02cab 100644 --- a/src/java/org/apache/cassandra/db/marshal/TxnIdUtf8Type.java +++ b/src/java/org/apache/cassandra/db/marshal/TxnIdUtf8Type.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import accord.primitives.TxnId; + import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.TypeSerializer; diff --git a/src/java/org/apache/cassandra/db/marshal/TypeParser.java b/src/java/org/apache/cassandra/db/marshal/TypeParser.java index 2fd1e9e053..b2dc0202bc 100644 --- a/src/java/org/apache/cassandra/db/marshal/TypeParser.java +++ b/src/java/org/apache/cassandra/db/marshal/TypeParser.java @@ -30,6 +30,7 @@ import java.util.Map; import com.google.common.base.Verify; import com.google.common.collect.ImmutableMap; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.FieldIdentifier; import org.apache.cassandra.dht.IPartitioner; diff --git a/src/java/org/apache/cassandra/db/marshal/UTF8Type.java b/src/java/org/apache/cassandra/db/marshal/UTF8Type.java index babd6a52da..3b9a13f7b5 100644 --- a/src/java/org/apache/cassandra/db/marshal/UTF8Type.java +++ b/src/java/org/apache/cassandra/db/marshal/UTF8Type.java @@ -21,11 +21,10 @@ import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; import java.nio.charset.StandardCharsets; -import org.apache.cassandra.cql3.terms.Constants; - import org.apache.cassandra.cql3.CQL3Type; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.functions.ArgumentDeserializer; +import org.apache.cassandra.cql3.terms.Constants; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.UTF8Serializer; diff --git a/src/java/org/apache/cassandra/db/marshal/UUIDType.java b/src/java/org/apache/cassandra/db/marshal/UUIDType.java index 0c72af9e8b..2b526f3cef 100644 --- a/src/java/org/apache/cassandra/db/marshal/UUIDType.java +++ b/src/java/org/apache/cassandra/db/marshal/UUIDType.java @@ -24,17 +24,17 @@ import java.util.regex.Pattern; import com.google.common.primitives.UnsignedLongs; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.cql3.functions.ArgumentDeserializer; -import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.UUIDSerializer; import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.UUIDGen; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; import org.apache.cassandra.utils.bytecomparable.ByteSourceInverse; -import org.apache.cassandra.utils.UUIDGen; /** * Compares UUIDs using the following criteria:
diff --git a/src/java/org/apache/cassandra/db/marshal/UserType.java b/src/java/org/apache/cassandra/db/marshal/UserType.java index 1f0f703070..df89e14de6 100644 --- a/src/java/org/apache/cassandra/db/marshal/UserType.java +++ b/src/java/org/apache/cassandra/db/marshal/UserType.java @@ -18,7 +18,15 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; import javax.annotation.Nullable; @@ -30,7 +38,10 @@ import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.CqlBuilder; +import org.apache.cassandra.cql3.FieldIdentifier; +import org.apache.cassandra.cql3.SchemaElement; import org.apache.cassandra.cql3.statements.SchemaDescriptionsUtil; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.MultiElements; diff --git a/src/java/org/apache/cassandra/db/marshal/ValueAccessor.java b/src/java/org/apache/cassandra/db/marshal/ValueAccessor.java index 4916c73262..1d9591d27b 100644 --- a/src/java/org/apache/cassandra/db/marshal/ValueAccessor.java +++ b/src/java/org/apache/cassandra/db/marshal/ValueAccessor.java @@ -41,7 +41,12 @@ import org.apache.cassandra.service.paxos.Ballot; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.vint.VIntCoding; -import static org.apache.cassandra.db.ClusteringPrefix.Kind.*; +import static org.apache.cassandra.db.ClusteringPrefix.Kind.EXCL_END_BOUND; +import static org.apache.cassandra.db.ClusteringPrefix.Kind.EXCL_END_INCL_START_BOUNDARY; +import static org.apache.cassandra.db.ClusteringPrefix.Kind.EXCL_START_BOUND; +import static org.apache.cassandra.db.ClusteringPrefix.Kind.INCL_END_BOUND; +import static org.apache.cassandra.db.ClusteringPrefix.Kind.INCL_END_EXCL_START_BOUNDARY; +import static org.apache.cassandra.db.ClusteringPrefix.Kind.INCL_START_BOUND; /** * ValueAccessor allows serializers and other code dealing with raw bytes to operate on different backing types diff --git a/src/java/org/apache/cassandra/db/memtable/AbstractAllocatorMemtable.java b/src/java/org/apache/cassandra/db/memtable/AbstractAllocatorMemtable.java index 2dbe41374f..8e296ac604 100644 --- a/src/java/org/apache/cassandra/db/memtable/AbstractAllocatorMemtable.java +++ b/src/java/org/apache/cassandra/db/memtable/AbstractAllocatorMemtable.java @@ -22,6 +22,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import com.google.common.annotations.VisibleForTesting; + +import org.github.jamm.Unmetered; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +49,6 @@ import org.apache.cassandra.utils.memory.MemtableCleaner; import org.apache.cassandra.utils.memory.MemtablePool; import org.apache.cassandra.utils.memory.NativePool; import org.apache.cassandra.utils.memory.SlabPool; -import org.github.jamm.Unmetered; /** * A memtable that uses memory tracked and maybe allocated via a MemtableAllocator from a MemtablePool. diff --git a/src/java/org/apache/cassandra/db/memtable/AbstractMemtable.java b/src/java/org/apache/cassandra/db/memtable/AbstractMemtable.java index 8983979a91..bce79771b2 100644 --- a/src/java/org/apache/cassandra/db/memtable/AbstractMemtable.java +++ b/src/java/org/apache/cassandra/db/memtable/AbstractMemtable.java @@ -32,6 +32,8 @@ import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; +import org.github.jamm.Unmetered; + import org.apache.cassandra.db.RegularAndStaticColumns; import org.apache.cassandra.db.commitlog.CommitLogPosition; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; @@ -40,7 +42,6 @@ import org.apache.cassandra.db.rows.EncodingStats; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.TableMetadataRef; -import org.github.jamm.Unmetered; public abstract class AbstractMemtable implements Memtable { diff --git a/src/java/org/apache/cassandra/db/memtable/AbstractShardedMemtable.java b/src/java/org/apache/cassandra/db/memtable/AbstractShardedMemtable.java index 081570188b..fef13fa667 100644 --- a/src/java/org/apache/cassandra/db/memtable/AbstractShardedMemtable.java +++ b/src/java/org/apache/cassandra/db/memtable/AbstractShardedMemtable.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.memtable; import java.util.concurrent.atomic.AtomicReference; +import org.github.jamm.Unmetered; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +28,6 @@ import org.apache.cassandra.db.commitlog.CommitLogPosition; import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.MBeanWrapper; -import org.github.jamm.Unmetered; import static org.apache.cassandra.config.CassandraRelevantProperties.MEMTABLE_SHARD_COUNT; diff --git a/src/java/org/apache/cassandra/db/memtable/Flushing.java b/src/java/org/apache/cassandra/db/memtable/Flushing.java index 3fc8568582..f2264dcf5b 100644 --- a/src/java/org/apache/cassandra/db/memtable/Flushing.java +++ b/src/java/org/apache/cassandra/db/memtable/Flushing.java @@ -25,6 +25,7 @@ import java.util.concurrent.Callable; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/memtable/Memtable.java b/src/java/org/apache/cassandra/db/memtable/Memtable.java index 4d665b8bf9..3898aeb499 100644 --- a/src/java/org/apache/cassandra/db/memtable/Memtable.java +++ b/src/java/org/apache/cassandra/db/memtable/Memtable.java @@ -21,6 +21,7 @@ package org.apache.cassandra.db.memtable; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; import java.util.function.Supplier; + import javax.annotation.concurrent.NotThreadSafe; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/src/java/org/apache/cassandra/db/memtable/ShardedSkipListMemtable.java b/src/java/org/apache/cassandra/db/memtable/ShardedSkipListMemtable.java index 8c0897e1d4..68ac5dfa0c 100644 --- a/src/java/org/apache/cassandra/db/memtable/ShardedSkipListMemtable.java +++ b/src/java/org/apache/cassandra/db/memtable/ShardedSkipListMemtable.java @@ -27,6 +27,8 @@ import java.util.concurrent.atomic.AtomicReference; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterators; + +import org.github.jamm.Unmetered; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,7 +60,6 @@ import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.utils.concurrent.OpOrder; import org.apache.cassandra.utils.memory.Cloner; import org.apache.cassandra.utils.memory.MemtableAllocator; -import org.github.jamm.Unmetered; /** * A proof-of-concept sharded memtable implementation. This implementation splits the partition skip-list into several diff --git a/src/java/org/apache/cassandra/db/memtable/SkipListMemtable.java b/src/java/org/apache/cassandra/db/memtable/SkipListMemtable.java index 9271000f05..1389b1954b 100644 --- a/src/java/org/apache/cassandra/db/memtable/SkipListMemtable.java +++ b/src/java/org/apache/cassandra/db/memtable/SkipListMemtable.java @@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/memtable/TrieMemtable.java b/src/java/org/apache/cassandra/db/memtable/TrieMemtable.java index 66b1e8cb3a..1e7f5fd408 100644 --- a/src/java/org/apache/cassandra/db/memtable/TrieMemtable.java +++ b/src/java/org/apache/cassandra/db/memtable/TrieMemtable.java @@ -29,6 +29,8 @@ import java.util.concurrent.locks.ReentrantLock; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterators; + +import org.github.jamm.Unmetered; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -75,7 +77,6 @@ import org.apache.cassandra.utils.bytecomparable.ByteSource; import org.apache.cassandra.utils.concurrent.OpOrder; import org.apache.cassandra.utils.memory.EnsureOnHeap; import org.apache.cassandra.utils.memory.MemtableAllocator; -import org.github.jamm.Unmetered; /** * Trie memtable implementation. Improves memory usage, garbage collection efficiency and lookup performance. diff --git a/src/java/org/apache/cassandra/db/monitoring/MonitoringTask.java b/src/java/org/apache/cassandra/db/monitoring/MonitoringTask.java index 4d6d995c77..9a3ba61b26 100644 --- a/src/java/org/apache/cassandra/db/monitoring/MonitoringTask.java +++ b/src/java/org/apache/cassandra/db/monitoring/MonitoringTask.java @@ -29,15 +29,16 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import com.google.common.annotations.VisibleForTesting; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.core.type.TypeReference; +import com.google.common.annotations.VisibleForTesting; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.utils.Clock; diff --git a/src/java/org/apache/cassandra/db/partitions/AtomicBTreePartition.java b/src/java/org/apache/cassandra/db/partitions/AtomicBTreePartition.java index 994ef1ac7b..b90ebccdff 100644 --- a/src/java/org/apache/cassandra/db/partitions/AtomicBTreePartition.java +++ b/src/java/org/apache/cassandra/db/partitions/AtomicBTreePartition.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.index.transactions.UpdateTransaction; +import org.github.jamm.Unmetered; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Clustering; @@ -34,13 +34,13 @@ import org.apache.cassandra.db.Slices; import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.index.transactions.UpdateTransaction; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.concurrent.OpOrder; import org.apache.cassandra.utils.memory.Cloner; import org.apache.cassandra.utils.memory.MemtableAllocator; -import org.github.jamm.Unmetered; import static org.apache.cassandra.utils.Clock.Global.nanoTime; diff --git a/src/java/org/apache/cassandra/db/partitions/CachedBTreePartition.java b/src/java/org/apache/cassandra/db/partitions/CachedBTreePartition.java index 79bc9f54a8..c289f23595 100644 --- a/src/java/org/apache/cassandra/db/partitions/CachedBTreePartition.java +++ b/src/java/org/apache/cassandra/db/partitions/CachedBTreePartition.java @@ -19,9 +19,15 @@ package org.apache.cassandra.db.partitions; import java.io.IOException; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.filter.DataLimits; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.Cell; +import org.apache.cassandra.db.rows.DeserializationHelper; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer; import org.apache.cassandra.io.ISerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/db/partitions/ImmutableBTreePartition.java b/src/java/org/apache/cassandra/db/partitions/ImmutableBTreePartition.java index 6617255660..2fe8b95375 100644 --- a/src/java/org/apache/cassandra/db/partitions/ImmutableBTreePartition.java +++ b/src/java/org/apache/cassandra/db/partitions/ImmutableBTreePartition.java @@ -18,11 +18,13 @@ */ package org.apache.cassandra.db.partitions; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.DeletionInfo; import org.apache.cassandra.db.RegularAndStaticColumns; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.EncodingStats; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.schema.TableMetadata; public class ImmutableBTreePartition extends AbstractBTreePartition { diff --git a/src/java/org/apache/cassandra/db/partitions/Partition.java b/src/java/org/apache/cassandra/db/partitions/Partition.java index 601934a8e7..3aed7c6f38 100644 --- a/src/java/org/apache/cassandra/db/partitions/Partition.java +++ b/src/java/org/apache/cassandra/db/partitions/Partition.java @@ -21,10 +21,16 @@ import java.util.NavigableSet; import javax.annotation.Nullable; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.RegularAndStaticColumns; +import org.apache.cassandra.db.Slices; import org.apache.cassandra.db.filter.ColumnFilter; +import org.apache.cassandra.db.rows.EncodingStats; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.schema.TableMetadata; /** * In-memory representation of a Partition. diff --git a/src/java/org/apache/cassandra/db/partitions/PartitionIterator.java b/src/java/org/apache/cassandra/db/partitions/PartitionIterator.java index e4b926a456..cba40fa99d 100644 --- a/src/java/org/apache/cassandra/db/partitions/PartitionIterator.java +++ b/src/java/org/apache/cassandra/db/partitions/PartitionIterator.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.db.partitions; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.RowIterator; /** * An iterator over a number of (filtered) partition. diff --git a/src/java/org/apache/cassandra/db/partitions/PartitionStatisticsCollector.java b/src/java/org/apache/cassandra/db/partitions/PartitionStatisticsCollector.java index 7c3ba150ae..cd9fe3a39a 100644 --- a/src/java/org/apache/cassandra/db/partitions/PartitionStatisticsCollector.java +++ b/src/java/org/apache/cassandra/db/partitions/PartitionStatisticsCollector.java @@ -17,7 +17,8 @@ */ package org.apache.cassandra.db.partitions; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.LivenessInfo; import org.apache.cassandra.db.rows.Cell; public interface PartitionStatisticsCollector diff --git a/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java b/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java index 3da60b3eb5..120bfc553a 100644 --- a/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java +++ b/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; + import javax.annotation.Nonnull; import com.google.common.annotations.VisibleForTesting; @@ -31,6 +32,7 @@ import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java b/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java index 41e5607566..b187be1e88 100644 --- a/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java +++ b/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java @@ -19,8 +19,14 @@ package org.apache.cassandra.db.partitions; import java.util.function.LongPredicate; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionPurger; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.rows.RangeTombstoneBoundMarker; +import org.apache.cassandra.db.rows.RangeTombstoneBoundaryMarker; +import org.apache.cassandra.db.rows.RangeTombstoneMarker; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.transform.Transformation; public abstract class PurgeFunction extends Transformation diff --git a/src/java/org/apache/cassandra/db/partitions/SingletonUnfilteredPartitionIterator.java b/src/java/org/apache/cassandra/db/partitions/SingletonUnfilteredPartitionIterator.java index b739e8b839..e25f29814b 100644 --- a/src/java/org/apache/cassandra/db/partitions/SingletonUnfilteredPartitionIterator.java +++ b/src/java/org/apache/cassandra/db/partitions/SingletonUnfilteredPartitionIterator.java @@ -19,8 +19,8 @@ package org.apache.cassandra.db.partitions; import java.util.NoSuchElementException; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.schema.TableMetadata; public class SingletonUnfilteredPartitionIterator implements UnfilteredPartitionIterator { diff --git a/src/java/org/apache/cassandra/db/partitions/UnfilteredPartitionIterator.java b/src/java/org/apache/cassandra/db/partitions/UnfilteredPartitionIterator.java index cd8e47f3ad..c6f5dc8b64 100644 --- a/src/java/org/apache/cassandra/db/partitions/UnfilteredPartitionIterator.java +++ b/src/java/org/apache/cassandra/db/partitions/UnfilteredPartitionIterator.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.db.partitions; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.schema.TableMetadata; /** * An iterator over a number of unfiltered partitions (i.e. partitions containing deletion informations). diff --git a/src/java/org/apache/cassandra/db/repair/CassandraTableRepairManager.java b/src/java/org/apache/cassandra/db/repair/CassandraTableRepairManager.java index bf5ab5a0e1..26a37f6500 100644 --- a/src/java/org/apache/cassandra/db/repair/CassandraTableRepairManager.java +++ b/src/java/org/apache/cassandra/db/repair/CassandraTableRepairManager.java @@ -31,15 +31,15 @@ import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.metrics.TopPartitionTracker; +import org.apache.cassandra.repair.NoSuchRepairSessionException; import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.repair.TableRepairManager; import org.apache.cassandra.repair.ValidationPartitionIterator; -import org.apache.cassandra.repair.NoSuchRepairSessionException; -import org.apache.cassandra.service.snapshot.SnapshotOptions; +import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.service.snapshot.SnapshotManager; +import org.apache.cassandra.service.snapshot.SnapshotOptions; import org.apache.cassandra.service.snapshot.SnapshotType; import org.apache.cassandra.utils.TimeUUID; -import org.apache.cassandra.service.ActiveRepairService; public class CassandraTableRepairManager implements TableRepairManager { diff --git a/src/java/org/apache/cassandra/db/repair/PendingAntiCompaction.java b/src/java/org/apache/cassandra/db/repair/PendingAntiCompaction.java index c39a667be9..35569c7b6f 100644 --- a/src/java/org/apache/cassandra/db/repair/PendingAntiCompaction.java +++ b/src/java/org/apache/cassandra/db/repair/PendingAntiCompaction.java @@ -34,15 +34,11 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.cassandra.concurrent.FutureTask; -import org.apache.cassandra.config.CassandraRelevantProperties; -import org.apache.cassandra.utils.TimeUUID; -import org.apache.cassandra.utils.concurrent.Future; -import org.apache.cassandra.utils.concurrent.FutureCombiner; -import org.apache.cassandra.utils.concurrent.ImmediateFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.concurrent.FutureTask; +import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.compaction.CompactionInfo; import org.apache.cassandra.db.compaction.CompactionManager; @@ -54,6 +50,10 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.metadata.StatsMetadata; import org.apache.cassandra.locator.RangesAtEndpoint; import org.apache.cassandra.service.ActiveRepairService; +import org.apache.cassandra.utils.TimeUUID; +import org.apache.cassandra.utils.concurrent.Future; +import org.apache.cassandra.utils.concurrent.FutureCombiner; +import org.apache.cassandra.utils.concurrent.ImmediateFuture; import org.apache.cassandra.utils.concurrent.Refs; import static org.apache.cassandra.service.ActiveRepairService.NO_PENDING_REPAIR; diff --git a/src/java/org/apache/cassandra/db/rows/AbstractCell.java b/src/java/org/apache/cassandra/db/rows/AbstractCell.java index aa5536593d..f14bd25b36 100644 --- a/src/java/org/apache/cassandra/db/rows/AbstractCell.java +++ b/src/java/org/apache/cassandra/db/rows/AbstractCell.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.rows; import java.nio.ByteBuffer; import java.util.Objects; + import javax.annotation.Nonnull; import com.google.common.base.Function; diff --git a/src/java/org/apache/cassandra/db/rows/AbstractRangeTombstoneMarker.java b/src/java/org/apache/cassandra/db/rows/AbstractRangeTombstoneMarker.java index a2c3a4dd30..be328474ce 100644 --- a/src/java/org/apache/cassandra/db/rows/AbstractRangeTombstoneMarker.java +++ b/src/java/org/apache/cassandra/db/rows/AbstractRangeTombstoneMarker.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.db.rows; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.ClusteringBoundOrBoundary; +import org.apache.cassandra.schema.TableMetadata; public abstract class AbstractRangeTombstoneMarker> implements RangeTombstoneMarker { diff --git a/src/java/org/apache/cassandra/db/rows/AbstractRow.java b/src/java/org/apache/cassandra/db/rows/AbstractRow.java index 416a781fa9..bfefad20b3 100644 --- a/src/java/org/apache/cassandra/db/rows/AbstractRow.java +++ b/src/java/org/apache/cassandra/db/rows/AbstractRow.java @@ -23,11 +23,11 @@ import java.util.stream.StreamSupport; import com.google.common.collect.Iterables; -import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.Digest; import org.apache.cassandra.db.marshal.CollectionType; import org.apache.cassandra.db.marshal.UserType; +import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.serializers.MarshalException; diff --git a/src/java/org/apache/cassandra/db/rows/AbstractUnfilteredRowIterator.java b/src/java/org/apache/cassandra/db/rows/AbstractUnfilteredRowIterator.java index 2c3f78feff..03e6ca25b4 100644 --- a/src/java/org/apache/cassandra/db/rows/AbstractUnfilteredRowIterator.java +++ b/src/java/org/apache/cassandra/db/rows/AbstractUnfilteredRowIterator.java @@ -17,11 +17,12 @@ */ package org.apache.cassandra.db.rows; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.RegularAndStaticColumns; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.AbstractIterator; -import org.apache.cassandra.db.*; - public abstract class AbstractUnfilteredRowIterator extends AbstractIterator implements UnfilteredRowIterator { protected final TableMetadata metadata; diff --git a/src/java/org/apache/cassandra/db/rows/BTreeRow.java b/src/java/org/apache/cassandra/db/rows/BTreeRow.java index 8bccda8aa7..c32be8e046 100644 --- a/src/java/org/apache/cassandra/db/rows/BTreeRow.java +++ b/src/java/org/apache/cassandra/db/rows/BTreeRow.java @@ -28,6 +28,7 @@ import java.util.Map; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Predicate; + import javax.annotation.Nonnull; import com.google.common.base.Function; diff --git a/src/java/org/apache/cassandra/db/rows/BaseRowIterator.java b/src/java/org/apache/cassandra/db/rows/BaseRowIterator.java index 403324879d..97ddfbc2b1 100644 --- a/src/java/org/apache/cassandra/db/rows/BaseRowIterator.java +++ b/src/java/org/apache/cassandra/db/rows/BaseRowIterator.java @@ -18,9 +18,9 @@ */ package org.apache.cassandra.db.rows; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.RegularAndStaticColumns; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.CloseableIterator; /** diff --git a/src/java/org/apache/cassandra/db/rows/BufferCell.java b/src/java/org/apache/cassandra/db/rows/BufferCell.java index b03fcb1a12..fa0826fa57 100644 --- a/src/java/org/apache/cassandra/db/rows/BufferCell.java +++ b/src/java/org/apache/cassandra/db/rows/BufferCell.java @@ -21,9 +21,9 @@ import java.nio.ByteBuffer; import org.apache.cassandra.db.ExpirationDateOverflowHandling; import org.apache.cassandra.db.marshal.ByteBufferAccessor; +import org.apache.cassandra.db.marshal.ByteType; import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.db.marshal.ByteType; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.memory.ByteBufferCloner; diff --git a/src/java/org/apache/cassandra/db/rows/CellPath.java b/src/java/org/apache/cassandra/db/rows/CellPath.java index 8e1ce7fe2c..1b19260d08 100644 --- a/src/java/org/apache/cassandra/db/rows/CellPath.java +++ b/src/java/org/apache/cassandra/db/rows/CellPath.java @@ -23,8 +23,8 @@ import java.util.Objects; import org.apache.cassandra.cache.IMeasurableMemory; import org.apache.cassandra.db.Digest; -import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.io.util.DataInputPlus; +import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.memory.ByteBufferCloner; diff --git a/src/java/org/apache/cassandra/db/rows/Cells.java b/src/java/org/apache/cassandra/db/rows/Cells.java index 621a91d19c..2103b1f8c2 100644 --- a/src/java/org/apache/cassandra/db/rows/Cells.java +++ b/src/java/org/apache/cassandra/db/rows/Cells.java @@ -21,12 +21,12 @@ import java.nio.ByteBuffer; import java.util.Comparator; import java.util.Iterator; +import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.db.context.CounterContext; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ValueAccessor; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.db.partitions.PartitionStatisticsCollector; +import org.apache.cassandra.schema.ColumnMetadata; /** * Static methods to work on cells. diff --git a/src/java/org/apache/cassandra/db/rows/ColumnData.java b/src/java/org/apache/cassandra/db/rows/ColumnData.java index e37a8dc292..36b1186ea4 100644 --- a/src/java/org/apache/cassandra/db/rows/ColumnData.java +++ b/src/java/org/apache/cassandra/db/rows/ColumnData.java @@ -18,6 +18,7 @@ package org.apache.cassandra.db.rows; import java.util.Comparator; + import javax.annotation.Nonnull; import com.google.common.base.Function; diff --git a/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java b/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java index 20c4045bac..d91deb2b30 100644 --- a/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java +++ b/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.rows; import java.nio.ByteBuffer; import java.util.Iterator; import java.util.Objects; + import javax.annotation.Nonnull; import com.google.common.annotations.VisibleForTesting; diff --git a/src/java/org/apache/cassandra/db/rows/DeserializationHelper.java b/src/java/org/apache/cassandra/db/rows/DeserializationHelper.java index 9404cc772d..d88e85c07d 100644 --- a/src/java/org/apache/cassandra/db/rows/DeserializationHelper.java +++ b/src/java/org/apache/cassandra/db/rows/DeserializationHelper.java @@ -18,15 +18,16 @@ package org.apache.cassandra.db.rows; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Map; -import org.apache.cassandra.db.marshal.ValueAccessor; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.LivenessInfo; import org.apache.cassandra.db.context.CounterContext; import org.apache.cassandra.db.filter.ColumnFilter; +import org.apache.cassandra.db.marshal.ValueAccessor; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.DroppedColumn; +import org.apache.cassandra.schema.TableMetadata; public class DeserializationHelper { diff --git a/src/java/org/apache/cassandra/db/rows/EncodingStats.java b/src/java/org/apache/cassandra/db/rows/EncodingStats.java index 0acc67815b..e259eb1ec0 100644 --- a/src/java/org/apache/cassandra/db/rows/EncodingStats.java +++ b/src/java/org/apache/cassandra/db/rows/EncodingStats.java @@ -18,11 +18,20 @@ package org.apache.cassandra.db.rows; import java.io.IOException; -import java.util.*; +import java.util.Calendar; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Objects; +import java.util.TimeZone; import java.util.function.Function; import org.apache.cassandra.cache.IMeasurableMemory; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.DeletionInfo; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.LivenessInfo; +import org.apache.cassandra.db.SerializationHeader; +import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.partitions.PartitionStatisticsCollector; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundMarker.java b/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundMarker.java index 67f43c910c..7600a1a36c 100644 --- a/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundMarker.java +++ b/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundMarker.java @@ -19,9 +19,14 @@ package org.apache.cassandra.db.rows; import java.util.Objects; +import org.apache.cassandra.db.AbstractArrayClusteringPrefix; +import org.apache.cassandra.db.ArrayClusteringBound; +import org.apache.cassandra.db.ClusteringBound; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.Digest; import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.*; import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.memory.ByteBufferCloner; diff --git a/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java b/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java index c36dcfdd55..b7695dbfa7 100644 --- a/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java +++ b/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java @@ -20,10 +20,14 @@ package org.apache.cassandra.db.rows; import java.nio.ByteBuffer; import java.util.Objects; +import org.apache.cassandra.db.ArrayClusteringBoundary; +import org.apache.cassandra.db.ClusteringBound; +import org.apache.cassandra.db.ClusteringBoundary; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.Digest; import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.*; - import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.memory.ByteBufferCloner; diff --git a/src/java/org/apache/cassandra/db/rows/RangeTombstoneMarker.java b/src/java/org/apache/cassandra/db/rows/RangeTombstoneMarker.java index 377880ae1c..8fe2505912 100644 --- a/src/java/org/apache/cassandra/db/rows/RangeTombstoneMarker.java +++ b/src/java/org/apache/cassandra/db/rows/RangeTombstoneMarker.java @@ -17,10 +17,12 @@ */ package org.apache.cassandra.db.rows; -import java.util.*; +import java.util.Arrays; import org.apache.cassandra.cache.IMeasurableMemory; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ClusteringBound; +import org.apache.cassandra.db.ClusteringBoundOrBoundary; +import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.utils.memory.ByteBufferCloner; /** diff --git a/src/java/org/apache/cassandra/db/rows/Row.java b/src/java/org/apache/cassandra/db/rows/Row.java index cb48c4ce6f..9a9323aeff 100644 --- a/src/java/org/apache/cassandra/db/rows/Row.java +++ b/src/java/org/apache/cassandra/db/rows/Row.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Objects; import java.util.function.BiConsumer; import java.util.function.Consumer; + import javax.annotation.Nonnull; import com.google.common.base.Function; diff --git a/src/java/org/apache/cassandra/db/rows/RowAndDeletionMergeIterator.java b/src/java/org/apache/cassandra/db/rows/RowAndDeletionMergeIterator.java index cd58daaf27..29007fd6e0 100644 --- a/src/java/org/apache/cassandra/db/rows/RowAndDeletionMergeIterator.java +++ b/src/java/org/apache/cassandra/db/rows/RowAndDeletionMergeIterator.java @@ -20,9 +20,13 @@ package org.apache.cassandra.db.rows; import java.util.Comparator; import java.util.Iterator; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.Clusterable; +import org.apache.cassandra.db.ClusteringBound; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.RangeTombstone; import org.apache.cassandra.db.filter.ColumnFilter; +import org.apache.cassandra.schema.TableMetadata; /** * An iterator that merges a source of rows with the range tombstone and partition level deletion of a give partition. diff --git a/src/java/org/apache/cassandra/db/rows/RowDiffListener.java b/src/java/org/apache/cassandra/db/rows/RowDiffListener.java index 28f7aefcb5..cf0e1c4ea5 100644 --- a/src/java/org/apache/cassandra/db/rows/RowDiffListener.java +++ b/src/java/org/apache/cassandra/db/rows/RowDiffListener.java @@ -17,8 +17,10 @@ */ package org.apache.cassandra.db.rows; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.LivenessInfo; import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.db.*; /** * Interface that allows to act on the result of merging multiple rows. diff --git a/src/java/org/apache/cassandra/db/rows/Rows.java b/src/java/org/apache/cassandra/db/rows/Rows.java index df9ff5e281..302d416107 100644 --- a/src/java/org/apache/cassandra/db/rows/Rows.java +++ b/src/java/org/apache/cassandra/db/rows/Rows.java @@ -17,15 +17,22 @@ */ package org.apache.cassandra.db.rows; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.LivenessInfo; +import org.apache.cassandra.db.SimpleBuilders; +import org.apache.cassandra.db.partitions.PartitionStatisticsCollector; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.partitions.PartitionStatisticsCollector; import org.apache.cassandra.utils.MergeIterator; /** diff --git a/src/java/org/apache/cassandra/db/rows/Unfiltered.java b/src/java/org/apache/cassandra/db/rows/Unfiltered.java index 4a90ded50d..0b3148c2f6 100644 --- a/src/java/org/apache/cassandra/db/rows/Unfiltered.java +++ b/src/java/org/apache/cassandra/db/rows/Unfiltered.java @@ -17,10 +17,10 @@ */ package org.apache.cassandra.db.rows; +import org.apache.cassandra.db.Clusterable; import org.apache.cassandra.db.ClusteringPrefix; import org.apache.cassandra.db.Digest; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.Clusterable; /** * Unfiltered is the common class for the main constituent of an unfiltered partition. diff --git a/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterator.java b/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterator.java index bbef11e849..ef9e3941a2 100644 --- a/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterator.java +++ b/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterator.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.db.rows; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.DeletionTime; /** * An iterator over the rows of a given partition that also includes deletion informations. diff --git a/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java b/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java index ca1edfdbaf..f3b716a2cd 100644 --- a/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java +++ b/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java @@ -20,7 +20,16 @@ package org.apache.cassandra.db.rows; import java.io.IOException; import net.nicoulaj.compilecommand.annotations.Inline; -import org.apache.cassandra.db.*; + +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringBound; +import org.apache.cassandra.db.ClusteringBoundOrBoundary; +import org.apache.cassandra.db.ClusteringBoundary; +import org.apache.cassandra.db.Columns; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.LivenessInfo; +import org.apache.cassandra.db.SerializationHeader; +import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.marshal.ByteArrayAccessor; import org.apache.cassandra.db.rows.Row.Deletion; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/db/streaming/CassandraIncomingFile.java b/src/java/org/apache/cassandra/db/streaming/CassandraIncomingFile.java index 3498f28b61..2daa886e15 100644 --- a/src/java/org/apache/cassandra/db/streaming/CassandraIncomingFile.java +++ b/src/java/org/apache/cassandra/db/streaming/CassandraIncomingFile.java @@ -21,6 +21,7 @@ package org.apache.cassandra.db.streaming; import java.util.Objects; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/streaming/CassandraStreamManager.java b/src/java/org/apache/cassandra/db/streaming/CassandraStreamManager.java index 505bd6b928..d3cee3d296 100644 --- a/src/java/org/apache/cassandra/db/streaming/CassandraStreamManager.java +++ b/src/java/org/apache/cassandra/db/streaming/CassandraStreamManager.java @@ -28,6 +28,7 @@ import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java b/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java index bab8d5a84b..9a6836d34a 100644 --- a/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java +++ b/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.base.Preconditions; import com.google.common.collect.UnmodifiableIterator; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/streaming/CassandraStreamReceiver.java b/src/java/org/apache/cassandra/db/streaming/CassandraStreamReceiver.java index 9705fab62e..40931e4295 100644 --- a/src/java/org/apache/cassandra/db/streaming/CassandraStreamReceiver.java +++ b/src/java/org/apache/cassandra/db/streaming/CassandraStreamReceiver.java @@ -31,6 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.primitives.Ranges; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; diff --git a/src/java/org/apache/cassandra/db/streaming/CassandraStreamWriter.java b/src/java/org/apache/cassandra/db/streaming/CassandraStreamWriter.java index cae6fefb2d..ea2f1b7053 100644 --- a/src/java/org/apache/cassandra/db/streaming/CassandraStreamWriter.java +++ b/src/java/org/apache/cassandra/db/streaming/CassandraStreamWriter.java @@ -21,11 +21,12 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.Collection; +import net.jpountz.lz4.LZ4Compressor; +import net.jpountz.lz4.LZ4Factory; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.jpountz.lz4.LZ4Compressor; -import net.jpountz.lz4.LZ4Factory; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.io.sstable.format.SSTableFormat.Components; import org.apache.cassandra.io.sstable.format.SSTableReader; diff --git a/src/java/org/apache/cassandra/db/streaming/CompressionInfo.java b/src/java/org/apache/cassandra/db/streaming/CompressionInfo.java index 84563da42c..c3c70d85e4 100644 --- a/src/java/org/apache/cassandra/db/streaming/CompressionInfo.java +++ b/src/java/org/apache/cassandra/db/streaming/CompressionInfo.java @@ -27,9 +27,9 @@ import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.compress.CompressionMetadata; import org.apache.cassandra.io.compress.CompressionMetadata.Chunk; import org.apache.cassandra.io.sstable.format.SSTableReader; -import org.apache.cassandra.schema.CompressionParams; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.schema.CompressionParams; /** * Container that carries compression parameters and chunks to decompress data from stream. diff --git a/src/java/org/apache/cassandra/db/transform/BaseIterator.java b/src/java/org/apache/cassandra/db/transform/BaseIterator.java index 8d7de474e0..7c27479e2f 100644 --- a/src/java/org/apache/cassandra/db/transform/BaseIterator.java +++ b/src/java/org/apache/cassandra/db/transform/BaseIterator.java @@ -24,6 +24,7 @@ import java.util.Iterator; import java.util.NoSuchElementException; import net.nicoulaj.compilecommand.annotations.DontInline; + import org.apache.cassandra.utils.CloseableIterator; import static org.apache.cassandra.utils.Throwables.maybeFail; diff --git a/src/java/org/apache/cassandra/db/transform/BaseRows.java b/src/java/org/apache/cassandra/db/transform/BaseRows.java index d5ad3f73cf..e0a0f0be69 100644 --- a/src/java/org/apache/cassandra/db/transform/BaseRows.java +++ b/src/java/org/apache/cassandra/db/transform/BaseRows.java @@ -20,10 +20,14 @@ */ package org.apache.cassandra.db.transform; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.RegularAndStaticColumns; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.BaseRowIterator; +import org.apache.cassandra.db.rows.RangeTombstoneMarker; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.Rows; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.schema.TableMetadata; import static org.apache.cassandra.utils.Throwables.merge; diff --git a/src/java/org/apache/cassandra/db/transform/DuplicateRowChecker.java b/src/java/org/apache/cassandra/db/transform/DuplicateRowChecker.java index 434719247a..590df7fae2 100644 --- a/src/java/org/apache/cassandra/db/transform/DuplicateRowChecker.java +++ b/src/java/org/apache/cassandra/db/transform/DuplicateRowChecker.java @@ -25,11 +25,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.db.compaction.OperationType; import org.apache.cassandra.db.partitions.PartitionIterator; import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.BaseRowIterator; +import org.apache.cassandra.db.rows.RangeTombstoneMarker; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.RowIterator; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.DiagnosticSnapshotService; diff --git a/src/java/org/apache/cassandra/db/transform/Filter.java b/src/java/org/apache/cassandra/db/transform/Filter.java index e927adf48b..9331fe090d 100644 --- a/src/java/org/apache/cassandra/db/transform/Filter.java +++ b/src/java/org/apache/cassandra/db/transform/Filter.java @@ -21,7 +21,12 @@ package org.apache.cassandra.db.transform; import org.apache.cassandra.db.DeletionPurger; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.BaseRowIterator; +import org.apache.cassandra.db.rows.RangeTombstoneMarker; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.RowIterator; +import org.apache.cassandra.db.rows.Rows; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; public final class Filter extends Transformation { diff --git a/src/java/org/apache/cassandra/db/transform/RTBoundCloser.java b/src/java/org/apache/cassandra/db/transform/RTBoundCloser.java index eb10805005..aa961ef8b2 100644 --- a/src/java/org/apache/cassandra/db/transform/RTBoundCloser.java +++ b/src/java/org/apache/cassandra/db/transform/RTBoundCloser.java @@ -21,7 +21,11 @@ import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.db.ReadExecutionController; import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.RangeTombstoneBoundMarker; +import org.apache.cassandra.db.rows.RangeTombstoneMarker; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.db.rows.UnfilteredRowIterators; /** * A transformation that appends an RT bound marker to row iterators in case they don't have one. diff --git a/src/java/org/apache/cassandra/db/transform/StoppingTransformation.java b/src/java/org/apache/cassandra/db/transform/StoppingTransformation.java index 691ee39bdb..2a65ad4962 100644 --- a/src/java/org/apache/cassandra/db/transform/StoppingTransformation.java +++ b/src/java/org/apache/cassandra/db/transform/StoppingTransformation.java @@ -21,6 +21,7 @@ package org.apache.cassandra.db.transform; import net.nicoulaj.compilecommand.annotations.DontInline; + import org.apache.cassandra.db.rows.BaseRowIterator; // A Transformation that can stop an iterator earlier than its natural exhaustion diff --git a/src/java/org/apache/cassandra/db/transform/Transformation.java b/src/java/org/apache/cassandra/db/transform/Transformation.java index 41c76df0ed..0713c02cd7 100644 --- a/src/java/org/apache/cassandra/db/transform/Transformation.java +++ b/src/java/org/apache/cassandra/db/transform/Transformation.java @@ -25,7 +25,11 @@ import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.db.RegularAndStaticColumns; import org.apache.cassandra.db.partitions.PartitionIterator; import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.BaseRowIterator; +import org.apache.cassandra.db.rows.RangeTombstoneMarker; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.RowIterator; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; /** * We have a single common superclass for all Transformations to make implementation efficient. diff --git a/src/java/org/apache/cassandra/db/transform/UnfilteredPartitions.java b/src/java/org/apache/cassandra/db/transform/UnfilteredPartitions.java index f0f295f62e..817a970c6b 100644 --- a/src/java/org/apache/cassandra/db/transform/UnfilteredPartitions.java +++ b/src/java/org/apache/cassandra/db/transform/UnfilteredPartitions.java @@ -20,9 +20,9 @@ */ package org.apache.cassandra.db.transform; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.schema.TableMetadata; final class UnfilteredPartitions extends BasePartitions implements UnfilteredPartitionIterator { diff --git a/src/java/org/apache/cassandra/db/tries/InMemoryReadTrie.java b/src/java/org/apache/cassandra/db/tries/InMemoryReadTrie.java index 863b11a9f4..b0be16c715 100644 --- a/src/java/org/apache/cassandra/db/tries/InMemoryReadTrie.java +++ b/src/java/org/apache/cassandra/db/tries/InMemoryReadTrie.java @@ -22,8 +22,9 @@ import java.util.concurrent.atomic.AtomicReferenceArray; import java.util.function.Function; import org.agrona.concurrent.UnsafeBuffer; -import org.apache.cassandra.utils.bytecomparable.ByteSource; + import org.apache.cassandra.utils.bytecomparable.ByteComparable; +import org.apache.cassandra.utils.bytecomparable.ByteSource; /** * In-memory trie built for fast modification and reads executing concurrently with writes from a single mutator thread. diff --git a/src/java/org/apache/cassandra/db/tries/InMemoryTrie.java b/src/java/org/apache/cassandra/db/tries/InMemoryTrie.java index a322d94a28..c2cfb2b901 100644 --- a/src/java/org/apache/cassandra/db/tries/InMemoryTrie.java +++ b/src/java/org/apache/cassandra/db/tries/InMemoryTrie.java @@ -26,14 +26,14 @@ import java.util.concurrent.atomic.AtomicReferenceArray; import com.google.common.annotations.VisibleForTesting; import org.agrona.concurrent.UnsafeBuffer; +import org.github.jamm.MemoryMeterStrategy; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.io.compress.BufferType; -import org.apache.cassandra.utils.bytecomparable.ByteSource; -import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.ObjectSizes; - +import org.apache.cassandra.utils.bytecomparable.ByteComparable; +import org.apache.cassandra.utils.bytecomparable.ByteSource; import org.apache.cassandra.utils.memory.MemoryUtil; -import org.github.jamm.MemoryMeterStrategy; /** * In-memory trie built for fast modification and reads executing concurrently with writes from a single mutator thread. diff --git a/src/java/org/apache/cassandra/db/tries/Trie.java b/src/java/org/apache/cassandra/db/tries/Trie.java index 7f02e154e0..569f204627 100644 --- a/src/java/org/apache/cassandra/db/tries/Trie.java +++ b/src/java/org/apache/cassandra/db/tries/Trie.java @@ -27,6 +27,7 @@ import java.util.function.Function; import com.google.common.collect.ImmutableList; import org.agrona.DirectBuffer; + import org.apache.cassandra.utils.bytecomparable.ByteComparable; /** diff --git a/src/java/org/apache/cassandra/db/tries/TriePathReconstructor.java b/src/java/org/apache/cassandra/db/tries/TriePathReconstructor.java index 4a9883fa00..69e0950187 100644 --- a/src/java/org/apache/cassandra/db/tries/TriePathReconstructor.java +++ b/src/java/org/apache/cassandra/db/tries/TriePathReconstructor.java @@ -21,6 +21,7 @@ package org.apache.cassandra.db.tries; import java.util.Arrays; import org.agrona.DirectBuffer; + import org.apache.cassandra.utils.bytecomparable.ByteComparable; public class TriePathReconstructor implements Trie.ResettingTransitionsReceiver diff --git a/src/java/org/apache/cassandra/db/view/View.java b/src/java/org/apache/cassandra/db/view/View.java index 9b582db4c0..17e970e1b3 100644 --- a/src/java/org/apache/cassandra/db/view/View.java +++ b/src/java/org/apache/cassandra/db/view/View.java @@ -21,9 +21,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; + import javax.annotation.Nullable; import com.google.common.collect.Iterables; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/view/ViewBuilder.java b/src/java/org/apache/cassandra/db/view/ViewBuilder.java index c59cfec855..b0dee577a5 100644 --- a/src/java/org/apache/cassandra/db/view/ViewBuilder.java +++ b/src/java/org/apache/cassandra/db/view/ViewBuilder.java @@ -28,6 +28,7 @@ import java.util.stream.Collectors; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.util.concurrent.FutureCallback; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/view/ViewBuilderTask.java b/src/java/org/apache/cassandra/db/view/ViewBuilderTask.java index d768610ab6..daf08794d5 100644 --- a/src/java/org/apache/cassandra/db/view/ViewBuilderTask.java +++ b/src/java/org/apache/cassandra/db/view/ViewBuilderTask.java @@ -30,6 +30,7 @@ import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/view/ViewManager.java b/src/java/org/apache/cassandra/db/view/ViewManager.java index 06fdcb4db5..90645265ea 100644 --- a/src/java/org/apache/cassandra/db/view/ViewManager.java +++ b/src/java/org/apache/cassandra/db/view/ViewManager.java @@ -17,20 +17,31 @@ */ package org.apache.cassandra.db.view; -import java.util.*; -import java.util.concurrent.ConcurrentMap; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.locks.Lock; import com.google.common.collect.Maps; import com.google.common.util.concurrent.Striped; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.schema.*; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.partitions.*; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.IMutation; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.SystemDistributedKeyspace; +import org.apache.cassandra.schema.TableId; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.ViewMetadata; +import org.apache.cassandra.schema.Views; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tcm.ClusterMetadata; diff --git a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java index c49d0ceb0c..021fc1f7fd 100644 --- a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java +++ b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java @@ -18,21 +18,30 @@ package org.apache.cassandra.db.view; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; import java.util.stream.Collectors; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.LivenessInfo; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ByteBufferAccessor; +import org.apache.cassandra.db.marshal.CompositeType; +import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.rows.BTreeRow; +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.db.rows.Row; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.*; -import org.apache.cassandra.db.partitions.*; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.CompositeType; /** * Creates the updates to apply to a view given the existing rows in the base diff --git a/src/java/org/apache/cassandra/db/view/ViewUtils.java b/src/java/org/apache/cassandra/db/view/ViewUtils.java index 510939fe6e..1bab97b312 100644 --- a/src/java/org/apache/cassandra/db/view/ViewUtils.java +++ b/src/java/org/apache/cassandra/db/view/ViewUtils.java @@ -22,6 +22,7 @@ import java.util.Optional; import java.util.function.Predicate; import com.google.common.collect.Iterables; + import org.apache.cassandra.dht.Token; import org.apache.cassandra.locator.EndpointsForToken; import org.apache.cassandra.locator.NetworkTopologyStrategy; diff --git a/src/java/org/apache/cassandra/db/virtual/AbstractLazyVirtualTable.java b/src/java/org/apache/cassandra/db/virtual/AbstractLazyVirtualTable.java index 68b010da58..3eb92c92a1 100644 --- a/src/java/org/apache/cassandra/db/virtual/AbstractLazyVirtualTable.java +++ b/src/java/org/apache/cassandra/db/virtual/AbstractLazyVirtualTable.java @@ -34,6 +34,7 @@ import java.util.function.UnaryOperator; import javax.annotation.Nullable; import accord.utils.Invariants; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Clusterable; import org.apache.cassandra.db.Clustering; diff --git a/src/java/org/apache/cassandra/db/virtual/AbstractLoggerVirtualTable.java b/src/java/org/apache/cassandra/db/virtual/AbstractLoggerVirtualTable.java index 008d5d432a..5a5c1f9d8e 100644 --- a/src/java/org/apache/cassandra/db/virtual/AbstractLoggerVirtualTable.java +++ b/src/java/org/apache/cassandra/db/virtual/AbstractLoggerVirtualTable.java @@ -23,12 +23,14 @@ import java.util.LinkedList; import java.util.List; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.spi.LoggingEvent; import org.apache.cassandra.schema.TableMetadata; +import ch.qos.logback.classic.spi.LoggingEvent; + /** * This table is inherently limited on number of rows it can hold. * diff --git a/src/java/org/apache/cassandra/db/virtual/AbstractMutableLazyVirtualTable.java b/src/java/org/apache/cassandra/db/virtual/AbstractMutableLazyVirtualTable.java index 1302f0e7bf..e27ec02117 100644 --- a/src/java/org/apache/cassandra/db/virtual/AbstractMutableLazyVirtualTable.java +++ b/src/java/org/apache/cassandra/db/virtual/AbstractMutableLazyVirtualTable.java @@ -22,6 +22,7 @@ import java.util.Iterator; import javax.annotation.Nullable; import accord.utils.Invariants; + import org.apache.cassandra.db.DeletionInfo; import org.apache.cassandra.db.RangeTombstone; import org.apache.cassandra.db.Slice; diff --git a/src/java/org/apache/cassandra/db/virtual/AbstractSchemaMetadataTable.java b/src/java/org/apache/cassandra/db/virtual/AbstractSchemaMetadataTable.java index dbcb3d95cc..c8f4d1d11f 100644 --- a/src/java/org/apache/cassandra/db/virtual/AbstractSchemaMetadataTable.java +++ b/src/java/org/apache/cassandra/db/virtual/AbstractSchemaMetadataTable.java @@ -17,10 +17,16 @@ */ package org.apache.cassandra.db.virtual; +import java.nio.ByteBuffer; +import java.util.Arrays; + +import com.google.common.base.Strings; + import org.apache.cassandra.cql3.FieldIdentifier; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.dht.LocalPartitioner; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.schema.ColumnMetadata; @@ -28,12 +34,6 @@ import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaProvider; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.marshal.UserType; - -import java.nio.ByteBuffer; -import java.util.Arrays; - -import com.google.common.base.Strings; /** * Abstract base class for virtual tables that expose metadata on schema elements. diff --git a/src/java/org/apache/cassandra/db/virtual/AccordDebugKeyspace.java b/src/java/org/apache/cassandra/db/virtual/AccordDebugKeyspace.java index a670bdb72b..756e0ad8c0 100644 --- a/src/java/org/apache/cassandra/db/virtual/AccordDebugKeyspace.java +++ b/src/java/org/apache/cassandra/db/virtual/AccordDebugKeyspace.java @@ -43,37 +43,22 @@ import javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; -import accord.api.LocalListeners; -import accord.coordinate.AbstractCoordination; -import accord.coordinate.Coordination; -import accord.coordinate.Coordination.CoordinationKind; -import accord.coordinate.PrepareRecovery; -import accord.coordinate.tracking.AbstractTracker; -import accord.impl.progresslog.DefaultProgressLog.ModeFlag; -import accord.local.Commands.NotifyWaitingOnPlus; -import accord.local.cfk.CommandsForKey.TxnInfo; -import accord.primitives.Range; -import accord.primitives.Ranges; -import accord.primitives.Routable; -import accord.primitives.RoutingKeys; -import accord.topology.ActiveEpoch; -import accord.topology.ActiveEpochs; -import accord.topology.Shard; -import accord.topology.Topology; -import accord.utils.SortedListMap; -import accord.utils.TinyEnumSet; -import org.apache.cassandra.db.PartitionPosition; -import org.apache.cassandra.db.marshal.CompositeType; -import org.apache.cassandra.db.marshal.TxnIdUtf8Type; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import accord.api.LocalListeners; import accord.api.RoutingKey; +import accord.coordinate.AbstractCoordination; +import accord.coordinate.Coordination; +import accord.coordinate.Coordination.CoordinationKind; import accord.coordinate.FetchData; import accord.coordinate.FetchRoute; import accord.coordinate.MaybeRecover; +import accord.coordinate.PrepareRecovery; +import accord.coordinate.tracking.AbstractTracker; import accord.impl.CommandChange; import accord.impl.progresslog.DefaultProgressLog; +import accord.impl.progresslog.DefaultProgressLog.ModeFlag; import accord.impl.progresslog.TxnStateKind; import accord.local.Cleanup; import accord.local.Command; @@ -81,6 +66,7 @@ import accord.local.CommandStore; import accord.local.CommandStores; import accord.local.CommandStores.LatentStoreSelector; import accord.local.Commands; +import accord.local.Commands.NotifyWaitingOnPlus; import accord.local.DurableBefore; import accord.local.MaxConflicts; import accord.local.Node; @@ -90,29 +76,44 @@ import accord.local.SafeCommand; import accord.local.SafeCommandStore; import accord.local.StoreParticipants; import accord.local.cfk.CommandsForKey; +import accord.local.cfk.CommandsForKey.TxnInfo; import accord.local.cfk.SafeCommandsForKey; import accord.local.durability.ShardDurability; import accord.primitives.FullRoute; import accord.primitives.Known; import accord.primitives.Participants; import accord.primitives.ProgressToken; +import accord.primitives.Range; +import accord.primitives.Ranges; +import accord.primitives.Routable; import accord.primitives.Route; +import accord.primitives.RoutingKeys; import accord.primitives.SaveStatus; import accord.primitives.Timestamp; import accord.primitives.TxnId; +import accord.topology.ActiveEpoch; +import accord.topology.ActiveEpochs; +import accord.topology.Shard; +import accord.topology.Topology; +import accord.utils.SortedListMap; +import accord.utils.TinyEnumSet; import accord.utils.UnhandledEnum; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; import accord.utils.async.AsyncResult; import accord.utils.async.AsyncResults; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DataRange; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.PartitionPosition; import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.TxnIdUtf8Type; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.dht.LocalPartitioner; import org.apache.cassandra.dht.NormalizedRanges; @@ -158,8 +159,8 @@ import static accord.local.RedundantStatus.Property.LOCALLY_SYNCED; import static accord.local.RedundantStatus.Property.LOCALLY_WITNESSED; import static accord.local.RedundantStatus.Property.LOG_UNAVAILABLE; import static accord.local.RedundantStatus.Property.QUORUM_APPLIED; -import static accord.local.RedundantStatus.Property.UNREADY; import static accord.local.RedundantStatus.Property.SHARD_APPLIED; +import static accord.local.RedundantStatus.Property.UNREADY; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/src/java/org/apache/cassandra/db/virtual/AccordVirtualTables.java b/src/java/org/apache/cassandra/db/virtual/AccordVirtualTables.java index 8dbba15e33..d9ec7ebb72 100644 --- a/src/java/org/apache/cassandra/db/virtual/AccordVirtualTables.java +++ b/src/java/org/apache/cassandra/db/virtual/AccordVirtualTables.java @@ -35,6 +35,7 @@ import accord.primitives.Ranges; import accord.topology.ActiveEpoch; import accord.topology.ActiveEpochs; import accord.topology.EpochReady; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.marshal.LongType; diff --git a/src/java/org/apache/cassandra/db/virtual/BatchMetricsTable.java b/src/java/org/apache/cassandra/db/virtual/BatchMetricsTable.java index d712566388..a5751a0f22 100644 --- a/src/java/org/apache/cassandra/db/virtual/BatchMetricsTable.java +++ b/src/java/org/apache/cassandra/db/virtual/BatchMetricsTable.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.virtual; import com.codahale.metrics.Snapshot; + import org.apache.cassandra.cql3.statements.BatchStatement; import org.apache.cassandra.db.marshal.DoubleType; import org.apache.cassandra.db.marshal.LongType; diff --git a/src/java/org/apache/cassandra/db/virtual/CIDRFilteringMetricsTable.java b/src/java/org/apache/cassandra/db/virtual/CIDRFilteringMetricsTable.java index 6bbf82c402..795b44ca06 100644 --- a/src/java/org/apache/cassandra/db/virtual/CIDRFilteringMetricsTable.java +++ b/src/java/org/apache/cassandra/db/virtual/CIDRFilteringMetricsTable.java @@ -25,10 +25,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.google.common.annotations.VisibleForTesting; - import com.codahale.metrics.Counter; import com.codahale.metrics.Snapshot; +import com.google.common.annotations.VisibleForTesting; + import org.apache.cassandra.auth.CassandraAuthorizer; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.QueryOptions; diff --git a/src/java/org/apache/cassandra/db/virtual/CachesTable.java b/src/java/org/apache/cassandra/db/virtual/CachesTable.java index 5a265e6330..1057af4e3c 100644 --- a/src/java/org/apache/cassandra/db/virtual/CachesTable.java +++ b/src/java/org/apache/cassandra/db/virtual/CachesTable.java @@ -18,7 +18,10 @@ package org.apache.cassandra.db.virtual; import org.apache.cassandra.cache.ChunkCache; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.DoubleType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.dht.LocalPartitioner; import org.apache.cassandra.metrics.CacheMetrics; import org.apache.cassandra.schema.TableMetadata; diff --git a/src/java/org/apache/cassandra/db/virtual/GossipInfoTable.java b/src/java/org/apache/cassandra/db/virtual/GossipInfoTable.java index 2051e6ef7b..5022ed0ea7 100644 --- a/src/java/org/apache/cassandra/db/virtual/GossipInfoTable.java +++ b/src/java/org/apache/cassandra/db/virtual/GossipInfoTable.java @@ -23,6 +23,7 @@ import java.util.Map; import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; + import org.apache.cassandra.db.marshal.InetAddressType; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.UTF8Type; diff --git a/src/java/org/apache/cassandra/db/virtual/InternodeInboundTable.java b/src/java/org/apache/cassandra/db/virtual/InternodeInboundTable.java index ce6e023f5f..cc359d1cb5 100644 --- a/src/java/org/apache/cassandra/db/virtual/InternodeInboundTable.java +++ b/src/java/org/apache/cassandra/db/virtual/InternodeInboundTable.java @@ -29,8 +29,8 @@ import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.dht.LocalPartitioner; import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.InboundMessageHandlers; +import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.tcm.membership.Location; diff --git a/src/java/org/apache/cassandra/db/virtual/LogMessagesTable.java b/src/java/org/apache/cassandra/db/virtual/LogMessagesTable.java index 87978e3fd9..09d08c424f 100644 --- a/src/java/org/apache/cassandra/db/virtual/LogMessagesTable.java +++ b/src/java/org/apache/cassandra/db/virtual/LogMessagesTable.java @@ -24,7 +24,6 @@ import java.util.List; import com.google.common.annotations.VisibleForTesting; -import ch.qos.logback.classic.spi.LoggingEvent; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.Int32Type; @@ -33,6 +32,8 @@ import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.dht.LocalPartitioner; import org.apache.cassandra.schema.TableMetadata; +import ch.qos.logback.classic.spi.LoggingEvent; + /** * Virtual table for holding Cassandra logs. Entries to this table are added via log appender. *

diff --git a/src/java/org/apache/cassandra/db/virtual/PartitionKeyStatsTable.java b/src/java/org/apache/cassandra/db/virtual/PartitionKeyStatsTable.java index d63ae194b4..c5a59d83e2 100644 --- a/src/java/org/apache/cassandra/db/virtual/PartitionKeyStatsTable.java +++ b/src/java/org/apache/cassandra/db/virtual/PartitionKeyStatsTable.java @@ -27,6 +27,7 @@ import java.util.function.Consumer; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/virtual/QueriesTable.java b/src/java/org/apache/cassandra/db/virtual/QueriesTable.java index 47b5a0c9f2..e58e874c14 100644 --- a/src/java/org/apache/cassandra/db/virtual/QueriesTable.java +++ b/src/java/org/apache/cassandra/db/virtual/QueriesTable.java @@ -30,7 +30,6 @@ import org.apache.cassandra.service.accord.AccordService; import static java.lang.Long.max; import static java.util.concurrent.TimeUnit.NANOSECONDS; - import static org.apache.cassandra.utils.Clock.Global.nanoTime; /** diff --git a/src/java/org/apache/cassandra/db/virtual/RemoteToLocalVirtualTable.java b/src/java/org/apache/cassandra/db/virtual/RemoteToLocalVirtualTable.java index 837c1feeb1..a32e94ab07 100644 --- a/src/java/org/apache/cassandra/db/virtual/RemoteToLocalVirtualTable.java +++ b/src/java/org/apache/cassandra/db/virtual/RemoteToLocalVirtualTable.java @@ -29,6 +29,7 @@ import java.util.NavigableSet; import java.util.function.Function; import accord.utils.Invariants; + import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.BufferClusteringBound; import org.apache.cassandra.db.Clustering; diff --git a/src/java/org/apache/cassandra/db/virtual/SchemaCommentsTable.java b/src/java/org/apache/cassandra/db/virtual/SchemaCommentsTable.java index c67395cb79..5f9f5c0f67 100644 --- a/src/java/org/apache/cassandra/db/virtual/SchemaCommentsTable.java +++ b/src/java/org/apache/cassandra/db/virtual/SchemaCommentsTable.java @@ -18,10 +18,10 @@ package org.apache.cassandra.db.virtual; import org.apache.cassandra.cql3.FieldIdentifier; +import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.marshal.UserType; /** * Virtual table that exposes all comments on schema elements. diff --git a/src/java/org/apache/cassandra/db/virtual/SchemaSecurityLabelsTable.java b/src/java/org/apache/cassandra/db/virtual/SchemaSecurityLabelsTable.java index 1b589649d2..9c7eaf6678 100644 --- a/src/java/org/apache/cassandra/db/virtual/SchemaSecurityLabelsTable.java +++ b/src/java/org/apache/cassandra/db/virtual/SchemaSecurityLabelsTable.java @@ -18,10 +18,10 @@ package org.apache.cassandra.db.virtual; import org.apache.cassandra.cql3.FieldIdentifier; +import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.marshal.UserType; /** * Virtual table that exposes all security labels on schema elements. diff --git a/src/java/org/apache/cassandra/db/virtual/SettingsTable.java b/src/java/org/apache/cassandra/db/virtual/SettingsTable.java index 526d7b538f..5a89b23427 100644 --- a/src/java/org/apache/cassandra/db/virtual/SettingsTable.java +++ b/src/java/org/apache/cassandra/db/virtual/SettingsTable.java @@ -26,21 +26,22 @@ import java.util.Objects; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; +import org.yaml.snakeyaml.introspector.Property; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.Config; -import org.apache.cassandra.config.Redacted; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.Loader; import org.apache.cassandra.config.Properties; +import org.apache.cassandra.config.Redacted; import org.apache.cassandra.config.Replacement; import org.apache.cassandra.config.Replacements; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.dht.LocalPartitioner; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.utils.JsonUtils; import org.apache.cassandra.service.ClientWarn; -import org.yaml.snakeyaml.introspector.Property; +import org.apache.cassandra.utils.JsonUtils; @VisibleForTesting public final class SettingsTable extends AbstractVirtualTable diff --git a/src/java/org/apache/cassandra/db/virtual/SlowQueriesTable.java b/src/java/org/apache/cassandra/db/virtual/SlowQueriesTable.java index 0d392d0ce2..ef28bf13c7 100644 --- a/src/java/org/apache/cassandra/db/virtual/SlowQueriesTable.java +++ b/src/java/org/apache/cassandra/db/virtual/SlowQueriesTable.java @@ -24,10 +24,10 @@ import java.util.Iterator; import java.util.List; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.spi.LoggingEvent; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DecoratedKey; @@ -41,6 +41,8 @@ import org.apache.cassandra.db.monitoring.MonitoringTask.Operation; import org.apache.cassandra.dht.LocalPartitioner; import org.apache.cassandra.schema.TableMetadata; +import ch.qos.logback.classic.spi.LoggingEvent; + import static java.util.concurrent.TimeUnit.NANOSECONDS; public class SlowQueriesTable extends AbstractLoggerVirtualTable diff --git a/src/java/org/apache/cassandra/db/virtual/StreamingVirtualTable.java b/src/java/org/apache/cassandra/db/virtual/StreamingVirtualTable.java index acfcede374..c1e89998ee 100644 --- a/src/java/org/apache/cassandra/db/virtual/StreamingVirtualTable.java +++ b/src/java/org/apache/cassandra/db/virtual/StreamingVirtualTable.java @@ -28,9 +28,8 @@ import org.apache.cassandra.streaming.StreamManager; import org.apache.cassandra.streaming.StreamingState; import org.apache.cassandra.utils.TimeUUID; -import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; - import static org.apache.cassandra.cql3.statements.schema.CreateTableStatement.parse; +import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; public class StreamingVirtualTable extends AbstractVirtualTable { diff --git a/src/java/org/apache/cassandra/db/virtual/SystemPropertiesTable.java b/src/java/org/apache/cassandra/db/virtual/SystemPropertiesTable.java index f1d0d7c43d..c82ede9ab7 100644 --- a/src/java/org/apache/cassandra/db/virtual/SystemPropertiesTable.java +++ b/src/java/org/apache/cassandra/db/virtual/SystemPropertiesTable.java @@ -23,7 +23,7 @@ import org.apache.cassandra.config.CassandraRelevantEnv; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.Config; import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.dht.LocalPartitioner; import org.apache.cassandra.schema.TableMetadata; diff --git a/src/java/org/apache/cassandra/db/virtual/TableMetricTables.java b/src/java/org/apache/cassandra/db/virtual/TableMetricTables.java index e1defe51e6..0159431afc 100644 --- a/src/java/org/apache/cassandra/db/virtual/TableMetricTables.java +++ b/src/java/org/apache/cassandra/db/virtual/TableMetricTables.java @@ -22,15 +22,16 @@ import java.math.BigDecimal; import java.util.Collection; import java.util.function.Function; -import com.google.common.collect.ImmutableList; -import org.apache.commons.math3.util.Precision; - import com.codahale.metrics.Counting; import com.codahale.metrics.Gauge; import com.codahale.metrics.Metered; import com.codahale.metrics.Metric; import com.codahale.metrics.Sampling; import com.codahale.metrics.Snapshot; +import com.google.common.collect.ImmutableList; + +import org.apache.commons.math3.util.Precision; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.marshal.AbstractType; diff --git a/src/java/org/apache/cassandra/db/virtual/VirtualKeyspaceRegistry.java b/src/java/org/apache/cassandra/db/virtual/VirtualKeyspaceRegistry.java index 1ef45029e3..5932549bfc 100644 --- a/src/java/org/apache/cassandra/db/virtual/VirtualKeyspaceRegistry.java +++ b/src/java/org/apache/cassandra/db/virtual/VirtualKeyspaceRegistry.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.virtual; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; + import javax.annotation.Nullable; import com.google.common.collect.Iterables; diff --git a/src/java/org/apache/cassandra/db/virtual/VirtualMutation.java b/src/java/org/apache/cassandra/db/virtual/VirtualMutation.java index 41e9e96266..929ead029f 100644 --- a/src/java/org/apache/cassandra/db/virtual/VirtualMutation.java +++ b/src/java/org/apache/cassandra/db/virtual/VirtualMutation.java @@ -22,12 +22,14 @@ import java.util.Collection; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableMap; import accord.utils.Invariants; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.IMutation; diff --git a/src/java/org/apache/cassandra/db/virtual/model/MetricRow.java b/src/java/org/apache/cassandra/db/virtual/model/MetricRow.java index 88ed98146b..a926a36bbe 100644 --- a/src/java/org/apache/cassandra/db/virtual/model/MetricRow.java +++ b/src/java/org/apache/cassandra/db/virtual/model/MetricRow.java @@ -24,6 +24,7 @@ import com.codahale.metrics.Histogram; import com.codahale.metrics.Meter; import com.codahale.metrics.Metric; import com.codahale.metrics.Timer; + import org.apache.cassandra.metrics.CassandraMetricsRegistry; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/dht/AccordBytesSplitter.java b/src/java/org/apache/cassandra/dht/AccordBytesSplitter.java index 9af4192748..d038af2657 100644 --- a/src/java/org/apache/cassandra/dht/AccordBytesSplitter.java +++ b/src/java/org/apache/cassandra/dht/AccordBytesSplitter.java @@ -23,6 +23,7 @@ import java.math.BigInteger; import accord.api.RoutingKey; import accord.primitives.Ranges; import accord.utils.Invariants; + import org.apache.cassandra.service.accord.api.TokenKey; import static accord.utils.Invariants.requireArgument; diff --git a/src/java/org/apache/cassandra/dht/AccordSplitter.java b/src/java/org/apache/cassandra/dht/AccordSplitter.java index 6fc25c1fea..e065cf85e4 100644 --- a/src/java/org/apache/cassandra/dht/AccordSplitter.java +++ b/src/java/org/apache/cassandra/dht/AccordSplitter.java @@ -22,6 +22,7 @@ import java.math.BigInteger; import accord.local.ShardDistributor; import accord.primitives.Range; + import org.apache.cassandra.schema.TableId; import org.apache.cassandra.service.accord.TokenRange; import org.apache.cassandra.service.accord.api.TokenKey; diff --git a/src/java/org/apache/cassandra/dht/BootStrapper.java b/src/java/org/apache/cassandra/dht/BootStrapper.java index 609b4b89e7..940d7b1370 100644 --- a/src/java/org/apache/cassandra/dht/BootStrapper.java +++ b/src/java/org/apache/cassandra/dht/BootStrapper.java @@ -27,10 +27,11 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; +import com.codahale.metrics.Gauge; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Gauge; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.tokenallocator.TokenAllocation; diff --git a/src/java/org/apache/cassandra/dht/BootstrapEvent.java b/src/java/org/apache/cassandra/dht/BootstrapEvent.java index e5a5cbc078..b55afe1e1e 100644 --- a/src/java/org/apache/cassandra/dht/BootstrapEvent.java +++ b/src/java/org/apache/cassandra/dht/BootstrapEvent.java @@ -22,6 +22,7 @@ import java.io.Serializable; import java.util.Collection; import java.util.HashMap; import java.util.Map; + import javax.annotation.Nullable; import com.google.common.collect.ImmutableCollection; diff --git a/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java b/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java index 551963ecec..6900ff2ac9 100644 --- a/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java +++ b/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java @@ -29,9 +29,11 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.function.Function; import com.google.common.collect.Maps; + import org.apache.commons.lang3.ArrayUtils; import accord.primitives.Ranges; + import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.AbstractType; diff --git a/src/java/org/apache/cassandra/dht/IPartitioner.java b/src/java/org/apache/cassandra/dht/IPartitioner.java index ef6d2b23fb..6adc9d92fa 100644 --- a/src/java/org/apache/cassandra/dht/IPartitioner.java +++ b/src/java/org/apache/cassandra/dht/IPartitioner.java @@ -25,6 +25,8 @@ import java.util.Optional; import java.util.Random; import java.util.function.Function; +import javax.annotation.Nullable; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.AbstractType; @@ -32,8 +34,6 @@ import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; -import javax.annotation.Nullable; - public interface IPartitioner { static IPartitioner global() diff --git a/src/java/org/apache/cassandra/dht/LocalPartitioner.java b/src/java/org/apache/cassandra/dht/LocalPartitioner.java index 2609402af7..50ca3c3854 100644 --- a/src/java/org/apache/cassandra/dht/LocalPartitioner.java +++ b/src/java/org/apache/cassandra/dht/LocalPartitioner.java @@ -26,14 +26,15 @@ import java.util.Random; import java.util.function.Function; import accord.primitives.Ranges; + import org.apache.cassandra.db.CachedHashDecoratedKey; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; -import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.memory.HeapCloner; public class LocalPartitioner implements IPartitioner diff --git a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java index e76a7df8ad..1919d530d2 100644 --- a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java +++ b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java @@ -35,6 +35,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Longs; import accord.primitives.Ranges; + import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.PartitionPosition; import org.apache.cassandra.db.PreHashedDecoratedKey; diff --git a/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java b/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java index db60e0f046..757ba2118b 100644 --- a/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java +++ b/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java @@ -30,6 +30,7 @@ import java.util.function.Function; import accord.api.RoutingKey; import accord.primitives.Ranges; + import org.apache.cassandra.db.CachedHashDecoratedKey; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.AbstractType; @@ -41,12 +42,12 @@ import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import org.apache.cassandra.utils.bytecomparable.ByteSource; -import org.apache.cassandra.utils.bytecomparable.ByteSourceInverse; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.Pair; +import org.apache.cassandra.utils.bytecomparable.ByteComparable; +import org.apache.cassandra.utils.bytecomparable.ByteSource; +import org.apache.cassandra.utils.bytecomparable.ByteSourceInverse; import static accord.utils.Invariants.requireArgument; import static java.lang.Integer.max; diff --git a/src/java/org/apache/cassandra/dht/OwnedRanges.java b/src/java/org/apache/cassandra/dht/OwnedRanges.java index dd60283d94..ed6027d83b 100644 --- a/src/java/org/apache/cassandra/dht/OwnedRanges.java +++ b/src/java/org/apache/cassandra/dht/OwnedRanges.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/dht/RandomPartitioner.java b/src/java/org/apache/cassandra/dht/RandomPartitioner.java index 40dfbbe614..3c0021674a 100644 --- a/src/java/org/apache/cassandra/dht/RandomPartitioner.java +++ b/src/java/org/apache/cassandra/dht/RandomPartitioner.java @@ -34,6 +34,7 @@ import com.google.common.annotations.VisibleForTesting; import accord.primitives.Ranges; import accord.utils.Invariants; + import org.apache.cassandra.db.CachedHashDecoratedKey; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.AbstractType; diff --git a/src/java/org/apache/cassandra/dht/Range.java b/src/java/org/apache/cassandra/dht/Range.java index 774faa1a23..a95249d426 100644 --- a/src/java/org/apache/cassandra/dht/Range.java +++ b/src/java/org/apache/cassandra/dht/Range.java @@ -31,6 +31,7 @@ import java.util.Set; import java.util.function.Predicate; import com.google.common.collect.Iterables; + import org.apache.commons.lang3.ObjectUtils; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/src/java/org/apache/cassandra/dht/RangeFetchMapCalculator.java b/src/java/org/apache/cassandra/dht/RangeFetchMapCalculator.java index 185ec19b90..bdeaec086d 100644 --- a/src/java/org/apache/cassandra/dht/RangeFetchMapCalculator.java +++ b/src/java/org/apache/cassandra/dht/RangeFetchMapCalculator.java @@ -30,24 +30,23 @@ import com.google.common.base.Predicates; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import org.apache.cassandra.locator.EndpointsByRange; -import org.apache.cassandra.locator.EndpointsForRange; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.locator.Locator; -import org.apache.cassandra.locator.Replica; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.apache.cassandra.locator.Replicas; import org.psjava.algo.graph.flownetwork.FordFulkersonAlgorithm; import org.psjava.algo.graph.flownetwork.MaximumFlowAlgorithm; import org.psjava.algo.graph.flownetwork.MaximumFlowAlgorithmResult; import org.psjava.algo.graph.pathfinder.DFSPathFinder; import org.psjava.ds.graph.CapacityEdge; import org.psjava.ds.graph.MutableCapacityGraph; -import org.psjava.ds.numbersystrem.IntegerNumberSystem; import org.psjava.ds.math.Function; +import org.psjava.ds.numbersystrem.IntegerNumberSystem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.locator.EndpointsByRange; +import org.apache.cassandra.locator.EndpointsForRange; +import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.locator.Locator; +import org.apache.cassandra.locator.Replica; +import org.apache.cassandra.locator.Replicas; /** * We model the graph like this: diff --git a/src/java/org/apache/cassandra/dht/RangeStreamer.java b/src/java/org/apache/cassandra/dht/RangeStreamer.java index f21dd3186d..cbdb42e60f 100644 --- a/src/java/org/apache/cassandra/dht/RangeStreamer.java +++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java @@ -35,6 +35,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,12 +54,12 @@ import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.LocalStrategy; import org.apache.cassandra.locator.Locator; import org.apache.cassandra.locator.NetworkTopologyStrategy; +import org.apache.cassandra.locator.NodeProximity; import org.apache.cassandra.locator.RangesAtEndpoint; import org.apache.cassandra.locator.Replica; import org.apache.cassandra.locator.ReplicaCollection; import org.apache.cassandra.locator.ReplicaCollection.Builder.Conflict; import org.apache.cassandra.locator.Replicas; -import org.apache.cassandra.locator.NodeProximity; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.ReplicationParams; import org.apache.cassandra.schema.Schema; diff --git a/src/java/org/apache/cassandra/dht/ReversedLongLocalPartitioner.java b/src/java/org/apache/cassandra/dht/ReversedLongLocalPartitioner.java index c39b920864..b22ae5d8eb 100644 --- a/src/java/org/apache/cassandra/dht/ReversedLongLocalPartitioner.java +++ b/src/java/org/apache/cassandra/dht/ReversedLongLocalPartitioner.java @@ -29,6 +29,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Longs; import accord.primitives.Ranges; + import org.apache.cassandra.db.CachedHashDecoratedKey; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.AbstractType; diff --git a/src/java/org/apache/cassandra/dht/Token.java b/src/java/org/apache/cassandra/dht/Token.java index ae99b2b37d..9305b33af4 100644 --- a/src/java/org/apache/cassandra/dht/Token.java +++ b/src/java/org/apache/cassandra/dht/Token.java @@ -24,6 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/dht/tokenallocator/OfflineTokenAllocator.java b/src/java/org/apache/cassandra/dht/tokenallocator/OfflineTokenAllocator.java index 0d9eec598a..23543b7913 100644 --- a/src/java/org/apache/cassandra/dht/tokenallocator/OfflineTokenAllocator.java +++ b/src/java/org/apache/cassandra/dht/tokenallocator/OfflineTokenAllocator.java @@ -29,6 +29,7 @@ import java.util.TreeSet; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; + import org.apache.commons.math3.stat.descriptive.SummaryStatistics; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/src/java/org/apache/cassandra/dht/tokenallocator/ReplicationAwareTokenAllocator.java b/src/java/org/apache/cassandra/dht/tokenallocator/ReplicationAwareTokenAllocator.java index 539b467c7f..03c24f2fd5 100644 --- a/src/java/org/apache/cassandra/dht/tokenallocator/ReplicationAwareTokenAllocator.java +++ b/src/java/org/apache/cassandra/dht/tokenallocator/ReplicationAwareTokenAllocator.java @@ -17,7 +17,10 @@ */ package org.apache.cassandra.dht.tokenallocator; -import java.util.*; +import java.util.Collection; +import java.util.Map; +import java.util.NavigableMap; +import java.util.PriorityQueue; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; diff --git a/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java b/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java index a946cd20ef..8b7b2a4289 100644 --- a/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java +++ b/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java @@ -32,7 +32,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import org.apache.commons.math3.stat.descriptive.SummaryStatistics; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocatorEvent.java b/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocatorEvent.java index acb5ed2b85..6ac2f333b4 100644 --- a/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocatorEvent.java +++ b/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocatorEvent.java @@ -23,6 +23,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.annotation.Nullable; import com.google.common.collect.ImmutableList; diff --git a/src/java/org/apache/cassandra/diag/LastEventIdBroadcaster.java b/src/java/org/apache/cassandra/diag/LastEventIdBroadcaster.java index e82b40cbcb..c56854f541 100644 --- a/src/java/org/apache/cassandra/diag/LastEventIdBroadcaster.java +++ b/src/java/org/apache/cassandra/diag/LastEventIdBroadcaster.java @@ -24,6 +24,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; + import javax.management.Notification; import javax.management.NotificationBroadcasterSupport; import javax.management.NotificationFilter; diff --git a/src/java/org/apache/cassandra/exceptions/RequestFailure.java b/src/java/org/apache/cassandra/exceptions/RequestFailure.java index 03d088a239..8efba5a2e3 100644 --- a/src/java/org/apache/cassandra/exceptions/RequestFailure.java +++ b/src/java/org/apache/cassandra/exceptions/RequestFailure.java @@ -19,6 +19,7 @@ package org.apache.cassandra.exceptions; import java.io.IOException; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -31,7 +32,6 @@ import org.apache.cassandra.tcm.NotCMSException; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.cassandra.exceptions.ExceptionSerializer.nullableRemoteExceptionSerializer; -import static org.apache.cassandra.exceptions.RequestFailureReason.UNKNOWN; /** * Allow inclusion of a serialized exception in failure response messages diff --git a/src/java/org/apache/cassandra/fql/FullQueryLogger.java b/src/java/org/apache/cassandra/fql/FullQueryLogger.java index a9697ba49f..47239fd424 100644 --- a/src/java/org/apache/cassandra/fql/FullQueryLogger.java +++ b/src/java/org/apache/cassandra/fql/FullQueryLogger.java @@ -28,19 +28,19 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.google.common.primitives.Ints; -import org.apache.cassandra.io.util.File; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import io.netty.buffer.ByteBuf; import net.openhft.chronicle.bytes.BytesStore; import net.openhft.chronicle.wire.ValueOut; import net.openhft.chronicle.wire.WireOut; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QueryEvents; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.statements.BatchStatement; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.CBUtil; import org.apache.cassandra.transport.Message; @@ -50,6 +50,8 @@ import org.apache.cassandra.utils.binlog.BinLogOptions; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; import org.apache.cassandra.utils.concurrent.WeightedQueue; +import io.netty.buffer.ByteBuf; + import static com.google.common.base.Preconditions.checkNotNull; /** diff --git a/src/java/org/apache/cassandra/fql/FullQueryLoggerOptionsCompositeData.java b/src/java/org/apache/cassandra/fql/FullQueryLoggerOptionsCompositeData.java index 184f1846cc..5f4d2d6ccd 100644 --- a/src/java/org/apache/cassandra/fql/FullQueryLoggerOptionsCompositeData.java +++ b/src/java/org/apache/cassandra/fql/FullQueryLoggerOptionsCompositeData.java @@ -20,6 +20,7 @@ package org.apache.cassandra.fql; import java.util.HashMap; import java.util.Map; + import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.CompositeType; diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java b/src/java/org/apache/cassandra/gms/EndpointState.java index 41a79caf7f..ebf2d97e21 100644 --- a/src/java/org/apache/cassandra/gms/EndpointState.java +++ b/src/java/org/apache/cassandra/gms/EndpointState.java @@ -17,16 +17,20 @@ */ package org.apache.cassandra.gms; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.util.Collections; +import java.util.EnumMap; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; - import com.google.common.base.Function; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java index 693cf578bb..13d6266ca0 100644 --- a/src/java/org/apache/cassandra/gms/FailureDetector.java +++ b/src/java/org/apache/cassandra/gms/FailureDetector.java @@ -33,6 +33,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; + import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.CompositeType; @@ -44,6 +45,7 @@ import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/gms/GossipDigest.java b/src/java/org/apache/cassandra/gms/GossipDigest.java index 53f6c5c52c..ff4a0f82bd 100644 --- a/src/java/org/apache/cassandra/gms/GossipDigest.java +++ b/src/java/org/apache/cassandra/gms/GossipDigest.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.gms; -import java.io.*; +import java.io.IOException; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.IVersionedSerializer; diff --git a/src/java/org/apache/cassandra/gms/GossipDigestAck2.java b/src/java/org/apache/cassandra/gms/GossipDigestAck2.java index ed959a54e5..91ce3edd5a 100644 --- a/src/java/org/apache/cassandra/gms/GossipDigestAck2.java +++ b/src/java/org/apache/cassandra/gms/GossipDigestAck2.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.gms; -import java.io.*; +import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/src/java/org/apache/cassandra/gms/GossipDigestSyn.java b/src/java/org/apache/cassandra/gms/GossipDigestSyn.java index ec4639f087..b93fa25ca7 100644 --- a/src/java/org/apache/cassandra/gms/GossipDigestSyn.java +++ b/src/java/org/apache/cassandra/gms/GossipDigestSyn.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.gms; -import java.io.*; +import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/src/java/org/apache/cassandra/gms/GossipShutdown.java b/src/java/org/apache/cassandra/gms/GossipShutdown.java index 713b2c4fe3..24e727b81c 100644 --- a/src/java/org/apache/cassandra/gms/GossipShutdown.java +++ b/src/java/org/apache/cassandra/gms/GossipShutdown.java @@ -19,6 +19,7 @@ package org.apache.cassandra.gms; import java.io.IOException; + import javax.annotation.Nullable; import org.apache.cassandra.io.IVersionedSerializer; diff --git a/src/java/org/apache/cassandra/gms/GossipShutdownVerbHandler.java b/src/java/org/apache/cassandra/gms/GossipShutdownVerbHandler.java index 9878520b81..5ddc8b3dc0 100644 --- a/src/java/org/apache/cassandra/gms/GossipShutdownVerbHandler.java +++ b/src/java/org/apache/cassandra/gms/GossipShutdownVerbHandler.java @@ -17,12 +17,12 @@ */ package org.apache.cassandra.gms; -import org.apache.cassandra.net.IVerbHandler; -import org.apache.cassandra.net.Message; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.net.IVerbHandler; +import org.apache.cassandra.net.Message; + public class GossipShutdownVerbHandler implements IVerbHandler { public static final GossipShutdownVerbHandler instance = new GossipShutdownVerbHandler(); diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java index 6d0195093f..fa88f227df 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -47,6 +47,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReentrantLock; import java.util.function.BooleanSupplier; import java.util.stream.Collectors; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; @@ -56,42 +57,43 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.cassandra.concurrent.FutureTask; -import org.apache.cassandra.dht.IPartitioner; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.net.NoPayload; -import org.apache.cassandra.net.Verb; -import org.apache.cassandra.tcm.ClusterMetadataService; -import org.apache.cassandra.tcm.compatibility.GossipHelper; -import org.apache.cassandra.tcm.membership.Directory; -import org.apache.cassandra.tcm.membership.Location; -import org.apache.cassandra.tcm.membership.NodeAddresses; -import org.apache.cassandra.tcm.membership.NodeVersion; -import org.apache.cassandra.tcm.transformations.Assassinate; -import org.apache.cassandra.utils.CassandraVersion; -import org.apache.cassandra.utils.ExecutorUtils; -import org.apache.cassandra.utils.MBeanWrapper; -import org.apache.cassandra.utils.NoSpamLogger; -import org.apache.cassandra.utils.Pair; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.concurrent.FutureTask; import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Token; +import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.net.NoPayload; import org.apache.cassandra.net.RequestCallback; +import org.apache.cassandra.net.Verb; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tcm.ClusterMetadata; +import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.Epoch; +import org.apache.cassandra.tcm.compatibility.GossipHelper; +import org.apache.cassandra.tcm.membership.Directory; +import org.apache.cassandra.tcm.membership.Location; +import org.apache.cassandra.tcm.membership.NodeAddresses; import org.apache.cassandra.tcm.membership.NodeId; import org.apache.cassandra.tcm.membership.NodeState; +import org.apache.cassandra.tcm.membership.NodeVersion; +import org.apache.cassandra.tcm.transformations.Assassinate; +import org.apache.cassandra.utils.CassandraVersion; +import org.apache.cassandra.utils.ExecutorUtils; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.JVMStabilityInspector; +import org.apache.cassandra.utils.MBeanWrapper; +import org.apache.cassandra.utils.NoSpamLogger; +import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.concurrent.NotScheduledFuture; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; diff --git a/src/java/org/apache/cassandra/gms/GossiperEvent.java b/src/java/org/apache/cassandra/gms/GossiperEvent.java index 366c1bbf25..8989851539 100644 --- a/src/java/org/apache/cassandra/gms/GossiperEvent.java +++ b/src/java/org/apache/cassandra/gms/GossiperEvent.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; + import javax.annotation.Nullable; import org.apache.cassandra.diag.DiagnosticEvent; diff --git a/src/java/org/apache/cassandra/gms/HeartBeatState.java b/src/java/org/apache/cassandra/gms/HeartBeatState.java index 374d346a0a..a477eafb4e 100644 --- a/src/java/org/apache/cassandra/gms/HeartBeatState.java +++ b/src/java/org/apache/cassandra/gms/HeartBeatState.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.gms; -import java.io.*; +import java.io.IOException; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.IVersionedSerializer; diff --git a/src/java/org/apache/cassandra/gms/IGossiper.java b/src/java/org/apache/cassandra/gms/IGossiper.java index aa9d95a97d..ec460a268f 100644 --- a/src/java/org/apache/cassandra/gms/IGossiper.java +++ b/src/java/org/apache/cassandra/gms/IGossiper.java @@ -19,6 +19,7 @@ package org.apache.cassandra.gms; import java.util.Map; + import javax.annotation.Nullable; import org.apache.cassandra.locator.InetAddressAndPort; diff --git a/src/java/org/apache/cassandra/gms/TokenSerializer.java b/src/java/org/apache/cassandra/gms/TokenSerializer.java index 0048e7c921..d1bd482fa1 100644 --- a/src/java/org/apache/cassandra/gms/TokenSerializer.java +++ b/src/java/org/apache/cassandra/gms/TokenSerializer.java @@ -17,18 +17,20 @@ */ package org.apache.cassandra.gms; -import org.apache.cassandra.dht.IPartitioner; -import org.apache.cassandra.dht.Token; -import org.apache.cassandra.utils.ByteArrayUtil; -import org.apache.cassandra.utils.FBUtilities; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.*; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collection; +import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.dht.Token; +import org.apache.cassandra.utils.ByteArrayUtil; +import org.apache.cassandra.utils.FBUtilities; public class TokenSerializer { diff --git a/src/java/org/apache/cassandra/gms/VersionedValue.java b/src/java/org/apache/cassandra/gms/VersionedValue.java index 126aecf703..68a0fad2ec 100644 --- a/src/java/org/apache/cassandra/gms/VersionedValue.java +++ b/src/java/org/apache/cassandra/gms/VersionedValue.java @@ -31,6 +31,7 @@ import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.db.TypeSizes; diff --git a/src/java/org/apache/cassandra/hints/ChecksummedDataInput.java b/src/java/org/apache/cassandra/hints/ChecksummedDataInput.java index c7bf42c755..51e8c440f6 100644 --- a/src/java/org/apache/cassandra/hints/ChecksummedDataInput.java +++ b/src/java/org/apache/cassandra/hints/ChecksummedDataInput.java @@ -24,9 +24,12 @@ import java.util.zip.CRC32; import com.google.common.base.Preconditions; import org.apache.cassandra.io.compress.BufferType; -import org.apache.cassandra.io.util.*; -import org.apache.cassandra.utils.Throwables; +import org.apache.cassandra.io.util.ChannelProxy; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.RandomAccessReader; +import org.apache.cassandra.io.util.RebufferingInputStream; import org.apache.cassandra.utils.NativeLibrary; +import org.apache.cassandra.utils.Throwables; import org.apache.cassandra.utils.memory.MemoryUtil; /** diff --git a/src/java/org/apache/cassandra/hints/CompressedChecksummedDataInput.java b/src/java/org/apache/cassandra/hints/CompressedChecksummedDataInput.java index 8236364077..4ea4fb098c 100644 --- a/src/java/org/apache/cassandra/hints/CompressedChecksummedDataInput.java +++ b/src/java/org/apache/cassandra/hints/CompressedChecksummedDataInput.java @@ -26,8 +26,8 @@ import com.google.common.annotations.VisibleForTesting; import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.compress.ICompressor; import org.apache.cassandra.io.util.ChannelProxy; -import org.apache.cassandra.utils.memory.BufferPool; import org.apache.cassandra.utils.Throwables; +import org.apache.cassandra.utils.memory.BufferPool; import org.apache.cassandra.utils.memory.BufferPools; public final class CompressedChecksummedDataInput extends ChecksummedDataInput diff --git a/src/java/org/apache/cassandra/hints/CompressedHintsWriter.java b/src/java/org/apache/cassandra/hints/CompressedHintsWriter.java index 63a59cd625..180bae7082 100644 --- a/src/java/org/apache/cassandra/hints/CompressedHintsWriter.java +++ b/src/java/org/apache/cassandra/hints/CompressedHintsWriter.java @@ -26,7 +26,6 @@ import java.util.zip.CRC32; import com.google.common.annotations.VisibleForTesting; import org.apache.cassandra.io.compress.ICompressor; - import org.apache.cassandra.io.util.File; public class CompressedHintsWriter extends HintsWriter diff --git a/src/java/org/apache/cassandra/hints/EncryptedChecksummedDataInput.java b/src/java/org/apache/cassandra/hints/EncryptedChecksummedDataInput.java index ab788b9ad6..203c823419 100644 --- a/src/java/org/apache/cassandra/hints/EncryptedChecksummedDataInput.java +++ b/src/java/org/apache/cassandra/hints/EncryptedChecksummedDataInput.java @@ -19,17 +19,19 @@ package org.apache.cassandra.hints; import java.io.IOException; import java.nio.ByteBuffer; + import javax.crypto.Cipher; import com.google.common.annotations.VisibleForTesting; -import io.netty.util.concurrent.FastThreadLocal; -import org.apache.cassandra.security.EncryptionUtils; import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.compress.ICompressor; import org.apache.cassandra.io.util.ChannelProxy; +import org.apache.cassandra.security.EncryptionUtils; import org.apache.cassandra.utils.Throwables; +import io.netty.util.concurrent.FastThreadLocal; + public class EncryptedChecksummedDataInput extends ChecksummedDataInput { private static final FastThreadLocal reusableBuffers = new FastThreadLocal() diff --git a/src/java/org/apache/cassandra/hints/EncryptedHintsWriter.java b/src/java/org/apache/cassandra/hints/EncryptedHintsWriter.java index f9822d9b23..7122cb0402 100644 --- a/src/java/org/apache/cassandra/hints/EncryptedHintsWriter.java +++ b/src/java/org/apache/cassandra/hints/EncryptedHintsWriter.java @@ -21,13 +21,14 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.util.zip.CRC32; + import javax.crypto.Cipher; import com.google.common.annotations.VisibleForTesting; +import org.apache.cassandra.io.compress.ICompressor; import org.apache.cassandra.io.util.File; import org.apache.cassandra.security.EncryptionUtils; -import org.apache.cassandra.io.compress.ICompressor; import static org.apache.cassandra.utils.FBUtilities.updateChecksum; diff --git a/src/java/org/apache/cassandra/hints/Hint.java b/src/java/org/apache/cassandra/hints/Hint.java index 886e781ee6..8c46441dfc 100644 --- a/src/java/org/apache/cassandra/hints/Hint.java +++ b/src/java/org/apache/cassandra/hints/Hint.java @@ -21,11 +21,12 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.TimeUnit; +import javax.annotation.Nullable; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; import com.google.common.primitives.Ints; -import javax.annotation.Nullable; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.io.IVersionedSerializer; diff --git a/src/java/org/apache/cassandra/hints/HintEvent.java b/src/java/org/apache/cassandra/hints/HintEvent.java index d709fbcd82..372dc373d2 100644 --- a/src/java/org/apache/cassandra/hints/HintEvent.java +++ b/src/java/org/apache/cassandra/hints/HintEvent.java @@ -21,6 +21,7 @@ package org.apache.cassandra.hints; import java.io.Serializable; import java.util.HashMap; import java.util.UUID; + import javax.annotation.Nullable; import org.apache.cassandra.diag.DiagnosticEvent; diff --git a/src/java/org/apache/cassandra/hints/HintMessage.java b/src/java/org/apache/cassandra/hints/HintMessage.java index 978ab41701..0955424b52 100644 --- a/src/java/org/apache/cassandra/hints/HintMessage.java +++ b/src/java/org/apache/cassandra/hints/HintMessage.java @@ -23,9 +23,10 @@ import java.nio.ByteBuffer; import java.util.Objects; import java.util.UUID; +import javax.annotation.Nullable; + import com.google.common.primitives.Ints; -import javax.annotation.Nullable; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.exceptions.UnknownTableException; import org.apache.cassandra.io.IVersionedAsymmetricSerializer; diff --git a/src/java/org/apache/cassandra/hints/HintsCatalog.java b/src/java/org/apache/cassandra/hints/HintsCatalog.java index 87e60336a7..000054ea61 100644 --- a/src/java/org/apache/cassandra/hints/HintsCatalog.java +++ b/src/java/org/apache/cassandra/hints/HintsCatalog.java @@ -28,9 +28,11 @@ import java.util.Optional; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Stream; + import javax.annotation.Nullable; import com.google.common.collect.ImmutableMap; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/hints/HintsDescriptor.java b/src/java/org/apache/cassandra/hints/HintsDescriptor.java index d52e309f0e..0f85c6101e 100644 --- a/src/java/org/apache/cassandra/hints/HintsDescriptor.java +++ b/src/java/org/apache/cassandra/hints/HintsDescriptor.java @@ -27,17 +27,16 @@ import java.util.Optional; import java.util.UUID; import java.util.regex.Pattern; import java.util.zip.CRC32; + import javax.crypto.Cipher; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; - -import org.apache.cassandra.io.util.File; -import org.apache.cassandra.io.util.FileInputStreamPlus; import com.google.common.io.ByteStreams; import com.google.common.io.CountingOutputStream; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,6 +46,8 @@ import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.compress.ICompressor; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileInputStreamPlus; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.schema.CompressionParams; import org.apache.cassandra.security.EncryptionContext; diff --git a/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java b/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java index 5777062db9..e508b4755e 100644 --- a/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java +++ b/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java @@ -26,9 +26,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BooleanSupplier; import java.util.function.Predicate; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.util.concurrent.RateLimiter; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/hints/HintsDispatcher.java b/src/java/org/apache/cassandra/hints/HintsDispatcher.java index 3753b9334d..3ba38bdeaf 100644 --- a/src/java/org/apache/cassandra/hints/HintsDispatcher.java +++ b/src/java/org/apache/cassandra/hints/HintsDispatcher.java @@ -30,10 +30,12 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import java.util.function.BooleanSupplier; import java.util.function.Function; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import com.google.common.util.concurrent.RateLimiter; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/hints/HintsReader.java b/src/java/org/apache/cassandra/hints/HintsReader.java index 117e1ccdd8..3bd5dbe727 100644 --- a/src/java/org/apache/cassandra/hints/HintsReader.java +++ b/src/java/org/apache/cassandra/hints/HintsReader.java @@ -27,13 +27,13 @@ import javax.annotation.Nullable; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.RateLimiter; -import org.apache.cassandra.exceptions.CoordinatorBehindException; -import org.apache.cassandra.io.util.File; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.exceptions.CoordinatorBehindException; import org.apache.cassandra.exceptions.UnknownTableException; import org.apache.cassandra.io.FSReadError; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.metrics.HintsServiceMetrics; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.service.StorageService; diff --git a/src/java/org/apache/cassandra/hints/HintsService.java b/src/java/org/apache/cassandra/hints/HintsService.java index 67990f5049..4db17c516f 100644 --- a/src/java/org/apache/cassandra/hints/HintsService.java +++ b/src/java/org/apache/cassandra/hints/HintsService.java @@ -33,6 +33,7 @@ import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/hints/HintsStore.java b/src/java/org/apache/cassandra/hints/HintsStore.java index 795c1479e1..4dd05efcf8 100644 --- a/src/java/org/apache/cassandra/hints/HintsStore.java +++ b/src/java/org/apache/cassandra/hints/HintsStore.java @@ -31,11 +31,13 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.function.Predicate; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/hints/HintsWriteExecutor.java b/src/java/org/apache/cassandra/hints/HintsWriteExecutor.java index 2b0a434dd3..335d6cd092 100644 --- a/src/java/org/apache/cassandra/hints/HintsWriteExecutor.java +++ b/src/java/org/apache/cassandra/hints/HintsWriteExecutor.java @@ -23,15 +23,15 @@ import java.util.Iterator; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.concurrent.ExecutorPlus; -import org.apache.cassandra.utils.concurrent.Future; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.FSError; import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.util.FileUtils; +import org.apache.cassandra.utils.concurrent.Future; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; diff --git a/src/java/org/apache/cassandra/index/Index.java b/src/java/org/apache/cassandra/index/Index.java index b830d75c98..06106f8683 100644 --- a/src/java/org/apache/cassandra/index/Index.java +++ b/src/java/org/apache/cassandra/index/Index.java @@ -32,6 +32,7 @@ import java.util.concurrent.Callable; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/java/org/apache/cassandra/index/IndexRegistry.java b/src/java/org/apache/cassandra/index/IndexRegistry.java index a7ad1fd61e..20a7d3ea1b 100644 --- a/src/java/org/apache/cassandra/index/IndexRegistry.java +++ b/src/java/org/apache/cassandra/index/IndexRegistry.java @@ -33,7 +33,12 @@ import javax.annotation.Nullable; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.Operator; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.ReadCommand; +import org.apache.cassandra.db.RegularAndStaticColumns; +import org.apache.cassandra.db.WriteContext; import org.apache.cassandra.db.filter.IndexHints; import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; diff --git a/src/java/org/apache/cassandra/index/IndexStatusManager.java b/src/java/org/apache/cassandra/index/IndexStatusManager.java index 0f50a26276..c3a6f91ceb 100644 --- a/src/java/org/apache/cassandra/index/IndexStatusManager.java +++ b/src/java/org/apache/cassandra/index/IndexStatusManager.java @@ -31,6 +31,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java index 8c6466feac..2846a8ede5 100644 --- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java +++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java @@ -19,7 +19,18 @@ package org.apache.cassandra.index; import java.io.UncheckedIOException; import java.lang.reflect.Constructor; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.StringJoiner; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -42,7 +53,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.util.concurrent.FutureCallback; -import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +61,21 @@ import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.concurrent.FutureTask; import org.apache.cassandra.concurrent.ImmediateExecutor; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.Directories; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.LivenessInfo; +import org.apache.cassandra.db.MutableDeletionInfo; +import org.apache.cassandra.db.RangeTombstone; +import org.apache.cassandra.db.ReadExecutionController; +import org.apache.cassandra.db.RegularAndStaticColumns; +import org.apache.cassandra.db.SinglePartitionReadCommand; +import org.apache.cassandra.db.Slices; +import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.db.WriteContext; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.filter.ClusteringIndexSliceFilter; import org.apache.cassandra.db.filter.ColumnFilter; @@ -64,7 +88,15 @@ import org.apache.cassandra.db.memtable.Memtable; import org.apache.cassandra.db.partitions.ImmutableBTreePartition; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.BTreeRow; +import org.apache.cassandra.db.rows.Cell; +import org.apache.cassandra.db.rows.Cells; +import org.apache.cassandra.db.rows.RangeTombstoneMarker; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.RowDiffListener; +import org.apache.cassandra.db.rows.Rows; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.index.Index.IndexBuildingSupport; import org.apache.cassandra.index.internal.CassandraIndex; @@ -73,6 +105,7 @@ import org.apache.cassandra.index.transactions.CompactionTransaction; import org.apache.cassandra.index.transactions.IndexTransaction; import org.apache.cassandra.index.transactions.UpdateTransaction; import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.notifications.INotification; import org.apache.cassandra.notifications.INotificationConsumer; import org.apache.cassandra.notifications.SSTableAddedNotification; @@ -86,7 +119,11 @@ import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.JVMStabilityInspector; -import org.apache.cassandra.utils.concurrent.*; +import org.apache.cassandra.utils.concurrent.AsyncPromise; +import org.apache.cassandra.utils.concurrent.Future; +import org.apache.cassandra.utils.concurrent.ImmediateFuture; +import org.apache.cassandra.utils.concurrent.Promise; +import org.apache.cassandra.utils.concurrent.Refs; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; import static org.apache.cassandra.config.CassandraRelevantProperties.FORCE_DEFAULT_INDEXING_PAGE_SIZE; diff --git a/src/java/org/apache/cassandra/index/SingletonIndexQueryPlan.java b/src/java/org/apache/cassandra/index/SingletonIndexQueryPlan.java index e6b529d7f5..cb602b9822 100644 --- a/src/java/org/apache/cassandra/index/SingletonIndexQueryPlan.java +++ b/src/java/org/apache/cassandra/index/SingletonIndexQueryPlan.java @@ -23,6 +23,7 @@ package org.apache.cassandra.index; import java.util.Collections; import java.util.Set; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/java/org/apache/cassandra/index/TargetParser.java b/src/java/org/apache/cassandra/index/TargetParser.java index e13bc17454..883399155f 100644 --- a/src/java/org/apache/cassandra/index/TargetParser.java +++ b/src/java/org/apache/cassandra/index/TargetParser.java @@ -23,12 +23,12 @@ import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.statements.schema.IndexTarget; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.IndexMetadata; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.Pair; public class TargetParser diff --git a/src/java/org/apache/cassandra/index/accord/CheckpointIntervalArrayIndex.java b/src/java/org/apache/cassandra/index/accord/CheckpointIntervalArrayIndex.java index 9fbb3634b9..aa908d54bb 100644 --- a/src/java/org/apache/cassandra/index/accord/CheckpointIntervalArrayIndex.java +++ b/src/java/org/apache/cassandra/index/accord/CheckpointIntervalArrayIndex.java @@ -35,6 +35,7 @@ import accord.utils.CheckpointIntervalArray; import accord.utils.CheckpointIntervalArrayBuilder; import accord.utils.CheckpointIntervalArrayBuilder.Accessor; import accord.utils.SortedArrays; + import org.apache.cassandra.index.accord.IndexDescriptor.IndexComponent; import org.apache.cassandra.io.util.ChecksumedRandomAccessReader; import org.apache.cassandra.io.util.ChecksumedSequentialWriter; diff --git a/src/java/org/apache/cassandra/index/accord/IndexMetrics.java b/src/java/org/apache/cassandra/index/accord/IndexMetrics.java index cb12afe147..30995157b2 100644 --- a/src/java/org/apache/cassandra/index/accord/IndexMetrics.java +++ b/src/java/org/apache/cassandra/index/accord/IndexMetrics.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.List; import com.codahale.metrics.Timer; + import org.apache.cassandra.metrics.CassandraMetricsRegistry; import org.apache.cassandra.metrics.DefaultNameFactory; diff --git a/src/java/org/apache/cassandra/index/accord/MemtableIndex.java b/src/java/org/apache/cassandra/index/accord/MemtableIndex.java index c225bbe5f0..0a6fe4c183 100644 --- a/src/java/org/apache/cassandra/index/accord/MemtableIndex.java +++ b/src/java/org/apache/cassandra/index/accord/MemtableIndex.java @@ -28,6 +28,7 @@ import javax.annotation.Nullable; import accord.local.MaxDecidedRX; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.schema.TableId; diff --git a/src/java/org/apache/cassandra/index/accord/MemtableIndexManager.java b/src/java/org/apache/cassandra/index/accord/MemtableIndexManager.java index 359a214bb1..14f8fa543c 100644 --- a/src/java/org/apache/cassandra/index/accord/MemtableIndexManager.java +++ b/src/java/org/apache/cassandra/index/accord/MemtableIndexManager.java @@ -26,6 +26,7 @@ import javax.annotation.Nullable; import accord.local.MaxDecidedRX.DecidedRX; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; import org.apache.cassandra.db.memtable.Memtable; diff --git a/src/java/org/apache/cassandra/index/accord/RangeMemoryIndex.java b/src/java/org/apache/cassandra/index/accord/RangeMemoryIndex.java index 2ced2a8ffc..5286cdbe2b 100644 --- a/src/java/org/apache/cassandra/index/accord/RangeMemoryIndex.java +++ b/src/java/org/apache/cassandra/index/accord/RangeMemoryIndex.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; import java.util.stream.Collectors; + import javax.annotation.Nullable; import javax.annotation.concurrent.GuardedBy; @@ -41,6 +42,7 @@ import accord.primitives.Timestamp; import accord.primitives.Txn; import accord.primitives.TxnId; import accord.primitives.Unseekable; + import org.apache.cassandra.cache.IMeasurableMemory; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.DecoratedKey; diff --git a/src/java/org/apache/cassandra/index/accord/RouteIndexFormat.java b/src/java/org/apache/cassandra/index/accord/RouteIndexFormat.java index a05e2e8354..537f55ac3a 100644 --- a/src/java/org/apache/cassandra/index/accord/RouteIndexFormat.java +++ b/src/java/org/apache/cassandra/index/accord/RouteIndexFormat.java @@ -40,6 +40,7 @@ import accord.local.StoreParticipants; import accord.primitives.Participants; import accord.primitives.Txn; import accord.primitives.TxnId; + import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.Int32Type; diff --git a/src/java/org/apache/cassandra/index/accord/RouteJournalIndex.java b/src/java/org/apache/cassandra/index/accord/RouteJournalIndex.java index 849ecd9d70..eb20373a73 100644 --- a/src/java/org/apache/cassandra/index/accord/RouteJournalIndex.java +++ b/src/java/org/apache/cassandra/index/accord/RouteJournalIndex.java @@ -41,6 +41,7 @@ import org.slf4j.LoggerFactory; import accord.local.MaxDecidedRX.DecidedRX; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.CassandraWriteContext; diff --git a/src/java/org/apache/cassandra/index/accord/RouteMemtableIndexManager.java b/src/java/org/apache/cassandra/index/accord/RouteMemtableIndexManager.java index 67174d7ae0..7c9adb6c3d 100644 --- a/src/java/org/apache/cassandra/index/accord/RouteMemtableIndexManager.java +++ b/src/java/org/apache/cassandra/index/accord/RouteMemtableIndexManager.java @@ -29,6 +29,7 @@ import javax.annotation.Nullable; import accord.local.MaxDecidedRX.DecidedRX; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; import org.apache.cassandra.db.memtable.Memtable; diff --git a/src/java/org/apache/cassandra/index/accord/RouteSSTableManager.java b/src/java/org/apache/cassandra/index/accord/RouteSSTableManager.java index af3074be28..9a21f9690d 100644 --- a/src/java/org/apache/cassandra/index/accord/RouteSSTableManager.java +++ b/src/java/org/apache/cassandra/index/accord/RouteSSTableManager.java @@ -32,6 +32,7 @@ import javax.annotation.Nullable; import accord.local.MaxDecidedRX; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.File; diff --git a/src/java/org/apache/cassandra/index/accord/SSTableIndex.java b/src/java/org/apache/cassandra/index/accord/SSTableIndex.java index 8163c05783..eb9845002d 100644 --- a/src/java/org/apache/cassandra/index/accord/SSTableIndex.java +++ b/src/java/org/apache/cassandra/index/accord/SSTableIndex.java @@ -32,6 +32,7 @@ import javax.annotation.Nullable; import accord.local.MaxDecidedRX.DecidedRX; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.index.accord.CheckpointIntervalArrayIndex.SegmentSearcher; import org.apache.cassandra.index.accord.IndexDescriptor.IndexComponent; import org.apache.cassandra.io.FSReadError; diff --git a/src/java/org/apache/cassandra/index/accord/SSTableManager.java b/src/java/org/apache/cassandra/index/accord/SSTableManager.java index f1d80f8983..1ffb224ca4 100644 --- a/src/java/org/apache/cassandra/index/accord/SSTableManager.java +++ b/src/java/org/apache/cassandra/index/accord/SSTableManager.java @@ -27,6 +27,7 @@ import javax.annotation.Nullable; import accord.local.MaxDecidedRX; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.schema.TableId; diff --git a/src/java/org/apache/cassandra/index/internal/CassandraIndex.java b/src/java/org/apache/cassandra/index/internal/CassandraIndex.java index 53100ad499..895015bc93 100644 --- a/src/java/org/apache/cassandra/index/internal/CassandraIndex.java +++ b/src/java/org/apache/cassandra/index/internal/CassandraIndex.java @@ -21,7 +21,10 @@ package org.apache.cassandra.index.internal; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Optional; import java.util.concurrent.Callable; import java.util.concurrent.Future; import java.util.stream.Collectors; @@ -35,7 +38,20 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.cql3.statements.schema.IndexTarget; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.CBuilder; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringComparator; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.LivenessInfo; +import org.apache.cassandra.db.RangeTombstone; +import org.apache.cassandra.db.ReadCommand; +import org.apache.cassandra.db.RegularAndStaticColumns; +import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.db.WriteContext; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.db.lifecycle.SSTableSet; @@ -44,10 +60,17 @@ import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.CollectionType; import org.apache.cassandra.db.memtable.Memtable; import org.apache.cassandra.db.partitions.PartitionUpdate; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.BTreeRow; +import org.apache.cassandra.db.rows.Cell; +import org.apache.cassandra.db.rows.CellPath; +import org.apache.cassandra.db.rows.ComplexColumnData; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.dht.LocalPartitioner; import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.index.*; +import org.apache.cassandra.index.Index; +import org.apache.cassandra.index.IndexRegistry; +import org.apache.cassandra.index.SecondaryIndexBuilder; +import org.apache.cassandra.index.TargetParser; import org.apache.cassandra.index.internal.composites.CompositesSearcher; import org.apache.cassandra.index.internal.keys.KeysSearcher; import org.apache.cassandra.index.transactions.IndexTransaction; diff --git a/src/java/org/apache/cassandra/index/internal/composites/ClusteringColumnIndex.java b/src/java/org/apache/cassandra/index/internal/composites/ClusteringColumnIndex.java index 23cff3f846..c8a63f457a 100644 --- a/src/java/org/apache/cassandra/index/internal/composites/ClusteringColumnIndex.java +++ b/src/java/org/apache/cassandra/index/internal/composites/ClusteringColumnIndex.java @@ -19,7 +19,11 @@ package org.apache.cassandra.index.internal.composites; import java.nio.ByteBuffer; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.CBuilder; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.rows.CellPath; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.index.internal.CassandraIndex; diff --git a/src/java/org/apache/cassandra/index/internal/composites/CollectionEntryIndex.java b/src/java/org/apache/cassandra/index/internal/composites/CollectionEntryIndex.java index ab78195474..632b7fb1d3 100644 --- a/src/java/org/apache/cassandra/index/internal/composites/CollectionEntryIndex.java +++ b/src/java/org/apache/cassandra/index/internal/composites/CollectionEntryIndex.java @@ -19,16 +19,16 @@ package org.apache.cassandra.index.internal.composites; import java.nio.ByteBuffer; -import org.apache.cassandra.db.marshal.ByteBufferAccessor; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.CollectionType; import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.CellPath; import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.IndexMetadata; /** diff --git a/src/java/org/apache/cassandra/index/internal/composites/CollectionKeyIndex.java b/src/java/org/apache/cassandra/index/internal/composites/CollectionKeyIndex.java index c1c599bbae..a6c79104db 100644 --- a/src/java/org/apache/cassandra/index/internal/composites/CollectionKeyIndex.java +++ b/src/java/org/apache/cassandra/index/internal/composites/CollectionKeyIndex.java @@ -19,7 +19,6 @@ package org.apache.cassandra.index.internal.composites; import java.nio.ByteBuffer; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.ColumnFamilyStore; @@ -27,6 +26,7 @@ import org.apache.cassandra.db.marshal.SetType; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.CellPath; import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.IndexMetadata; /** diff --git a/src/java/org/apache/cassandra/index/internal/composites/CollectionKeyIndexBase.java b/src/java/org/apache/cassandra/index/internal/composites/CollectionKeyIndexBase.java index f0201e1eff..1222eaf6a3 100644 --- a/src/java/org/apache/cassandra/index/internal/composites/CollectionKeyIndexBase.java +++ b/src/java/org/apache/cassandra/index/internal/composites/CollectionKeyIndexBase.java @@ -19,7 +19,11 @@ package org.apache.cassandra.index.internal.composites; import java.nio.ByteBuffer; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.CBuilder; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.rows.CellPath; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.index.internal.CassandraIndex; diff --git a/src/java/org/apache/cassandra/index/internal/composites/CollectionValueIndex.java b/src/java/org/apache/cassandra/index/internal/composites/CollectionValueIndex.java index ed929f22b3..f5d290d827 100644 --- a/src/java/org/apache/cassandra/index/internal/composites/CollectionValueIndex.java +++ b/src/java/org/apache/cassandra/index/internal/composites/CollectionValueIndex.java @@ -19,14 +19,21 @@ package org.apache.cassandra.index.internal.composites; import java.nio.ByteBuffer; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.cql3.Operator; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.CBuilder; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.CollectionType; import org.apache.cassandra.db.marshal.SetType; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.Cell; +import org.apache.cassandra.db.rows.CellPath; +import org.apache.cassandra.db.rows.ComplexColumnData; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.index.internal.CassandraIndex; import org.apache.cassandra.index.internal.IndexEntry; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.IndexMetadata; /** diff --git a/src/java/org/apache/cassandra/index/internal/composites/PartitionKeyIndex.java b/src/java/org/apache/cassandra/index/internal/composites/PartitionKeyIndex.java index b8235370b7..4280ee65a1 100644 --- a/src/java/org/apache/cassandra/index/internal/composites/PartitionKeyIndex.java +++ b/src/java/org/apache/cassandra/index/internal/composites/PartitionKeyIndex.java @@ -19,7 +19,11 @@ package org.apache.cassandra.index.internal.composites; import java.nio.ByteBuffer; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.CBuilder; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.db.rows.CellPath; import org.apache.cassandra.db.rows.Row; diff --git a/src/java/org/apache/cassandra/index/internal/composites/RegularColumnIndex.java b/src/java/org/apache/cassandra/index/internal/composites/RegularColumnIndex.java index 9dcb8dfcc4..f68862e114 100644 --- a/src/java/org/apache/cassandra/index/internal/composites/RegularColumnIndex.java +++ b/src/java/org/apache/cassandra/index/internal/composites/RegularColumnIndex.java @@ -19,7 +19,12 @@ package org.apache.cassandra.index.internal.composites; import java.nio.ByteBuffer; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.CBuilder; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringComparator; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.rows.Cell; diff --git a/src/java/org/apache/cassandra/index/internal/keys/KeysIndex.java b/src/java/org/apache/cassandra/index/internal/keys/KeysIndex.java index 695fb67ef9..3391ab3435 100644 --- a/src/java/org/apache/cassandra/index/internal/keys/KeysIndex.java +++ b/src/java/org/apache/cassandra/index/internal/keys/KeysIndex.java @@ -22,17 +22,21 @@ package org.apache.cassandra.index.internal.keys; import java.nio.ByteBuffer; +import org.apache.cassandra.db.CBuilder; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.ByteBufferAccessor; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.schema.TableMetadataRef; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.db.*; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.CellPath; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.index.internal.CassandraIndex; import org.apache.cassandra.index.internal.IndexEntry; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.IndexMetadata; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.TableMetadataRef; public class KeysIndex extends CassandraIndex { diff --git a/src/java/org/apache/cassandra/index/sai/QueryContext.java b/src/java/org/apache/cassandra/index/sai/QueryContext.java index e319730359..41ff703bb8 100644 --- a/src/java/org/apache/cassandra/index/sai/QueryContext.java +++ b/src/java/org/apache/cassandra/index/sai/QueryContext.java @@ -20,6 +20,7 @@ package org.apache.cassandra.index.sai; import java.util.Collection; import java.util.concurrent.TimeUnit; + import javax.annotation.concurrent.NotThreadSafe; import org.apache.cassandra.db.ReadCommand; diff --git a/src/java/org/apache/cassandra/index/sai/SSTableContextManager.java b/src/java/org/apache/cassandra/index/sai/SSTableContextManager.java index b2df0f29c2..06027296e6 100644 --- a/src/java/org/apache/cassandra/index/sai/SSTableContextManager.java +++ b/src/java/org/apache/cassandra/index/sai/SSTableContextManager.java @@ -22,9 +22,11 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; + import javax.annotation.concurrent.ThreadSafe; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/index/sai/StorageAttachedIndex.java b/src/java/org/apache/cassandra/index/sai/StorageAttachedIndex.java index 9f13496b52..33ae11e3af 100644 --- a/src/java/org/apache/cassandra/index/sai/StorageAttachedIndex.java +++ b/src/java/org/apache/cassandra/index/sai/StorageAttachedIndex.java @@ -46,15 +46,14 @@ import com.google.common.collect.ImmutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.github.jbellis.jvector.vector.VectorSimilarityFunction; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.CqlBuilder; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.cql3.restrictions.ClusteringElements; import org.apache.cassandra.cql3.restrictions.Restriction; import org.apache.cassandra.cql3.restrictions.SimpleRestriction; -import org.apache.cassandra.cql3.restrictions.ClusteringElements; import org.apache.cassandra.cql3.statements.schema.IndexTarget; import org.apache.cassandra.db.CassandraWriteContext; import org.apache.cassandra.db.ColumnFamilyStore; @@ -116,6 +115,8 @@ import org.apache.cassandra.utils.concurrent.FutureCombiner; import org.apache.cassandra.utils.concurrent.ImmediateFuture; import org.apache.cassandra.utils.concurrent.OpOrder; +import io.github.jbellis.jvector.vector.VectorSimilarityFunction; + import static org.apache.cassandra.index.sai.disk.v1.IndexWriterConfig.MAX_TOP_K; public class StorageAttachedIndex implements Index diff --git a/src/java/org/apache/cassandra/index/sai/StorageAttachedIndexBuilder.java b/src/java/org/apache/cassandra/index/sai/StorageAttachedIndexBuilder.java index 55f6381859..a2022f3501 100644 --- a/src/java/org/apache/cassandra/index/sai/StorageAttachedIndexBuilder.java +++ b/src/java/org/apache/cassandra/index/sai/StorageAttachedIndexBuilder.java @@ -29,6 +29,7 @@ import java.util.SortedMap; import java.util.stream.Collectors; import com.google.common.collect.Maps; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,8 +44,8 @@ import org.apache.cassandra.index.sai.disk.StorageAttachedIndexWriter; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.KeyIterator; -import org.apache.cassandra.io.sstable.SSTableIdentityIterator; import org.apache.cassandra.io.sstable.SSTableFlushObserver; +import org.apache.cassandra.io.sstable.SSTableIdentityIterator; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.schema.TableMetadata; diff --git a/src/java/org/apache/cassandra/index/sai/StorageAttachedIndexGroup.java b/src/java/org/apache/cassandra/index/sai/StorageAttachedIndexGroup.java index 28711e9abe..046af69618 100644 --- a/src/java/org/apache/cassandra/index/sai/StorageAttachedIndexGroup.java +++ b/src/java/org/apache/cassandra/index/sai/StorageAttachedIndexGroup.java @@ -25,12 +25,14 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; import java.util.stream.Collectors; + import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Ints; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/index/sai/VectorQueryContext.java b/src/java/org/apache/cassandra/index/sai/VectorQueryContext.java index a0533a0fe8..499af1601b 100644 --- a/src/java/org/apache/cassandra/index/sai/VectorQueryContext.java +++ b/src/java/org/apache/cassandra/index/sai/VectorQueryContext.java @@ -26,7 +26,6 @@ import java.util.NavigableSet; import java.util.Set; import java.util.TreeSet; -import io.github.jbellis.jvector.util.Bits; import org.apache.cassandra.db.ReadCommand; import org.apache.cassandra.index.sai.disk.PrimaryKeyMap; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; @@ -34,6 +33,8 @@ import org.apache.cassandra.index.sai.disk.v1.vector.DiskAnn; import org.apache.cassandra.index.sai.disk.v1.vector.OnHeapGraph; import org.apache.cassandra.index.sai.utils.PrimaryKey; +import io.github.jbellis.jvector.util.Bits; + /** * This represents the state of a vector query. It is repsonsible for maintaining a list of any {@link PrimaryKey}s diff --git a/src/java/org/apache/cassandra/index/sai/analyzer/NonTokenizingAnalyzer.java b/src/java/org/apache/cassandra/index/sai/analyzer/NonTokenizingAnalyzer.java index 30eedc08f3..4e24d1dfba 100644 --- a/src/java/org/apache/cassandra/index/sai/analyzer/NonTokenizingAnalyzer.java +++ b/src/java/org/apache/cassandra/index/sai/analyzer/NonTokenizingAnalyzer.java @@ -22,6 +22,7 @@ import java.nio.ByteBuffer; import java.util.Map; import com.google.common.base.MoreObjects; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/index/sai/disk/IndexSearchResultIterator.java b/src/java/org/apache/cassandra/index/sai/disk/IndexSearchResultIterator.java index e59d7c6e35..172b7e7c95 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/IndexSearchResultIterator.java +++ b/src/java/org/apache/cassandra/index/sai/disk/IndexSearchResultIterator.java @@ -30,10 +30,10 @@ import org.apache.cassandra.db.PartitionPosition; import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.exceptions.QueryCancelledException; import org.apache.cassandra.index.sai.QueryContext; -import org.apache.cassandra.index.sai.memory.MemtableIndex; -import org.apache.cassandra.index.sai.plan.Expression; import org.apache.cassandra.index.sai.iterators.KeyRangeIterator; import org.apache.cassandra.index.sai.iterators.KeyRangeUnionIterator; +import org.apache.cassandra.index.sai.memory.MemtableIndex; +import org.apache.cassandra.index.sai.plan.Expression; import org.apache.cassandra.index.sai.plan.QueryViewBuilder; import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.io.util.FileUtils; diff --git a/src/java/org/apache/cassandra/index/sai/disk/RowMapping.java b/src/java/org/apache/cassandra/index/sai/disk/RowMapping.java index 2b91bc304b..5bf64360af 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/RowMapping.java +++ b/src/java/org/apache/cassandra/index/sai/disk/RowMapping.java @@ -23,6 +23,7 @@ import java.util.Iterator; import javax.annotation.concurrent.NotThreadSafe; import com.carrotsearch.hppc.LongArrayList; + import org.apache.cassandra.db.compaction.OperationType; import org.apache.cassandra.db.rows.RangeTombstoneMarker; import org.apache.cassandra.db.rows.Row; diff --git a/src/java/org/apache/cassandra/index/sai/disk/SSTableIndex.java b/src/java/org/apache/cassandra/index/sai/disk/SSTableIndex.java index 3c4614dcbc..f887a818ca 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/SSTableIndex.java +++ b/src/java/org/apache/cassandra/index/sai/disk/SSTableIndex.java @@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/index/sai/disk/StorageAttachedIndexWriter.java b/src/java/org/apache/cassandra/index/sai/disk/StorageAttachedIndexWriter.java index 88c538ad79..77e25da812 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/StorageAttachedIndexWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/StorageAttachedIndexWriter.java @@ -22,9 +22,11 @@ import java.util.Collection; import java.util.Objects; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; + import javax.annotation.concurrent.NotThreadSafe; import com.google.common.base.Stopwatch; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/index/sai/disk/format/IndexDescriptor.java b/src/java/org/apache/cassandra/index/sai/disk/format/IndexDescriptor.java index 976097b084..21b5ef78b3 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/format/IndexDescriptor.java +++ b/src/java/org/apache/cassandra/index/sai/disk/format/IndexDescriptor.java @@ -26,15 +26,18 @@ import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Objects; import com.google.common.io.Files; + +import org.apache.lucene.store.IndexInput; +import org.apache.lucene.util.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; import org.apache.cassandra.dht.IPartitioner; -import org.apache.cassandra.index.sai.StorageAttachedIndex; import org.apache.cassandra.index.sai.IndexValidation; import org.apache.cassandra.index.sai.SSTableContext; +import org.apache.cassandra.index.sai.StorageAttachedIndex; import org.apache.cassandra.index.sai.disk.PerColumnIndexWriter; import org.apache.cassandra.index.sai.disk.PerSSTableIndexWriter; import org.apache.cassandra.index.sai.disk.PrimaryKeyMap; @@ -52,8 +55,6 @@ import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Throwables; -import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.IOUtils; /** * The {@link IndexDescriptor} is an analog of the SSTable {@link Descriptor} and provides version diff --git a/src/java/org/apache/cassandra/index/sai/disk/io/BufferedChecksumIndexInput.java b/src/java/org/apache/cassandra/index/sai/disk/io/BufferedChecksumIndexInput.java index 333868466a..b04d9014ca 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/io/BufferedChecksumIndexInput.java +++ b/src/java/org/apache/cassandra/index/sai/disk/io/BufferedChecksumIndexInput.java @@ -18,12 +18,12 @@ package org.apache.cassandra.index.sai.disk.io; -import org.apache.lucene.store.ChecksumIndexInput; -import org.apache.lucene.store.IndexInput; - import java.io.IOException; import java.util.zip.Checksum; +import org.apache.lucene.store.ChecksumIndexInput; +import org.apache.lucene.store.IndexInput; + /** * This implementation of {@link ChecksumIndexInput} is based on {@link org.apache.lucene.store.BufferedChecksumIndexInput} * but uses custom checksum algorithm instead of the hardcoded {@code CRC32} in {@code BufferedChecksumIndexInput}. diff --git a/src/java/org/apache/cassandra/index/sai/disk/io/IndexFileUtils.java b/src/java/org/apache/cassandra/index/sai/disk/io/IndexFileUtils.java index 2c203bdbce..c3501fb23b 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/io/IndexFileUtils.java +++ b/src/java/org/apache/cassandra/index/sai/disk/io/IndexFileUtils.java @@ -26,6 +26,9 @@ import java.util.zip.Checksum; import com.google.common.annotations.VisibleForTesting; +import org.apache.lucene.store.ChecksumIndexInput; +import org.apache.lucene.store.IndexInput; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.io.util.File; @@ -33,8 +36,6 @@ import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.io.util.SequentialWriter; import org.apache.cassandra.io.util.SequentialWriterOption; -import org.apache.lucene.store.ChecksumIndexInput; -import org.apache.lucene.store.IndexInput; public class IndexFileUtils { diff --git a/src/java/org/apache/cassandra/index/sai/disk/io/IndexInputReader.java b/src/java/org/apache/cassandra/index/sai/disk/io/IndexInputReader.java index b97c727c6a..0c93f3c1fe 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/io/IndexInputReader.java +++ b/src/java/org/apache/cassandra/index/sai/disk/io/IndexInputReader.java @@ -20,11 +20,12 @@ package org.apache.cassandra.index.sai.disk.io; import java.io.IOException; -import org.apache.cassandra.io.util.FileHandle; -import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.lucene.store.DataInput; import org.apache.lucene.store.IndexInput; +import org.apache.cassandra.io.util.FileHandle; +import org.apache.cassandra.io.util.RandomAccessReader; + /** * This is a wrapper over a Cassandra {@link RandomAccessReader} that provides an {@link IndexInput} * interface for Lucene classes that need {@link IndexInput}. This is an optimisation because the diff --git a/src/java/org/apache/cassandra/index/sai/disk/io/IndexOutputWriter.java b/src/java/org/apache/cassandra/index/sai/disk/io/IndexOutputWriter.java index 4e801011da..baaf6e1c44 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/io/IndexOutputWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/io/IndexOutputWriter.java @@ -18,15 +18,17 @@ package org.apache.cassandra.index.sai.disk.io; import java.io.IOException; + import javax.annotation.concurrent.NotThreadSafe; import com.google.common.base.MoreObjects; + +import org.apache.lucene.store.IndexOutput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.SequentialWriter; -import org.apache.lucene.store.IndexOutput; /** * This is a wrapper over a Cassandra {@link SequentialWriter} that provides a Lucene {@link IndexOutput} diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/ColumnCompletionMarkerUtil.java b/src/java/org/apache/cassandra/index/sai/disk/v1/ColumnCompletionMarkerUtil.java index 6d3a3dd927..35395595fa 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/ColumnCompletionMarkerUtil.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/ColumnCompletionMarkerUtil.java @@ -20,12 +20,13 @@ package org.apache.cassandra.index.sai.disk.v1; import java.io.IOException; +import org.apache.lucene.store.IndexInput; +import org.apache.lucene.store.IndexOutput; + import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; import org.apache.cassandra.index.sai.disk.io.IndexOutputWriter; import org.apache.cassandra.index.sai.utils.IndexIdentifier; -import org.apache.lucene.store.IndexInput; -import org.apache.lucene.store.IndexOutput; /** * Utility class for creating and reading the column completion marker, {@link IndexComponent#COLUMN_COMPLETION_MARKER}. diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/IndexWriterConfig.java b/src/java/org/apache/cassandra/index/sai/disk/v1/IndexWriterConfig.java index c6b0607437..c9f0116490 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/IndexWriterConfig.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/IndexWriterConfig.java @@ -21,12 +21,13 @@ import java.util.Arrays; import java.util.Map; import java.util.stream.Collectors; -import io.github.jbellis.jvector.vector.VectorSimilarityFunction; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.index.sai.disk.v1.vector.OptimizeFor; import org.apache.cassandra.index.sai.utils.IndexTermType; +import io.github.jbellis.jvector.vector.VectorSimilarityFunction; + import static org.apache.cassandra.config.CassandraRelevantProperties.SAI_VECTOR_SEARCH_MAX_TOP_K; import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/LongArray.java b/src/java/org/apache/cassandra/index/sai/disk/v1/LongArray.java index 044e41b23e..2c5f604f19 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/LongArray.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/LongArray.java @@ -20,6 +20,7 @@ package org.apache.cassandra.index.sai.disk.v1; import java.io.Closeable; import java.io.IOException; import java.util.function.Supplier; + import javax.annotation.concurrent.NotThreadSafe; /** diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/MemtableIndexWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/MemtableIndexWriter.java index 846f65505b..795d5c1a0d 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/MemtableIndexWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/MemtableIndexWriter.java @@ -22,11 +22,12 @@ import java.util.Collections; import java.util.Iterator; import java.util.concurrent.TimeUnit; +import com.carrotsearch.hppc.LongArrayList; import com.google.common.base.Stopwatch; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.carrotsearch.hppc.LongArrayList; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.index.sai.disk.PerColumnIndexWriter; import org.apache.cassandra.index.sai.disk.RowMapping; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/MetadataSource.java b/src/java/org/apache/cassandra/index/sai/disk/v1/MetadataSource.java index e1c5c4f450..41698cc8ce 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/MetadataSource.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/MetadataSource.java @@ -20,18 +20,20 @@ package org.apache.cassandra.index.sai.disk.v1; import java.io.IOException; import java.util.HashMap; import java.util.Map; + import javax.annotation.concurrent.NotThreadSafe; -import org.apache.cassandra.index.sai.disk.format.IndexComponent; -import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; -import org.apache.cassandra.index.sai.disk.io.IndexFileUtils; import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.ChecksumIndexInput; import org.apache.lucene.store.DataInput; import org.apache.lucene.store.IndexInput; import org.apache.lucene.util.BytesRef; +import org.apache.cassandra.index.sai.disk.format.IndexComponent; +import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; +import org.apache.cassandra.index.sai.disk.io.IndexFileUtils; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; + @NotThreadSafe public class MetadataSource { diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/MetadataWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/MetadataWriter.java index 4b4dc7a98e..3628d0f4ff 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/MetadataWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/MetadataWriter.java @@ -21,12 +21,14 @@ import java.io.Closeable; import java.io.IOException; import java.util.HashMap; import java.util.Map; + import javax.annotation.concurrent.NotThreadSafe; -import org.apache.cassandra.index.sai.disk.ResettableByteBuffersIndexOutput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.util.BytesRef; +import org.apache.cassandra.index.sai.disk.ResettableByteBuffersIndexOutput; + @NotThreadSafe public class MetadataWriter implements Closeable { diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/SAICodecUtils.java b/src/java/org/apache/cassandra/index/sai/disk/v1/SAICodecUtils.java index 58be96a531..a0e33c66cc 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/SAICodecUtils.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/SAICodecUtils.java @@ -20,14 +20,15 @@ package org.apache.cassandra.index.sai.disk.v1; import java.io.IOException; -import org.apache.cassandra.index.sai.disk.format.Version; -import org.apache.cassandra.index.sai.disk.io.IndexFileUtils; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.store.ChecksumIndexInput; import org.apache.lucene.store.DataInput; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.cassandra.index.sai.disk.format.Version; +import org.apache.cassandra.index.sai.disk.io.IndexFileUtils; + import static org.apache.lucene.codecs.CodecUtil.CODEC_MAGIC; import static org.apache.lucene.codecs.CodecUtil.FOOTER_MAGIC; import static org.apache.lucene.codecs.CodecUtil.footerLength; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/SSTableIndexWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/SSTableIndexWriter.java index c3c83992b2..65480f0985 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/SSTableIndexWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/SSTableIndexWriter.java @@ -24,9 +24,11 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.function.BooleanSupplier; + import javax.annotation.concurrent.NotThreadSafe; import com.google.common.base.Stopwatch; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/SkinnyPrimaryKeyMap.java b/src/java/org/apache/cassandra/index/sai/disk/v1/SkinnyPrimaryKeyMap.java index a764eb6c8e..ab02c1c3cd 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/SkinnyPrimaryKeyMap.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/SkinnyPrimaryKeyMap.java @@ -20,6 +20,7 @@ package org.apache.cassandra.index.sai.disk.v1; import java.io.IOException; import java.util.Arrays; + import javax.annotation.concurrent.NotThreadSafe; import javax.annotation.concurrent.ThreadSafe; @@ -31,8 +32,8 @@ import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; import org.apache.cassandra.index.sai.disk.v1.bitpack.BlockPackedReader; import org.apache.cassandra.index.sai.disk.v1.bitpack.MonotonicBlockPackedReader; import org.apache.cassandra.index.sai.disk.v1.bitpack.NumericValuesMeta; -import org.apache.cassandra.index.sai.disk.v1.keystore.KeyLookupMeta; import org.apache.cassandra.index.sai.disk.v1.keystore.KeyLookup; +import org.apache.cassandra.index.sai.disk.v1.keystore.KeyLookupMeta; import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.io.util.FileUtils; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/V1OnDiskFormat.java b/src/java/org/apache/cassandra/index/sai/disk/v1/V1OnDiskFormat.java index d8f5d9e631..ba8b13ca4c 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/V1OnDiskFormat.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/V1OnDiskFormat.java @@ -23,11 +23,13 @@ import java.io.UncheckedIOException; import java.util.EnumSet; import java.util.Set; +import com.codahale.metrics.Gauge; import com.google.common.annotations.VisibleForTesting; + +import org.apache.lucene.store.IndexInput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Gauge; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.compaction.OperationType; import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; @@ -50,7 +52,6 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.metrics.CassandraMetricsRegistry; import org.apache.cassandra.metrics.DefaultNameFactory; import org.apache.cassandra.utils.Throwables; -import org.apache.lucene.store.IndexInput; import static org.apache.cassandra.utils.FBUtilities.prettyPrintMemory; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/WidePrimaryKeyMap.java b/src/java/org/apache/cassandra/index/sai/disk/v1/WidePrimaryKeyMap.java index c37681e268..c6e7737cf0 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/WidePrimaryKeyMap.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/WidePrimaryKeyMap.java @@ -20,6 +20,7 @@ package org.apache.cassandra.index.sai.disk.v1; import java.io.IOException; import java.util.Arrays; + import javax.annotation.concurrent.NotThreadSafe; import javax.annotation.concurrent.ThreadSafe; @@ -31,8 +32,8 @@ import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; import org.apache.cassandra.index.sai.disk.v1.bitpack.BlockPackedReader; import org.apache.cassandra.index.sai.disk.v1.bitpack.NumericValuesMeta; -import org.apache.cassandra.index.sai.disk.v1.keystore.KeyLookupMeta; import org.apache.cassandra.index.sai.disk.v1.keystore.KeyLookup; +import org.apache.cassandra.index.sai.disk.v1.keystore.KeyLookupMeta; import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.FileHandle; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreePostingsIndex.java b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreePostingsIndex.java index 4b87f4673a..f6cea5fd32 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreePostingsIndex.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreePostingsIndex.java @@ -21,6 +21,7 @@ import java.io.IOException; import com.carrotsearch.hppc.IntLongHashMap; import com.carrotsearch.hppc.IntLongMap; + import org.apache.cassandra.index.sai.disk.io.IndexInputReader; import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.io.util.RandomAccessReader; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreePostingsWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreePostingsWriter.java index 590528e782..0122d41886 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreePostingsWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreePostingsWriter.java @@ -29,27 +29,29 @@ import java.util.PriorityQueue; import java.util.TreeMap; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; + import javax.annotation.concurrent.NotThreadSafe; import com.google.common.base.Stopwatch; import com.google.common.collect.HashMultimap; import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; + +import org.agrona.collections.IntArrayList; +import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.util.packed.PackedLongValues; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.agrona.collections.IntArrayList; import org.apache.cassandra.config.CassandraRelevantProperties; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.io.IndexOutputWriter; import org.apache.cassandra.index.sai.disk.v1.postings.MergePostingList; import org.apache.cassandra.index.sai.disk.v1.postings.PackedLongsPostingList; import org.apache.cassandra.index.sai.disk.v1.postings.PostingsWriter; import org.apache.cassandra.index.sai.postings.PeekablePostingList; import org.apache.cassandra.index.sai.postings.PostingList; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.utils.FBUtilities; -import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.packed.PackedLongValues; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeQueries.java b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeQueries.java index bb4b477c40..2a4d2f2bbc 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeQueries.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeQueries.java @@ -19,10 +19,11 @@ package org.apache.cassandra.index.sai.disk.v1.bbtree; import java.nio.ByteBuffer; +import org.apache.lucene.index.PointValues.Relation; + import org.apache.cassandra.index.sai.plan.Expression; import org.apache.cassandra.index.sai.utils.IndexTermType; import org.apache.cassandra.utils.ByteArrayUtil; -import org.apache.lucene.index.PointValues.Relation; public class BlockBalancedTreeQueries { diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeReader.java b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeReader.java index 0f14db390b..6c019ea520 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeReader.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeReader.java @@ -25,12 +25,19 @@ import java.util.PriorityQueue; import java.util.concurrent.TimeUnit; import com.google.common.base.Stopwatch; + +import org.apache.lucene.index.CorruptIndexException; +import org.apache.lucene.index.PointValues.Relation; +import org.apache.lucene.store.IndexInput; +import org.apache.lucene.util.FixedBitSet; +import org.apache.lucene.util.LongValues; +import org.apache.lucene.util.packed.DirectReader; +import org.apache.lucene.util.packed.DirectWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.exceptions.QueryCancelledException; import org.apache.cassandra.index.sai.QueryContext; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.io.IndexFileUtils; import org.apache.cassandra.index.sai.disk.io.SeekingRandomAccessInput; import org.apache.cassandra.index.sai.disk.v1.postings.FilteringPostingList; @@ -39,17 +46,11 @@ import org.apache.cassandra.index.sai.disk.v1.postings.PostingsReader; import org.apache.cassandra.index.sai.metrics.QueryEventListener; import org.apache.cassandra.index.sai.postings.PeekablePostingList; import org.apache.cassandra.index.sai.postings.PostingList; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.ByteArrayUtil; import org.apache.cassandra.utils.Throwables; -import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.index.PointValues.Relation; -import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LongValues; -import org.apache.lucene.util.packed.DirectReader; -import org.apache.lucene.util.packed.DirectWriter; /** * Handles intersection of a point or point range with a block balanced tree previously written with diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeWalker.java b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeWalker.java index 5a01b81f09..8dec44455d 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeWalker.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeWalker.java @@ -26,6 +26,12 @@ import javax.annotation.concurrent.NotThreadSafe; import com.google.common.annotations.VisibleForTesting; import org.agrona.collections.IntArrayList; +import org.apache.lucene.index.CorruptIndexException; +import org.apache.lucene.store.ByteArrayDataInput; +import org.apache.lucene.store.DataInput; +import org.apache.lucene.store.IndexInput; +import org.apache.lucene.util.BytesRef; + import org.apache.cassandra.index.sai.disk.io.IndexInputReader; import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; import org.apache.cassandra.io.util.FileHandle; @@ -34,11 +40,6 @@ import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.utils.ByteArrayUtil; import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.Throwables; -import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.store.ByteArrayDataInput; -import org.apache.lucene.store.DataInput; -import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.BytesRef; /** * Base reader for a block balanced tree previously written with {@link BlockBalancedTreeWriter}. diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeWriter.java index 0fa4180c09..bca5af47cc 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeWriter.java @@ -28,13 +28,6 @@ import javax.annotation.concurrent.NotThreadSafe; import com.google.common.base.MoreObjects; -import org.apache.cassandra.config.CassandraRelevantProperties; -import org.apache.cassandra.index.sai.disk.ResettableByteBuffersIndexOutput; -import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; -import org.apache.cassandra.index.sai.utils.IndexEntry; -import org.apache.cassandra.utils.ByteArrayUtil; -import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import org.apache.cassandra.utils.bytecomparable.ByteSourceInverse; import org.apache.lucene.store.ByteBuffersDataOutput; import org.apache.lucene.store.DataOutput; import org.apache.lucene.store.IndexOutput; @@ -44,6 +37,14 @@ import org.apache.lucene.util.IntroSorter; import org.apache.lucene.util.Sorter; import org.apache.lucene.util.bkd.BKDWriter; +import org.apache.cassandra.config.CassandraRelevantProperties; +import org.apache.cassandra.index.sai.disk.ResettableByteBuffersIndexOutput; +import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; +import org.apache.cassandra.index.sai.utils.IndexEntry; +import org.apache.cassandra.utils.ByteArrayUtil; +import org.apache.cassandra.utils.bytecomparable.ByteComparable; +import org.apache.cassandra.utils.bytecomparable.ByteSourceInverse; + import static org.apache.cassandra.index.sai.postings.PostingList.END_OF_STREAM; /** diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/NumericIndexWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/NumericIndexWriter.java index aedf64be1f..bde129a7a0 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/NumericIndexWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/NumericIndexWriter.java @@ -27,17 +27,18 @@ import java.util.Map; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; -import org.apache.cassandra.index.sai.disk.format.IndexComponent; -import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.disk.v1.segment.SegmentWriter; -import org.apache.cassandra.index.sai.utils.IndexEntry; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; -import org.apache.cassandra.index.sai.disk.io.IndexOutputWriter; -import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.util.packed.PackedInts; import org.apache.lucene.util.packed.PackedLongValues; +import org.apache.cassandra.index.sai.disk.format.IndexComponent; +import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; +import org.apache.cassandra.index.sai.disk.io.IndexOutputWriter; +import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; +import org.apache.cassandra.index.sai.disk.v1.segment.SegmentWriter; +import org.apache.cassandra.index.sai.utils.IndexEntry; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; + /** * Specialized writer for values, that builds them into a {@link BlockBalancedTreeWriter} with auxiliary * posting lists on eligible tree levels. diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/AbstractBlockPackedReader.java b/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/AbstractBlockPackedReader.java index 33f23acd15..c0d674a7f8 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/AbstractBlockPackedReader.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/AbstractBlockPackedReader.java @@ -19,12 +19,13 @@ package org.apache.cassandra.index.sai.disk.v1.bitpack; import javax.annotation.concurrent.NotThreadSafe; -import org.apache.cassandra.index.sai.disk.io.SeekingRandomAccessInput; -import org.apache.cassandra.index.sai.disk.v1.LongArray; import org.apache.lucene.store.IndexInput; import org.apache.lucene.util.LongValues; import org.apache.lucene.util.packed.DirectReader; +import org.apache.cassandra.index.sai.disk.io.SeekingRandomAccessInput; +import org.apache.cassandra.index.sai.disk.v1.LongArray; + @NotThreadSafe public abstract class AbstractBlockPackedReader implements LongArray { diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/AbstractBlockPackedWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/AbstractBlockPackedWriter.java index 767217d88f..c57e1a482f 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/AbstractBlockPackedWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/AbstractBlockPackedWriter.java @@ -19,10 +19,11 @@ package org.apache.cassandra.index.sai.disk.v1.bitpack; import java.io.IOException; -import org.apache.cassandra.index.sai.disk.ResettableByteBuffersIndexOutput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.util.packed.DirectWriter; +import org.apache.cassandra.index.sai.disk.ResettableByteBuffersIndexOutput; + import static org.apache.cassandra.index.sai.disk.v1.SAICodecUtils.checkBlockSize; /** diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/BlockPackedReader.java b/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/BlockPackedReader.java index 50ce53d56c..be0d23a07b 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/BlockPackedReader.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/BlockPackedReader.java @@ -19,6 +19,8 @@ package org.apache.cassandra.index.sai.disk.v1.bitpack; import java.io.IOException; +import org.apache.lucene.store.IndexInput; + import org.apache.cassandra.index.sai.disk.io.IndexFileUtils; import org.apache.cassandra.index.sai.disk.io.IndexInputReader; import org.apache.cassandra.index.sai.disk.v1.DirectReaders; @@ -26,7 +28,6 @@ import org.apache.cassandra.index.sai.disk.v1.LongArray; import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.io.util.RandomAccessReader; -import org.apache.lucene.store.IndexInput; import static org.apache.cassandra.index.sai.disk.v1.SAICodecUtils.checkBlockSize; import static org.apache.cassandra.index.sai.disk.v1.SAICodecUtils.numBlocks; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/MonotonicBlockPackedReader.java b/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/MonotonicBlockPackedReader.java index 02071b8052..4e9531a9fd 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/MonotonicBlockPackedReader.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/MonotonicBlockPackedReader.java @@ -19,6 +19,10 @@ package org.apache.cassandra.index.sai.disk.v1.bitpack; import java.io.IOException; +import org.apache.lucene.store.IndexInput; +import org.apache.lucene.util.packed.PackedInts; +import org.apache.lucene.util.packed.PackedLongValues; + import org.apache.cassandra.index.sai.disk.io.IndexFileUtils; import org.apache.cassandra.index.sai.disk.io.IndexInputReader; import org.apache.cassandra.index.sai.disk.v1.DirectReaders; @@ -26,9 +30,6 @@ import org.apache.cassandra.index.sai.disk.v1.LongArray; import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.io.util.RandomAccessReader; -import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.packed.PackedInts; -import org.apache.lucene.util.packed.PackedLongValues; import static org.apache.cassandra.index.sai.disk.v1.SAICodecUtils.checkBlockSize; import static org.apache.cassandra.index.sai.disk.v1.SAICodecUtils.numBlocks; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/NumericValuesWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/NumericValuesWriter.java index 392146655d..54a78148bc 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/NumericValuesWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/bitpack/NumericValuesWriter.java @@ -22,11 +22,12 @@ import java.io.IOException; import javax.annotation.concurrent.NotThreadSafe; +import org.apache.lucene.store.IndexOutput; + import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; import org.apache.cassandra.index.sai.disk.v1.MetadataWriter; import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; -import org.apache.lucene.store.IndexOutput; @NotThreadSafe public class NumericValuesWriter implements Closeable diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/keystore/KeyLookup.java b/src/java/org/apache/cassandra/index/sai/disk/v1/keystore/KeyLookup.java index 439db532cd..fb5c85fb2f 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/keystore/KeyLookup.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/keystore/KeyLookup.java @@ -19,11 +19,15 @@ package org.apache.cassandra.index.sai.disk.v1.keystore; import java.io.IOException; + import javax.annotation.Nonnull; import javax.annotation.concurrent.NotThreadSafe; import com.google.common.annotations.VisibleForTesting; +import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.BytesRefBuilder; + import org.apache.cassandra.index.sai.disk.io.IndexInputReader; import org.apache.cassandra.index.sai.disk.v1.LongArray; import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; @@ -34,8 +38,6 @@ import org.apache.cassandra.utils.FastByteOperations; import org.apache.cassandra.utils.Throwables; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; -import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.BytesRefBuilder; /** * Provides read access to an on-disk sequence of partition or clustering keys written by {@link KeyStoreWriter}. diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/keystore/KeyStoreWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/keystore/KeyStoreWriter.java index b95c355e7b..741a8c4368 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/keystore/KeyStoreWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/keystore/KeyStoreWriter.java @@ -20,9 +20,15 @@ package org.apache.cassandra.index.sai.disk.v1.keystore; import java.io.Closeable; import java.io.IOException; + import javax.annotation.Nonnull; import javax.annotation.concurrent.NotThreadSafe; +import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.BytesRefBuilder; +import org.apache.lucene.util.StringHelper; + import org.apache.cassandra.index.sai.disk.v1.MetadataWriter; import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; import org.apache.cassandra.index.sai.disk.v1.bitpack.NumericValuesWriter; @@ -30,10 +36,6 @@ import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.FastByteOperations; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; -import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.BytesRefBuilder; -import org.apache.lucene.util.StringHelper; /** * Writes a sequence of partition keys or clustering keys for use with {@link KeyLookup}. diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/FilteringPostingList.java b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/FilteringPostingList.java index 9140e358c9..3de0a60e90 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/FilteringPostingList.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/FilteringPostingList.java @@ -19,9 +19,10 @@ package org.apache.cassandra.index.sai.disk.v1.postings; import java.io.IOException; +import org.apache.lucene.util.FixedBitSet; + import org.apache.cassandra.index.sai.postings.OrdinalPostingList; import org.apache.cassandra.index.sai.postings.PostingList; -import org.apache.lucene.util.FixedBitSet; /** * A wrapper that iterates over a delegate {@link PostingList}, filtering out postings at diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/MergePostingList.java b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/MergePostingList.java index 39516d8f6b..7d3104f8b0 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/MergePostingList.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/MergePostingList.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.PriorityQueue; + import javax.annotation.concurrent.NotThreadSafe; import org.apache.cassandra.index.sai.postings.PeekablePostingList; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PackedLongsPostingList.java b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PackedLongsPostingList.java index 34a6ea8e17..940ef5dd03 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PackedLongsPostingList.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PackedLongsPostingList.java @@ -17,9 +17,10 @@ */ package org.apache.cassandra.index.sai.disk.v1.postings; -import org.apache.cassandra.index.sai.postings.PostingList; import org.apache.lucene.util.packed.PackedLongValues; +import org.apache.cassandra.index.sai.postings.PostingList; + /** * Adapter class for {@link PackedLongValues} to expose it as {@link PostingList}. */ diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PostingListRangeIterator.java b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PostingListRangeIterator.java index 813017db8d..c548c84e2a 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PostingListRangeIterator.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PostingListRangeIterator.java @@ -20,19 +20,21 @@ package org.apache.cassandra.index.sai.disk.v1.postings; import java.io.IOException; import java.util.Arrays; import java.util.concurrent.TimeUnit; + import javax.annotation.concurrent.NotThreadSafe; import com.google.common.base.Stopwatch; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.exceptions.QueryCancelledException; import org.apache.cassandra.index.sai.QueryContext; import org.apache.cassandra.index.sai.disk.PrimaryKeyMap; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.v1.segment.IndexSegmentSearcherContext; import org.apache.cassandra.index.sai.iterators.KeyRangeIterator; import org.apache.cassandra.index.sai.postings.PostingList; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.Throwables; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PostingsReader.java b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PostingsReader.java index bbc360445c..34329f51ab 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PostingsReader.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PostingsReader.java @@ -19,10 +19,16 @@ package org.apache.cassandra.index.sai.disk.v1.postings; import java.io.IOException; + import javax.annotation.concurrent.NotThreadSafe; import com.google.common.annotations.VisibleForTesting; +import org.apache.lucene.index.CorruptIndexException; +import org.apache.lucene.store.IndexInput; +import org.apache.lucene.util.LongValues; +import org.apache.lucene.util.packed.DirectReader; + import org.apache.cassandra.index.sai.disk.io.SeekingRandomAccessInput; import org.apache.cassandra.index.sai.disk.v1.DirectReaders; import org.apache.cassandra.index.sai.disk.v1.LongArray; @@ -30,10 +36,6 @@ import org.apache.cassandra.index.sai.metrics.QueryEventListener; import org.apache.cassandra.index.sai.postings.OrdinalPostingList; import org.apache.cassandra.index.sai.postings.PostingList; import org.apache.cassandra.io.util.FileUtils; -import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.LongValues; -import org.apache.lucene.util.packed.DirectReader; /** diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PostingsWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PostingsWriter.java index 545710c861..3f6b058f69 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PostingsWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/PostingsWriter.java @@ -20,22 +20,24 @@ package org.apache.cassandra.index.sai.disk.v1.postings; import java.io.Closeable; import java.io.IOException; + import javax.annotation.concurrent.NotThreadSafe; import com.google.common.annotations.VisibleForTesting; import org.agrona.collections.LongArrayList; -import org.apache.cassandra.index.sai.disk.ResettableByteBuffersIndexOutput; -import org.apache.cassandra.index.sai.disk.format.IndexComponent; -import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; -import org.apache.cassandra.index.sai.disk.io.IndexOutputWriter; -import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; -import org.apache.cassandra.index.sai.postings.PostingList; import org.apache.lucene.store.DataOutput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.util.packed.DirectWriter; +import org.apache.cassandra.index.sai.disk.ResettableByteBuffersIndexOutput; +import org.apache.cassandra.index.sai.disk.format.IndexComponent; +import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; +import org.apache.cassandra.index.sai.disk.io.IndexOutputWriter; +import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; +import org.apache.cassandra.index.sai.postings.PostingList; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; + import static com.google.common.base.Preconditions.checkArgument; import static java.lang.Math.max; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/VectorPostingList.java b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/VectorPostingList.java index cc3fc58665..fefc0a3a34 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/postings/VectorPostingList.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/postings/VectorPostingList.java @@ -21,9 +21,10 @@ package org.apache.cassandra.index.sai.disk.v1.postings; import java.io.IOException; import java.util.PrimitiveIterator; -import org.apache.cassandra.index.sai.postings.PostingList; import org.apache.lucene.util.LongHeap; +import org.apache.cassandra.index.sai.postings.PostingList; + /** * A {@link PostingList} for ANN search results. Transforms result from similarity order to row ID order. */ diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/LiteralIndexSegmentSearcher.java b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/LiteralIndexSegmentSearcher.java index 3aa566e65a..429d81d74f 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/LiteralIndexSegmentSearcher.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/LiteralIndexSegmentSearcher.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.Map; import com.google.common.base.MoreObjects; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/LiteralIndexSegmentTermsReader.java b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/LiteralIndexSegmentTermsReader.java index 6c6f81cddf..e18f6256b3 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/LiteralIndexSegmentTermsReader.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/LiteralIndexSegmentTermsReader.java @@ -22,23 +22,24 @@ import java.io.IOException; import java.util.concurrent.TimeUnit; import com.google.common.annotations.VisibleForTesting; + +import org.apache.lucene.store.IndexInput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.exceptions.QueryCancelledException; import org.apache.cassandra.index.sai.QueryContext; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.io.IndexFileUtils; import org.apache.cassandra.index.sai.disk.v1.postings.PostingsReader; import org.apache.cassandra.index.sai.disk.v1.trie.TrieTermsDictionaryReader; import org.apache.cassandra.index.sai.metrics.QueryEventListener; import org.apache.cassandra.index.sai.postings.PostingList; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.Throwables; import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import org.apache.lucene.store.IndexInput; import static org.apache.cassandra.index.sai.disk.v1.SAICodecUtils.validate; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/NumericIndexSegmentSearcher.java b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/NumericIndexSegmentSearcher.java index 137e635fd0..b5f4cda834 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/NumericIndexSegmentSearcher.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/NumericIndexSegmentSearcher.java @@ -21,6 +21,8 @@ import java.io.IOException; import java.lang.invoke.MethodHandles; import com.google.common.base.MoreObjects; + +import org.apache.lucene.index.CorruptIndexException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +38,6 @@ import org.apache.cassandra.index.sai.iterators.KeyRangeIterator; import org.apache.cassandra.index.sai.metrics.MulticastQueryEventListeners; import org.apache.cassandra.index.sai.metrics.QueryEventListener; import org.apache.cassandra.index.sai.plan.Expression; -import org.apache.lucene.index.CorruptIndexException; import static org.apache.cassandra.index.sai.disk.v1.bbtree.BlockBalancedTreeQueries.balancedTreeQueryFrom; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/SegmentBuilder.java b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/SegmentBuilder.java index d02f14582d..492cec245e 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/SegmentBuilder.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/SegmentBuilder.java @@ -20,9 +20,11 @@ package org.apache.cassandra.index.sai.disk.v1.segment; import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicInteger; + import javax.annotation.concurrent.NotThreadSafe; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/SegmentMetadata.java b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/SegmentMetadata.java index 3ae1bd55d4..1638bd8733 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/SegmentMetadata.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/SegmentMetadata.java @@ -31,6 +31,9 @@ import java.util.stream.Stream; import com.google.common.collect.ImmutableMap; +import org.apache.lucene.store.DataInput; +import org.apache.lucene.store.IndexOutput; + import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.v1.MetadataSource; import org.apache.cassandra.index.sai.disk.v1.MetadataWriter; @@ -39,8 +42,6 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; import org.apache.cassandra.utils.bytecomparable.ByteSourceInverse; -import org.apache.lucene.store.DataInput; -import org.apache.lucene.store.IndexOutput; /** * Multiple {@link SegmentMetadata} are stored in {@link IndexComponent#META} file, each corresponds to an on-disk diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/SegmentTrieBuffer.java b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/SegmentTrieBuffer.java index 5852fb87b3..96e307d84f 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/SegmentTrieBuffer.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/SegmentTrieBuffer.java @@ -20,16 +20,18 @@ package org.apache.cassandra.index.sai.disk.v1.segment; import java.util.Iterator; import java.util.Map; import java.util.concurrent.atomic.LongAdder; + import javax.annotation.concurrent.NotThreadSafe; +import org.apache.lucene.util.packed.PackedInts; +import org.apache.lucene.util.packed.PackedLongValues; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.tries.InMemoryTrie; import org.apache.cassandra.index.sai.postings.PostingList; import org.apache.cassandra.index.sai.utils.IndexEntry; import org.apache.cassandra.utils.Throwables; import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import org.apache.lucene.util.packed.PackedInts; -import org.apache.lucene.util.packed.PackedLongValues; /** * On-heap buffer for values that provides a sorted view of itself as an {@link Iterator}. diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/VectorIndexSegmentSearcher.java b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/VectorIndexSegmentSearcher.java index 4af9c1e6e0..1875ec7a8b 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/segment/VectorIndexSegmentSearcher.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/segment/VectorIndexSegmentSearcher.java @@ -21,16 +21,16 @@ import java.io.IOException; import java.lang.invoke.MethodHandles; import java.util.List; import java.util.stream.Collectors; + import javax.annotation.Nullable; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; + +import org.agrona.collections.IntArrayList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.github.jbellis.jvector.util.Bits; -import io.github.jbellis.jvector.util.SparseFixedBitSet; -import org.agrona.collections.IntArrayList; import org.apache.cassandra.db.PartitionPosition; import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.index.sai.QueryContext; @@ -52,6 +52,9 @@ import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.index.sai.utils.RangeUtil; import org.apache.cassandra.tracing.Tracing; +import io.github.jbellis.jvector.util.Bits; +import io.github.jbellis.jvector.util.SparseFixedBitSet; + import static java.lang.Math.max; import static java.lang.Math.min; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/trie/LiteralIndexWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/trie/LiteralIndexWriter.java index 616ef603a2..2c3a68525c 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/trie/LiteralIndexWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/trie/LiteralIndexWriter.java @@ -21,19 +21,20 @@ import java.io.IOException; import java.util.HashMap; import java.util.Iterator; import java.util.Map; + import javax.annotation.concurrent.NotThreadSafe; import org.apache.commons.lang3.mutable.MutableLong; import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.disk.v1.segment.SegmentWriter; -import org.apache.cassandra.index.sai.utils.IndexEntry; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; import org.apache.cassandra.index.sai.disk.v1.postings.PostingsWriter; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; +import org.apache.cassandra.index.sai.disk.v1.segment.SegmentWriter; import org.apache.cassandra.index.sai.postings.PostingList; +import org.apache.cassandra.index.sai.utils.IndexEntry; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; /** * Builds an on-disk inverted index structure: terms dictionary and postings lists. diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/trie/TrieTermsDictionaryReader.java b/src/java/org/apache/cassandra/index/sai/disk/v1/trie/TrieTermsDictionaryReader.java index b0867da1e3..2402206ece 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/trie/TrieTermsDictionaryReader.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/trie/TrieTermsDictionaryReader.java @@ -19,6 +19,7 @@ package org.apache.cassandra.index.sai.disk.v1.trie; import java.io.IOException; import java.nio.ByteBuffer; + import javax.annotation.concurrent.NotThreadSafe; import org.apache.cassandra.io.tries.SerializationNode; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/trie/TrieTermsDictionaryWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/trie/TrieTermsDictionaryWriter.java index df6b278a06..652877c03d 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/trie/TrieTermsDictionaryWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/trie/TrieTermsDictionaryWriter.java @@ -19,15 +19,16 @@ package org.apache.cassandra.index.sai.disk.v1.trie; import java.io.Closeable; import java.io.IOException; + import javax.annotation.concurrent.NotThreadSafe; import org.apache.commons.lang3.mutable.MutableLong; import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.io.IndexOutputWriter; import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.io.tries.IncrementalDeepTrieWriterPageAware; import org.apache.cassandra.io.tries.IncrementalTrieWriter; import org.apache.cassandra.utils.bytecomparable.ByteComparable; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/vector/CompactionVectorValues.java b/src/java/org/apache/cassandra/index/sai/disk/v1/vector/CompactionVectorValues.java index af23a666a9..ddd4390a4e 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/vector/CompactionVectorValues.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/vector/CompactionVectorValues.java @@ -21,12 +21,14 @@ package org.apache.cassandra.index.sai.disk.v1.vector; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; + import javax.annotation.concurrent.NotThreadSafe; -import io.github.jbellis.jvector.util.RamUsageEstimator; import org.apache.cassandra.db.marshal.VectorType; import org.apache.cassandra.io.util.SequentialWriter; +import io.github.jbellis.jvector.util.RamUsageEstimator; + @NotThreadSafe public class CompactionVectorValues implements RamAwareVectorValues { diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/vector/DiskAnn.java b/src/java/org/apache/cassandra/index/sai/disk/v1/vector/DiskAnn.java index 3e476a7581..196802df43 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/vector/DiskAnn.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/vector/DiskAnn.java @@ -25,6 +25,14 @@ import java.util.NoSuchElementException; import java.util.PrimitiveIterator; import java.util.stream.IntStream; +import org.apache.cassandra.index.sai.disk.format.IndexComponent; +import org.apache.cassandra.index.sai.disk.v1.IndexWriterConfig; +import org.apache.cassandra.index.sai.disk.v1.PerColumnIndexFiles; +import org.apache.cassandra.index.sai.disk.v1.postings.VectorPostingList; +import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; +import org.apache.cassandra.io.util.FileHandle; +import org.apache.cassandra.tracing.Tracing; + import io.github.jbellis.jvector.disk.CachingGraphIndex; import io.github.jbellis.jvector.disk.OnDiskGraphIndex; import io.github.jbellis.jvector.graph.GraphIndex; @@ -35,13 +43,6 @@ import io.github.jbellis.jvector.graph.SearchResult.NodeScore; import io.github.jbellis.jvector.pq.CompressedVectors; import io.github.jbellis.jvector.util.Bits; import io.github.jbellis.jvector.vector.VectorSimilarityFunction; -import org.apache.cassandra.index.sai.disk.format.IndexComponent; -import org.apache.cassandra.index.sai.disk.v1.IndexWriterConfig; -import org.apache.cassandra.index.sai.disk.v1.PerColumnIndexFiles; -import org.apache.cassandra.index.sai.disk.v1.postings.VectorPostingList; -import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; -import org.apache.cassandra.io.util.FileHandle; -import org.apache.cassandra.tracing.Tracing; public class DiskAnn implements AutoCloseable { diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/vector/OnDiskOrdinalsMap.java b/src/java/org/apache/cassandra/index/sai/disk/v1/vector/OnDiskOrdinalsMap.java index 673dcc3170..5166531345 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/vector/OnDiskOrdinalsMap.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/vector/OnDiskOrdinalsMap.java @@ -24,10 +24,11 @@ import java.util.Set; import com.google.common.base.Preconditions; -import io.github.jbellis.jvector.util.Bits; import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.io.util.RandomAccessReader; +import io.github.jbellis.jvector.util.Bits; + public class OnDiskOrdinalsMap implements AutoCloseable { private final FileHandle fh; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/vector/OnHeapGraph.java b/src/java/org/apache/cassandra/index/sai/disk/v1/vector/OnHeapGraph.java index f11db645fd..369aac2fde 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/vector/OnHeapGraph.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/vector/OnHeapGraph.java @@ -32,10 +32,25 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import java.util.stream.IntStream; +import org.apache.lucene.util.StringHelper; import org.cliffc.high_scale_lib.NonBlockingHashMapLong; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.VectorType; +import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.index.sai.disk.format.IndexComponent; +import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; +import org.apache.cassandra.index.sai.disk.io.IndexFileUtils; +import org.apache.cassandra.index.sai.disk.v1.IndexWriterConfig; +import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; +import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; +import org.apache.cassandra.io.util.SequentialWriter; +import org.apache.cassandra.tracing.Tracing; +import org.apache.cassandra.utils.ByteBufferUtil; + import io.github.jbellis.jvector.disk.OnDiskGraphIndex; import io.github.jbellis.jvector.graph.GraphIndex; import io.github.jbellis.jvector.graph.GraphIndexBuilder; @@ -48,20 +63,6 @@ import io.github.jbellis.jvector.pq.ProductQuantization; import io.github.jbellis.jvector.util.Bits; import io.github.jbellis.jvector.vector.VectorEncoding; import io.github.jbellis.jvector.vector.VectorSimilarityFunction; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.VectorType; -import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.index.sai.disk.format.IndexComponent; -import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; -import org.apache.cassandra.index.sai.disk.io.IndexFileUtils; -import org.apache.cassandra.index.sai.disk.v1.IndexWriterConfig; -import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; -import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; -import org.apache.cassandra.io.util.SequentialWriter; -import org.apache.cassandra.tracing.Tracing; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.lucene.util.StringHelper; public class OnHeapGraph { diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/vector/RandomAccessReaderAdapter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/vector/RandomAccessReaderAdapter.java index 95ea81f323..7448dc0648 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/vector/RandomAccessReaderAdapter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/vector/RandomAccessReaderAdapter.java @@ -25,11 +25,12 @@ import java.nio.IntBuffer; import com.google.common.primitives.Ints; -import io.github.jbellis.jvector.disk.ReaderSupplier; import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.io.util.Rebufferer.BufferHolder; +import io.github.jbellis.jvector.disk.ReaderSupplier; + public class RandomAccessReaderAdapter extends RandomAccessReader implements io.github.jbellis.jvector.disk.RandomAccessReader { static ReaderSupplier createSupplier(FileHandle fileHandle) diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/vector/VectorPostingsWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/vector/VectorPostingsWriter.java index b62575e6f3..b1781384d6 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/vector/VectorPostingsWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/vector/VectorPostingsWriter.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.Set; import org.agrona.collections.IntArrayList; + import org.apache.cassandra.io.util.SequentialWriter; import org.apache.cassandra.utils.Pair; diff --git a/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIterator.java b/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIterator.java index 4909033bf8..95daea84da 100644 --- a/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIterator.java +++ b/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIterator.java @@ -22,7 +22,10 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; +import javax.annotation.Nullable; + import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,8 +35,6 @@ import org.apache.cassandra.index.sai.utils.PrimaryKey.Kind; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.tracing.Tracing; -import javax.annotation.Nullable; - /** * A simple intersection iterator that makes no real attempts at optimising the iteration apart from * initially sorting the ranges. This implementation also supports an intersection limit via diff --git a/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIterator.java b/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIterator.java index a4ada8ec57..4797d8a7c7 100644 --- a/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIterator.java +++ b/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIterator.java @@ -19,6 +19,8 @@ package org.apache.cassandra.index.sai.iterators; import java.io.Closeable; +import javax.annotation.concurrent.NotThreadSafe; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; @@ -26,8 +28,6 @@ import com.google.common.collect.Iterables; import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.utils.AbstractGuavaIterator; -import javax.annotation.concurrent.NotThreadSafe; - /** * An abstract implementation of {@link AbstractGuavaIterator} that supports the building and management of * concatanation, union and intersection iterators. diff --git a/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeOrderingIterator.java b/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeOrderingIterator.java index 6c6a8dd814..834fac8847 100644 --- a/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeOrderingIterator.java +++ b/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeOrderingIterator.java @@ -21,6 +21,7 @@ package org.apache.cassandra.index.sai.iterators; import java.util.ArrayList; import java.util.List; import java.util.function.Function; + import javax.annotation.concurrent.NotThreadSafe; import org.apache.cassandra.index.sai.utils.PrimaryKey; diff --git a/src/java/org/apache/cassandra/index/sai/memory/InMemoryKeyRangeIterator.java b/src/java/org/apache/cassandra/index/sai/memory/InMemoryKeyRangeIterator.java index 5131965278..cd70f7cc70 100644 --- a/src/java/org/apache/cassandra/index/sai/memory/InMemoryKeyRangeIterator.java +++ b/src/java/org/apache/cassandra/index/sai/memory/InMemoryKeyRangeIterator.java @@ -19,6 +19,7 @@ package org.apache.cassandra.index.sai.memory; import java.util.PriorityQueue; import java.util.SortedSet; + import javax.annotation.concurrent.NotThreadSafe; import org.apache.cassandra.index.sai.iterators.KeyRangeIterator; diff --git a/src/java/org/apache/cassandra/index/sai/memory/MemoryIndex.java b/src/java/org/apache/cassandra/index/sai/memory/MemoryIndex.java index 4307727b88..27190be4cf 100644 --- a/src/java/org/apache/cassandra/index/sai/memory/MemoryIndex.java +++ b/src/java/org/apache/cassandra/index/sai/memory/MemoryIndex.java @@ -18,6 +18,11 @@ package org.apache.cassandra.index.sai.memory; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.Iterator; +import java.util.function.Function; + import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.PartitionPosition; @@ -25,20 +30,15 @@ import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.index.sai.QueryContext; import org.apache.cassandra.index.sai.StorageAttachedIndex; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; import org.apache.cassandra.index.sai.iterators.KeyRangeIterator; import org.apache.cassandra.index.sai.plan.Expression; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.index.sai.utils.PrimaryKeys; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.Iterator; -import java.util.function.Function; - public abstract class MemoryIndex implements MemtableOrdering { protected final StorageAttachedIndex index; diff --git a/src/java/org/apache/cassandra/index/sai/memory/MemtableIndex.java b/src/java/org/apache/cassandra/index/sai/memory/MemtableIndex.java index 1546ede37d..d592c94209 100644 --- a/src/java/org/apache/cassandra/index/sai/memory/MemtableIndex.java +++ b/src/java/org/apache/cassandra/index/sai/memory/MemtableIndex.java @@ -33,10 +33,10 @@ import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.index.sai.QueryContext; import org.apache.cassandra.index.sai.StorageAttachedIndex; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; import org.apache.cassandra.index.sai.iterators.KeyRangeIterator; import org.apache.cassandra.index.sai.plan.Expression; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.index.sai.utils.PrimaryKeys; import org.apache.cassandra.utils.Pair; diff --git a/src/java/org/apache/cassandra/index/sai/memory/MemtableTermsIterator.java b/src/java/org/apache/cassandra/index/sai/memory/MemtableTermsIterator.java index 638b0d2183..41e6e798de 100644 --- a/src/java/org/apache/cassandra/index/sai/memory/MemtableTermsIterator.java +++ b/src/java/org/apache/cassandra/index/sai/memory/MemtableTermsIterator.java @@ -20,13 +20,13 @@ package org.apache.cassandra.index.sai.memory; import java.nio.ByteBuffer; import java.util.Iterator; -import com.google.common.base.Preconditions; - import com.carrotsearch.hppc.LongArrayList; import com.carrotsearch.hppc.cursors.LongCursor; +import com.google.common.base.Preconditions; + +import org.apache.cassandra.index.sai.postings.PostingList; import org.apache.cassandra.index.sai.utils.IndexEntry; import org.apache.cassandra.index.sai.utils.TermsIterator; -import org.apache.cassandra.index.sai.postings.PostingList; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.bytecomparable.ByteComparable; diff --git a/src/java/org/apache/cassandra/index/sai/memory/VectorMemoryIndex.java b/src/java/org/apache/cassandra/index/sai/memory/VectorMemoryIndex.java index 39690de089..976c81d205 100644 --- a/src/java/org/apache/cassandra/index/sai/memory/VectorMemoryIndex.java +++ b/src/java/org/apache/cassandra/index/sai/memory/VectorMemoryIndex.java @@ -30,9 +30,9 @@ import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.atomic.LongAdder; import java.util.function.Function; import java.util.stream.Collectors; + import javax.annotation.Nullable; -import io.github.jbellis.jvector.util.Bits; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.PartitionPosition; @@ -41,12 +41,12 @@ import org.apache.cassandra.index.sai.QueryContext; import org.apache.cassandra.index.sai.StorageAttachedIndex; import org.apache.cassandra.index.sai.VectorQueryContext; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; import org.apache.cassandra.index.sai.disk.v1.vector.OnHeapGraph; import org.apache.cassandra.index.sai.iterators.KeyRangeIterator; import org.apache.cassandra.index.sai.iterators.KeyRangeListIterator; import org.apache.cassandra.index.sai.plan.Expression; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.index.sai.utils.PrimaryKeys; import org.apache.cassandra.index.sai.utils.RangeUtil; @@ -54,6 +54,8 @@ import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.bytecomparable.ByteComparable; +import io.github.jbellis.jvector.util.Bits; + import static java.lang.Math.log; import static java.lang.Math.max; import static java.lang.Math.min; diff --git a/src/java/org/apache/cassandra/index/sai/metrics/AbstractMetrics.java b/src/java/org/apache/cassandra/index/sai/metrics/AbstractMetrics.java index 642cfd24fc..70084335f8 100644 --- a/src/java/org/apache/cassandra/index/sai/metrics/AbstractMetrics.java +++ b/src/java/org/apache/cassandra/index/sai/metrics/AbstractMetrics.java @@ -18,6 +18,7 @@ package org.apache.cassandra.index.sai.metrics; import com.codahale.metrics.MetricRegistry; + import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.metrics.CassandraMetricsRegistry; import org.apache.cassandra.metrics.DefaultNameFactory; diff --git a/src/java/org/apache/cassandra/index/sai/metrics/ColumnQueryMetrics.java b/src/java/org/apache/cassandra/index/sai/metrics/ColumnQueryMetrics.java index d2438510d9..d55423bc31 100644 --- a/src/java/org/apache/cassandra/index/sai/metrics/ColumnQueryMetrics.java +++ b/src/java/org/apache/cassandra/index/sai/metrics/ColumnQueryMetrics.java @@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; + import org.apache.cassandra.index.sai.utils.IndexIdentifier; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/index/sai/metrics/IndexGroupMetrics.java b/src/java/org/apache/cassandra/index/sai/metrics/IndexGroupMetrics.java index fff6291ab0..419f1a24bc 100644 --- a/src/java/org/apache/cassandra/index/sai/metrics/IndexGroupMetrics.java +++ b/src/java/org/apache/cassandra/index/sai/metrics/IndexGroupMetrics.java @@ -18,6 +18,7 @@ package org.apache.cassandra.index.sai.metrics; import com.codahale.metrics.Gauge; + import org.apache.cassandra.index.sai.StorageAttachedIndexGroup; import org.apache.cassandra.schema.TableMetadata; diff --git a/src/java/org/apache/cassandra/index/sai/metrics/IndexMetrics.java b/src/java/org/apache/cassandra/index/sai/metrics/IndexMetrics.java index 575fb79b9b..2fbdedd8e6 100644 --- a/src/java/org/apache/cassandra/index/sai/metrics/IndexMetrics.java +++ b/src/java/org/apache/cassandra/index/sai/metrics/IndexMetrics.java @@ -21,6 +21,7 @@ import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; import com.codahale.metrics.Timer; + import org.apache.cassandra.index.sai.StorageAttachedIndex; import org.apache.cassandra.index.sai.memory.MemtableIndexManager; diff --git a/src/java/org/apache/cassandra/index/sai/metrics/TableQueryMetrics.java b/src/java/org/apache/cassandra/index/sai/metrics/TableQueryMetrics.java index bbfbe1d287..288e083af2 100644 --- a/src/java/org/apache/cassandra/index/sai/metrics/TableQueryMetrics.java +++ b/src/java/org/apache/cassandra/index/sai/metrics/TableQueryMetrics.java @@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit; import com.codahale.metrics.Counter; import com.codahale.metrics.Histogram; import com.codahale.metrics.Timer; + import org.apache.cassandra.index.sai.QueryContext; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.tracing.Tracing; diff --git a/src/java/org/apache/cassandra/index/sai/metrics/TableStateMetrics.java b/src/java/org/apache/cassandra/index/sai/metrics/TableStateMetrics.java index f7b6405520..b017d026d5 100644 --- a/src/java/org/apache/cassandra/index/sai/metrics/TableStateMetrics.java +++ b/src/java/org/apache/cassandra/index/sai/metrics/TableStateMetrics.java @@ -19,6 +19,7 @@ package org.apache.cassandra.index.sai.metrics; import com.codahale.metrics.Gauge; import com.codahale.metrics.RatioGauge; + import org.apache.cassandra.index.sai.StorageAttachedIndexGroup; import org.apache.cassandra.schema.TableMetadata; diff --git a/src/java/org/apache/cassandra/index/sai/plan/StorageAttachedIndexQueryPlan.java b/src/java/org/apache/cassandra/index/sai/plan/StorageAttachedIndexQueryPlan.java index b62bdf6003..77065c09ed 100644 --- a/src/java/org/apache/cassandra/index/sai/plan/StorageAttachedIndexQueryPlan.java +++ b/src/java/org/apache/cassandra/index/sai/plan/StorageAttachedIndexQueryPlan.java @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.Function; + import javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; diff --git a/src/java/org/apache/cassandra/index/sai/plan/StorageAttachedIndexSearcher.java b/src/java/org/apache/cassandra/index/sai/plan/StorageAttachedIndexSearcher.java index 20a9cad58c..cf5beb129b 100644 --- a/src/java/org/apache/cassandra/index/sai/plan/StorageAttachedIndexSearcher.java +++ b/src/java/org/apache/cassandra/index/sai/plan/StorageAttachedIndexSearcher.java @@ -28,10 +28,10 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; + import javax.annotation.Nonnull; import javax.annotation.Nullable; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.ClusteringBound; import org.apache.cassandra.db.ClusteringComparator; @@ -59,14 +59,16 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.RequestTimeoutException; import org.apache.cassandra.index.Index; import org.apache.cassandra.index.sai.QueryContext; -import org.apache.cassandra.index.sai.metrics.TableQueryMetrics; import org.apache.cassandra.index.sai.iterators.KeyRangeIterator; +import org.apache.cassandra.index.sai.metrics.TableQueryMetrics; import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.AbstractIterator; import org.apache.cassandra.utils.Clock; +import io.netty.util.concurrent.FastThreadLocal; + public class StorageAttachedIndexSearcher implements Index.Searcher { private static final int PARTITION_ROW_BATCH_SIZE = 100; diff --git a/src/java/org/apache/cassandra/index/sai/plan/VectorTopKProcessor.java b/src/java/org/apache/cassandra/index/sai/plan/VectorTopKProcessor.java index 9122b5e262..b21bf38a05 100644 --- a/src/java/org/apache/cassandra/index/sai/plan/VectorTopKProcessor.java +++ b/src/java/org/apache/cassandra/index/sai/plan/VectorTopKProcessor.java @@ -23,9 +23,11 @@ import java.util.Comparator; import java.util.PriorityQueue; import java.util.TreeMap; import java.util.TreeSet; + import javax.annotation.Nullable; import com.google.common.base.Preconditions; + import org.apache.commons.lang3.tuple.Triple; import org.apache.cassandra.cql3.Operator; diff --git a/src/java/org/apache/cassandra/index/sai/utils/IndexTermType.java b/src/java/org/apache/cassandra/index/sai/utils/IndexTermType.java index 2f07f76ad4..05abe93c38 100644 --- a/src/java/org/apache/cassandra/index/sai/utils/IndexTermType.java +++ b/src/java/org/apache/cassandra/index/sai/utils/IndexTermType.java @@ -36,8 +36,8 @@ import java.util.stream.StreamSupport; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; - import com.googlecode.concurrenttrees.radix.ConcurrentRadixTree; + import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.cql3.statements.schema.IndexTarget; diff --git a/src/java/org/apache/cassandra/index/sai/utils/NamedMemoryLimiter.java b/src/java/org/apache/cassandra/index/sai/utils/NamedMemoryLimiter.java index 0a5fdf69c2..7589395a19 100644 --- a/src/java/org/apache/cassandra/index/sai/utils/NamedMemoryLimiter.java +++ b/src/java/org/apache/cassandra/index/sai/utils/NamedMemoryLimiter.java @@ -18,9 +18,11 @@ package org.apache.cassandra.index.sai.utils; import java.util.concurrent.atomic.AtomicLong; + import javax.annotation.concurrent.ThreadSafe; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/index/sai/utils/PartitionInfo.java b/src/java/org/apache/cassandra/index/sai/utils/PartitionInfo.java index c8e1c62b65..cc322e4c07 100644 --- a/src/java/org/apache/cassandra/index/sai/utils/PartitionInfo.java +++ b/src/java/org/apache/cassandra/index/sai/utils/PartitionInfo.java @@ -19,6 +19,7 @@ package org.apache.cassandra.index.sai.utils; import java.util.Objects; + import javax.annotation.Nullable; import org.apache.cassandra.db.DecoratedKey; diff --git a/src/java/org/apache/cassandra/index/sai/utils/TermsIterator.java b/src/java/org/apache/cassandra/index/sai/utils/TermsIterator.java index 25649c71b5..5f7675649a 100644 --- a/src/java/org/apache/cassandra/index/sai/utils/TermsIterator.java +++ b/src/java/org/apache/cassandra/index/sai/utils/TermsIterator.java @@ -20,6 +20,7 @@ package org.apache.cassandra.index.sai.utils; import java.io.Closeable; import java.nio.ByteBuffer; import java.util.Iterator; + import javax.annotation.concurrent.NotThreadSafe; /** diff --git a/src/java/org/apache/cassandra/index/sai/view/IndexViewManager.java b/src/java/org/apache/cassandra/index/sai/view/IndexViewManager.java index 5bbaccd691..24be0276cf 100644 --- a/src/java/org/apache/cassandra/index/sai/view/IndexViewManager.java +++ b/src/java/org/apache/cassandra/index/sai/view/IndexViewManager.java @@ -31,8 +31,8 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.index.sai.IndexValidation; import org.apache.cassandra.index.sai.SSTableContext; import org.apache.cassandra.index.sai.StorageAttachedIndex; -import org.apache.cassandra.index.sai.disk.SSTableIndex; import org.apache.cassandra.index.sai.StorageAttachedIndexGroup; +import org.apache.cassandra.index.sai.disk.SSTableIndex; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.utils.Pair; diff --git a/src/java/org/apache/cassandra/index/sai/view/RangeTermTree.java b/src/java/org/apache/cassandra/index/sai/view/RangeTermTree.java index 7817740293..f2680d7587 100644 --- a/src/java/org/apache/cassandra/index/sai/view/RangeTermTree.java +++ b/src/java/org/apache/cassandra/index/sai/view/RangeTermTree.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Objects; import com.google.common.base.MoreObjects; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/index/sasi/SASIIndex.java b/src/java/org/apache/cassandra/index/sasi/SASIIndex.java index 9b069827d3..7b9ede5b78 100644 --- a/src/java/org/apache/cassandra/index/sasi/SASIIndex.java +++ b/src/java/org/apache/cassandra/index/sasi/SASIIndex.java @@ -29,6 +29,7 @@ import java.util.TreeMap; import java.util.concurrent.Callable; import com.googlecode.concurrenttrees.common.Iterables; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.cql3.statements.schema.IndexTarget; diff --git a/src/java/org/apache/cassandra/index/sasi/SSTableIndex.java b/src/java/org/apache/cassandra/index/sasi/SSTableIndex.java index b5e7905640..4316edb1dd 100644 --- a/src/java/org/apache/cassandra/index/sasi/SSTableIndex.java +++ b/src/java/org/apache/cassandra/index/sasi/SSTableIndex.java @@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.base.Function; + import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.cassandra.db.DecoratedKey; diff --git a/src/java/org/apache/cassandra/index/sasi/Term.java b/src/java/org/apache/cassandra/index/sasi/Term.java index 8f42d5874a..4b6b1654b9 100644 --- a/src/java/org/apache/cassandra/index/sasi/Term.java +++ b/src/java/org/apache/cassandra/index/sasi/Term.java @@ -19,9 +19,9 @@ package org.apache.cassandra.index.sasi; import java.nio.ByteBuffer; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder.TermSize; import org.apache.cassandra.index.sasi.utils.MappedBuffer; -import org.apache.cassandra.db.marshal.AbstractType; import static org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder.IS_PARTIAL_BIT; diff --git a/src/java/org/apache/cassandra/index/sasi/TermIterator.java b/src/java/org/apache/cassandra/index/sasi/TermIterator.java index a180ac3478..8ecdcfcb11 100644 --- a/src/java/org/apache/cassandra/index/sasi/TermIterator.java +++ b/src/java/org/apache/cassandra/index/sasi/TermIterator.java @@ -19,21 +19,24 @@ package org.apache.cassandra.index.sasi; import java.util.List; import java.util.Set; -import java.util.concurrent.*; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicLong; -import io.netty.util.concurrent.FastThreadLocal; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.concurrent.ImmediateExecutor; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.index.sasi.disk.Token; import org.apache.cassandra.index.sasi.plan.Expression; -import org.apache.cassandra.index.sasi.utils.RangeUnionIterator; import org.apache.cassandra.index.sasi.utils.RangeIterator; +import org.apache.cassandra.index.sasi.utils.RangeUnionIterator; import org.apache.cassandra.io.util.FileUtils; - import org.apache.cassandra.utils.concurrent.CountDownLatch; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import io.netty.util.concurrent.FastThreadLocal; import static java.lang.String.format; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java b/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java index b7f297b774..e22a4f9d38 100644 --- a/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java +++ b/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.index.sasi.analyzer; -import java.nio.CharBuffer; import java.nio.ByteBuffer; +import java.nio.CharBuffer; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/NonTokenizingAnalyzer.java b/src/java/org/apache/cassandra/index/sasi/analyzer/NonTokenizingAnalyzer.java index 195ad2a7a2..2d05ae8578 100644 --- a/src/java/org/apache/cassandra/index/sasi/analyzer/NonTokenizingAnalyzer.java +++ b/src/java/org/apache/cassandra/index/sasi/analyzer/NonTokenizingAnalyzer.java @@ -22,21 +22,21 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.index.sasi.analyzer.filter.BasicResultFilters; import org.apache.cassandra.index.sasi.analyzer.filter.FilterPipelineBuilder; import org.apache.cassandra.index.sasi.analyzer.filter.FilterPipelineExecutor; import org.apache.cassandra.index.sasi.analyzer.filter.FilterPipelineTask; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.AsciiType; -import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.ByteBufferUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Analyzer that does *not* tokenize the input. Optionally will * apply filters for the input output as defined in analyzers options diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java index 1af070c543..66464677bb 100644 --- a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java +++ b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java @@ -27,18 +27,22 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.cassandra.index.sasi.analyzer.filter.*; +import com.carrotsearch.hppc.IntObjectHashMap; +import com.carrotsearch.hppc.IntObjectMap; +import com.google.common.annotations.VisibleForTesting; + import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.index.sasi.analyzer.filter.BasicResultFilters; +import org.apache.cassandra.index.sasi.analyzer.filter.FilterPipelineBuilder; +import org.apache.cassandra.index.sasi.analyzer.filter.FilterPipelineExecutor; +import org.apache.cassandra.index.sasi.analyzer.filter.FilterPipelineTask; +import org.apache.cassandra.index.sasi.analyzer.filter.StemmingFilters; +import org.apache.cassandra.index.sasi.analyzer.filter.StopWordFilters; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.utils.ByteBufferUtil; -import com.google.common.annotations.VisibleForTesting; - -import com.carrotsearch.hppc.IntObjectMap; -import com.carrotsearch.hppc.IntObjectHashMap; - public class StandardAnalyzer extends AbstractAnalyzer { diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StemmerFactory.java b/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StemmerFactory.java index 9786a86ae2..1e68e371f6 100644 --- a/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StemmerFactory.java +++ b/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StemmerFactory.java @@ -22,13 +22,12 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import org.apache.cassandra.concurrent.ImmediateExecutor; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tartarus.snowball.SnowballStemmer; import org.tartarus.snowball.ext.DanishStemmer; import org.tartarus.snowball.ext.DutchStemmer; @@ -46,6 +45,8 @@ import org.tartarus.snowball.ext.SpanishStemmer; import org.tartarus.snowball.ext.SwedishStemmer; import org.tartarus.snowball.ext.TurkishStemmer; +import org.apache.cassandra.concurrent.ImmediateExecutor; + /** * Returns a SnowballStemmer instance appropriate for * a given language diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StopWordFactory.java b/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StopWordFactory.java index b85a36fe93..bf52017552 100644 --- a/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StopWordFactory.java +++ b/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StopWordFactory.java @@ -30,11 +30,12 @@ import java.util.concurrent.CompletionException; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import org.apache.cassandra.concurrent.ImmediateExecutor; -import org.apache.cassandra.io.util.File; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.concurrent.ImmediateExecutor; +import org.apache.cassandra.io.util.File; + /** * Provides a list of Stop Words for a given language */ diff --git a/src/java/org/apache/cassandra/index/sasi/conf/IndexMode.java b/src/java/org/apache/cassandra/index/sasi/conf/IndexMode.java index 7d4f5c9467..c827b2b820 100644 --- a/src/java/org/apache/cassandra/index/sasi/conf/IndexMode.java +++ b/src/java/org/apache/cassandra/index/sasi/conf/IndexMode.java @@ -22,22 +22,22 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import org.apache.cassandra.schema.ColumnMetadata; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.index.sasi.analyzer.AbstractAnalyzer; import org.apache.cassandra.index.sasi.analyzer.NoOpAnalyzer; import org.apache.cassandra.index.sasi.analyzer.NonTokenizingAnalyzer; import org.apache.cassandra.index.sasi.analyzer.StandardAnalyzer; import org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder.Mode; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.AsciiType; -import org.apache.cassandra.db.marshal.UTF8Type; -import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.index.sasi.plan.Expression.Op; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.IndexMetadata; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class IndexMode { private static final Logger logger = LoggerFactory.getLogger(IndexMode.class); diff --git a/src/java/org/apache/cassandra/index/sasi/conf/view/PrefixTermTree.java b/src/java/org/apache/cassandra/index/sasi/conf/view/PrefixTermTree.java index f7cd942d5c..eb76466646 100644 --- a/src/java/org/apache/cassandra/index/sasi/conf/view/PrefixTermTree.java +++ b/src/java/org/apache/cassandra/index/sasi/conf/view/PrefixTermTree.java @@ -22,18 +22,18 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import com.google.common.collect.Sets; + +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sasi.SSTableIndex; import org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder; import org.apache.cassandra.index.sasi.plan.Expression; import org.apache.cassandra.index.sasi.utils.trie.KeyAnalyzer; import org.apache.cassandra.index.sasi.utils.trie.PatriciaTrie; import org.apache.cassandra.index.sasi.utils.trie.Trie; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.utils.Interval; import org.apache.cassandra.utils.IntervalTree; -import com.google.common.collect.Sets; - /** * This class is an extension over RangeTermTree for string terms, * it is required because interval tree can't handle matching if search is on the diff --git a/src/java/org/apache/cassandra/index/sasi/conf/view/RangeTermTree.java b/src/java/org/apache/cassandra/index/sasi/conf/view/RangeTermTree.java index d6b4551ea7..89c4c586cb 100644 --- a/src/java/org/apache/cassandra/index/sasi/conf/view/RangeTermTree.java +++ b/src/java/org/apache/cassandra/index/sasi/conf/view/RangeTermTree.java @@ -23,10 +23,10 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sasi.SSTableIndex; import org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder; import org.apache.cassandra.index.sasi.plan.Expression; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.utils.Interval; import org.apache.cassandra.utils.IntervalTree; diff --git a/src/java/org/apache/cassandra/index/sasi/conf/view/TermTree.java b/src/java/org/apache/cassandra/index/sasi/conf/view/TermTree.java index a175e22568..d3944263ca 100644 --- a/src/java/org/apache/cassandra/index/sasi/conf/view/TermTree.java +++ b/src/java/org/apache/cassandra/index/sasi/conf/view/TermTree.java @@ -20,10 +20,10 @@ package org.apache.cassandra.index.sasi.conf.view; import java.nio.ByteBuffer; import java.util.Set; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sasi.SSTableIndex; import org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder; import org.apache.cassandra.index.sasi.plan.Expression; -import org.apache.cassandra.db.marshal.AbstractType; public interface TermTree { diff --git a/src/java/org/apache/cassandra/index/sasi/conf/view/View.java b/src/java/org/apache/cassandra/index/sasi/conf/view/View.java index b0afc5b564..67692edfa1 100644 --- a/src/java/org/apache/cassandra/index/sasi/conf/view/View.java +++ b/src/java/org/apache/cassandra/index/sasi/conf/view/View.java @@ -18,22 +18,30 @@ package org.apache.cassandra.index.sasi.conf.view; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; -import org.apache.cassandra.index.sasi.SSTableIndex; -import org.apache.cassandra.index.sasi.conf.ColumnIndex; -import org.apache.cassandra.index.sasi.plan.Expression; +import com.google.common.collect.Iterables; + import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.index.sasi.SSTableIndex; +import org.apache.cassandra.index.sasi.conf.ColumnIndex; +import org.apache.cassandra.index.sasi.plan.Expression; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.utils.Interval; import org.apache.cassandra.utils.IntervalTree; -import com.google.common.collect.Iterables; - public class View implements Iterable { private final Map view; diff --git a/src/java/org/apache/cassandra/index/sasi/disk/AbstractTokenTreeBuilder.java b/src/java/org/apache/cassandra/index/sasi/disk/AbstractTokenTreeBuilder.java index ae1024fb5b..77be737614 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/AbstractTokenTreeBuilder.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/AbstractTokenTreeBuilder.java @@ -24,15 +24,15 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import com.carrotsearch.hppc.LongArrayList; +import com.carrotsearch.hppc.LongSet; +import com.carrotsearch.hppc.cursors.LongCursor; + import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.utils.AbstractIterator; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; -import com.carrotsearch.hppc.LongArrayList; -import com.carrotsearch.hppc.LongSet; -import com.carrotsearch.hppc.cursors.LongCursor; - public abstract class AbstractTokenTreeBuilder implements TokenTreeBuilder { protected int numBlocks; diff --git a/src/java/org/apache/cassandra/index/sasi/disk/DynamicTokenTreeBuilder.java b/src/java/org/apache/cassandra/index/sasi/disk/DynamicTokenTreeBuilder.java index 0e906e20d0..649587f4b5 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/DynamicTokenTreeBuilder.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/DynamicTokenTreeBuilder.java @@ -18,15 +18,18 @@ package org.apache.cassandra.index.sasi.disk; import java.nio.ByteBuffer; -import java.util.*; - -import org.apache.cassandra.utils.AbstractIterator; -import org.apache.cassandra.utils.Pair; +import java.util.Iterator; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; import com.carrotsearch.hppc.LongHashSet; import com.carrotsearch.hppc.LongSet; import com.carrotsearch.hppc.cursors.LongCursor; +import org.apache.cassandra.utils.AbstractIterator; +import org.apache.cassandra.utils.Pair; + public class DynamicTokenTreeBuilder extends AbstractTokenTreeBuilder { private final SortedMap tokens = new TreeMap<>(); diff --git a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java index 32cda53d7e..9339bbcab1 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java @@ -19,9 +19,9 @@ package org.apache.cassandra.index.sasi.disk; import java.nio.ByteBuffer; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sasi.Term; import org.apache.cassandra.index.sasi.utils.MappedBuffer; -import org.apache.cassandra.db.marshal.AbstractType; public abstract class OnDiskBlock { diff --git a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java index 0eab229556..93d47fff14 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java @@ -41,8 +41,8 @@ import org.apache.cassandra.index.sasi.Term; import org.apache.cassandra.index.sasi.plan.Expression; import org.apache.cassandra.index.sasi.plan.Expression.Op; import org.apache.cassandra.index.sasi.utils.MappedBuffer; -import org.apache.cassandra.index.sasi.utils.RangeUnionIterator; import org.apache.cassandra.index.sasi.utils.RangeIterator; +import org.apache.cassandra.index.sasi.utils.RangeUnionIterator; import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.util.ChannelProxy; import org.apache.cassandra.io.util.File; diff --git a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java index 6930055048..5287da24cd 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java @@ -19,21 +19,12 @@ package org.apache.cassandra.index.sasi.disk; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; - -import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.index.sasi.plan.Expression.Op; -import org.apache.cassandra.index.sasi.sa.IndexedTerm; -import org.apache.cassandra.index.sasi.sa.IntegralSA; -import org.apache.cassandra.index.sasi.sa.SA; -import org.apache.cassandra.index.sasi.sa.TermIterator; -import org.apache.cassandra.index.sasi.sa.SuffixSA; -import org.apache.cassandra.db.marshal.*; -import org.apache.cassandra.io.FSWriteError; -import org.apache.cassandra.io.util.*; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.Pair; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import com.carrotsearch.hppc.LongArrayList; import com.carrotsearch.hppc.LongSet; @@ -43,6 +34,35 @@ import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.DateType; +import org.apache.cassandra.db.marshal.DoubleType; +import org.apache.cassandra.db.marshal.FloatType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.TimeUUIDType; +import org.apache.cassandra.db.marshal.TimestampType; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.marshal.UUIDType; +import org.apache.cassandra.index.sasi.plan.Expression.Op; +import org.apache.cassandra.index.sasi.sa.IndexedTerm; +import org.apache.cassandra.index.sasi.sa.IntegralSA; +import org.apache.cassandra.index.sasi.sa.SA; +import org.apache.cassandra.index.sasi.sa.SuffixSA; +import org.apache.cassandra.index.sasi.sa.TermIterator; +import org.apache.cassandra.io.FSWriteError; +import org.apache.cassandra.io.util.DataOutputBufferFixed; +import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileUtils; +import org.apache.cassandra.io.util.SequentialWriter; +import org.apache.cassandra.io.util.SequentialWriterOption; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.Pair; + import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized; public class OnDiskIndexBuilder diff --git a/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java b/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java index 5b01cad124..e8ad26033b 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Maps; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/index/sasi/disk/StaticTokenTreeBuilder.java b/src/java/org/apache/cassandra/index/sasi/disk/StaticTokenTreeBuilder.java index 7a41b38d7a..978d2ce3bb 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/StaticTokenTreeBuilder.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/StaticTokenTreeBuilder.java @@ -22,15 +22,15 @@ import java.nio.ByteBuffer; import java.util.Iterator; import java.util.SortedMap; +import com.carrotsearch.hppc.LongSet; +import com.google.common.collect.Iterators; + import org.apache.cassandra.index.sasi.utils.CombinedTerm; import org.apache.cassandra.index.sasi.utils.RangeIterator; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.utils.AbstractIterator; import org.apache.cassandra.utils.Pair; -import com.carrotsearch.hppc.LongSet; -import com.google.common.collect.Iterators; - /** * Intended usage of this class is to be used in place of {@link DynamicTokenTreeBuilder} * when multiple index segments produced by {@link PerSSTableIndexWriter} are stitched together diff --git a/src/java/org/apache/cassandra/index/sasi/disk/Token.java b/src/java/org/apache/cassandra/index/sasi/disk/Token.java index 4cd1ea352a..6da9eb5abb 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/Token.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/Token.java @@ -17,13 +17,12 @@ */ package org.apache.cassandra.index.sasi.disk; +import com.carrotsearch.hppc.LongSet; import com.google.common.primitives.Longs; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.index.sasi.utils.CombinedValue; -import com.carrotsearch.hppc.LongSet; - public abstract class Token implements CombinedValue, Iterable { protected final long token; diff --git a/src/java/org/apache/cassandra/index/sasi/disk/TokenTree.java b/src/java/org/apache/cassandra/index/sasi/disk/TokenTree.java index 7f8f3a0f36..b67b598254 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/TokenTree.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/TokenTree.java @@ -18,7 +18,20 @@ package org.apache.cassandra.index.sasi.disk; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + +import com.carrotsearch.hppc.LongHashSet; +import com.carrotsearch.hppc.LongSet; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Function; +import com.google.common.collect.Iterators; + +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.index.sasi.utils.CombinedValue; @@ -27,13 +40,6 @@ import org.apache.cassandra.index.sasi.utils.RangeIterator; import org.apache.cassandra.utils.AbstractGuavaIterator; import org.apache.cassandra.utils.MergeIterator; -import com.carrotsearch.hppc.LongHashSet; -import com.carrotsearch.hppc.LongSet; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Function; -import com.google.common.collect.Iterators; -import org.apache.commons.lang3.builder.HashCodeBuilder; - import static org.apache.cassandra.index.sasi.disk.TokenTreeBuilder.EntryType; // Note: all of the seek-able offsets contained in TokenTree should be sizeof(long) diff --git a/src/java/org/apache/cassandra/index/sasi/disk/TokenTreeBuilder.java b/src/java/org/apache/cassandra/index/sasi/disk/TokenTreeBuilder.java index 01a536ccda..6ebf4fd678 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/TokenTreeBuilder.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/TokenTreeBuilder.java @@ -18,13 +18,14 @@ package org.apache.cassandra.index.sasi.disk; import java.io.IOException; -import java.util.*; +import java.util.Iterator; +import java.util.SortedMap; + +import com.carrotsearch.hppc.LongSet; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.utils.Pair; -import com.carrotsearch.hppc.LongSet; - public interface TokenTreeBuilder extends Iterable> { int BLOCK_BYTES = 4096; diff --git a/src/java/org/apache/cassandra/index/sasi/memory/IndexMemtable.java b/src/java/org/apache/cassandra/index/sasi/memory/IndexMemtable.java index e55a806ab5..161e8deb5d 100644 --- a/src/java/org/apache/cassandra/index/sasi/memory/IndexMemtable.java +++ b/src/java/org/apache/cassandra/index/sasi/memory/IndexMemtable.java @@ -19,6 +19,9 @@ package org.apache.cassandra.index.sasi.memory; import java.nio.ByteBuffer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sasi.conf.ColumnIndex; @@ -28,9 +31,6 @@ import org.apache.cassandra.index.sasi.utils.RangeIterator; import org.apache.cassandra.index.sasi.utils.TypeUtil; import org.apache.cassandra.utils.FBUtilities; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class IndexMemtable { private static final Logger logger = LoggerFactory.getLogger(IndexMemtable.class); diff --git a/src/java/org/apache/cassandra/index/sasi/memory/KeyRangeIterator.java b/src/java/org/apache/cassandra/index/sasi/memory/KeyRangeIterator.java index b4b1ccb9eb..6b61d467b5 100644 --- a/src/java/org/apache/cassandra/index/sasi/memory/KeyRangeIterator.java +++ b/src/java/org/apache/cassandra/index/sasi/memory/KeyRangeIterator.java @@ -23,17 +23,16 @@ import java.util.SortedSet; import java.util.TreeSet; import java.util.concurrent.ConcurrentSkipListSet; +import com.carrotsearch.hppc.LongHashSet; +import com.carrotsearch.hppc.LongSet; +import com.google.common.collect.PeekingIterator; + import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.index.sasi.disk.Token; import org.apache.cassandra.index.sasi.utils.CombinedValue; import org.apache.cassandra.index.sasi.utils.RangeIterator; - -import com.carrotsearch.hppc.LongHashSet; -import com.carrotsearch.hppc.LongSet; import org.apache.cassandra.utils.AbstractGuavaIterator; -import com.google.common.collect.PeekingIterator; - public class KeyRangeIterator extends RangeIterator { private final DKIterator iterator; diff --git a/src/java/org/apache/cassandra/index/sasi/memory/MemIndex.java b/src/java/org/apache/cassandra/index/sasi/memory/MemIndex.java index cc1eb3ff39..1afadaa4c5 100644 --- a/src/java/org/apache/cassandra/index/sasi/memory/MemIndex.java +++ b/src/java/org/apache/cassandra/index/sasi/memory/MemIndex.java @@ -20,11 +20,11 @@ package org.apache.cassandra.index.sasi.memory; import java.nio.ByteBuffer; import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sasi.conf.ColumnIndex; import org.apache.cassandra.index.sasi.disk.Token; import org.apache.cassandra.index.sasi.plan.Expression; import org.apache.cassandra.index.sasi.utils.RangeIterator; -import org.apache.cassandra.db.marshal.AbstractType; public abstract class MemIndex { diff --git a/src/java/org/apache/cassandra/index/sasi/memory/SkipListMemIndex.java b/src/java/org/apache/cassandra/index/sasi/memory/SkipListMemIndex.java index 9e44344f12..8aa948bdcb 100644 --- a/src/java/org/apache/cassandra/index/sasi/memory/SkipListMemIndex.java +++ b/src/java/org/apache/cassandra/index/sasi/memory/SkipListMemIndex.java @@ -18,17 +18,17 @@ package org.apache.cassandra.index.sasi.memory; import java.nio.ByteBuffer; -import java.util.*; +import java.util.SortedMap; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListSet; import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sasi.conf.ColumnIndex; import org.apache.cassandra.index.sasi.disk.Token; import org.apache.cassandra.index.sasi.plan.Expression; -import org.apache.cassandra.index.sasi.utils.RangeUnionIterator; import org.apache.cassandra.index.sasi.utils.RangeIterator; -import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.index.sasi.utils.RangeUnionIterator; public class SkipListMemIndex extends MemIndex { diff --git a/src/java/org/apache/cassandra/index/sasi/memory/TrieMemIndex.java b/src/java/org/apache/cassandra/index/sasi/memory/TrieMemIndex.java index cebd68f08c..c6aa56cba1 100644 --- a/src/java/org/apache/cassandra/index/sasi/memory/TrieMemIndex.java +++ b/src/java/org/apache/cassandra/index/sasi/memory/TrieMemIndex.java @@ -22,28 +22,27 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ConcurrentSkipListSet; +import com.googlecode.concurrenttrees.radix.ConcurrentRadixTree; +import com.googlecode.concurrenttrees.radix.node.Node; +import com.googlecode.concurrenttrees.radix.node.concrete.SmartArrayBasedNodeFactory; +import com.googlecode.concurrenttrees.suffix.ConcurrentSuffixTree; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.index.sasi.analyzer.AbstractAnalyzer; import org.apache.cassandra.index.sasi.conf.ColumnIndex; import org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder; import org.apache.cassandra.index.sasi.disk.Token; import org.apache.cassandra.index.sasi.plan.Expression; import org.apache.cassandra.index.sasi.plan.Expression.Op; -import org.apache.cassandra.index.sasi.analyzer.AbstractAnalyzer; -import org.apache.cassandra.index.sasi.utils.RangeUnionIterator; import org.apache.cassandra.index.sasi.utils.RangeIterator; -import org.apache.cassandra.db.marshal.AbstractType; - -import com.googlecode.concurrenttrees.radix.ConcurrentRadixTree; -import com.googlecode.concurrenttrees.suffix.ConcurrentSuffixTree; -import com.googlecode.concurrenttrees.radix.node.concrete.SmartArrayBasedNodeFactory; -import com.googlecode.concurrenttrees.radix.node.Node; +import org.apache.cassandra.index.sasi.utils.RangeUnionIterator; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.utils.FBUtilities; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import static org.apache.cassandra.index.sasi.memory.SkipListMemIndex.CSLM_OVERHEAD; public class TrieMemIndex extends MemIndex diff --git a/src/java/org/apache/cassandra/index/sasi/plan/Expression.java b/src/java/org/apache/cassandra/index/sasi/plan/Expression.java index b17a50d621..26bc70d587 100644 --- a/src/java/org/apache/cassandra/index/sasi/plan/Expression.java +++ b/src/java/org/apache/cassandra/index/sasi/plan/Expression.java @@ -22,25 +22,24 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.apache.cassandra.schema.ColumnMetadata; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Iterators; + +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.cql3.Operator; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.index.sasi.analyzer.AbstractAnalyzer; import org.apache.cassandra.index.sasi.conf.ColumnIndex; import org.apache.cassandra.index.sasi.disk.OnDiskIndex; import org.apache.cassandra.index.sasi.utils.TypeUtil; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import org.apache.commons.lang3.builder.HashCodeBuilder; - -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.Iterators; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class Expression { private static final Logger logger = LoggerFactory.getLogger(Expression.class); diff --git a/src/java/org/apache/cassandra/index/sasi/plan/Operation.java b/src/java/org/apache/cassandra/index/sasi/plan/Operation.java index 5b7f433282..343f1f056b 100644 --- a/src/java/org/apache/cassandra/index/sasi/plan/Operation.java +++ b/src/java/org/apache/cassandra/index/sasi/plan/Operation.java @@ -19,25 +19,29 @@ package org.apache.cassandra.index.sasi.plan; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Iterables; +import com.google.common.collect.ListMultimap; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.ColumnMetadata.Kind; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.rows.Unfiltered; -import org.apache.cassandra.index.sasi.conf.ColumnIndex; import org.apache.cassandra.index.sasi.analyzer.AbstractAnalyzer; +import org.apache.cassandra.index.sasi.conf.ColumnIndex; import org.apache.cassandra.index.sasi.disk.Token; import org.apache.cassandra.index.sasi.plan.Expression.Op; import org.apache.cassandra.index.sasi.utils.RangeIntersectionIterator; import org.apache.cassandra.index.sasi.utils.RangeIterator; import org.apache.cassandra.index.sasi.utils.RangeUnionIterator; - -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.*; - +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.ColumnMetadata.Kind; import org.apache.cassandra.utils.FBUtilities; public class Operation extends RangeIterator diff --git a/src/java/org/apache/cassandra/index/sasi/plan/QueryController.java b/src/java/org/apache/cassandra/index/sasi/plan/QueryController.java index 1599a7e719..49fc628d1d 100644 --- a/src/java/org/apache/cassandra/index/sasi/plan/QueryController.java +++ b/src/java/org/apache/cassandra/index/sasi/plan/QueryController.java @@ -17,7 +17,15 @@ */ package org.apache.cassandra.index.sasi.plan; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; diff --git a/src/java/org/apache/cassandra/index/sasi/plan/SASIIndexSearcher.java b/src/java/org/apache/cassandra/index/sasi/plan/SASIIndexSearcher.java index 6da4f8a969..b2b937de94 100644 --- a/src/java/org/apache/cassandra/index/sasi/plan/SASIIndexSearcher.java +++ b/src/java/org/apache/cassandra/index/sasi/plan/SASIIndexSearcher.java @@ -17,11 +17,21 @@ */ package org.apache.cassandra.index.sasi.plan; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.PartitionPosition; +import org.apache.cassandra.db.ReadCommand; +import org.apache.cassandra.db.ReadExecutionController; import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.AbstractUnfilteredRowIterator; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.index.Index; import org.apache.cassandra.index.sasi.disk.Token; diff --git a/src/java/org/apache/cassandra/index/sasi/sa/ByteTerm.java b/src/java/org/apache/cassandra/index/sasi/sa/ByteTerm.java index c7bbab781c..b1b1193799 100644 --- a/src/java/org/apache/cassandra/index/sasi/sa/ByteTerm.java +++ b/src/java/org/apache/cassandra/index/sasi/sa/ByteTerm.java @@ -19,8 +19,8 @@ package org.apache.cassandra.index.sasi.sa; import java.nio.ByteBuffer; -import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder; import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder; public class ByteTerm extends Term { diff --git a/src/java/org/apache/cassandra/index/sasi/sa/CharTerm.java b/src/java/org/apache/cassandra/index/sasi/sa/CharTerm.java index 533b566441..ca3af2f206 100644 --- a/src/java/org/apache/cassandra/index/sasi/sa/CharTerm.java +++ b/src/java/org/apache/cassandra/index/sasi/sa/CharTerm.java @@ -20,11 +20,11 @@ package org.apache.cassandra.index.sasi.sa; import java.nio.ByteBuffer; import java.nio.CharBuffer; -import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder; -import org.apache.cassandra.db.marshal.AbstractType; - import com.google.common.base.Charsets; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder; + public class CharTerm extends Term { public CharTerm(int position, CharBuffer value, TokenTreeBuilder tokens) diff --git a/src/java/org/apache/cassandra/index/sasi/sa/IntegralSA.java b/src/java/org/apache/cassandra/index/sasi/sa/IntegralSA.java index 5f04876ed9..6171de8ad8 100644 --- a/src/java/org/apache/cassandra/index/sasi/sa/IntegralSA.java +++ b/src/java/org/apache/cassandra/index/sasi/sa/IntegralSA.java @@ -22,9 +22,9 @@ import java.util.Collections; import java.util.Comparator; import java.util.Iterator; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder; import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.utils.Pair; public class IntegralSA extends SA diff --git a/src/java/org/apache/cassandra/index/sasi/sa/SA.java b/src/java/org/apache/cassandra/index/sasi/sa/SA.java index 75f9f92e8e..3eac950f88 100644 --- a/src/java/org/apache/cassandra/index/sasi/sa/SA.java +++ b/src/java/org/apache/cassandra/index/sasi/sa/SA.java @@ -22,9 +22,9 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder.Mode; import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder; -import org.apache.cassandra.db.marshal.AbstractType; public abstract class SA { diff --git a/src/java/org/apache/cassandra/index/sasi/sa/SuffixSA.java b/src/java/org/apache/cassandra/index/sasi/sa/SuffixSA.java index 9e1c76a850..b183c448ac 100644 --- a/src/java/org/apache/cassandra/index/sasi/sa/SuffixSA.java +++ b/src/java/org/apache/cassandra/index/sasi/sa/SuffixSA.java @@ -20,15 +20,15 @@ package org.apache.cassandra.index.sasi.sa; import java.nio.ByteBuffer; import java.nio.CharBuffer; +import com.google.common.base.Charsets; + +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sasi.disk.DynamicTokenTreeBuilder; import org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder; import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.utils.LongTimSort; import org.apache.cassandra.utils.Pair; -import com.google.common.base.Charsets; - public class SuffixSA extends SA { public SuffixSA(AbstractType comparator, OnDiskIndexBuilder.Mode mode) diff --git a/src/java/org/apache/cassandra/index/sasi/sa/Term.java b/src/java/org/apache/cassandra/index/sasi/sa/Term.java index fe6eca8c35..c58144be7b 100644 --- a/src/java/org/apache/cassandra/index/sasi/sa/Term.java +++ b/src/java/org/apache/cassandra/index/sasi/sa/Term.java @@ -20,8 +20,8 @@ package org.apache.cassandra.index.sasi.sa; import java.nio.Buffer; import java.nio.ByteBuffer; -import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder; import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder; public abstract class Term { diff --git a/src/java/org/apache/cassandra/index/sasi/sa/TermIterator.java b/src/java/org/apache/cassandra/index/sasi/sa/TermIterator.java index c8572a9d43..365eed562a 100644 --- a/src/java/org/apache/cassandra/index/sasi/sa/TermIterator.java +++ b/src/java/org/apache/cassandra/index/sasi/sa/TermIterator.java @@ -19,11 +19,11 @@ package org.apache.cassandra.index.sasi.sa; import java.nio.ByteBuffer; +import com.google.common.collect.AbstractIterator; + import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder; import org.apache.cassandra.utils.Pair; -import com.google.common.collect.AbstractIterator; - public abstract class TermIterator extends AbstractIterator> { public abstract ByteBuffer minTerm(); diff --git a/src/java/org/apache/cassandra/index/sasi/utils/CombinedTerm.java b/src/java/org/apache/cassandra/index/sasi/utils/CombinedTerm.java index cc327bcfdd..29788cc866 100644 --- a/src/java/org/apache/cassandra/index/sasi/utils/CombinedTerm.java +++ b/src/java/org/apache/cassandra/index/sasi/utils/CombinedTerm.java @@ -18,11 +18,15 @@ package org.apache.cassandra.index.sasi.utils; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import org.apache.cassandra.index.sasi.disk.*; -import org.apache.cassandra.index.sasi.disk.OnDiskIndex.DataTerm; import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.index.sasi.disk.OnDiskIndex; +import org.apache.cassandra.index.sasi.disk.OnDiskIndex.DataTerm; +import org.apache.cassandra.index.sasi.disk.StaticTokenTreeBuilder; +import org.apache.cassandra.index.sasi.disk.Token; +import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder; public class CombinedTerm implements CombinedValue { diff --git a/src/java/org/apache/cassandra/index/sasi/utils/CombinedTermIterator.java b/src/java/org/apache/cassandra/index/sasi/utils/CombinedTermIterator.java index 683ca7adec..061e1ad56e 100644 --- a/src/java/org/apache/cassandra/index/sasi/utils/CombinedTermIterator.java +++ b/src/java/org/apache/cassandra/index/sasi/utils/CombinedTermIterator.java @@ -19,12 +19,12 @@ package org.apache.cassandra.index.sasi.utils; import java.nio.ByteBuffer; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sasi.disk.Descriptor; import org.apache.cassandra.index.sasi.disk.OnDiskIndex; import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder; import org.apache.cassandra.index.sasi.sa.IndexedTerm; import org.apache.cassandra.index.sasi.sa.TermIterator; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.utils.Pair; public class CombinedTermIterator extends TermIterator diff --git a/src/java/org/apache/cassandra/index/sasi/utils/MappedBuffer.java b/src/java/org/apache/cassandra/index/sasi/utils/MappedBuffer.java index 684ec26271..63f2ebfd87 100644 --- a/src/java/org/apache/cassandra/index/sasi/utils/MappedBuffer.java +++ b/src/java/org/apache/cassandra/index/sasi/utils/MappedBuffer.java @@ -22,13 +22,13 @@ import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel.MapMode; +import com.google.common.annotations.VisibleForTesting; + import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.util.ChannelProxy; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.utils.memory.MemoryUtil; -import com.google.common.annotations.VisibleForTesting; - public class MappedBuffer implements Closeable { private final MappedByteBuffer[] pages; diff --git a/src/java/org/apache/cassandra/index/sasi/utils/OnDiskIndexIterator.java b/src/java/org/apache/cassandra/index/sasi/utils/OnDiskIndexIterator.java index ae97cabfc2..7a1b40099a 100644 --- a/src/java/org/apache/cassandra/index/sasi/utils/OnDiskIndexIterator.java +++ b/src/java/org/apache/cassandra/index/sasi/utils/OnDiskIndexIterator.java @@ -20,9 +20,9 @@ package org.apache.cassandra.index.sasi.utils; import java.io.IOException; import java.util.Iterator; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sasi.disk.OnDiskIndex; import org.apache.cassandra.index.sasi.disk.OnDiskIndex.DataTerm; -import org.apache.cassandra.db.marshal.AbstractType; public class OnDiskIndexIterator extends RangeIterator { diff --git a/src/java/org/apache/cassandra/index/sasi/utils/RangeIntersectionIterator.java b/src/java/org/apache/cassandra/index/sasi/utils/RangeIntersectionIterator.java index 331f4edff3..78292b4f77 100644 --- a/src/java/org/apache/cassandra/index/sasi/utils/RangeIntersectionIterator.java +++ b/src/java/org/apache/cassandra/index/sasi/utils/RangeIntersectionIterator.java @@ -23,10 +23,10 @@ import java.util.Iterator; import java.util.List; import java.util.PriorityQueue; -import com.google.common.collect.Iterators; -import org.apache.cassandra.io.util.FileUtils; - import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Iterators; + +import org.apache.cassandra.io.util.FileUtils; public class RangeIntersectionIterator { diff --git a/src/java/org/apache/cassandra/index/sasi/utils/RangeUnionIterator.java b/src/java/org/apache/cassandra/index/sasi/utils/RangeUnionIterator.java index f229569970..ae0ed7fc1f 100644 --- a/src/java/org/apache/cassandra/index/sasi/utils/RangeUnionIterator.java +++ b/src/java/org/apache/cassandra/index/sasi/utils/RangeUnionIterator.java @@ -18,7 +18,10 @@ package org.apache.cassandra.index.sasi.utils; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.PriorityQueue; import java.util.stream.Collectors; import org.apache.cassandra.io.util.FileUtils; diff --git a/src/java/org/apache/cassandra/index/sasi/utils/TypeUtil.java b/src/java/org/apache/cassandra/index/sasi/utils/TypeUtil.java index 9815233cf3..c7e7bfd397 100644 --- a/src/java/org/apache/cassandra/index/sasi/utils/TypeUtil.java +++ b/src/java/org/apache/cassandra/index/sasi/utils/TypeUtil.java @@ -19,7 +19,12 @@ package org.apache.cassandra.index.sasi.utils; import java.nio.ByteBuffer; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.DoubleType; +import org.apache.cassandra.db.marshal.FloatType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.serializers.MarshalException; public class TypeUtil diff --git a/src/java/org/apache/cassandra/index/sasi/utils/trie/PatriciaTrie.java b/src/java/org/apache/cassandra/index/sasi/utils/trie/PatriciaTrie.java index a36af9828c..9beeb29a61 100644 --- a/src/java/org/apache/cassandra/index/sasi/utils/trie/PatriciaTrie.java +++ b/src/java/org/apache/cassandra/index/sasi/utils/trie/PatriciaTrie.java @@ -17,7 +17,15 @@ package org.apache.cassandra.index.sasi.utils.trie; import java.io.Serializable; -import java.util.*; +import java.util.AbstractMap; +import java.util.AbstractSet; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.SortedMap; /** * This class is taken from https://github.com/rkapsi/patricia-trie (v0.6), and slightly modified diff --git a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java index 1f4cd517b0..71f1dc4c6f 100644 --- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java +++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java @@ -24,6 +24,7 @@ import java.nio.ByteBuffer; import java.nio.channels.Channels; import java.util.Optional; import java.util.zip.CRC32; + import javax.annotation.Nullable; import org.apache.cassandra.db.compression.CompressionDictionary; diff --git a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java index bd09b9081c..2370d25ef2 100644 --- a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java +++ b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java @@ -27,6 +27,7 @@ import java.util.HashMap; import java.util.Map; import java.util.SortedSet; import java.util.TreeSet; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; diff --git a/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java b/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java index d3d7090559..055f7e415c 100644 --- a/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java +++ b/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java @@ -17,9 +17,6 @@ */ package org.apache.cassandra.io.compress; -import io.netty.util.concurrent.FastThreadLocal; -import org.apache.cassandra.schema.CompressionParams; - import java.io.IOException; import java.nio.ByteBuffer; import java.util.Collections; @@ -31,6 +28,10 @@ import java.util.zip.Inflater; import com.google.common.collect.ImmutableSet; +import org.apache.cassandra.schema.CompressionParams; + +import io.netty.util.concurrent.FastThreadLocal; + public class DeflateCompressor implements ICompressor { public static final DeflateCompressor instance = new DeflateCompressor(); diff --git a/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java b/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java index 6c333b7651..be01eb534b 100644 --- a/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java +++ b/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java @@ -28,11 +28,13 @@ import java.util.concurrent.ConcurrentHashMap; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.jpountz.lz4.LZ4Exception; import net.jpountz.lz4.LZ4Factory; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.utils.Pair; diff --git a/src/java/org/apache/cassandra/io/compress/ZstdCompressorBase.java b/src/java/org/apache/cassandra/io/compress/ZstdCompressorBase.java index bbe278cbf4..a5cd146478 100644 --- a/src/java/org/apache/cassandra/io/compress/ZstdCompressorBase.java +++ b/src/java/org/apache/cassandra/io/compress/ZstdCompressorBase.java @@ -24,12 +24,12 @@ import java.util.Collections; import java.util.Map; import java.util.Set; +import com.github.luben.zstd.Zstd; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.github.luben.zstd.Zstd; - public abstract class ZstdCompressorBase implements ICompressor { // These might change with the version of Zstd we're using diff --git a/src/java/org/apache/cassandra/io/compress/ZstdDictionaryCompressor.java b/src/java/org/apache/cassandra/io/compress/ZstdDictionaryCompressor.java index 59cba54b20..46a0c3d483 100644 --- a/src/java/org/apache/cassandra/io/compress/ZstdDictionaryCompressor.java +++ b/src/java/org/apache/cassandra/io/compress/ZstdDictionaryCompressor.java @@ -25,21 +25,20 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import javax.annotation.Nullable; + import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.RemovalCause; import com.github.luben.zstd.Zstd; - import com.google.common.annotations.VisibleForTesting; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.ParameterizedClass; -import org.apache.cassandra.db.compression.ZstdCompressionDictionary; import org.apache.cassandra.db.compression.CompressionDictionary.Kind; +import org.apache.cassandra.db.compression.ZstdCompressionDictionary; import org.apache.cassandra.utils.concurrent.Ref; -import javax.annotation.Nullable; - public class ZstdDictionaryCompressor extends ZstdCompressorBase implements ICompressor, IDictionaryCompressor { private static final ConcurrentHashMap instancesPerLevel = new ConcurrentHashMap<>(); diff --git a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java index 8236451eb8..552da199ca 100644 --- a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java @@ -38,6 +38,9 @@ import java.util.stream.Collectors; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnSpecification; @@ -90,9 +93,6 @@ import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.JavaDriverUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; /** diff --git a/src/java/org/apache/cassandra/io/sstable/ClusteringDescriptor.java b/src/java/org/apache/cassandra/io/sstable/ClusteringDescriptor.java index 2afbc4db77..27bd3cea89 100644 --- a/src/java/org/apache/cassandra/io/sstable/ClusteringDescriptor.java +++ b/src/java/org/apache/cassandra/io/sstable/ClusteringDescriptor.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; -import org.apache.cassandra.io.util.ResizableByteBuffer; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.ClusteringBound; import org.apache.cassandra.db.ClusteringPrefix; @@ -30,6 +29,7 @@ import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ByteArrayAccessor; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.RandomAccessReader; +import org.apache.cassandra.io.util.ResizableByteBuffer; import static org.apache.cassandra.io.sstable.SSTableCursorReader.readUnfilteredClustering; diff --git a/src/java/org/apache/cassandra/io/sstable/Descriptor.java b/src/java/org/apache/cassandra/io/sstable/Descriptor.java index b9e1498042..68c85ccfa5 100644 --- a/src/java/org/apache/cassandra/io/sstable/Descriptor.java +++ b/src/java/org/apache/cassandra/io/sstable/Descriptor.java @@ -28,6 +28,7 @@ import com.google.common.base.Objects; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/Downsampling.java b/src/java/org/apache/cassandra/io/sstable/Downsampling.java index 8455d0b48d..66ff76354b 100644 --- a/src/java/org/apache/cassandra/io/sstable/Downsampling.java +++ b/src/java/org/apache/cassandra/io/sstable/Downsampling.java @@ -18,7 +18,11 @@ */ package org.apache.cassandra.io.sstable; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class Downsampling { diff --git a/src/java/org/apache/cassandra/io/sstable/GaugeProvider.java b/src/java/org/apache/cassandra/io/sstable/GaugeProvider.java index d0680be2a2..40d77b89ea 100644 --- a/src/java/org/apache/cassandra/io/sstable/GaugeProvider.java +++ b/src/java/org/apache/cassandra/io/sstable/GaugeProvider.java @@ -19,6 +19,7 @@ package org.apache.cassandra.io.sstable; import com.codahale.metrics.Gauge; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; diff --git a/src/java/org/apache/cassandra/io/sstable/PartitionDescriptor.java b/src/java/org/apache/cassandra/io/sstable/PartitionDescriptor.java index 425f2413d3..c944a13b00 100644 --- a/src/java/org/apache/cassandra/io/sstable/PartitionDescriptor.java +++ b/src/java/org/apache/cassandra/io/sstable/PartitionDescriptor.java @@ -22,11 +22,11 @@ import java.io.IOException; import java.nio.ByteBuffer; import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.db.DeletionTime.ReusableDeletionTime; import org.apache.cassandra.dht.ReusableDecoratedKey; -import org.apache.cassandra.io.util.ResizableByteBuffer; -import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.io.util.RandomAccessReader; +import org.apache.cassandra.io.util.ResizableByteBuffer; public final class PartitionDescriptor extends ResizableByteBuffer { diff --git a/src/java/org/apache/cassandra/io/sstable/SSTable.java b/src/java/org/apache/cassandra/io/sstable/SSTable.java index 0ee4de1897..ea3fbbe52a 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTable.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTable.java @@ -27,6 +27,7 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import java.util.stream.Collectors; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; @@ -39,11 +40,11 @@ import com.google.common.collect.Sets; import org.apache.cassandra.cache.ChunkCache; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.compression.CompressionDictionaryManager; import org.apache.cassandra.db.lifecycle.Tracker; import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.db.compression.CompressionDictionaryManager; import org.apache.cassandra.io.sstable.format.SSTableFormat; import org.apache.cassandra.io.sstable.format.SSTableFormat.Components; import org.apache.cassandra.io.sstable.format.TOCComponent; diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableCursorKeyReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableCursorKeyReader.java index d0bbe73821..cb5be343f3 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableCursorKeyReader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableCursorKeyReader.java @@ -19,13 +19,13 @@ package org.apache.cassandra.io.sstable; import java.io.IOException; import java.nio.ByteBuffer; + import javax.annotation.concurrent.NotThreadSafe; - -import org.apache.cassandra.io.util.ResizableByteBuffer; import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.RandomAccessReader; +import org.apache.cassandra.io.util.ResizableByteBuffer; import org.apache.cassandra.utils.Throwables; @NotThreadSafe diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableCursorReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableCursorReader.java index f9dfc2ffcb..ccf94ce6da 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableCursorReader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableCursorReader.java @@ -22,12 +22,11 @@ import java.io.IOException; import com.google.common.collect.ImmutableList; -import org.apache.cassandra.db.ReusableLivenessInfo; -import org.apache.cassandra.io.util.ResizableByteBuffer; import org.apache.cassandra.db.ClusteringPrefix; import org.apache.cassandra.db.Columns; import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.db.LivenessInfo; +import org.apache.cassandra.db.ReusableLivenessInfo; import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.rows.Cell; @@ -42,13 +41,25 @@ import org.apache.cassandra.io.sstable.format.Version; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.io.util.RandomAccessReader; +import org.apache.cassandra.io.util.ResizableByteBuffer; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.tools.Util; import org.apache.cassandra.utils.concurrent.Ref; -import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.*; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.CELL_END; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.CELL_HEADER_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.CELL_VALUE_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.DONE; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.PARTITION_END; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.PARTITION_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.ROW_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.SEEK; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.STATIC_ROW_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.TOMBSTONE_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.UNFILTERED_END; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.isState; public class SSTableCursorReader implements AutoCloseable { diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableCursorWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableCursorWriter.java index 2a170acb73..63f0e03405 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableCursorWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableCursorWriter.java @@ -24,6 +24,7 @@ import java.nio.ByteBuffer; import com.google.common.primitives.Ints; import org.agrona.collections.IntArrayList; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ClusteringPrefix; import org.apache.cassandra.db.DecoratedKey; @@ -57,7 +58,12 @@ import org.apache.cassandra.utils.ByteArrayUtil; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.concurrent.Ref; -import static org.apache.cassandra.db.rows.UnfilteredSerializer.*; +import static org.apache.cassandra.db.rows.UnfilteredSerializer.HAS_ALL_COLUMNS; +import static org.apache.cassandra.db.rows.UnfilteredSerializer.HAS_DELETION; +import static org.apache.cassandra.db.rows.UnfilteredSerializer.HAS_TIMESTAMP; +import static org.apache.cassandra.db.rows.UnfilteredSerializer.HAS_TTL; +import static org.apache.cassandra.db.rows.UnfilteredSerializer.IS_MARKER; +import static org.apache.cassandra.db.rows.UnfilteredSerializer.isExtended; public class SSTableCursorWriter implements AutoCloseable { diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleIterator.java b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleIterator.java index 92643b21b8..27144f76bb 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleIterator.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleIterator.java @@ -17,14 +17,20 @@ */ package org.apache.cassandra.io.sstable; -import java.io.IOException; import java.io.IOError; +import java.io.IOException; import java.util.Iterator; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.SerializationHeader; +import org.apache.cassandra.db.rows.BTreeRow; +import org.apache.cassandra.db.rows.DeserializationHelper; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.Rows; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredSerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.schema.TableMetadata; diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java index 59b52ca77a..8c9b2f9796 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import com.google.common.base.Throwables; -import io.netty.util.concurrent.FastThreadLocalThread; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.RegularAndStaticColumns; import org.apache.cassandra.db.SerializationHeader; @@ -41,6 +40,8 @@ import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; +import io.netty.util.concurrent.FastThreadLocalThread; + import static org.apache.cassandra.utils.concurrent.BlockingQueues.newBlockingQueue; /** diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableZeroCopyWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableZeroCopyWriter.java index 47566ee550..9d191482af 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableZeroCopyWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableZeroCopyWriter.java @@ -27,6 +27,7 @@ import java.util.Set; import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/SimpleGaugeProvider.java b/src/java/org/apache/cassandra/io/sstable/SimpleGaugeProvider.java index 192909000c..a080656e63 100644 --- a/src/java/org/apache/cassandra/io/sstable/SimpleGaugeProvider.java +++ b/src/java/org/apache/cassandra/io/sstable/SimpleGaugeProvider.java @@ -21,9 +21,9 @@ package org.apache.cassandra.io.sstable; import java.util.Objects; import java.util.function.Function; +import com.codahale.metrics.Gauge; import com.google.common.collect.Iterables; -import com.codahale.metrics.Gauge; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.io.sstable.format.SSTableReader; diff --git a/src/java/org/apache/cassandra/io/sstable/UUIDBasedSSTableId.java b/src/java/org/apache/cassandra/io/sstable/UUIDBasedSSTableId.java index 9cec5879f6..34efd45a81 100644 --- a/src/java/org/apache/cassandra/io/sstable/UUIDBasedSSTableId.java +++ b/src/java/org/apache/cassandra/io/sstable/UUIDBasedSSTableId.java @@ -25,6 +25,7 @@ import java.util.function.Supplier; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Stream; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java index 6ffaa8a7ba..bd6f630701 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java @@ -20,6 +20,7 @@ package org.apache.cassandra.io.sstable.format; import java.io.IOException; import java.util.Map; import java.util.Set; + import javax.annotation.Nonnull; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index 93915b1ba2..7d8941d80c 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java @@ -38,17 +38,18 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReentrantReadWriteLock; +import com.clearspring.analytics.stream.cardinality.CardinalityMergeException; +import com.clearspring.analytics.stream.cardinality.ICardinality; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; import com.google.common.primitives.Longs; import com.google.common.util.concurrent.RateLimiter; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.clearspring.analytics.stream.cardinality.CardinalityMergeException; -import com.clearspring.analytics.stream.cardinality.ICardinality; import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.concurrent.ScheduledExecutors; diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableReaderLoadingBuilder.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableReaderLoadingBuilder.java index 1a4aa0d9f5..056b4de12a 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReaderLoadingBuilder.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReaderLoadingBuilder.java @@ -23,6 +23,7 @@ import java.util.Set; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java index 8543da23e2..b542b15bf6 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java @@ -28,11 +28,13 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/format/SortedTableScrubber.java b/src/java/org/apache/cassandra/io/sstable/format/SortedTableScrubber.java index e8fbea22d2..07fc965673 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SortedTableScrubber.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SortedTableScrubber.java @@ -30,11 +30,13 @@ import java.util.TreeSet; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; + import javax.annotation.concurrent.NotThreadSafe; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/format/SortedTableVerifier.java b/src/java/org/apache/cassandra/io/sstable/format/SortedTableVerifier.java index 50c9744856..305c337a47 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SortedTableVerifier.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SortedTableVerifier.java @@ -33,6 +33,7 @@ import java.util.function.LongPredicate; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/format/SortedTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/SortedTableWriter.java index d600ee665d..05924a1b54 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SortedTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SortedTableWriter.java @@ -27,6 +27,7 @@ import java.util.function.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/format/TOCComponent.java b/src/java/org/apache/cassandra/io/sstable/format/TOCComponent.java index 883550081c..9a0c77fe3b 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/TOCComponent.java +++ b/src/java/org/apache/cassandra/io/sstable/format/TOCComponent.java @@ -31,6 +31,7 @@ import java.util.TreeSet; import com.google.common.collect.Collections2; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableKeyReader.java b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableKeyReader.java index d3fba91046..238bd232cd 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableKeyReader.java +++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableKeyReader.java @@ -19,6 +19,7 @@ package org.apache.cassandra.io.sstable.format.big; import java.io.IOException; import java.nio.ByteBuffer; + import javax.annotation.concurrent.NotThreadSafe; import org.apache.cassandra.io.sstable.KeyReader; diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java index 2f31d4c358..d59e5dae70 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java @@ -31,9 +31,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import org.apache.cassandra.dht.AbstractBounds; -import org.apache.cassandra.io.sstable.*; -import org.apache.cassandra.utils.*; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,8 +47,20 @@ import org.apache.cassandra.db.rows.Rows; import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.rows.UnfilteredRowIteratorWithLowerBound; import org.apache.cassandra.db.rows.UnfilteredRowIterators; +import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; +import org.apache.cassandra.io.sstable.AbstractRowIndexEntry; +import org.apache.cassandra.io.sstable.CorruptSSTableException; +import org.apache.cassandra.io.sstable.Descriptor; +import org.apache.cassandra.io.sstable.Downsampling; +import org.apache.cassandra.io.sstable.ISSTableScanner; +import org.apache.cassandra.io.sstable.IVerifier; +import org.apache.cassandra.io.sstable.IndexInfo; +import org.apache.cassandra.io.sstable.KeyIterator; +import org.apache.cassandra.io.sstable.KeyReader; +import org.apache.cassandra.io.sstable.SSTable; +import org.apache.cassandra.io.sstable.SSTableReadsListener; import org.apache.cassandra.io.sstable.SSTableReadsListener.SelectionReason; import org.apache.cassandra.io.sstable.SSTableReadsListener.SkippingReason; import org.apache.cassandra.io.sstable.format.SSTableReader; @@ -66,6 +76,9 @@ import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.RandomAccessReader; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.IFilter; +import org.apache.cassandra.utils.OutputHandler; import static org.apache.cassandra.utils.concurrent.SharedCloseable.sharedCopyOrNull; diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java index 4f04eee100..1f706c0ba4 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.function.Consumer; import com.google.common.collect.ImmutableSet; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/RowIndexEntry.java b/src/java/org/apache/cassandra/io/sstable/format/big/RowIndexEntry.java index c66b94ab0c..9e3ce7496a 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/big/RowIndexEntry.java +++ b/src/java/org/apache/cassandra/io/sstable/format/big/RowIndexEntry.java @@ -23,6 +23,9 @@ import java.util.Arrays; import java.util.List; import com.codahale.metrics.Histogram; + +import org.github.jamm.Unmetered; + import org.apache.cassandra.config.DataStorageSpec; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ArrayClustering; @@ -50,7 +53,6 @@ import org.apache.cassandra.net.ParamType; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.vint.VIntCoding; -import org.github.jamm.Unmetered; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/io/sstable/format/bti/BtiFormat.java b/src/java/org/apache/cassandra/io/sstable/format/bti/BtiFormat.java index 8c6dbf1f1f..ff7f11ce17 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/bti/BtiFormat.java +++ b/src/java/org/apache/cassandra/io/sstable/format/bti/BtiFormat.java @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/format/bti/BtiTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/bti/BtiTableWriter.java index e88f7228f2..bf28a83a37 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/bti/BtiTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/format/bti/BtiTableWriter.java @@ -24,6 +24,7 @@ import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/format/bti/PartitionIndex.java b/src/java/org/apache/cassandra/io/sstable/format/bti/PartitionIndex.java index cfdfe37eed..4c6ac0f28e 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/bti/PartitionIndex.java +++ b/src/java/org/apache/cassandra/io/sstable/format/bti/PartitionIndex.java @@ -22,6 +22,7 @@ import java.io.PrintStream; import java.nio.ByteBuffer; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/format/bti/RowIndexReader.java b/src/java/org/apache/cassandra/io/sstable/format/bti/RowIndexReader.java index 3bfd2903fc..55d0d38639 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/bti/RowIndexReader.java +++ b/src/java/org/apache/cassandra/io/sstable/format/bti/RowIndexReader.java @@ -20,6 +20,7 @@ package org.apache.cassandra.io.sstable.format.bti; import java.io.IOException; import java.io.PrintStream; import java.nio.ByteBuffer; + import javax.annotation.concurrent.NotThreadSafe; import org.apache.cassandra.db.DeletionTime; diff --git a/src/java/org/apache/cassandra/io/sstable/format/bti/SSTableReversedIterator.java b/src/java/org/apache/cassandra/io/sstable/format/bti/SSTableReversedIterator.java index c54bc0136c..8e69054d52 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/bti/SSTableReversedIterator.java +++ b/src/java/org/apache/cassandra/io/sstable/format/bti/SSTableReversedIterator.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.util.NoSuchElementException; import com.carrotsearch.hppc.LongStack; + import org.apache.cassandra.db.ClusteringBound; import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.db.DecoratedKey; diff --git a/src/java/org/apache/cassandra/io/sstable/indexsummary/IndexSummary.java b/src/java/org/apache/cassandra/io/sstable/indexsummary/IndexSummary.java index 6173d8ddd7..6ddc85ce3e 100644 --- a/src/java/org/apache/cassandra/io/sstable/indexsummary/IndexSummary.java +++ b/src/java/org/apache/cassandra/io/sstable/indexsummary/IndexSummary.java @@ -28,6 +28,7 @@ import java.util.Iterator; import java.util.List; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryManager.java b/src/java/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryManager.java index 7de33ba2f1..3486150c3f 100644 --- a/src/java/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryManager.java +++ b/src/java/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryManager.java @@ -28,13 +28,14 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Supplier; +import com.codahale.metrics.Timer; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Timer; import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/src/java/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryRedistribution.java b/src/java/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryRedistribution.java index 77b341be91..335a659354 100644 --- a/src/java/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryRedistribution.java +++ b/src/java/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryRedistribution.java @@ -28,6 +28,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/keycache/KeyCache.java b/src/java/org/apache/cassandra/io/sstable/keycache/KeyCache.java index 7ed1955b3f..67093d6dfb 100644 --- a/src/java/org/apache/cassandra/io/sstable/keycache/KeyCache.java +++ b/src/java/org/apache/cassandra/io/sstable/keycache/KeyCache.java @@ -19,6 +19,7 @@ package org.apache.cassandra.io.sstable.keycache; import java.util.concurrent.atomic.LongAdder; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/java/org/apache/cassandra/io/sstable/keycache/KeyCacheSupport.java b/src/java/org/apache/cassandra/io/sstable/keycache/KeyCacheSupport.java index 9d5db7ff49..b1c95a02d4 100644 --- a/src/java/org/apache/cassandra/io/sstable/keycache/KeyCacheSupport.java +++ b/src/java/org/apache/cassandra/io/sstable/keycache/KeyCacheSupport.java @@ -20,6 +20,7 @@ package org.apache.cassandra.io.sstable.keycache; import java.io.IOException; import java.nio.ByteBuffer; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java index a137b653a4..d60f37fa91 100644 --- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java @@ -23,10 +23,9 @@ import java.util.EnumMap; import java.util.Map; import java.util.UUID; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.io.sstable.ClusteringDescriptor; import com.clearspring.analytics.stream.cardinality.HyperLogLogPlus; import com.clearspring.analytics.stream.cardinality.ICardinality; + import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.ClusteringBound; import org.apache.cassandra.db.ClusteringBoundOrBoundary; @@ -38,9 +37,11 @@ import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.Slice; import org.apache.cassandra.db.commitlog.CommitLogPosition; import org.apache.cassandra.db.commitlog.IntervalSet; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.partitions.PartitionStatisticsCollector; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.io.sstable.ClusteringDescriptor; import org.apache.cassandra.io.sstable.SSTable; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.service.ActiveRepairService; diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java index 788f8cd814..314694a611 100644 --- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java @@ -29,6 +29,7 @@ import java.util.zip.CRC32; import com.google.common.base.Throwables; import com.google.common.collect.Lists; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java index b509e3f3ae..3ec1a208c5 100644 --- a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java @@ -25,7 +25,6 @@ import java.util.UUID; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/tries/Walker.java b/src/java/org/apache/cassandra/io/tries/Walker.java index 0b2b86ca94..2f91ab23af 100644 --- a/src/java/org/apache/cassandra/io/tries/Walker.java +++ b/src/java/org/apache/cassandra/io/tries/Walker.java @@ -21,15 +21,17 @@ import java.io.IOException; import java.io.PrintStream; import java.nio.ByteBuffer; import java.util.Arrays; + import javax.annotation.concurrent.NotThreadSafe; +import org.apache.lucene.util.ArrayUtil; + import org.apache.cassandra.io.sstable.format.Version; import org.apache.cassandra.io.util.PageAware; import org.apache.cassandra.io.util.Rebufferer; import org.apache.cassandra.io.util.Rebufferer.BufferHolder; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; -import org.apache.lucene.util.ArrayUtil; /** * Thread-unsafe trie walking helper. This is analogous to {@link org.apache.cassandra.io.util.RandomAccessReader} for diff --git a/src/java/org/apache/cassandra/io/util/BufferedDataOutputStreamPlus.java b/src/java/org/apache/cassandra/io/util/BufferedDataOutputStreamPlus.java index 62b7667ba3..22ee9217df 100644 --- a/src/java/org/apache/cassandra/io/util/BufferedDataOutputStreamPlus.java +++ b/src/java/org/apache/cassandra/io/util/BufferedDataOutputStreamPlus.java @@ -26,6 +26,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import net.nicoulaj.compilecommand.annotations.DontInline; + import org.apache.cassandra.utils.FastByteOperations; import org.apache.cassandra.utils.memory.MemoryUtil; diff --git a/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java b/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java index 308219aa5f..0a4dde7d32 100644 --- a/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java +++ b/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java @@ -27,10 +27,11 @@ import java.nio.charset.StandardCharsets; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.memory.MemoryUtil; +import io.netty.util.concurrent.FastThreadLocal; + import static org.apache.cassandra.config.CassandraRelevantProperties.DATA_OUTPUT_BUFFER_ALLOCATE_TYPE; import static org.apache.cassandra.config.CassandraRelevantProperties.DOB_DOUBLING_THRESHOLD_MB; import static org.apache.cassandra.config.CassandraRelevantProperties.DOB_MAX_RECYCLE_BYTES; diff --git a/src/java/org/apache/cassandra/io/util/DataOutputPlus.java b/src/java/org/apache/cassandra/io/util/DataOutputPlus.java index 3c66424065..6fa94e5784 100644 --- a/src/java/org/apache/cassandra/io/util/DataOutputPlus.java +++ b/src/java/org/apache/cassandra/io/util/DataOutputPlus.java @@ -17,16 +17,16 @@ */ package org.apache.cassandra.io.util; -import org.apache.cassandra.utils.Shared; -import org.apache.cassandra.utils.memory.MemoryUtil; -import org.apache.cassandra.utils.vint.VIntCoding; - import java.io.DataOutput; import java.io.IOException; import java.nio.ByteBuffer; import com.google.common.primitives.Ints; +import org.apache.cassandra.utils.Shared; +import org.apache.cassandra.utils.memory.MemoryUtil; +import org.apache.cassandra.utils.vint.VIntCoding; + import static org.apache.cassandra.utils.Shared.Scope.SIMULATION; /** diff --git a/src/java/org/apache/cassandra/io/util/DataOutputStreamPlus.java b/src/java/org/apache/cassandra/io/util/DataOutputStreamPlus.java index 7dd2341bba..68e31c24b4 100644 --- a/src/java/org/apache/cassandra/io/util/DataOutputStreamPlus.java +++ b/src/java/org/apache/cassandra/io/util/DataOutputStreamPlus.java @@ -22,9 +22,10 @@ import java.io.OutputStream; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.utils.ByteBufferUtil; +import io.netty.util.concurrent.FastThreadLocal; + import static org.apache.cassandra.config.CassandraRelevantProperties.DATA_OUTPUT_STREAM_PLUS_TEMP_BUFFER_SIZE; /** diff --git a/src/java/org/apache/cassandra/io/util/File.java b/src/java/org/apache/cassandra/io/util/File.java index e814e37b74..eee8046aae 100644 --- a/src/java/org/apache/cassandra/io/util/File.java +++ b/src/java/org/apache/cassandra/io/util/File.java @@ -36,12 +36,14 @@ import java.util.function.Function; import java.util.function.IntFunction; import java.util.function.Predicate; import java.util.stream.Stream; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.RateLimiter; import net.openhft.chronicle.core.util.ThrowingFunction; + import org.apache.cassandra.io.FSWriteError; import static org.apache.cassandra.io.util.PathUtils.filename; diff --git a/src/java/org/apache/cassandra/io/util/FileUtils.java b/src/java/org/apache/cassandra/io/util/FileUtils.java index a67f70dd96..731c2f4cf0 100644 --- a/src/java/org/apache/cassandra/io/util/FileUtils.java +++ b/src/java/org/apache/cassandra/io/util/FileUtils.java @@ -47,6 +47,7 @@ import java.util.stream.Stream; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.RateLimiter; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/io/util/Memory.java b/src/java/org/apache/cassandra/io/util/Memory.java index 512acd59d7..f62bf1c5ba 100644 --- a/src/java/org/apache/cassandra/io/util/Memory.java +++ b/src/java/org/apache/cassandra/io/util/Memory.java @@ -26,6 +26,7 @@ import org.apache.cassandra.utils.FastByteOperations; import org.apache.cassandra.utils.concurrent.Ref; import org.apache.cassandra.utils.memory.LittleEndianMemoryUtil; import org.apache.cassandra.utils.memory.MemoryUtil; + import sun.misc.Unsafe; /** diff --git a/src/java/org/apache/cassandra/io/util/MmappedRegionsCache.java b/src/java/org/apache/cassandra/io/util/MmappedRegionsCache.java index e3ebc34609..018e6492cd 100644 --- a/src/java/org/apache/cassandra/io/util/MmappedRegionsCache.java +++ b/src/java/org/apache/cassandra/io/util/MmappedRegionsCache.java @@ -21,6 +21,7 @@ package org.apache.cassandra.io.util; import java.util.HashMap; import java.util.Iterator; import java.util.Map; + import javax.annotation.concurrent.NotThreadSafe; import com.google.common.base.Preconditions; diff --git a/src/java/org/apache/cassandra/io/util/PathUtils.java b/src/java/org/apache/cassandra/io/util/PathUtils.java index fa0a91543e..334763f271 100644 --- a/src/java/org/apache/cassandra/io/util/PathUtils.java +++ b/src/java/org/apache/cassandra/io/util/PathUtils.java @@ -49,15 +49,18 @@ import java.util.function.Function; import java.util.function.IntFunction; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.RateLimiter; + +import net.openhft.chronicle.core.util.ThrowingFunction; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.openhft.chronicle.core.util.ThrowingFunction; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.io.FSError; import org.apache.cassandra.io.FSReadError; diff --git a/src/java/org/apache/cassandra/io/util/RebufferingInputStream.java b/src/java/org/apache/cassandra/io/util/RebufferingInputStream.java index 9cc9032029..a4fdd1516a 100644 --- a/src/java/org/apache/cassandra/io/util/RebufferingInputStream.java +++ b/src/java/org/apache/cassandra/io/util/RebufferingInputStream.java @@ -27,6 +27,7 @@ import java.nio.ByteOrder; import com.google.common.base.Preconditions; import net.nicoulaj.compilecommand.annotations.DontInline; + import org.apache.cassandra.io.util.DataInputPlus.DataInputStreamPlus; import org.apache.cassandra.utils.FastByteOperations; import org.apache.cassandra.utils.vint.VIntCoding; diff --git a/src/java/org/apache/cassandra/io/util/ResizableByteBuffer.java b/src/java/org/apache/cassandra/io/util/ResizableByteBuffer.java index 35a1e63217..cfaa263397 100644 --- a/src/java/org/apache/cassandra/io/util/ResizableByteBuffer.java +++ b/src/java/org/apache/cassandra/io/util/ResizableByteBuffer.java @@ -21,9 +21,10 @@ package org.apache.cassandra.io.util; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.cassandra.utils.vint.VIntCoding; import org.jctools.util.Pow2; +import org.apache.cassandra.utils.vint.VIntCoding; + public class ResizableByteBuffer { private int length = 0; diff --git a/src/java/org/apache/cassandra/io/util/SafeMemory.java b/src/java/org/apache/cassandra/io/util/SafeMemory.java index 4482d96019..9200d20225 100644 --- a/src/java/org/apache/cassandra/io/util/SafeMemory.java +++ b/src/java/org/apache/cassandra/io/util/SafeMemory.java @@ -19,6 +19,7 @@ package org.apache.cassandra.io.util; import net.nicoulaj.compilecommand.annotations.Inline; + import org.apache.cassandra.utils.concurrent.Ref; import org.apache.cassandra.utils.concurrent.RefCounted; import org.apache.cassandra.utils.concurrent.SharedCloseable; diff --git a/src/java/org/apache/cassandra/io/util/SimpleCachedBufferPool.java b/src/java/org/apache/cassandra/io/util/SimpleCachedBufferPool.java index c4a639ae0c..688901135a 100644 --- a/src/java/org/apache/cassandra/io/util/SimpleCachedBufferPool.java +++ b/src/java/org/apache/cassandra/io/util/SimpleCachedBufferPool.java @@ -22,9 +22,10 @@ import java.nio.ByteBuffer; import java.util.Queue; import java.util.concurrent.atomic.AtomicInteger; +import org.jctools.queues.MpmcArrayQueue; + import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.utils.memory.MemoryUtil; -import org.jctools.queues.MpmcArrayQueue; /** * A very simple Bytebuffer pool with a fixed allocation size and a cached max allocation count. Will allow diff --git a/src/java/org/apache/cassandra/io/util/TailOverridingRebufferer.java b/src/java/org/apache/cassandra/io/util/TailOverridingRebufferer.java index 8bd92e93dc..c5e8d58176 100644 --- a/src/java/org/apache/cassandra/io/util/TailOverridingRebufferer.java +++ b/src/java/org/apache/cassandra/io/util/TailOverridingRebufferer.java @@ -18,6 +18,7 @@ package org.apache.cassandra.io.util; import java.nio.ByteBuffer; + import javax.annotation.concurrent.NotThreadSafe; /** diff --git a/src/java/org/apache/cassandra/io/util/ThreadLocalByteBufferHolder.java b/src/java/org/apache/cassandra/io/util/ThreadLocalByteBufferHolder.java index 3b3c701d34..e22ab14aff 100644 --- a/src/java/org/apache/cassandra/io/util/ThreadLocalByteBufferHolder.java +++ b/src/java/org/apache/cassandra/io/util/ThreadLocalByteBufferHolder.java @@ -21,11 +21,11 @@ package org.apache.cassandra.io.util; import java.nio.ByteBuffer; import java.util.EnumMap; -import io.netty.util.concurrent.FastThreadLocal; - import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.utils.memory.MemoryUtil; +import io.netty.util.concurrent.FastThreadLocal; + /** * Utility class that allow buffers to be reused by storing them in a thread local instance. */ diff --git a/src/java/org/apache/cassandra/io/util/ThreadLocalReadAheadBuffer.java b/src/java/org/apache/cassandra/io/util/ThreadLocalReadAheadBuffer.java index c7963e431a..63dca9bfc4 100644 --- a/src/java/org/apache/cassandra/io/util/ThreadLocalReadAheadBuffer.java +++ b/src/java/org/apache/cassandra/io/util/ThreadLocalReadAheadBuffer.java @@ -22,11 +22,12 @@ import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Map; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.utils.memory.MemoryUtil; +import io.netty.util.concurrent.FastThreadLocal; + public final class ThreadLocalReadAheadBuffer { private static class Block diff --git a/src/java/org/apache/cassandra/io/util/TrackedDataInputPlus.java b/src/java/org/apache/cassandra/io/util/TrackedDataInputPlus.java index d319a86e4f..0590dd594a 100644 --- a/src/java/org/apache/cassandra/io/util/TrackedDataInputPlus.java +++ b/src/java/org/apache/cassandra/io/util/TrackedDataInputPlus.java @@ -23,6 +23,7 @@ import java.io.EOFException; import java.io.IOException; import net.nicoulaj.compilecommand.annotations.Inline; + import org.apache.cassandra.db.TypeSizes; /** diff --git a/src/java/org/apache/cassandra/io/util/WrappingRebufferer.java b/src/java/org/apache/cassandra/io/util/WrappingRebufferer.java index 5fbe5eaa00..0b09927a96 100644 --- a/src/java/org/apache/cassandra/io/util/WrappingRebufferer.java +++ b/src/java/org/apache/cassandra/io/util/WrappingRebufferer.java @@ -18,6 +18,7 @@ package org.apache.cassandra.io.util; import java.nio.ByteBuffer; + import javax.annotation.concurrent.NotThreadSafe; /** diff --git a/src/java/org/apache/cassandra/journal/ActiveSegment.java b/src/java/org/apache/cassandra/journal/ActiveSegment.java index 75d3505c3f..34caaa690f 100644 --- a/src/java/org/apache/cassandra/journal/ActiveSegment.java +++ b/src/java/org/apache/cassandra/journal/ActiveSegment.java @@ -27,14 +27,17 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater; import java.util.concurrent.locks.LockSupport; import java.util.function.Consumer; -import accord.utils.Invariants; import com.codahale.metrics.Timer; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import accord.utils.Invariants; + import org.apache.cassandra.db.TypeSizes; -import org.apache.cassandra.utils.*; +import org.apache.cassandra.utils.Simulate; +import org.apache.cassandra.utils.SyncUtil; import org.apache.cassandra.utils.concurrent.OpOrder; import org.apache.cassandra.utils.concurrent.Ref; import org.apache.cassandra.utils.concurrent.WaitQueue; diff --git a/src/java/org/apache/cassandra/journal/Component.java b/src/java/org/apache/cassandra/journal/Component.java index 07da71536a..5f03321a8f 100644 --- a/src/java/org/apache/cassandra/journal/Component.java +++ b/src/java/org/apache/cassandra/journal/Component.java @@ -20,6 +20,7 @@ package org.apache.cassandra.journal; import java.util.List; import accord.utils.Invariants; + import org.apache.cassandra.io.util.File; import static accord.utils.SortedArrays.SortedArrayList.ofSorted; diff --git a/src/java/org/apache/cassandra/journal/EntrySerializer.java b/src/java/org/apache/cassandra/journal/EntrySerializer.java index 2ff680b150..70d1e934d4 100644 --- a/src/java/org/apache/cassandra/journal/EntrySerializer.java +++ b/src/java/org/apache/cassandra/journal/EntrySerializer.java @@ -17,16 +17,17 @@ */ package org.apache.cassandra.journal; -import accord.utils.Invariants; -import org.apache.cassandra.db.TypeSizes; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.Crc; - import java.io.EOFException; import java.io.IOException; import java.nio.ByteBuffer; import java.util.zip.CRC32; +import accord.utils.Invariants; + +import org.apache.cassandra.db.TypeSizes; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.Crc; + import static org.apache.cassandra.journal.Journal.validateCRC; /** diff --git a/src/java/org/apache/cassandra/journal/Flusher.java b/src/java/org/apache/cassandra/journal/Flusher.java index 2ce4abc2ae..2db7b0f6d0 100644 --- a/src/java/org/apache/cassandra/journal/Flusher.java +++ b/src/java/org/apache/cassandra/journal/Flusher.java @@ -22,11 +22,13 @@ import java.util.concurrent.locks.LockSupport; import javax.annotation.Nullable; +import com.codahale.metrics.Timer; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; -import com.codahale.metrics.Timer; + import org.apache.cassandra.concurrent.Interruptible; import org.apache.cassandra.concurrent.Interruptible.TerminateException; import org.apache.cassandra.utils.MonotonicClock; diff --git a/src/java/org/apache/cassandra/journal/Journal.java b/src/java/org/apache/cassandra/journal/Journal.java index a79873b2af..085848588c 100644 --- a/src/java/org/apache/cassandra/journal/Journal.java +++ b/src/java/org/apache/cassandra/journal/Journal.java @@ -30,15 +30,21 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.LockSupport; -import java.util.function.*; +import java.util.function.BooleanSupplier; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Predicate; import java.util.zip.CRC32; +import com.codahale.metrics.Timer.Context; import com.google.common.annotations.VisibleForTesting; + +import org.jctools.queues.MpscUnboundedArrayQueue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; -import com.codahale.metrics.Timer.Context; + import org.apache.cassandra.concurrent.Interruptible; import org.apache.cassandra.concurrent.Interruptible.TerminateException; import org.apache.cassandra.concurrent.SequentialExecutorPlus; @@ -58,7 +64,6 @@ import org.apache.cassandra.utils.MergeIterator; import org.apache.cassandra.utils.Simulate; import org.apache.cassandra.utils.concurrent.OpOrder; import org.apache.cassandra.utils.concurrent.WaitQueue; -import org.jctools.queues.MpscUnboundedArrayQueue; import static java.lang.String.format; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; diff --git a/src/java/org/apache/cassandra/journal/Metadata.java b/src/java/org/apache/cassandra/journal/Metadata.java index 13198fa77a..8b1c55a3c3 100644 --- a/src/java/org/apache/cassandra/journal/Metadata.java +++ b/src/java/org/apache/cassandra/journal/Metadata.java @@ -22,7 +22,11 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.zip.CRC32; -import org.apache.cassandra.io.util.*; +import org.apache.cassandra.io.util.DataInputPlus; +import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileInputStreamPlus; +import org.apache.cassandra.io.util.FileOutputStreamPlus; import org.apache.cassandra.utils.Crc; import static org.apache.cassandra.journal.Journal.validateCRC; diff --git a/src/java/org/apache/cassandra/journal/Metrics.java b/src/java/org/apache/cassandra/journal/Metrics.java index 4bca57c77c..5f1a063620 100644 --- a/src/java/org/apache/cassandra/journal/Metrics.java +++ b/src/java/org/apache/cassandra/journal/Metrics.java @@ -19,6 +19,7 @@ package org.apache.cassandra.journal; import com.codahale.metrics.Gauge; import com.codahale.metrics.Timer; + import org.apache.cassandra.metrics.CassandraMetricsRegistry; import org.apache.cassandra.metrics.DefaultNameFactory; import org.apache.cassandra.metrics.MetricNameFactory; diff --git a/src/java/org/apache/cassandra/journal/OnDiskIndex.java b/src/java/org/apache/cassandra/journal/OnDiskIndex.java index 0a2ca8cc95..0edb3a6ab6 100644 --- a/src/java/org/apache/cassandra/journal/OnDiskIndex.java +++ b/src/java/org/apache/cassandra/journal/OnDiskIndex.java @@ -24,9 +24,11 @@ import java.nio.file.StandardOpenOption; import java.util.Map; import java.util.NavigableMap; import java.util.zip.CRC32; + import javax.annotation.Nullable; import accord.utils.Invariants; + import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.io.util.File; diff --git a/src/java/org/apache/cassandra/journal/Segment.java b/src/java/org/apache/cassandra/journal/Segment.java index 1fda2f57c9..7335bb2ca2 100644 --- a/src/java/org/apache/cassandra/journal/Segment.java +++ b/src/java/org/apache/cassandra/journal/Segment.java @@ -20,6 +20,7 @@ package org.apache.cassandra.journal; import java.nio.ByteBuffer; import accord.utils.Invariants; + import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.io.util.File; import org.apache.cassandra.utils.concurrent.OpOrder; diff --git a/src/java/org/apache/cassandra/journal/Segments.java b/src/java/org/apache/cassandra/journal/Segments.java index effc879513..ea8dafd304 100644 --- a/src/java/org/apache/cassandra/journal/Segments.java +++ b/src/java/org/apache/cassandra/journal/Segments.java @@ -21,9 +21,11 @@ import java.util.Collection; import java.util.List; import java.util.function.Predicate; +import org.agrona.collections.Long2ObjectHashMap; + import accord.utils.Invariants; import accord.utils.SortedArrays.SortedArrayList; -import org.agrona.collections.Long2ObjectHashMap; + import org.apache.cassandra.utils.concurrent.Refs; /** diff --git a/src/java/org/apache/cassandra/journal/StaticSegment.java b/src/java/org/apache/cassandra/journal/StaticSegment.java index bc425dda7e..bc327b952e 100644 --- a/src/java/org/apache/cassandra/journal/StaticSegment.java +++ b/src/java/org/apache/cassandra/journal/StaticSegment.java @@ -17,15 +17,6 @@ */ package org.apache.cassandra.journal; -import org.apache.cassandra.io.util.File; -import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.utils.Closeable; -import org.apache.cassandra.utils.Throwables; -import org.apache.cassandra.utils.concurrent.Ref; -import org.apache.cassandra.utils.memory.MemoryUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; @@ -36,6 +27,16 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileUtils; +import org.apache.cassandra.utils.Closeable; +import org.apache.cassandra.utils.Throwables; +import org.apache.cassandra.utils.concurrent.Ref; +import org.apache.cassandra.utils.memory.MemoryUtil; + /** * An immutable data segment that is no longer written to. *

diff --git a/src/java/org/apache/cassandra/locator/AbstractReplicaCollection.java b/src/java/org/apache/cassandra/locator/AbstractReplicaCollection.java index fa8d17facd..059415d5f3 100644 --- a/src/java/org/apache/cassandra/locator/AbstractReplicaCollection.java +++ b/src/java/org/apache/cassandra/locator/AbstractReplicaCollection.java @@ -18,12 +18,6 @@ package org.apache.cassandra.locator; -import com.carrotsearch.hppc.ObjectIntHashMap; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.collect.Iterators; - import java.util.AbstractList; import java.util.AbstractMap; import java.util.AbstractSet; @@ -45,6 +39,12 @@ import java.util.function.Supplier; import java.util.stream.Collector; import java.util.stream.Stream; +import com.carrotsearch.hppc.ObjectIntHashMap; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; +import com.google.common.collect.Iterators; + /** * A collection like class for Replica objects. Since the Replica class contains inetaddress, range, and * transient replication status, basic contains and remove methods can be ambiguous. Replicas forces you diff --git a/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java b/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java index 04cfac933c..4dd68b3dfd 100644 --- a/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java +++ b/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java @@ -20,8 +20,11 @@ package org.apache.cassandra.locator; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.function.Supplier; -import java.util.*; import com.google.common.base.Preconditions; diff --git a/src/java/org/apache/cassandra/locator/AzureCloudLocationProvider.java b/src/java/org/apache/cassandra/locator/AzureCloudLocationProvider.java index 930a1f139b..6c6195e97f 100644 --- a/src/java/org/apache/cassandra/locator/AzureCloudLocationProvider.java +++ b/src/java/org/apache/cassandra/locator/AzureCloudLocationProvider.java @@ -20,9 +20,9 @@ package org.apache.cassandra.locator; import java.io.IOException; +import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableMap; -import com.fasterxml.jackson.databind.JsonNode; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.locator.AbstractCloudMetadataServiceConnector.DefaultCloudMetadataServiceConnector; import org.apache.cassandra.tcm.membership.Location; diff --git a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java index 003347ef29..990fd9dda2 100644 --- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java +++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java @@ -20,16 +20,21 @@ package org.apache.cassandra.locator; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import com.google.common.annotations.VisibleForTesting; - import com.codahale.metrics.ExponentiallyDecayingReservoir; import com.codahale.metrics.Snapshot; +import com.google.common.annotations.VisibleForTesting; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitchMBean.java b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitchMBean.java index dd07b80e66..2acd23a908 100644 --- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitchMBean.java +++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitchMBean.java @@ -19,8 +19,8 @@ package org.apache.cassandra.locator; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.Map; import java.util.List; +import java.util.Map; public interface DynamicEndpointSnitchMBean { diff --git a/src/java/org/apache/cassandra/locator/Endpoints.java b/src/java/org/apache/cassandra/locator/Endpoints.java index 3dd418dbb6..6017ee72c6 100644 --- a/src/java/org/apache/cassandra/locator/Endpoints.java +++ b/src/java/org/apache/cassandra/locator/Endpoints.java @@ -18,15 +18,15 @@ package org.apache.cassandra.locator; -import org.apache.cassandra.locator.ReplicaCollection.Builder.Conflict; -import org.apache.cassandra.utils.FBUtilities; - import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; +import org.apache.cassandra.locator.ReplicaCollection.Builder.Conflict; +import org.apache.cassandra.utils.FBUtilities; + /** * A collection of Endpoints for a given ring position. This will typically reside in a ReplicaLayout, * representing some subset of the endpoints for the Token or Range diff --git a/src/java/org/apache/cassandra/locator/EndpointsByRange.java b/src/java/org/apache/cassandra/locator/EndpointsByRange.java index a1b03b3753..f7274895a3 100644 --- a/src/java/org/apache/cassandra/locator/EndpointsByRange.java +++ b/src/java/org/apache/cassandra/locator/EndpointsByRange.java @@ -18,15 +18,16 @@ package org.apache.cassandra.locator; +import java.util.Map; + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; + import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.locator.ReplicaCollection.Builder.Conflict; -import java.util.Map; - public class EndpointsByRange extends ReplicaMultimap, EndpointsForRange> { public EndpointsByRange(Map, EndpointsForRange> map) diff --git a/src/java/org/apache/cassandra/locator/EndpointsByReplica.java b/src/java/org/apache/cassandra/locator/EndpointsByReplica.java index 3f5bd6ec76..2894ecae4e 100644 --- a/src/java/org/apache/cassandra/locator/EndpointsByReplica.java +++ b/src/java/org/apache/cassandra/locator/EndpointsByReplica.java @@ -18,6 +18,9 @@ package org.apache.cassandra.locator; +import java.io.IOException; +import java.util.Map; + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; @@ -31,9 +34,6 @@ import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.locator.ReplicaCollection.Builder.Conflict; -import java.io.IOException; -import java.util.Map; - import static org.apache.cassandra.dht.AbstractBounds.tokenSerializer; public class EndpointsByReplica extends ReplicaMultimap diff --git a/src/java/org/apache/cassandra/locator/EndpointsForRange.java b/src/java/org/apache/cassandra/locator/EndpointsForRange.java index f7aefb8dfd..6ac12707c2 100644 --- a/src/java/org/apache/cassandra/locator/EndpointsForRange.java +++ b/src/java/org/apache/cassandra/locator/EndpointsForRange.java @@ -18,13 +18,14 @@ package org.apache.cassandra.locator; -import com.google.common.base.Preconditions; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; - import java.util.Arrays; import java.util.Collection; +import com.google.common.base.Preconditions; + +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; + import static com.google.common.collect.Iterables.all; /** diff --git a/src/java/org/apache/cassandra/locator/EndpointsForToken.java b/src/java/org/apache/cassandra/locator/EndpointsForToken.java index 9b616ecd07..fc88fa761b 100644 --- a/src/java/org/apache/cassandra/locator/EndpointsForToken.java +++ b/src/java/org/apache/cassandra/locator/EndpointsForToken.java @@ -18,6 +18,9 @@ package org.apache.cassandra.locator; +import java.util.Arrays; +import java.util.Collection; + import com.google.common.base.Preconditions; import org.apache.cassandra.db.Keyspace; @@ -25,9 +28,6 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.ownership.VersionedEndpoints; -import java.util.Arrays; -import java.util.Collection; - /** * A ReplicaCollection where all Replica are required to cover a range that fully contains the token() defined in the builder(). * Endpoints are guaranteed to be unique; on construction, this is enforced unless optionally silenced (in which case diff --git a/src/java/org/apache/cassandra/locator/InetAddressAndPort.java b/src/java/org/apache/cassandra/locator/InetAddressAndPort.java index 1cf1a81fdd..d447342408 100644 --- a/src/java/org/apache/cassandra/locator/InetAddressAndPort.java +++ b/src/java/org/apache/cassandra/locator/InetAddressAndPort.java @@ -27,9 +27,9 @@ import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Set; import java.util.regex.Pattern; -import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -44,8 +44,8 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; -import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.FastByteOperations; diff --git a/src/java/org/apache/cassandra/locator/NetworkTopologyProximity.java b/src/java/org/apache/cassandra/locator/NetworkTopologyProximity.java index f7f30dafb7..a35c1f41d3 100644 --- a/src/java/org/apache/cassandra/locator/NetworkTopologyProximity.java +++ b/src/java/org/apache/cassandra/locator/NetworkTopologyProximity.java @@ -18,12 +18,12 @@ package org.apache.cassandra.locator; +import java.util.Comparator; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.tcm.membership.Location; import org.apache.cassandra.utils.Sortable; -import java.util.Comparator; - public class NetworkTopologyProximity extends BaseProximity { public int compareEndpoints(InetAddressAndPort address, Replica r1, Replica r2) diff --git a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java index 05bfcfb9ed..a1096e89bc 100644 --- a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java +++ b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java @@ -29,6 +29,7 @@ import java.util.Set; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/locator/NoOpProximity.java b/src/java/org/apache/cassandra/locator/NoOpProximity.java index 69f5250d70..6fcddf4b09 100644 --- a/src/java/org/apache/cassandra/locator/NoOpProximity.java +++ b/src/java/org/apache/cassandra/locator/NoOpProximity.java @@ -18,10 +18,10 @@ package org.apache.cassandra.locator; -import org.apache.cassandra.utils.Sortable; - import java.util.Comparator; +import org.apache.cassandra.utils.Sortable; + public class NoOpProximity extends BaseProximity { @Override diff --git a/src/java/org/apache/cassandra/locator/NodeProximity.java b/src/java/org/apache/cassandra/locator/NodeProximity.java index af7c17eaac..d1a63a84a2 100644 --- a/src/java/org/apache/cassandra/locator/NodeProximity.java +++ b/src/java/org/apache/cassandra/locator/NodeProximity.java @@ -18,10 +18,10 @@ package org.apache.cassandra.locator; -import org.apache.cassandra.utils.Sortable; - import java.util.Comparator; +import org.apache.cassandra.utils.Sortable; + public interface NodeProximity { /** diff --git a/src/java/org/apache/cassandra/locator/RangesAtEndpoint.java b/src/java/org/apache/cassandra/locator/RangesAtEndpoint.java index 6401d2a06e..51b5fe3a7b 100644 --- a/src/java/org/apache/cassandra/locator/RangesAtEndpoint.java +++ b/src/java/org/apache/cassandra/locator/RangesAtEndpoint.java @@ -18,12 +18,6 @@ package org.apache.cassandra.locator; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableSet; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; - import java.net.UnknownHostException; import java.util.Arrays; import java.util.Collection; @@ -34,8 +28,15 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collector; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; + +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; + import static com.google.common.collect.Iterables.all; -import static org.apache.cassandra.locator.ReplicaCollection.Builder.Conflict.*; +import static org.apache.cassandra.locator.ReplicaCollection.Builder.Conflict.NONE; /** * A ReplicaCollection for Ranges occurring at an endpoint. All Replica will be for the same endpoint, diff --git a/src/java/org/apache/cassandra/locator/RangesByEndpoint.java b/src/java/org/apache/cassandra/locator/RangesByEndpoint.java index ed3e2a7918..e59f94d391 100644 --- a/src/java/org/apache/cassandra/locator/RangesByEndpoint.java +++ b/src/java/org/apache/cassandra/locator/RangesByEndpoint.java @@ -18,14 +18,14 @@ package org.apache.cassandra.locator; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; - import java.io.IOException; import java.util.Map; import java.util.Set; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; diff --git a/src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.java b/src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.java index 346aabe44d..97b507e187 100644 --- a/src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.java +++ b/src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.java @@ -22,14 +22,18 @@ import java.net.UnknownHostException; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.gms.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.gms.ApplicationState; +import org.apache.cassandra.gms.EndpointState; +import org.apache.cassandra.gms.Gossiper; +import org.apache.cassandra.gms.IEndpointStateChangeSubscriber; +import org.apache.cassandra.gms.VersionedValue; import org.apache.cassandra.net.ConnectionCategory; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.OutboundConnectionSettings; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import static org.apache.cassandra.auth.IInternodeAuthenticator.InternodeConnectionDirection.OUTBOUND_PRECONNECT; /** diff --git a/src/java/org/apache/cassandra/locator/ReplicaLayout.java b/src/java/org/apache/cassandra/locator/ReplicaLayout.java index 0cd3ccf257..440b2bed73 100644 --- a/src/java/org/apache/cassandra/locator/ReplicaLayout.java +++ b/src/java/org/apache/cassandra/locator/ReplicaLayout.java @@ -18,6 +18,9 @@ package org.apache.cassandra.locator; +import java.util.Set; +import java.util.function.Predicate; + import com.google.common.annotations.VisibleForTesting; import org.apache.cassandra.config.DatabaseDescriptor; @@ -34,9 +37,6 @@ import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.ownership.DataPlacement; import org.apache.cassandra.utils.FBUtilities; -import java.util.Set; -import java.util.function.Predicate; - /** * The relevant replicas for an operation over a given range or token. * diff --git a/src/java/org/apache/cassandra/locator/ReplicaPlans.java b/src/java/org/apache/cassandra/locator/ReplicaPlans.java index d009ed33db..da52510bf3 100644 --- a/src/java/org/apache/cassandra/locator/ReplicaPlans.java +++ b/src/java/org/apache/cassandra/locator/ReplicaPlans.java @@ -44,10 +44,10 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ConsistencyLevel; @@ -64,11 +64,10 @@ import org.apache.cassandra.index.IndexStatusManager; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.service.reads.ReadCoordinator; -import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.service.reads.AlwaysSpeculativeRetryPolicy; +import org.apache.cassandra.service.reads.ReadCoordinator; import org.apache.cassandra.service.reads.SpeculativeRetryPolicy; - +import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.membership.Directory; import org.apache.cassandra.tcm.membership.Location; diff --git a/src/java/org/apache/cassandra/locator/Replicas.java b/src/java/org/apache/cassandra/locator/Replicas.java index e280e9980d..74ba7233a5 100644 --- a/src/java/org/apache/cassandra/locator/Replicas.java +++ b/src/java/org/apache/cassandra/locator/Replicas.java @@ -25,7 +25,6 @@ import java.util.function.Predicate; import com.carrotsearch.hppc.ObjectIntHashMap; import com.carrotsearch.hppc.ObjectObjectHashMap; - import com.google.common.collect.Iterables; import static com.google.common.collect.Iterables.all; diff --git a/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java b/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java index b6ccaecc26..ae44792873 100644 --- a/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java +++ b/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java @@ -25,14 +25,14 @@ import java.util.Map; import com.google.common.annotations.VisibleForTesting; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.utils.FBUtilities; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class SimpleSeedProvider implements SeedProvider { private static final Logger logger = LoggerFactory.getLogger(SimpleSeedProvider.class); diff --git a/src/java/org/apache/cassandra/locator/SnitchProperties.java b/src/java/org/apache/cassandra/locator/SnitchProperties.java index 1745b79650..1a6d90d20f 100644 --- a/src/java/org/apache/cassandra/locator/SnitchProperties.java +++ b/src/java/org/apache/cassandra/locator/SnitchProperties.java @@ -23,12 +23,12 @@ import java.util.Properties; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.utils.Pair; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.io.util.FileUtils; +import org.apache.cassandra.utils.Pair; + import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_RACKDC_PROPERTIES; public class SnitchProperties diff --git a/src/java/org/apache/cassandra/locator/SystemReplicas.java b/src/java/org/apache/cassandra/locator/SystemReplicas.java index 456bae5a52..337bb102ed 100644 --- a/src/java/org/apache/cassandra/locator/SystemReplicas.java +++ b/src/java/org/apache/cassandra/locator/SystemReplicas.java @@ -23,6 +23,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import com.google.common.collect.Collections2; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; diff --git a/src/java/org/apache/cassandra/locator/TopologyFileLocationProvider.java b/src/java/org/apache/cassandra/locator/TopologyFileLocationProvider.java index 9ee4b696f5..8224f738d3 100644 --- a/src/java/org/apache/cassandra/locator/TopologyFileLocationProvider.java +++ b/src/java/org/apache/cassandra/locator/TopologyFileLocationProvider.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.Properties; import com.google.common.annotations.VisibleForTesting; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/metrics/AbstractCacheMetrics.java b/src/java/org/apache/cassandra/metrics/AbstractCacheMetrics.java index 7b4b7510d5..a633446ded 100644 --- a/src/java/org/apache/cassandra/metrics/AbstractCacheMetrics.java +++ b/src/java/org/apache/cassandra/metrics/AbstractCacheMetrics.java @@ -19,11 +19,10 @@ package org.apache.cassandra.metrics; import java.util.function.DoubleSupplier; -import com.google.common.annotations.VisibleForTesting; - import com.codahale.metrics.Gauge; import com.codahale.metrics.Meter; import com.codahale.metrics.RatioGauge; +import com.google.common.annotations.VisibleForTesting; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/metrics/AccordCacheMetrics.java b/src/java/org/apache/cassandra/metrics/AccordCacheMetrics.java index 3df852af9d..59efb88044 100644 --- a/src/java/org/apache/cassandra/metrics/AccordCacheMetrics.java +++ b/src/java/org/apache/cassandra/metrics/AccordCacheMetrics.java @@ -23,6 +23,7 @@ import java.util.function.Function; import java.util.function.ToLongFunction; import com.codahale.metrics.Gauge; + import org.apache.cassandra.service.accord.AccordExecutor; import org.apache.cassandra.service.accord.IAccordService; diff --git a/src/java/org/apache/cassandra/metrics/AccordCoordinatorMetrics.java b/src/java/org/apache/cassandra/metrics/AccordCoordinatorMetrics.java index 12c736614f..b305ac9d0d 100644 --- a/src/java/org/apache/cassandra/metrics/AccordCoordinatorMetrics.java +++ b/src/java/org/apache/cassandra/metrics/AccordCoordinatorMetrics.java @@ -19,8 +19,14 @@ package org.apache.cassandra.metrics; import java.lang.reflect.Field; + import javax.annotation.Nullable; +import com.codahale.metrics.Counting; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.Meter; +import com.codahale.metrics.Timer; + import accord.api.CoordinatorEventListener; import accord.api.Result; import accord.coordinate.ExecutePath; @@ -28,10 +34,7 @@ import accord.local.Node; import accord.primitives.Ballot; import accord.primitives.Deps; import accord.primitives.TxnId; -import com.codahale.metrics.Counting; -import com.codahale.metrics.Histogram; -import com.codahale.metrics.Meter; -import com.codahale.metrics.Timer; + import org.apache.cassandra.service.accord.api.AccordTimeService; import org.apache.cassandra.tracing.Tracing; diff --git a/src/java/org/apache/cassandra/metrics/AccordExecutorMetrics.java b/src/java/org/apache/cassandra/metrics/AccordExecutorMetrics.java index 94d8e43ab5..a59710f4a0 100644 --- a/src/java/org/apache/cassandra/metrics/AccordExecutorMetrics.java +++ b/src/java/org/apache/cassandra/metrics/AccordExecutorMetrics.java @@ -21,6 +21,7 @@ package org.apache.cassandra.metrics; import java.util.concurrent.TimeUnit; import com.codahale.metrics.Gauge; + import org.apache.cassandra.metrics.ShardedDecayingHistograms.ShardedDecayingHistogram; import org.apache.cassandra.service.accord.AccordExecutor; diff --git a/src/java/org/apache/cassandra/metrics/AccordMetricUtils.java b/src/java/org/apache/cassandra/metrics/AccordMetricUtils.java index d7b784fe8e..7d912a5c36 100644 --- a/src/java/org/apache/cassandra/metrics/AccordMetricUtils.java +++ b/src/java/org/apache/cassandra/metrics/AccordMetricUtils.java @@ -20,9 +20,11 @@ package org.apache.cassandra.metrics; import java.util.function.Function; +import com.codahale.metrics.Gauge; + import accord.local.durability.DurabilityService; import accord.topology.TopologyManager; -import com.codahale.metrics.Gauge; + import org.apache.cassandra.service.accord.AccordService; import org.apache.cassandra.service.accord.IAccordService; diff --git a/src/java/org/apache/cassandra/metrics/AccordReplicaMetrics.java b/src/java/org/apache/cassandra/metrics/AccordReplicaMetrics.java index 8461789771..6bc46f89c7 100644 --- a/src/java/org/apache/cassandra/metrics/AccordReplicaMetrics.java +++ b/src/java/org/apache/cassandra/metrics/AccordReplicaMetrics.java @@ -21,12 +21,14 @@ package org.apache.cassandra.metrics; import java.lang.reflect.Field; import java.util.concurrent.TimeUnit; +import com.codahale.metrics.Counting; + import accord.api.ReplicaEventListener; import accord.local.Command; import accord.local.SafeCommandStore; import accord.primitives.PartialDeps; import accord.primitives.TxnId; -import com.codahale.metrics.Counting; + import org.apache.cassandra.metrics.LogLinearDecayingHistograms.LogLinearDecayingHistogram; import org.apache.cassandra.metrics.ShardedDecayingHistograms.DecayingHistogramsShard; import org.apache.cassandra.metrics.ShardedDecayingHistograms.ShardedDecayingHistogram; diff --git a/src/java/org/apache/cassandra/metrics/AccordSystemMetrics.java b/src/java/org/apache/cassandra/metrics/AccordSystemMetrics.java index 1ef552588f..9b8f6fa3e7 100644 --- a/src/java/org/apache/cassandra/metrics/AccordSystemMetrics.java +++ b/src/java/org/apache/cassandra/metrics/AccordSystemMetrics.java @@ -21,6 +21,10 @@ package org.apache.cassandra.metrics; import java.lang.reflect.Field; import java.util.concurrent.TimeUnit; +import com.codahale.metrics.Counter; +import com.codahale.metrics.Counting; +import com.codahale.metrics.Gauge; + import accord.api.SystemEventListener; import accord.impl.progresslog.DefaultProgressLog; import accord.local.MaxDecidedRX; @@ -28,9 +32,7 @@ import accord.local.RedundantBefore; import accord.primitives.TxnId; import accord.topology.TopologyManager; import accord.utils.Invariants; -import com.codahale.metrics.Counter; -import com.codahale.metrics.Counting; -import com.codahale.metrics.Gauge; + import org.apache.cassandra.metrics.LogLinearHistogram.LogLinearSnapshot; import org.apache.cassandra.service.accord.AccordService; import org.apache.cassandra.service.accord.IAccordService; diff --git a/src/java/org/apache/cassandra/metrics/AutoRepairMetrics.java b/src/java/org/apache/cassandra/metrics/AutoRepairMetrics.java index 77d03c1c15..2b5eebc197 100644 --- a/src/java/org/apache/cassandra/metrics/AutoRepairMetrics.java +++ b/src/java/org/apache/cassandra/metrics/AutoRepairMetrics.java @@ -20,9 +20,10 @@ package org.apache.cassandra.metrics; import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.google.common.annotations.VisibleForTesting; + +import org.apache.cassandra.repair.autorepair.AutoRepair; import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType; import org.apache.cassandra.repair.autorepair.AutoRepairUtils; -import org.apache.cassandra.repair.autorepair.AutoRepair; import org.apache.cassandra.service.AutoRepairService; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/src/java/org/apache/cassandra/metrics/AutoRepairMetricsManager.java b/src/java/org/apache/cassandra/metrics/AutoRepairMetricsManager.java index e97ce34e5a..8a987f21b7 100644 --- a/src/java/org/apache/cassandra/metrics/AutoRepairMetricsManager.java +++ b/src/java/org/apache/cassandra/metrics/AutoRepairMetricsManager.java @@ -18,11 +18,11 @@ package org.apache.cassandra.metrics; -import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType; - import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType; + /** * AutoRepair metrics manager holding all the auto-repair related metrics. */ diff --git a/src/java/org/apache/cassandra/metrics/BufferPoolMetrics.java b/src/java/org/apache/cassandra/metrics/BufferPoolMetrics.java index afcf62a09b..d6571eb41a 100644 --- a/src/java/org/apache/cassandra/metrics/BufferPoolMetrics.java +++ b/src/java/org/apache/cassandra/metrics/BufferPoolMetrics.java @@ -19,6 +19,7 @@ package org.apache.cassandra.metrics; import com.codahale.metrics.Gauge; import com.codahale.metrics.Meter; + import org.apache.cassandra.utils.memory.BufferPool; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/metrics/CQLMetrics.java b/src/java/org/apache/cassandra/metrics/CQLMetrics.java index ad6c571b78..e7b6ec57d1 100644 --- a/src/java/org/apache/cassandra/metrics/CQLMetrics.java +++ b/src/java/org/apache/cassandra/metrics/CQLMetrics.java @@ -20,6 +20,7 @@ package org.apache.cassandra.metrics; import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.RatioGauge; + import org.apache.cassandra.cql3.QueryProcessor; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/metrics/CacheAccessMetrics.java b/src/java/org/apache/cassandra/metrics/CacheAccessMetrics.java index 59d76a9f49..9960314db8 100644 --- a/src/java/org/apache/cassandra/metrics/CacheAccessMetrics.java +++ b/src/java/org/apache/cassandra/metrics/CacheAccessMetrics.java @@ -18,9 +18,8 @@ package org.apache.cassandra.metrics; -import com.google.common.annotations.VisibleForTesting; - import com.codahale.metrics.Meter; +import com.google.common.annotations.VisibleForTesting; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/metrics/CacheMetrics.java b/src/java/org/apache/cassandra/metrics/CacheMetrics.java index 13a59f88e6..8b893859e4 100644 --- a/src/java/org/apache/cassandra/metrics/CacheMetrics.java +++ b/src/java/org/apache/cassandra/metrics/CacheMetrics.java @@ -18,6 +18,7 @@ package org.apache.cassandra.metrics; import com.codahale.metrics.Gauge; + import org.apache.cassandra.cache.CacheSize; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/metrics/CacheSizeMetrics.java b/src/java/org/apache/cassandra/metrics/CacheSizeMetrics.java index fb34cfcc19..4b83ec923e 100644 --- a/src/java/org/apache/cassandra/metrics/CacheSizeMetrics.java +++ b/src/java/org/apache/cassandra/metrics/CacheSizeMetrics.java @@ -18,6 +18,7 @@ package org.apache.cassandra.metrics; import com.codahale.metrics.Gauge; + import org.apache.cassandra.cache.CacheSize; import static org.apache.cassandra.metrics.CacheMetrics.TYPE_NAME; diff --git a/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java b/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java index c11fd5d018..7c69c77d88 100644 --- a/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java +++ b/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java @@ -32,14 +32,11 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.function.UnaryOperator; import java.util.stream.Stream; + import javax.annotation.Nullable; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; - import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; @@ -48,6 +45,10 @@ import com.codahale.metrics.Metered; import com.codahale.metrics.Metric; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.MetricSet; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; + import org.apache.cassandra.db.virtual.CollectionVirtualTableAdapter; import org.apache.cassandra.db.virtual.VirtualTable; import org.apache.cassandra.db.virtual.model.CounterMetricRow; diff --git a/src/java/org/apache/cassandra/metrics/CassandraReservoir.java b/src/java/org/apache/cassandra/metrics/CassandraReservoir.java index 424735f088..49137ed968 100644 --- a/src/java/org/apache/cassandra/metrics/CassandraReservoir.java +++ b/src/java/org/apache/cassandra/metrics/CassandraReservoir.java @@ -22,9 +22,11 @@ import java.util.Arrays; import java.util.function.IntFunction; import java.util.function.LongFunction; -import accord.utils.Invariants; import com.codahale.metrics.Reservoir; import com.codahale.metrics.Snapshot; + +import accord.utils.Invariants; + import org.apache.cassandra.utils.EstimatedHistogram; public interface CassandraReservoir extends Reservoir diff --git a/src/java/org/apache/cassandra/metrics/ChunkCacheMetrics.java b/src/java/org/apache/cassandra/metrics/ChunkCacheMetrics.java index a208998c9a..0f6c5259a9 100644 --- a/src/java/org/apache/cassandra/metrics/ChunkCacheMetrics.java +++ b/src/java/org/apache/cassandra/metrics/ChunkCacheMetrics.java @@ -18,12 +18,14 @@ package org.apache.cassandra.metrics; import java.util.concurrent.TimeUnit; + import javax.annotation.Nonnull; import com.codahale.metrics.Timer; import com.github.benmanes.caffeine.cache.RemovalCause; import com.github.benmanes.caffeine.cache.stats.CacheStats; import com.github.benmanes.caffeine.cache.stats.StatsCounter; + import org.apache.cassandra.cache.ChunkCache; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/metrics/ClientMessageSizeMetrics.java b/src/java/org/apache/cassandra/metrics/ClientMessageSizeMetrics.java index 416e6b44b4..ba7c3e91f9 100644 --- a/src/java/org/apache/cassandra/metrics/ClientMessageSizeMetrics.java +++ b/src/java/org/apache/cassandra/metrics/ClientMessageSizeMetrics.java @@ -18,11 +18,11 @@ package org.apache.cassandra.metrics; -import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; - import com.codahale.metrics.Counter; import com.codahale.metrics.Histogram; +import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; + /** * Metrics to track the size of incoming and outgoing bytes at Cassandra server. */ diff --git a/src/java/org/apache/cassandra/metrics/ClientMetrics.java b/src/java/org/apache/cassandra/metrics/ClientMetrics.java index 4bedb1808b..25f6c2a51c 100644 --- a/src/java/org/apache/cassandra/metrics/ClientMetrics.java +++ b/src/java/org/apache/cassandra/metrics/ClientMetrics.java @@ -28,11 +28,11 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Predicate; -import com.google.common.annotations.VisibleForTesting; - import com.codahale.metrics.Gauge; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; +import com.google.common.annotations.VisibleForTesting; + import org.apache.cassandra.auth.AuthenticatedUser; import org.apache.cassandra.auth.IAuthenticator; import org.apache.cassandra.auth.IAuthenticator.AuthenticationMode; diff --git a/src/java/org/apache/cassandra/metrics/ClientRequestMetrics.java b/src/java/org/apache/cassandra/metrics/ClientRequestMetrics.java index e22eec6f51..019ba04d5d 100644 --- a/src/java/org/apache/cassandra/metrics/ClientRequestMetrics.java +++ b/src/java/org/apache/cassandra/metrics/ClientRequestMetrics.java @@ -22,6 +22,7 @@ package org.apache.cassandra.metrics; import com.codahale.metrics.Meter; + import org.apache.cassandra.exceptions.ReadAbortException; import org.apache.cassandra.exceptions.ReadSizeAbortException; import org.apache.cassandra.exceptions.TombstoneAbortException; diff --git a/src/java/org/apache/cassandra/metrics/CommitLogMetrics.java b/src/java/org/apache/cassandra/metrics/CommitLogMetrics.java index 1c7390522a..6c6bead714 100644 --- a/src/java/org/apache/cassandra/metrics/CommitLogMetrics.java +++ b/src/java/org/apache/cassandra/metrics/CommitLogMetrics.java @@ -20,8 +20,9 @@ package org.apache.cassandra.metrics; import com.codahale.metrics.Gauge; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; -import org.apache.cassandra.db.commitlog.AbstractCommitLogService; + import org.apache.cassandra.db.commitlog.AbstractCommitLogSegmentManager; +import org.apache.cassandra.db.commitlog.AbstractCommitLogService; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/metrics/CompactionMetrics.java b/src/java/org/apache/cassandra/metrics/CompactionMetrics.java index 3bdd14a0bb..03d51e2ecf 100644 --- a/src/java/org/apache/cassandra/metrics/CompactionMetrics.java +++ b/src/java/org/apache/cassandra/metrics/CompactionMetrics.java @@ -17,13 +17,14 @@ */ package org.apache.cassandra.metrics; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Meter; - import com.codahale.metrics.Timer; + import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; diff --git a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java index 23a06fc253..e4c7592ea5 100644 --- a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java +++ b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java @@ -28,14 +28,15 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLongArray; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.primitives.Ints; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.ExponentiallyDecayingReservoir; import com.codahale.metrics.Reservoir; import com.codahale.metrics.Snapshot; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.primitives.Ints; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.utils.EstimatedHistogram; import org.apache.cassandra.utils.MonotonicClock; import org.apache.cassandra.utils.NoSpamLogger; diff --git a/src/java/org/apache/cassandra/metrics/DroppedMessageMetrics.java b/src/java/org/apache/cassandra/metrics/DroppedMessageMetrics.java index e17c24de7a..e881435abf 100644 --- a/src/java/org/apache/cassandra/metrics/DroppedMessageMetrics.java +++ b/src/java/org/apache/cassandra/metrics/DroppedMessageMetrics.java @@ -19,11 +19,10 @@ package org.apache.cassandra.metrics; import java.util.EnumMap; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; - import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import org.apache.cassandra.net.Verb; diff --git a/src/java/org/apache/cassandra/metrics/FrequencySampler.java b/src/java/org/apache/cassandra/metrics/FrequencySampler.java index d4dfe860a4..92135cdd91 100644 --- a/src/java/org/apache/cassandra/metrics/FrequencySampler.java +++ b/src/java/org/apache/cassandra/metrics/FrequencySampler.java @@ -21,11 +21,11 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; +import com.clearspring.analytics.stream.StreamSummary; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.clearspring.analytics.stream.StreamSummary; - import static java.util.concurrent.TimeUnit.MILLISECONDS; /** diff --git a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java index 187f5afe43..edafa4bcf2 100644 --- a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java +++ b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java @@ -23,13 +23,13 @@ import com.codahale.metrics.Counter; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.concurrent.ImmediateExecutor; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.locator.InetAddressAndPort; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; diff --git a/src/java/org/apache/cassandra/metrics/HintsServiceMetrics.java b/src/java/org/apache/cassandra/metrics/HintsServiceMetrics.java index 2954d4add9..7491afec80 100644 --- a/src/java/org/apache/cassandra/metrics/HintsServiceMetrics.java +++ b/src/java/org/apache/cassandra/metrics/HintsServiceMetrics.java @@ -20,15 +20,16 @@ package org.apache.cassandra.metrics; import java.io.Serializable; import java.net.UnknownHostException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; import com.codahale.metrics.Meter; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.concurrent.ImmediateExecutor; import org.apache.cassandra.hints.HintsService; import org.apache.cassandra.locator.InetAddressAndPort; diff --git a/src/java/org/apache/cassandra/metrics/InternodeInboundMetrics.java b/src/java/org/apache/cassandra/metrics/InternodeInboundMetrics.java index 16870321be..27b3010355 100644 --- a/src/java/org/apache/cassandra/metrics/InternodeInboundMetrics.java +++ b/src/java/org/apache/cassandra/metrics/InternodeInboundMetrics.java @@ -18,9 +18,10 @@ package org.apache.cassandra.metrics; import com.codahale.metrics.Gauge; + import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.net.InboundMessageHandlers; import org.apache.cassandra.metrics.CassandraMetricsRegistry.MetricName; +import org.apache.cassandra.net.InboundMessageHandlers; /** * Metrics for internode connections. diff --git a/src/java/org/apache/cassandra/metrics/InternodeOutboundMetrics.java b/src/java/org/apache/cassandra/metrics/InternodeOutboundMetrics.java index f2a1a8bb6f..ab6cd2cc87 100644 --- a/src/java/org/apache/cassandra/metrics/InternodeOutboundMetrics.java +++ b/src/java/org/apache/cassandra/metrics/InternodeOutboundMetrics.java @@ -19,12 +19,12 @@ package org.apache.cassandra.metrics; import com.codahale.metrics.Gauge; import com.codahale.metrics.Meter; + +import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.OutboundConnections; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; -import org.apache.cassandra.locator.InetAddressAndPort; - /** * Metrics for internode connections. */ diff --git a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java index aca570c098..6f533defff 100644 --- a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java +++ b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java @@ -19,13 +19,13 @@ package org.apache.cassandra.metrics; import java.util.function.ToLongFunction; -import com.google.common.collect.ImmutableMap; - import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; +import com.google.common.collect.ImmutableMap; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; diff --git a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java index 01891812f0..1bf90caec3 100644 --- a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java +++ b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java @@ -21,10 +21,9 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; -import com.google.common.collect.Lists; - import com.codahale.metrics.Counter; import com.codahale.metrics.Snapshot; +import com.google.common.collect.Lists; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/metrics/LogLinearDecayingHistograms.java b/src/java/org/apache/cassandra/metrics/LogLinearDecayingHistograms.java index 3d0279c0ca..00fdae201f 100644 --- a/src/java/org/apache/cassandra/metrics/LogLinearDecayingHistograms.java +++ b/src/java/org/apache/cassandra/metrics/LogLinearDecayingHistograms.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import accord.utils.Invariants; + import org.apache.cassandra.metrics.LogLinearHistogram.LogLinearSnapshot; import static org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoir.MEAN_LIFETIME_IN_S; diff --git a/src/java/org/apache/cassandra/metrics/LogLinearHistogram.java b/src/java/org/apache/cassandra/metrics/LogLinearHistogram.java index e6be4f9017..72daefa357 100644 --- a/src/java/org/apache/cassandra/metrics/LogLinearHistogram.java +++ b/src/java/org/apache/cassandra/metrics/LogLinearHistogram.java @@ -24,12 +24,12 @@ import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.util.Arrays; +import com.codahale.metrics.Snapshot; import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Ints; import accord.utils.Invariants; import accord.utils.SortedArrays; -import com.codahale.metrics.Snapshot; import static accord.utils.SortedArrays.Search.CEIL; diff --git a/src/java/org/apache/cassandra/metrics/MessagingMetrics.java b/src/java/org/apache/cassandra/metrics/MessagingMetrics.java index 8f122d6dd7..de53dce5bf 100644 --- a/src/java/org/apache/cassandra/metrics/MessagingMetrics.java +++ b/src/java/org/apache/cassandra/metrics/MessagingMetrics.java @@ -25,19 +25,19 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; +import com.codahale.metrics.Timer; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.DatabaseDescriptor; - -import com.codahale.metrics.Timer; import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.net.Message; -import org.apache.cassandra.net.Verb; import org.apache.cassandra.net.InboundMessageHandlers; import org.apache.cassandra.net.LatencyConsumer; +import org.apache.cassandra.net.Message; +import org.apache.cassandra.net.Verb; import org.apache.cassandra.utils.StatusLogger; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/src/java/org/apache/cassandra/metrics/OnDemandHistogram.java b/src/java/org/apache/cassandra/metrics/OnDemandHistogram.java index f00966824b..38c46cff7d 100644 --- a/src/java/org/apache/cassandra/metrics/OnDemandHistogram.java +++ b/src/java/org/apache/cassandra/metrics/OnDemandHistogram.java @@ -21,6 +21,7 @@ package org.apache.cassandra.metrics; import java.util.function.Supplier; import com.codahale.metrics.Snapshot; + import org.apache.cassandra.metrics.LogLinearHistogram.LogLinearSnapshot; import static org.apache.cassandra.metrics.CassandraReservoir.BucketStrategy.log_linear; diff --git a/src/java/org/apache/cassandra/metrics/OverrideHistogram.java b/src/java/org/apache/cassandra/metrics/OverrideHistogram.java index e45480247d..07ecb227ec 100644 --- a/src/java/org/apache/cassandra/metrics/OverrideHistogram.java +++ b/src/java/org/apache/cassandra/metrics/OverrideHistogram.java @@ -19,6 +19,7 @@ package org.apache.cassandra.metrics; import com.codahale.metrics.Snapshot; + import org.agrona.UnsafeAccess; public class OverrideHistogram extends com.codahale.metrics.Histogram diff --git a/src/java/org/apache/cassandra/metrics/RatioGaugeSet.java b/src/java/org/apache/cassandra/metrics/RatioGaugeSet.java index 057a69011b..d56c9682ab 100644 --- a/src/java/org/apache/cassandra/metrics/RatioGaugeSet.java +++ b/src/java/org/apache/cassandra/metrics/RatioGaugeSet.java @@ -23,6 +23,7 @@ import java.util.function.ToDoubleFunction; import com.codahale.metrics.Metered; import com.codahale.metrics.RatioGauge; + import org.apache.cassandra.metrics.CassandraMetricsRegistry.MetricName; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/metrics/RepairMetrics.java b/src/java/org/apache/cassandra/metrics/RepairMetrics.java index bcdb1b44f9..38e4329d7d 100644 --- a/src/java/org/apache/cassandra/metrics/RepairMetrics.java +++ b/src/java/org/apache/cassandra/metrics/RepairMetrics.java @@ -22,10 +22,10 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import com.google.common.annotations.VisibleForTesting; - import com.codahale.metrics.Counter; import com.codahale.metrics.Histogram; +import com.google.common.annotations.VisibleForTesting; + import org.apache.cassandra.net.Verb; import org.apache.cassandra.repair.messages.RepairMessage; diff --git a/src/java/org/apache/cassandra/metrics/RestorableMeter.java b/src/java/org/apache/cassandra/metrics/RestorableMeter.java index ea3fddeb2b..e840f750ce 100644 --- a/src/java/org/apache/cassandra/metrics/RestorableMeter.java +++ b/src/java/org/apache/cassandra/metrics/RestorableMeter.java @@ -22,9 +22,10 @@ package org.apache.cassandra.metrics; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import static java.lang.Math.exp; import com.codahale.metrics.Clock; +import static java.lang.Math.exp; + /** * A meter metric which measures mean throughput as well as fifteen-minute and two-hour * exponentially-weighted moving average throughputs. diff --git a/src/java/org/apache/cassandra/metrics/Sampler.java b/src/java/org/apache/cassandra/metrics/Sampler.java index b32d8111e2..4506e2861d 100644 --- a/src/java/org/apache/cassandra/metrics/Sampler.java +++ b/src/java/org/apache/cassandra/metrics/Sampler.java @@ -24,14 +24,14 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.BiFunction; +import com.google.common.annotations.VisibleForTesting; + import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.Verb; import org.apache.cassandra.utils.ExecutorUtils; import org.apache.cassandra.utils.MonotonicClock; -import com.google.common.annotations.VisibleForTesting; - import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; public abstract class Sampler diff --git a/src/java/org/apache/cassandra/metrics/SamplingManager.java b/src/java/org/apache/cassandra/metrics/SamplingManager.java index 862b81fe77..c2d427f68b 100644 --- a/src/java/org/apache/cassandra/metrics/SamplingManager.java +++ b/src/java/org/apache/cassandra/metrics/SamplingManager.java @@ -34,6 +34,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import java.util.stream.StreamSupport; + import javax.management.openmbean.CompositeData; import javax.management.openmbean.OpenDataException; diff --git a/src/java/org/apache/cassandra/metrics/ShardedDecayingHistograms.java b/src/java/org/apache/cassandra/metrics/ShardedDecayingHistograms.java index 92620fb034..c0a2a54a17 100644 --- a/src/java/org/apache/cassandra/metrics/ShardedDecayingHistograms.java +++ b/src/java/org/apache/cassandra/metrics/ShardedDecayingHistograms.java @@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import com.codahale.metrics.Snapshot; + import org.apache.cassandra.metrics.LogLinearDecayingHistograms.LogLinearDecayingHistogram; import org.apache.cassandra.metrics.LogLinearHistogram.LogLinearSnapshot; import org.apache.cassandra.utils.Clock; diff --git a/src/java/org/apache/cassandra/metrics/ShardedHistogram.java b/src/java/org/apache/cassandra/metrics/ShardedHistogram.java index 3ac77a9717..e11c10c0ca 100644 --- a/src/java/org/apache/cassandra/metrics/ShardedHistogram.java +++ b/src/java/org/apache/cassandra/metrics/ShardedHistogram.java @@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import com.codahale.metrics.Snapshot; + import org.apache.cassandra.metrics.LogLinearHistogram.LogLinearSnapshot; import org.apache.cassandra.utils.Clock; diff --git a/src/java/org/apache/cassandra/metrics/ShardedHitRate.java b/src/java/org/apache/cassandra/metrics/ShardedHitRate.java index 1a9feea7ac..b3bd70fe44 100644 --- a/src/java/org/apache/cassandra/metrics/ShardedHitRate.java +++ b/src/java/org/apache/cassandra/metrics/ShardedHitRate.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import accord.utils.Invariants; + import org.apache.cassandra.utils.Clock; public class ShardedHitRate diff --git a/src/java/org/apache/cassandra/metrics/ShardedLongGauges.java b/src/java/org/apache/cassandra/metrics/ShardedLongGauges.java index d2721a94c6..18ac55f602 100644 --- a/src/java/org/apache/cassandra/metrics/ShardedLongGauges.java +++ b/src/java/org/apache/cassandra/metrics/ShardedLongGauges.java @@ -25,8 +25,10 @@ import java.util.concurrent.locks.Lock; import java.util.function.LongBinaryOperator; import java.util.function.ToLongFunction; -import accord.utils.Invariants; import com.codahale.metrics.Gauge; + +import accord.utils.Invariants; + import org.apache.cassandra.utils.Clock; public class ShardedLongGauges diff --git a/src/java/org/apache/cassandra/metrics/StorageMetrics.java b/src/java/org/apache/cassandra/metrics/StorageMetrics.java index 24a1a6994e..0dfb3eb0ad 100644 --- a/src/java/org/apache/cassandra/metrics/StorageMetrics.java +++ b/src/java/org/apache/cassandra/metrics/StorageMetrics.java @@ -23,6 +23,7 @@ import java.util.stream.StreamSupport; import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Meter; + import org.apache.cassandra.db.Keyspace; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/metrics/StreamingMetrics.java b/src/java/org/apache/cassandra/metrics/StreamingMetrics.java index eb5d840063..48064e5972 100644 --- a/src/java/org/apache/cassandra/metrics/StreamingMetrics.java +++ b/src/java/org/apache/cassandra/metrics/StreamingMetrics.java @@ -19,13 +19,13 @@ package org.apache.cassandra.metrics; import java.util.concurrent.ConcurrentMap; - import com.codahale.metrics.Counter; import com.codahale.metrics.Timer; -import org.apache.cassandra.locator.InetAddressAndPort; import org.cliffc.high_scale_lib.NonBlockingHashMap; +import org.apache.cassandra.locator.InetAddressAndPort; + import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; /** diff --git a/src/java/org/apache/cassandra/metrics/TCMMetrics.java b/src/java/org/apache/cassandra/metrics/TCMMetrics.java index 909280c577..9544c2215a 100644 --- a/src/java/org/apache/cassandra/metrics/TCMMetrics.java +++ b/src/java/org/apache/cassandra/metrics/TCMMetrics.java @@ -24,6 +24,7 @@ import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; + import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.Epoch; diff --git a/src/java/org/apache/cassandra/metrics/TableMetrics.java b/src/java/org/apache/cassandra/metrics/TableMetrics.java index 8caf6f4e67..a1ee119240 100644 --- a/src/java/org/apache/cassandra/metrics/TableMetrics.java +++ b/src/java/org/apache/cassandra/metrics/TableMetrics.java @@ -30,18 +30,19 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; -import org.apache.commons.lang3.ArrayUtils; - import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; import com.codahale.metrics.Meter; import com.codahale.metrics.Metric; import com.codahale.metrics.Timer; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; + +import org.apache.commons.lang3.ArrayUtils; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; diff --git a/src/java/org/apache/cassandra/metrics/ThreadLocalMeter.java b/src/java/org/apache/cassandra/metrics/ThreadLocalMeter.java index 3a20504e85..6b569cb4a2 100644 --- a/src/java/org/apache/cassandra/metrics/ThreadLocalMeter.java +++ b/src/java/org/apache/cassandra/metrics/ThreadLocalMeter.java @@ -27,9 +27,9 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import com.codahale.metrics.Clock; import com.google.common.annotations.VisibleForTesting; -import com.codahale.metrics.Clock; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.utils.MonotonicClock; import org.apache.cassandra.utils.ReflectionUtils; diff --git a/src/java/org/apache/cassandra/metrics/ThreadLocalMetrics.java b/src/java/org/apache/cassandra/metrics/ThreadLocalMetrics.java index 6f4afe6677..0135522ac0 100644 --- a/src/java/org/apache/cassandra/metrics/ThreadLocalMetrics.java +++ b/src/java/org/apache/cassandra/metrics/ThreadLocalMetrics.java @@ -36,10 +36,11 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import com.google.common.annotations.VisibleForTesting; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.concurrent.Shutdownable; +import io.netty.util.concurrent.FastThreadLocal; + import static com.google.common.collect.ImmutableList.of; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; import static org.apache.cassandra.concurrent.InfiniteLoopExecutor.SimulatorSafe.UNSAFE; diff --git a/src/java/org/apache/cassandra/metrics/ThreadPoolMetrics.java b/src/java/org/apache/cassandra/metrics/ThreadPoolMetrics.java index 90a50ad597..9ec57595f2 100644 --- a/src/java/org/apache/cassandra/metrics/ThreadPoolMetrics.java +++ b/src/java/org/apache/cassandra/metrics/ThreadPoolMetrics.java @@ -21,11 +21,11 @@ import java.util.concurrent.ThreadPoolExecutor; import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; + import org.apache.cassandra.concurrent.ResizableThreadPool; import org.apache.cassandra.metrics.CassandraMetricsRegistry.MetricName; import static java.lang.String.format; - import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; /** diff --git a/src/java/org/apache/cassandra/metrics/Timer.java b/src/java/org/apache/cassandra/metrics/Timer.java index 84369be485..f09b196396 100644 --- a/src/java/org/apache/cassandra/metrics/Timer.java +++ b/src/java/org/apache/cassandra/metrics/Timer.java @@ -25,6 +25,7 @@ import java.util.function.Supplier; import com.codahale.metrics.Metered; import com.codahale.metrics.Sampling; + import org.apache.cassandra.metrics.CassandraReservoir.BucketStrategy; /** diff --git a/src/java/org/apache/cassandra/metrics/UnweightedCacheMetrics.java b/src/java/org/apache/cassandra/metrics/UnweightedCacheMetrics.java index b651a51995..2bf1d64aa3 100644 --- a/src/java/org/apache/cassandra/metrics/UnweightedCacheMetrics.java +++ b/src/java/org/apache/cassandra/metrics/UnweightedCacheMetrics.java @@ -18,6 +18,7 @@ package org.apache.cassandra.metrics; import com.codahale.metrics.Gauge; + import org.apache.cassandra.cache.UnweightedCacheSize; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/src/java/org/apache/cassandra/metrics/ViewWriteMetrics.java b/src/java/org/apache/cassandra/metrics/ViewWriteMetrics.java index 98363d413d..5badfd457a 100644 --- a/src/java/org/apache/cassandra/metrics/ViewWriteMetrics.java +++ b/src/java/org/apache/cassandra/metrics/ViewWriteMetrics.java @@ -18,11 +18,11 @@ package org.apache.cassandra.metrics; -import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; - import com.codahale.metrics.Counter; -import com.codahale.metrics.Timer; import com.codahale.metrics.Gauge; +import com.codahale.metrics.Timer; + +import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; public class ViewWriteMetrics extends ClientRequestMetrics { diff --git a/src/java/org/apache/cassandra/net/AbstractMessageHandler.java b/src/java/org/apache/cassandra/net/AbstractMessageHandler.java index 895b277ad5..0ef03990fd 100644 --- a/src/java/org/apache/cassandra/net/AbstractMessageHandler.java +++ b/src/java/org/apache/cassandra/net/AbstractMessageHandler.java @@ -26,13 +26,10 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.Channel; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.channel.EventLoop; import org.apache.cassandra.concurrent.ManyToOneConcurrentLinkedQueue; import org.apache.cassandra.metrics.ClientMetrics; import org.apache.cassandra.net.FrameDecoder.CorruptFrame; @@ -42,6 +39,11 @@ import org.apache.cassandra.net.FrameDecoder.IntactFrame; import org.apache.cassandra.net.Message.Header; import org.apache.cassandra.net.ResourceLimits.Limit; +import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.channel.EventLoop; + import static java.lang.Math.max; import static java.lang.Math.min; import static org.apache.cassandra.utils.Crc.InvalidCrc; diff --git a/src/java/org/apache/cassandra/net/AsyncChannelOutputPlus.java b/src/java/org/apache/cassandra/net/AsyncChannelOutputPlus.java index 983db3ef51..d5215c9bf3 100644 --- a/src/java/org/apache/cassandra/net/AsyncChannelOutputPlus.java +++ b/src/java/org/apache/cassandra/net/AsyncChannelOutputPlus.java @@ -21,11 +21,12 @@ import java.io.IOException; import java.nio.channels.WritableByteChannel; import java.util.concurrent.locks.LockSupport; -import io.netty.channel.Channel; -import io.netty.channel.ChannelPromise; import org.apache.cassandra.io.util.BufferedDataOutputStreamPlus; import org.apache.cassandra.io.util.DataOutputStreamPlus; +import io.netty.channel.Channel; +import io.netty.channel.ChannelPromise; + import static java.lang.Math.max; /** diff --git a/src/java/org/apache/cassandra/net/AsyncChannelPromise.java b/src/java/org/apache/cassandra/net/AsyncChannelPromise.java index 00253fa72a..8700ea69c8 100644 --- a/src/java/org/apache/cassandra/net/AsyncChannelPromise.java +++ b/src/java/org/apache/cassandra/net/AsyncChannelPromise.java @@ -18,13 +18,14 @@ package org.apache.cassandra.net; +import org.apache.cassandra.utils.concurrent.AsyncPromise; + import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; import io.netty.util.concurrent.Future; // checkstyle: permit this import import io.netty.util.concurrent.GenericFutureListener; -import org.apache.cassandra.utils.concurrent.AsyncPromise; /** * See {@link AsyncPromise} and {@link io.netty.channel.ChannelPromise} diff --git a/src/java/org/apache/cassandra/net/AsyncMessageOutputPlus.java b/src/java/org/apache/cassandra/net/AsyncMessageOutputPlus.java index e1bcfed193..2c1117f1d6 100644 --- a/src/java/org/apache/cassandra/net/AsyncMessageOutputPlus.java +++ b/src/java/org/apache/cassandra/net/AsyncMessageOutputPlus.java @@ -21,10 +21,11 @@ package org.apache.cassandra.net; import java.io.IOException; import java.nio.channels.ClosedChannelException; +import org.apache.cassandra.io.util.DataOutputStreamPlus; + import io.netty.channel.Channel; import io.netty.channel.ChannelPromise; import io.netty.channel.WriteBufferWaterMark; -import org.apache.cassandra.io.util.DataOutputStreamPlus; /** * A {@link DataOutputStreamPlus} that writes ASYNCHRONOUSLY to a Netty Channel. diff --git a/src/java/org/apache/cassandra/net/AsyncStreamingInputPlus.java b/src/java/org/apache/cassandra/net/AsyncStreamingInputPlus.java index ee18a873ea..0e04cfd9b5 100644 --- a/src/java/org/apache/cassandra/net/AsyncStreamingInputPlus.java +++ b/src/java/org/apache/cassandra/net/AsyncStreamingInputPlus.java @@ -25,12 +25,13 @@ import java.util.concurrent.BlockingQueue; import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Ints; +import org.apache.cassandra.io.util.RebufferingInputStream; +import org.apache.cassandra.streaming.StreamingDataInputPlus; + import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; -import org.apache.cassandra.io.util.RebufferingInputStream; -import org.apache.cassandra.streaming.StreamingDataInputPlus; import static org.apache.cassandra.utils.concurrent.BlockingQueues.newBlockingQueue; diff --git a/src/java/org/apache/cassandra/net/AsyncStreamingOutputPlus.java b/src/java/org/apache/cassandra/net/AsyncStreamingOutputPlus.java index 450f47d2b2..ff0c6e2eab 100644 --- a/src/java/org/apache/cassandra/net/AsyncStreamingOutputPlus.java +++ b/src/java/org/apache/cassandra/net/AsyncStreamingOutputPlus.java @@ -24,21 +24,23 @@ import java.nio.channels.ClosedChannelException; import java.nio.channels.FileChannel; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.io.compress.BufferType; +import org.apache.cassandra.io.util.DataOutputStreamPlus; +import org.apache.cassandra.net.SharedDefaultFileRegion.SharedFileChannel; +import org.apache.cassandra.streaming.StreamingDataOutputPlus; +import org.apache.cassandra.utils.memory.BufferPool; +import org.apache.cassandra.utils.memory.BufferPools; + import io.netty.channel.Channel; import io.netty.channel.ChannelPromise; import io.netty.channel.DefaultFileRegion; import io.netty.channel.FileRegion; import io.netty.channel.WriteBufferWaterMark; import io.netty.handler.ssl.SslHandler; -import org.apache.cassandra.io.compress.BufferType; -import org.apache.cassandra.io.util.DataOutputStreamPlus; -import org.apache.cassandra.net.SharedDefaultFileRegion.SharedFileChannel; -import org.apache.cassandra.streaming.StreamingDataOutputPlus; -import org.apache.cassandra.utils.memory.BufferPool; -import org.apache.cassandra.utils.memory.BufferPools; import static java.lang.Math.min; diff --git a/src/java/org/apache/cassandra/net/BufferPoolAllocator.java b/src/java/org/apache/cassandra/net/BufferPoolAllocator.java index 63e734a998..ffe2f7f46b 100644 --- a/src/java/org/apache/cassandra/net/BufferPoolAllocator.java +++ b/src/java/org/apache/cassandra/net/BufferPoolAllocator.java @@ -21,13 +21,14 @@ import java.nio.ByteBuffer; import com.google.common.annotations.VisibleForTesting; +import org.apache.cassandra.io.compress.BufferType; +import org.apache.cassandra.utils.memory.BufferPool; +import org.apache.cassandra.utils.memory.BufferPools; + import io.netty.buffer.AbstractByteBufAllocator; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.buffer.UnpooledUnsafeDirectByteBuf; -import org.apache.cassandra.io.compress.BufferType; -import org.apache.cassandra.utils.memory.BufferPool; -import org.apache.cassandra.utils.memory.BufferPools; import static java.lang.Integer.max; diff --git a/src/java/org/apache/cassandra/net/EndpointMessagingVersions.java b/src/java/org/apache/cassandra/net/EndpointMessagingVersions.java index dceffc7cc1..bf011e99bb 100644 --- a/src/java/org/apache/cassandra/net/EndpointMessagingVersions.java +++ b/src/java/org/apache/cassandra/net/EndpointMessagingVersions.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.concurrent.ConcurrentMap; import org.cliffc.high_scale_lib.NonBlockingHashMap; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/net/ForwardingInfo.java b/src/java/org/apache/cassandra/net/ForwardingInfo.java index bb8880c5b8..0929f47e96 100644 --- a/src/java/org/apache/cassandra/net/ForwardingInfo.java +++ b/src/java/org/apache/cassandra/net/ForwardingInfo.java @@ -17,18 +17,19 @@ */ package org.apache.cassandra.net; -import com.google.common.base.Preconditions; -import org.apache.cassandra.io.IVersionedSerializer; -import org.apache.cassandra.io.util.DataInputPlus; -import org.apache.cassandra.io.util.DataOutputPlus; -import org.apache.cassandra.locator.InetAddressAndPort; - import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.function.BiConsumer; +import com.google.common.base.Preconditions; + +import org.apache.cassandra.io.IVersionedSerializer; +import org.apache.cassandra.io.util.DataInputPlus; +import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.locator.InetAddressAndPort; + import static org.apache.cassandra.locator.InetAddressAndPort.Serializer.inetAddressAndPortSerializer; import static org.apache.cassandra.net.MessagingService.VERSION_40; import static org.apache.cassandra.utils.vint.VIntCoding.computeUnsignedVIntSize; diff --git a/src/java/org/apache/cassandra/net/FrameDecoderCrc.java b/src/java/org/apache/cassandra/net/FrameDecoderCrc.java index 86f4442453..c13cc46e71 100644 --- a/src/java/org/apache/cassandra/net/FrameDecoderCrc.java +++ b/src/java/org/apache/cassandra/net/FrameDecoderCrc.java @@ -24,7 +24,9 @@ import java.util.zip.CRC32; import io.netty.channel.ChannelPipeline; -import static org.apache.cassandra.utils.Crc.*; +import static org.apache.cassandra.utils.Crc.crc24; +import static org.apache.cassandra.utils.Crc.crc32; +import static org.apache.cassandra.utils.Crc.updateCrc32; /** * Framing format that protects integrity of data in movement with CRCs (of both header and payload). diff --git a/src/java/org/apache/cassandra/net/FrameDecoderLZ4.java b/src/java/org/apache/cassandra/net/FrameDecoderLZ4.java index 7dafb7fedf..129cd4f3f4 100644 --- a/src/java/org/apache/cassandra/net/FrameDecoderLZ4.java +++ b/src/java/org/apache/cassandra/net/FrameDecoderLZ4.java @@ -22,11 +22,14 @@ import java.nio.ByteOrder; import java.util.Collection; import java.util.zip.CRC32; -import io.netty.channel.ChannelPipeline; import net.jpountz.lz4.LZ4Factory; import net.jpountz.lz4.LZ4SafeDecompressor; -import static org.apache.cassandra.utils.Crc.*; +import io.netty.channel.ChannelPipeline; + +import static org.apache.cassandra.utils.Crc.crc24; +import static org.apache.cassandra.utils.Crc.crc32; +import static org.apache.cassandra.utils.Crc.updateCrc32; /** * Framing format that compresses payloads with LZ4, and protects integrity of data in movement with CRCs diff --git a/src/java/org/apache/cassandra/net/FrameEncoder.java b/src/java/org/apache/cassandra/net/FrameEncoder.java index fc4f861909..9d95366d24 100644 --- a/src/java/org/apache/cassandra/net/FrameEncoder.java +++ b/src/java/org/apache/cassandra/net/FrameEncoder.java @@ -19,13 +19,14 @@ package org.apache.cassandra.net; import java.nio.ByteBuffer; +import org.apache.cassandra.io.compress.BufferType; +import org.apache.cassandra.utils.memory.BufferPool; +import org.apache.cassandra.utils.memory.BufferPools; + import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOutboundHandlerAdapter; import io.netty.channel.ChannelPromise; -import org.apache.cassandra.io.compress.BufferType; -import org.apache.cassandra.utils.memory.BufferPool; -import org.apache.cassandra.utils.memory.BufferPools; public abstract class FrameEncoder extends ChannelOutboundHandlerAdapter { diff --git a/src/java/org/apache/cassandra/net/FrameEncoderCrc.java b/src/java/org/apache/cassandra/net/FrameEncoderCrc.java index 75b84aa14f..c73ce36f9c 100644 --- a/src/java/org/apache/cassandra/net/FrameEncoderCrc.java +++ b/src/java/org/apache/cassandra/net/FrameEncoderCrc.java @@ -24,7 +24,8 @@ import java.util.zip.CRC32; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandler; -import static org.apache.cassandra.utils.Crc.*; +import static org.apache.cassandra.utils.Crc.crc24; +import static org.apache.cassandra.utils.Crc.crc32; /** * Please see {@link FrameDecoderCrc} for description of the framing produced by this encoder. diff --git a/src/java/org/apache/cassandra/net/FrameEncoderLZ4.java b/src/java/org/apache/cassandra/net/FrameEncoderLZ4.java index 423e377a27..3ca245914f 100644 --- a/src/java/org/apache/cassandra/net/FrameEncoderLZ4.java +++ b/src/java/org/apache/cassandra/net/FrameEncoderLZ4.java @@ -21,14 +21,17 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.zip.CRC32; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandler; import net.jpountz.lz4.LZ4Compressor; import net.jpountz.lz4.LZ4Factory; + import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.utils.ByteBufferUtil; -import static org.apache.cassandra.utils.Crc.*; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandler; + +import static org.apache.cassandra.utils.Crc.crc24; +import static org.apache.cassandra.utils.Crc.crc32; /** * Please see {@link FrameDecoderLZ4} for description of the framing produced by this encoder. diff --git a/src/java/org/apache/cassandra/net/FutureResult.java b/src/java/org/apache/cassandra/net/FutureResult.java index e2648c599c..5bc06035ee 100644 --- a/src/java/org/apache/cassandra/net/FutureResult.java +++ b/src/java/org/apache/cassandra/net/FutureResult.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.net; -import io.netty.util.concurrent.Future; //checkstyle: permit this import +import io.netty.util.concurrent.Future; // checkstyle: permit this import /** * An abstraction for yielding a result performed by an asynchronous task, diff --git a/src/java/org/apache/cassandra/net/GlobalBufferPoolAllocator.java b/src/java/org/apache/cassandra/net/GlobalBufferPoolAllocator.java index f559a6341d..7072c9ae07 100644 --- a/src/java/org/apache/cassandra/net/GlobalBufferPoolAllocator.java +++ b/src/java/org/apache/cassandra/net/GlobalBufferPoolAllocator.java @@ -19,9 +19,10 @@ package org.apache.cassandra.net; import java.nio.ByteBuffer; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.utils.memory.BufferPool; +import io.netty.buffer.ByteBuf; + /** * Primary {@link ByteBuf} / {@link ByteBuffer} allocator - using the global {@link BufferPool}. */ diff --git a/src/java/org/apache/cassandra/net/HandshakeProtocol.java b/src/java/org/apache/cassandra/net/HandshakeProtocol.java index 085c8b966c..108091a76b 100644 --- a/src/java/org/apache/cassandra/net/HandshakeProtocol.java +++ b/src/java/org/apache/cassandra/net/HandshakeProtocol.java @@ -22,8 +22,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.Objects; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufAllocator; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.io.util.DataInputBuffer; @@ -31,12 +29,16 @@ import org.apache.cassandra.io.util.DataOutputBufferFixed; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.utils.memory.BufferPools; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; + import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.cassandra.locator.InetAddressAndPort.Serializer.inetAddressAndPortSerializer; -import static org.apache.cassandra.net.MessagingService.VERSION_40; import static org.apache.cassandra.net.Message.validateLegacyProtocolMagic; -import static org.apache.cassandra.utils.Crc.*; -import static org.apache.cassandra.net.OutboundConnectionSettings.*; +import static org.apache.cassandra.net.MessagingService.VERSION_40; +import static org.apache.cassandra.net.OutboundConnectionSettings.Framing; +import static org.apache.cassandra.utils.Crc.InvalidCrc; +import static org.apache.cassandra.utils.Crc.computeCrc32; /** * Messages for the handshake phase of the internode protocol. diff --git a/src/java/org/apache/cassandra/net/InboundConnectionInitiator.java b/src/java/org/apache/cassandra/net/InboundConnectionInitiator.java index c4cbc50a2b..53876c26fe 100644 --- a/src/java/org/apache/cassandra/net/InboundConnectionInitiator.java +++ b/src/java/org/apache/cassandra/net/InboundConnectionInitiator.java @@ -29,9 +29,24 @@ import java.util.function.Consumer; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.auth.IInternodeAuthenticator; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.EncryptionOptions; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.net.OutboundConnectionSettings.Framing; +import org.apache.cassandra.security.ISslContextFactory; +import org.apache.cassandra.security.SSLFactory; +import org.apache.cassandra.streaming.StreamDeserializingTask; +import org.apache.cassandra.streaming.StreamingChannel; +import org.apache.cassandra.streaming.async.NettyStreamingChannel; +import org.apache.cassandra.utils.NoSpamLogger; +import org.apache.cassandra.utils.memory.BufferPools; + import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; @@ -49,21 +64,9 @@ import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslHandler; -import org.apache.cassandra.auth.IInternodeAuthenticator; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.EncryptionOptions; -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.net.OutboundConnectionSettings.Framing; -import org.apache.cassandra.security.ISslContextFactory; -import org.apache.cassandra.security.SSLFactory; -import org.apache.cassandra.streaming.StreamDeserializingTask; -import org.apache.cassandra.streaming.StreamingChannel; -import org.apache.cassandra.streaming.async.NettyStreamingChannel; -import org.apache.cassandra.utils.NoSpamLogger; -import org.apache.cassandra.utils.memory.BufferPools; -import static java.lang.Math.*; +import static java.lang.Math.max; +import static java.lang.Math.min; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.cassandra.auth.IInternodeAuthenticator.InternodeConnectionDirection.INBOUND; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; @@ -72,7 +75,9 @@ import static org.apache.cassandra.net.InternodeConnectionUtils.DISCARD_HANDLER_ import static org.apache.cassandra.net.InternodeConnectionUtils.SSL_FACTORY_CONTEXT_DESCRIPTION; import static org.apache.cassandra.net.InternodeConnectionUtils.SSL_HANDLER_NAME; import static org.apache.cassandra.net.InternodeConnectionUtils.certificates; -import static org.apache.cassandra.net.MessagingService.*; +import static org.apache.cassandra.net.MessagingService.current_version; +import static org.apache.cassandra.net.MessagingService.instance; +import static org.apache.cassandra.net.MessagingService.minimum_version; import static org.apache.cassandra.net.SocketFactory.WIRETRACE; import static org.apache.cassandra.net.SocketFactory.newSslHandler; diff --git a/src/java/org/apache/cassandra/net/InboundConnectionSettings.java b/src/java/org/apache/cassandra/net/InboundConnectionSettings.java index 4a9db7ca81..72743e5a14 100644 --- a/src/java/org/apache/cassandra/net/InboundConnectionSettings.java +++ b/src/java/org/apache/cassandra/net/InboundConnectionSettings.java @@ -30,7 +30,9 @@ import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.utils.FBUtilities; import static java.lang.String.format; -import static org.apache.cassandra.net.MessagingService.*; +import static org.apache.cassandra.net.MessagingService.accept_messaging; +import static org.apache.cassandra.net.MessagingService.accept_streaming; +import static org.apache.cassandra.net.MessagingService.instance; public class InboundConnectionSettings { diff --git a/src/java/org/apache/cassandra/net/InboundMessageHandler.java b/src/java/org/apache/cassandra/net/InboundMessageHandler.java index 16a900cf72..3f7c7b0e91 100644 --- a/src/java/org/apache/cassandra/net/InboundMessageHandler.java +++ b/src/java/org/apache/cassandra/net/InboundMessageHandler.java @@ -23,28 +23,29 @@ import java.nio.ByteBuffer; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import org.apache.cassandra.utils.ByteBufferUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.Channel; -import io.netty.channel.ChannelHandlerContext; import org.apache.cassandra.concurrent.ExecutorLocals; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.exceptions.IncompatibleSchemaException; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.net.Message.Header; -import org.apache.cassandra.net.FrameDecoder.IntactFrame; import org.apache.cassandra.net.FrameDecoder.CorruptFrame; +import org.apache.cassandra.net.FrameDecoder.IntactFrame; +import org.apache.cassandra.net.Message.Header; import org.apache.cassandra.net.ResourceLimits.Limit; import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tracing.TraceState; import org.apache.cassandra.tracing.Tracing; +import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Crc; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.NoSpamLogger; +import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; + import static java.util.concurrent.TimeUnit.NANOSECONDS; import static org.apache.cassandra.utils.MonotonicClock.Global.approxTime; diff --git a/src/java/org/apache/cassandra/net/InboundMessageHandlers.java b/src/java/org/apache/cassandra/net/InboundMessageHandlers.java index f1b98bdbbe..6d5bb5458c 100644 --- a/src/java/org/apache/cassandra/net/InboundMessageHandlers.java +++ b/src/java/org/apache/cassandra/net/InboundMessageHandlers.java @@ -26,12 +26,13 @@ import java.util.function.ToLongFunction; import com.google.common.annotations.VisibleForTesting; -import io.netty.channel.Channel; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.metrics.InternodeInboundMetrics; import org.apache.cassandra.net.Message.Header; import org.apache.cassandra.utils.Crc; +import io.netty.channel.Channel; + import static java.util.concurrent.TimeUnit.NANOSECONDS; import static org.apache.cassandra.utils.MonotonicClock.Global.approxTime; diff --git a/src/java/org/apache/cassandra/net/InboundSink.java b/src/java/org/apache/cassandra/net/InboundSink.java index 7fbc50a201..734c9a1ba1 100644 --- a/src/java/org/apache/cassandra/net/InboundSink.java +++ b/src/java/org/apache/cassandra/net/InboundSink.java @@ -23,14 +23,15 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.function.Predicate; -import org.apache.cassandra.index.IndexBuildInProgressException; +import net.openhft.chronicle.core.util.ThrowingConsumer; + import org.slf4j.LoggerFactory; -import net.openhft.chronicle.core.util.ThrowingConsumer; import org.apache.cassandra.db.filter.TombstoneOverwhelmingException; import org.apache.cassandra.exceptions.CoordinatorBehindException; import org.apache.cassandra.exceptions.InvalidRoutingException; import org.apache.cassandra.exceptions.RequestFailure; +import org.apache.cassandra.index.IndexBuildInProgressException; import org.apache.cassandra.index.IndexNotAvailableException; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.tcm.ClusterMetadata; diff --git a/src/java/org/apache/cassandra/net/InboundSockets.java b/src/java/org/apache/cassandra/net/InboundSockets.java index 80309aa443..94b3233fa8 100644 --- a/src/java/org/apache/cassandra/net/InboundSockets.java +++ b/src/java/org/apache/cassandra/net/InboundSockets.java @@ -24,24 +24,26 @@ import java.util.function.Consumer; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.concurrent.NamedThreadFactory; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.concurrent.AsyncPromise; +import org.apache.cassandra.utils.concurrent.FutureCombiner; + import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelPipeline; import io.netty.channel.group.ChannelGroup; import io.netty.channel.group.DefaultChannelGroup; import io.netty.util.concurrent.DefaultEventExecutor; -import io.netty.util.concurrent.Future; //checkstyle: permit this import +import io.netty.util.concurrent.Future; // checkstyle: permit this import import io.netty.util.concurrent.GlobalEventExecutor; import io.netty.util.concurrent.PromiseNotifier; import io.netty.util.concurrent.SucceededFuture; -import org.apache.cassandra.concurrent.NamedThreadFactory; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.concurrent.AsyncPromise; -import org.apache.cassandra.utils.concurrent.FutureCombiner; class InboundSockets { diff --git a/src/java/org/apache/cassandra/net/InternodeConnectionUtils.java b/src/java/org/apache/cassandra/net/InternodeConnectionUtils.java index c6c029dfc5..8afb25478f 100644 --- a/src/java/org/apache/cassandra/net/InternodeConnectionUtils.java +++ b/src/java/org/apache/cassandra/net/InternodeConnectionUtils.java @@ -20,6 +20,7 @@ package org.apache.cassandra.net; import java.nio.channels.ClosedChannelException; import java.security.cert.Certificate; + import javax.net.ssl.SSLPeerUnverifiedException; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/net/LocalBufferPoolAllocator.java b/src/java/org/apache/cassandra/net/LocalBufferPoolAllocator.java index 8017854946..aae0510753 100644 --- a/src/java/org/apache/cassandra/net/LocalBufferPoolAllocator.java +++ b/src/java/org/apache/cassandra/net/LocalBufferPoolAllocator.java @@ -19,10 +19,11 @@ package org.apache.cassandra.net; import java.nio.ByteBuffer; -import io.netty.channel.EventLoop; import org.apache.cassandra.utils.memory.BufferPool; import org.apache.cassandra.utils.memory.BufferPools; +import io.netty.channel.EventLoop; + /** * Equivalent to {@link GlobalBufferPoolAllocator}, except explicitly using a specified * {@link org.apache.cassandra.utils.memory.BufferPool.LocalPool} to allocate from. diff --git a/src/java/org/apache/cassandra/net/Message.java b/src/java/org/apache/cassandra/net/Message.java index 4bf114972b..ba334261a6 100644 --- a/src/java/org/apache/cassandra/net/Message.java +++ b/src/java/org/apache/cassandra/net/Message.java @@ -27,10 +27,12 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Ints; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/net/MessageDelivery.java b/src/java/org/apache/cassandra/net/MessageDelivery.java index cb6c7190d7..2e9155f713 100644 --- a/src/java/org/apache/cassandra/net/MessageDelivery.java +++ b/src/java/org/apache/cassandra/net/MessageDelivery.java @@ -23,12 +23,14 @@ import java.util.Iterator; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; + import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.RequestFailure; import org.apache.cassandra.exceptions.RequestFailureReason; diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index 129d5114dd..0e9e6eb9ab 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -30,10 +30,10 @@ import java.util.concurrent.TimeoutException; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.util.concurrent.Future; //checkstyle: permit this import import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.config.DatabaseDescriptor; @@ -51,6 +51,8 @@ import org.apache.cassandra.utils.concurrent.AsyncPromise; import org.apache.cassandra.utils.concurrent.FutureCombiner; import org.apache.cassandra.utils.concurrent.Promise; +import io.netty.util.concurrent.Future; // checkstyle: permit this import + import static java.util.Collections.synchronizedList; import static java.util.concurrent.TimeUnit.MINUTES; import static org.apache.cassandra.concurrent.Stage.MUTATION; diff --git a/src/java/org/apache/cassandra/net/OutboundConnection.java b/src/java/org/apache/cassandra/net/OutboundConnection.java index 4aa754d8aa..d5a95706a1 100644 --- a/src/java/org/apache/cassandra/net/OutboundConnection.java +++ b/src/java/org/apache/cassandra/net/OutboundConnection.java @@ -34,30 +34,31 @@ import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.utils.Clock; -import org.apache.cassandra.utils.concurrent.AsyncPromise; -import org.apache.cassandra.utils.concurrent.CountDownLatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.io.util.DataOutputBufferFixed; +import org.apache.cassandra.net.OutboundConnectionInitiator.Result.MessagingSuccess; +import org.apache.cassandra.tracing.Tracing; +import org.apache.cassandra.utils.Clock; +import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.JVMStabilityInspector; +import org.apache.cassandra.utils.NoSpamLogger; +import org.apache.cassandra.utils.concurrent.AsyncPromise; +import org.apache.cassandra.utils.concurrent.CountDownLatch; +import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; + import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.EventLoop; import io.netty.channel.unix.Errors; -import io.netty.util.concurrent.Future; //checkstyle: permit this import -import io.netty.util.concurrent.Promise; //checkstyle: permit this import +import io.netty.util.concurrent.Future; // checkstyle: permit this import +import io.netty.util.concurrent.Promise; // checkstyle: permit this import import io.netty.util.concurrent.PromiseNotifier; import io.netty.util.concurrent.SucceededFuture; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.io.util.DataOutputBufferFixed; -import org.apache.cassandra.net.OutboundConnectionInitiator.Result.MessagingSuccess; -import org.apache.cassandra.tracing.Tracing; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.JVMStabilityInspector; -import org.apache.cassandra.utils.NoSpamLogger; -import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; import static java.lang.Math.max; import static java.lang.Math.min; @@ -65,11 +66,18 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static org.apache.cassandra.net.InternodeConnectionUtils.isSSLError; import static org.apache.cassandra.net.MessagingService.current_version; -import static org.apache.cassandra.net.OutboundConnectionInitiator.*; +import static org.apache.cassandra.net.OutboundConnectionInitiator.Result; +import static org.apache.cassandra.net.OutboundConnectionInitiator.SslFallbackConnectionType; +import static org.apache.cassandra.net.OutboundConnectionInitiator.initiateMessaging; import static org.apache.cassandra.net.OutboundConnections.LARGE_MESSAGE_THRESHOLD; -import static org.apache.cassandra.net.ResourceLimits.*; -import static org.apache.cassandra.net.ResourceLimits.Outcome.*; -import static org.apache.cassandra.net.SocketFactory.*; +import static org.apache.cassandra.net.ResourceLimits.EndpointAndGlobal; +import static org.apache.cassandra.net.ResourceLimits.Limit; +import static org.apache.cassandra.net.ResourceLimits.Outcome; +import static org.apache.cassandra.net.ResourceLimits.Outcome.INSUFFICIENT_ENDPOINT; +import static org.apache.cassandra.net.ResourceLimits.Outcome.SUCCESS; +import static org.apache.cassandra.net.SocketFactory.encryptionConnectionSummary; +import static org.apache.cassandra.net.SocketFactory.isCausedByConnectionReset; +import static org.apache.cassandra.net.SocketFactory.isConnectionReset; import static org.apache.cassandra.utils.FBUtilities.prettyPrintMemory; import static org.apache.cassandra.utils.MonotonicClock.Global.approxTime; import static org.apache.cassandra.utils.Throwables.isCausedBy; diff --git a/src/java/org/apache/cassandra/net/OutboundConnectionInitiator.java b/src/java/org/apache/cassandra/net/OutboundConnectionInitiator.java index 2bddc174f2..22634a1ecc 100644 --- a/src/java/org/apache/cassandra/net/OutboundConnectionInitiator.java +++ b/src/java/org/apache/cassandra/net/OutboundConnectionInitiator.java @@ -27,14 +27,20 @@ import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.annotations.VisibleForTesting; -import io.netty.util.concurrent.Future; //checkstyle: permit this import -import io.netty.util.concurrent.Promise; //checkstyle: permit this import -import org.apache.cassandra.config.EncryptionOptions; -import org.apache.cassandra.utils.concurrent.AsyncPromise; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.EncryptionOptions; +import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.net.OutboundConnectionInitiator.Result.MessagingSuccess; +import org.apache.cassandra.net.OutboundConnectionInitiator.Result.StreamingSuccess; +import org.apache.cassandra.security.ISslContextFactory; +import org.apache.cassandra.security.SSLFactory; +import org.apache.cassandra.utils.JVMStabilityInspector; +import org.apache.cassandra.utils.concurrent.AsyncPromise; +import org.apache.cassandra.utils.concurrent.ImmediateFuture; +import org.apache.cassandra.utils.memory.BufferPools; + import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; @@ -47,38 +53,35 @@ import io.netty.channel.ChannelPipeline; import io.netty.channel.EventLoop; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.ByteToMessageDecoder; - import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; import io.netty.handler.ssl.SslClosedEngineException; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslHandler; +import io.netty.util.concurrent.Future; // checkstyle: permit this import +import io.netty.util.concurrent.Promise; // checkstyle: permit this import import io.netty.util.concurrent.ScheduledFuture; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.net.OutboundConnectionInitiator.Result.MessagingSuccess; -import org.apache.cassandra.net.OutboundConnectionInitiator.Result.StreamingSuccess; -import org.apache.cassandra.security.ISslContextFactory; -import org.apache.cassandra.security.SSLFactory; -import org.apache.cassandra.utils.JVMStabilityInspector; -import org.apache.cassandra.utils.concurrent.ImmediateFuture; -import org.apache.cassandra.utils.memory.BufferPools; -import static java.util.concurrent.TimeUnit.*; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.cassandra.auth.IInternodeAuthenticator.InternodeConnectionDirection.OUTBOUND; import static org.apache.cassandra.auth.IInternodeAuthenticator.InternodeConnectionDirection.OUTBOUND_PRECONNECT; import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.NOT_REQUIRED; import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.OPTIONAL; import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.REQUIRED; +import static org.apache.cassandra.net.ConnectionType.STREAMING; +import static org.apache.cassandra.net.HandshakeProtocol.Accept; +import static org.apache.cassandra.net.HandshakeProtocol.Initiate; +import static org.apache.cassandra.net.HandshakeProtocol.TIMEOUT_MILLIS; import static org.apache.cassandra.net.InternodeConnectionUtils.DISCARD_HANDLER_NAME; import static org.apache.cassandra.net.InternodeConnectionUtils.SSL_FACTORY_CONTEXT_DESCRIPTION; import static org.apache.cassandra.net.InternodeConnectionUtils.SSL_HANDLER_NAME; import static org.apache.cassandra.net.InternodeConnectionUtils.certificates; -import static org.apache.cassandra.net.HandshakeProtocol.*; -import static org.apache.cassandra.net.ConnectionType.STREAMING; import static org.apache.cassandra.net.OutboundConnectionInitiator.Result.incompatible; import static org.apache.cassandra.net.OutboundConnectionInitiator.Result.messagingSuccess; import static org.apache.cassandra.net.OutboundConnectionInitiator.Result.streamingSuccess; -import static org.apache.cassandra.net.SocketFactory.*; +import static org.apache.cassandra.net.SocketFactory.WIRETRACE; +import static org.apache.cassandra.net.SocketFactory.isCausedByConnectionReset; +import static org.apache.cassandra.net.SocketFactory.newSslHandler; /** * A {@link ChannelHandler} to execute the send-side of the internode handshake protocol. diff --git a/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java b/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java index 23ac75e717..64214e0946 100644 --- a/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java +++ b/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java @@ -21,7 +21,6 @@ package org.apache.cassandra.net; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import io.netty.channel.WriteBufferWaterMark; import org.apache.cassandra.auth.IInternodeAuthenticator; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.Config; @@ -32,6 +31,8 @@ import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.Locator; import org.apache.cassandra.utils.FBUtilities; +import io.netty.channel.WriteBufferWaterMark; + import static org.apache.cassandra.net.MessagingService.instance; import static org.apache.cassandra.utils.FBUtilities.getBroadcastAddressAndPort; diff --git a/src/java/org/apache/cassandra/net/OutboundConnections.java b/src/java/org/apache/cassandra/net/OutboundConnections.java index 80c66e0595..bd6c5bdf39 100644 --- a/src/java/org/apache/cassandra/net/OutboundConnections.java +++ b/src/java/org/apache/cassandra/net/OutboundConnections.java @@ -24,30 +24,33 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.function.Function; +import com.carrotsearch.hppc.ObjectObjectHashMap; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -import org.apache.cassandra.utils.concurrent.FutureCombiner; -import org.apache.cassandra.utils.concurrent.Condition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.carrotsearch.hppc.ObjectObjectHashMap; -import io.netty.util.concurrent.Future; //checkstyle: permit this import import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.metrics.InternodeOutboundMetrics; import org.apache.cassandra.utils.NoSpamLogger; +import org.apache.cassandra.utils.concurrent.Condition; +import org.apache.cassandra.utils.concurrent.FutureCombiner; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; +import io.netty.util.concurrent.Future; // checkstyle: permit this import + import static java.lang.Math.max; import static org.apache.cassandra.config.CassandraRelevantProperties.OTCP_LARGE_MESSAGE_THRESHOLD; import static org.apache.cassandra.gms.Gossiper.instance; -import static org.apache.cassandra.net.FrameEncoderCrc.HEADER_AND_TRAILER_LENGTH; -import static org.apache.cassandra.net.MessagingService.current_version; -import static org.apache.cassandra.net.ConnectionType.URGENT_MESSAGES; import static org.apache.cassandra.net.ConnectionType.LARGE_MESSAGES; import static org.apache.cassandra.net.ConnectionType.SMALL_MESSAGES; -import static org.apache.cassandra.net.ResourceLimits.*; +import static org.apache.cassandra.net.ConnectionType.URGENT_MESSAGES; +import static org.apache.cassandra.net.FrameEncoderCrc.HEADER_AND_TRAILER_LENGTH; +import static org.apache.cassandra.net.MessagingService.current_version; +import static org.apache.cassandra.net.ResourceLimits.Concurrent; +import static org.apache.cassandra.net.ResourceLimits.EndpointAndGlobal; +import static org.apache.cassandra.net.ResourceLimits.Limit; import static org.apache.cassandra.utils.concurrent.Condition.newOneTimeCondition; /** diff --git a/src/java/org/apache/cassandra/net/OutboundMessageQueue.java b/src/java/org/apache/cassandra/net/OutboundMessageQueue.java index 5098f32bc9..9c70e6b305 100644 --- a/src/java/org/apache/cassandra/net/OutboundMessageQueue.java +++ b/src/java/org/apache/cassandra/net/OutboundMessageQueue.java @@ -27,12 +27,12 @@ import java.util.function.Consumer; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.concurrent.ManyToOneConcurrentLinkedQueue; -import org.apache.cassandra.utils.concurrent.CountDownLatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.concurrent.ManyToOneConcurrentLinkedQueue; import org.apache.cassandra.utils.MonotonicClock; +import org.apache.cassandra.utils.concurrent.CountDownLatch; import static java.lang.Long.MAX_VALUE; import static java.lang.Math.min; diff --git a/src/java/org/apache/cassandra/net/PingRequest.java b/src/java/org/apache/cassandra/net/PingRequest.java index 6b725479f0..c0fc4cb9c3 100644 --- a/src/java/org/apache/cassandra/net/PingRequest.java +++ b/src/java/org/apache/cassandra/net/PingRequest.java @@ -25,9 +25,9 @@ import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; -import static org.apache.cassandra.net.ConnectionType.URGENT_MESSAGES; -import static org.apache.cassandra.net.ConnectionType.SMALL_MESSAGES; import static org.apache.cassandra.net.ConnectionType.LARGE_MESSAGES; +import static org.apache.cassandra.net.ConnectionType.SMALL_MESSAGES; +import static org.apache.cassandra.net.ConnectionType.URGENT_MESSAGES; /** * Indicates to the recipient which {@link ConnectionType} should be used for the response. diff --git a/src/java/org/apache/cassandra/net/RequestCallbacks.java b/src/java/org/apache/cassandra/net/RequestCallbacks.java index 485efc30b1..1f627761ef 100644 --- a/src/java/org/apache/cassandra/net/RequestCallbacks.java +++ b/src/java/org/apache/cassandra/net/RequestCallbacks.java @@ -21,9 +21,11 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeoutException; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/net/ResourceLimits.java b/src/java/org/apache/cassandra/net/ResourceLimits.java index cfddfc32f1..71c3acab72 100644 --- a/src/java/org/apache/cassandra/net/ResourceLimits.java +++ b/src/java/org/apache/cassandra/net/ResourceLimits.java @@ -17,10 +17,10 @@ */ package org.apache.cassandra.net; -import org.apache.cassandra.exceptions.UnrecoverableIllegalStateException; - import java.util.concurrent.atomic.AtomicLongFieldUpdater; +import org.apache.cassandra.exceptions.UnrecoverableIllegalStateException; + public abstract class ResourceLimits { /** diff --git a/src/java/org/apache/cassandra/net/ResponseContext.java b/src/java/org/apache/cassandra/net/ResponseContext.java index 4f254e3e6a..c9b657a2ad 100644 --- a/src/java/org/apache/cassandra/net/ResponseContext.java +++ b/src/java/org/apache/cassandra/net/ResponseContext.java @@ -18,6 +18,7 @@ package org.apache.cassandra.net; import accord.messages.ReplyContext; + import org.apache.cassandra.locator.InetAddressAndPort; public interface ResponseContext extends ReplyContext diff --git a/src/java/org/apache/cassandra/net/SharedDefaultFileRegion.java b/src/java/org/apache/cassandra/net/SharedDefaultFileRegion.java index 6b47c22d24..e67f639ac1 100644 --- a/src/java/org/apache/cassandra/net/SharedDefaultFileRegion.java +++ b/src/java/org/apache/cassandra/net/SharedDefaultFileRegion.java @@ -21,10 +21,11 @@ package org.apache.cassandra.net; import java.nio.channels.FileChannel; import java.util.concurrent.atomic.AtomicInteger; -import io.netty.channel.DefaultFileRegion; import org.apache.cassandra.utils.concurrent.Ref; import org.apache.cassandra.utils.concurrent.RefCounted; +import io.netty.channel.DefaultFileRegion; + /** * Netty's DefaultFileRegion closes the underlying FileChannel as soon as * the refCnt() for the region drops to zero, this is an implementation of diff --git a/src/java/org/apache/cassandra/net/SocketFactory.java b/src/java/org/apache/cassandra/net/SocketFactory.java index bb4013dee5..766c7521b5 100644 --- a/src/java/org/apache/cassandra/net/SocketFactory.java +++ b/src/java/org/apache/cassandra/net/SocketFactory.java @@ -26,15 +26,26 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeoutException; + import javax.annotation.Nullable; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLParameters; import javax.net.ssl.SSLSession; import com.google.common.collect.ImmutableList; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.concurrent.ManyToOneConcurrentLinkedQueue; +import org.apache.cassandra.concurrent.NamedThreadFactory; +import org.apache.cassandra.config.EncryptionOptions; +import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.security.SSLFactory; +import org.apache.cassandra.service.NativeTransportService; +import org.apache.cassandra.utils.ExecutorUtils; +import org.apache.cassandra.utils.FBUtilities; + import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; @@ -51,23 +62,15 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.channel.unix.Errors; +import io.netty.handler.ssl.SslClosedEngineException; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslHandler; -import io.netty.handler.ssl.SslClosedEngineException; import io.netty.util.concurrent.DefaultEventExecutorChooserFactory; import io.netty.util.concurrent.DefaultThreadFactory; import io.netty.util.concurrent.RejectedExecutionHandlers; import io.netty.util.concurrent.ThreadPerTaskExecutor; import io.netty.util.internal.logging.InternalLoggerFactory; import io.netty.util.internal.logging.Slf4JLoggerFactory; -import org.apache.cassandra.concurrent.ManyToOneConcurrentLinkedQueue; -import org.apache.cassandra.concurrent.NamedThreadFactory; -import org.apache.cassandra.config.EncryptionOptions; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.security.SSLFactory; -import org.apache.cassandra.service.NativeTransportService; -import org.apache.cassandra.utils.ExecutorUtils; -import org.apache.cassandra.utils.FBUtilities; import static io.netty.channel.unix.Errors.ERRNO_ECONNRESET_NEGATIVE; import static io.netty.channel.unix.Errors.ERROR_ECONNREFUSED_NEGATIVE; diff --git a/src/java/org/apache/cassandra/net/StartupClusterConnectivityChecker.java b/src/java/org/apache/cassandra/net/StartupClusterConnectivityChecker.java index 0197a6b346..8c627a6ece 100644 --- a/src/java/org/apache/cassandra/net/StartupClusterConnectivityChecker.java +++ b/src/java/org/apache/cassandra/net/StartupClusterConnectivityChecker.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.cassandra.utils.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; @@ -33,6 +32,7 @@ import java.util.function.Function; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.HashMultimap; import com.google.common.collect.SetMultimap; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,13 +42,14 @@ import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.gms.IEndpointStateChangeSubscriber; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.concurrent.CountDownLatch; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.mapping; import static java.util.stream.Collectors.toList; -import static org.apache.cassandra.net.Verb.PING_REQ; import static org.apache.cassandra.net.ConnectionType.LARGE_MESSAGES; import static org.apache.cassandra.net.ConnectionType.SMALL_MESSAGES; +import static org.apache.cassandra.net.Verb.PING_REQ; import static org.apache.cassandra.utils.Clock.Global.nanoTime; import static org.apache.cassandra.utils.concurrent.CountDownLatch.newCountDownLatch; diff --git a/src/java/org/apache/cassandra/net/Verb.java b/src/java/org/apache/cassandra/net/Verb.java index d4e4a48568..ad2317e5ab 100644 --- a/src/java/org/apache/cassandra/net/Verb.java +++ b/src/java/org/apache/cassandra/net/Verb.java @@ -138,9 +138,9 @@ import org.apache.cassandra.tcm.Discovery; import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.FetchCMSLog; import org.apache.cassandra.tcm.FetchPeerLog; +import org.apache.cassandra.tcm.migration.CMSInitializationRequest; import org.apache.cassandra.tcm.migration.CMSInitializationResponse; import org.apache.cassandra.tcm.migration.Election; -import org.apache.cassandra.tcm.migration.CMSInitializationRequest; import org.apache.cassandra.tcm.sequences.DataMovements; import org.apache.cassandra.tcm.serialization.MessageSerializers; import org.apache.cassandra.utils.BooleanSerializer; diff --git a/src/java/org/apache/cassandra/repair/AbstractRepairTask.java b/src/java/org/apache/cassandra/repair/AbstractRepairTask.java index e07ae8cc1e..8a71a8efc2 100644 --- a/src/java/org/apache/cassandra/repair/AbstractRepairTask.java +++ b/src/java/org/apache/cassandra/repair/AbstractRepairTask.java @@ -24,6 +24,7 @@ import java.util.Objects; import com.google.common.collect.Lists; import com.google.common.util.concurrent.FutureCallback; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/repair/AsymmetricRemoteSyncTask.java b/src/java/org/apache/cassandra/repair/AsymmetricRemoteSyncTask.java index 475c389678..86d7e66c51 100644 --- a/src/java/org/apache/cassandra/repair/AsymmetricRemoteSyncTask.java +++ b/src/java/org/apache/cassandra/repair/AsymmetricRemoteSyncTask.java @@ -20,7 +20,6 @@ package org.apache.cassandra.repair; import java.util.List; - import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.RepairException; diff --git a/src/java/org/apache/cassandra/repair/LocalSyncTask.java b/src/java/org/apache/cassandra/repair/LocalSyncTask.java index 379ba4b2a1..d0ec52b7d6 100644 --- a/src/java/org/apache/cassandra/repair/LocalSyncTask.java +++ b/src/java/org/apache/cassandra/repair/LocalSyncTask.java @@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/repair/RepairCoordinator.java b/src/java/org/apache/cassandra/repair/RepairCoordinator.java index 8a5045382b..3ba51e4df6 100644 --- a/src/java/org/apache/cassandra/repair/RepairCoordinator.java +++ b/src/java/org/apache/cassandra/repair/RepairCoordinator.java @@ -32,6 +32,7 @@ import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Supplier; +import com.codahale.metrics.Timer; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -39,11 +40,11 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.apache.commons.lang3.time.DurationFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Timer; import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.QueryOptions; diff --git a/src/java/org/apache/cassandra/repair/RepairJob.java b/src/java/org/apache/cassandra/repair/RepairJob.java index 5febd5be7b..6b425aaf14 100644 --- a/src/java/org/apache/cassandra/repair/RepairJob.java +++ b/src/java/org/apache/cassandra/repair/RepairJob.java @@ -30,16 +30,19 @@ import java.util.concurrent.Executor; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.FutureCallback; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.local.durability.DurabilityService.SyncRemote; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; diff --git a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java index 2f80bedd31..5fa2c4d6e8 100644 --- a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java +++ b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java @@ -22,10 +22,10 @@ import java.util.List; import java.util.function.BiFunction; import java.util.function.Function; -import org.apache.cassandra.config.DatabaseDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.IVerbHandler; diff --git a/src/java/org/apache/cassandra/repair/RepairSession.java b/src/java/org/apache/cassandra/repair/RepairSession.java index d22c96bae3..7d5d3e550b 100644 --- a/src/java/org/apache/cassandra/repair/RepairSession.java +++ b/src/java/org/apache/cassandra/repair/RepairSession.java @@ -30,11 +30,13 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import com.google.common.util.concurrent.FutureCallback; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/repair/Scheduler.java b/src/java/org/apache/cassandra/repair/Scheduler.java index cc08a0666c..da87454081 100644 --- a/src/java/org/apache/cassandra/repair/Scheduler.java +++ b/src/java/org/apache/cassandra/repair/Scheduler.java @@ -22,6 +22,7 @@ import java.util.LinkedList; import java.util.Queue; import java.util.concurrent.Executor; import java.util.function.Supplier; + import javax.annotation.concurrent.GuardedBy; import org.apache.cassandra.utils.Pair; diff --git a/src/java/org/apache/cassandra/repair/StreamingRepairTask.java b/src/java/org/apache/cassandra/repair/StreamingRepairTask.java index 0f84d66893..0b6ffb5bdb 100644 --- a/src/java/org/apache/cassandra/repair/StreamingRepairTask.java +++ b/src/java/org/apache/cassandra/repair/StreamingRepairTask.java @@ -17,27 +17,27 @@ */ package org.apache.cassandra.repair; -import java.util.Collections; import java.util.Collection; +import java.util.Collections; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.locator.RangesAtEndpoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.locator.RangesAtEndpoint; import org.apache.cassandra.repair.messages.RepairMessage; import org.apache.cassandra.repair.messages.SyncResponse; import org.apache.cassandra.repair.state.SyncState; import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.streaming.StreamEvent; import org.apache.cassandra.streaming.StreamEventHandler; +import org.apache.cassandra.streaming.StreamOperation; import org.apache.cassandra.streaming.StreamPlan; import org.apache.cassandra.streaming.StreamState; -import org.apache.cassandra.streaming.StreamOperation; import org.apache.cassandra.utils.TimeUUID; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/src/java/org/apache/cassandra/repair/SymmetricRemoteSyncTask.java b/src/java/org/apache/cassandra/repair/SymmetricRemoteSyncTask.java index 95b8959407..084b821e6d 100644 --- a/src/java/org/apache/cassandra/repair/SymmetricRemoteSyncTask.java +++ b/src/java/org/apache/cassandra/repair/SymmetricRemoteSyncTask.java @@ -20,6 +20,7 @@ package org.apache.cassandra.repair; import java.util.List; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/repair/SyncTask.java b/src/java/org/apache/cassandra/repair/SyncTask.java index a3b1a57493..b6f5ad9d2d 100644 --- a/src/java/org/apache/cassandra/repair/SyncTask.java +++ b/src/java/org/apache/cassandra/repair/SyncTask.java @@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import org.apache.cassandra.utils.concurrent.AsyncFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,6 +35,7 @@ import org.apache.cassandra.repair.messages.RepairMessage; import org.apache.cassandra.repair.messages.SyncRequest; import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.tracing.Tracing; +import org.apache.cassandra.utils.concurrent.AsyncFuture; import static org.apache.cassandra.net.Verb.SYNC_REQ; import static org.apache.cassandra.repair.messages.RepairMessage.notDone; diff --git a/src/java/org/apache/cassandra/repair/Validator.java b/src/java/org/apache/cassandra/repair/Validator.java index c5152aee13..c1147f4a60 100644 --- a/src/java/org/apache/cassandra/repair/Validator.java +++ b/src/java/org/apache/cassandra/repair/Validator.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Random; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/repair/asymmetric/IncomingRepairStreamTracker.java b/src/java/org/apache/cassandra/repair/asymmetric/IncomingRepairStreamTracker.java index 5b4de8c3d1..7b05e4e1a8 100644 --- a/src/java/org/apache/cassandra/repair/asymmetric/IncomingRepairStreamTracker.java +++ b/src/java/org/apache/cassandra/repair/asymmetric/IncomingRepairStreamTracker.java @@ -21,6 +21,7 @@ package org.apache.cassandra.repair.asymmetric; import java.util.Set; import com.google.common.collect.ImmutableMap; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/repair/autorepair/AutoRepair.java b/src/java/org/apache/cassandra/repair/autorepair/AutoRepair.java index 0cfe2fa208..87d342e443 100644 --- a/src/java/org/apache/cassandra/repair/autorepair/AutoRepair.java +++ b/src/java/org/apache/cassandra/repair/autorepair/AutoRepair.java @@ -38,25 +38,24 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.cassandra.repair.RepairCoordinator; -import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.config.DurationSpec; -import org.apache.cassandra.utils.Clock; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; +import org.apache.cassandra.repair.RepairCoordinator; +import org.apache.cassandra.repair.autorepair.AutoRepairUtils.RepairTurn; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.Tables; import org.apache.cassandra.service.AutoRepairService; +import org.apache.cassandra.service.StorageService; +import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.repair.autorepair.AutoRepairUtils.RepairTurn; import org.apache.cassandra.utils.concurrent.Condition; import org.apache.cassandra.utils.concurrent.Future; import org.apache.cassandra.utils.progress.ProgressEvent; diff --git a/src/java/org/apache/cassandra/repair/autorepair/AutoRepairConfig.java b/src/java/org/apache/cassandra/repair/autorepair/AutoRepairConfig.java index 500cbc09be..dd5c0d6ed9 100644 --- a/src/java/org/apache/cassandra/repair/autorepair/AutoRepairConfig.java +++ b/src/java/org/apache/cassandra/repair/autorepair/AutoRepairConfig.java @@ -35,9 +35,9 @@ import com.google.common.collect.Maps; import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.config.ParameterizedClass; -import org.apache.cassandra.utils.LocalizeString; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.LocalizeString; /** * Defines configurations for AutoRepair. diff --git a/src/java/org/apache/cassandra/repair/autorepair/AutoRepairState.java b/src/java/org/apache/cassandra/repair/autorepair/AutoRepairState.java index ef64f24066..6e7a19bc12 100644 --- a/src/java/org/apache/cassandra/repair/autorepair/AutoRepairState.java +++ b/src/java/org/apache/cassandra/repair/autorepair/AutoRepairState.java @@ -18,28 +18,6 @@ package org.apache.cassandra.repair.autorepair; -import com.google.common.annotations.VisibleForTesting; - -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.db.view.TableViews; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; -import org.apache.cassandra.metrics.AutoRepairMetricsManager; -import org.apache.cassandra.metrics.AutoRepairMetrics; -import org.apache.cassandra.repair.RepairCoordinator; -import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType; -import org.apache.cassandra.repair.autorepair.AutoRepairUtils.AutoRepairHistory; -import org.apache.cassandra.repair.RepairParallelism; -import org.apache.cassandra.repair.messages.RepairOption; -import org.apache.cassandra.service.AutoRepairService; -import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.streaming.PreviewKind; -import org.apache.cassandra.utils.Clock; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.text.SimpleDateFormat; import java.util.List; import java.util.Set; @@ -47,6 +25,28 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import java.util.stream.Collectors; +import com.google.common.annotations.VisibleForTesting; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.view.TableViews; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; +import org.apache.cassandra.metrics.AutoRepairMetrics; +import org.apache.cassandra.metrics.AutoRepairMetricsManager; +import org.apache.cassandra.repair.RepairCoordinator; +import org.apache.cassandra.repair.RepairParallelism; +import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType; +import org.apache.cassandra.repair.autorepair.AutoRepairUtils.AutoRepairHistory; +import org.apache.cassandra.repair.messages.RepairOption; +import org.apache.cassandra.service.AutoRepairService; +import org.apache.cassandra.service.StorageService; +import org.apache.cassandra.streaming.PreviewKind; +import org.apache.cassandra.utils.Clock; + /** * AutoRepairState represents the state of automated repair for a given repair type. */ diff --git a/src/java/org/apache/cassandra/repair/autorepair/AutoRepairUtils.java b/src/java/org/apache/cassandra/repair/autorepair/AutoRepairUtils.java index d8c0c52f20..2574e5cfa8 100644 --- a/src/java/org/apache/cassandra/repair/autorepair/AutoRepairUtils.java +++ b/src/java/org/apache/cassandra/repair/autorepair/AutoRepairUtils.java @@ -39,24 +39,14 @@ import java.util.stream.Stream; import javax.annotation.Nullable; +import com.clearspring.analytics.stream.cardinality.CardinalityMergeException; +import com.clearspring.analytics.stream.cardinality.HyperLogLogPlus; +import com.clearspring.analytics.stream.cardinality.ICardinality; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.clearspring.analytics.stream.cardinality.CardinalityMergeException; -import com.clearspring.analytics.stream.cardinality.HyperLogLogPlus; -import com.clearspring.analytics.stream.cardinality.ICardinality; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Splitter; -import org.apache.cassandra.dht.Token; -import org.apache.cassandra.io.sstable.format.SSTableReader; -import org.apache.cassandra.io.sstable.metadata.CompactionMetadata; -import org.apache.cassandra.io.sstable.metadata.MetadataType; -import org.apache.cassandra.locator.EndpointsByRange; -import org.apache.cassandra.locator.EndpointsForRange; -import org.apache.cassandra.locator.LocalStrategy; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,14 +60,24 @@ import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.marshal.UUIDType; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Splitter; +import org.apache.cassandra.dht.Token; import org.apache.cassandra.gms.Gossiper; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.sstable.metadata.CompactionMetadata; +import org.apache.cassandra.io.sstable.metadata.MetadataType; import org.apache.cassandra.locator.AbstractReplicationStrategy; +import org.apache.cassandra.locator.EndpointsByRange; +import org.apache.cassandra.locator.EndpointsForRange; import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.locator.LocalStrategy; import org.apache.cassandra.locator.MetaStrategy; import org.apache.cassandra.locator.NetworkTopologyStrategy; import org.apache.cassandra.locator.RangesAtEndpoint; import org.apache.cassandra.locator.Replica; import org.apache.cassandra.metrics.AutoRepairMetricsManager; +import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.schema.SystemDistributedKeyspace; @@ -99,14 +99,13 @@ import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType; import org.apache.cassandra.utils.NoSpamLogger; import org.apache.cassandra.utils.concurrent.Refs; import static org.apache.cassandra.repair.autorepair.AutoRepairUtils.RepairTurn.MY_TURN; import static org.apache.cassandra.repair.autorepair.AutoRepairUtils.RepairTurn.MY_TURN_DUE_TO_PRIORITY; -import static org.apache.cassandra.repair.autorepair.AutoRepairUtils.RepairTurn.NOT_MY_TURN; import static org.apache.cassandra.repair.autorepair.AutoRepairUtils.RepairTurn.MY_TURN_FORCE_REPAIR; +import static org.apache.cassandra.repair.autorepair.AutoRepairUtils.RepairTurn.NOT_MY_TURN; import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; /** diff --git a/src/java/org/apache/cassandra/repair/autorepair/FixedSplitTokenRangeSplitter.java b/src/java/org/apache/cassandra/repair/autorepair/FixedSplitTokenRangeSplitter.java index 4dd1e409c8..482240adfb 100644 --- a/src/java/org/apache/cassandra/repair/autorepair/FixedSplitTokenRangeSplitter.java +++ b/src/java/org/apache/cassandra/repair/autorepair/FixedSplitTokenRangeSplitter.java @@ -28,10 +28,10 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.service.AutoRepairService; - import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; +import org.apache.cassandra.service.AutoRepairService; + import static org.apache.cassandra.repair.autorepair.AutoRepairUtils.split; /** diff --git a/src/java/org/apache/cassandra/repair/consistent/ConsistentSession.java b/src/java/org/apache/cassandra/repair/consistent/ConsistentSession.java index d5eb5edb31..1546c7cfcc 100644 --- a/src/java/org/apache/cassandra/repair/consistent/ConsistentSession.java +++ b/src/java/org/apache/cassandra/repair/consistent/ConsistentSession.java @@ -31,8 +31,8 @@ import com.google.common.collect.Iterables; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; - import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.repair.messages.FailSession; import org.apache.cassandra.repair.messages.FinalizeCommit; import org.apache.cassandra.repair.messages.FinalizePromise; @@ -44,7 +44,6 @@ import org.apache.cassandra.repair.messages.RepairOption; import org.apache.cassandra.repair.messages.StatusRequest; import org.apache.cassandra.repair.messages.StatusResponse; import org.apache.cassandra.repair.messages.ValidationRequest; -import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.tools.nodetool.RepairAdmin; diff --git a/src/java/org/apache/cassandra/repair/consistent/CoordinatorSession.java b/src/java/org/apache/cassandra/repair/consistent/CoordinatorSession.java index 4e472afde5..3400e07380 100644 --- a/src/java/org/apache/cassandra/repair/consistent/CoordinatorSession.java +++ b/src/java/org/apache/cassandra/repair/consistent/CoordinatorSession.java @@ -29,28 +29,27 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; -import org.apache.cassandra.concurrent.ImmediateExecutor; -import org.apache.cassandra.repair.SharedContext; -import org.apache.cassandra.repair.CoordinatedRepairResult; -import org.apache.cassandra.repair.messages.FinalizePromise; -import org.apache.cassandra.repair.messages.PrepareConsistentResponse; -import org.apache.cassandra.utils.concurrent.AsyncPromise; -import org.apache.cassandra.utils.concurrent.Future; - import org.apache.commons.lang3.time.DurationFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.concurrent.ImmediateExecutor; import org.apache.cassandra.exceptions.RepairException; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.Verb; +import org.apache.cassandra.repair.CoordinatedRepairResult; +import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.repair.SomeRepairFailedException; import org.apache.cassandra.repair.messages.FailSession; import org.apache.cassandra.repair.messages.FinalizeCommit; +import org.apache.cassandra.repair.messages.FinalizePromise; import org.apache.cassandra.repair.messages.FinalizePropose; import org.apache.cassandra.repair.messages.PrepareConsistentRequest; +import org.apache.cassandra.repair.messages.PrepareConsistentResponse; import org.apache.cassandra.service.ActiveRepairService; +import org.apache.cassandra.utils.concurrent.AsyncPromise; +import org.apache.cassandra.utils.concurrent.Future; import org.apache.cassandra.utils.concurrent.ImmediateFuture; import static org.apache.cassandra.repair.messages.RepairMessage.notDone; diff --git a/src/java/org/apache/cassandra/repair/consistent/CoordinatorSessions.java b/src/java/org/apache/cassandra/repair/consistent/CoordinatorSessions.java index 407ad9f788..ab38680898 100644 --- a/src/java/org/apache/cassandra/repair/consistent/CoordinatorSessions.java +++ b/src/java/org/apache/cassandra/repair/consistent/CoordinatorSessions.java @@ -27,15 +27,15 @@ import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.net.Message; -import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.net.Message; +import org.apache.cassandra.repair.NoSuchRepairSessionException; +import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.repair.messages.FailSession; import org.apache.cassandra.repair.messages.FinalizePromise; import org.apache.cassandra.repair.messages.PrepareConsistentResponse; import org.apache.cassandra.repair.messages.RepairMessage; import org.apache.cassandra.service.ActiveRepairService; -import org.apache.cassandra.repair.NoSuchRepairSessionException; import org.apache.cassandra.utils.TimeUUID; import static org.apache.cassandra.repair.messages.RepairMessage.sendFailureResponse; diff --git a/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java b/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java index 04fb7a6cf4..4860609ded 100644 --- a/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java +++ b/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java @@ -39,6 +39,7 @@ import java.util.function.BooleanSupplier; import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; @@ -52,33 +53,33 @@ import com.google.common.collect.Sets; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.FutureCallback; -import org.apache.cassandra.db.compaction.CompactionInterruptedException; -import org.apache.cassandra.locator.RangesAtEndpoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.locator.Replica; -import org.apache.cassandra.net.Verb; -import org.apache.cassandra.repair.KeyspaceRepairManager; -import org.apache.cassandra.repair.consistent.admin.CleanupSummary; -import org.apache.cassandra.repair.consistent.admin.PendingStat; -import org.apache.cassandra.repair.consistent.admin.PendingStats; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.db.marshal.UTF8Type; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; +import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.db.compaction.CompactionInterruptedException; import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; +import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.locator.RangesAtEndpoint; +import org.apache.cassandra.locator.Replica; import org.apache.cassandra.net.Message; +import org.apache.cassandra.net.Verb; +import org.apache.cassandra.repair.KeyspaceRepairManager; +import org.apache.cassandra.repair.NoSuchRepairSessionException; +import org.apache.cassandra.repair.SharedContext; +import org.apache.cassandra.repair.consistent.admin.CleanupSummary; +import org.apache.cassandra.repair.consistent.admin.PendingStat; +import org.apache.cassandra.repair.consistent.admin.PendingStats; import org.apache.cassandra.repair.messages.FailSession; import org.apache.cassandra.repair.messages.FinalizeCommit; import org.apache.cassandra.repair.messages.FinalizePromise; @@ -88,11 +89,11 @@ import org.apache.cassandra.repair.messages.PrepareConsistentResponse; import org.apache.cassandra.repair.messages.RepairMessage; import org.apache.cassandra.repair.messages.StatusRequest; import org.apache.cassandra.repair.messages.StatusResponse; -import org.apache.cassandra.repair.SharedContext; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ActiveRepairService; -import org.apache.cassandra.repair.NoSuchRepairSessionException; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.Throwables; import org.apache.cassandra.utils.TimeUUID; @@ -107,7 +108,12 @@ import static org.apache.cassandra.net.Verb.FINALIZE_PROMISE_MSG; import static org.apache.cassandra.net.Verb.PREPARE_CONSISTENT_RSP; import static org.apache.cassandra.net.Verb.STATUS_REQ; import static org.apache.cassandra.net.Verb.STATUS_RSP; -import static org.apache.cassandra.repair.consistent.ConsistentSession.State.*; +import static org.apache.cassandra.repair.consistent.ConsistentSession.State.FAILED; +import static org.apache.cassandra.repair.consistent.ConsistentSession.State.FINALIZED; +import static org.apache.cassandra.repair.consistent.ConsistentSession.State.FINALIZE_PROMISED; +import static org.apache.cassandra.repair.consistent.ConsistentSession.State.PREPARED; +import static org.apache.cassandra.repair.consistent.ConsistentSession.State.PREPARING; +import static org.apache.cassandra.repair.consistent.ConsistentSession.State.REPAIRING; import static org.apache.cassandra.repair.messages.RepairMessage.always; import static org.apache.cassandra.repair.messages.RepairMessage.sendAck; import static org.apache.cassandra.repair.messages.RepairMessage.sendFailureResponse; diff --git a/src/java/org/apache/cassandra/repair/consistent/admin/PendingStat.java b/src/java/org/apache/cassandra/repair/consistent/admin/PendingStat.java index 0f50e0ef61..ca9f38ea20 100644 --- a/src/java/org/apache/cassandra/repair/consistent/admin/PendingStat.java +++ b/src/java/org/apache/cassandra/repair/consistent/admin/PendingStat.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; + import javax.management.openmbean.ArrayType; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; diff --git a/src/java/org/apache/cassandra/repair/consistent/admin/PendingStats.java b/src/java/org/apache/cassandra/repair/consistent/admin/PendingStats.java index 9fa3fd32b8..65f133c0f9 100644 --- a/src/java/org/apache/cassandra/repair/consistent/admin/PendingStats.java +++ b/src/java/org/apache/cassandra/repair/consistent/admin/PendingStats.java @@ -20,6 +20,7 @@ package org.apache.cassandra.repair.consistent.admin; import java.util.HashMap; import java.util.Map; + import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.CompositeType; diff --git a/src/java/org/apache/cassandra/repair/consistent/admin/RepairStats.java b/src/java/org/apache/cassandra/repair/consistent/admin/RepairStats.java index 6d3e424927..b962f3708b 100644 --- a/src/java/org/apache/cassandra/repair/consistent/admin/RepairStats.java +++ b/src/java/org/apache/cassandra/repair/consistent/admin/RepairStats.java @@ -22,7 +22,14 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.management.openmbean.*; + +import javax.management.openmbean.ArrayType; +import javax.management.openmbean.CompositeData; +import javax.management.openmbean.CompositeDataSupport; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.OpenDataException; +import javax.management.openmbean.OpenType; +import javax.management.openmbean.SimpleType; import com.google.common.base.Preconditions; diff --git a/src/java/org/apache/cassandra/repair/messages/RepairMessage.java b/src/java/org/apache/cassandra/repair/messages/RepairMessage.java index c615bf9f52..644245aad3 100644 --- a/src/java/org/apache/cassandra/repair/messages/RepairMessage.java +++ b/src/java/org/apache/cassandra/repair/messages/RepairMessage.java @@ -25,26 +25,28 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterators; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.RepairRetrySpec; import org.apache.cassandra.config.RetrySpec; -import org.apache.cassandra.exceptions.RequestFailure; -import org.apache.cassandra.metrics.RepairMetrics; -import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.exceptions.RepairException; +import org.apache.cassandra.exceptions.RequestFailure; import org.apache.cassandra.exceptions.RequestFailureReason; import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.metrics.RepairMetrics; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.RequestCallback; import org.apache.cassandra.net.Verb; import org.apache.cassandra.repair.RepairJobDesc; +import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.service.WaitStrategy; import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.utils.CassandraVersion; diff --git a/src/java/org/apache/cassandra/repair/messages/RepairOption.java b/src/java/org/apache/cassandra/repair/messages/RepairOption.java index 4cbff03657..7b2d5422ee 100644 --- a/src/java/org/apache/cassandra/repair/messages/RepairOption.java +++ b/src/java/org/apache/cassandra/repair/messages/RepairOption.java @@ -26,6 +26,7 @@ import java.util.Set; import java.util.StringTokenizer; import com.google.common.base.Joiner; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/schema/AutoRepairParams.java b/src/java/org/apache/cassandra/schema/AutoRepairParams.java index 1fe80f766f..f8bfd8407c 100644 --- a/src/java/org/apache/cassandra/schema/AutoRepairParams.java +++ b/src/java/org/apache/cassandra/schema/AutoRepairParams.java @@ -24,6 +24,7 @@ import java.util.TreeMap; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableMap; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.exceptions.ConfigurationException; diff --git a/src/java/org/apache/cassandra/schema/CQLTypeParser.java b/src/java/org/apache/cassandra/schema/CQLTypeParser.java index ef1af7fda3..bcd8252204 100644 --- a/src/java/org/apache/cassandra/schema/CQLTypeParser.java +++ b/src/java/org/apache/cassandra/schema/CQLTypeParser.java @@ -19,7 +19,9 @@ package org.apache.cassandra.schema; import com.google.common.collect.ImmutableSet; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.CQLFragmentParser; +import org.apache.cassandra.cql3.CqlParser; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.UserType; diff --git a/src/java/org/apache/cassandra/schema/CachingParams.java b/src/java/org/apache/cassandra/schema/CachingParams.java index f06eadb8db..78f690657b 100644 --- a/src/java/org/apache/cassandra/schema/CachingParams.java +++ b/src/java/org/apache/cassandra/schema/CachingParams.java @@ -23,6 +23,7 @@ import java.util.Map; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.exceptions.ConfigurationException; diff --git a/src/java/org/apache/cassandra/schema/ColumnMetadata.java b/src/java/org/apache/cassandra/schema/ColumnMetadata.java index d6ffa1c1ca..d10b6faefd 100644 --- a/src/java/org/apache/cassandra/schema/ColumnMetadata.java +++ b/src/java/org/apache/cassandra/schema/ColumnMetadata.java @@ -35,6 +35,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; + import org.github.jamm.Unmetered; import org.apache.cassandra.cql3.ColumnIdentifier; diff --git a/src/java/org/apache/cassandra/schema/CompactionParams.java b/src/java/org/apache/cassandra/schema/CompactionParams.java index e082be487b..259c2a2d8f 100644 --- a/src/java/org/apache/cassandra/schema/CompactionParams.java +++ b/src/java/org/apache/cassandra/schema/CompactionParams.java @@ -26,6 +26,7 @@ import java.util.Optional; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableMap; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/schema/CompressionParams.java b/src/java/org/apache/cassandra/schema/CompressionParams.java index fdf184e94d..751bb334ac 100644 --- a/src/java/org/apache/cassandra/schema/CompressionParams.java +++ b/src/java/org/apache/cassandra/schema/CompressionParams.java @@ -35,7 +35,14 @@ import org.apache.cassandra.config.ParameterizedClass; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.IVersionedSerializer; -import org.apache.cassandra.io.compress.*; +import org.apache.cassandra.io.compress.DeflateCompressor; +import org.apache.cassandra.io.compress.ICompressor; +import org.apache.cassandra.io.compress.IDictionaryCompressor; +import org.apache.cassandra.io.compress.LZ4Compressor; +import org.apache.cassandra.io.compress.NoopCompressor; +import org.apache.cassandra.io.compress.SnappyCompressor; +import org.apache.cassandra.io.compress.ZstdCompressor; +import org.apache.cassandra.io.compress.ZstdDictionaryCompressor; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.net.MessagingService; diff --git a/src/java/org/apache/cassandra/schema/DistributedSchema.java b/src/java/org/apache/cassandra/schema/DistributedSchema.java index 1266d9b4c3..7abcc360a3 100644 --- a/src/java/org/apache/cassandra/schema/DistributedSchema.java +++ b/src/java/org/apache/cassandra/schema/DistributedSchema.java @@ -18,9 +18,22 @@ package org.apache.cassandra.schema; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; + import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; + import org.apache.cassandra.auth.AuthKeyspace; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.functions.UserFunction; @@ -38,18 +51,6 @@ import org.apache.cassandra.tracing.TraceKeyspace; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; - import static org.apache.cassandra.db.TypeSizes.sizeof; /** diff --git a/src/java/org/apache/cassandra/schema/IndexMetadata.java b/src/java/org/apache/cassandra/schema/IndexMetadata.java index 0eee4f7832..585f51e7df 100644 --- a/src/java/org/apache/cassandra/schema/IndexMetadata.java +++ b/src/java/org/apache/cassandra/schema/IndexMetadata.java @@ -33,6 +33,7 @@ import java.util.stream.Collectors; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; + import org.apache.commons.lang3.builder.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,9 +55,9 @@ import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.UUIDSerializer; import static org.apache.cassandra.db.TypeSizes.sizeof; -import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; import static org.apache.cassandra.schema.SchemaConstants.PATTERN_NON_WORD_CHAR; import static org.apache.cassandra.schema.SchemaConstants.isValidCharsName; +import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; /** * An immutable representation of secondary index metadata. diff --git a/src/java/org/apache/cassandra/schema/Indexes.java b/src/java/org/apache/cassandra/schema/Indexes.java index 0282cfc666..517d27d800 100644 --- a/src/java/org/apache/cassandra/schema/Indexes.java +++ b/src/java/org/apache/cassandra/schema/Indexes.java @@ -18,7 +18,9 @@ package org.apache.cassandra.schema; import java.io.IOException; -import java.util.*; +import java.util.Iterator; +import java.util.Optional; +import java.util.UUID; import java.util.stream.Stream; import com.google.common.collect.ImmutableMap; @@ -28,9 +30,8 @@ import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.tcm.serialization.MetadataSerializer; import org.apache.cassandra.tcm.serialization.Version; -import static java.lang.String.format; - import static com.google.common.collect.Iterables.filter; +import static java.lang.String.format; import static org.apache.cassandra.db.TypeSizes.sizeof; /** diff --git a/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java b/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java index 32e3eed97e..5239790b19 100644 --- a/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java +++ b/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java @@ -44,13 +44,13 @@ import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.locator.AbstractReplicationStrategy; +import org.apache.cassandra.schema.Tables.TablesDiff; +import org.apache.cassandra.schema.Types.TypesDiff; import org.apache.cassandra.schema.UserFunctions.FunctionsDiff; +import org.apache.cassandra.schema.Views.ViewsDiff; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.MetadataSerializer; import org.apache.cassandra.tcm.serialization.Version; -import org.apache.cassandra.schema.Tables.TablesDiff; -import org.apache.cassandra.schema.Types.TypesDiff; -import org.apache.cassandra.schema.Views.ViewsDiff; import static com.google.common.collect.Iterables.any; import static java.lang.String.format; diff --git a/src/java/org/apache/cassandra/schema/KeyspaceParams.java b/src/java/org/apache/cassandra/schema/KeyspaceParams.java index 128d2f88ff..4f41235367 100644 --- a/src/java/org/apache/cassandra/schema/KeyspaceParams.java +++ b/src/java/org/apache/cassandra/schema/KeyspaceParams.java @@ -24,10 +24,10 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import org.apache.cassandra.service.ClientState; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.accord.fastpath.FastPathStrategy; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.MetadataSerializer; diff --git a/src/java/org/apache/cassandra/schema/Keyspaces.java b/src/java/org/apache/cassandra/schema/Keyspaces.java index 151d5a5db0..e671453a6e 100644 --- a/src/java/org/apache/cassandra/schema/Keyspaces.java +++ b/src/java/org/apache/cassandra/schema/Keyspaces.java @@ -27,7 +27,7 @@ import java.util.stream.Stream; import javax.annotation.Nullable; -import com.google.common.collect.*; +import com.google.common.collect.ImmutableList; import org.apache.cassandra.schema.KeyspaceMetadata.KeyspaceDiff; import org.apache.cassandra.tcm.ClusterMetadata; diff --git a/src/java/org/apache/cassandra/schema/PartitionDenylist.java b/src/java/org/apache/cassandra/schema/PartitionDenylist.java index f0f7ec1d52..92523616cb 100644 --- a/src/java/org/apache/cassandra/schema/PartitionDenylist.java +++ b/src/java/org/apache/cassandra/schema/PartitionDenylist.java @@ -29,14 +29,15 @@ import java.util.TreeSet; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSortedSet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSortedSet; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.UntypedResultSet; diff --git a/src/java/org/apache/cassandra/schema/Schema.java b/src/java/org/apache/cassandra/schema/Schema.java index fcfae3f151..e9b6210275 100644 --- a/src/java/org/apache/cassandra/schema/Schema.java +++ b/src/java/org/apache/cassandra/schema/Schema.java @@ -26,6 +26,7 @@ import java.util.function.Supplier; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; + import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/schema/SchemaEvent.java b/src/java/org/apache/cassandra/schema/SchemaEvent.java index 3473c75191..eeb7190484 100644 --- a/src/java/org/apache/cassandra/schema/SchemaEvent.java +++ b/src/java/org/apache/cassandra/schema/SchemaEvent.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; import java.util.stream.StreamSupport; + import javax.annotation.Nullable; import com.google.common.collect.ImmutableCollection; diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java index 9001480c24..f8057ed8b7 100644 --- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java +++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java @@ -19,51 +19,98 @@ package org.apache.cassandra.schema; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import javax.annotation.concurrent.NotThreadSafe; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.*; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.MapDifference; +import com.google.common.collect.Maps; +import org.antlr.runtime.RecognitionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.antlr.runtime.RecognitionException; -import org.apache.cassandra.config.*; -import org.apache.cassandra.cql3.*; -import org.apache.cassandra.cql3.functions.*; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.cql3.FieldIdentifier; +import org.apache.cassandra.cql3.UntypedResultSet; +import org.apache.cassandra.cql3.WhereClause; +import org.apache.cassandra.cql3.functions.Function; +import org.apache.cassandra.cql3.functions.FunctionName; +import org.apache.cassandra.cql3.functions.FunctionResolver; +import org.apache.cassandra.cql3.functions.ScalarFunction; +import org.apache.cassandra.cql3.functions.UDAggregate; +import org.apache.cassandra.cql3.functions.UDFunction; +import org.apache.cassandra.cql3.functions.UserFunction; import org.apache.cassandra.cql3.functions.masking.ColumnMask; import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.Digest; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.Mutation; +import org.apache.cassandra.db.PartitionRangeReadCommand; +import org.apache.cassandra.db.ReadCommand; +import org.apache.cassandra.db.ReadExecutionController; import org.apache.cassandra.db.filter.ColumnFilter; -import org.apache.cassandra.db.marshal.*; -import org.apache.cassandra.db.partitions.*; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.BooleanType; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.ReversedType; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.marshal.UserType; +import org.apache.cassandra.db.partitions.PartitionIterator; +import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.RowIterator; +import org.apache.cassandra.db.rows.RowIterators; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.service.accord.fastpath.FastPathStrategy; -import org.apache.cassandra.service.reads.SpeculativeRetryPolicy; import org.apache.cassandra.schema.ColumnMetadata.ClusteringOrder; import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff; +import org.apache.cassandra.service.accord.fastpath.FastPathStrategy; +import org.apache.cassandra.service.reads.SpeculativeRetryPolicy; import org.apache.cassandra.service.reads.repair.ReadRepairStrategy; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Simulate; import static java.lang.String.format; - import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; - import static org.apache.cassandra.config.CassandraRelevantProperties.IGNORE_CORRUPTED_SCHEMA_TABLES; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_FLUSH_LOCAL_SCHEMA_CHANGES; import static org.apache.cassandra.cql3.QueryProcessor.executeInternal; import static org.apache.cassandra.cql3.QueryProcessor.executeOnceInternal; import static org.apache.cassandra.schema.ColumnMetadata.NO_UNIQUE_ID; -import static org.apache.cassandra.schema.SchemaKeyspaceTables.*; +import static org.apache.cassandra.schema.SchemaKeyspaceTables.AGGREGATES; +import static org.apache.cassandra.schema.SchemaKeyspaceTables.ALL; +import static org.apache.cassandra.schema.SchemaKeyspaceTables.COLUMNS; +import static org.apache.cassandra.schema.SchemaKeyspaceTables.COLUMN_MASKS; +import static org.apache.cassandra.schema.SchemaKeyspaceTables.DROPPED_COLUMNS; +import static org.apache.cassandra.schema.SchemaKeyspaceTables.FUNCTIONS; +import static org.apache.cassandra.schema.SchemaKeyspaceTables.INDEXES; +import static org.apache.cassandra.schema.SchemaKeyspaceTables.KEYSPACES; +import static org.apache.cassandra.schema.SchemaKeyspaceTables.TABLES; +import static org.apache.cassandra.schema.SchemaKeyspaceTables.TRIGGERS; +import static org.apache.cassandra.schema.SchemaKeyspaceTables.TYPES; +import static org.apache.cassandra.schema.SchemaKeyspaceTables.VIEWS; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized; import static org.apache.cassandra.utils.Simulate.With.GLOBAL_CLOCK; diff --git a/src/java/org/apache/cassandra/schema/SchemaProvider.java b/src/java/org/apache/cassandra/schema/SchemaProvider.java index 868d357d67..f6d12346b9 100644 --- a/src/java/org/apache/cassandra/schema/SchemaProvider.java +++ b/src/java/org/apache/cassandra/schema/SchemaProvider.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Optional; import java.util.Set; import java.util.UUID; + import javax.annotation.Nullable; import org.apache.cassandra.cql3.ColumnIdentifier; diff --git a/src/java/org/apache/cassandra/schema/SchemaTransformation.java b/src/java/org/apache/cassandra/schema/SchemaTransformation.java index 38b66434bb..b30770a132 100644 --- a/src/java/org/apache/cassandra/schema/SchemaTransformation.java +++ b/src/java/org/apache/cassandra/schema/SchemaTransformation.java @@ -25,10 +25,10 @@ import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; -import org.apache.cassandra.tcm.serialization.MetadataSerializer; -import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.tcm.ClusterMetadata; +import org.apache.cassandra.tcm.serialization.MetadataSerializer; +import org.apache.cassandra.tcm.serialization.Version; public interface SchemaTransformation { diff --git a/src/java/org/apache/cassandra/schema/SystemDistributedKeyspace.java b/src/java/org/apache/cassandra/schema/SystemDistributedKeyspace.java index 0a29e72961..04ccb54345 100644 --- a/src/java/org/apache/cassandra/schema/SystemDistributedKeyspace.java +++ b/src/java/org/apache/cassandra/schema/SystemDistributedKeyspace.java @@ -39,6 +39,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,10 +51,10 @@ import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.compression.CompressionDictionary; import org.apache.cassandra.db.compression.CompressionDictionary.LightweightCompressionDictionary; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.db.compression.CompressionDictionary; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.repair.CommonRange; import org.apache.cassandra.repair.messages.RepairOption; diff --git a/src/java/org/apache/cassandra/schema/TableId.java b/src/java/org/apache/cassandra/schema/TableId.java index 7cebcf2c66..fa1cdd5a71 100644 --- a/src/java/org/apache/cassandra/schema/TableId.java +++ b/src/java/org/apache/cassandra/schema/TableId.java @@ -26,15 +26,15 @@ import java.util.function.LongUnaryOperator; import javax.annotation.Nullable; -import org.apache.cassandra.io.UnversionedSerializer; -import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.commons.lang3.ArrayUtils; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.io.IVersionedSerializer; +import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.MetadataSerializer; import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/schema/TableMetadata.java b/src/java/org/apache/cassandra/schema/TableMetadata.java index 1c5b577793..9589062c8b 100644 --- a/src/java/org/apache/cassandra/schema/TableMetadata.java +++ b/src/java/org/apache/cassandra/schema/TableMetadata.java @@ -32,6 +32,7 @@ import java.util.Map.Entry; import java.util.Objects; import java.util.Optional; import java.util.Set; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -44,14 +45,17 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import org.github.jamm.Unmetered; + import accord.utils.Invariants; + import org.apache.cassandra.auth.DataResource; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.constraints.ColumnConstraint; -import org.apache.cassandra.cql3.constraints.ColumnConstraints; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.CqlBuilder; import org.apache.cassandra.cql3.SchemaElement; +import org.apache.cassandra.cql3.constraints.ColumnConstraint; +import org.apache.cassandra.cql3.constraints.ColumnConstraints; import org.apache.cassandra.cql3.constraints.InvalidConstraintDefinitionException; import org.apache.cassandra.cql3.constraints.NotNullConstraint; import org.apache.cassandra.cql3.functions.Function; @@ -82,7 +86,6 @@ import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.utils.AbstractIterator; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import org.github.jamm.Unmetered; import static accord.utils.Invariants.require; import static com.google.common.collect.Iterables.any; diff --git a/src/java/org/apache/cassandra/schema/TableParams.java b/src/java/org/apache/cassandra/schema/TableParams.java index e5f51859a4..abc8714c67 100644 --- a/src/java/org/apache/cassandra/schema/TableParams.java +++ b/src/java/org/apache/cassandra/schema/TableParams.java @@ -45,9 +45,9 @@ import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.utils.BloomCalculations; import org.apache.cassandra.utils.ByteBufferUtil; +import static com.google.common.base.Preconditions.checkNotNull; import static java.lang.String.format; import static java.util.stream.Collectors.toMap; -import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.cassandra.db.TypeSizes.sizeof; import static org.apache.cassandra.db.TypeSizes.sizeofUnsignedVInt; import static org.apache.cassandra.schema.TableParams.Option.ADDITIONAL_WRITE_POLICY; diff --git a/src/java/org/apache/cassandra/schema/Tables.java b/src/java/org/apache/cassandra/schema/Tables.java index 74d8a90191..f0e7ad03e5 100644 --- a/src/java/org/apache/cassandra/schema/Tables.java +++ b/src/java/org/apache/cassandra/schema/Tables.java @@ -29,7 +29,12 @@ import java.util.stream.StreamSupport; import javax.annotation.Nullable; -import com.google.common.collect.*; +import com.google.common.collect.ImmutableCollection; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.google.common.collect.MapDifference; +import com.google.common.collect.Maps; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.marshal.UserType; diff --git a/src/java/org/apache/cassandra/schema/Types.java b/src/java/org/apache/cassandra/schema/Types.java index d9c22b94ee..43f3a23afc 100644 --- a/src/java/org/apache/cassandra/schema/Types.java +++ b/src/java/org/apache/cassandra/schema/Types.java @@ -19,7 +19,18 @@ package org.apache.cassandra.schema; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Queue; +import java.util.Set; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Stream; @@ -27,10 +38,17 @@ import java.util.stream.StreamSupport; import javax.annotation.Nullable; -import com.google.common.collect.*; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableCollection; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSortedMap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; +import com.google.common.collect.Multimap; -import org.apache.cassandra.cql3.FieldIdentifier; import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.FieldIdentifier; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.exceptions.ConfigurationException; @@ -38,12 +56,10 @@ import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.tcm.serialization.Version; -import static java.lang.String.format; -import static java.util.stream.Collectors.toList; - import static com.google.common.collect.Iterables.any; import static com.google.common.collect.Iterables.transform; - +import static java.lang.String.format; +import static java.util.stream.Collectors.toList; import static org.apache.cassandra.db.TypeSizes.sizeof; import static org.apache.cassandra.db.TypeSizes.sizeofUnsignedVInt; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; diff --git a/src/java/org/apache/cassandra/schema/UserFunctions.java b/src/java/org/apache/cassandra/schema/UserFunctions.java index b8823d7d85..4b284959ec 100644 --- a/src/java/org/apache/cassandra/schema/UserFunctions.java +++ b/src/java/org/apache/cassandra/schema/UserFunctions.java @@ -19,14 +19,26 @@ package org.apache.cassandra.schema; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Optional; import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.google.common.collect.*; +import com.google.common.collect.ImmutableCollection; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.Iterables; -import org.apache.cassandra.cql3.functions.*; +import org.apache.cassandra.cql3.functions.Function; +import org.apache.cassandra.cql3.functions.FunctionName; +import org.apache.cassandra.cql3.functions.UDAggregate; +import org.apache.cassandra.cql3.functions.UDFunction; +import org.apache.cassandra.cql3.functions.UserFunction; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.io.util.DataInputPlus; @@ -35,9 +47,8 @@ import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.serialization.UDTAwareMetadataSerializer; import org.apache.cassandra.tcm.serialization.Version; -import static java.util.stream.Collectors.toList; - import static com.google.common.collect.Iterables.any; +import static java.util.stream.Collectors.toList; import static org.apache.cassandra.db.TypeSizes.sizeof; /** diff --git a/src/java/org/apache/cassandra/schema/ViewMetadata.java b/src/java/org/apache/cassandra/schema/ViewMetadata.java index e20ae25ea0..a4b6448e8d 100644 --- a/src/java/org/apache/cassandra/schema/ViewMetadata.java +++ b/src/java/org/apache/cassandra/schema/ViewMetadata.java @@ -23,11 +23,14 @@ import java.util.Optional; import javax.annotation.Nullable; +import org.antlr.runtime.RecognitionException; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; -import org.antlr.runtime.RecognitionException; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.cql3.CqlBuilder; +import org.apache.cassandra.cql3.SchemaElement; +import org.apache.cassandra.cql3.WhereClause; import org.apache.cassandra.cql3.functions.masking.ColumnMask; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.marshal.UserType; diff --git a/src/java/org/apache/cassandra/schema/Views.java b/src/java/org/apache/cassandra/schema/Views.java index dc5e7556d0..fd6e096036 100644 --- a/src/java/org/apache/cassandra/schema/Views.java +++ b/src/java/org/apache/cassandra/schema/Views.java @@ -28,7 +28,10 @@ import java.util.stream.StreamSupport; import javax.annotation.Nullable; -import com.google.common.collect.*; +import com.google.common.collect.ImmutableCollection; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/security/AbstractCryptoProvider.java b/src/java/org/apache/cassandra/security/AbstractCryptoProvider.java index 1c437e6f2d..8914c0d999 100644 --- a/src/java/org/apache/cassandra/security/AbstractCryptoProvider.java +++ b/src/java/org/apache/cassandra/security/AbstractCryptoProvider.java @@ -18,18 +18,18 @@ package org.apache.cassandra.security; -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.utils.FBUtilities; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.security.Provider; import java.security.Security; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.utils.FBUtilities; + import static java.lang.String.format; import static org.apache.cassandra.config.CassandraRelevantProperties.FAIL_ON_MISSING_CRYPTO_PROVIDER; diff --git a/src/java/org/apache/cassandra/security/AbstractSslContextFactory.java b/src/java/org/apache/cassandra/security/AbstractSslContextFactory.java index 0fc8f94352..d04c4d0343 100644 --- a/src/java/org/apache/cassandra/security/AbstractSslContextFactory.java +++ b/src/java/org/apache/cassandra/security/AbstractSslContextFactory.java @@ -21,6 +21,7 @@ package org.apache.cassandra.security; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLException; @@ -29,18 +30,18 @@ import javax.net.ssl.TrustManagerFactory; import com.google.common.collect.ImmutableList; +import org.apache.cassandra.config.EncryptionOptions; + import io.netty.handler.ssl.CipherSuiteFilter; import io.netty.handler.ssl.ClientAuth; import io.netty.handler.ssl.OpenSsl; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslProvider; -import org.apache.cassandra.config.EncryptionOptions; - -import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.NOT_REQUIRED; -import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.REQUIRED; import static org.apache.cassandra.config.CassandraRelevantProperties.DISABLE_TCACTIVE_OPENSSL; +import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.NOT_REQUIRED; +import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.REQUIRED; /** * Abstract class implementing {@code ISslContextFacotry} to provide most of the functionality that any diff --git a/src/java/org/apache/cassandra/security/CipherFactory.java b/src/java/org/apache/cassandra/security/CipherFactory.java index 4674fd17cd..b214976cc4 100644 --- a/src/java/org/apache/cassandra/security/CipherFactory.java +++ b/src/java/org/apache/cassandra/security/CipherFactory.java @@ -26,22 +26,23 @@ import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Arrays; import java.util.concurrent.CompletionException; + import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.IvParameterSpec; -import com.google.common.annotations.VisibleForTesting; - import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; +import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.concurrent.ImmediateExecutor; import org.apache.cassandra.config.TransparentDataEncryptionOptions; +import io.netty.util.concurrent.FastThreadLocal; + /** * A factory for loading encryption keys from {@link KeyProvider} instances. * Maintains a cache of loaded keys to avoid invoking the key provider on every call. diff --git a/src/java/org/apache/cassandra/security/DefaultCryptoProvider.java b/src/java/org/apache/cassandra/security/DefaultCryptoProvider.java index ac7ef2c652..cf83740d55 100644 --- a/src/java/org/apache/cassandra/security/DefaultCryptoProvider.java +++ b/src/java/org/apache/cassandra/security/DefaultCryptoProvider.java @@ -19,6 +19,7 @@ package org.apache.cassandra.security; import java.util.Map; + import javax.crypto.Cipher; import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; diff --git a/src/java/org/apache/cassandra/security/EncryptionContext.java b/src/java/org/apache/cassandra/security/EncryptionContext.java index 8176d6001d..6b2ec09320 100644 --- a/src/java/org/apache/cassandra/security/EncryptionContext.java +++ b/src/java/org/apache/cassandra/security/EncryptionContext.java @@ -22,6 +22,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; + import javax.crypto.Cipher; import com.google.common.annotations.VisibleForTesting; diff --git a/src/java/org/apache/cassandra/security/EncryptionUtils.java b/src/java/org/apache/cassandra/security/EncryptionUtils.java index d5300b5012..48868f73c4 100644 --- a/src/java/org/apache/cassandra/security/EncryptionUtils.java +++ b/src/java/org/apache/cassandra/security/EncryptionUtils.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; @@ -28,13 +29,14 @@ import javax.crypto.ShortBufferException; import com.google.common.base.Preconditions; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.db.commitlog.EncryptedSegment; import org.apache.cassandra.io.compress.ICompressor; import org.apache.cassandra.io.util.ChannelProxy; import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.utils.ByteBufferUtil; +import io.netty.util.concurrent.FastThreadLocal; + /** * Encryption and decryption functions specific to the commit log. * See comments in {@link EncryptedSegment} for details on the binary format. diff --git a/src/java/org/apache/cassandra/security/FileBasedSslContextFactory.java b/src/java/org/apache/cassandra/security/FileBasedSslContextFactory.java index e0867493d7..ce9d28e3b3 100644 --- a/src/java/org/apache/cassandra/security/FileBasedSslContextFactory.java +++ b/src/java/org/apache/cassandra/security/FileBasedSslContextFactory.java @@ -28,6 +28,7 @@ import java.util.Date; import java.util.Enumeration; import java.util.List; import java.util.Map; + import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLException; import javax.net.ssl.TrustManagerFactory; diff --git a/src/java/org/apache/cassandra/security/ISslContextFactory.java b/src/java/org/apache/cassandra/security/ISslContextFactory.java index 2f8b53d166..117320add3 100644 --- a/src/java/org/apache/cassandra/security/ISslContextFactory.java +++ b/src/java/org/apache/cassandra/security/ISslContextFactory.java @@ -19,12 +19,14 @@ package org.apache.cassandra.security; import java.util.List; + import javax.net.ssl.SSLContext; import javax.net.ssl.SSLException; +import org.apache.cassandra.config.EncryptionOptions; + import io.netty.handler.ssl.CipherSuiteFilter; import io.netty.handler.ssl.SslContext; -import org.apache.cassandra.config.EncryptionOptions; /** * The purpose of this interface is to provide pluggable mechanism for creating custom JSSE and Netty SSLContext diff --git a/src/java/org/apache/cassandra/security/JKSKeyProvider.java b/src/java/org/apache/cassandra/security/JKSKeyProvider.java index eedacba39f..9f7688fa2a 100644 --- a/src/java/org/apache/cassandra/security/JKSKeyProvider.java +++ b/src/java/org/apache/cassandra/security/JKSKeyProvider.java @@ -17,9 +17,9 @@ */ package org.apache.cassandra.security; -import java.nio.file.Files; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; import java.security.Key; import java.security.KeyStore; diff --git a/src/java/org/apache/cassandra/security/PEMBasedSslContextFactory.java b/src/java/org/apache/cassandra/security/PEMBasedSslContextFactory.java index 3e0a89563c..a534129bc2 100644 --- a/src/java/org/apache/cassandra/security/PEMBasedSslContextFactory.java +++ b/src/java/org/apache/cassandra/security/PEMBasedSslContextFactory.java @@ -27,6 +27,7 @@ import java.security.cert.Certificate; import java.util.ArrayList; import java.util.List; import java.util.Map; + import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLException; import javax.net.ssl.TrustManagerFactory; diff --git a/src/java/org/apache/cassandra/security/PEMReader.java b/src/java/org/apache/cassandra/security/PEMReader.java index aaeeab82e0..879b3f9cfd 100644 --- a/src/java/org/apache/cassandra/security/PEMReader.java +++ b/src/java/org/apache/cassandra/security/PEMReader.java @@ -35,6 +35,7 @@ import java.util.List; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.EncryptedPrivateKeyInfo; @@ -42,6 +43,7 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; import com.google.common.collect.ImmutableSet; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/security/SSLFactory.java b/src/java/org/apache/cassandra/security/SSLFactory.java index 65a6dfa24f..be3b66b1a8 100644 --- a/src/java/org/apache/cassandra/security/SSLFactory.java +++ b/src/java/org/apache/cassandra/security/SSLFactory.java @@ -28,6 +28,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; + import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLParameters; @@ -36,17 +37,17 @@ import javax.net.ssl.SSLSocket; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.concurrent.ScheduledExecutors; +import org.apache.cassandra.config.EncryptionOptions; +import org.apache.cassandra.security.ISslContextFactory.SocketType; + import io.netty.buffer.ByteBufAllocator; import io.netty.handler.ssl.CipherSuiteFilter; import io.netty.handler.ssl.OpenSsl; import io.netty.handler.ssl.SslContext; import io.netty.util.ReferenceCountUtil; -import org.apache.cassandra.concurrent.ScheduledExecutors; -import org.apache.cassandra.config.EncryptionOptions; -import org.apache.cassandra.security.ISslContextFactory.SocketType; import static org.apache.cassandra.config.CassandraRelevantProperties.DISABLE_TCACTIVE_OPENSSL; - import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.REQUIRED; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; diff --git a/src/java/org/apache/cassandra/security/ThreadAwareSecurityManager.java b/src/java/org/apache/cassandra/security/ThreadAwareSecurityManager.java index 65793a63a1..8639b46ffb 100644 --- a/src/java/org/apache/cassandra/security/ThreadAwareSecurityManager.java +++ b/src/java/org/apache/cassandra/security/ThreadAwareSecurityManager.java @@ -33,10 +33,11 @@ import java.util.Enumeration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.utils.logging.LoggingSupportFactory; +import io.netty.util.concurrent.FastThreadLocal; + /** * Custom {@link SecurityManager} and {@link Policy} implementation that only performs access checks * if explicitly enabled. diff --git a/src/java/org/apache/cassandra/serializers/BytesSerializer.java b/src/java/org/apache/cassandra/serializers/BytesSerializer.java index 1c60733ceb..c5e10935e9 100644 --- a/src/java/org/apache/cassandra/serializers/BytesSerializer.java +++ b/src/java/org/apache/cassandra/serializers/BytesSerializer.java @@ -18,11 +18,11 @@ package org.apache.cassandra.serializers; +import java.nio.ByteBuffer; + import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.utils.ByteBufferUtil; -import java.nio.ByteBuffer; - public class BytesSerializer extends TypeSerializer { public static final BytesSerializer instance = new BytesSerializer(); diff --git a/src/java/org/apache/cassandra/serializers/CollectionSerializer.java b/src/java/org/apache/cassandra/serializers/CollectionSerializer.java index 6d38f2a781..8d18333e45 100644 --- a/src/java/org/apache/cassandra/serializers/CollectionSerializer.java +++ b/src/java/org/apache/cassandra/serializers/CollectionSerializer.java @@ -28,9 +28,9 @@ import java.util.function.Consumer; import com.google.common.collect.Range; import org.apache.cassandra.db.TypeSizes; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.ValueAccessor; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.utils.ByteBufferUtil; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; diff --git a/src/java/org/apache/cassandra/serializers/DecimalSerializer.java b/src/java/org/apache/cassandra/serializers/DecimalSerializer.java index d0666ff9de..6a23428701 100644 --- a/src/java/org/apache/cassandra/serializers/DecimalSerializer.java +++ b/src/java/org/apache/cassandra/serializers/DecimalSerializer.java @@ -17,13 +17,13 @@ */ package org.apache.cassandra.serializers; -import org.apache.cassandra.db.marshal.ValueAccessor; -import org.apache.cassandra.utils.ByteBufferUtil; - import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; +import org.apache.cassandra.db.marshal.ValueAccessor; +import org.apache.cassandra.utils.ByteBufferUtil; + public class DecimalSerializer extends TypeSerializer { public static final DecimalSerializer instance = new DecimalSerializer(); diff --git a/src/java/org/apache/cassandra/serializers/DurationSerializer.java b/src/java/org/apache/cassandra/serializers/DurationSerializer.java index 78326e17ab..d79d0af63e 100644 --- a/src/java/org/apache/cassandra/serializers/DurationSerializer.java +++ b/src/java/org/apache/cassandra/serializers/DurationSerializer.java @@ -17,6 +17,9 @@ */ package org.apache.cassandra.serializers; +import java.io.IOException; +import java.nio.ByteBuffer; + import org.apache.cassandra.cql3.Duration; import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.io.util.DataInputBuffer; @@ -24,9 +27,6 @@ import org.apache.cassandra.io.util.DataOutputBufferFixed; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.vint.VIntCoding; -import java.io.IOException; -import java.nio.ByteBuffer; - public final class DurationSerializer extends TypeSerializer { public static final DurationSerializer instance = new DurationSerializer(); diff --git a/src/java/org/apache/cassandra/serializers/InetAddressSerializer.java b/src/java/org/apache/cassandra/serializers/InetAddressSerializer.java index ba9e63f79f..f9d8aacaa3 100644 --- a/src/java/org/apache/cassandra/serializers/InetAddressSerializer.java +++ b/src/java/org/apache/cassandra/serializers/InetAddressSerializer.java @@ -18,13 +18,13 @@ package org.apache.cassandra.serializers; -import org.apache.cassandra.db.marshal.ValueAccessor; -import org.apache.cassandra.utils.ByteBufferUtil; - import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.ByteBuffer; +import org.apache.cassandra.db.marshal.ValueAccessor; +import org.apache.cassandra.utils.ByteBufferUtil; + public class InetAddressSerializer extends TypeSerializer { public static final InetAddressSerializer instance = new InetAddressSerializer(); diff --git a/src/java/org/apache/cassandra/serializers/IntegerSerializer.java b/src/java/org/apache/cassandra/serializers/IntegerSerializer.java index c3538ffc2a..17ab5476ff 100644 --- a/src/java/org/apache/cassandra/serializers/IntegerSerializer.java +++ b/src/java/org/apache/cassandra/serializers/IntegerSerializer.java @@ -18,12 +18,12 @@ package org.apache.cassandra.serializers; -import org.apache.cassandra.db.marshal.ValueAccessor; -import org.apache.cassandra.utils.ByteBufferUtil; - import java.math.BigInteger; import java.nio.ByteBuffer; +import org.apache.cassandra.db.marshal.ValueAccessor; +import org.apache.cassandra.utils.ByteBufferUtil; + public class IntegerSerializer extends TypeSerializer { public static final IntegerSerializer instance = new IntegerSerializer(); diff --git a/src/java/org/apache/cassandra/serializers/TimestampSerializer.java b/src/java/org/apache/cassandra/serializers/TimestampSerializer.java index 977218151b..225120b8a4 100644 --- a/src/java/org/apache/cassandra/serializers/TimestampSerializer.java +++ b/src/java/org/apache/cassandra/serializers/TimestampSerializer.java @@ -17,10 +17,6 @@ */ package org.apache.cassandra.serializers; -import io.netty.util.concurrent.FastThreadLocal; -import org.apache.cassandra.db.marshal.ValueAccessor; -import org.apache.cassandra.utils.ByteBufferUtil; - import java.nio.ByteBuffer; import java.text.Format; import java.time.ZoneId; @@ -34,6 +30,11 @@ import java.util.Date; import java.util.List; import java.util.regex.Pattern; +import org.apache.cassandra.db.marshal.ValueAccessor; +import org.apache.cassandra.utils.ByteBufferUtil; + +import io.netty.util.concurrent.FastThreadLocal; + import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; diff --git a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java index 84dfe49b57..5a0d16cf59 100644 --- a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java +++ b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java @@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.function.Function; import java.util.function.Supplier; + import javax.annotation.Nullable; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java index 5d2a8c89c4..286e8e86fc 100644 --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@ -39,6 +39,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; + import javax.management.openmbean.CompositeData; import com.google.common.annotations.VisibleForTesting; @@ -49,6 +50,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -107,8 +109,8 @@ import org.apache.cassandra.service.disk.usage.DiskUsageMonitor; import org.apache.cassandra.service.paxos.PaxosRepair; import org.apache.cassandra.service.paxos.cleanup.PaxosCleanup; import org.apache.cassandra.service.snapshot.SnapshotManager; -import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.streaming.PreviewKind; +import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.utils.ExecutorUtils; import org.apache.cassandra.utils.MerkleTrees; import org.apache.cassandra.utils.Pair; diff --git a/src/java/org/apache/cassandra/service/ActiveRepairServiceMBean.java b/src/java/org/apache/cassandra/service/ActiveRepairServiceMBean.java index c739b048d6..bc4a31cb1c 100644 --- a/src/java/org/apache/cassandra/service/ActiveRepairServiceMBean.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairServiceMBean.java @@ -20,6 +20,7 @@ package org.apache.cassandra.service; import java.util.List; import java.util.Map; + import javax.management.openmbean.CompositeData; public interface ActiveRepairServiceMBean diff --git a/src/java/org/apache/cassandra/service/AutoRepairService.java b/src/java/org/apache/cassandra/service/AutoRepairService.java index 463629f058..537c44149b 100644 --- a/src/java/org/apache/cassandra/service/AutoRepairService.java +++ b/src/java/org/apache/cassandra/service/AutoRepairService.java @@ -17,15 +17,6 @@ */ package org.apache.cassandra.service; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.ParameterizedClass; -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.repair.autorepair.AutoRepairConfig; -import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType; -import org.apache.cassandra.repair.autorepair.AutoRepairUtils; -import org.apache.cassandra.utils.MBeanWrapper; - import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -36,6 +27,15 @@ import java.util.UUID; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.ParameterizedClass; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.repair.autorepair.AutoRepairConfig; +import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType; +import org.apache.cassandra.repair.autorepair.AutoRepairUtils; +import org.apache.cassandra.utils.MBeanWrapper; + /** * Implement all the MBeans for AutoRepair. */ diff --git a/src/java/org/apache/cassandra/service/CASRequest.java b/src/java/org/apache/cassandra/service/CASRequest.java index 9a0592f4cd..37bfdcec70 100644 --- a/src/java/org/apache/cassandra/service/CASRequest.java +++ b/src/java/org/apache/cassandra/service/CASRequest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.service; import accord.primitives.Txn; + import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.SinglePartitionReadCommand; import org.apache.cassandra.db.partitions.FilteredPartition; diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index 22b8810f48..58f69a1793 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -34,17 +34,19 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.stream.Stream; + import javax.management.StandardMBean; import javax.management.remote.JMXConnectorServer; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.Meter; import com.codahale.metrics.MetricRegistryListener; import com.codahale.metrics.SharedMetricRegistries; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableList; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.audit.AuditLogManager; import org.apache.cassandra.auth.AuthCacheService; import org.apache.cassandra.auth.AuthenticatedUser; @@ -60,8 +62,8 @@ import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.db.SystemKeyspaceMigrator41; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.virtual.AccordDebugKeyspace; -import org.apache.cassandra.db.virtual.ExceptionsTable; import org.apache.cassandra.db.virtual.AccordDebugRemoteKeyspace; +import org.apache.cassandra.db.virtual.ExceptionsTable; import org.apache.cassandra.db.virtual.LogMessagesTable; import org.apache.cassandra.db.virtual.SlowQueriesTable; import org.apache.cassandra.db.virtual.SystemViewsKeyspace; @@ -74,11 +76,6 @@ import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.Locator; -import org.apache.cassandra.service.accord.AccordService; -import org.apache.cassandra.tcm.CMSOperations; -import org.apache.cassandra.tcm.ClusterMetadataService; -import org.apache.cassandra.tcm.RegistrationStatus; -import org.apache.cassandra.tcm.Startup; import org.apache.cassandra.metrics.CassandraMetricsRegistry; import org.apache.cassandra.metrics.DefaultNameFactory; import org.apache.cassandra.net.StartupClusterConnectivityChecker; @@ -86,13 +83,18 @@ import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.security.ThreadAwareSecurityManager; import org.apache.cassandra.service.accord.AccordOperations; +import org.apache.cassandra.service.accord.AccordService; import org.apache.cassandra.service.paxos.PaxosState; import org.apache.cassandra.service.snapshot.SnapshotManager; import org.apache.cassandra.streaming.StreamManager; +import org.apache.cassandra.tcm.CMSOperations; import org.apache.cassandra.tcm.ClusterMetadata; +import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.MultiStepOperation; -import org.apache.cassandra.tcm.membership.NodeState; +import org.apache.cassandra.tcm.RegistrationStatus; +import org.apache.cassandra.tcm.Startup; import org.apache.cassandra.tcm.membership.NodeId; +import org.apache.cassandra.tcm.membership.NodeState; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.JMXServerUtils; import org.apache.cassandra.utils.JVMStabilityInspector; diff --git a/src/java/org/apache/cassandra/service/ClientState.java b/src/java/org/apache/cassandra/service/ClientState.java index d1c91d94a5..7ec2160e8d 100644 --- a/src/java/org/apache/cassandra/service/ClientState.java +++ b/src/java/org/apache/cassandra/service/ClientState.java @@ -36,24 +36,29 @@ import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.auth.*; -import org.apache.cassandra.db.virtual.VirtualSchemaKeyspace; -import org.apache.cassandra.exceptions.RequestExecutionException; -import org.apache.cassandra.exceptions.RequestValidationException; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.schema.TableMetadataRef; +import org.apache.cassandra.auth.AuthenticatedUser; +import org.apache.cassandra.auth.DataResource; +import org.apache.cassandra.auth.FunctionResource; +import org.apache.cassandra.auth.IResource; +import org.apache.cassandra.auth.Permission; +import org.apache.cassandra.auth.Resources; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.schema.SchemaConstants; -import org.apache.cassandra.schema.SchemaKeyspaceTables; import org.apache.cassandra.cql3.QueryHandler; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.functions.Function; import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.db.virtual.VirtualSchemaKeyspace; import org.apache.cassandra.dht.Datacenters; import org.apache.cassandra.exceptions.AuthenticationException; import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.exceptions.RequestExecutionException; +import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.exceptions.UnauthorizedException; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.SchemaConstants; +import org.apache.cassandra.schema.SchemaKeyspaceTables; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.tracing.TraceKeyspace; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.JVMStabilityInspector; diff --git a/src/java/org/apache/cassandra/service/ClientWarn.java b/src/java/org/apache/cassandra/service/ClientWarn.java index de8e84da13..aff945c4d0 100644 --- a/src/java/org/apache/cassandra/service/ClientWarn.java +++ b/src/java/org/apache/cassandra/service/ClientWarn.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.service; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import org.apache.cassandra.concurrent.ExecutorLocals; import org.apache.cassandra.utils.FBUtilities; diff --git a/src/java/org/apache/cassandra/service/DataResurrectionCheck.java b/src/java/org/apache/cassandra/service/DataResurrectionCheck.java index 4cf3278110..cd7a4dda62 100644 --- a/src/java/org/apache/cassandra/service/DataResurrectionCheck.java +++ b/src/java/org/apache/cassandra/service/DataResurrectionCheck.java @@ -30,12 +30,13 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java b/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java index d035286d7d..689b5f100d 100644 --- a/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java +++ b/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java @@ -23,14 +23,14 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.Mutation; +import org.apache.cassandra.db.WriteType; import org.apache.cassandra.locator.Locator; import org.apache.cassandra.locator.NetworkTopologyStrategy; import org.apache.cassandra.locator.Replica; import org.apache.cassandra.locator.ReplicaPlan; import org.apache.cassandra.net.Message; -import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.db.WriteType; import org.apache.cassandra.transport.Dispatcher; /** diff --git a/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java b/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java index f33d6607e1..dc9f38a99e 100644 --- a/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java +++ b/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java @@ -17,6 +17,9 @@ */ package org.apache.cassandra.service; +import java.util.function.Predicate; +import java.util.function.Supplier; + import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.WriteType; import org.apache.cassandra.locator.InOurDc; @@ -25,9 +28,6 @@ import org.apache.cassandra.locator.ReplicaPlan; import org.apache.cassandra.net.Message; import org.apache.cassandra.transport.Dispatcher; -import java.util.function.Predicate; -import java.util.function.Supplier; - /** * This class blocks for a quorum of responses _in the local datacenter only_ (CL.LOCAL_QUORUM). */ diff --git a/src/java/org/apache/cassandra/service/DefaultDiskErrorsHandler.java b/src/java/org/apache/cassandra/service/DefaultDiskErrorsHandler.java index 72a18a9f72..1bd755d48e 100644 --- a/src/java/org/apache/cassandra/service/DefaultDiskErrorsHandler.java +++ b/src/java/org/apache/cassandra/service/DefaultDiskErrorsHandler.java @@ -22,6 +22,7 @@ import java.nio.file.FileStore; import java.util.Set; import com.google.common.collect.ImmutableSet; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/DiskErrorsHandlerService.java b/src/java/org/apache/cassandra/service/DiskErrorsHandlerService.java index 98fb7ee609..036559a738 100644 --- a/src/java/org/apache/cassandra/service/DiskErrorsHandlerService.java +++ b/src/java/org/apache/cassandra/service/DiskErrorsHandlerService.java @@ -19,6 +19,7 @@ package org.apache.cassandra.service; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/EchoVerbHandler.java b/src/java/org/apache/cassandra/service/EchoVerbHandler.java index 7a6c1e1b7c..599615f701 100644 --- a/src/java/org/apache/cassandra/service/EchoVerbHandler.java +++ b/src/java/org/apache/cassandra/service/EchoVerbHandler.java @@ -19,15 +19,16 @@ package org.apache.cassandra.service; * under the License. * */ + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.net.IVerbHandler; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.NoPayload; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class EchoVerbHandler implements IVerbHandler { public static final EchoVerbHandler instance = new EchoVerbHandler(); diff --git a/src/java/org/apache/cassandra/service/FileSystemOwnershipCheck.java b/src/java/org/apache/cassandra/service/FileSystemOwnershipCheck.java index 6e6ebd67b7..b8fe30b823 100644 --- a/src/java/org/apache/cassandra/service/FileSystemOwnershipCheck.java +++ b/src/java/org/apache/cassandra/service/FileSystemOwnershipCheck.java @@ -21,7 +21,11 @@ package org.apache.cassandra.service; import java.io.BufferedReader; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -29,6 +33,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.HashMultimap; import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/GCInspector.java b/src/java/org/apache/cassandra/service/GCInspector.java index e6d0d1f56b..2d86019d9d 100644 --- a/src/java/org/apache/cassandra/service/GCInspector.java +++ b/src/java/org/apache/cassandra/service/GCInspector.java @@ -43,7 +43,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; - import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.utils.MBeanWrapper; import org.apache.cassandra.utils.StatusLogger; diff --git a/src/java/org/apache/cassandra/service/LoadBroadcaster.java b/src/java/org/apache/cassandra/service/LoadBroadcaster.java index a8dd6c8873..e70ae0b6a7 100644 --- a/src/java/org/apache/cassandra/service/LoadBroadcaster.java +++ b/src/java/org/apache/cassandra/service/LoadBroadcaster.java @@ -17,18 +17,23 @@ */ package org.apache.cassandra.service; -import java.util.*; +import java.util.Collections; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.metrics.StorageMetrics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.concurrent.ScheduledExecutors; -import org.apache.cassandra.gms.*; +import org.apache.cassandra.gms.ApplicationState; +import org.apache.cassandra.gms.EndpointState; +import org.apache.cassandra.gms.Gossiper; +import org.apache.cassandra.gms.IEndpointStateChangeSubscriber; +import org.apache.cassandra.gms.VersionedValue; +import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.metrics.StorageMetrics; import static org.apache.cassandra.config.CassandraRelevantProperties.BROADCAST_INTERVAL_MS; diff --git a/src/java/org/apache/cassandra/service/NativeTransportService.java b/src/java/org/apache/cassandra/service/NativeTransportService.java index 5766be65c6..28817df396 100644 --- a/src/java/org/apache/cassandra/service/NativeTransportService.java +++ b/src/java/org/apache/cassandra/service/NativeTransportService.java @@ -26,11 +26,6 @@ import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.epoll.Epoll; -import io.netty.channel.epoll.EpollEventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.util.Version; import org.apache.cassandra.auth.AuthenticatedUser; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.EncryptionOptions; @@ -39,6 +34,12 @@ import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.transport.Server; import org.apache.cassandra.utils.NativeLibrary; +import io.netty.channel.EventLoopGroup; +import io.netty.channel.epoll.Epoll; +import io.netty.channel.epoll.EpollEventLoopGroup; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.util.Version; + import static org.apache.cassandra.config.CassandraRelevantProperties.NATIVE_EPOLL_ENABLED; /** diff --git a/src/java/org/apache/cassandra/service/Rebuild.java b/src/java/org/apache/cassandra/service/Rebuild.java index feb782ddcb..7c28960b96 100644 --- a/src/java/org/apache/cassandra/service/Rebuild.java +++ b/src/java/org/apache/cassandra/service/Rebuild.java @@ -30,10 +30,12 @@ import java.util.regex.MatchResult; import java.util.regex.Pattern; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.topology.EpochReady; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.Range; diff --git a/src/java/org/apache/cassandra/service/RetryStrategy.java b/src/java/org/apache/cassandra/service/RetryStrategy.java index 385842e8cd..ba1b01dfc8 100644 --- a/src/java/org/apache/cassandra/service/RetryStrategy.java +++ b/src/java/org/apache/cassandra/service/RetryStrategy.java @@ -18,13 +18,6 @@ package org.apache.cassandra.service; -import com.google.common.annotations.VisibleForTesting; - -import accord.utils.Invariants; -import accord.utils.RandomSource; -import org.apache.cassandra.service.TimeoutStrategy.LatencySourceFactory; -import org.apache.cassandra.service.TimeoutStrategy.Wait; - import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.function.DoubleSupplier; @@ -35,7 +28,16 @@ import java.util.regex.Pattern; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import static java.util.concurrent.TimeUnit.*; +import com.google.common.annotations.VisibleForTesting; + +import accord.utils.Invariants; +import accord.utils.RandomSource; + +import org.apache.cassandra.service.TimeoutStrategy.LatencySourceFactory; +import org.apache.cassandra.service.TimeoutStrategy.Wait; + +import static java.util.concurrent.TimeUnit.MICROSECONDS; +import static java.util.concurrent.TimeUnit.NANOSECONDS; import static org.apache.cassandra.service.TimeoutStrategy.parseInMicros; import static org.apache.cassandra.utils.Clock.Global.nanoTime; diff --git a/src/java/org/apache/cassandra/service/SSTablesGlobalTracker.java b/src/java/org/apache/cassandra/service/SSTablesGlobalTracker.java index 6a7baf34c9..74f4b2d50e 100644 --- a/src/java/org/apache/cassandra/service/SSTablesGlobalTracker.java +++ b/src/java/org/apache/cassandra/service/SSTablesGlobalTracker.java @@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java index 11a27d7fe8..d5696fda29 100644 --- a/src/java/org/apache/cassandra/service/StartupChecks.java +++ b/src/java/org/apache/cassandra/service/StartupChecks.java @@ -45,12 +45,14 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Range; +import com.vdurmont.semver4j.Semver; + +import net.jpountz.lz4.LZ4Factory; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.vdurmont.semver4j.Semver; -import net.jpountz.lz4.LZ4Factory; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index b1ac0bfffa..ba660858a4 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -41,6 +41,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Function; import java.util.function.IntPredicate; import java.util.stream.Collectors; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -50,10 +51,12 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; import com.google.common.util.concurrent.Uninterruptibles; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.primitives.Txn; + import org.apache.cassandra.batchlog.Batch; import org.apache.cassandra.batchlog.BatchlogManager; import org.apache.cassandra.concurrent.DebuggableTask.RunnableDebuggableTask; diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index e6b051e570..aa2df20b0e 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -50,6 +50,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.management.ListenerNotFoundException; @@ -60,6 +61,7 @@ import javax.management.openmbean.CompositeData; import javax.management.openmbean.OpenDataException; import javax.management.openmbean.TabularData; +import com.codahale.metrics.Meter; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Predicate; @@ -71,11 +73,11 @@ import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Meter; import org.apache.cassandra.audit.AuditLogManager; import org.apache.cassandra.audit.AuditLogOptions; import org.apache.cassandra.auth.AuthCacheService; diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java index 803edf855c..9c4ae481ec 100644 --- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java +++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.management.NotificationEmitter; diff --git a/src/java/org/apache/cassandra/service/TimeoutStrategy.java b/src/java/org/apache/cassandra/service/TimeoutStrategy.java index 7554dcf215..0c2e64d49a 100644 --- a/src/java/org/apache/cassandra/service/TimeoutStrategy.java +++ b/src/java/org/apache/cassandra/service/TimeoutStrategy.java @@ -26,10 +26,11 @@ import java.util.regex.Pattern; import javax.annotation.Nullable; +import com.codahale.metrics.Snapshot; import com.google.common.annotations.VisibleForTesting; import accord.utils.Invariants; -import com.codahale.metrics.Snapshot; + import org.apache.cassandra.metrics.ClientRequestMetrics; import org.apache.cassandra.service.TimeoutStrategy.LatencySupplier.Constant; import org.apache.cassandra.service.TimeoutStrategy.LatencySupplier.Percentile; diff --git a/src/java/org/apache/cassandra/service/TokenRange.java b/src/java/org/apache/cassandra/service/TokenRange.java index 27d1485094..a3ed29bc18 100644 --- a/src/java/org/apache/cassandra/service/TokenRange.java +++ b/src/java/org/apache/cassandra/service/TokenRange.java @@ -17,7 +17,8 @@ */ package org.apache.cassandra.service; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Range; diff --git a/src/java/org/apache/cassandra/service/WriteResponseHandler.java b/src/java/org/apache/cassandra/service/WriteResponseHandler.java index a25c8aedf4..2a3665712b 100644 --- a/src/java/org/apache/cassandra/service/WriteResponseHandler.java +++ b/src/java/org/apache/cassandra/service/WriteResponseHandler.java @@ -20,15 +20,15 @@ package org.apache.cassandra.service; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.function.Supplier; -import org.apache.cassandra.db.Mutation; -import org.apache.cassandra.locator.ReplicaPlan; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.net.Message; +import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.WriteType; -import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.locator.ReplicaPlan; +import org.apache.cassandra.net.Message; import org.apache.cassandra.transport.Dispatcher; +import org.apache.cassandra.utils.FBUtilities; /** * Handles blocking writes for ONE, ANY, TWO, THREE, QUORUM, and ALL consistency levels. diff --git a/src/java/org/apache/cassandra/service/accord/AbstractAccordSegmentCompactor.java b/src/java/org/apache/cassandra/service/accord/AbstractAccordSegmentCompactor.java index 0c26521f8b..dafee34101 100644 --- a/src/java/org/apache/cassandra/service/accord/AbstractAccordSegmentCompactor.java +++ b/src/java/org/apache/cassandra/service/accord/AbstractAccordSegmentCompactor.java @@ -26,6 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + import org.apache.cassandra.db.BufferClustering; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DecoratedKey; @@ -47,14 +48,14 @@ import org.apache.cassandra.journal.StaticSegment.KeyOrderReader; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.accord.AccordJournalValueSerializers.FlyweightImage; import org.apache.cassandra.service.accord.AccordJournalValueSerializers.FlyweightSerializer; +import org.apache.cassandra.service.accord.serializers.Version; import org.apache.cassandra.utils.BulkIterator; import org.apache.cassandra.utils.NoSpamLogger; - -import static java.util.concurrent.TimeUnit.MINUTES; -import org.apache.cassandra.service.accord.serializers.Version; import org.apache.cassandra.utils.btree.BTree; import org.apache.cassandra.utils.btree.UpdateFunction; +import static java.util.concurrent.TimeUnit.MINUTES; + /** * Segment compactor: takes static segments and compacts them into a single SSTable. */ diff --git a/src/java/org/apache/cassandra/service/accord/AccordCache.java b/src/java/org/apache/cassandra/service/accord/AccordCache.java index 040baf11b2..c947a83b22 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordCache.java +++ b/src/java/org/apache/cassandra/service/accord/AccordCache.java @@ -33,9 +33,12 @@ import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.ToLongFunction; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; + +import org.agrona.collections.Object2ObjectHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +55,7 @@ import accord.utils.Invariants; import accord.utils.QuadFunction; import accord.utils.TriFunction; import accord.utils.UnhandledEnum; -import org.agrona.collections.Object2ObjectHashMap; + import org.apache.cassandra.cache.CacheSize; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.marshal.ByteBufferAccessor; diff --git a/src/java/org/apache/cassandra/service/accord/AccordCacheEntry.java b/src/java/org/apache/cassandra/service/accord/AccordCacheEntry.java index 26f46334d6..77b56f3203 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordCacheEntry.java +++ b/src/java/org/apache/cassandra/service/accord/AccordCacheEntry.java @@ -34,6 +34,7 @@ import accord.utils.IntrusiveLinkedList; import accord.utils.IntrusiveLinkedListNode; import accord.utils.Invariants; import accord.utils.async.Cancellable; + import org.apache.cassandra.service.accord.AccordCache.Adapter; import org.apache.cassandra.service.accord.AccordCache.Adapter.Shrink; import org.apache.cassandra.utils.ObjectSizes; diff --git a/src/java/org/apache/cassandra/service/accord/AccordCommandStore.java b/src/java/org/apache/cassandra/service/accord/AccordCommandStore.java index 3614bb65b2..39d1db6fab 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordCommandStore.java +++ b/src/java/org/apache/cassandra/service/accord/AccordCommandStore.java @@ -29,6 +29,7 @@ import java.util.concurrent.locks.Lock; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.IntFunction; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; @@ -65,6 +66,7 @@ import accord.utils.Invariants; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; import accord.utils.async.AsyncResults.CountingResult; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.metrics.LogLinearDecayingHistograms; diff --git a/src/java/org/apache/cassandra/service/accord/AccordCommandStores.java b/src/java/org/apache/cassandra/service/accord/AccordCommandStores.java index c8a05795d4..b885ae8424 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordCommandStores.java +++ b/src/java/org/apache/cassandra/service/accord/AccordCommandStores.java @@ -32,6 +32,7 @@ import accord.local.NodeCommandStoreService; import accord.local.SequentialAsyncExecutor; import accord.local.ShardDistributor; import accord.utils.RandomSource; + import org.apache.cassandra.cache.CacheSize; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.concurrent.Shutdownable; diff --git a/src/java/org/apache/cassandra/service/accord/AccordDataStore.java b/src/java/org/apache/cassandra/service/accord/AccordDataStore.java index 438bca469f..a8f05f8f3c 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordDataStore.java +++ b/src/java/org/apache/cassandra/service/accord/AccordDataStore.java @@ -30,6 +30,7 @@ import accord.primitives.Range; import accord.primitives.Ranges; import accord.primitives.SyncPoint; import accord.utils.UnhandledEnum; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.memtable.Memtable; import org.apache.cassandra.schema.Schema; diff --git a/src/java/org/apache/cassandra/service/accord/AccordDurableOnFlush.java b/src/java/org/apache/cassandra/service/accord/AccordDurableOnFlush.java index 7f1bb70a04..68c39284d3 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordDurableOnFlush.java +++ b/src/java/org/apache/cassandra/service/accord/AccordDurableOnFlush.java @@ -21,6 +21,7 @@ package org.apache.cassandra.service.accord; import java.util.Map; import java.util.function.Consumer; +import org.agrona.collections.Int2ObjectHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +29,7 @@ import accord.local.CommandStore; import accord.local.CommandStores; import accord.local.PreLoadContext; import accord.local.RedundantBefore; -import org.agrona.collections.Int2ObjectHashMap; + import org.apache.cassandra.schema.TableMetadata; class AccordDurableOnFlush implements Consumer diff --git a/src/java/org/apache/cassandra/service/accord/AccordEndpointMapper.java b/src/java/org/apache/cassandra/service/accord/AccordEndpointMapper.java index 9264f068d1..ea68de5de8 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordEndpointMapper.java +++ b/src/java/org/apache/cassandra/service/accord/AccordEndpointMapper.java @@ -19,9 +19,11 @@ package org.apache.cassandra.service.accord; import java.util.Map; + import javax.annotation.Nullable; import accord.local.Node; + import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.tcm.ClusterMetadata; diff --git a/src/java/org/apache/cassandra/service/accord/AccordExecutor.java b/src/java/org/apache/cassandra/service/accord/AccordExecutor.java index bca114a0c6..abb8509b6a 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordExecutor.java +++ b/src/java/org/apache/cassandra/service/accord/AccordExecutor.java @@ -62,9 +62,11 @@ import accord.utils.async.AsyncCallbacks.RunOrFail; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; import accord.utils.async.Cancellable; + import org.apache.cassandra.cache.CacheSize; import org.apache.cassandra.concurrent.DebuggableTask; import org.apache.cassandra.concurrent.DebuggableTask.DebuggableTaskRunner; +import org.apache.cassandra.concurrent.ExecutorLocals; import org.apache.cassandra.concurrent.Shutdownable; import org.apache.cassandra.metrics.AccordCacheMetrics; import org.apache.cassandra.metrics.AccordExecutorMetrics; @@ -76,7 +78,6 @@ import org.apache.cassandra.metrics.ShardedDecayingHistograms.DecayingHistograms import org.apache.cassandra.service.accord.AccordCacheEntry.LoadExecutor; import org.apache.cassandra.service.accord.AccordCacheEntry.SaveExecutor; import org.apache.cassandra.service.accord.AccordCacheEntry.UniqueSave; -import org.apache.cassandra.concurrent.ExecutorLocals; import org.apache.cassandra.utils.Closeable; import org.apache.cassandra.utils.MonotonicClock; import org.apache.cassandra.utils.WithResources; diff --git a/src/java/org/apache/cassandra/service/accord/AccordExecutorAbstractLockLoop.java b/src/java/org/apache/cassandra/service/accord/AccordExecutorAbstractLockLoop.java index f48deb9863..8d71ab61a5 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordExecutorAbstractLockLoop.java +++ b/src/java/org/apache/cassandra/service/accord/AccordExecutorAbstractLockLoop.java @@ -24,6 +24,7 @@ import java.util.stream.Stream; import accord.api.Agent; import accord.utils.QuadFunction; import accord.utils.QuintConsumer; + import org.apache.cassandra.concurrent.DebuggableTask.DebuggableTaskRunner; import org.apache.cassandra.service.accord.AccordExecutorLoops.LoopTask; import org.apache.cassandra.utils.concurrent.ConcurrentLinkedStack; diff --git a/src/java/org/apache/cassandra/service/accord/AccordExecutorAsyncSubmit.java b/src/java/org/apache/cassandra/service/accord/AccordExecutorAsyncSubmit.java index 06ebd26964..b212ccc32c 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordExecutorAsyncSubmit.java +++ b/src/java/org/apache/cassandra/service/accord/AccordExecutorAsyncSubmit.java @@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.IntFunction; import accord.api.Agent; + import org.apache.cassandra.utils.concurrent.LockWithAsyncSignal; // WARNING: experimental - needs more testing diff --git a/src/java/org/apache/cassandra/service/accord/AccordExecutorLoops.java b/src/java/org/apache/cassandra/service/accord/AccordExecutorLoops.java index 803839de94..17baa1b122 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordExecutorLoops.java +++ b/src/java/org/apache/cassandra/service/accord/AccordExecutorLoops.java @@ -24,8 +24,10 @@ import java.util.function.BiFunction; import java.util.function.IntFunction; import java.util.stream.Stream; -import accord.utils.Invariants; import org.agrona.collections.Long2ObjectHashMap; + +import accord.utils.Invariants; + import org.apache.cassandra.concurrent.DebuggableTask.DebuggableTaskRunner; import org.apache.cassandra.service.accord.AccordExecutor.Mode; import org.apache.cassandra.service.accord.AccordExecutor.TaskRunner; diff --git a/src/java/org/apache/cassandra/service/accord/AccordExecutorSimple.java b/src/java/org/apache/cassandra/service/accord/AccordExecutorSimple.java index d5712ef53b..c7842e4666 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordExecutorSimple.java +++ b/src/java/org/apache/cassandra/service/accord/AccordExecutorSimple.java @@ -26,6 +26,7 @@ import accord.api.Agent; import accord.utils.Invariants; import accord.utils.QuadFunction; import accord.utils.QuintConsumer; + import org.apache.cassandra.concurrent.ExecutorPlus; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; diff --git a/src/java/org/apache/cassandra/service/accord/AccordFastPath.java b/src/java/org/apache/cassandra/service/accord/AccordFastPath.java index e9ea757282..dc3399ad1e 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordFastPath.java +++ b/src/java/org/apache/cassandra/service/accord/AccordFastPath.java @@ -22,10 +22,11 @@ import java.io.IOException; import java.util.Map; import java.util.Objects; -import accord.local.Node; import com.google.common.collect.ImmutableMap; +import accord.local.Node; import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/AccordFastPathCoordinator.java b/src/java/org/apache/cassandra/service/accord/AccordFastPathCoordinator.java index fb93d9d4b9..9b64921a88 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordFastPathCoordinator.java +++ b/src/java/org/apache/cassandra/service/accord/AccordFastPathCoordinator.java @@ -18,14 +18,23 @@ package org.apache.cassandra.service.accord; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableSet; + import accord.api.TopologyListener; import accord.local.Node; import accord.topology.Topology; import accord.utils.Invariants; import accord.utils.async.AsyncResult; import accord.utils.async.AsyncResults; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableSet; + import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.config.DatabaseDescriptor; @@ -43,9 +52,6 @@ import org.apache.cassandra.tcm.listeners.ChangeListener; import org.apache.cassandra.tcm.transformations.ReconfigureAccordFastPath; import org.apache.cassandra.utils.Clock; -import java.util.*; -import java.util.concurrent.TimeUnit; - /** * Listens to availability status of peers and updates tcm fast path data accordingly */ diff --git a/src/java/org/apache/cassandra/service/accord/AccordFetchCoordinator.java b/src/java/org/apache/cassandra/service/accord/AccordFetchCoordinator.java index 1006efb825..45aeaa2f18 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordFetchCoordinator.java +++ b/src/java/org/apache/cassandra/service/accord/AccordFetchCoordinator.java @@ -54,6 +54,7 @@ import accord.topology.TopologyException; import accord.utils.Invariants; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.ParameterisedVersionedSerializer; import org.apache.cassandra.io.UnversionedSerializer; diff --git a/src/java/org/apache/cassandra/service/accord/AccordJournal.java b/src/java/org/apache/cassandra/service/accord/AccordJournal.java index 2127f336d8..00f03be854 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordJournal.java +++ b/src/java/org/apache/cassandra/service/accord/AccordJournal.java @@ -32,9 +32,13 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; + +import org.agrona.collections.Int2ObjectHashMap; +import org.agrona.collections.IntArrayList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,8 +66,7 @@ import accord.utils.PersistentField; import accord.utils.UnhandledEnum; import accord.utils.async.AsyncResult; import accord.utils.async.AsyncResults; -import org.agrona.collections.Int2ObjectHashMap; -import org.agrona.collections.IntArrayList; + import org.apache.cassandra.concurrent.Shutdownable; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/src/java/org/apache/cassandra/service/accord/AccordJournalTable.java b/src/java/org/apache/cassandra/service/accord/AccordJournalTable.java index e557bdd993..0ab04cfd50 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordJournalTable.java +++ b/src/java/org/apache/cassandra/service/accord/AccordJournalTable.java @@ -24,11 +24,13 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; + import javax.annotation.CheckForNull; import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.AbstractIterator; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,6 +39,7 @@ import accord.primitives.Timestamp; import accord.primitives.TxnId; import accord.utils.Invariants; import accord.utils.UncheckedInterruptedException; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.Operator; diff --git a/src/java/org/apache/cassandra/service/accord/AccordJournalValueSerializers.java b/src/java/org/apache/cassandra/service/accord/AccordJournalValueSerializers.java index 69ff7fac10..3c1d71fd48 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordJournalValueSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/AccordJournalValueSerializers.java @@ -28,6 +28,7 @@ import accord.local.RedundantBefore; import accord.primitives.Ranges; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.service.accord.journal.AccordTopologyUpdate; diff --git a/src/java/org/apache/cassandra/service/accord/AccordKeyspace.java b/src/java/org/apache/cassandra/service/accord/AccordKeyspace.java index 783299dc4f..55d69c979b 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordKeyspace.java +++ b/src/java/org/apache/cassandra/service/accord/AccordKeyspace.java @@ -32,6 +32,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,6 +41,7 @@ import accord.local.cfk.CommandsForKey; import accord.local.cfk.Serialize; import accord.primitives.TxnId; import accord.utils.Invariants; + import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.Clustering; diff --git a/src/java/org/apache/cassandra/service/accord/AccordMessageSink.java b/src/java/org/apache/cassandra/service/accord/AccordMessageSink.java index c302e684fb..5e3168d15b 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordMessageSink.java +++ b/src/java/org/apache/cassandra/service/accord/AccordMessageSink.java @@ -37,6 +37,7 @@ import accord.messages.ReplyContext; import accord.messages.Request; import accord.primitives.TxnId; import accord.utils.async.Cancellable; + import org.apache.cassandra.exceptions.RequestFailureReason; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.Message; @@ -48,7 +49,48 @@ import org.apache.cassandra.net.Verb; import org.apache.cassandra.service.TimeoutStrategy; import org.apache.cassandra.utils.Clock; -import static accord.messages.MessageType.StandardMessage.*; +import static accord.messages.MessageType.StandardMessage.ACCEPT_REQ; +import static accord.messages.MessageType.StandardMessage.ACCEPT_RSP; +import static accord.messages.MessageType.StandardMessage.APPLY_REQ; +import static accord.messages.MessageType.StandardMessage.APPLY_RSP; +import static accord.messages.MessageType.StandardMessage.APPLY_THEN_WAIT_UNTIL_APPLIED_REQ; +import static accord.messages.MessageType.StandardMessage.ASYNC_AWAIT_COMPLETE_REQ; +import static accord.messages.MessageType.StandardMessage.AWAIT_REQ; +import static accord.messages.MessageType.StandardMessage.AWAIT_RSP; +import static accord.messages.MessageType.StandardMessage.BEGIN_INVALIDATE_REQ; +import static accord.messages.MessageType.StandardMessage.BEGIN_INVALIDATE_RSP; +import static accord.messages.MessageType.StandardMessage.BEGIN_RECOVER_REQ; +import static accord.messages.MessageType.StandardMessage.BEGIN_RECOVER_RSP; +import static accord.messages.MessageType.StandardMessage.CHECK_STATUS_REQ; +import static accord.messages.MessageType.StandardMessage.CHECK_STATUS_RSP; +import static accord.messages.MessageType.StandardMessage.COMMIT_INVALIDATE_REQ; +import static accord.messages.MessageType.StandardMessage.COMMIT_REQ; +import static accord.messages.MessageType.StandardMessage.FAILURE_RSP; +import static accord.messages.MessageType.StandardMessage.FETCH_DATA_REQ; +import static accord.messages.MessageType.StandardMessage.FETCH_DATA_RSP; +import static accord.messages.MessageType.StandardMessage.GET_DURABLE_BEFORE_REQ; +import static accord.messages.MessageType.StandardMessage.GET_DURABLE_BEFORE_RSP; +import static accord.messages.MessageType.StandardMessage.GET_EPHEMERAL_READ_DEPS_REQ; +import static accord.messages.MessageType.StandardMessage.GET_EPHEMERAL_READ_DEPS_RSP; +import static accord.messages.MessageType.StandardMessage.GET_LATEST_DEPS_REQ; +import static accord.messages.MessageType.StandardMessage.GET_LATEST_DEPS_RSP; +import static accord.messages.MessageType.StandardMessage.GET_MAX_CONFLICT_REQ; +import static accord.messages.MessageType.StandardMessage.GET_MAX_CONFLICT_RSP; +import static accord.messages.MessageType.StandardMessage.INFORM_DURABLE_REQ; +import static accord.messages.MessageType.StandardMessage.NOT_ACCEPT_REQ; +import static accord.messages.MessageType.StandardMessage.PRE_ACCEPT_REQ; +import static accord.messages.MessageType.StandardMessage.PRE_ACCEPT_RSP; +import static accord.messages.MessageType.StandardMessage.READ_EPHEMERAL_REQ; +import static accord.messages.MessageType.StandardMessage.READ_REQ; +import static accord.messages.MessageType.StandardMessage.READ_RSP; +import static accord.messages.MessageType.StandardMessage.RECOVER_AWAIT_REQ; +import static accord.messages.MessageType.StandardMessage.RECOVER_AWAIT_RSP; +import static accord.messages.MessageType.StandardMessage.SET_GLOBALLY_DURABLE_REQ; +import static accord.messages.MessageType.StandardMessage.SET_SHARD_DURABLE_REQ; +import static accord.messages.MessageType.StandardMessage.SIMPLE_RSP; +import static accord.messages.MessageType.StandardMessage.STABLE_THEN_READ_REQ; +import static accord.messages.MessageType.StandardMessage.StandardMessage; +import static accord.messages.MessageType.StandardMessage.WAIT_UNTIL_APPLIED_REQ; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static org.apache.cassandra.service.accord.api.AccordWaitStrategies.expire; import static org.apache.cassandra.service.accord.api.AccordWaitStrategies.slowPreaccept; diff --git a/src/java/org/apache/cassandra/service/accord/AccordObjectSizes.java b/src/java/org/apache/cassandra/service/accord/AccordObjectSizes.java index d6955ec44c..fc1b35e2bb 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordObjectSizes.java +++ b/src/java/org/apache/cassandra/service/accord/AccordObjectSizes.java @@ -59,11 +59,12 @@ import accord.primitives.Unseekables; import accord.primitives.Writes; import accord.utils.ImmutableBitSet; import accord.utils.UnhandledEnum; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.schema.TableId; -import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.service.accord.api.PartitionKey; +import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.service.accord.serializers.ResultSerializers; import org.apache.cassandra.service.accord.serializers.TableMetadatasAndKeys; import org.apache.cassandra.service.accord.txn.AccordUpdate; @@ -80,7 +81,9 @@ import static accord.local.Command.Executed.executed; import static accord.local.Command.NotAcceptedWithoutDefinition.notAccepted; import static accord.local.Command.NotDefined.notDefined; import static accord.local.Command.PreAccepted.preaccepted; -import static accord.local.Command.Truncated.*; +import static accord.local.Command.Truncated.WaitingOn; +import static accord.local.Command.Truncated.invalidated; +import static accord.local.Command.Truncated.vestigial; import static accord.local.cfk.CommandsForKey.InternalStatus.ACCEPTED; import static accord.primitives.Status.Durability.NotDurable; import static accord.primitives.TxnId.NO_TXNIDS; diff --git a/src/java/org/apache/cassandra/service/accord/AccordOperations.java b/src/java/org/apache/cassandra/service/accord/AccordOperations.java index 4c0c2a7f4f..2d30f7773b 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordOperations.java +++ b/src/java/org/apache/cassandra/service/accord/AccordOperations.java @@ -28,8 +28,8 @@ import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.membership.NodeId; import org.apache.cassandra.tcm.transformations.AccordMarkHardRemoved; -import org.apache.cassandra.tcm.transformations.AccordMarkStale; import org.apache.cassandra.tcm.transformations.AccordMarkRejoining; +import org.apache.cassandra.tcm.transformations.AccordMarkStale; import org.apache.cassandra.utils.MBeanWrapper; public class AccordOperations implements AccordOperationsMBean diff --git a/src/java/org/apache/cassandra/service/accord/AccordResponseVerbHandler.java b/src/java/org/apache/cassandra/service/accord/AccordResponseVerbHandler.java index e003fe6c03..b5df0863f4 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordResponseVerbHandler.java +++ b/src/java/org/apache/cassandra/service/accord/AccordResponseVerbHandler.java @@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory; import accord.impl.RequestCallbacks; import accord.local.Node; import accord.messages.Reply; + import org.apache.cassandra.exceptions.RequestFailure; import org.apache.cassandra.exceptions.RequestFailureReason; import org.apache.cassandra.net.IVerbHandler; diff --git a/src/java/org/apache/cassandra/service/accord/AccordResult.java b/src/java/org/apache/cassandra/service/accord/AccordResult.java index cf7e3ecbd8..04b474ffa8 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordResult.java +++ b/src/java/org/apache/cassandra/service/accord/AccordResult.java @@ -23,6 +23,7 @@ import java.util.Iterator; import java.util.Set; import java.util.concurrent.TimeoutException; import java.util.function.BiConsumer; + import javax.annotation.Nullable; import org.slf4j.Logger; @@ -37,6 +38,7 @@ import accord.primitives.Seekables; import accord.primitives.TxnId; import accord.topology.TopologyMismatch; import accord.utils.UnhandledEnum; + import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.ReadFailureException; import org.apache.cassandra.exceptions.ReadTimeoutException; diff --git a/src/java/org/apache/cassandra/service/accord/AccordSafeCommand.java b/src/java/org/apache/cassandra/service/accord/AccordSafeCommand.java index 162a8d326b..361e0e38ca 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordSafeCommand.java +++ b/src/java/org/apache/cassandra/service/accord/AccordSafeCommand.java @@ -26,6 +26,7 @@ import accord.api.Journal; import accord.local.Command; import accord.local.SafeCommand; import accord.primitives.TxnId; + import org.apache.cassandra.utils.concurrent.Ref; public class AccordSafeCommand extends SafeCommand implements AccordSafeState diff --git a/src/java/org/apache/cassandra/service/accord/AccordSafeCommandStore.java b/src/java/org/apache/cassandra/service/accord/AccordSafeCommandStore.java index f9624d2354..35e712add8 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordSafeCommandStore.java +++ b/src/java/org/apache/cassandra/service/accord/AccordSafeCommandStore.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.Map; import java.util.Set; import java.util.function.Predicate; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; @@ -41,6 +42,7 @@ import accord.primitives.Txn; import accord.primitives.TxnId; import accord.primitives.Unseekables; import accord.utils.Invariants; + import org.apache.cassandra.metrics.LogLinearDecayingHistograms; import org.apache.cassandra.service.accord.AccordCommandStore.ExclusiveCaches; import org.apache.cassandra.service.accord.AccordCommandStore.SafeRedundantBefore; diff --git a/src/java/org/apache/cassandra/service/accord/AccordSerializers.java b/src/java/org/apache/cassandra/service/accord/AccordSerializers.java index 2bae9c8a0c..7818d3550b 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/AccordSerializers.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.nio.ByteBuffer; import accord.utils.VIntCoding; + import org.apache.cassandra.cql3.terms.MultiElements; import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.db.ArrayClustering; diff --git a/src/java/org/apache/cassandra/service/accord/AccordService.java b/src/java/org/apache/cassandra/service/accord/AccordService.java index 124eb3761c..2c5a12ccfc 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordService.java +++ b/src/java/org/apache/cassandra/service/accord/AccordService.java @@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Function; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.annotation.concurrent.GuardedBy; @@ -38,20 +39,6 @@ import javax.annotation.concurrent.GuardedBy; import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Ints; -import accord.impl.progresslog.DefaultProgressLog; -import accord.local.Catchup; -import accord.topology.ActiveEpochs; -import accord.topology.EpochReady; -import accord.primitives.Txn; -import org.apache.cassandra.config.AccordSpec; -import org.apache.cassandra.db.SystemKeyspace; -import org.apache.cassandra.db.SystemKeyspace.BootstrapState; -import org.apache.cassandra.metrics.AccordExecutorMetrics; -import org.apache.cassandra.metrics.AccordReplicaMetrics; -import org.apache.cassandra.metrics.AccordSystemMetrics; -import org.apache.cassandra.service.accord.api.AccordViolationHandler; -import org.apache.cassandra.utils.concurrent.AsyncFuture; -import org.apache.cassandra.utils.concurrent.ImmediateFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,7 +50,9 @@ import accord.impl.DefaultLocalListeners; import accord.impl.DefaultRemoteListeners; import accord.impl.RequestCallbacks; import accord.impl.SizeOfIntersectionSorter; +import accord.impl.progresslog.DefaultProgressLog; import accord.impl.progresslog.DefaultProgressLogs; +import accord.local.Catchup; import accord.local.Node; import accord.local.Node.Id; import accord.local.ShardDistributor.EvenSplit; @@ -77,7 +66,10 @@ import accord.primitives.Ranges; import accord.primitives.Seekable; import accord.primitives.Seekables; import accord.primitives.Timestamp; +import accord.primitives.Txn; import accord.primitives.TxnId; +import accord.topology.ActiveEpochs; +import accord.topology.EpochReady; import accord.topology.Shard; import accord.topology.Topology; import accord.topology.TopologyManager; @@ -87,13 +79,20 @@ import accord.utils.Invariants; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncResult; import accord.utils.async.AsyncResults; + import org.apache.cassandra.concurrent.Shutdownable; +import org.apache.cassandra.config.AccordSpec; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ConsistencyLevel; +import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.db.SystemKeyspace.BootstrapState; import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.journal.Params; import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.metrics.AccordExecutorMetrics; +import org.apache.cassandra.metrics.AccordReplicaMetrics; +import org.apache.cassandra.metrics.AccordSystemMetrics; import org.apache.cassandra.net.IVerbHandler; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessageDelivery; @@ -108,6 +107,7 @@ import org.apache.cassandra.service.accord.api.AccordRoutableKey; import org.apache.cassandra.service.accord.api.AccordScheduler; import org.apache.cassandra.service.accord.api.AccordTimeService; import org.apache.cassandra.service.accord.api.AccordTopologySorter; +import org.apache.cassandra.service.accord.api.AccordViolationHandler; import org.apache.cassandra.service.accord.api.CompositeTopologySorter; import org.apache.cassandra.service.accord.api.TokenKey.KeyspaceSplitter; import org.apache.cassandra.service.accord.interop.AccordInteropAdapter.AccordInteropFactory; @@ -127,8 +127,10 @@ import org.apache.cassandra.tcm.membership.NodeId; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.utils.ExecutorUtils; import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.concurrent.AsyncFuture; import org.apache.cassandra.utils.concurrent.AsyncPromise; import org.apache.cassandra.utils.concurrent.Future; +import org.apache.cassandra.utils.concurrent.ImmediateFuture; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; import static accord.api.Journal.TopologyUpdate; diff --git a/src/java/org/apache/cassandra/service/accord/AccordStaleReplicas.java b/src/java/org/apache/cassandra/service/accord/AccordStaleReplicas.java index 006b5fb0e3..ad0a06a761 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordStaleReplicas.java +++ b/src/java/org/apache/cassandra/service/accord/AccordStaleReplicas.java @@ -25,6 +25,7 @@ import javax.annotation.concurrent.Immutable; import accord.local.Node; import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/AccordSyncPropagator.java b/src/java/org/apache/cassandra/service/accord/AccordSyncPropagator.java index ef67c5b496..f37e2621e2 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordSyncPropagator.java +++ b/src/java/org/apache/cassandra/service/accord/AccordSyncPropagator.java @@ -27,6 +27,9 @@ import java.util.concurrent.TimeUnit; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; + +import org.agrona.collections.Int2ObjectHashMap; +import org.agrona.collections.Long2ObjectHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,8 +42,7 @@ import accord.utils.Invariants; import accord.utils.SortedArrays.SortedArrayList; import accord.utils.SortedListSet; import accord.utils.UnhandledEnum; -import org.agrona.collections.Int2ObjectHashMap; -import org.agrona.collections.Long2ObjectHashMap; + import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.exceptions.RequestFailure; diff --git a/src/java/org/apache/cassandra/service/accord/AccordTask.java b/src/java/org/apache/cassandra/service/accord/AccordTask.java index 79c1170827..9e5902347b 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordTask.java +++ b/src/java/org/apache/cassandra/service/accord/AccordTask.java @@ -32,9 +32,12 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; + import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.agrona.collections.Object2ObjectHashMap; +import org.agrona.collections.ObjectHashSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,8 +60,7 @@ import accord.utils.UnhandledEnum; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; import accord.utils.async.Cancellable; -import org.agrona.collections.Object2ObjectHashMap; -import org.agrona.collections.ObjectHashSet; + import org.apache.cassandra.concurrent.DebuggableTask; import org.apache.cassandra.metrics.LogLinearDecayingHistograms; import org.apache.cassandra.service.accord.AccordCacheEntry.Status; diff --git a/src/java/org/apache/cassandra/service/accord/AccordTopology.java b/src/java/org/apache/cassandra/service/accord/AccordTopology.java index 15fa854f92..f37aef6811 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordTopology.java +++ b/src/java/org/apache/cassandra/service/accord/AccordTopology.java @@ -43,6 +43,7 @@ import accord.topology.Topology; import accord.utils.Invariants; import accord.utils.SortedArrays.SortedArrayList; import accord.utils.TinyEnumSet; + import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; diff --git a/src/java/org/apache/cassandra/service/accord/AccordTopologyService.java b/src/java/org/apache/cassandra/service/accord/AccordTopologyService.java index 1a4852bf83..85d6f5d2c1 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordTopologyService.java +++ b/src/java/org/apache/cassandra/service/accord/AccordTopologyService.java @@ -22,10 +22,14 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; + import javax.annotation.concurrent.GuardedBy; import com.google.common.annotations.VisibleForTesting; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import accord.api.TopologyListener; import accord.api.TopologyService; import accord.local.Node; @@ -35,6 +39,7 @@ import accord.utils.Invariants; import accord.utils.SortedArrays.SortedArrayList; import accord.utils.async.AsyncResult; import accord.utils.async.AsyncResults.SettableByCallback; + import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.concurrent.Shutdownable; @@ -49,9 +54,6 @@ import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Simulate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import static org.apache.cassandra.utils.Simulate.With.MONITORS; @Simulate(with=MONITORS) diff --git a/src/java/org/apache/cassandra/service/accord/AccordTracing.java b/src/java/org/apache/cassandra/service/accord/AccordTracing.java index eb1b845c92..58d2149ebe 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordTracing.java +++ b/src/java/org/apache/cassandra/service/accord/AccordTracing.java @@ -53,6 +53,7 @@ import accord.utils.Invariants; import accord.utils.SortedListMap; import accord.utils.TinyEnumSet; import accord.utils.UnhandledEnum; + import org.apache.cassandra.metrics.AccordCoordinatorMetrics; import org.apache.cassandra.service.ClientWarn; import org.apache.cassandra.utils.Clock; diff --git a/src/java/org/apache/cassandra/service/accord/AccordVerbHandler.java b/src/java/org/apache/cassandra/service/accord/AccordVerbHandler.java index 4833c5beec..1fa311fca0 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordVerbHandler.java +++ b/src/java/org/apache/cassandra/service/accord/AccordVerbHandler.java @@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory; import accord.local.Node; import accord.messages.Request; + import org.apache.cassandra.net.IVerbHandler; import org.apache.cassandra.net.Message; import org.apache.cassandra.utils.NoSpamLogger; diff --git a/src/java/org/apache/cassandra/service/accord/ClientRequestBookkeeping.java b/src/java/org/apache/cassandra/service/accord/ClientRequestBookkeeping.java index 0d960362ef..7d08cc4e07 100644 --- a/src/java/org/apache/cassandra/service/accord/ClientRequestBookkeeping.java +++ b/src/java/org/apache/cassandra/service/accord/ClientRequestBookkeeping.java @@ -21,6 +21,7 @@ package org.apache.cassandra.service.accord; import java.util.function.Function; import com.codahale.metrics.Meter; + import org.apache.cassandra.metrics.AccordClientRequestMetrics; import org.apache.cassandra.metrics.ClientRequestMetrics; diff --git a/src/java/org/apache/cassandra/service/accord/CommandsForRanges.java b/src/java/org/apache/cassandra/service/accord/CommandsForRanges.java index f831e82175..d8cd4aac8c 100644 --- a/src/java/org/apache/cassandra/service/accord/CommandsForRanges.java +++ b/src/java/org/apache/cassandra/service/accord/CommandsForRanges.java @@ -31,8 +31,11 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Consumer; + import javax.annotation.Nullable; +import org.agrona.collections.Object2ObjectHashMap; + import accord.api.RoutingKey; import accord.local.Command; import accord.local.CommandSummaries; @@ -55,7 +58,7 @@ import accord.utils.AsymmetricComparator; import accord.utils.Invariants; import accord.utils.SymmetricComparator; import accord.utils.UnhandledEnum; -import org.agrona.collections.Object2ObjectHashMap; + import org.apache.cassandra.exceptions.UnknownTableException; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.service.accord.api.TokenKey; diff --git a/src/java/org/apache/cassandra/service/accord/DebugBlockedTxns.java b/src/java/org/apache/cassandra/service/accord/DebugBlockedTxns.java index 7756c712b4..645a6b3b23 100644 --- a/src/java/org/apache/cassandra/service/accord/DebugBlockedTxns.java +++ b/src/java/org/apache/cassandra/service/accord/DebugBlockedTxns.java @@ -48,6 +48,7 @@ import accord.primitives.Timestamp; import accord.primitives.TxnId; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; + import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.utils.concurrent.Future; diff --git a/src/java/org/apache/cassandra/service/accord/EndpointMapping.java b/src/java/org/apache/cassandra/service/accord/EndpointMapping.java index 5ee46c0047..1bddf0d52e 100644 --- a/src/java/org/apache/cassandra/service/accord/EndpointMapping.java +++ b/src/java/org/apache/cassandra/service/accord/EndpointMapping.java @@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory; import accord.local.Node; import accord.utils.Invariants; + import org.apache.cassandra.gms.ApplicationState; import org.apache.cassandra.gms.EndpointState; import org.apache.cassandra.gms.Gossiper; diff --git a/src/java/org/apache/cassandra/service/accord/IAccordService.java b/src/java/org/apache/cassandra/service/accord/IAccordService.java index e500cd94a5..4364dd95f7 100644 --- a/src/java/org/apache/cassandra/service/accord/IAccordService.java +++ b/src/java/org/apache/cassandra/service/accord/IAccordService.java @@ -25,11 +25,11 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.BiConsumer; import java.util.function.Function; + import javax.annotation.Nonnull; import javax.annotation.Nullable; -import accord.utils.async.AsyncResult; -import org.apache.cassandra.tcm.ClusterMetadata; +import org.agrona.collections.Int2ObjectHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +51,8 @@ import accord.topology.EpochReady; import accord.topology.TopologyManager; import accord.utils.Invariants; import accord.utils.async.AsyncChain; -import org.agrona.collections.Int2ObjectHashMap; +import accord.utils.async.AsyncResult; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.exceptions.RequestExecutionException; @@ -63,6 +64,7 @@ import org.apache.cassandra.service.accord.AccordSyncPropagator.Notification; import org.apache.cassandra.service.accord.api.AccordScheduler; import org.apache.cassandra.service.accord.api.AccordTopologySorter; import org.apache.cassandra.service.accord.txn.TxnResult; +import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.transport.Dispatcher.RequestTime; import org.apache.cassandra.utils.concurrent.Future; diff --git a/src/java/org/apache/cassandra/service/accord/ImmediateAsyncExecutor.java b/src/java/org/apache/cassandra/service/accord/ImmediateAsyncExecutor.java index cc214dd380..d5c54b0c9b 100644 --- a/src/java/org/apache/cassandra/service/accord/ImmediateAsyncExecutor.java +++ b/src/java/org/apache/cassandra/service/accord/ImmediateAsyncExecutor.java @@ -21,6 +21,7 @@ package org.apache.cassandra.service.accord; import javax.annotation.Nonnull; import accord.impl.AbstractAsyncExecutor; + import org.apache.cassandra.service.accord.api.AccordAgent; public class ImmediateAsyncExecutor implements AbstractAsyncExecutor diff --git a/src/java/org/apache/cassandra/service/accord/JournalKey.java b/src/java/org/apache/cassandra/service/accord/JournalKey.java index cda98d7c99..e45c8b95fc 100644 --- a/src/java/org/apache/cassandra/service/accord/JournalKey.java +++ b/src/java/org/apache/cassandra/service/accord/JournalKey.java @@ -27,6 +27,7 @@ import accord.local.Node.Id; import accord.primitives.Timestamp; import accord.primitives.TxnId; import accord.utils.Invariants; + import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.journal.KeySupport; @@ -36,7 +37,13 @@ import org.apache.cassandra.utils.ByteArrayUtil; import static org.apache.cassandra.db.TypeSizes.BYTE_SIZE; import static org.apache.cassandra.db.TypeSizes.INT_SIZE; import static org.apache.cassandra.db.TypeSizes.LONG_SIZE; -import static org.apache.cassandra.service.accord.AccordJournalValueSerializers.*; +import static org.apache.cassandra.service.accord.AccordJournalValueSerializers.BootstrapBeganAtSerializer; +import static org.apache.cassandra.service.accord.AccordJournalValueSerializers.CommandDiffSerializer; +import static org.apache.cassandra.service.accord.AccordJournalValueSerializers.DurableBeforeSerializer; +import static org.apache.cassandra.service.accord.AccordJournalValueSerializers.FlyweightSerializer; +import static org.apache.cassandra.service.accord.AccordJournalValueSerializers.RangesForEpochSerializer; +import static org.apache.cassandra.service.accord.AccordJournalValueSerializers.RedundantBeforeSerializer; +import static org.apache.cassandra.service.accord.AccordJournalValueSerializers.SafeToReadSerializer; public final class JournalKey { diff --git a/src/java/org/apache/cassandra/service/accord/RangeSearcher.java b/src/java/org/apache/cassandra/service/accord/RangeSearcher.java index fdaab601aa..cb3707fed3 100644 --- a/src/java/org/apache/cassandra/service/accord/RangeSearcher.java +++ b/src/java/org/apache/cassandra/service/accord/RangeSearcher.java @@ -25,6 +25,7 @@ import javax.annotation.Nullable; import accord.local.MaxDecidedRX; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.index.accord.RouteIndexFormat; import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.utils.CloseableIterator; diff --git a/src/java/org/apache/cassandra/service/accord/RangeTreeRangeAccessor.java b/src/java/org/apache/cassandra/service/accord/RangeTreeRangeAccessor.java index 80eabf4b5a..0a870c8171 100644 --- a/src/java/org/apache/cassandra/service/accord/RangeTreeRangeAccessor.java +++ b/src/java/org/apache/cassandra/service/accord/RangeTreeRangeAccessor.java @@ -20,6 +20,7 @@ package org.apache.cassandra.service.accord; import accord.api.RoutingKey; import accord.primitives.Range; + import org.apache.cassandra.utils.RangeTree; public enum RangeTreeRangeAccessor implements RangeTree.Accessor diff --git a/src/java/org/apache/cassandra/service/accord/RequestBookkeeping.java b/src/java/org/apache/cassandra/service/accord/RequestBookkeeping.java index a4876e15a5..f0373b2dcf 100644 --- a/src/java/org/apache/cassandra/service/accord/RequestBookkeeping.java +++ b/src/java/org/apache/cassandra/service/accord/RequestBookkeeping.java @@ -19,10 +19,12 @@ package org.apache.cassandra.service.accord; import java.util.Collections; + import javax.annotation.Nullable; import accord.primitives.Seekables; import accord.primitives.TxnId; + import org.apache.cassandra.db.WriteType; import org.apache.cassandra.exceptions.ReadFailureException; import org.apache.cassandra.exceptions.ReadTimeoutException; diff --git a/src/java/org/apache/cassandra/service/accord/RouteInMemoryIndex.java b/src/java/org/apache/cassandra/service/accord/RouteInMemoryIndex.java index 65e0bb0921..3cf05ecfdb 100644 --- a/src/java/org/apache/cassandra/service/accord/RouteInMemoryIndex.java +++ b/src/java/org/apache/cassandra/service/accord/RouteInMemoryIndex.java @@ -32,6 +32,9 @@ import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; +import org.agrona.collections.Int2ObjectHashMap; +import org.agrona.collections.Long2ObjectHashMap; + import accord.local.MaxDecidedRX; import accord.local.MaxDecidedRX.DecidedRX; import accord.primitives.Route; @@ -40,8 +43,7 @@ import accord.primitives.Txn; import accord.primitives.TxnId; import accord.primitives.Unseekable; import accord.utils.Invariants; -import org.agrona.collections.Int2ObjectHashMap; -import org.agrona.collections.Long2ObjectHashMap; + import org.apache.cassandra.index.accord.OrderedRouteSerializer; import org.apache.cassandra.index.accord.RouteIndexFormat; import org.apache.cassandra.index.accord.RouteJournalIndex; diff --git a/src/java/org/apache/cassandra/service/accord/TimeOnlyRequestBookkeeping.java b/src/java/org/apache/cassandra/service/accord/TimeOnlyRequestBookkeeping.java index 1a6e258703..de84f3379b 100644 --- a/src/java/org/apache/cassandra/service/accord/TimeOnlyRequestBookkeeping.java +++ b/src/java/org/apache/cassandra/service/accord/TimeOnlyRequestBookkeeping.java @@ -19,6 +19,7 @@ package org.apache.cassandra.service.accord; import org.apache.cassandra.metrics.LatencyMetrics; + import static org.apache.cassandra.service.accord.RequestBookkeeping.ThrowsExceptionType.READ; public abstract class TimeOnlyRequestBookkeeping extends RequestBookkeeping diff --git a/src/java/org/apache/cassandra/service/accord/TokenRange.java b/src/java/org/apache/cassandra/service/accord/TokenRange.java index 9c00c4dcdf..3d20639f39 100644 --- a/src/java/org/apache/cassandra/service/accord/TokenRange.java +++ b/src/java/org/apache/cassandra/service/accord/TokenRange.java @@ -25,6 +25,7 @@ import com.google.common.annotations.VisibleForTesting; import accord.api.RoutingKey; import accord.primitives.Range; import accord.utils.Invariants; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; diff --git a/src/java/org/apache/cassandra/service/accord/WatermarkCollector.java b/src/java/org/apache/cassandra/service/accord/WatermarkCollector.java index 12229c99dc..88c9acce31 100644 --- a/src/java/org/apache/cassandra/service/accord/WatermarkCollector.java +++ b/src/java/org/apache/cassandra/service/accord/WatermarkCollector.java @@ -35,6 +35,8 @@ import com.google.common.base.Predicates; import com.google.common.collect.Iterators; import com.google.common.primitives.Ints; +import org.agrona.collections.Long2LongHashMap; + import accord.api.TopologyListener; import accord.local.Node; import accord.primitives.Range; @@ -43,7 +45,7 @@ import accord.topology.Topology; import accord.topology.TopologyManager; import accord.utils.Invariants; import accord.utils.ReducingRangeMap; -import org.agrona.collections.Long2LongHashMap; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java b/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java index 67825bad6b..de0b2d190f 100644 --- a/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java +++ b/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java @@ -26,14 +26,15 @@ import java.util.function.BiConsumer; import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.api.Agent; import accord.api.CoordinatorEventListener; import accord.api.OwnershipEventListener; -import accord.api.ReplicaEventListener; import accord.api.ProgressLog.BlockedUntil; +import accord.api.ReplicaEventListener; import accord.api.RoutingKey; import accord.api.Tracing; import accord.coordinate.Coordination; @@ -63,6 +64,7 @@ import accord.utils.UnhandledEnum; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; import accord.utils.async.Cancellable; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.exceptions.RequestTimeoutException; @@ -96,8 +98,8 @@ import static org.apache.cassandra.service.accord.api.AccordWaitStrategies.retry import static org.apache.cassandra.service.accord.api.AccordWaitStrategies.retryFetchTopology; import static org.apache.cassandra.service.accord.api.AccordWaitStrategies.retryJoinBootstrap; import static org.apache.cassandra.service.accord.api.AccordWaitStrategies.retrySyncPoint; -import static org.apache.cassandra.service.accord.api.AccordWaitStrategies.slowTxnPreaccept; import static org.apache.cassandra.service.accord.api.AccordWaitStrategies.slowRead; +import static org.apache.cassandra.service.accord.api.AccordWaitStrategies.slowTxnPreaccept; import static org.apache.cassandra.utils.Clock.Global.nanoTime; // TODO (expected): merge with AccordService diff --git a/src/java/org/apache/cassandra/service/accord/api/AccordRoutableKey.java b/src/java/org/apache/cassandra/service/accord/api/AccordRoutableKey.java index d70cf2beea..aa9317a2ca 100644 --- a/src/java/org/apache/cassandra/service/accord/api/AccordRoutableKey.java +++ b/src/java/org/apache/cassandra/service/accord/api/AccordRoutableKey.java @@ -23,6 +23,7 @@ import java.io.IOException; import javax.annotation.Nonnull; import accord.primitives.RoutableKey; + import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/api/AccordScheduler.java b/src/java/org/apache/cassandra/service/accord/api/AccordScheduler.java index b8e0b8755f..c0c0482f10 100644 --- a/src/java/org/apache/cassandra/service/accord/api/AccordScheduler.java +++ b/src/java/org/apache/cassandra/service/accord/api/AccordScheduler.java @@ -24,6 +24,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import accord.api.Scheduler; + import org.apache.cassandra.concurrent.ExecutorFactory; import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.concurrent.Shutdownable; diff --git a/src/java/org/apache/cassandra/service/accord/api/AccordTimeService.java b/src/java/org/apache/cassandra/service/accord/api/AccordTimeService.java index 2f13983ea8..b800e30b11 100644 --- a/src/java/org/apache/cassandra/service/accord/api/AccordTimeService.java +++ b/src/java/org/apache/cassandra/service/accord/api/AccordTimeService.java @@ -21,6 +21,7 @@ package org.apache.cassandra.service.accord.api; import java.util.concurrent.TimeUnit; import accord.local.TimeService; + import org.apache.cassandra.utils.Clock; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/src/java/org/apache/cassandra/service/accord/api/AccordTopologySorter.java b/src/java/org/apache/cassandra/service/accord/api/AccordTopologySorter.java index 6d1c42b490..d6ca0ab825 100644 --- a/src/java/org/apache/cassandra/service/accord/api/AccordTopologySorter.java +++ b/src/java/org/apache/cassandra/service/accord/api/AccordTopologySorter.java @@ -30,6 +30,7 @@ import accord.topology.ShardSelection; import accord.topology.Topologies; import accord.topology.Topology; import accord.utils.SortedList; + import org.apache.cassandra.locator.DynamicEndpointSnitch; import org.apache.cassandra.locator.Endpoint; import org.apache.cassandra.locator.InetAddressAndPort; diff --git a/src/java/org/apache/cassandra/service/accord/api/AccordWaitStrategies.java b/src/java/org/apache/cassandra/service/accord/api/AccordWaitStrategies.java index 74d1777aa2..b48056f425 100644 --- a/src/java/org/apache/cassandra/service/accord/api/AccordWaitStrategies.java +++ b/src/java/org/apache/cassandra/service/accord/api/AccordWaitStrategies.java @@ -21,6 +21,7 @@ package org.apache.cassandra.service.accord.api; import javax.annotation.Nullable; import accord.primitives.TxnId; + import org.apache.cassandra.config.AccordSpec; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.StringRetryStrategy; diff --git a/src/java/org/apache/cassandra/service/accord/api/PartitionKey.java b/src/java/org/apache/cassandra/service/accord/api/PartitionKey.java index 5301d42446..3f257387f7 100644 --- a/src/java/org/apache/cassandra/service/accord/api/PartitionKey.java +++ b/src/java/org/apache/cassandra/service/accord/api/PartitionKey.java @@ -24,6 +24,7 @@ import java.nio.ByteBuffer; import accord.api.Key; import accord.primitives.Range; import accord.utils.Invariants; + import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.SinglePartitionReadCommand; import org.apache.cassandra.db.marshal.ByteBufferAccessor; diff --git a/src/java/org/apache/cassandra/service/accord/api/TokenKey.java b/src/java/org/apache/cassandra/service/accord/api/TokenKey.java index 88a32babd2..bd18870948 100644 --- a/src/java/org/apache/cassandra/service/accord/api/TokenKey.java +++ b/src/java/org/apache/cassandra/service/accord/api/TokenKey.java @@ -36,6 +36,7 @@ import accord.primitives.RangeFactory; import accord.primitives.Ranges; import accord.utils.Invariants; import accord.utils.VIntCoding; + import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.dht.IPartitioner; diff --git a/src/java/org/apache/cassandra/service/accord/fastpath/FastPathStrategy.java b/src/java/org/apache/cassandra/service/accord/fastpath/FastPathStrategy.java index fac1d4a6a1..a53e342b5f 100644 --- a/src/java/org/apache/cassandra/service/accord/fastpath/FastPathStrategy.java +++ b/src/java/org/apache/cassandra/service/accord/fastpath/FastPathStrategy.java @@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableMap; import accord.local.Node; import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/fastpath/ParameterizedFastPathStrategy.java b/src/java/org/apache/cassandra/service/accord/fastpath/ParameterizedFastPathStrategy.java index 9ad04ebbfa..78f6ffd9f7 100644 --- a/src/java/org/apache/cassandra/service/accord/fastpath/ParameterizedFastPathStrategy.java +++ b/src/java/org/apache/cassandra/service/accord/fastpath/ParameterizedFastPathStrategy.java @@ -31,6 +31,8 @@ import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Collectors; +import javax.annotation.Nonnull; + import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; @@ -39,6 +41,7 @@ import accord.local.Node; import accord.topology.Shard; import accord.utils.Invariants; import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.util.DataInputPlus; @@ -46,8 +49,6 @@ import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.tcm.serialization.MetadataSerializer; import org.apache.cassandra.tcm.serialization.Version; -import javax.annotation.Nonnull; - public class ParameterizedFastPathStrategy implements FastPathStrategy { public static final String SIZE = "size"; diff --git a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropAdapter.java b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropAdapter.java index c98ba63a4a..001bc9afee 100644 --- a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropAdapter.java +++ b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropAdapter.java @@ -41,6 +41,7 @@ import accord.primitives.Txn; import accord.primitives.TxnId; import accord.primitives.Writes; import accord.topology.Topologies; + import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.service.accord.AccordEndpointMapper; import org.apache.cassandra.service.accord.txn.AccordUpdate; diff --git a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropApply.java b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropApply.java index 9fef927579..688f45192d 100644 --- a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropApply.java +++ b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropApply.java @@ -20,6 +20,8 @@ package org.apache.cassandra.service.accord.interop; import javax.annotation.Nullable; +import org.agrona.collections.Int2ObjectHashMap; + import accord.api.LocalListeners; import accord.api.Result; import accord.coordinate.ExecuteFlag.ExecuteFlags; @@ -44,7 +46,7 @@ import accord.primitives.Unseekables; import accord.primitives.Writes; import accord.topology.Topologies; import accord.utils.UnhandledEnum; -import org.agrona.collections.Int2ObjectHashMap; + import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.service.accord.AccordMessageSink.AccordMessageType; import org.apache.cassandra.service.accord.serializers.ApplySerializers.ApplySerializer; diff --git a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropExecution.java b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropExecution.java index 6872ed79e1..ab6fbb0d88 100644 --- a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropExecution.java +++ b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropExecution.java @@ -55,6 +55,7 @@ import accord.utils.Invariants; import accord.utils.UnhandledEnum; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; + import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.Mutation; diff --git a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropPersist.java b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropPersist.java index d567d2a175..b4849762c2 100644 --- a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropPersist.java +++ b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropPersist.java @@ -41,6 +41,7 @@ import accord.primitives.Writes; import accord.topology.Topologies; import accord.utils.Invariants; import accord.utils.UnhandledEnum; + import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.utils.Throwables; diff --git a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropRead.java b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropRead.java index fa55717d3c..504f1187a1 100644 --- a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropRead.java +++ b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropRead.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -44,6 +45,7 @@ import accord.primitives.TxnId; import accord.topology.Topologies; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; + import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.db.PartitionRangeReadCommand; import org.apache.cassandra.db.ReadCommand; diff --git a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropReadCallback.java b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropReadCallback.java index 6b6e204c63..d5095eb744 100644 --- a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropReadCallback.java +++ b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropReadCallback.java @@ -25,6 +25,7 @@ import accord.messages.ReadData; import accord.messages.ReadData.ReadOk; import accord.messages.ReadData.ReadReply; import accord.utils.Invariants; + import org.apache.cassandra.exceptions.RequestFailure; import org.apache.cassandra.exceptions.RequestFailureReason; import org.apache.cassandra.locator.InetAddressAndPort; diff --git a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropReadRepair.java b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropReadRepair.java index 73a669d7a6..7dbc3325b7 100644 --- a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropReadRepair.java +++ b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropReadRepair.java @@ -19,6 +19,7 @@ package org.apache.cassandra.service.accord.interop; import java.io.IOException; + import javax.annotation.Nullable; import accord.api.Data; @@ -35,6 +36,7 @@ import accord.primitives.TxnId; import accord.topology.Topologies; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; + import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.ReadRepairVerbHandler; import org.apache.cassandra.db.TypeSizes; diff --git a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropStableThenRead.java b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropStableThenRead.java index 468f5ff413..36ec1823f1 100644 --- a/src/java/org/apache/cassandra/service/accord/interop/AccordInteropStableThenRead.java +++ b/src/java/org/apache/cassandra/service/accord/interop/AccordInteropStableThenRead.java @@ -19,6 +19,7 @@ package org.apache.cassandra.service.accord.interop; import java.io.IOException; + import javax.annotation.Nullable; import accord.local.Commands; @@ -39,6 +40,7 @@ import accord.primitives.Timestamp; import accord.primitives.Txn; import accord.primitives.TxnId; import accord.topology.Topologies; + import org.apache.cassandra.db.ReadCommand; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/journal/AccordTopologyUpdate.java b/src/java/org/apache/cassandra/service/accord/journal/AccordTopologyUpdate.java index 26b7e546f8..efb92c2df1 100644 --- a/src/java/org/apache/cassandra/service/accord/journal/AccordTopologyUpdate.java +++ b/src/java/org/apache/cassandra/service/accord/journal/AccordTopologyUpdate.java @@ -21,13 +21,16 @@ package org.apache.cassandra.service.accord.journal; import java.io.IOException; import java.util.Map; import java.util.Objects; + +import org.agrona.collections.Int2ObjectHashMap; + import accord.api.Journal; import accord.local.CommandStores; import accord.primitives.Ranges; import accord.topology.Topology; import accord.utils.Invariants; import accord.utils.UnhandledEnum; -import org.agrona.collections.Int2ObjectHashMap; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/repair/AccordRepair.java b/src/java/org/apache/cassandra/service/accord/repair/AccordRepair.java index d9a905bb43..da3ffad949 100644 --- a/src/java/org/apache/cassandra/service/accord/repair/AccordRepair.java +++ b/src/java/org/apache/cassandra/service/accord/repair/AccordRepair.java @@ -22,12 +22,14 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.concurrent.Executor; + import javax.annotation.Nullable; import accord.local.Node; import accord.local.durability.DurabilityService.SyncRemote; import accord.primitives.Ranges; import accord.primitives.Timestamp; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.Range; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/AcceptSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/AcceptSerializers.java index 53391cd322..c515f15f95 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/AcceptSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/AcceptSerializers.java @@ -30,6 +30,7 @@ import accord.primitives.Participants; import accord.primitives.Route; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/ApplySerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/ApplySerializers.java index 8fdb1e0d80..29704e48cb 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/ApplySerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/ApplySerializers.java @@ -33,6 +33,7 @@ import accord.primitives.Timestamp; import accord.primitives.TxnId; import accord.primitives.Writes; import accord.utils.VIntCoding; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/AwaitSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/AwaitSerializers.java index 0e017184fb..25fd9eabad 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/AwaitSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/AwaitSerializers.java @@ -30,6 +30,7 @@ import accord.primitives.Route; import accord.primitives.SaveStatus; import accord.primitives.TxnId; import accord.utils.Invariants; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/BeginInvalidationSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/BeginInvalidationSerializers.java index 231c932878..3af24b3ecc 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/BeginInvalidationSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/BeginInvalidationSerializers.java @@ -27,6 +27,7 @@ import accord.primitives.Ballot; import accord.primitives.Participants; import accord.primitives.Route; import accord.primitives.SaveStatus; + import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/CheckStatusSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/CheckStatusSerializers.java index 9747d9f72f..baa954d69f 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/CheckStatusSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/CheckStatusSerializers.java @@ -42,6 +42,7 @@ import accord.primitives.Status.Durability; import accord.primitives.Timestamp; import accord.primitives.TxnId; import accord.primitives.Writes; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/CommandSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/CommandSerializers.java index 5163ab5418..690d2cdab9 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/CommandSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/CommandSerializers.java @@ -52,6 +52,7 @@ import accord.utils.ArrayBuffers; import accord.utils.BitUtils; import accord.utils.Invariants; import accord.utils.VIntCoding; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.ValueAccessor; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/CommandStoreSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/CommandStoreSerializers.java index a30ea59270..d006eafea7 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/CommandStoreSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/CommandStoreSerializers.java @@ -33,6 +33,7 @@ import accord.primitives.TxnId; import accord.utils.Invariants; import accord.utils.ReducingRangeMap; import accord.utils.TriFunction; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/CommitSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/CommitSerializers.java index 2d2592eee8..2e52d85e19 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/CommitSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/CommitSerializers.java @@ -29,6 +29,7 @@ import accord.primitives.Participants; import accord.primitives.Route; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/DepsSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/DepsSerializers.java index c20d4a5e91..0e0d707063 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/DepsSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/DepsSerializers.java @@ -31,6 +31,7 @@ import accord.primitives.RoutingKeys; import accord.primitives.TxnId; import accord.utils.Invariants; import accord.utils.VIntCoding; + import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/EnumSerializer.java b/src/java/org/apache/cassandra/service/accord/serializers/EnumSerializer.java index b8c77d3ecf..429a2f1898 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/EnumSerializer.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/EnumSerializer.java @@ -21,6 +21,7 @@ package org.apache.cassandra.service.accord.serializers; import java.io.IOException; import accord.messages.SimpleReply; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/FetchSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/FetchSerializers.java index e5da16bb07..2acd8e2464 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/FetchSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/FetchSerializers.java @@ -27,6 +27,7 @@ import accord.messages.ReadData.CommitOrReadNack; import accord.messages.ReadData.ReadReply; import accord.primitives.Ranges; import accord.utils.VIntCoding; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/GetDurableBeforeSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/GetDurableBeforeSerializers.java index 4ba6d7366f..1c64d281fd 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/GetDurableBeforeSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/GetDurableBeforeSerializers.java @@ -21,6 +21,7 @@ import java.io.IOException; import accord.messages.GetDurableBefore; import accord.messages.GetDurableBefore.DurableBeforeReply; + import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/GetEphmrlReadDepsSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/GetEphmrlReadDepsSerializers.java index 670a8cdee3..5281902841 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/GetEphmrlReadDepsSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/GetEphmrlReadDepsSerializers.java @@ -26,6 +26,7 @@ import accord.messages.GetEphemeralReadDeps.GetEphemeralReadDepsOk; import accord.primitives.Deps; import accord.primitives.Route; import accord.primitives.TxnId; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/GetMaxConflictSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/GetMaxConflictSerializers.java index eed742e247..013d021ae0 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/GetMaxConflictSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/GetMaxConflictSerializers.java @@ -24,6 +24,7 @@ import accord.messages.GetMaxConflict; import accord.messages.GetMaxConflict.GetMaxConflictOk; import accord.primitives.Route; import accord.primitives.Timestamp; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/IVersionedWithKeysSerializer.java b/src/java/org/apache/cassandra/service/accord/serializers/IVersionedWithKeysSerializer.java index d9b9f18005..77d30ff71a 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/IVersionedWithKeysSerializer.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/IVersionedWithKeysSerializer.java @@ -22,6 +22,9 @@ import java.io.IOException; import java.util.function.BiFunction; import java.util.function.IntFunction; +import net.nicoulaj.compilecommand.annotations.DontInline; +import net.nicoulaj.compilecommand.annotations.Inline; + import accord.api.Key; import accord.api.RoutingKey; import accord.primitives.AbstractKeys; @@ -35,8 +38,7 @@ import accord.primitives.RoutableKey; import accord.primitives.Routables; import accord.primitives.RoutingKeys; import accord.utils.UnhandledEnum; -import net.nicoulaj.compilecommand.annotations.DontInline; -import net.nicoulaj.compilecommand.annotations.Inline; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/InformSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/InformSerializers.java index 5e1ee94ea1..f1aaf9a612 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/InformSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/InformSerializers.java @@ -25,6 +25,7 @@ import accord.primitives.Route; import accord.primitives.Status; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/KeySerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/KeySerializers.java index d8778fc67b..8cf9f8b463 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/KeySerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/KeySerializers.java @@ -54,6 +54,7 @@ import accord.primitives.Unseekables.UnseekablesKind; import accord.utils.Invariants; import accord.utils.TinyEnumSet; import accord.utils.UnhandledEnum; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; @@ -61,8 +62,8 @@ import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.service.accord.TokenRange; import org.apache.cassandra.service.accord.api.AccordRoutableKey.AccordKeySerializer; import org.apache.cassandra.service.accord.api.AccordRoutableKey.AccordSearchableKeySerializer; -import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.service.accord.api.PartitionKey; +import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.utils.NullableSerializer; import static accord.utils.ArrayBuffers.cachedInts; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/LatestDepsSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/LatestDepsSerializers.java index 26d95b0494..b26ff11157 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/LatestDepsSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/LatestDepsSerializers.java @@ -30,6 +30,7 @@ import accord.primitives.LatestDeps; import accord.primitives.Route; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/PreacceptSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/PreacceptSerializers.java index ae07f347c4..fe263b1adc 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/PreacceptSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/PreacceptSerializers.java @@ -19,6 +19,7 @@ package org.apache.cassandra.service.accord.serializers; import java.io.IOException; + import javax.annotation.Nullable; import accord.coordinate.ExecuteFlag.ExecuteFlags; @@ -30,6 +31,7 @@ import accord.primitives.PartialDeps; import accord.primitives.PartialTxn; import accord.primitives.Route; import accord.primitives.TxnId; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/ReadDataSerializer.java b/src/java/org/apache/cassandra/service/accord/serializers/ReadDataSerializer.java index 8c1bd7eca8..5e496329df 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/ReadDataSerializer.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/ReadDataSerializer.java @@ -44,6 +44,7 @@ import accord.primitives.TxnId; import accord.primitives.Writes; import accord.utils.Invariants; import accord.utils.UnhandledEnum; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.VersionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/RecoverySerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/RecoverySerializers.java index 9e67d5dcac..e3db6c0e07 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/RecoverySerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/RecoverySerializers.java @@ -19,6 +19,7 @@ package org.apache.cassandra.service.accord.serializers; import java.io.IOException; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -40,6 +41,7 @@ import accord.primitives.Status; import accord.primitives.Timestamp; import accord.primitives.TxnId; import accord.primitives.Writes; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/ResultSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/ResultSerializers.java index aa28e4cd27..be9e68cb6e 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/ResultSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/ResultSerializers.java @@ -19,6 +19,7 @@ package org.apache.cassandra.service.accord.serializers; import accord.api.Result; + import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/SerializePacked.java b/src/java/org/apache/cassandra/service/accord/serializers/SerializePacked.java index 67d66a7185..a0b6f0a386 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/SerializePacked.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/SerializePacked.java @@ -20,9 +20,11 @@ package org.apache.cassandra.service.accord.serializers; import java.io.IOException; +import net.nicoulaj.compilecommand.annotations.Inline; + import accord.utils.BitUtils; import accord.utils.Invariants; -import net.nicoulaj.compilecommand.annotations.Inline; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/SetDurableSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/SetDurableSerializers.java index a5e7ef92dc..97dbb86d3c 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/SetDurableSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/SetDurableSerializers.java @@ -27,6 +27,7 @@ import accord.primitives.RangeRoute; import accord.primitives.Route; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/TableMetadatas.java b/src/java/org/apache/cassandra/service/accord/serializers/TableMetadatas.java index e022d193ff..c09fa532dd 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/TableMetadatas.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/TableMetadatas.java @@ -28,6 +28,7 @@ import com.google.common.annotations.VisibleForTesting; import accord.utils.Invariants; import accord.utils.SortedArrays; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.exceptions.UnknownTableException; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/TableMetadatasAndKeys.java b/src/java/org/apache/cassandra/service/accord/serializers/TableMetadatasAndKeys.java index 47b218944a..57e2bc9e28 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/TableMetadatasAndKeys.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/TableMetadatasAndKeys.java @@ -31,6 +31,7 @@ import accord.primitives.Seekable; import accord.primitives.Seekables; import accord.utils.Invariants; import accord.utils.VIntCoding; + import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/TopologySerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/TopologySerializers.java index 0802b083d7..6bd0f1eb5c 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/TopologySerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/TopologySerializers.java @@ -23,6 +23,8 @@ import java.nio.ByteBuffer; import java.util.List; import java.util.Map; +import org.agrona.collections.Object2IntHashMap; + import accord.local.Node; import accord.primitives.Range; import accord.topology.Shard; @@ -31,7 +33,7 @@ import accord.utils.LargeBitSet; import accord.utils.SortedArrays; import accord.utils.SortedArrays.SortedArrayList; import accord.utils.TinyEnumSet; -import org.agrona.collections.Object2IntHashMap; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.io.UnversionedSerializer; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/TxnRequestSerializer.java b/src/java/org/apache/cassandra/service/accord/serializers/TxnRequestSerializer.java index 37e5efdb8f..d737844aa4 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/TxnRequestSerializer.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/TxnRequestSerializer.java @@ -23,6 +23,7 @@ import java.io.IOException; import accord.messages.RouteRequest; import accord.primitives.Route; import accord.primitives.TxnId; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/WaitingOnSerializer.java b/src/java/org/apache/cassandra/service/accord/serializers/WaitingOnSerializer.java index 16a71e1bdd..1e7b56fa8b 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/WaitingOnSerializer.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/WaitingOnSerializer.java @@ -31,6 +31,7 @@ import accord.primitives.TxnId; import accord.utils.ImmutableBitSet; import accord.utils.Invariants; import accord.utils.LargeBitSet; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/txn/AbstractKeySorted.java b/src/java/org/apache/cassandra/service/accord/txn/AbstractKeySorted.java index ac605b33ab..14e1b7212c 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/AbstractKeySorted.java +++ b/src/java/org/apache/cassandra/service/accord/txn/AbstractKeySorted.java @@ -35,6 +35,7 @@ import accord.primitives.Ranges; import accord.primitives.Routable.Domain; import accord.primitives.Seekable; import accord.primitives.Seekables; + import org.apache.cassandra.service.accord.TokenRange; import org.apache.cassandra.service.accord.api.PartitionKey; diff --git a/src/java/org/apache/cassandra/service/accord/txn/AbstractParameterisedUnversionedSerialized.java b/src/java/org/apache/cassandra/service/accord/txn/AbstractParameterisedUnversionedSerialized.java index b0a827b7bf..4bd83d7aa2 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/AbstractParameterisedUnversionedSerialized.java +++ b/src/java/org/apache/cassandra/service/accord/txn/AbstractParameterisedUnversionedSerialized.java @@ -19,6 +19,7 @@ package org.apache.cassandra.service.accord.txn; import java.nio.ByteBuffer; + import javax.annotation.Nullable; import org.apache.cassandra.io.ParameterisedUnversionedSerializer; diff --git a/src/java/org/apache/cassandra/service/accord/txn/AbstractParameterisedVersionedSerialized.java b/src/java/org/apache/cassandra/service/accord/txn/AbstractParameterisedVersionedSerialized.java index e2c628f9ab..f1a5316e51 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/AbstractParameterisedVersionedSerialized.java +++ b/src/java/org/apache/cassandra/service/accord/txn/AbstractParameterisedVersionedSerialized.java @@ -19,11 +19,13 @@ package org.apache.cassandra.service.accord.txn; import java.nio.ByteBuffer; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; import accord.utils.Invariants; + import org.apache.cassandra.service.accord.serializers.Version; /** diff --git a/src/java/org/apache/cassandra/service/accord/txn/AbstractSerialized.java b/src/java/org/apache/cassandra/service/accord/txn/AbstractSerialized.java index d3d86dfa85..a5add844ac 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/AbstractSerialized.java +++ b/src/java/org/apache/cassandra/service/accord/txn/AbstractSerialized.java @@ -20,6 +20,7 @@ package org.apache.cassandra.service.accord.txn; import java.nio.ByteBuffer; import java.util.Objects; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; diff --git a/src/java/org/apache/cassandra/service/accord/txn/AccordUpdate.java b/src/java/org/apache/cassandra/service/accord/txn/AccordUpdate.java index f6d50763a4..7b0e2c3699 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/AccordUpdate.java +++ b/src/java/org/apache/cassandra/service/accord/txn/AccordUpdate.java @@ -19,10 +19,12 @@ package org.apache.cassandra.service.accord.txn; import java.io.IOException; + import javax.annotation.Nullable; import accord.api.Data; import accord.api.Update; + import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnCondition.java b/src/java/org/apache/cassandra/service/accord/txn/TxnCondition.java index 589f954fb6..90897d8ea3 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnCondition.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnCondition.java @@ -25,6 +25,7 @@ import java.util.EnumSet; import java.util.List; import java.util.Objects; import java.util.Set; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -33,6 +34,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import accord.utils.Invariants; + import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.cql3.conditions.ColumnCondition; import org.apache.cassandra.cql3.conditions.ColumnCondition.Bound; diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnData.java b/src/java/org/apache/cassandra/service/accord/txn/TxnData.java index 4d5ab0b6a3..d47f756dc5 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnData.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnData.java @@ -21,11 +21,13 @@ package org.apache.cassandra.service.accord.txn; import java.io.IOException; import java.util.Map; +import org.agrona.collections.Int2ObjectHashMap; + import accord.api.Data; import accord.primitives.Ranges; import accord.primitives.Timestamp; import accord.primitives.TxnId; -import org.agrona.collections.Int2ObjectHashMap; + import org.apache.cassandra.db.EmptyIterators; import org.apache.cassandra.db.SinglePartitionReadCommand; import org.apache.cassandra.db.TypeSizes; diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnDataKeyValue.java b/src/java/org/apache/cassandra/service/accord/txn/TxnDataKeyValue.java index 5e81f79f38..fd62e1f949 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnDataKeyValue.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnDataKeyValue.java @@ -22,6 +22,7 @@ import java.io.IOException; import accord.primitives.Ranges; import accord.utils.Invariants; + import org.apache.cassandra.db.partitions.FilteredPartition; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.rows.RowIterator; diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnDataRangeValue.java b/src/java/org/apache/cassandra/service/accord/txn/TxnDataRangeValue.java index a23c05828b..571b07f0dd 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnDataRangeValue.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnDataRangeValue.java @@ -23,11 +23,13 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.RandomAccess; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.collect.Lists; import accord.primitives.Ranges; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.partitions.FilteredPartition; import org.apache.cassandra.db.partitions.PartitionIterator; diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnDataValue.java b/src/java/org/apache/cassandra/service/accord/txn/TxnDataValue.java index cacafcd616..46c31f1ee5 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnDataValue.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnDataValue.java @@ -23,6 +23,7 @@ import java.io.IOException; import javax.annotation.Nullable; import accord.primitives.Ranges; + import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.service.accord.serializers.IVersionedSerializer; diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnNamedRead.java b/src/java/org/apache/cassandra/service/accord/txn/TxnNamedRead.java index a9060c52d3..5cf61c2d8d 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnNamedRead.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnNamedRead.java @@ -36,6 +36,7 @@ import accord.primitives.Timestamp; import accord.utils.Invariants; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; + import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.PartitionPosition; import org.apache.cassandra.db.PartitionRangeReadCommand; @@ -60,9 +61,9 @@ import org.apache.cassandra.schema.TableId; import org.apache.cassandra.service.accord.AccordExecutor; import org.apache.cassandra.service.accord.TokenRange; import org.apache.cassandra.service.accord.api.PartitionKey; +import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.service.accord.serializers.TableMetadatas; import org.apache.cassandra.service.accord.serializers.TableMetadatasAndKeys; -import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.service.accord.serializers.Version; import org.apache.cassandra.service.accord.txn.TxnData.TxnDataNameKind; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnQuery.java b/src/java/org/apache/cassandra/service/accord/txn/TxnQuery.java index 191518e34a..088cd684d9 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnQuery.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnQuery.java @@ -20,6 +20,7 @@ package org.apache.cassandra.service.accord.txn; import java.io.IOException; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.base.Preconditions; @@ -33,6 +34,7 @@ import accord.primitives.Ranges; import accord.primitives.Seekables; import accord.primitives.Timestamp; import accord.primitives.TxnId; + import org.apache.cassandra.db.EmptyIterators; import org.apache.cassandra.db.PartitionRangeReadCommand; import org.apache.cassandra.db.SinglePartitionReadCommand; diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnRead.java b/src/java/org/apache/cassandra/service/accord/txn/TxnRead.java index 39e16cfd3f..1f025c7139 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnRead.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnRead.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Comparator; import java.util.List; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -43,6 +44,7 @@ import accord.primitives.Timestamp; import accord.utils.UnhandledEnum; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; + import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.PartitionPosition; import org.apache.cassandra.db.PartitionRangeReadCommand; diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnReference.java b/src/java/org/apache/cassandra/service/accord/txn/TxnReference.java index 13d021930a..8b6f753951 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnReference.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnReference.java @@ -29,6 +29,7 @@ import accord.utils.Invariants; import accord.utils.TinyEnumSet; import accord.utils.UnhandledEnum; import accord.utils.VIntCoding; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ByteBufferAccessor; diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnUpdate.java b/src/java/org/apache/cassandra/service/accord/txn/TxnUpdate.java index 0d3def4fd0..3cf34fbf7a 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnUpdate.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnUpdate.java @@ -26,6 +26,7 @@ import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.function.Function; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; @@ -42,6 +43,7 @@ import accord.utils.Invariants; import accord.utils.SimpleBitSet; import accord.utils.SimpleBitSets; import accord.utils.SortedArrays; + import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.TypeSizes; diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnWrite.java b/src/java/org/apache/cassandra/service/accord/txn/TxnWrite.java index e00da6690a..882e2d27e7 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnWrite.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnWrite.java @@ -46,6 +46,7 @@ import accord.utils.SimpleBitSet; import accord.utils.SimpleBitSets; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; + import org.apache.cassandra.cql3.UpdateParameters; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.Columns; diff --git a/src/java/org/apache/cassandra/service/accord/txn/UnrecoverableRepairUpdate.java b/src/java/org/apache/cassandra/service/accord/txn/UnrecoverableRepairUpdate.java index 7167a637ed..e995142bb6 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/UnrecoverableRepairUpdate.java +++ b/src/java/org/apache/cassandra/service/accord/txn/UnrecoverableRepairUpdate.java @@ -20,6 +20,7 @@ package org.apache.cassandra.service.accord.txn; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -32,6 +33,7 @@ import accord.primitives.Participants; import accord.primitives.Ranges; import accord.primitives.Seekables; import accord.primitives.Timestamp; + import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Mutation; diff --git a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusKeyMigrationState.java b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusKeyMigrationState.java index 196c250e04..b5b960b995 100644 --- a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusKeyMigrationState.java +++ b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusKeyMigrationState.java @@ -23,12 +23,18 @@ import java.nio.ByteBuffer; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; + import javax.annotation.Nonnull; import javax.annotation.Nullable; +import com.github.benmanes.caffeine.cache.CacheLoader; +import com.github.benmanes.caffeine.cache.Caffeine; +import com.github.benmanes.caffeine.cache.LoadingCache; +import com.github.benmanes.caffeine.cache.Weigher; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,10 +42,7 @@ import accord.primitives.Keys; import accord.primitives.Range; import accord.primitives.Ranges; import accord.primitives.Timestamp; -import com.github.benmanes.caffeine.cache.CacheLoader; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.github.benmanes.caffeine.cache.LoadingCache; -import com.github.benmanes.caffeine.cache.Weigher; + import org.apache.cassandra.concurrent.ImmediateExecutor; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigratedAt.java b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigratedAt.java index cc64f3f582..8aef6298ff 100644 --- a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigratedAt.java +++ b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigratedAt.java @@ -19,6 +19,7 @@ package org.apache.cassandra.service.consensus.migration; import java.io.IOException; + import javax.annotation.Nullable; import org.apache.cassandra.db.TypeSizes; diff --git a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationMutationHelper.java b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationMutationHelper.java index 0e9d410303..9fc8f6ba28 100644 --- a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationMutationHelper.java +++ b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationMutationHelper.java @@ -24,16 +24,19 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.function.Predicate; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.primitives.Routable.Domain; import accord.primitives.Txn; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.DecoratedKey; diff --git a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationRepairResult.java b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationRepairResult.java index 2efe2a6686..4f916cb72a 100644 --- a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationRepairResult.java +++ b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationRepairResult.java @@ -21,6 +21,7 @@ package org.apache.cassandra.service.consensus.migration; import javax.annotation.Nullable; import accord.primitives.Ranges; + import org.apache.cassandra.service.accord.IAccordService; import org.apache.cassandra.service.accord.repair.AccordRepair.AccordRepairResult; import org.apache.cassandra.tcm.Epoch; diff --git a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationState.java b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationState.java index 67d43ab77b..f730ef796e 100644 --- a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationState.java +++ b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationState.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusRequestRouter.java b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusRequestRouter.java index 2988b8563e..c447c7ebd9 100644 --- a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusRequestRouter.java +++ b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusRequestRouter.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.function.BiPredicate; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -32,6 +33,7 @@ import accord.primitives.Routable.Domain; import accord.primitives.Seekables; import accord.primitives.Txn; import accord.primitives.Txn.Kind; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.ConsistencyLevel; diff --git a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusTableMigration.java b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusTableMigration.java index 79a7f67ed5..7a954c17ef 100644 --- a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusTableMigration.java +++ b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusTableMigration.java @@ -26,12 +26,14 @@ import java.util.Map; import java.util.Optional; import java.util.function.Function; import java.util.function.Predicate; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.FutureCallback; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,12 +64,12 @@ import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.tcm.transformations.BeginConsensusMigrationForTableAndRange; import org.apache.cassandra.tcm.transformations.MaybeFinishConsensusMigrationForTableAndRange; -import static java.lang.String.format; -import static java.util.Collections.emptyList; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; +import static java.lang.String.format; +import static java.util.Collections.emptyList; import static org.apache.cassandra.dht.NormalizedRanges.normalizedRanges; import static org.apache.cassandra.dht.Range.normalize; import static org.apache.cassandra.utils.CollectionSerializers.deserializeList; diff --git a/src/java/org/apache/cassandra/service/consensus/migration/TableMigrationState.java b/src/java/org/apache/cassandra/service/consensus/migration/TableMigrationState.java index 01fb936565..91e112a83a 100644 --- a/src/java/org/apache/cassandra/service/consensus/migration/TableMigrationState.java +++ b/src/java/org/apache/cassandra/service/consensus/migration/TableMigrationState.java @@ -31,6 +31,7 @@ import java.util.NavigableMap; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -39,6 +40,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/disk/usage/DiskUsageBroadcaster.java b/src/java/org/apache/cassandra/service/disk/usage/DiskUsageBroadcaster.java index a2674fc795..9f638e3313 100644 --- a/src/java/org/apache/cassandra/service/disk/usage/DiskUsageBroadcaster.java +++ b/src/java/org/apache/cassandra/service/disk/usage/DiskUsageBroadcaster.java @@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/disk/usage/DiskUsageMonitor.java b/src/java/org/apache/cassandra/service/disk/usage/DiskUsageMonitor.java index fad5945483..83e5ba2e08 100644 --- a/src/java/org/apache/cassandra/service/disk/usage/DiskUsageMonitor.java +++ b/src/java/org/apache/cassandra/service/disk/usage/DiskUsageMonitor.java @@ -33,6 +33,7 @@ import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java index 292264984f..45fb35ab7f 100644 --- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java +++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java @@ -17,10 +17,20 @@ */ package org.apache.cassandra.service.pager; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.*; -import org.apache.cassandra.db.partitions.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ConsistencyLevel; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.EmptyIterators; +import org.apache.cassandra.db.ReadExecutionController; +import org.apache.cassandra.db.ReadQuery; import org.apache.cassandra.db.filter.DataLimits; +import org.apache.cassandra.db.partitions.PartitionIterator; +import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; +import org.apache.cassandra.db.rows.BaseRowIterator; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.RowIterator; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.transform.Transformation; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ClientState; diff --git a/src/java/org/apache/cassandra/service/pager/AggregationQueryPager.java b/src/java/org/apache/cassandra/service/pager/AggregationQueryPager.java index 95d910de60..c6701e41ba 100644 --- a/src/java/org/apache/cassandra/service/pager/AggregationQueryPager.java +++ b/src/java/org/apache/cassandra/service/pager/AggregationQueryPager.java @@ -20,13 +20,17 @@ package org.apache.cassandra.service.pager; import java.nio.ByteBuffer; import java.util.NoSuchElementException; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ConsistencyLevel; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.ReadExecutionController; +import org.apache.cassandra.db.RegularAndStaticColumns; import org.apache.cassandra.db.aggregation.GroupingState; import org.apache.cassandra.db.filter.DataLimits; import org.apache.cassandra.db.partitions.PartitionIterator; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.rows.RowIterator; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.Dispatcher; diff --git a/src/java/org/apache/cassandra/service/pager/MultiPartitionPager.java b/src/java/org/apache/cassandra/service/pager/MultiPartitionPager.java index 842eb35e81..d71aafc52d 100644 --- a/src/java/org/apache/cassandra/service/pager/MultiPartitionPager.java +++ b/src/java/org/apache/cassandra/service/pager/MultiPartitionPager.java @@ -17,20 +17,21 @@ */ package org.apache.cassandra.service.pager; +import java.util.Arrays; + +import org.apache.cassandra.db.ConsistencyLevel; +import org.apache.cassandra.db.ReadExecutionController; +import org.apache.cassandra.db.SinglePartitionReadQuery; +import org.apache.cassandra.db.filter.DataLimits; +import org.apache.cassandra.db.partitions.PartitionIterator; +import org.apache.cassandra.db.rows.RowIterator; +import org.apache.cassandra.exceptions.RequestExecutionException; +import org.apache.cassandra.exceptions.RequestValidationException; +import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.AbstractIterator; -import java.util.Arrays; - -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.*; -import org.apache.cassandra.db.filter.DataLimits; -import org.apache.cassandra.db.partitions.*; -import org.apache.cassandra.exceptions.RequestValidationException; -import org.apache.cassandra.exceptions.RequestExecutionException; -import org.apache.cassandra.service.ClientState; - /** * Pager over a list of SinglePartitionReadQuery. * diff --git a/src/java/org/apache/cassandra/service/pager/PagingState.java b/src/java/org/apache/cassandra/service/pager/PagingState.java index 627f958ff3..ef19275501 100644 --- a/src/java/org/apache/cassandra/service/pager/PagingState.java +++ b/src/java/org/apache/cassandra/service/pager/PagingState.java @@ -19,7 +19,11 @@ package org.apache.cassandra.service.pager; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; import com.google.common.annotations.VisibleForTesting; @@ -40,7 +44,14 @@ import org.apache.cassandra.transport.ProtocolVersion; import static org.apache.cassandra.db.TypeSizes.sizeof; import static org.apache.cassandra.db.TypeSizes.sizeofUnsignedVInt; -import static org.apache.cassandra.utils.ByteBufferUtil.*; +import static org.apache.cassandra.utils.ByteBufferUtil.EMPTY_BYTE_BUFFER; +import static org.apache.cassandra.utils.ByteBufferUtil.bytesToHex; +import static org.apache.cassandra.utils.ByteBufferUtil.readWithShortLength; +import static org.apache.cassandra.utils.ByteBufferUtil.readWithVIntLength; +import static org.apache.cassandra.utils.ByteBufferUtil.serializedSizeWithShortLength; +import static org.apache.cassandra.utils.ByteBufferUtil.serializedSizeWithVIntLength; +import static org.apache.cassandra.utils.ByteBufferUtil.writeWithShortLength; +import static org.apache.cassandra.utils.ByteBufferUtil.writeWithVIntLength; import static org.apache.cassandra.utils.vint.VIntCoding.computeUnsignedVIntSize; import static org.apache.cassandra.utils.vint.VIntCoding.getUnsignedVInt; diff --git a/src/java/org/apache/cassandra/service/pager/PartitionRangeQueryPager.java b/src/java/org/apache/cassandra/service/pager/PartitionRangeQueryPager.java index 3ee90d7074..e70b80f5bb 100644 --- a/src/java/org/apache/cassandra/service/pager/PartitionRangeQueryPager.java +++ b/src/java/org/apache/cassandra/service/pager/PartitionRangeQueryPager.java @@ -17,10 +17,18 @@ */ package org.apache.cassandra.service.pager; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.DataRange; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.PartitionPosition; +import org.apache.cassandra.db.PartitionRangeReadQuery; import org.apache.cassandra.db.filter.DataLimits; import org.apache.cassandra.db.rows.Row; -import org.apache.cassandra.dht.*; +import org.apache.cassandra.dht.AbstractBounds; +import org.apache.cassandra.dht.Bounds; +import org.apache.cassandra.dht.ExcludingBounds; +import org.apache.cassandra.dht.IncludingExcludingBounds; +import org.apache.cassandra.dht.Range; import org.apache.cassandra.transport.ProtocolVersion; /** diff --git a/src/java/org/apache/cassandra/service/pager/QueryPager.java b/src/java/org/apache/cassandra/service/pager/QueryPager.java index 1619af8a38..7bf0e541de 100644 --- a/src/java/org/apache/cassandra/service/pager/QueryPager.java +++ b/src/java/org/apache/cassandra/service/pager/QueryPager.java @@ -18,9 +18,9 @@ package org.apache.cassandra.service.pager; import org.apache.cassandra.db.ConsistencyLevel; +import org.apache.cassandra.db.EmptyIterators; import org.apache.cassandra.db.ReadExecutionController; import org.apache.cassandra.db.filter.DataLimits; -import org.apache.cassandra.db.EmptyIterators; import org.apache.cassandra.db.partitions.PartitionIterator; import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.exceptions.RequestValidationException; diff --git a/src/java/org/apache/cassandra/service/pager/SinglePartitionPager.java b/src/java/org/apache/cassandra/service/pager/SinglePartitionPager.java index 832526e5ce..87e820ea34 100644 --- a/src/java/org/apache/cassandra/service/pager/SinglePartitionPager.java +++ b/src/java/org/apache/cassandra/service/pager/SinglePartitionPager.java @@ -19,9 +19,11 @@ package org.apache.cassandra.service.pager; import java.nio.ByteBuffer; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.*; -import org.apache.cassandra.db.filter.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.SinglePartitionReadQuery; +import org.apache.cassandra.db.filter.DataLimits; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.transport.ProtocolVersion; /** diff --git a/src/java/org/apache/cassandra/service/paxos/AbstractPaxosRepair.java b/src/java/org/apache/cassandra/service/paxos/AbstractPaxosRepair.java index 7640d75e89..7efe0602e5 100644 --- a/src/java/org/apache/cassandra/service/paxos/AbstractPaxosRepair.java +++ b/src/java/org/apache/cassandra/service/paxos/AbstractPaxosRepair.java @@ -24,9 +24,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.function.Consumer; + import javax.annotation.Nullable; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/paxos/Commit.java b/src/java/org/apache/cassandra/service/paxos/Commit.java index c6a9916f79..fd4102e038 100644 --- a/src/java/org/apache/cassandra/service/paxos/Commit.java +++ b/src/java/org/apache/cassandra/service/paxos/Commit.java @@ -23,6 +23,7 @@ package org.apache.cassandra.service.paxos; import java.io.IOException; import java.util.function.BiFunction; + import javax.annotation.Nullable; import com.google.common.base.Objects; diff --git a/src/java/org/apache/cassandra/service/paxos/ContentionStrategy.java b/src/java/org/apache/cassandra/service/paxos/ContentionStrategy.java index b5107016b6..06d49dc9ae 100644 --- a/src/java/org/apache/cassandra/service/paxos/ContentionStrategy.java +++ b/src/java/org/apache/cassandra/service/paxos/ContentionStrategy.java @@ -18,10 +18,20 @@ package org.apache.cassandra.service.paxos; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.annotation.Nullable; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.DecoratedKey; @@ -35,22 +45,16 @@ import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.NoSpamLogger; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.annotation.Nullable; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import static java.lang.Math.max; import static java.lang.Math.min; import static java.util.Arrays.stream; import static java.util.concurrent.TimeUnit.MICROSECONDS; import static java.util.concurrent.TimeUnit.MINUTES; -import static org.apache.cassandra.config.DatabaseDescriptor.*; +import static org.apache.cassandra.config.DatabaseDescriptor.getRpcTimeout; +import static org.apache.cassandra.config.DatabaseDescriptor.setPaxosContentionMaxWait; +import static org.apache.cassandra.config.DatabaseDescriptor.setPaxosContentionMinDelta; +import static org.apache.cassandra.config.DatabaseDescriptor.setPaxosContentionMinWait; +import static org.apache.cassandra.config.DatabaseDescriptor.setPaxosContentionWaitRandomizer; import static org.apache.cassandra.metrics.ClientRequestsMetricsHolder.casReadMetrics; import static org.apache.cassandra.metrics.ClientRequestsMetricsHolder.casWriteMetrics; import static org.apache.cassandra.service.TimeoutStrategy.parseInMicros; diff --git a/src/java/org/apache/cassandra/service/paxos/Paxos.java b/src/java/org/apache/cassandra/service/paxos/Paxos.java index 57b6da8d77..a40900f73c 100644 --- a/src/java/org/apache/cassandra/service/paxos/Paxos.java +++ b/src/java/org/apache/cassandra/service/paxos/Paxos.java @@ -28,15 +28,17 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; + import javax.annotation.Nullable; +import com.codahale.metrics.Meter; import com.google.common.base.Preconditions; import com.google.common.collect.Iterators; import com.google.common.collect.Maps; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Meter; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ConsistencyLevel; diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosPrepare.java b/src/java/org/apache/cassandra/service/paxos/PaxosPrepare.java index 1c3df86925..f1c2f3fdd7 100644 --- a/src/java/org/apache/cassandra/service/paxos/PaxosPrepare.java +++ b/src/java/org/apache/cassandra/service/paxos/PaxosPrepare.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.stream.Collectors; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosPropose.java b/src/java/org/apache/cassandra/service/paxos/PaxosPropose.java index 2245f38141..f3e42a7a9a 100644 --- a/src/java/org/apache/cassandra/service/paxos/PaxosPropose.java +++ b/src/java/org/apache/cassandra/service/paxos/PaxosPropose.java @@ -22,9 +22,11 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicLongFieldUpdater; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.function.Consumer; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +42,6 @@ import org.apache.cassandra.net.IVerbHandler; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.service.paxos.Commit.Proposal; -import org.apache.cassandra.service.paxos.PaxosPropose.Status.Outcome; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.utils.concurrent.ConditionAsConsumer; diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosRepair.java b/src/java/org/apache/cassandra/service/paxos/PaxosRepair.java index 224b404898..5948086394 100644 --- a/src/java/org/apache/cassandra/service/paxos/PaxosRepair.java +++ b/src/java/org/apache/cassandra/service/paxos/PaxosRepair.java @@ -29,12 +29,14 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Function; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosRepairHistory.java b/src/java/org/apache/cassandra/service/paxos/PaxosRepairHistory.java index fa99419626..811d4b48f7 100644 --- a/src/java/org/apache/cassandra/service/paxos/PaxosRepairHistory.java +++ b/src/java/org/apache/cassandra/service/paxos/PaxosRepairHistory.java @@ -20,7 +20,10 @@ package org.apache.cassandra.service.paxos; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosRequestCallback.java b/src/java/org/apache/cassandra/service/paxos/PaxosRequestCallback.java index 790f5dbc2d..e9031a73d6 100644 --- a/src/java/org/apache/cassandra/service/paxos/PaxosRequestCallback.java +++ b/src/java/org/apache/cassandra/service/paxos/PaxosRequestCallback.java @@ -20,11 +20,11 @@ package org.apache.cassandra.service.paxos; import java.util.function.BiFunction; -import org.apache.cassandra.config.DatabaseDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.config.CassandraRelevantProperties; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.RequestFailure; import org.apache.cassandra.exceptions.RetryOnDifferentSystemException; import org.apache.cassandra.exceptions.WriteTimeoutException; diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosState.java b/src/java/org/apache/cassandra/service/paxos/PaxosState.java index 61c33423de..30929dd72d 100644 --- a/src/java/org/apache/cassandra/service/paxos/PaxosState.java +++ b/src/java/org/apache/cassandra/service/paxos/PaxosState.java @@ -26,15 +26,17 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.function.BiConsumer; import java.util.function.Function; + import javax.annotation.Nonnull; import javax.annotation.Nullable; +import com.github.benmanes.caffeine.cache.Caffeine; import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Ints; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.github.benmanes.caffeine.cache.Caffeine; import org.apache.cassandra.concurrent.ImmediateExecutor; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ConsistencyLevel; diff --git a/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanup.java b/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanup.java index 23be99f000..fb92038cbf 100644 --- a/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanup.java +++ b/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanup.java @@ -24,6 +24,7 @@ import java.util.function.Consumer; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupLocalCoordinator.java b/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupLocalCoordinator.java index 62124a5a20..1afdeea432 100644 --- a/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupLocalCoordinator.java +++ b/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupLocalCoordinator.java @@ -27,6 +27,7 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupRequest.java b/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupRequest.java index 103441940b..e4d94ad013 100644 --- a/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupRequest.java +++ b/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupRequest.java @@ -24,6 +24,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.UUID; + import javax.annotation.Nullable; import com.google.common.util.concurrent.FutureCallback; diff --git a/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosStartPrepareCleanup.java b/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosStartPrepareCleanup.java index 71f02d374a..671398dd9c 100644 --- a/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosStartPrepareCleanup.java +++ b/src/java/org/apache/cassandra/service/paxos/cleanup/PaxosStartPrepareCleanup.java @@ -25,10 +25,10 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.cassandra.config.DatabaseDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.TypeSizes; diff --git a/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosBallotTracker.java b/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosBallotTracker.java index ea3d3c615e..d374cdd60d 100644 --- a/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosBallotTracker.java +++ b/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosBallotTracker.java @@ -25,6 +25,7 @@ import java.util.zip.CRC32; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosRows.java b/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosRows.java index 1aae7ca8d3..57fbcc05b3 100644 --- a/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosRows.java +++ b/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosRows.java @@ -56,7 +56,7 @@ import org.apache.cassandra.utils.AbstractIterator; import org.apache.cassandra.utils.CloseableIterator; import org.apache.cassandra.utils.JVMStabilityInspector; -import static org.apache.cassandra.db.partitions.PartitionUpdate.PartitionUpdateSerializer.*; +import static org.apache.cassandra.db.partitions.PartitionUpdate.PartitionUpdateSerializer.isEmpty; import static org.apache.cassandra.service.paxos.Commit.isAfter; import static org.apache.cassandra.service.paxos.Commit.latest; diff --git a/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosStateTracker.java b/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosStateTracker.java index 3e90c83c5b..1e58104921 100644 --- a/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosStateTracker.java +++ b/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosStateTracker.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.NoSuchElementException; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTracker.java b/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTracker.java index 44d147e134..2230768c09 100644 --- a/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTracker.java +++ b/src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTracker.java @@ -42,10 +42,10 @@ import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.schema.TableId; -import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.service.paxos.cleanup.PaxosRepairState; diff --git a/src/java/org/apache/cassandra/service/paxos/uncommitted/UncommittedTableData.java b/src/java/org/apache/cassandra/service/paxos/uncommitted/UncommittedTableData.java index bfc31c6d85..d55aaae39a 100644 --- a/src/java/org/apache/cassandra/service/paxos/uncommitted/UncommittedTableData.java +++ b/src/java/org/apache/cassandra/service/paxos/uncommitted/UncommittedTableData.java @@ -40,6 +40,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/paxos/v1/AbstractPaxosCallback.java b/src/java/org/apache/cassandra/service/paxos/v1/AbstractPaxosCallback.java index 6ab5fbeb62..970112f357 100644 --- a/src/java/org/apache/cassandra/service/paxos/v1/AbstractPaxosCallback.java +++ b/src/java/org/apache/cassandra/service/paxos/v1/AbstractPaxosCallback.java @@ -23,9 +23,9 @@ import org.apache.cassandra.db.WriteType; import org.apache.cassandra.exceptions.WriteTimeoutException; import org.apache.cassandra.net.RequestCallback; import org.apache.cassandra.transport.Dispatcher; -import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.concurrent.CountDownLatch; +import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static org.apache.cassandra.utils.concurrent.CountDownLatch.newCountDownLatch; diff --git a/src/java/org/apache/cassandra/service/paxos/v1/AbstractPaxosVerbHandler.java b/src/java/org/apache/cassandra/service/paxos/v1/AbstractPaxosVerbHandler.java index c549cb4cab..35ac9360a9 100644 --- a/src/java/org/apache/cassandra/service/paxos/v1/AbstractPaxosVerbHandler.java +++ b/src/java/org/apache/cassandra/service/paxos/v1/AbstractPaxosVerbHandler.java @@ -24,13 +24,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.exceptions.RequestFailureReason; import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.exceptions.RequestFailureReason; import org.apache.cassandra.net.IVerbHandler; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.service.paxos.Commit; import org.apache.cassandra.service.StorageService; +import org.apache.cassandra.service.paxos.Commit; import org.apache.cassandra.utils.NoSpamLogger; public abstract class AbstractPaxosVerbHandler implements IVerbHandler diff --git a/src/java/org/apache/cassandra/service/paxos/v1/PrepareCallback.java b/src/java/org/apache/cassandra/service/paxos/v1/PrepareCallback.java index 717acf4ab5..50ecf9f149 100644 --- a/src/java/org/apache/cassandra/service/paxos/v1/PrepareCallback.java +++ b/src/java/org/apache/cassandra/service/paxos/v1/PrepareCallback.java @@ -26,17 +26,17 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.Iterables; -import org.apache.cassandra.config.Config; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.SystemKeyspace; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.db.DecoratedKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.Config; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.ConsistencyLevel; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.Message; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.paxos.Commit; import org.apache.cassandra.service.paxos.PrepareResponse; import org.apache.cassandra.transport.Dispatcher; diff --git a/src/java/org/apache/cassandra/service/paxos/v1/ProposeCallback.java b/src/java/org/apache/cassandra/service/paxos/v1/ProposeCallback.java index 2d83644e07..e89f16e8b9 100644 --- a/src/java/org/apache/cassandra/service/paxos/v1/ProposeCallback.java +++ b/src/java/org/apache/cassandra/service/paxos/v1/ProposeCallback.java @@ -21,10 +21,10 @@ package org.apache.cassandra.service.paxos.v1; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.cassandra.db.ConsistencyLevel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.net.Message; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.utils.Nemesis; diff --git a/src/java/org/apache/cassandra/service/reads/AbstractReadExecutor.java b/src/java/org/apache/cassandra/service/reads/AbstractReadExecutor.java index 1774164fb9..814aa74481 100644 --- a/src/java/org/apache/cassandra/service/reads/AbstractReadExecutor.java +++ b/src/java/org/apache/cassandra/service/reads/AbstractReadExecutor.java @@ -18,6 +18,7 @@ package org.apache.cassandra.service.reads; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/reads/DataResolver.java b/src/java/org/apache/cassandra/service/reads/DataResolver.java index 03eee1c2c5..cd576c5bc3 100644 --- a/src/java/org/apache/cassandra/service/reads/DataResolver.java +++ b/src/java/org/apache/cassandra/service/reads/DataResolver.java @@ -23,6 +23,7 @@ import java.util.Collection; import java.util.List; import java.util.function.Supplier; import java.util.function.UnaryOperator; + import javax.annotation.Nullable; import com.google.common.base.Joiner; diff --git a/src/java/org/apache/cassandra/service/reads/HybridSpeculativeRetryPolicy.java b/src/java/org/apache/cassandra/service/reads/HybridSpeculativeRetryPolicy.java index 226f4f1441..00cf8654ba 100644 --- a/src/java/org/apache/cassandra/service/reads/HybridSpeculativeRetryPolicy.java +++ b/src/java/org/apache/cassandra/service/reads/HybridSpeculativeRetryPolicy.java @@ -20,9 +20,9 @@ package org.apache.cassandra.service.reads; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.codahale.metrics.Snapshot; import com.google.common.base.Objects; -import com.codahale.metrics.Snapshot; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.metrics.SnapshottingTimer; import org.apache.cassandra.schema.TableParams; diff --git a/src/java/org/apache/cassandra/service/reads/PercentileSpeculativeRetryPolicy.java b/src/java/org/apache/cassandra/service/reads/PercentileSpeculativeRetryPolicy.java index a084a0fa33..218b0b0457 100644 --- a/src/java/org/apache/cassandra/service/reads/PercentileSpeculativeRetryPolicy.java +++ b/src/java/org/apache/cassandra/service/reads/PercentileSpeculativeRetryPolicy.java @@ -23,9 +23,9 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.codahale.metrics.Snapshot; import com.google.common.base.Objects; -import com.codahale.metrics.Snapshot; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.metrics.SnapshottingTimer; import org.apache.cassandra.schema.TableParams; diff --git a/src/java/org/apache/cassandra/service/reads/ReadCallback.java b/src/java/org/apache/cassandra/service/reads/ReadCallback.java index 3b36332b2f..7f68b3e4d5 100644 --- a/src/java/org/apache/cassandra/service/reads/ReadCallback.java +++ b/src/java/org/apache/cassandra/service/reads/ReadCallback.java @@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import com.google.common.collect.ImmutableMap; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/reads/range/RangeCommandIterator.java b/src/java/org/apache/cassandra/service/reads/range/RangeCommandIterator.java index 1d0c01e674..62725a1d6d 100644 --- a/src/java/org/apache/cassandra/service/reads/range/RangeCommandIterator.java +++ b/src/java/org/apache/cassandra/service/reads/range/RangeCommandIterator.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/reads/range/RangeCommands.java b/src/java/org/apache/cassandra/service/reads/range/RangeCommands.java index ad6dfc150a..298793d721 100644 --- a/src/java/org/apache/cassandra/service/reads/range/RangeCommands.java +++ b/src/java/org/apache/cassandra/service/reads/range/RangeCommands.java @@ -19,6 +19,7 @@ package org.apache.cassandra.service.reads.range; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/reads/repair/AbstractReadRepair.java b/src/java/org/apache/cassandra/service/reads/repair/AbstractReadRepair.java index 418deb4aa2..67c4842979 100644 --- a/src/java/org/apache/cassandra/service/reads/repair/AbstractReadRepair.java +++ b/src/java/org/apache/cassandra/service/reads/repair/AbstractReadRepair.java @@ -20,11 +20,12 @@ package org.apache.cassandra.service.reads.repair; import java.util.function.Consumer; +import com.codahale.metrics.Meter; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Meter; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/src/java/org/apache/cassandra/service/reads/repair/BlockingReadRepair.java b/src/java/org/apache/cassandra/service/reads/repair/BlockingReadRepair.java index ee66574b01..3535f6ed50 100644 --- a/src/java/org/apache/cassandra/service/reads/repair/BlockingReadRepair.java +++ b/src/java/org/apache/cassandra/service/reads/repair/BlockingReadRepair.java @@ -25,13 +25,15 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import com.codahale.metrics.Meter; import com.google.common.util.concurrent.UncheckedExecutionException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.primitives.Keys; import accord.primitives.Txn; -import com.codahale.metrics.Meter; + import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ConsistencyLevel; diff --git a/src/java/org/apache/cassandra/service/reads/repair/ReadOnlyReadRepair.java b/src/java/org/apache/cassandra/service/reads/repair/ReadOnlyReadRepair.java index 9560247ef0..92a8d87ec7 100644 --- a/src/java/org/apache/cassandra/service/reads/repair/ReadOnlyReadRepair.java +++ b/src/java/org/apache/cassandra/service/reads/repair/ReadOnlyReadRepair.java @@ -21,6 +21,7 @@ package org.apache.cassandra.service.reads.repair; import java.util.Map; import com.codahale.metrics.Meter; + import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.ReadCommand; @@ -30,8 +31,8 @@ import org.apache.cassandra.locator.Replica; import org.apache.cassandra.locator.ReplicaPlan; import org.apache.cassandra.locator.ReplicaPlan.ForWrite; import org.apache.cassandra.metrics.ReadRepairMetrics; -import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.service.reads.ReadCoordinator; +import org.apache.cassandra.transport.Dispatcher; /** * Only performs the collection of data responses and reconciliation of them, doesn't send repair mutations diff --git a/src/java/org/apache/cassandra/service/reads/repair/ReadRepair.java b/src/java/org/apache/cassandra/service/reads/repair/ReadRepair.java index b21765203e..a51dfaeb21 100644 --- a/src/java/org/apache/cassandra/service/reads/repair/ReadRepair.java +++ b/src/java/org/apache/cassandra/service/reads/repair/ReadRepair.java @@ -19,6 +19,7 @@ package org.apache.cassandra.service.reads.repair; import java.util.Map; import java.util.function.Consumer; + import javax.annotation.Nullable; import org.apache.cassandra.db.DecoratedKey; diff --git a/src/java/org/apache/cassandra/service/reads/repair/ReadRepairStrategy.java b/src/java/org/apache/cassandra/service/reads/repair/ReadRepairStrategy.java index 7f8d861888..f1272f6c57 100644 --- a/src/java/org/apache/cassandra/service/reads/repair/ReadRepairStrategy.java +++ b/src/java/org/apache/cassandra/service/reads/repair/ReadRepairStrategy.java @@ -21,8 +21,8 @@ package org.apache.cassandra.service.reads.repair; import org.apache.cassandra.db.ReadCommand; import org.apache.cassandra.locator.Endpoints; import org.apache.cassandra.locator.ReplicaPlan; -import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.service.reads.ReadCoordinator; +import org.apache.cassandra.transport.Dispatcher; import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized; diff --git a/src/java/org/apache/cassandra/service/reads/repair/RowIteratorMergeListener.java b/src/java/org/apache/cassandra/service/reads/repair/RowIteratorMergeListener.java index 47bf0efeb1..9a1b709052 100644 --- a/src/java/org/apache/cassandra/service/reads/repair/RowIteratorMergeListener.java +++ b/src/java/org/apache/cassandra/service/reads/repair/RowIteratorMergeListener.java @@ -23,11 +23,12 @@ import java.util.BitSet; import java.util.Map; import java.util.function.Consumer; +import com.carrotsearch.hppc.ObjectIntHashMap; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import com.carrotsearch.hppc.ObjectIntHashMap; import net.nicoulaj.compilecommand.annotations.Inline; + import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.ClusteringBound; import org.apache.cassandra.db.DecoratedKey; diff --git a/src/java/org/apache/cassandra/service/reads/thresholds/CoordinatorWarnings.java b/src/java/org/apache/cassandra/service/reads/thresholds/CoordinatorWarnings.java index f69be50ed2..fdb68a56a8 100644 --- a/src/java/org/apache/cassandra/service/reads/thresholds/CoordinatorWarnings.java +++ b/src/java/org/apache/cassandra/service/reads/thresholds/CoordinatorWarnings.java @@ -26,13 +26,14 @@ import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.ReadCommand; import org.apache.cassandra.metrics.TableMetrics; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.service.ClientWarn; +import io.netty.util.concurrent.FastThreadLocal; + import static org.apache.cassandra.config.CassandraRelevantProperties.READS_THRESHOLDS_COORDINATOR_DEFENSIVE_CHECKS_ENABLED; public class CoordinatorWarnings diff --git a/src/java/org/apache/cassandra/service/reads/thresholds/WarningsSnapshot.java b/src/java/org/apache/cassandra/service/reads/thresholds/WarningsSnapshot.java index 0a07c8360e..e863e07d85 100644 --- a/src/java/org/apache/cassandra/service/reads/thresholds/WarningsSnapshot.java +++ b/src/java/org/apache/cassandra/service/reads/thresholds/WarningsSnapshot.java @@ -27,10 +27,10 @@ import com.google.common.collect.ImmutableSet; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.ReadCommand; +import org.apache.cassandra.exceptions.QueryReferencesTooManyIndexesAbortException; import org.apache.cassandra.exceptions.ReadSizeAbortException; import org.apache.cassandra.exceptions.RequestFailureReason; import org.apache.cassandra.exceptions.TombstoneAbortException; -import org.apache.cassandra.exceptions.QueryReferencesTooManyIndexesAbortException; import org.apache.cassandra.locator.InetAddressAndPort; public class WarningsSnapshot diff --git a/src/java/org/apache/cassandra/service/snapshot/ListSnapshotsTask.java b/src/java/org/apache/cassandra/service/snapshot/ListSnapshotsTask.java index 1351c12d0b..d0ccf69941 100644 --- a/src/java/org/apache/cassandra/service/snapshot/ListSnapshotsTask.java +++ b/src/java/org/apache/cassandra/service/snapshot/ListSnapshotsTask.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; import java.util.function.Predicate; + import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; diff --git a/src/java/org/apache/cassandra/service/snapshot/SnapshotDetailsTabularData.java b/src/java/org/apache/cassandra/service/snapshot/SnapshotDetailsTabularData.java index 7b7635b0a4..de8e61c28f 100644 --- a/src/java/org/apache/cassandra/service/snapshot/SnapshotDetailsTabularData.java +++ b/src/java/org/apache/cassandra/service/snapshot/SnapshotDetailsTabularData.java @@ -18,6 +18,7 @@ package org.apache.cassandra.service.snapshot; import java.util.Set; + import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.CompositeType; import javax.management.openmbean.OpenDataException; diff --git a/src/java/org/apache/cassandra/service/snapshot/SnapshotLoader.java b/src/java/org/apache/cassandra/service/snapshot/SnapshotLoader.java index 0e0ecc11c0..72cf1d7b49 100644 --- a/src/java/org/apache/cassandra/service/snapshot/SnapshotLoader.java +++ b/src/java/org/apache/cassandra/service/snapshot/SnapshotLoader.java @@ -38,6 +38,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/snapshot/SnapshotManager.java b/src/java/org/apache/cassandra/service/snapshot/SnapshotManager.java index f079f42a9a..a4e8a9e472 100644 --- a/src/java/org/apache/cassandra/service/snapshot/SnapshotManager.java +++ b/src/java/org/apache/cassandra/service/snapshot/SnapshotManager.java @@ -30,9 +30,11 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Predicate; + import javax.management.openmbean.TabularData; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/service/snapshot/SnapshotManagerMBean.java b/src/java/org/apache/cassandra/service/snapshot/SnapshotManagerMBean.java index 332ebb4b54..031b11e106 100644 --- a/src/java/org/apache/cassandra/service/snapshot/SnapshotManagerMBean.java +++ b/src/java/org/apache/cassandra/service/snapshot/SnapshotManagerMBean.java @@ -20,6 +20,7 @@ package org.apache.cassandra.service.snapshot; import java.io.IOException; import java.util.Map; + import javax.management.openmbean.TabularData; public interface SnapshotManagerMBean diff --git a/src/java/org/apache/cassandra/service/snapshot/SnapshotManifest.java b/src/java/org/apache/cassandra/service/snapshot/SnapshotManifest.java index 6f23eba84d..ce3c9ab736 100644 --- a/src/java/org/apache/cassandra/service/snapshot/SnapshotManifest.java +++ b/src/java/org/apache/cassandra/service/snapshot/SnapshotManifest.java @@ -18,7 +18,7 @@ package org.apache.cassandra.service.snapshot; -import java.io.*; +import java.io.IOException; import java.time.Instant; import java.util.List; import java.util.Objects; @@ -26,6 +26,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; + import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.io.util.File; import org.apache.cassandra.utils.JsonUtils; diff --git a/src/java/org/apache/cassandra/service/snapshot/SnapshotOptions.java b/src/java/org/apache/cassandra/service/snapshot/SnapshotOptions.java index 8f487d2453..ce35c9ca1b 100644 --- a/src/java/org/apache/cassandra/service/snapshot/SnapshotOptions.java +++ b/src/java/org/apache/cassandra/service/snapshot/SnapshotOptions.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.function.Predicate; import com.google.common.util.concurrent.RateLimiter; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.config.CassandraRelevantProperties; diff --git a/src/java/org/apache/cassandra/service/snapshot/TableSnapshot.java b/src/java/org/apache/cassandra/service/snapshot/TableSnapshot.java index a23aa7a2b1..2712d118de 100644 --- a/src/java/org/apache/cassandra/service/snapshot/TableSnapshot.java +++ b/src/java/org/apache/cassandra/service/snapshot/TableSnapshot.java @@ -57,6 +57,7 @@ import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.LocalizeString; import org.apache.cassandra.utils.Throwables; import org.apache.cassandra.utils.concurrent.Refs; + import oshi.PlatformEnum; public class TableSnapshot diff --git a/src/java/org/apache/cassandra/streaming/StreamConnectionFactory.java b/src/java/org/apache/cassandra/streaming/StreamConnectionFactory.java index 95208e400b..0184aff423 100644 --- a/src/java/org/apache/cassandra/streaming/StreamConnectionFactory.java +++ b/src/java/org/apache/cassandra/streaming/StreamConnectionFactory.java @@ -20,9 +20,10 @@ package org.apache.cassandra.streaming; import java.io.IOException; -import io.netty.channel.Channel; import org.apache.cassandra.net.OutboundConnectionSettings; +import io.netty.channel.Channel; + public interface StreamConnectionFactory { Channel createConnection(OutboundConnectionSettings template, int messagingVersion) throws IOException; diff --git a/src/java/org/apache/cassandra/streaming/StreamCoordinator.java b/src/java/org/apache/cassandra/streaming/StreamCoordinator.java index ad2925171c..07ce08696d 100644 --- a/src/java/org/apache/cassandra/streaming/StreamCoordinator.java +++ b/src/java/org/apache/cassandra/streaming/StreamCoordinator.java @@ -18,10 +18,19 @@ package org.apache.cassandra.streaming; import java.net.InetSocketAddress; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/streaming/StreamDeserializingTask.java b/src/java/org/apache/cassandra/streaming/StreamDeserializingTask.java index a9ddabb689..a8b6a8f6c9 100644 --- a/src/java/org/apache/cassandra/streaming/StreamDeserializingTask.java +++ b/src/java/org/apache/cassandra/streaming/StreamDeserializingTask.java @@ -19,6 +19,7 @@ package org.apache.cassandra.streaming; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/streaming/StreamManager.java b/src/java/org/apache/cassandra/streaming/StreamManager.java index 6bfecf8aa8..ea67eb9cd4 100644 --- a/src/java/org/apache/cassandra/streaming/StreamManager.java +++ b/src/java/org/apache/cassandra/streaming/StreamManager.java @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; + import javax.management.ListenerNotFoundException; import javax.management.MBeanNotificationInfo; import javax.management.NotificationFilter; @@ -35,8 +36,8 @@ import com.google.common.cache.Weigher; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.common.util.concurrent.RateLimiter; -import org.cliffc.high_scale_lib.NonBlockingHashMap; +import org.cliffc.high_scale_lib.NonBlockingHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/streaming/StreamManagerMBean.java b/src/java/org/apache/cassandra/streaming/StreamManagerMBean.java index e49c059590..e14a6d14ab 100644 --- a/src/java/org/apache/cassandra/streaming/StreamManagerMBean.java +++ b/src/java/org/apache/cassandra/streaming/StreamManagerMBean.java @@ -18,6 +18,7 @@ package org.apache.cassandra.streaming; import java.util.Set; + import javax.management.NotificationEmitter; import javax.management.openmbean.CompositeData; diff --git a/src/java/org/apache/cassandra/streaming/StreamPlan.java b/src/java/org/apache/cassandra/streaming/StreamPlan.java index 9c39e5dbd2..3ce25014b0 100644 --- a/src/java/org/apache/cassandra/streaming/StreamPlan.java +++ b/src/java/org/apache/cassandra/streaming/StreamPlan.java @@ -17,7 +17,11 @@ */ package org.apache.cassandra.streaming; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; import com.google.common.annotations.VisibleForTesting; diff --git a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java index 86b880cd89..cec6065c74 100644 --- a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java +++ b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeoutException; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/streaming/StreamResultFuture.java b/src/java/org/apache/cassandra/streaming/StreamResultFuture.java index 6d3e1ca6c1..78d6e4a538 100644 --- a/src/java/org/apache/cassandra/streaming/StreamResultFuture.java +++ b/src/java/org/apache/cassandra/streaming/StreamResultFuture.java @@ -24,15 +24,15 @@ import java.util.concurrent.TimeUnit; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.utils.NoSpamLogger; -import org.apache.cassandra.utils.TimeUUID; -import org.apache.cassandra.utils.concurrent.AsyncFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.NoSpamLogger; +import org.apache.cassandra.utils.TimeUUID; +import org.apache.cassandra.utils.concurrent.AsyncFuture; import static org.apache.cassandra.streaming.StreamingChannel.Factory.Global.streamingFactory; import static org.apache.cassandra.utils.Clock.Global.nanoTime; diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java index 447621c78c..12997e94f5 100644 --- a/src/java/org/apache/cassandra/streaming/StreamSession.java +++ b/src/java/org/apache/cassandra/streaming/StreamSession.java @@ -36,6 +36,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; @@ -44,12 +45,10 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.Channel; -import io.netty.util.concurrent.Future; //checkstyle: permit this import - import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; @@ -87,10 +86,13 @@ import org.apache.cassandra.utils.NoSpamLogger; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.concurrent.FutureCombiner; +import io.netty.channel.Channel; +import io.netty.util.concurrent.Future; // checkstyle: permit this import + import static com.google.common.collect.Iterables.all; import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_STREAMING_DEBUG_STACKTRACE_LIMIT; -import static org.apache.cassandra.utils.Clock.Global.nanoTime; import static org.apache.cassandra.locator.InetAddressAndPort.hostAddressAndPort; +import static org.apache.cassandra.utils.Clock.Global.nanoTime; import static org.apache.cassandra.utils.FBUtilities.getBroadcastAddressAndPort; /** diff --git a/src/java/org/apache/cassandra/streaming/StreamSummary.java b/src/java/org/apache/cassandra/streaming/StreamSummary.java index b6b3545bf2..7a0dd9c401 100644 --- a/src/java/org/apache/cassandra/streaming/StreamSummary.java +++ b/src/java/org/apache/cassandra/streaming/StreamSummary.java @@ -23,6 +23,7 @@ import java.util.List; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; diff --git a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java index 8b4fe1f1bd..cbd0b75e6e 100644 --- a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java +++ b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java @@ -32,6 +32,7 @@ import java.util.concurrent.atomic.AtomicInteger; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/streaming/StreamingChannel.java b/src/java/org/apache/cassandra/streaming/StreamingChannel.java index 6b623b8588..1cb0eb4089 100644 --- a/src/java/org/apache/cassandra/streaming/StreamingChannel.java +++ b/src/java/org/apache/cassandra/streaming/StreamingChannel.java @@ -22,10 +22,11 @@ import java.io.IOException; import java.net.InetSocketAddress; import java.util.function.IntFunction; -import io.netty.util.concurrent.Future; //checkstyle: permit this import import org.apache.cassandra.streaming.async.NettyStreamingConnectionFactory; import org.apache.cassandra.utils.Shared; +import io.netty.util.concurrent.Future; // checkstyle: permit this import + import static org.apache.cassandra.utils.Shared.Recursive.INTERFACES; import static org.apache.cassandra.utils.Shared.Scope.SIMULATION; diff --git a/src/java/org/apache/cassandra/streaming/StreamingDataOutputPlus.java b/src/java/org/apache/cassandra/streaming/StreamingDataOutputPlus.java index d845497f77..206c809848 100644 --- a/src/java/org/apache/cassandra/streaming/StreamingDataOutputPlus.java +++ b/src/java/org/apache/cassandra/streaming/StreamingDataOutputPlus.java @@ -23,10 +23,11 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; -import io.netty.channel.FileRegion; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.utils.Shared; +import io.netty.channel.FileRegion; + import static org.apache.cassandra.utils.Shared.Recursive.INTERFACES; import static org.apache.cassandra.utils.Shared.Scope.SIMULATION; diff --git a/src/java/org/apache/cassandra/streaming/StreamingState.java b/src/java/org/apache/cassandra/streaming/StreamingState.java index fbd66d1bb6..8dbe354944 100644 --- a/src/java/org/apache/cassandra/streaming/StreamingState.java +++ b/src/java/org/apache/cassandra/streaming/StreamingState.java @@ -32,6 +32,7 @@ import javax.annotation.concurrent.GuardedBy; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/streaming/async/NettyStreamingChannel.java b/src/java/org/apache/cassandra/streaming/async/NettyStreamingChannel.java index 8515ad6089..cce2db3393 100644 --- a/src/java/org/apache/cassandra/streaming/async/NettyStreamingChannel.java +++ b/src/java/org/apache/cassandra/streaming/async/NettyStreamingChannel.java @@ -31,12 +31,6 @@ import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ByteBuf; -import io.netty.channel.Channel; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.util.AttributeKey; -import io.netty.util.ReferenceCountUtil; import org.apache.cassandra.net.AsyncChannelPromise; import org.apache.cassandra.net.AsyncStreamingInputPlus; import org.apache.cassandra.net.AsyncStreamingOutputPlus; @@ -48,6 +42,13 @@ import org.apache.cassandra.streaming.StreamingDataOutputPlusFixed; import org.apache.cassandra.utils.concurrent.Future; import org.apache.cassandra.utils.concurrent.ImmediateFuture; +import io.netty.buffer.ByteBuf; +import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.util.AttributeKey; +import io.netty.util.ReferenceCountUtil; + import static io.netty.util.AttributeKey.valueOf; import static java.lang.Boolean.FALSE; diff --git a/src/java/org/apache/cassandra/streaming/async/NettyStreamingConnectionFactory.java b/src/java/org/apache/cassandra/streaming/async/NettyStreamingConnectionFactory.java index 4002f9b61f..cc74674fdd 100644 --- a/src/java/org/apache/cassandra/streaming/async/NettyStreamingConnectionFactory.java +++ b/src/java/org/apache/cassandra/streaming/async/NettyStreamingConnectionFactory.java @@ -26,10 +26,6 @@ import java.util.List; import com.google.common.annotations.VisibleForTesting; -import io.netty.channel.Channel; -import io.netty.channel.ChannelPipeline; -import io.netty.channel.EventLoop; -import io.netty.util.concurrent.Future; // checkstyle: permit this import import org.apache.cassandra.net.ConnectionCategory; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.OutboundConnectionInitiator.Result; @@ -37,11 +33,16 @@ import org.apache.cassandra.net.OutboundConnectionInitiator.Result.StreamingSucc import org.apache.cassandra.net.OutboundConnectionSettings; import org.apache.cassandra.streaming.StreamingChannel; +import io.netty.channel.Channel; +import io.netty.channel.ChannelPipeline; +import io.netty.channel.EventLoop; +import io.netty.util.concurrent.Future; // checkstyle: permit this import + import static org.apache.cassandra.locator.InetAddressAndPort.getByAddress; import static org.apache.cassandra.net.InternodeConnectionUtils.isSSLError; -import static org.apache.cassandra.net.OutboundConnectionInitiator.initiateStreaming; import static org.apache.cassandra.net.OutboundConnectionInitiator.SslFallbackConnectionType; import static org.apache.cassandra.net.OutboundConnectionInitiator.SslFallbackConnectionType.SERVER_CONFIG; +import static org.apache.cassandra.net.OutboundConnectionInitiator.initiateStreaming; public class NettyStreamingConnectionFactory implements StreamingChannel.Factory { diff --git a/src/java/org/apache/cassandra/streaming/async/StreamCompressionSerializer.java b/src/java/org/apache/cassandra/streaming/async/StreamCompressionSerializer.java index f7d8101a8d..26c5a930db 100644 --- a/src/java/org/apache/cassandra/streaming/async/StreamCompressionSerializer.java +++ b/src/java/org/apache/cassandra/streaming/async/StreamCompressionSerializer.java @@ -22,13 +22,15 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufAllocator; import net.jpountz.lz4.LZ4Compressor; import net.jpountz.lz4.LZ4SafeDecompressor; + import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.streaming.StreamingDataOutputPlus; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; + import static org.apache.cassandra.net.MessagingService.current_version; /** diff --git a/src/java/org/apache/cassandra/streaming/async/StreamingMultiplexedChannel.java b/src/java/org/apache/cassandra/streaming/async/StreamingMultiplexedChannel.java index 751928c190..b73b25035e 100644 --- a/src/java/org/apache/cassandra/streaming/async/StreamingMultiplexedChannel.java +++ b/src/java/org/apache/cassandra/streaming/async/StreamingMultiplexedChannel.java @@ -23,28 +23,26 @@ import java.io.IOException; import java.net.InetSocketAddress; import java.nio.channels.ClosedByInterruptException; import java.util.Collection; -import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; -import io.netty.util.concurrent.Future; // checkstyle: permit this import import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.streaming.StreamDeserializingTask; +import org.apache.cassandra.streaming.StreamSession; import org.apache.cassandra.streaming.StreamingChannel; import org.apache.cassandra.streaming.StreamingDataOutputPlus; -import org.apache.cassandra.streaming.StreamSession; import org.apache.cassandra.streaming.messages.IncomingStreamMessage; import org.apache.cassandra.streaming.messages.KeepAliveMessage; import org.apache.cassandra.streaming.messages.OutgoingStreamMessage; @@ -53,12 +51,15 @@ import org.apache.cassandra.utils.concurrent.ImmediateFuture; import org.apache.cassandra.utils.concurrent.Semaphore; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; -import static com.google.common.base.Throwables.getRootCause; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.util.concurrent.Future; // checkstyle: permit this import +import static com.google.common.base.Throwables.getRootCause; import static java.lang.String.format; import static java.lang.Thread.currentThread; -import static java.util.concurrent.TimeUnit.*; - +import static java.util.concurrent.TimeUnit.MINUTES; +import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; import static org.apache.cassandra.config.CassandraRelevantProperties.STREAMING_SESSION_PARALLELTRANSFERS; import static org.apache.cassandra.net.MessagingService.VERSION_40; diff --git a/src/java/org/apache/cassandra/streaming/compress/StreamCompressionInputStream.java b/src/java/org/apache/cassandra/streaming/compress/StreamCompressionInputStream.java index ceed532c5e..3b6e5b92dd 100644 --- a/src/java/org/apache/cassandra/streaming/compress/StreamCompressionInputStream.java +++ b/src/java/org/apache/cassandra/streaming/compress/StreamCompressionInputStream.java @@ -20,17 +20,19 @@ package org.apache.cassandra.streaming.compress; import java.io.IOException; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufAllocator; -import io.netty.buffer.PooledByteBufAllocator; -import io.netty.buffer.Unpooled; import net.jpountz.lz4.LZ4Factory; import net.jpountz.lz4.LZ4SafeDecompressor; + import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.RebufferingInputStream; import org.apache.cassandra.net.AsyncStreamingInputPlus; import org.apache.cassandra.streaming.async.StreamCompressionSerializer; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; +import io.netty.buffer.PooledByteBufAllocator; +import io.netty.buffer.Unpooled; + public class StreamCompressionInputStream extends RebufferingInputStream implements AutoCloseable { /** diff --git a/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java b/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java index 38ff31efb1..08f5ae2c53 100644 --- a/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java +++ b/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java @@ -20,7 +20,13 @@ package org.apache.cassandra.streaming.management; import java.net.UnknownHostException; import java.util.HashMap; import java.util.Map; -import javax.management.openmbean.*; + +import javax.management.openmbean.CompositeData; +import javax.management.openmbean.CompositeDataSupport; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.OpenDataException; +import javax.management.openmbean.OpenType; +import javax.management.openmbean.SimpleType; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.streaming.ProgressInfo; diff --git a/src/java/org/apache/cassandra/streaming/management/SessionCompleteEventCompositeData.java b/src/java/org/apache/cassandra/streaming/management/SessionCompleteEventCompositeData.java index 1a6fea5da8..9f6a071dbb 100644 --- a/src/java/org/apache/cassandra/streaming/management/SessionCompleteEventCompositeData.java +++ b/src/java/org/apache/cassandra/streaming/management/SessionCompleteEventCompositeData.java @@ -19,7 +19,13 @@ package org.apache.cassandra.streaming.management; import java.util.HashMap; import java.util.Map; -import javax.management.openmbean.*; + +import javax.management.openmbean.CompositeData; +import javax.management.openmbean.CompositeDataSupport; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.OpenDataException; +import javax.management.openmbean.OpenType; +import javax.management.openmbean.SimpleType; import org.apache.cassandra.streaming.StreamEvent; diff --git a/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java b/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java index eaa37bbca8..dde4db223c 100644 --- a/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java +++ b/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java @@ -18,8 +18,18 @@ package org.apache.cassandra.streaming.management; import java.net.UnknownHostException; -import java.util.*; -import javax.management.openmbean.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import javax.management.openmbean.ArrayType; +import javax.management.openmbean.CompositeData; +import javax.management.openmbean.CompositeDataSupport; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.OpenDataException; +import javax.management.openmbean.OpenType; +import javax.management.openmbean.SimpleType; import com.google.common.base.Function; import com.google.common.collect.Iterables; diff --git a/src/java/org/apache/cassandra/streaming/management/StreamEventJMXNotifier.java b/src/java/org/apache/cassandra/streaming/management/StreamEventJMXNotifier.java index b8c7487431..8145b318d8 100644 --- a/src/java/org/apache/cassandra/streaming/management/StreamEventJMXNotifier.java +++ b/src/java/org/apache/cassandra/streaming/management/StreamEventJMXNotifier.java @@ -18,10 +18,15 @@ package org.apache.cassandra.streaming.management; import java.util.concurrent.atomic.AtomicLong; + import javax.management.Notification; import javax.management.NotificationBroadcasterSupport; -import org.apache.cassandra.streaming.*; +import org.apache.cassandra.streaming.ProgressInfo; +import org.apache.cassandra.streaming.StreamEvent; +import org.apache.cassandra.streaming.StreamEventHandler; +import org.apache.cassandra.streaming.StreamManagerMBean; +import org.apache.cassandra.streaming.StreamState; import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; diff --git a/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java b/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java index c04205f620..97590e1a76 100644 --- a/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java +++ b/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java @@ -17,8 +17,18 @@ */ package org.apache.cassandra.streaming.management; -import java.util.*; -import javax.management.openmbean.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.management.openmbean.ArrayType; +import javax.management.openmbean.CompositeData; +import javax.management.openmbean.CompositeDataSupport; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.OpenDataException; +import javax.management.openmbean.OpenType; +import javax.management.openmbean.SimpleType; import com.google.common.base.Function; import com.google.common.collect.Iterables; @@ -26,8 +36,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.apache.cassandra.streaming.SessionInfo; -import org.apache.cassandra.streaming.StreamState; import org.apache.cassandra.streaming.StreamOperation; +import org.apache.cassandra.streaming.StreamState; import org.apache.cassandra.utils.TimeUUID; /** diff --git a/src/java/org/apache/cassandra/streaming/management/StreamSummaryCompositeData.java b/src/java/org/apache/cassandra/streaming/management/StreamSummaryCompositeData.java index c79c1a9a1f..5fd58ae197 100644 --- a/src/java/org/apache/cassandra/streaming/management/StreamSummaryCompositeData.java +++ b/src/java/org/apache/cassandra/streaming/management/StreamSummaryCompositeData.java @@ -19,6 +19,7 @@ package org.apache.cassandra.streaming.management; import java.util.HashMap; import java.util.Map; + import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.CompositeType; diff --git a/src/java/org/apache/cassandra/tcm/AtomicLongBackedProcessor.java b/src/java/org/apache/cassandra/tcm/AtomicLongBackedProcessor.java index 99c280bdd3..bbbe4fa806 100644 --- a/src/java/org/apache/cassandra/tcm/AtomicLongBackedProcessor.java +++ b/src/java/org/apache/cassandra/tcm/AtomicLongBackedProcessor.java @@ -27,6 +27,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.atomic.AtomicLong; import com.google.common.collect.ImmutableList; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/tcm/CMSOperations.java b/src/java/org/apache/cassandra/tcm/CMSOperations.java index e439b1b9f0..d4b496e1ac 100644 --- a/src/java/org/apache/cassandra/tcm/CMSOperations.java +++ b/src/java/org/apache/cassandra/tcm/CMSOperations.java @@ -40,10 +40,10 @@ import org.apache.cassandra.tcm.membership.NodeState; import org.apache.cassandra.tcm.membership.NodeVersion; import org.apache.cassandra.tcm.migration.Election; import org.apache.cassandra.tcm.sequences.CancelCMSReconfiguration; +import org.apache.cassandra.tcm.sequences.DropAccordTable; import org.apache.cassandra.tcm.sequences.InProgressSequences; import org.apache.cassandra.tcm.sequences.ReconfigureCMS; import org.apache.cassandra.tcm.serialization.Version; -import org.apache.cassandra.tcm.sequences.DropAccordTable; import org.apache.cassandra.tcm.transformations.Unregister; import org.apache.cassandra.tcm.transformations.cms.AdvanceCMSReconfiguration; import org.apache.cassandra.utils.FBUtilities; diff --git a/src/java/org/apache/cassandra/tcm/ClusterMetadata.java b/src/java/org/apache/cassandra/tcm/ClusterMetadata.java index 8c962ae299..fa2d8f5ee5 100644 --- a/src/java/org/apache/cassandra/tcm/ClusterMetadata.java +++ b/src/java/org/apache/cassandra/tcm/ClusterMetadata.java @@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory; import accord.local.Node; import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.dht.IPartitioner; @@ -59,14 +60,19 @@ import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.ReplicationParams; import org.apache.cassandra.schema.TableId; +import org.apache.cassandra.service.accord.AccordFastPath; import org.apache.cassandra.service.accord.AccordStaleReplicas; import org.apache.cassandra.service.accord.AccordTopology; import org.apache.cassandra.service.consensus.migration.ConsensusMigrationState; import org.apache.cassandra.service.consensus.migration.TableMigrationState; import org.apache.cassandra.tcm.extensions.ExtensionKey; import org.apache.cassandra.tcm.extensions.ExtensionValue; -import org.apache.cassandra.service.accord.AccordFastPath; -import org.apache.cassandra.tcm.membership.*; +import org.apache.cassandra.tcm.membership.Directory; +import org.apache.cassandra.tcm.membership.Location; +import org.apache.cassandra.tcm.membership.NodeAddresses; +import org.apache.cassandra.tcm.membership.NodeId; +import org.apache.cassandra.tcm.membership.NodeState; +import org.apache.cassandra.tcm.membership.NodeVersion; import org.apache.cassandra.tcm.ownership.DataPlacement; import org.apache.cassandra.tcm.ownership.DataPlacements; import org.apache.cassandra.tcm.ownership.PrimaryRangeComparator; diff --git a/src/java/org/apache/cassandra/tcm/ClusterMetadataService.java b/src/java/org/apache/cassandra/tcm/ClusterMetadataService.java index 74062e91c1..e582271a84 100644 --- a/src/java/org/apache/cassandra/tcm/ClusterMetadataService.java +++ b/src/java/org/apache/cassandra/tcm/ClusterMetadataService.java @@ -34,14 +34,7 @@ import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Sets; -import org.apache.cassandra.schema.*; -import org.apache.cassandra.service.accord.AccordFastPath; -import org.apache.cassandra.service.accord.AccordStaleReplicas; -import org.apache.cassandra.service.consensus.migration.ConsensusMigrationState; -import org.apache.cassandra.tcm.membership.Directory; -import org.apache.cassandra.tcm.ownership.DataPlacements; -import org.apache.cassandra.tcm.ownership.TokenMap; -import org.apache.cassandra.tcm.sequences.LockedRanges; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,18 +52,28 @@ import org.apache.cassandra.metrics.TCMMetrics; import org.apache.cassandra.net.IVerbHandler; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessageDelivery; +import org.apache.cassandra.schema.DistributedSchema; +import org.apache.cassandra.schema.Keyspaces; +import org.apache.cassandra.schema.ReplicationParams; +import org.apache.cassandra.service.accord.AccordFastPath; +import org.apache.cassandra.service.accord.AccordStaleReplicas; +import org.apache.cassandra.service.consensus.migration.ConsensusMigrationState; import org.apache.cassandra.tcm.listeners.SchemaListener; import org.apache.cassandra.tcm.log.Entry; import org.apache.cassandra.tcm.log.LocalLog; import org.apache.cassandra.tcm.log.LogState; +import org.apache.cassandra.tcm.membership.Directory; import org.apache.cassandra.tcm.membership.NodeId; import org.apache.cassandra.tcm.membership.NodeState; import org.apache.cassandra.tcm.membership.NodeVersion; import org.apache.cassandra.tcm.migration.Election; import org.apache.cassandra.tcm.migration.GossipProcessor; +import org.apache.cassandra.tcm.ownership.DataPlacements; import org.apache.cassandra.tcm.ownership.PlacementProvider; +import org.apache.cassandra.tcm.ownership.TokenMap; import org.apache.cassandra.tcm.ownership.UniformRangePlacement; import org.apache.cassandra.tcm.sequences.InProgressSequences; +import org.apache.cassandra.tcm.sequences.LockedRanges; import org.apache.cassandra.tcm.sequences.ReconfigureCMS; import org.apache.cassandra.tcm.serialization.VerboseMetadataSerializer; import org.apache.cassandra.tcm.serialization.Version; diff --git a/src/java/org/apache/cassandra/tcm/Commit.java b/src/java/org/apache/cassandra/tcm/Commit.java index 6767eeaf48..f002b3e66e 100644 --- a/src/java/org/apache/cassandra/tcm/Commit.java +++ b/src/java/org/apache/cassandra/tcm/Commit.java @@ -23,6 +23,7 @@ import java.util.function.BiConsumer; import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,17 +34,20 @@ import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.metrics.TCMMetrics; +import org.apache.cassandra.net.IVerbHandler; +import org.apache.cassandra.net.Message; +import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.net.Verb; +import org.apache.cassandra.tcm.log.Entry; import org.apache.cassandra.tcm.log.LogState; -import org.apache.cassandra.tcm.membership.NodeVersion; -import org.apache.cassandra.tcm.serialization.Version; -import org.apache.cassandra.net.*; import org.apache.cassandra.tcm.membership.Directory; import org.apache.cassandra.tcm.membership.NodeId; -import org.apache.cassandra.tcm.log.Entry; +import org.apache.cassandra.tcm.membership.NodeVersion; +import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.vint.VIntCoding; -import static org.apache.cassandra.tcm.ClusterMetadataService.State.*; +import static org.apache.cassandra.tcm.ClusterMetadataService.State.LOCAL; public class Commit { diff --git a/src/java/org/apache/cassandra/tcm/Discovery.java b/src/java/org/apache/cassandra/tcm/Discovery.java index 612975b0bc..99ca8907cc 100644 --- a/src/java/org/apache/cassandra/tcm/Discovery.java +++ b/src/java/org/apache/cassandra/tcm/Discovery.java @@ -31,6 +31,7 @@ import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/tcm/EpochAwareDebounce.java b/src/java/org/apache/cassandra/tcm/EpochAwareDebounce.java index 967a358371..b296eb1a23 100644 --- a/src/java/org/apache/cassandra/tcm/EpochAwareDebounce.java +++ b/src/java/org/apache/cassandra/tcm/EpochAwareDebounce.java @@ -23,6 +23,7 @@ import java.util.function.Supplier; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; + import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.utils.Closeable; import org.apache.cassandra.utils.concurrent.Future; diff --git a/src/java/org/apache/cassandra/tcm/MultiStepOperation.java b/src/java/org/apache/cassandra/tcm/MultiStepOperation.java index 3d42772518..7083f27b64 100644 --- a/src/java/org/apache/cassandra/tcm/MultiStepOperation.java +++ b/src/java/org/apache/cassandra/tcm/MultiStepOperation.java @@ -25,15 +25,15 @@ import com.google.common.collect.ImmutableSet; import org.apache.cassandra.tcm.sequences.AddToCMS; import org.apache.cassandra.tcm.sequences.BootstrapAndJoin; import org.apache.cassandra.tcm.sequences.BootstrapAndReplace; +import org.apache.cassandra.tcm.sequences.DropAccordTable; import org.apache.cassandra.tcm.sequences.LockedRanges; import org.apache.cassandra.tcm.sequences.Move; +import org.apache.cassandra.tcm.sequences.ProgressBarrier; import org.apache.cassandra.tcm.sequences.ReconfigureCMS; import org.apache.cassandra.tcm.sequences.SequenceState; -import org.apache.cassandra.tcm.sequences.ProgressBarrier; import org.apache.cassandra.tcm.sequences.UnbootstrapAndLeave; import org.apache.cassandra.tcm.serialization.AsymmetricMetadataSerializer; import org.apache.cassandra.tcm.serialization.MetadataSerializer; -import org.apache.cassandra.tcm.sequences.DropAccordTable; /** * Represents a multi-step process performed in order to transition the cluster to some state. diff --git a/src/java/org/apache/cassandra/tcm/PaxosBackedProcessor.java b/src/java/org/apache/cassandra/tcm/PaxosBackedProcessor.java index 38fdd306de..03f9afe053 100644 --- a/src/java/org/apache/cassandra/tcm/PaxosBackedProcessor.java +++ b/src/java/org/apache/cassandra/tcm/PaxosBackedProcessor.java @@ -32,8 +32,8 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.exceptions.ReadTimeoutException; -import org.apache.cassandra.locator.EndpointsForRange; import org.apache.cassandra.exceptions.RequestFailure; +import org.apache.cassandra.locator.EndpointsForRange; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.Replica; import org.apache.cassandra.metrics.TCMMetrics; diff --git a/src/java/org/apache/cassandra/tcm/PeerLogFetcher.java b/src/java/org/apache/cassandra/tcm/PeerLogFetcher.java index 0565520bbd..ceac4c7025 100644 --- a/src/java/org/apache/cassandra/tcm/PeerLogFetcher.java +++ b/src/java/org/apache/cassandra/tcm/PeerLogFetcher.java @@ -23,10 +23,11 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import com.codahale.metrics.Timer; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Timer; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.metrics.TCMMetrics; diff --git a/src/java/org/apache/cassandra/tcm/Processor.java b/src/java/org/apache/cassandra/tcm/Processor.java index f80277b983..b93adfcd5b 100644 --- a/src/java/org/apache/cassandra/tcm/Processor.java +++ b/src/java/org/apache/cassandra/tcm/Processor.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tcm; import com.codahale.metrics.Meter; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.metrics.TCMMetrics; diff --git a/src/java/org/apache/cassandra/tcm/RemoteProcessor.java b/src/java/org/apache/cassandra/tcm/RemoteProcessor.java index a8fe8193f0..59b63d42e1 100644 --- a/src/java/org/apache/cassandra/tcm/RemoteProcessor.java +++ b/src/java/org/apache/cassandra/tcm/RemoteProcessor.java @@ -29,10 +29,11 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Supplier; +import com.codahale.metrics.Timer; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Timer; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.RequestFailure; import org.apache.cassandra.exceptions.RequestFailureReason; diff --git a/src/java/org/apache/cassandra/tcm/Retry.java b/src/java/org/apache/cassandra/tcm/Retry.java index ca294aaee0..f4951bf110 100644 --- a/src/java/org/apache/cassandra/tcm/Retry.java +++ b/src/java/org/apache/cassandra/tcm/Retry.java @@ -21,6 +21,7 @@ package org.apache.cassandra.tcm; import java.util.concurrent.TimeUnit; import com.codahale.metrics.Meter; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.service.RetryStrategy; diff --git a/src/java/org/apache/cassandra/tcm/Startup.java b/src/java/org/apache/cassandra/tcm/Startup.java index 1589e8db17..970ea190c6 100644 --- a/src/java/org/apache/cassandra/tcm/Startup.java +++ b/src/java/org/apache/cassandra/tcm/Startup.java @@ -33,6 +33,7 @@ import java.util.function.Function; import java.util.function.Supplier; import com.google.common.util.concurrent.Uninterruptibles; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/tcm/Transformation.java b/src/java/org/apache/cassandra/tcm/Transformation.java index 200d19e990..12fbfd168c 100644 --- a/src/java/org/apache/cassandra/tcm/Transformation.java +++ b/src/java/org/apache/cassandra/tcm/Transformation.java @@ -65,9 +65,9 @@ import org.apache.cassandra.tcm.transformations.cms.AdvanceCMSReconfiguration; import org.apache.cassandra.tcm.transformations.cms.FinishAddToCMS; import org.apache.cassandra.tcm.transformations.cms.Initialize; import org.apache.cassandra.tcm.transformations.cms.PreInitialize; +import org.apache.cassandra.tcm.transformations.cms.PrepareCMSReconfiguration; import org.apache.cassandra.tcm.transformations.cms.RemoveFromCMS; import org.apache.cassandra.tcm.transformations.cms.StartAddToCMS; -import org.apache.cassandra.tcm.transformations.cms.PrepareCMSReconfiguration; import static org.apache.cassandra.tcm.serialization.Version.V0; diff --git a/src/java/org/apache/cassandra/tcm/compatibility/GossipHelper.java b/src/java/org/apache/cassandra/tcm/compatibility/GossipHelper.java index 2e24120873..1f451cdbc2 100644 --- a/src/java/org/apache/cassandra/tcm/compatibility/GossipHelper.java +++ b/src/java/org/apache/cassandra/tcm/compatibility/GossipHelper.java @@ -34,6 +34,7 @@ import java.util.UUID; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,6 +55,7 @@ import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.schema.SchemaKeyspace; import org.apache.cassandra.service.StorageService; +import org.apache.cassandra.service.accord.AccordFastPath; import org.apache.cassandra.service.accord.AccordStaleReplicas; import org.apache.cassandra.service.consensus.migration.ConsensusMigrationState; import org.apache.cassandra.tcm.ClusterMetadata; @@ -61,7 +63,6 @@ import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.MultiStepOperation; import org.apache.cassandra.tcm.extensions.ExtensionKey; import org.apache.cassandra.tcm.extensions.ExtensionValue; -import org.apache.cassandra.service.accord.AccordFastPath; import org.apache.cassandra.tcm.membership.Directory; import org.apache.cassandra.tcm.membership.Location; import org.apache.cassandra.tcm.membership.NodeAddresses; diff --git a/src/java/org/apache/cassandra/tcm/compatibility/TokenRingUtils.java b/src/java/org/apache/cassandra/tcm/compatibility/TokenRingUtils.java index 676915d3f2..54a90ef661 100644 --- a/src/java/org/apache/cassandra/tcm/compatibility/TokenRingUtils.java +++ b/src/java/org/apache/cassandra/tcm/compatibility/TokenRingUtils.java @@ -28,6 +28,7 @@ import java.util.List; import com.google.common.base.Preconditions; import com.google.common.collect.AbstractIterator; import com.google.common.collect.Iterators; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/tcm/listeners/LegacyStateListener.java b/src/java/org/apache/cassandra/tcm/listeners/LegacyStateListener.java index 3f77db174f..708094a361 100644 --- a/src/java/org/apache/cassandra/tcm/listeners/LegacyStateListener.java +++ b/src/java/org/apache/cassandra/tcm/listeners/LegacyStateListener.java @@ -25,6 +25,7 @@ import java.util.Set; import java.util.stream.StreamSupport; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/tcm/log/LocalLog.java b/src/java/org/apache/cassandra/tcm/log/LocalLog.java index 232db188db..0da8e6715b 100644 --- a/src/java/org/apache/cassandra/tcm/log/LocalLog.java +++ b/src/java/org/apache/cassandra/tcm/log/LocalLog.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.apache.cassandra.service.accord.AccordService; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,6 +49,7 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.exceptions.StartupException; import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.service.accord.AccordService; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.Epoch; diff --git a/src/java/org/apache/cassandra/tcm/log/LogState.java b/src/java/org/apache/cassandra/tcm/log/LogState.java index 7e050e0805..62e20ceddf 100644 --- a/src/java/org/apache/cassandra/tcm/log/LogState.java +++ b/src/java/org/apache/cassandra/tcm/log/LogState.java @@ -23,10 +23,12 @@ import java.util.Objects; import java.util.Optional; import com.google.common.collect.ImmutableList; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.SystemKeyspace; diff --git a/src/java/org/apache/cassandra/tcm/log/SystemKeyspaceStorage.java b/src/java/org/apache/cassandra/tcm/log/SystemKeyspaceStorage.java index 92f4b78903..d1c4e8e57c 100644 --- a/src/java/org/apache/cassandra/tcm/log/SystemKeyspaceStorage.java +++ b/src/java/org/apache/cassandra/tcm/log/SystemKeyspaceStorage.java @@ -24,6 +24,7 @@ import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/tcm/membership/Directory.java b/src/java/org/apache/cassandra/tcm/membership/Directory.java index ec5f2c4a9d..c0c4d7a4df 100644 --- a/src/java/org/apache/cassandra/tcm/membership/Directory.java +++ b/src/java/org/apache/cassandra/tcm/membership/Directory.java @@ -19,7 +19,13 @@ package org.apache.cassandra.tcm.membership; import java.io.IOException; -import java.util.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.Map; +import java.util.NavigableSet; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; import java.util.stream.Collectors; import javax.annotation.Nullable; @@ -34,16 +40,16 @@ import org.slf4j.LoggerFactory; import accord.utils.Invariants; import accord.utils.btree.BTreeSet; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.locator.InetAddressAndPort; - +import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.MetadataValue; import org.apache.cassandra.tcm.serialization.MetadataSerializer; import org.apache.cassandra.tcm.serialization.Version; -import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.UUIDSerializer; import org.apache.cassandra.utils.btree.BTreeBiMap; diff --git a/src/java/org/apache/cassandra/tcm/membership/NodeVersion.java b/src/java/org/apache/cassandra/tcm/membership/NodeVersion.java index 33d60da6fe..de1bc71250 100644 --- a/src/java/org/apache/cassandra/tcm/membership/NodeVersion.java +++ b/src/java/org/apache/cassandra/tcm/membership/NodeVersion.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.Objects; import com.google.common.annotations.VisibleForTesting; + import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.tcm.serialization.MetadataSerializer; diff --git a/src/java/org/apache/cassandra/tcm/migration/Election.java b/src/java/org/apache/cassandra/tcm/migration/Election.java index ee8bb36af5..34ce077583 100644 --- a/src/java/org/apache/cassandra/tcm/migration/Election.java +++ b/src/java/org/apache/cassandra/tcm/migration/Election.java @@ -29,12 +29,20 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.net.IVerbHandler; +import org.apache.cassandra.net.Message; +import org.apache.cassandra.net.MessageDelivery; +import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.net.Verb; +import org.apache.cassandra.schema.DistributedMetadataLogKeyspace; import org.apache.cassandra.schema.SchemaKeyspace; +import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.Startup; import org.apache.cassandra.tcm.membership.Directory; @@ -42,13 +50,6 @@ import org.apache.cassandra.tcm.membership.NodeId; import org.apache.cassandra.tcm.membership.NodeState; import org.apache.cassandra.tcm.ownership.TokenMap; import org.apache.cassandra.tcm.transformations.Register; -import org.apache.cassandra.net.MessageDelivery; -import org.apache.cassandra.net.IVerbHandler; -import org.apache.cassandra.net.Message; -import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.net.Verb; -import org.apache.cassandra.schema.DistributedMetadataLogKeyspace; -import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; diff --git a/src/java/org/apache/cassandra/tcm/migration/GossipCMSListener.java b/src/java/org/apache/cassandra/tcm/migration/GossipCMSListener.java index 97ff11b0e7..8074493bae 100644 --- a/src/java/org/apache/cassandra/tcm/migration/GossipCMSListener.java +++ b/src/java/org/apache/cassandra/tcm/migration/GossipCMSListener.java @@ -29,9 +29,9 @@ import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.gms.IEndpointStateChangeSubscriber; import org.apache.cassandra.gms.VersionedValue; import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.Epoch; -import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.compatibility.GossipHelper; import org.apache.cassandra.tcm.membership.NodeAddresses; import org.apache.cassandra.tcm.membership.NodeId; diff --git a/src/java/org/apache/cassandra/tcm/migration/GossipProcessor.java b/src/java/org/apache/cassandra/tcm/migration/GossipProcessor.java index ef52305e0d..f222f7b563 100644 --- a/src/java/org/apache/cassandra/tcm/migration/GossipProcessor.java +++ b/src/java/org/apache/cassandra/tcm/migration/GossipProcessor.java @@ -18,13 +18,13 @@ package org.apache.cassandra.tcm.migration; +import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.Commit; +import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.Processor; import org.apache.cassandra.tcm.Retry; -import org.apache.cassandra.tcm.log.Entry; -import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.Transformation; -import org.apache.cassandra.tcm.ClusterMetadata; +import org.apache.cassandra.tcm.log.Entry; public class GossipProcessor implements Processor { diff --git a/src/java/org/apache/cassandra/tcm/ownership/PlacementTransitionPlan.java b/src/java/org/apache/cassandra/tcm/ownership/PlacementTransitionPlan.java index c93d33f632..aecab7f445 100644 --- a/src/java/org/apache/cassandra/tcm/ownership/PlacementTransitionPlan.java +++ b/src/java/org/apache/cassandra/tcm/ownership/PlacementTransitionPlan.java @@ -21,9 +21,11 @@ package org.apache.cassandra.tcm.ownership; import java.util.HashSet; import java.util.Map; import java.util.Set; + import javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/tcm/ownership/ReplicaGroups.java b/src/java/org/apache/cassandra/tcm/ownership/ReplicaGroups.java index 33d160fa10..9cffdde9e2 100644 --- a/src/java/org/apache/cassandra/tcm/ownership/ReplicaGroups.java +++ b/src/java/org/apache/cassandra/tcm/ownership/ReplicaGroups.java @@ -19,7 +19,16 @@ package org.apache.cassandra.tcm.ownership; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.SortedMap; +import java.util.TreeMap; import java.util.function.BiConsumer; import java.util.stream.Collectors; diff --git a/src/java/org/apache/cassandra/tcm/ownership/TokenMap.java b/src/java/org/apache/cassandra/tcm/ownership/TokenMap.java index ca0a3eb930..ed82642c8a 100644 --- a/src/java/org/apache/cassandra/tcm/ownership/TokenMap.java +++ b/src/java/org/apache/cassandra/tcm/ownership/TokenMap.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Objects; import com.google.common.collect.ImmutableList; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/tcm/ownership/UniformRangePlacement.java b/src/java/org/apache/cassandra/tcm/ownership/UniformRangePlacement.java index 3d4f22ea2f..3d3b4da374 100644 --- a/src/java/org/apache/cassandra/tcm/ownership/UniformRangePlacement.java +++ b/src/java/org/apache/cassandra/tcm/ownership/UniformRangePlacement.java @@ -26,6 +26,7 @@ import java.util.Set; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/tcm/sequences/BootstrapAndJoin.java b/src/java/org/apache/cassandra/tcm/sequences/BootstrapAndJoin.java index e41d1a2f43..b410097f84 100644 --- a/src/java/org/apache/cassandra/tcm/sequences/BootstrapAndJoin.java +++ b/src/java/org/apache/cassandra/tcm/sequences/BootstrapAndJoin.java @@ -27,13 +27,15 @@ import java.util.Set; import java.util.stream.StreamSupport; import com.google.common.annotations.VisibleForTesting; +import com.googlecode.concurrenttrees.common.Iterables; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import accord.topology.EpochReady; import accord.local.Node; +import accord.topology.EpochReady; import accord.utils.async.AsyncResult; -import com.googlecode.concurrenttrees.common.Iterables; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.SystemKeyspace; @@ -72,10 +74,10 @@ import org.apache.cassandra.utils.vint.VIntCoding; import static com.google.common.collect.ImmutableList.of; import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.apache.cassandra.tcm.MultiStepOperation.Kind.JOIN; import static org.apache.cassandra.tcm.Transformation.Kind.FINISH_JOIN; import static org.apache.cassandra.tcm.Transformation.Kind.MID_JOIN; import static org.apache.cassandra.tcm.Transformation.Kind.START_JOIN; -import static org.apache.cassandra.tcm.MultiStepOperation.Kind.JOIN; import static org.apache.cassandra.tcm.sequences.SequenceState.continuable; import static org.apache.cassandra.tcm.sequences.SequenceState.error; import static org.apache.cassandra.tcm.sequences.SequenceState.halted; diff --git a/src/java/org/apache/cassandra/tcm/sequences/BootstrapAndReplace.java b/src/java/org/apache/cassandra/tcm/sequences/BootstrapAndReplace.java index 8bc73d142e..cb34179d44 100644 --- a/src/java/org/apache/cassandra/tcm/sequences/BootstrapAndReplace.java +++ b/src/java/org/apache/cassandra/tcm/sequences/BootstrapAndReplace.java @@ -28,6 +28,7 @@ import java.util.Set; import java.util.stream.StreamSupport; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,11 +68,11 @@ import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.vint.VIntCoding; import static com.google.common.collect.ImmutableList.of; +import static org.apache.cassandra.tcm.MultiStepOperation.Kind.REPLACE; import static org.apache.cassandra.tcm.Transformation.Kind.FINISH_REPLACE; import static org.apache.cassandra.tcm.Transformation.Kind.MID_REPLACE; import static org.apache.cassandra.tcm.Transformation.Kind.START_REPLACE; import static org.apache.cassandra.tcm.sequences.BootstrapAndJoin.bootstrap; -import static org.apache.cassandra.tcm.MultiStepOperation.Kind.REPLACE; import static org.apache.cassandra.tcm.sequences.SequenceState.continuable; import static org.apache.cassandra.tcm.sequences.SequenceState.error; import static org.apache.cassandra.tcm.sequences.SequenceState.halted; diff --git a/src/java/org/apache/cassandra/tcm/sequences/DropAccordTable.java b/src/java/org/apache/cassandra/tcm/sequences/DropAccordTable.java index 8cd981335a..0a3512296a 100644 --- a/src/java/org/apache/cassandra/tcm/sequences/DropAccordTable.java +++ b/src/java/org/apache/cassandra/tcm/sequences/DropAccordTable.java @@ -27,6 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.topology.EpochReady; + import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.schema.Keyspaces; diff --git a/src/java/org/apache/cassandra/tcm/sequences/InProgressSequences.java b/src/java/org/apache/cassandra/tcm/sequences/InProgressSequences.java index 840c2505f4..7adc4e7165 100644 --- a/src/java/org/apache/cassandra/tcm/sequences/InProgressSequences.java +++ b/src/java/org/apache/cassandra/tcm/sequences/InProgressSequences.java @@ -34,11 +34,10 @@ import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.Epoch; -import org.apache.cassandra.tcm.MultiStepOperation; import org.apache.cassandra.tcm.MetadataValue; +import org.apache.cassandra.tcm.MultiStepOperation; import org.apache.cassandra.tcm.Transformation; import org.apache.cassandra.tcm.membership.NodeId; - import org.apache.cassandra.tcm.serialization.MetadataSerializer; import org.apache.cassandra.tcm.serialization.Version; diff --git a/src/java/org/apache/cassandra/tcm/sequences/Move.java b/src/java/org/apache/cassandra/tcm/sequences/Move.java index e67763f6b1..a26d6ded45 100644 --- a/src/java/org/apache/cassandra/tcm/sequences/Move.java +++ b/src/java/org/apache/cassandra/tcm/sequences/Move.java @@ -28,10 +28,12 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.topology.EpochReady; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.db.TypeSizes; @@ -76,10 +78,10 @@ import org.apache.cassandra.utils.concurrent.FutureCombiner; import org.apache.cassandra.utils.vint.VIntCoding; import static com.google.common.collect.ImmutableList.of; +import static org.apache.cassandra.tcm.MultiStepOperation.Kind.MOVE; import static org.apache.cassandra.tcm.Transformation.Kind.FINISH_MOVE; import static org.apache.cassandra.tcm.Transformation.Kind.MID_MOVE; import static org.apache.cassandra.tcm.Transformation.Kind.START_MOVE; -import static org.apache.cassandra.tcm.MultiStepOperation.Kind.MOVE; import static org.apache.cassandra.tcm.sequences.SequenceState.continuable; import static org.apache.cassandra.tcm.sequences.SequenceState.error; diff --git a/src/java/org/apache/cassandra/tcm/sequences/ProgressBarrier.java b/src/java/org/apache/cassandra/tcm/sequences/ProgressBarrier.java index 56eda18283..7b89acceb6 100644 --- a/src/java/org/apache/cassandra/tcm/sequences/ProgressBarrier.java +++ b/src/java/org/apache/cassandra/tcm/sequences/ProgressBarrier.java @@ -28,13 +28,14 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Predicate; +import com.codahale.metrics.Timer; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Maps; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Timer; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.dht.Range; diff --git a/src/java/org/apache/cassandra/tcm/sequences/ReconfigureCMS.java b/src/java/org/apache/cassandra/tcm/sequences/ReconfigureCMS.java index c0efee0ae4..ce2daf6b46 100644 --- a/src/java/org/apache/cassandra/tcm/sequences/ReconfigureCMS.java +++ b/src/java/org/apache/cassandra/tcm/sequences/ReconfigureCMS.java @@ -31,6 +31,7 @@ import java.util.function.Supplier; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/tcm/sequences/SingleNodeSequences.java b/src/java/org/apache/cassandra/tcm/sequences/SingleNodeSequences.java index 9da95b8aff..3a2fd2221a 100644 --- a/src/java/org/apache/cassandra/tcm/sequences/SingleNodeSequences.java +++ b/src/java/org/apache/cassandra/tcm/sequences/SingleNodeSequences.java @@ -41,10 +41,10 @@ import org.apache.cassandra.tcm.transformations.PrepareLeave; import org.apache.cassandra.tcm.transformations.PrepareMove; import org.apache.cassandra.utils.FBUtilities; +import static org.apache.cassandra.service.StorageService.Mode.DECOMMISSION_FAILED; import static org.apache.cassandra.service.StorageService.Mode.LEAVING; import static org.apache.cassandra.service.StorageService.Mode.MOVE_FAILED; import static org.apache.cassandra.service.StorageService.Mode.NORMAL; -import static org.apache.cassandra.service.StorageService.Mode.DECOMMISSION_FAILED; import static org.apache.cassandra.utils.FBUtilities.getBroadcastAddressAndPort; /** diff --git a/src/java/org/apache/cassandra/tcm/sequences/UnbootstrapAndLeave.java b/src/java/org/apache/cassandra/tcm/sequences/UnbootstrapAndLeave.java index 9e1d1ea62c..83d543a8dd 100644 --- a/src/java/org/apache/cassandra/tcm/sequences/UnbootstrapAndLeave.java +++ b/src/java/org/apache/cassandra/tcm/sequences/UnbootstrapAndLeave.java @@ -23,6 +23,7 @@ import java.util.Objects; import java.util.concurrent.ExecutionException; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,10 +49,10 @@ import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.vint.VIntCoding; import static com.google.common.collect.ImmutableList.of; +import static org.apache.cassandra.tcm.MultiStepOperation.Kind.LEAVE; import static org.apache.cassandra.tcm.Transformation.Kind.FINISH_LEAVE; import static org.apache.cassandra.tcm.Transformation.Kind.MID_LEAVE; import static org.apache.cassandra.tcm.Transformation.Kind.START_LEAVE; -import static org.apache.cassandra.tcm.MultiStepOperation.Kind.LEAVE; import static org.apache.cassandra.tcm.sequences.SequenceState.continuable; import static org.apache.cassandra.tcm.sequences.SequenceState.error; diff --git a/src/java/org/apache/cassandra/tcm/transformations/AccordMarkHardRemoved.java b/src/java/org/apache/cassandra/tcm/transformations/AccordMarkHardRemoved.java index 3342678aef..4c39abc146 100644 --- a/src/java/org/apache/cassandra/tcm/transformations/AccordMarkHardRemoved.java +++ b/src/java/org/apache/cassandra/tcm/transformations/AccordMarkHardRemoved.java @@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory; import accord.local.Node; import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/src/java/org/apache/cassandra/tcm/transformations/AccordMarkRejoining.java b/src/java/org/apache/cassandra/tcm/transformations/AccordMarkRejoining.java index 93ebeff232..516a03dee8 100644 --- a/src/java/org/apache/cassandra/tcm/transformations/AccordMarkRejoining.java +++ b/src/java/org/apache/cassandra/tcm/transformations/AccordMarkRejoining.java @@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory; import accord.local.Node; import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.service.accord.AccordTopology; diff --git a/src/java/org/apache/cassandra/tcm/transformations/AccordMarkStale.java b/src/java/org/apache/cassandra/tcm/transformations/AccordMarkStale.java index aad193be71..be4385f426 100644 --- a/src/java/org/apache/cassandra/tcm/transformations/AccordMarkStale.java +++ b/src/java/org/apache/cassandra/tcm/transformations/AccordMarkStale.java @@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory; import accord.local.Node; import accord.topology.Shard; import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.schema.KeyspaceMetadata; diff --git a/src/java/org/apache/cassandra/tcm/transformations/AlterSchema.java b/src/java/org/apache/cassandra/tcm/transformations/AlterSchema.java index f2a8389c60..a0031c621a 100644 --- a/src/java/org/apache/cassandra/tcm/transformations/AlterSchema.java +++ b/src/java/org/apache/cassandra/tcm/transformations/AlterSchema.java @@ -32,6 +32,7 @@ import java.util.stream.Stream; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.google.common.collect.Streams; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/tcm/transformations/ApplyPlacementDeltas.java b/src/java/org/apache/cassandra/tcm/transformations/ApplyPlacementDeltas.java index 2f55f712ba..2a1eaba7e0 100644 --- a/src/java/org/apache/cassandra/tcm/transformations/ApplyPlacementDeltas.java +++ b/src/java/org/apache/cassandra/tcm/transformations/ApplyPlacementDeltas.java @@ -24,13 +24,13 @@ import java.util.Objects; import org.apache.cassandra.exceptions.ExceptionCode; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; -import org.apache.cassandra.tcm.Transformation; -import org.apache.cassandra.tcm.serialization.AsymmetricMetadataSerializer; -import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.tcm.ClusterMetadata; -import org.apache.cassandra.tcm.sequences.LockedRanges; +import org.apache.cassandra.tcm.Transformation; import org.apache.cassandra.tcm.membership.NodeId; import org.apache.cassandra.tcm.ownership.PlacementDeltas; +import org.apache.cassandra.tcm.sequences.LockedRanges; +import org.apache.cassandra.tcm.serialization.AsymmetricMetadataSerializer; +import org.apache.cassandra.tcm.serialization.Version; public abstract class ApplyPlacementDeltas implements Transformation { diff --git a/src/java/org/apache/cassandra/tcm/transformations/BeginConsensusMigrationForTableAndRange.java b/src/java/org/apache/cassandra/tcm/transformations/BeginConsensusMigrationForTableAndRange.java index 869a5b5189..a738f73a82 100644 --- a/src/java/org/apache/cassandra/tcm/transformations/BeginConsensusMigrationForTableAndRange.java +++ b/src/java/org/apache/cassandra/tcm/transformations/BeginConsensusMigrationForTableAndRange.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; + import javax.annotation.Nonnull; import org.apache.cassandra.dht.NormalizedRanges; diff --git a/src/java/org/apache/cassandra/tcm/transformations/CustomTransformation.java b/src/java/org/apache/cassandra/tcm/transformations/CustomTransformation.java index bbe09699d5..c943dbdd41 100644 --- a/src/java/org/apache/cassandra/tcm/transformations/CustomTransformation.java +++ b/src/java/org/apache/cassandra/tcm/transformations/CustomTransformation.java @@ -19,18 +19,20 @@ package org.apache.cassandra.tcm.transformations; import java.io.IOException; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.Transformation; import org.apache.cassandra.tcm.extensions.ExtensionKey; import org.apache.cassandra.tcm.extensions.IntValue; import org.apache.cassandra.tcm.extensions.StringValue; +import org.apache.cassandra.tcm.sequences.LockedRanges; import org.apache.cassandra.tcm.serialization.AsymmetricMetadataSerializer; import org.apache.cassandra.tcm.serialization.Version; -import org.apache.cassandra.tcm.ClusterMetadata; -import org.apache.cassandra.tcm.sequences.LockedRanges; public class CustomTransformation implements Transformation { diff --git a/src/java/org/apache/cassandra/tcm/transformations/MaybeFinishConsensusMigrationForTableAndRange.java b/src/java/org/apache/cassandra/tcm/transformations/MaybeFinishConsensusMigrationForTableAndRange.java index 9b758b3486..710d5fea6f 100644 --- a/src/java/org/apache/cassandra/tcm/transformations/MaybeFinishConsensusMigrationForTableAndRange.java +++ b/src/java/org/apache/cassandra/tcm/transformations/MaybeFinishConsensusMigrationForTableAndRange.java @@ -20,6 +20,7 @@ package org.apache.cassandra.tcm.transformations; import java.io.IOException; import java.util.List; + import javax.annotation.Nonnull; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/tcm/transformations/PrepareJoin.java b/src/java/org/apache/cassandra/tcm/transformations/PrepareJoin.java index 55220e0cea..d8986e6829 100644 --- a/src/java/org/apache/cassandra/tcm/transformations/PrepareJoin.java +++ b/src/java/org/apache/cassandra/tcm/transformations/PrepareJoin.java @@ -26,6 +26,7 @@ import java.util.stream.Collectors; import com.google.common.collect.ImmutableSet; import accord.utils.Invariants; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Token; diff --git a/src/java/org/apache/cassandra/tcm/transformations/ReconfigureAccordFastPath.java b/src/java/org/apache/cassandra/tcm/transformations/ReconfigureAccordFastPath.java index e8feef342b..23e587d2f7 100644 --- a/src/java/org/apache/cassandra/tcm/transformations/ReconfigureAccordFastPath.java +++ b/src/java/org/apache/cassandra/tcm/transformations/ReconfigureAccordFastPath.java @@ -21,6 +21,7 @@ package org.apache.cassandra.tcm.transformations; import java.io.IOException; import accord.local.Node; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.exceptions.ExceptionCode; import org.apache.cassandra.exceptions.InvalidRequestException; diff --git a/src/java/org/apache/cassandra/tcm/transformations/Register.java b/src/java/org/apache/cassandra/tcm/transformations/Register.java index c60244bab7..0b3ebb375f 100644 --- a/src/java/org/apache/cassandra/tcm/transformations/Register.java +++ b/src/java/org/apache/cassandra/tcm/transformations/Register.java @@ -24,6 +24,7 @@ import java.util.Map; import java.util.UUID; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/tcm/transformations/cms/PreInitialize.java b/src/java/org/apache/cassandra/tcm/transformations/cms/PreInitialize.java index ed25d33cdf..e07d1f1a29 100644 --- a/src/java/org/apache/cassandra/tcm/transformations/cms/PreInitialize.java +++ b/src/java/org/apache/cassandra/tcm/transformations/cms/PreInitialize.java @@ -29,15 +29,15 @@ import org.apache.cassandra.locator.Replica; import org.apache.cassandra.schema.DistributedMetadataLogKeyspace; import org.apache.cassandra.schema.DistributedSchema; import org.apache.cassandra.schema.Keyspaces; -import org.apache.cassandra.tcm.Epoch; -import org.apache.cassandra.tcm.Transformation; -import org.apache.cassandra.tcm.serialization.AsymmetricMetadataSerializer; -import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.schema.ReplicationParams; import org.apache.cassandra.tcm.ClusterMetadata; +import org.apache.cassandra.tcm.Epoch; +import org.apache.cassandra.tcm.Transformation; import org.apache.cassandra.tcm.ownership.DataPlacement; import org.apache.cassandra.tcm.ownership.DataPlacements; import org.apache.cassandra.tcm.sequences.LockedRanges; +import org.apache.cassandra.tcm.serialization.AsymmetricMetadataSerializer; +import org.apache.cassandra.tcm.serialization.Version; public class PreInitialize implements Transformation { diff --git a/src/java/org/apache/cassandra/tools/AuditLogViewer.java b/src/java/org/apache/cassandra/tools/AuditLogViewer.java index f226aa2e70..866afd503d 100644 --- a/src/java/org/apache/cassandra/tools/AuditLogViewer.java +++ b/src/java/org/apache/cassandra/tools/AuditLogViewer.java @@ -22,7 +22,15 @@ import java.util.List; import java.util.function.Consumer; import java.util.stream.Collectors; -import org.apache.cassandra.io.util.File; +import net.openhft.chronicle.core.io.IORuntimeException; +import net.openhft.chronicle.queue.ExcerptTailer; +import net.openhft.chronicle.queue.RollCycles; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueue; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; +import net.openhft.chronicle.threads.Pauser; +import net.openhft.chronicle.wire.ReadMarshallable; +import net.openhft.chronicle.wire.WireIn; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.GnuParser; @@ -31,15 +39,8 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import net.openhft.chronicle.core.io.IORuntimeException; -import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; -import net.openhft.chronicle.queue.ExcerptTailer; -import net.openhft.chronicle.queue.RollCycles; -import net.openhft.chronicle.queue.impl.single.SingleChronicleQueue; -import net.openhft.chronicle.threads.Pauser; -import net.openhft.chronicle.wire.ReadMarshallable; -import net.openhft.chronicle.wire.WireIn; import org.apache.cassandra.audit.BinAuditLogger; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.utils.binlog.BinLog; /** diff --git a/src/java/org/apache/cassandra/tools/GenerateTokens.java b/src/java/org/apache/cassandra/tools/GenerateTokens.java index 560a53f8d9..8e41566529 100644 --- a/src/java/org/apache/cassandra/tools/GenerateTokens.java +++ b/src/java/org/apache/cassandra/tools/GenerateTokens.java @@ -28,8 +28,6 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.tokenallocator.OfflineTokenAllocator; @@ -38,6 +36,9 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.OutputHandler; +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; + public class GenerateTokens { private static final String RF = "rf"; diff --git a/src/java/org/apache/cassandra/tools/HashPassword.java b/src/java/org/apache/cassandra/tools/HashPassword.java index f229858c5c..68a13d603c 100644 --- a/src/java/org/apache/cassandra/tools/HashPassword.java +++ b/src/java/org/apache/cassandra/tools/HashPassword.java @@ -32,9 +32,9 @@ import org.apache.commons.cli.OptionGroup; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.lang3.StringUtils; +import org.mindrot.jbcrypt.BCrypt; import org.apache.cassandra.io.util.File; -import org.mindrot.jbcrypt.BCrypt; public class HashPassword { diff --git a/src/java/org/apache/cassandra/tools/JMXTool.java b/src/java/org/apache/cassandra/tools/JMXTool.java index aaab04ee76..7691e781cc 100644 --- a/src/java/org/apache/cassandra/tools/JMXTool.java +++ b/src/java/org/apache/cassandra/tools/JMXTool.java @@ -40,6 +40,7 @@ import java.util.function.BiConsumer; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.management.InstanceNotFoundException; import javax.management.IntrospectionException; import javax.management.MBeanAttributeInfo; @@ -55,15 +56,12 @@ import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; +import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Sets; import com.google.common.collect.Sets.SetView; -import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.cassandra.config.YamlConfigurationLoader; -import org.apache.cassandra.io.util.FileInputStreamPlus; -import org.apache.cassandra.utils.JsonUtils; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; @@ -72,6 +70,11 @@ import org.yaml.snakeyaml.nodes.MappingNode; import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.nodes.Tag; import org.yaml.snakeyaml.representer.Representer; + +import org.apache.cassandra.config.YamlConfigurationLoader; +import org.apache.cassandra.io.util.FileInputStreamPlus; +import org.apache.cassandra.utils.JsonUtils; + import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/JsonTransformer.java b/src/java/org/apache/cassandra/tools/JsonTransformer.java index cd960cb4ca..c86940f4b1 100644 --- a/src/java/org/apache/cassandra/tools/JsonTransformer.java +++ b/src/java/org/apache/cassandra/tools/JsonTransformer.java @@ -30,14 +30,15 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter.Indenter; import com.fasterxml.jackson.core.util.MinimalPrettyPrinter; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.db.ClusteringBound; import org.apache.cassandra.db.ClusteringPrefix; import org.apache.cassandra.db.DecoratedKey; diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index 897f49acfc..aa98d2218e 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -42,6 +42,7 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; + import javax.annotation.Nullable; import javax.management.InstanceNotFoundException; import javax.management.JMX; diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java index eefdbc2614..005e5304ed 100644 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@ -25,6 +25,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; + import javax.inject.Inject; import javax.management.InstanceNotFoundException; @@ -40,6 +41,7 @@ import org.apache.cassandra.tools.nodetool.JmxConnect; import org.apache.cassandra.tools.nodetool.NodetoolCommand; import org.apache.cassandra.tools.nodetool.layout.CassandraCliHelpLayout; import org.apache.cassandra.utils.FBUtilities; + import picocli.CommandLine; import static com.google.common.base.Throwables.getStackTraceAsString; diff --git a/src/java/org/apache/cassandra/tools/RepairRunner.java b/src/java/org/apache/cassandra/tools/RepairRunner.java index 97dbe39c37..acd784ac60 100644 --- a/src/java/org/apache/cassandra/tools/RepairRunner.java +++ b/src/java/org/apache/cassandra/tools/RepairRunner.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.PrintStream; import java.text.SimpleDateFormat; import java.util.List; + import javax.management.ListenerNotFoundException; import javax.management.remote.JMXConnector; diff --git a/src/java/org/apache/cassandra/tools/SSTableExport.java b/src/java/org/apache/cassandra/tools/SSTableExport.java index 0181e9f29f..937ffbb781 100644 --- a/src/java/org/apache/cassandra/tools/SSTableExport.java +++ b/src/java/org/apache/cassandra/tools/SSTableExport.java @@ -49,7 +49,6 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.File; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.TableMetadataRef; - import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_UTIL_ALLOW_TOOL_REINIT_FOR_TEST; diff --git a/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java b/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java index 11df06158d..2f526a5c23 100644 --- a/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java +++ b/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.google.common.collect.MinMaxPriorityQueue; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.HelpFormatter; diff --git a/src/java/org/apache/cassandra/tools/SSTablePartitions.java b/src/java/org/apache/cassandra/tools/SSTablePartitions.java index b435994bba..bce21f286a 100644 --- a/src/java/org/apache/cassandra/tools/SSTablePartitions.java +++ b/src/java/org/apache/cassandra/tools/SSTablePartitions.java @@ -30,6 +30,7 @@ import java.util.function.ToLongFunction; import java.util.stream.Collectors; import com.google.common.collect.ImmutableSet; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.HelpFormatter; diff --git a/src/java/org/apache/cassandra/tools/StandaloneJournalUtil.java b/src/java/org/apache/cassandra/tools/StandaloneJournalUtil.java index a14770472c..6cadb7fdc0 100644 --- a/src/java/org/apache/cassandra/tools/StandaloneJournalUtil.java +++ b/src/java/org/apache/cassandra/tools/StandaloneJournalUtil.java @@ -18,10 +18,6 @@ package org.apache.cassandra.tools; -import accord.local.RedundantBefore; -import accord.primitives.Timestamp; -import accord.primitives.TxnId; - import java.io.IOException; import java.nio.file.FileSystems; import java.nio.file.Files; @@ -34,7 +30,11 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import accord.local.RedundantBefore; +import accord.primitives.Timestamp; +import accord.primitives.TxnId; import accord.utils.Invariants; + import org.apache.cassandra.config.AccordSpec; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.DurationSpec; diff --git a/src/java/org/apache/cassandra/tools/StandaloneSSTableUtil.java b/src/java/org/apache/cassandra/tools/StandaloneSSTableUtil.java index badea964c5..5d39194d28 100644 --- a/src/java/org/apache/cassandra/tools/StandaloneSSTableUtil.java +++ b/src/java/org/apache/cassandra/tools/StandaloneSSTableUtil.java @@ -18,18 +18,22 @@ */ package org.apache.cassandra.tools; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.Directories; -import org.apache.cassandra.db.lifecycle.LifecycleTransaction; -import org.apache.cassandra.tcm.ClusterMetadataService; -import org.apache.cassandra.utils.OutputHandler; -import org.apache.commons.cli.*; - import java.io.IOException; import java.util.function.BiPredicate; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.ParseException; + +import org.apache.cassandra.db.Directories; +import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.io.util.File; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.tcm.ClusterMetadataService; +import org.apache.cassandra.utils.OutputHandler; public class StandaloneSSTableUtil { diff --git a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java index 965186ce7e..07a6056849 100644 --- a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java +++ b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java @@ -50,7 +50,6 @@ import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.utils.JVMStabilityInspector; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_UTIL_ALLOW_TOOL_REINIT_FOR_TEST; - import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; public class StandaloneSplitter diff --git a/src/java/org/apache/cassandra/tools/nodetool/AbortBootstrap.java b/src/java/org/apache/cassandra/tools/nodetool/AbortBootstrap.java index 00f44249e1..8b0d0eeecc 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/AbortBootstrap.java +++ b/src/java/org/apache/cassandra/tools/nodetool/AbortBootstrap.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/AccordAdmin.java b/src/java/org/apache/cassandra/tools/nodetool/AccordAdmin.java index e07f714824..0784f9f121 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/AccordAdmin.java +++ b/src/java/org/apache/cassandra/tools/nodetool/AccordAdmin.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Map; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/AlterTopology.java b/src/java/org/apache/cassandra/tools/nodetool/AlterTopology.java index 62390228d9..421076445e 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/AlterTopology.java +++ b/src/java/org/apache/cassandra/tools/nodetool/AlterTopology.java @@ -21,8 +21,10 @@ import java.util.ArrayList; import java.util.List; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; + import static com.google.common.base.Preconditions.checkArgument; @Command(name = "altertopology", description = "Modify the datacenter and/or rack of one or more nodes") diff --git a/src/java/org/apache/cassandra/tools/nodetool/Assassinate.java b/src/java/org/apache/cassandra/tools/nodetool/Assassinate.java index 22f56c5709..ae20ceedc0 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Assassinate.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Assassinate.java @@ -20,6 +20,7 @@ package org.apache.cassandra.tools.nodetool; import java.net.UnknownHostException; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/AutoRepairStatus.java b/src/java/org/apache/cassandra/tools/nodetool/AutoRepairStatus.java index 951be1ab37..09730fc73e 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/AutoRepairStatus.java +++ b/src/java/org/apache/cassandra/tools/nodetool/AutoRepairStatus.java @@ -25,6 +25,7 @@ import com.google.common.annotations.VisibleForTesting; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/BootstrapResume.java b/src/java/org/apache/cassandra/tools/nodetool/BootstrapResume.java index 9f000b9e07..43f9d5cf5f 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/BootstrapResume.java +++ b/src/java/org/apache/cassandra/tools/nodetool/BootstrapResume.java @@ -21,6 +21,7 @@ import java.io.IOError; import java.io.IOException; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/CIDRFilteringStats.java b/src/java/org/apache/cassandra/tools/nodetool/CIDRFilteringStats.java index c01bf46b41..f906aed8ed 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/CIDRFilteringStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/CIDRFilteringStats.java @@ -26,6 +26,7 @@ import org.apache.cassandra.db.virtual.CIDRFilteringMetricsTable.CIDRFilteringMe import org.apache.cassandra.db.virtual.CIDRFilteringMetricsTable.CIDRFilteringMetricsLatenciesTable; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; + import picocli.CommandLine.Command; /** diff --git a/src/java/org/apache/cassandra/tools/nodetool/CMSAdmin.java b/src/java/org/apache/cassandra/tools/nodetool/CMSAdmin.java index 40fb38464c..20aad56a17 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/CMSAdmin.java +++ b/src/java/org/apache/cassandra/tools/nodetool/CMSAdmin.java @@ -30,6 +30,7 @@ import com.google.common.collect.ImmutableList; import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/Cleanup.java b/src/java/org/apache/cassandra/tools/nodetool/Cleanup.java index b8e722d86b..d70d82ec3e 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Cleanup.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Cleanup.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/ClearSnapshot.java b/src/java/org/apache/cassandra/tools/nodetool/ClearSnapshot.java index 869531961c..7b4ba1f3ed 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ClearSnapshot.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ClearSnapshot.java @@ -28,6 +28,7 @@ import java.util.Map; import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/ClientStats.java b/src/java/org/apache/cassandra/tools/nodetool/ClientStats.java index 10b29bbb56..b4c3e70514 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ClientStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ClientStats.java @@ -31,6 +31,7 @@ import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; import org.apache.cassandra.transport.ClientStat; import org.apache.cassandra.transport.ConnectedClient; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/Compact.java b/src/java/org/apache/cassandra/tools/nodetool/Compact.java index c776592b65..8b73caef83 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Compact.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Compact.java @@ -22,6 +22,7 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/CompactionHistory.java b/src/java/org/apache/cassandra/tools/nodetool/CompactionHistory.java index 0eb4a32fda..6b5df8f14c 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/CompactionHistory.java +++ b/src/java/org/apache/cassandra/tools/nodetool/CompactionHistory.java @@ -22,6 +22,7 @@ import org.apache.cassandra.tools.nodetool.stats.CompactionHistoryHolder; import org.apache.cassandra.tools.nodetool.stats.CompactionHistoryPrinter; import org.apache.cassandra.tools.nodetool.stats.StatsHolder; import org.apache.cassandra.tools.nodetool.stats.StatsPrinter; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java b/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java index 51a675c5ac..4dab0158a1 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java @@ -30,6 +30,7 @@ import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.metrics.CassandraMetricsRegistry; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/CompressionDictionaryCommandGroup.java b/src/java/org/apache/cassandra/tools/nodetool/CompressionDictionaryCommandGroup.java index 02901cd375..3c11597207 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/CompressionDictionaryCommandGroup.java +++ b/src/java/org/apache/cassandra/tools/nodetool/CompressionDictionaryCommandGroup.java @@ -21,12 +21,13 @@ import java.io.PrintStream; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; + import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; +import com.fasterxml.jackson.databind.exc.ValueInstantiationException; import com.google.common.util.concurrent.Uninterruptibles; -import com.fasterxml.jackson.databind.exc.ValueInstantiationException; import org.apache.cassandra.db.compression.CompressionDictionaryDetailsTabularData; import org.apache.cassandra.db.compression.CompressionDictionaryDetailsTabularData.CompressionDictionaryDataObject; import org.apache.cassandra.db.compression.ICompressionDictionaryTrainer.TrainingStatus; @@ -37,6 +38,7 @@ import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.JsonUtils; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/ConsensusMigrationAdmin.java b/src/java/org/apache/cassandra/tools/nodetool/ConsensusMigrationAdmin.java index 7135ee7158..3bc66ef338 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ConsensusMigrationAdmin.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ConsensusMigrationAdmin.java @@ -27,6 +27,7 @@ import java.util.Set; import org.apache.cassandra.service.consensus.migration.ConsensusMigrationTarget; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.RepairRunner.RepairCmd; + import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/DataPaths.java b/src/java/org/apache/cassandra/tools/nodetool/DataPaths.java index 2af65534aa..f62ff1f3fb 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DataPaths.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DataPaths.java @@ -25,6 +25,7 @@ import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; import org.apache.cassandra.tools.nodetool.stats.DataPathsHolder; import org.apache.cassandra.tools.nodetool.stats.DataPathsPrinter; import org.apache.cassandra.tools.nodetool.stats.StatsPrinter; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/Decommission.java b/src/java/org/apache/cassandra/tools/nodetool/Decommission.java index 59b509037a..5576a97c97 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Decommission.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Decommission.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java b/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java index 11bf299286..a045dfa605 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java @@ -29,6 +29,7 @@ import org.apache.cassandra.locator.DynamicEndpointSnitch; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.LocationInfoMBean; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "describecluster", description = "Print the name, snitch, partitioner and schema version of a cluster") diff --git a/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java b/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java index a975b7638a..fd2ca386ad 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.PrintStream; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableAuditLog.java b/src/java/org/apache/cassandra/tools/nodetool/DisableAuditLog.java index 9ad15c21f8..d93bd7f61b 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableAuditLog.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableAuditLog.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "disableauditlog", description = "Disable the audit log") diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableAutoCompaction.java b/src/java/org/apache/cassandra/tools/nodetool/DisableAutoCompaction.java index ecba7441ba..421d50d2da 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableAutoCompaction.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableAutoCompaction.java @@ -23,12 +23,13 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; +import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalKeyspace; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalTables; -import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; @Command(name = "disableautocompaction", description = "Disable autocompaction for the given keyspace and table") public class DisableAutoCompaction extends AbstractCommand diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableBackup.java b/src/java/org/apache/cassandra/tools/nodetool/DisableBackup.java index f10f65a2e2..9bc82dbaf3 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableBackup.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableBackup.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "disablebackup", description = "Disable incremental backup") diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableBinary.java b/src/java/org/apache/cassandra/tools/nodetool/DisableBinary.java index 28513a2b54..8c5e141a61 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableBinary.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableBinary.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableFullQueryLog.java b/src/java/org/apache/cassandra/tools/nodetool/DisableFullQueryLog.java index d3a41d9faf..4ae550e79d 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableFullQueryLog.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableFullQueryLog.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "disablefullquerylog", description = "Disable the full query log") diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableGossip.java b/src/java/org/apache/cassandra/tools/nodetool/DisableGossip.java index f60ae02bcd..fd27b9633e 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableGossip.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableGossip.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "disablegossip", description = "Disable gossip (effectively marking the node down)") diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableHandoff.java b/src/java/org/apache/cassandra/tools/nodetool/DisableHandoff.java index 00a8251389..684c7afe5d 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableHandoff.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableHandoff.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "disablehandoff", description = "Disable storing hinted handoffs") diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableHintsForDC.java b/src/java/org/apache/cassandra/tools/nodetool/DisableHintsForDC.java index b78d6ab909..52498868a5 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableHintsForDC.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableHintsForDC.java @@ -21,10 +21,10 @@ import java.util.ArrayList; import java.util.List; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; - import static com.google.common.base.Preconditions.checkArgument; @Command(name = "disablehintsfordc", description = "Disable hints for a data center") diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableOldProtocolVersions.java b/src/java/org/apache/cassandra/tools/nodetool/DisableOldProtocolVersions.java index 8577d0f4bb..cb178671b4 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableOldProtocolVersions.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableOldProtocolVersions.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "disableoldprotocolversions", description = "Disable old protocol versions") diff --git a/src/java/org/apache/cassandra/tools/nodetool/Drain.java b/src/java/org/apache/cassandra/tools/nodetool/Drain.java index 3cbc2e6a4d..fa61b45989 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Drain.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Drain.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.concurrent.ExecutionException; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "drain", description = "Drain the node (stop accepting writes and flush all tables)") diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableAuditLog.java b/src/java/org/apache/cassandra/tools/nodetool/EnableAuditLog.java index 265aada48f..4c1676ab1d 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableAuditLog.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableAuditLog.java @@ -21,6 +21,7 @@ package org.apache.cassandra.tools.nodetool; import java.util.Collections; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableAutoCompaction.java b/src/java/org/apache/cassandra/tools/nodetool/EnableAutoCompaction.java index 7c098e3f32..19c3e0c888 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableAutoCompaction.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableAutoCompaction.java @@ -22,14 +22,14 @@ import java.util.ArrayList; import java.util.List; import org.apache.cassandra.tools.NodeProbe; - import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; +import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalKeyspace; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalTables; -import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; @Command(name = "enableautocompaction", description = "Enable autocompaction for the given keyspace and table") public class EnableAutoCompaction extends AbstractCommand diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableBackup.java b/src/java/org/apache/cassandra/tools/nodetool/EnableBackup.java index 9e5611ee4e..0e7b83daed 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableBackup.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableBackup.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "enablebackup", description = "Enable incremental backup") diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableBinary.java b/src/java/org/apache/cassandra/tools/nodetool/EnableBinary.java index 17fd640f4f..c5683cb46f 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableBinary.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableBinary.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "enablebinary", description = "Reenable native transport (binary protocol)") diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableFullQueryLog.java b/src/java/org/apache/cassandra/tools/nodetool/EnableFullQueryLog.java index 7f8f2ddfd4..b2989a7e63 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableFullQueryLog.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableFullQueryLog.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableGossip.java b/src/java/org/apache/cassandra/tools/nodetool/EnableGossip.java index a0c53e21b7..9ad43bd1a1 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableGossip.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableGossip.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "enablegossip", description = "Reenable gossip") diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableHandoff.java b/src/java/org/apache/cassandra/tools/nodetool/EnableHandoff.java index cf77ead527..fcca35863f 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableHandoff.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableHandoff.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "enablehandoff", description = "Reenable future hints storing on the current node") diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableOldProtocolVersions.java b/src/java/org/apache/cassandra/tools/nodetool/EnableOldProtocolVersions.java index abdfe0094b..695d824aa7 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableOldProtocolVersions.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableOldProtocolVersions.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "enableoldprotocolversions", description = "Enable old protocol versions") diff --git a/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java b/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java index 185406e7f4..f24feccc01 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java +++ b/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java @@ -18,10 +18,12 @@ package org.apache.cassandra.tools.nodetool; import java.util.List; + import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "failuredetector", description = "Shows the failure detector information for the cluster") diff --git a/src/java/org/apache/cassandra/tools/nodetool/Flush.java b/src/java/org/apache/cassandra/tools/nodetool/Flush.java index 79e352fe14..3e865f89d1 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Flush.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Flush.java @@ -22,12 +22,13 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; +import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalKeyspace; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalTables; -import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; @Command(name = "flush", description = "Flush one or more tables") public class Flush extends AbstractCommand diff --git a/src/java/org/apache/cassandra/tools/nodetool/ForceCompact.java b/src/java/org/apache/cassandra/tools/nodetool/ForceCompact.java index a00c033dbe..3e83ff2e06 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ForceCompact.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ForceCompact.java @@ -23,12 +23,13 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.cassandra.tools.nodetool.CommandUtils.parsePartitionKeys; import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; +import static org.apache.cassandra.tools.nodetool.CommandUtils.parsePartitionKeys; @Command(name = "forcecompact", description = "Force a (major) compaction on a table") public class ForceCompact extends AbstractCommand diff --git a/src/java/org/apache/cassandra/tools/nodetool/GarbageCollect.java b/src/java/org/apache/cassandra/tools/nodetool/GarbageCollect.java index 8d9073e402..5d285bb7bf 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GarbageCollect.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GarbageCollect.java @@ -22,15 +22,15 @@ import java.util.List; import org.apache.cassandra.schema.CompactionParams; import org.apache.cassandra.tools.NodeProbe; - import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; -import picocli.CommandLine.Parameters; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; +import picocli.CommandLine.Parameters; +import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalKeyspace; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalTables; -import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; @Command(name = "garbagecollect", description = "Remove deleted data from one or more tables") public class GarbageCollect extends AbstractCommand diff --git a/src/java/org/apache/cassandra/tools/nodetool/GcStats.java b/src/java/org/apache/cassandra/tools/nodetool/GcStats.java index 59f1c752a7..4942cae1ca 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GcStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GcStats.java @@ -20,6 +20,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.stats.GcStatsHolder; import org.apache.cassandra.tools.nodetool.stats.GcStatsPrinter; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetAuditLog.java b/src/java/org/apache/cassandra/tools/nodetool/GetAuditLog.java index 410141ff24..a9a27934ba 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetAuditLog.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetAuditLog.java @@ -21,6 +21,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.audit.AuditLogOptions; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; + import picocli.CommandLine.Command; @Command(name = "getauditlog", description = "Print configuration of audit log if enabled, otherwise the configuration reflected in cassandra.yaml") diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetAuthCacheConfig.java b/src/java/org/apache/cassandra/tools/nodetool/GetAuthCacheConfig.java index ba2e6584ca..4a2c5327ce 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetAuthCacheConfig.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetAuthCacheConfig.java @@ -20,6 +20,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.auth.AuthCacheMBean; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetAutoRepairConfig.java b/src/java/org/apache/cassandra/tools/nodetool/GetAutoRepairConfig.java index 11cb2fd31d..ac457dc93e 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetAutoRepairConfig.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetAutoRepairConfig.java @@ -22,6 +22,7 @@ import java.io.PrintStream; import com.google.common.annotations.VisibleForTesting; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; /** diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetBatchlogReplayTrottle.java b/src/java/org/apache/cassandra/tools/nodetool/GetBatchlogReplayTrottle.java index 7a1f706da8..b861194acf 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetBatchlogReplayTrottle.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetBatchlogReplayTrottle.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "getbatchlogreplaythrottle", description = "Print batchlog replay throttle in KB/s. " + diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetCIDRGroupsOfIP.java b/src/java/org/apache/cassandra/tools/nodetool/GetCIDRGroupsOfIP.java index 28cc36530b..f35da355f3 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetCIDRGroupsOfIP.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetCIDRGroupsOfIP.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetColumnIndexSize.java b/src/java/org/apache/cassandra/tools/nodetool/GetColumnIndexSize.java index c820fd0995..c4b52c0648 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetColumnIndexSize.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetColumnIndexSize.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "getcolumnindexsize", description = "Print the granularity of the collation index of rows within a partition in KiB") diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThreshold.java b/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThreshold.java index c5e8c3b1ad..2d08d114cc 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThreshold.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThreshold.java @@ -17,18 +17,19 @@ */ package org.apache.cassandra.tools.nodetool; -import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; - import java.util.ArrayList; import java.util.List; import org.apache.cassandra.db.ColumnFamilyStoreMBean; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; +import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; + @Command(name = "getcompactionthreshold", description = "Print min and max compaction thresholds for a given table") public class GetCompactionThreshold extends AbstractCommand { diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThroughput.java b/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThroughput.java index 16b867e7e3..817b6f8933 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThroughput.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThroughput.java @@ -22,6 +22,7 @@ import java.util.Map; import com.google.common.math.DoubleMath; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetConcurrency.java b/src/java/org/apache/cassandra/tools/nodetool/GetConcurrency.java index fa35559560..0d6c3e8e2c 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetConcurrency.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetConcurrency.java @@ -22,8 +22,9 @@ import java.util.List; import java.util.Map; import org.apache.cassandra.tools.NodeProbe; -import picocli.CommandLine.Parameters; + import picocli.CommandLine.Command; +import picocli.CommandLine.Parameters; @Command(name = "getconcurrency", description = "Get maximum concurrency for processing stages") public class GetConcurrency extends AbstractCommand diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetConcurrentCompactors.java b/src/java/org/apache/cassandra/tools/nodetool/GetConcurrentCompactors.java index 77674c1d6d..5ffd26c0ca 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetConcurrentCompactors.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetConcurrentCompactors.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "getconcurrentcompactors", description = "Get the number of concurrent compactors in the system.") diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetConcurrentViewBuilders.java b/src/java/org/apache/cassandra/tools/nodetool/GetConcurrentViewBuilders.java index 536e892b86..7267d6651b 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetConcurrentViewBuilders.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetConcurrentViewBuilders.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "getconcurrentviewbuilders", description = "Get the number of concurrent view builders in the system") diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetDefaultKeyspaceRF.java b/src/java/org/apache/cassandra/tools/nodetool/GetDefaultKeyspaceRF.java index 53e9124041..3d5dd6f733 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetDefaultKeyspaceRF.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetDefaultKeyspaceRF.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "getdefaultrf", description = "Gets default keyspace replication factor.") diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java b/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java index 7d89bb678f..b83a06e217 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java @@ -23,8 +23,9 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; -import picocli.CommandLine.Parameters; + import picocli.CommandLine.Command; +import picocli.CommandLine.Parameters; import static com.google.common.base.Preconditions.checkArgument; import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetFullQueryLog.java b/src/java/org/apache/cassandra/tools/nodetool/GetFullQueryLog.java index 72c2d6dad8..16462055ed 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetFullQueryLog.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetFullQueryLog.java @@ -21,6 +21,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.fql.FullQueryLoggerOptions; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; + import picocli.CommandLine.Command; @Command(name = "getfullquerylog", description = "Print configuration of fql if enabled, otherwise the configuration reflected in cassandra.yaml") diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetInterDCStreamThroughput.java b/src/java/org/apache/cassandra/tools/nodetool/GetInterDCStreamThroughput.java index 5d727470ed..df913cb9a6 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetInterDCStreamThroughput.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetInterDCStreamThroughput.java @@ -20,6 +20,7 @@ package org.apache.cassandra.tools.nodetool; import com.google.common.math.DoubleMath; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetLoggingLevels.java b/src/java/org/apache/cassandra/tools/nodetool/GetLoggingLevels.java index fedac6f091..93b822d369 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetLoggingLevels.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetLoggingLevels.java @@ -20,6 +20,7 @@ package org.apache.cassandra.tools.nodetool; import java.util.Map; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "getlogginglevels", description = "Get the runtime logging levels") diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetMaxHintWindow.java b/src/java/org/apache/cassandra/tools/nodetool/GetMaxHintWindow.java index 7eba1315ac..d34c22c1dc 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetMaxHintWindow.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetMaxHintWindow.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "getmaxhintwindow", description = "Print the max hint window in ms") diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetSSTables.java b/src/java/org/apache/cassandra/tools/nodetool/GetSSTables.java index 37395730c9..a30aea4d7b 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetSSTables.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetSSTables.java @@ -24,6 +24,7 @@ import java.util.Set; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetSeeds.java b/src/java/org/apache/cassandra/tools/nodetool/GetSeeds.java index 1d92673300..3403f0f500 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetSeeds.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetSeeds.java @@ -20,6 +20,7 @@ package org.apache.cassandra.tools.nodetool; import java.util.List; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "getseeds", description = "Get the currently in use seed node IP list excluding the node IP") diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetSnapshotThrottle.java b/src/java/org/apache/cassandra/tools/nodetool/GetSnapshotThrottle.java index 06a4260ca5..962bccb796 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetSnapshotThrottle.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetSnapshotThrottle.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "getsnapshotthrottle", description = "Print the snapshot_links_per_second throttle for snapshot/clearsnapshot") diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetStreamThroughput.java b/src/java/org/apache/cassandra/tools/nodetool/GetStreamThroughput.java index 2de2db9844..f731bd7d3c 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetStreamThroughput.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetStreamThroughput.java @@ -20,6 +20,7 @@ package org.apache.cassandra.tools.nodetool; import com.google.common.math.DoubleMath; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetTraceProbability.java b/src/java/org/apache/cassandra/tools/nodetool/GetTraceProbability.java index da8c15a275..a05e52d99d 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetTraceProbability.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetTraceProbability.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "gettraceprobability", description = "Print the current trace probability value") diff --git a/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java b/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java index 0d5f5a1253..a75b3b7abd 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/Help.java b/src/java/org/apache/cassandra/tools/nodetool/Help.java index 2491fde5a6..3e9de1554f 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Help.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Help.java @@ -27,6 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import org.apache.cassandra.tools.nodetool.layout.CassandraCliHelpLayout; + import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.IHelpCommandInitializable2; diff --git a/src/java/org/apache/cassandra/tools/nodetool/History.java b/src/java/org/apache/cassandra/tools/nodetool/History.java index 3f7d502161..15ece16df2 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/History.java +++ b/src/java/org/apache/cassandra/tools/nodetool/History.java @@ -24,6 +24,7 @@ import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool; + import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/Import.java b/src/java/org/apache/cassandra/tools/nodetool/Import.java index 8868599936..dc8ef04ff4 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Import.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Import.java @@ -26,6 +26,7 @@ import com.google.common.collect.Lists; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/Info.java b/src/java/org/apache/cassandra/tools/nodetool/Info.java index 8f7598b064..b0b2dff019 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Info.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Info.java @@ -23,12 +23,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; + import javax.management.InstanceNotFoundException; import org.apache.cassandra.db.ColumnFamilyStoreMBean; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.service.CacheServiceMBean; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/InvalidateCIDRPermissionsCache.java b/src/java/org/apache/cassandra/tools/nodetool/InvalidateCIDRPermissionsCache.java index d4e66bcf7c..2c3b792009 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/InvalidateCIDRPermissionsCache.java +++ b/src/java/org/apache/cassandra/tools/nodetool/InvalidateCIDRPermissionsCache.java @@ -22,8 +22,9 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; -import picocli.CommandLine.Parameters; + import picocli.CommandLine.Command; +import picocli.CommandLine.Parameters; /** * Nodetool command to invalidate CIDR permissions cache, for a give role or for all roles in the cache. diff --git a/src/java/org/apache/cassandra/tools/nodetool/InvalidateCounterCache.java b/src/java/org/apache/cassandra/tools/nodetool/InvalidateCounterCache.java index b05f87dd64..c583072efa 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/InvalidateCounterCache.java +++ b/src/java/org/apache/cassandra/tools/nodetool/InvalidateCounterCache.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "invalidatecountercache", description = "Invalidate the counter cache") diff --git a/src/java/org/apache/cassandra/tools/nodetool/InvalidateCredentialsCache.java b/src/java/org/apache/cassandra/tools/nodetool/InvalidateCredentialsCache.java index 58dede10a6..24d1bf732c 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/InvalidateCredentialsCache.java +++ b/src/java/org/apache/cassandra/tools/nodetool/InvalidateCredentialsCache.java @@ -22,6 +22,7 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/InvalidateJmxPermissionsCache.java b/src/java/org/apache/cassandra/tools/nodetool/InvalidateJmxPermissionsCache.java index abf67aa68b..cc517cb3f6 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/InvalidateJmxPermissionsCache.java +++ b/src/java/org/apache/cassandra/tools/nodetool/InvalidateJmxPermissionsCache.java @@ -22,6 +22,7 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/InvalidateKeyCache.java b/src/java/org/apache/cassandra/tools/nodetool/InvalidateKeyCache.java index af7149f64a..e6ddd74413 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/InvalidateKeyCache.java +++ b/src/java/org/apache/cassandra/tools/nodetool/InvalidateKeyCache.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "invalidatekeycache", description = "Invalidate the key cache") diff --git a/src/java/org/apache/cassandra/tools/nodetool/InvalidateNetworkPermissionsCache.java b/src/java/org/apache/cassandra/tools/nodetool/InvalidateNetworkPermissionsCache.java index c68569b132..9cad615d34 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/InvalidateNetworkPermissionsCache.java +++ b/src/java/org/apache/cassandra/tools/nodetool/InvalidateNetworkPermissionsCache.java @@ -22,6 +22,7 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/InvalidatePermissionsCache.java b/src/java/org/apache/cassandra/tools/nodetool/InvalidatePermissionsCache.java index e659dc4d9a..e1fcc6b26a 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/InvalidatePermissionsCache.java +++ b/src/java/org/apache/cassandra/tools/nodetool/InvalidatePermissionsCache.java @@ -28,9 +28,10 @@ import org.apache.cassandra.auth.JMXResource; import org.apache.cassandra.auth.RoleResource; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.tools.NodeProbe; -import picocli.CommandLine.Parameters; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; +import picocli.CommandLine.Parameters; import static com.google.common.base.Preconditions.checkArgument; diff --git a/src/java/org/apache/cassandra/tools/nodetool/InvalidateRolesCache.java b/src/java/org/apache/cassandra/tools/nodetool/InvalidateRolesCache.java index 5ce39bbbcb..574c9bbeb3 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/InvalidateRolesCache.java +++ b/src/java/org/apache/cassandra/tools/nodetool/InvalidateRolesCache.java @@ -22,6 +22,7 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/InvalidateRowCache.java b/src/java/org/apache/cassandra/tools/nodetool/InvalidateRowCache.java index f3676730d8..89aaac4e90 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/InvalidateRowCache.java +++ b/src/java/org/apache/cassandra/tools/nodetool/InvalidateRowCache.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "invalidaterowcache", description = "Invalidate the row cache") diff --git a/src/java/org/apache/cassandra/tools/nodetool/Join.java b/src/java/org/apache/cassandra/tools/nodetool/Join.java index 6c14be165a..0eb88e09c6 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Join.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Join.java @@ -17,13 +17,14 @@ */ package org.apache.cassandra.tools.nodetool; -import static com.google.common.base.Preconditions.checkState; - import java.io.IOException; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; +import static com.google.common.base.Preconditions.checkState; + @Command(name = "join", description = "Join the ring") public class Join extends AbstractCommand diff --git a/src/java/org/apache/cassandra/tools/nodetool/ListCIDRGroups.java b/src/java/org/apache/cassandra/tools/nodetool/ListCIDRGroups.java index 330dfeb9f9..c655df991e 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ListCIDRGroups.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ListCIDRGroups.java @@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.auth.AuthKeyspace; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/ListPendingHints.java b/src/java/org/apache/cassandra/tools/nodetool/ListPendingHints.java index 008c8b716e..c65ea6a002 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ListPendingHints.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ListPendingHints.java @@ -31,6 +31,7 @@ import org.apache.cassandra.locator.EndpointSnitchInfoMBean; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; + import picocli.CommandLine.Command; @Command(name = "listpendinghints", description = "Print all pending hints that this node has") diff --git a/src/java/org/apache/cassandra/tools/nodetool/ListSnapshots.java b/src/java/org/apache/cassandra/tools/nodetool/ListSnapshots.java index 49ebf140dc..6c4391efeb 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ListSnapshots.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ListSnapshots.java @@ -22,11 +22,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; + import javax.management.openmbean.TabularData; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/Move.java b/src/java/org/apache/cassandra/tools/nodetool/Move.java index d4ef54cdfc..89684bb75c 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Move.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Move.java @@ -20,6 +20,7 @@ package org.apache.cassandra.tools.nodetool; import java.io.IOException; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/NetStats.java b/src/java/org/apache/cassandra/tools/nodetool/NetStats.java index fcee02cf03..0399030315 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/NetStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/NetStats.java @@ -29,6 +29,7 @@ import org.apache.cassandra.streaming.ProgressInfo; import org.apache.cassandra.streaming.SessionInfo; import org.apache.cassandra.streaming.StreamState; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/PauseHandoff.java b/src/java/org/apache/cassandra/tools/nodetool/PauseHandoff.java index e650048441..4492e87b36 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/PauseHandoff.java +++ b/src/java/org/apache/cassandra/tools/nodetool/PauseHandoff.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "pausehandoff", description = "Pause hints delivery process") diff --git a/src/java/org/apache/cassandra/tools/nodetool/ProfileLoad.java b/src/java/org/apache/cassandra/tools/nodetool/ProfileLoad.java index 711d259c78..e1ecbf7de3 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ProfileLoad.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ProfileLoad.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; + import javax.management.openmbean.CompositeData; import javax.management.openmbean.OpenDataException; @@ -35,6 +36,7 @@ import org.apache.cassandra.metrics.SamplingManager; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; import org.apache.cassandra.utils.Pair; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/ProxyHistograms.java b/src/java/org/apache/cassandra/tools/nodetool/ProxyHistograms.java index aff4a294b2..36fffb9686 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ProxyHistograms.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ProxyHistograms.java @@ -20,6 +20,7 @@ package org.apache.cassandra.tools.nodetool; import java.io.PrintStream; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import static java.lang.String.format; diff --git a/src/java/org/apache/cassandra/tools/nodetool/RangeKeySample.java b/src/java/org/apache/cassandra/tools/nodetool/RangeKeySample.java index 96003a5a34..e566f0b99f 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RangeKeySample.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RangeKeySample.java @@ -20,6 +20,7 @@ package org.apache.cassandra.tools.nodetool; import java.util.List; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "rangekeysample", description = "Shows the sampled keys held across all keyspaces") diff --git a/src/java/org/apache/cassandra/tools/nodetool/Rebuild.java b/src/java/org/apache/cassandra/tools/nodetool/Rebuild.java index a68a3d5d9a..326e7e968c 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Rebuild.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Rebuild.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/RebuildIndex.java b/src/java/org/apache/cassandra/tools/nodetool/RebuildIndex.java index 02975244cc..e0e090bd3a 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RebuildIndex.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RebuildIndex.java @@ -22,6 +22,7 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/RecompressSSTables.java b/src/java/org/apache/cassandra/tools/nodetool/RecompressSSTables.java index 3b65615469..d03879d6b0 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RecompressSSTables.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RecompressSSTables.java @@ -22,13 +22,14 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; +import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalKeyspace; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalTables; -import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; @Command(name = "recompress_sstables", description = "Rewrite sstables (for the requested tables) that have compression configuration different from the current") public class RecompressSSTables extends AbstractCommand diff --git a/src/java/org/apache/cassandra/tools/nodetool/Refresh.java b/src/java/org/apache/cassandra/tools/nodetool/Refresh.java index 10bf07c650..1daaf18a9f 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Refresh.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Refresh.java @@ -22,6 +22,7 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/RefreshSizeEstimates.java b/src/java/org/apache/cassandra/tools/nodetool/RefreshSizeEstimates.java index b8d4d948d3..fc0f7b7ded 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RefreshSizeEstimates.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RefreshSizeEstimates.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "refreshsizeestimates", description = "Refresh system.size_estimates") diff --git a/src/java/org/apache/cassandra/tools/nodetool/ReloadCIDRGroupsCache.java b/src/java/org/apache/cassandra/tools/nodetool/ReloadCIDRGroupsCache.java index c5b8091974..54f121ee36 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ReloadCIDRGroupsCache.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ReloadCIDRGroupsCache.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; /** diff --git a/src/java/org/apache/cassandra/tools/nodetool/ReloadLocalSchema.java b/src/java/org/apache/cassandra/tools/nodetool/ReloadLocalSchema.java index 8ae6daeef7..e3cdde2c91 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ReloadLocalSchema.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ReloadLocalSchema.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "reloadlocalschema", description = "Reload local node schema from system tables") diff --git a/src/java/org/apache/cassandra/tools/nodetool/ReloadSeeds.java b/src/java/org/apache/cassandra/tools/nodetool/ReloadSeeds.java index 1c0680fc2c..fa6e32e783 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ReloadSeeds.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ReloadSeeds.java @@ -21,6 +21,7 @@ import java.io.PrintStream; import java.util.List; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "reloadseeds", description = "Reload the seed node list from the seed node provider") diff --git a/src/java/org/apache/cassandra/tools/nodetool/ReloadSslCertificates.java b/src/java/org/apache/cassandra/tools/nodetool/ReloadSslCertificates.java index ae48c56c33..7cea39b36d 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ReloadSslCertificates.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ReloadSslCertificates.java @@ -19,9 +19,10 @@ package org.apache.cassandra.tools.nodetool; import java.io.IOException; -import picocli.CommandLine.Command; import org.apache.cassandra.tools.NodeProbe; +import picocli.CommandLine.Command; + @Command(name = "reloadssl", description = "Signals Cassandra to reload SSL certificates") public class ReloadSslCertificates extends AbstractCommand { diff --git a/src/java/org/apache/cassandra/tools/nodetool/ReloadTriggers.java b/src/java/org/apache/cassandra/tools/nodetool/ReloadTriggers.java index 5c296e90f9..393c54d196 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ReloadTriggers.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ReloadTriggers.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "reloadtriggers", description = "Reload trigger classes") diff --git a/src/java/org/apache/cassandra/tools/nodetool/RelocateSSTables.java b/src/java/org/apache/cassandra/tools/nodetool/RelocateSSTables.java index da4da2b411..67f3ee5193 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RelocateSSTables.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RelocateSSTables.java @@ -22,13 +22,14 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; +import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalKeyspace; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalTables; -import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; @Command(name = "relocatesstables", description = "Relocates sstables to the correct disk") public class RelocateSSTables extends AbstractCommand diff --git a/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java b/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java index 67ab782f60..f827a37888 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/Repair.java b/src/java/org/apache/cassandra/tools/nodetool/Repair.java index 1d0aa8e95f..2ce81a64af 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Repair.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Repair.java @@ -25,6 +25,7 @@ import java.util.Set; import java.util.function.Supplier; import com.google.common.collect.Sets; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.repair.RepairParallelism; @@ -33,6 +34,7 @@ import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/RepairAdmin.java b/src/java/org/apache/cassandra/tools/nodetool/RepairAdmin.java index 22b0aaf91c..0d8ecae012 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RepairAdmin.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RepairAdmin.java @@ -22,11 +22,13 @@ import java.io.PrintStream; import java.util.ArrayList; import java.util.List; import java.util.Map; + import javax.management.openmbean.CompositeData; import com.google.common.base.Joiner; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; + import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.repair.consistent.LocalSessionInfo; @@ -36,6 +38,7 @@ import org.apache.cassandra.repair.consistent.admin.RepairStats; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; import org.apache.cassandra.utils.FBUtilities; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/ReplayBatchlog.java b/src/java/org/apache/cassandra/tools/nodetool/ReplayBatchlog.java index 91b6e12e5b..0241da7e7e 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ReplayBatchlog.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ReplayBatchlog.java @@ -22,6 +22,7 @@ import java.io.IOError; import java.io.IOException; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "replaybatchlog", description = "Kick off batchlog replay and wait for finish") diff --git a/src/java/org/apache/cassandra/tools/nodetool/ResetFullQueryLog.java b/src/java/org/apache/cassandra/tools/nodetool/ResetFullQueryLog.java index b3df3fffd0..95febc7acb 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ResetFullQueryLog.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ResetFullQueryLog.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "resetfullquerylog", description = "Stop the full query log and clean files in the configured full query log directory from cassandra.yaml as well as JMX") diff --git a/src/java/org/apache/cassandra/tools/nodetool/ResetLocalSchema.java b/src/java/org/apache/cassandra/tools/nodetool/ResetLocalSchema.java index f6d8c647f1..318a44e2f0 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ResetLocalSchema.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ResetLocalSchema.java @@ -20,6 +20,7 @@ package org.apache.cassandra.tools.nodetool; import java.io.IOException; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "resetlocalschema", description = "Reset node's local schema and resync") diff --git a/src/java/org/apache/cassandra/tools/nodetool/ResumeHandoff.java b/src/java/org/apache/cassandra/tools/nodetool/ResumeHandoff.java index 0da92beca5..1635b051df 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ResumeHandoff.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ResumeHandoff.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "resumehandoff", description = "Resume hints delivery process") diff --git a/src/java/org/apache/cassandra/tools/nodetool/Ring.java b/src/java/org/apache/cassandra/tools/nodetool/Ring.java index 331bc8de5b..15964525da 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Ring.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Ring.java @@ -32,6 +32,7 @@ import com.google.common.collect.LinkedHashMultimap; import org.apache.cassandra.locator.EndpointSnitchInfoMBean; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SSTableRepairedSet.java b/src/java/org/apache/cassandra/tools/nodetool/SSTableRepairedSet.java index ac1f8f0509..511162508c 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SSTableRepairedSet.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SSTableRepairedSet.java @@ -25,6 +25,7 @@ import java.util.List; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java index 5de96ab1d4..1302eb4f89 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.StandaloneScrubber; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetAuthCacheConfig.java b/src/java/org/apache/cassandra/tools/nodetool/SetAuthCacheConfig.java index 83cbaa3293..492ade1f59 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetAuthCacheConfig.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetAuthCacheConfig.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.auth.AuthCacheMBean; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetAutoRepairConfig.java b/src/java/org/apache/cassandra/tools/nodetool/SetAutoRepairConfig.java index 32b0c6ea4f..0a65e8b478 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetAutoRepairConfig.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetAutoRepairConfig.java @@ -17,10 +17,6 @@ */ package org.apache.cassandra.tools.nodetool; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Splitter; - - import java.io.PrintStream; import java.util.ArrayList; import java.util.HashSet; @@ -28,10 +24,14 @@ import java.util.List; import java.util.Objects; import java.util.Set; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Splitter; + import org.apache.cassandra.tools.NodeProbe; -import picocli.CommandLine.Parameters; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; +import picocli.CommandLine.Parameters; import static com.google.common.base.Preconditions.checkArgument; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetBatchlogReplayThrottle.java b/src/java/org/apache/cassandra/tools/nodetool/SetBatchlogReplayThrottle.java index aa02bf87c9..679006a7d3 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetBatchlogReplayThrottle.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetBatchlogReplayThrottle.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetCacheCapacity.java b/src/java/org/apache/cassandra/tools/nodetool/SetCacheCapacity.java index 3ff55f5cfe..f91ab28d73 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetCacheCapacity.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetCacheCapacity.java @@ -23,6 +23,7 @@ import java.util.Optional; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetCacheKeysToSave.java b/src/java/org/apache/cassandra/tools/nodetool/SetCacheKeysToSave.java index 9b4f1d8b64..224605a590 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetCacheKeysToSave.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetCacheKeysToSave.java @@ -23,6 +23,7 @@ import java.util.Optional; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetColumnIndexSize.java b/src/java/org/apache/cassandra/tools/nodetool/SetColumnIndexSize.java index de9673196d..a8827276af 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetColumnIndexSize.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetColumnIndexSize.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThreshold.java b/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThreshold.java index 29ec91d405..362b8d6b39 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThreshold.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThreshold.java @@ -22,6 +22,7 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThroughput.java b/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThroughput.java index dc61e93f00..f1ff3ed4d9 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThroughput.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThroughput.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetConcurrency.java b/src/java/org/apache/cassandra/tools/nodetool/SetConcurrency.java index 2e24372e83..16957c74cd 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetConcurrency.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetConcurrency.java @@ -22,6 +22,7 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetConcurrentCompactors.java b/src/java/org/apache/cassandra/tools/nodetool/SetConcurrentCompactors.java index 265890830a..880a041ac8 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetConcurrentCompactors.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetConcurrentCompactors.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetConcurrentViewBuilders.java b/src/java/org/apache/cassandra/tools/nodetool/SetConcurrentViewBuilders.java index 4ee03b8c5a..7dfe636b01 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetConcurrentViewBuilders.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetConcurrentViewBuilders.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetDefaultKeyspaceRF.java b/src/java/org/apache/cassandra/tools/nodetool/SetDefaultKeyspaceRF.java index 4bf2ccc9a6..d6a236bbed 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetDefaultKeyspaceRF.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetDefaultKeyspaceRF.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetHintedHandoffThrottleInKB.java b/src/java/org/apache/cassandra/tools/nodetool/SetHintedHandoffThrottleInKB.java index 21c2a171da..37363356f9 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetHintedHandoffThrottleInKB.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetHintedHandoffThrottleInKB.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetInterDCStreamThroughput.java b/src/java/org/apache/cassandra/tools/nodetool/SetInterDCStreamThroughput.java index 464b226070..cdce2aa279 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetInterDCStreamThroughput.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetInterDCStreamThroughput.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetLoggingLevel.java b/src/java/org/apache/cassandra/tools/nodetool/SetLoggingLevel.java index dcde61f6a4..183d614f84 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetLoggingLevel.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetLoggingLevel.java @@ -25,6 +25,7 @@ import com.google.common.collect.Lists; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetMaxHintWindow.java b/src/java/org/apache/cassandra/tools/nodetool/SetMaxHintWindow.java index f73e68b8a2..792b33b05d 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetMaxHintWindow.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetMaxHintWindow.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetSnapshotThrottle.java b/src/java/org/apache/cassandra/tools/nodetool/SetSnapshotThrottle.java index cbb5557e47..e4d3e91a0e 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetSnapshotThrottle.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetSnapshotThrottle.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetStreamThroughput.java b/src/java/org/apache/cassandra/tools/nodetool/SetStreamThroughput.java index d781a1a6ae..d5fcfbe962 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetStreamThroughput.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetStreamThroughput.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetTimeout.java b/src/java/org/apache/cassandra/tools/nodetool/SetTimeout.java index e386a09f9d..51ca862b99 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetTimeout.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetTimeout.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetTraceProbability.java b/src/java/org/apache/cassandra/tools/nodetool/SetTraceProbability.java index 013a7f3548..d370ded15d 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetTraceProbability.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetTraceProbability.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/Sjk.java b/src/java/org/apache/cassandra/tools/nodetool/Sjk.java index 793063ca10..1f2d5db777 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Sjk.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Sjk.java @@ -33,17 +33,21 @@ import java.util.Map; import java.util.Stack; import java.util.jar.JarEntry; import java.util.jar.JarFile; + import javax.annotation.Nullable; import javax.management.MBeanServerConnection; import com.beust.jcommander.JCommander; import com.beust.jcommander.ParameterDescription; import com.beust.jcommander.Parameterized; + +import org.gridkit.jvmtool.JmxConnectionInfo; +import org.gridkit.jvmtool.cli.CommandLauncher; + import org.apache.cassandra.io.util.File; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.Output; -import org.gridkit.jvmtool.JmxConnectionInfo; -import org.gridkit.jvmtool.cli.CommandLauncher; + import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.ExecutionException; diff --git a/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java b/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java index e789057784..996de113b7 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java @@ -28,6 +28,7 @@ import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.io.util.File; import org.apache.cassandra.service.snapshot.SnapshotOptions; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/Status.java b/src/java/org/apache/cassandra/tools/nodetool/Status.java index 2f10b2ef0b..a0312aeed8 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Status.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Status.java @@ -42,6 +42,7 @@ import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; import org.apache.cassandra.utils.LocalizeString; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/StatusAutoCompaction.java b/src/java/org/apache/cassandra/tools/nodetool/StatusAutoCompaction.java index ab12d7ef9a..59874cf89a 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/StatusAutoCompaction.java +++ b/src/java/org/apache/cassandra/tools/nodetool/StatusAutoCompaction.java @@ -25,13 +25,14 @@ import java.util.Map; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; +import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalKeyspace; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalTables; -import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; @Command(name = "statusautocompaction", description = "status of autocompaction of the given keyspace and table") public class StatusAutoCompaction extends AbstractCommand diff --git a/src/java/org/apache/cassandra/tools/nodetool/StatusBackup.java b/src/java/org/apache/cassandra/tools/nodetool/StatusBackup.java index 675b11af79..68afa5002a 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/StatusBackup.java +++ b/src/java/org/apache/cassandra/tools/nodetool/StatusBackup.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "statusbackup", description = "Status of incremental backup") diff --git a/src/java/org/apache/cassandra/tools/nodetool/StatusBinary.java b/src/java/org/apache/cassandra/tools/nodetool/StatusBinary.java index f4c62dc331..d1610292de 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/StatusBinary.java +++ b/src/java/org/apache/cassandra/tools/nodetool/StatusBinary.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "statusbinary", description = "Status of native transport (binary protocol)") diff --git a/src/java/org/apache/cassandra/tools/nodetool/StatusGossip.java b/src/java/org/apache/cassandra/tools/nodetool/StatusGossip.java index a93160df01..2b3051588c 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/StatusGossip.java +++ b/src/java/org/apache/cassandra/tools/nodetool/StatusGossip.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "statusgossip", description = "Status of gossip") diff --git a/src/java/org/apache/cassandra/tools/nodetool/StatusHandoff.java b/src/java/org/apache/cassandra/tools/nodetool/StatusHandoff.java index 4bec42752f..8cf0d4c12f 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/StatusHandoff.java +++ b/src/java/org/apache/cassandra/tools/nodetool/StatusHandoff.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; @Command(name = "statushandoff", description = "Status of storing future hints on the current node") diff --git a/src/java/org/apache/cassandra/tools/nodetool/Stop.java b/src/java/org/apache/cassandra/tools/nodetool/Stop.java index daa07491db..a9215237a9 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Stop.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Stop.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.db.compaction.OperationType; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java b/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java index ac44a05ba2..f86b3f7505 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java +++ b/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java @@ -21,6 +21,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.utils.JVMStabilityInspector; + import picocli.CommandLine.Command; @Command(name = "stopdaemon", description = "Stop cassandra daemon") diff --git a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java index 6db88830c1..fa98d490a7 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java @@ -25,6 +25,7 @@ import java.util.Map; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; + import org.apache.commons.lang3.ArrayUtils; import org.apache.cassandra.db.ColumnFamilyStoreMBean; @@ -33,6 +34,7 @@ import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; import org.apache.cassandra.utils.EstimatedHistogram; import org.apache.cassandra.utils.Pair; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/TableStats.java b/src/java/org/apache/cassandra/tools/nodetool/TableStats.java index 918c818601..6ae240c54b 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/TableStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TableStats.java @@ -28,6 +28,7 @@ import org.apache.cassandra.tools.nodetool.stats.StatsPrinter; import org.apache.cassandra.tools.nodetool.stats.StatsTableComparator; import org.apache.cassandra.tools.nodetool.stats.TableStatsHolder; import org.apache.cassandra.tools.nodetool.stats.TableStatsPrinter; + import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/TpStats.java b/src/java/org/apache/cassandra/tools/nodetool/TpStats.java index 5f3b966d76..44430b292e 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/TpStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TpStats.java @@ -22,6 +22,7 @@ import org.apache.cassandra.tools.nodetool.stats.StatsHolder; import org.apache.cassandra.tools.nodetool.stats.StatsPrinter; import org.apache.cassandra.tools.nodetool.stats.TpStatsHolder; import org.apache.cassandra.tools.nodetool.stats.TpStatsPrinter; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/TruncateHints.java b/src/java/org/apache/cassandra/tools/nodetool/TruncateHints.java index ea42e45b57..1e99c822d5 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/TruncateHints.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TruncateHints.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/UpdateCIDRGroup.java b/src/java/org/apache/cassandra/tools/nodetool/UpdateCIDRGroup.java index 27bbb73111..1243f5fe9a 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/UpdateCIDRGroup.java +++ b/src/java/org/apache/cassandra/tools/nodetool/UpdateCIDRGroup.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.cassandra.auth.AuthKeyspace; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java b/src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java index 93638cd820..85f02428f9 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java +++ b/src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java @@ -26,13 +26,14 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.cassandra.db.compaction.CompactionInterruptedException; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; +import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalKeyspace; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalTables; -import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; @Command(name = "upgradesstables", description = "Rewrite sstables (for the requested tables) that are not on the current version (thus upgrading them to said current version)") public class UpgradeSSTable extends AbstractCommand diff --git a/src/java/org/apache/cassandra/tools/nodetool/Verify.java b/src/java/org/apache/cassandra/tools/nodetool/Verify.java index 5e20802d3f..ca4b9d2d88 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Verify.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Verify.java @@ -23,13 +23,14 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; +import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalKeyspace; import static org.apache.cassandra.tools.nodetool.CommandUtils.parseOptionalTables; -import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs; @Command(name = "verify", description = "Verify (check data checksum for) one or more tables") public class Verify extends AbstractCommand diff --git a/src/java/org/apache/cassandra/tools/nodetool/Version.java b/src/java/org/apache/cassandra/tools/nodetool/Version.java index c279c4f3cf..9b39e19b3a 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Version.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Version.java @@ -18,6 +18,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/java/org/apache/cassandra/tools/nodetool/ViewBuildStatus.java b/src/java/org/apache/cassandra/tools/nodetool/ViewBuildStatus.java index 560e13258b..fa8720b2d6 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ViewBuildStatus.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ViewBuildStatus.java @@ -26,6 +26,7 @@ import java.util.Map; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; import org.apache.cassandra.tools.nodetool.layout.CassandraUsage; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/src/java/org/apache/cassandra/tools/nodetool/formatter/TableBuilder.java b/src/java/org/apache/cassandra/tools/nodetool/formatter/TableBuilder.java index ab4ee03063..143a1a7097 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/formatter/TableBuilder.java +++ b/src/java/org/apache/cassandra/tools/nodetool/formatter/TableBuilder.java @@ -29,6 +29,7 @@ import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; + import javax.annotation.Nonnull; import com.google.common.collect.Iterables; diff --git a/src/java/org/apache/cassandra/tools/nodetool/layout/CassandraCliHelpLayout.java b/src/java/org/apache/cassandra/tools/nodetool/layout/CassandraCliHelpLayout.java index c12f615496..d99a7dd21b 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/layout/CassandraCliHelpLayout.java +++ b/src/java/org/apache/cassandra/tools/nodetool/layout/CassandraCliHelpLayout.java @@ -18,13 +18,6 @@ package org.apache.cassandra.tools.nodetool.layout; -import org.apache.cassandra.tools.nodetool.CommandUtils; -import org.apache.cassandra.tools.nodetool.JmxConnect; -import org.apache.cassandra.tools.nodetool.NodetoolCommand; -import org.apache.cassandra.utils.Pair; -import org.apache.commons.lang3.StringUtils; -import picocli.CommandLine; - import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; @@ -38,6 +31,15 @@ import java.util.TreeMap; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.commons.lang3.StringUtils; + +import org.apache.cassandra.tools.nodetool.CommandUtils; +import org.apache.cassandra.tools.nodetool.JmxConnect; +import org.apache.cassandra.tools.nodetool.NodetoolCommand; +import org.apache.cassandra.utils.Pair; + +import picocli.CommandLine; + import static org.apache.cassandra.tools.nodetool.CommandUtils.findCassandraBackwardCompatibleArgument; import static org.apache.cassandra.tools.nodetool.CommandUtils.sortShortestFirst; import static org.apache.commons.lang3.ArrayUtils.isEmpty; diff --git a/src/java/org/apache/cassandra/tools/nodetool/stats/CompactionHistoryHolder.java b/src/java/org/apache/cassandra/tools/nodetool/stats/CompactionHistoryHolder.java index 189500bc9e..707d615498 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/stats/CompactionHistoryHolder.java +++ b/src/java/org/apache/cassandra/tools/nodetool/stats/CompactionHistoryHolder.java @@ -22,11 +22,12 @@ import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.ArrayList; -import java.util.HashMap; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; + import javax.management.openmbean.TabularData; import org.apache.cassandra.io.util.FileUtils; diff --git a/src/java/org/apache/cassandra/tools/nodetool/stats/DataPathsHolder.java b/src/java/org/apache/cassandra/tools/nodetool/stats/DataPathsHolder.java index 9bf7bdb45f..601ca7bfd1 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/stats/DataPathsHolder.java +++ b/src/java/org/apache/cassandra/tools/nodetool/stats/DataPathsHolder.java @@ -22,11 +22,11 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import static com.google.common.base.Throwables.getStackTraceAsString; - import org.apache.cassandra.db.ColumnFamilyStoreMBean; import org.apache.cassandra.tools.NodeProbe; +import static com.google.common.base.Throwables.getStackTraceAsString; + public class DataPathsHolder implements StatsHolder { public final Map pathsHash = new HashMap<>(); diff --git a/src/java/org/apache/cassandra/tools/nodetool/stats/StatsPrinter.java b/src/java/org/apache/cassandra/tools/nodetool/stats/StatsPrinter.java index 690db258cc..2cfae67ecd 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/stats/StatsPrinter.java +++ b/src/java/org/apache/cassandra/tools/nodetool/stats/StatsPrinter.java @@ -21,10 +21,11 @@ package org.apache.cassandra.tools.nodetool.stats; import java.io.PrintStream; import java.util.Map; -import org.apache.cassandra.utils.JsonUtils; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; +import org.apache.cassandra.utils.JsonUtils; + /** * Interface for the Stats printer, that'd output statistics * given the {@code StatsHolder} diff --git a/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java b/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java index fe7750ce8e..6e05ac5e43 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java +++ b/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java @@ -20,21 +20,30 @@ package org.apache.cassandra.tools.nodetool.stats; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.*; - -import com.google.common.collect.ArrayListMultimap; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; import javax.management.InstanceNotFoundException; +import com.google.common.collect.ArrayListMultimap; + import org.apache.commons.lang3.time.DurationFormatUtils; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStoreMBean; import org.apache.cassandra.db.compaction.TimeWindowCompactionStrategy; import org.apache.cassandra.db.compaction.TimeWindowCompactionStrategyOptions; -import org.apache.cassandra.io.util.*; -import org.apache.cassandra.metrics.*; +import org.apache.cassandra.io.util.FileUtils; +import org.apache.cassandra.metrics.CassandraMetricsRegistry; import org.apache.cassandra.schema.SchemaConstants; -import org.apache.cassandra.tools.*; +import org.apache.cassandra.tools.NodeProbe; public class TableStatsHolder implements StatsHolder { diff --git a/src/java/org/apache/cassandra/tracing/TraceKeyspace.java b/src/java/org/apache/cassandra/tracing/TraceKeyspace.java index 12288e9e73..27985ed785 100644 --- a/src/java/org/apache/cassandra/tracing/TraceKeyspace.java +++ b/src/java/org/apache/cassandra/tracing/TraceKeyspace.java @@ -19,13 +19,15 @@ package org.apache.cassandra.tracing; import java.net.InetAddress; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Date; +import java.util.Map; +import java.util.Set; import com.google.common.collect.ImmutableSet; import org.apache.cassandra.config.CassandraRelevantProperties; -import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.db.rows.Row; diff --git a/src/java/org/apache/cassandra/tracing/TraceState.java b/src/java/org/apache/cassandra/tracing/TraceState.java index 17133698e8..2fdce0877f 100644 --- a/src/java/org/apache/cassandra/tracing/TraceState.java +++ b/src/java/org/apache/cassandra/tracing/TraceState.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.base.Stopwatch; + import org.slf4j.helpers.MessageFormatter; import org.apache.cassandra.locator.InetAddressAndPort; diff --git a/src/java/org/apache/cassandra/tracing/TraceStateImpl.java b/src/java/org/apache/cassandra/tracing/TraceStateImpl.java index 44fcf950bc..a1913bda7f 100644 --- a/src/java/org/apache/cassandra/tracing/TraceStateImpl.java +++ b/src/java/org/apache/cassandra/tracing/TraceStateImpl.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/transport/CBUtil.java b/src/java/org/apache/cassandra/transport/CBUtil.java index 3c6a3a9011..c66d5416ce 100644 --- a/src/java/org/apache/cassandra/transport/CBUtil.java +++ b/src/java/org/apache/cassandra/transport/CBUtil.java @@ -35,12 +35,6 @@ import java.util.UUID; import com.google.common.base.Preconditions; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufAllocator; -import io.netty.buffer.ByteBufUtil; -import io.netty.buffer.PooledByteBufAllocator; -import io.netty.buffer.UnpooledByteBufAllocator; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.utils.ByteArrayUtil; import org.apache.cassandra.utils.ByteBufferUtil; @@ -50,6 +44,13 @@ import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.UUIDGen; import org.apache.cassandra.utils.memory.MemoryUtil; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; +import io.netty.buffer.ByteBufUtil; +import io.netty.buffer.PooledByteBufAllocator; +import io.netty.buffer.UnpooledByteBufAllocator; +import io.netty.util.concurrent.FastThreadLocal; + import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_NETTY_USE_HEAP_ALLOCATOR; import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized; diff --git a/src/java/org/apache/cassandra/transport/CQLMessageHandler.java b/src/java/org/apache/cassandra/transport/CQLMessageHandler.java index 65e67925ad..2486497c2f 100644 --- a/src/java/org/apache/cassandra/transport/CQLMessageHandler.java +++ b/src/java/org/apache/cassandra/transport/CQLMessageHandler.java @@ -24,12 +24,10 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import com.google.common.primitives.Ints; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.Channel; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.OverloadedException; import org.apache.cassandra.exceptions.OversizedCQLMessageException; @@ -48,6 +46,10 @@ import org.apache.cassandra.transport.messages.ErrorMessage; import org.apache.cassandra.utils.NoSpamLogger; import org.apache.cassandra.utils.concurrent.NonBlockingRateLimiter; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.Channel; + import static org.apache.cassandra.utils.MonotonicClock.Global.approxTime; /** diff --git a/src/java/org/apache/cassandra/transport/Client.java b/src/java/org/apache/cassandra/transport/Client.java index 6c60f6508c..66eeaf6a5f 100644 --- a/src/java/org/apache/cassandra/transport/Client.java +++ b/src/java/org/apache/cassandra/transport/Client.java @@ -22,7 +22,12 @@ import java.io.IOException; import java.io.InputStreamReader; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import com.google.common.base.Splitter; @@ -33,7 +38,13 @@ import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.UTF8Type; -import org.apache.cassandra.transport.messages.*; +import org.apache.cassandra.transport.messages.AuthResponse; +import org.apache.cassandra.transport.messages.ExecuteMessage; +import org.apache.cassandra.transport.messages.OptionsMessage; +import org.apache.cassandra.transport.messages.PrepareMessage; +import org.apache.cassandra.transport.messages.QueryMessage; +import org.apache.cassandra.transport.messages.RegisterMessage; +import org.apache.cassandra.transport.messages.StartupMessage; import org.apache.cassandra.utils.Hex; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.MD5Digest; diff --git a/src/java/org/apache/cassandra/transport/ClientResourceLimits.java b/src/java/org/apache/cassandra/transport/ClientResourceLimits.java index a6191d189c..211915f16f 100644 --- a/src/java/org/apache/cassandra/transport/ClientResourceLimits.java +++ b/src/java/org/apache/cassandra/transport/ClientResourceLimits.java @@ -23,18 +23,18 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; +import com.codahale.metrics.Snapshot; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.metrics.CassandraReservoir; -import org.apache.cassandra.utils.concurrent.NonBlockingRateLimiter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Snapshot; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.metrics.CassandraReservoir; import org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoir; import org.apache.cassandra.net.AbstractMessageHandler; import org.apache.cassandra.net.ResourceLimits; +import org.apache.cassandra.utils.concurrent.NonBlockingRateLimiter; public class ClientResourceLimits { diff --git a/src/java/org/apache/cassandra/transport/Compressor.java b/src/java/org/apache/cassandra/transport/Compressor.java index ae28e7ac16..d5de951723 100644 --- a/src/java/org/apache/cassandra/transport/Compressor.java +++ b/src/java/org/apache/cassandra/transport/Compressor.java @@ -19,14 +19,15 @@ package org.apache.cassandra.transport; import java.io.IOException; -import io.netty.buffer.ByteBuf; +import net.jpountz.lz4.LZ4Factory; + import org.xerial.snappy.Snappy; import org.xerial.snappy.SnappyError; -import net.jpountz.lz4.LZ4Factory; - import org.apache.cassandra.utils.JVMStabilityInspector; +import io.netty.buffer.ByteBuf; + public interface Compressor { public Envelope compress(Envelope uncompressed) throws IOException; diff --git a/src/java/org/apache/cassandra/transport/ConnectedClient.java b/src/java/org/apache/cassandra/transport/ConnectedClient.java index b8624de983..efea171622 100644 --- a/src/java/org/apache/cassandra/transport/ConnectedClient.java +++ b/src/java/org/apache/cassandra/transport/ConnectedClient.java @@ -25,11 +25,12 @@ import java.util.Optional; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; -import io.netty.handler.ssl.SslHandler; import org.apache.cassandra.auth.AuthenticatedUser; import org.apache.cassandra.auth.IAuthenticator; import org.apache.cassandra.service.ClientState; +import io.netty.handler.ssl.SslHandler; + import static org.apache.cassandra.auth.IAuthenticator.AuthenticationMode.UNAUTHENTICATED; public final class ConnectedClient diff --git a/src/java/org/apache/cassandra/transport/ConnectionLimitHandler.java b/src/java/org/apache/cassandra/transport/ConnectionLimitHandler.java index 24cf68d5c4..f6a9bddbdb 100644 --- a/src/java/org/apache/cassandra/transport/ConnectionLimitHandler.java +++ b/src/java/org/apache/cassandra/transport/ConnectionLimitHandler.java @@ -18,18 +18,6 @@ package org.apache.cassandra.transport; -import io.netty.channel.Channel; -import io.netty.channel.ChannelHandler; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.util.Attribute; -import io.netty.util.AttributeKey; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.utils.NoSpamLogger; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -38,6 +26,19 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.utils.NoSpamLogger; + +import io.netty.channel.Channel; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.util.Attribute; +import io.netty.util.AttributeKey; + /** * {@link ChannelInboundHandlerAdapter} implementation which allows to limit the number of concurrent diff --git a/src/java/org/apache/cassandra/transport/DataType.java b/src/java/org/apache/cassandra/transport/DataType.java index 1d1a9130b6..7523752779 100644 --- a/src/java/org/apache/cassandra/transport/DataType.java +++ b/src/java/org/apache/cassandra/transport/DataType.java @@ -21,18 +21,46 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -import java.util.Map; import java.util.List; +import java.util.Map; import com.google.common.annotations.VisibleForTesting; -import io.netty.buffer.ByteBuf; - import org.apache.cassandra.cql3.FieldIdentifier; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.BooleanType; +import org.apache.cassandra.db.marshal.ByteType; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.CounterColumnType; +import org.apache.cassandra.db.marshal.DateType; +import org.apache.cassandra.db.marshal.DecimalType; +import org.apache.cassandra.db.marshal.DoubleType; +import org.apache.cassandra.db.marshal.DurationType; +import org.apache.cassandra.db.marshal.FloatType; +import org.apache.cassandra.db.marshal.InetAddressType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.ListType; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.MapType; +import org.apache.cassandra.db.marshal.ReversedType; +import org.apache.cassandra.db.marshal.SetType; +import org.apache.cassandra.db.marshal.ShortType; +import org.apache.cassandra.db.marshal.SimpleDateType; +import org.apache.cassandra.db.marshal.TimeType; +import org.apache.cassandra.db.marshal.TimeUUIDType; +import org.apache.cassandra.db.marshal.TimestampType; +import org.apache.cassandra.db.marshal.TupleType; +import org.apache.cassandra.db.marshal.TypeParser; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.marshal.UUIDType; +import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.utils.Pair; +import io.netty.buffer.ByteBuf; + public enum DataType { CUSTOM (0, null, ProtocolVersion.V1), diff --git a/src/java/org/apache/cassandra/transport/Dispatcher.java b/src/java/org/apache/cassandra/transport/Dispatcher.java index 6a38184829..ccec6817c3 100644 --- a/src/java/org/apache/cassandra/transport/Dispatcher.java +++ b/src/java/org/apache/cassandra/transport/Dispatcher.java @@ -26,12 +26,10 @@ import java.util.function.Consumer; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.Channel; -import io.netty.channel.EventLoop; -import io.netty.util.AttributeKey; import org.apache.cassandra.concurrent.DebuggableTask; import org.apache.cassandra.concurrent.LocalAwareExecutorPlus; import org.apache.cassandra.config.DatabaseDescriptor; @@ -49,6 +47,10 @@ import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.MonotonicClock; import org.apache.cassandra.utils.NoSpamLogger; +import io.netty.channel.Channel; +import io.netty.channel.EventLoop; +import io.netty.util.AttributeKey; + import static org.apache.cassandra.concurrent.SharedExecutorPool.SHARED; public class Dispatcher implements CQLMessageHandler.MessageConsumer diff --git a/src/java/org/apache/cassandra/transport/Envelope.java b/src/java/org/apache/cassandra/transport/Envelope.java index b425abc63e..e70b4fe551 100644 --- a/src/java/org/apache/cassandra/transport/Envelope.java +++ b/src/java/org/apache/cassandra/transport/Envelope.java @@ -25,18 +25,20 @@ import java.util.List; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.*; -import io.netty.handler.codec.ByteToMessageDecoder; -import io.netty.handler.codec.MessageToMessageDecoder; -import io.netty.handler.codec.MessageToMessageEncoder; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.metrics.ClientMessageSizeMetrics; import org.apache.cassandra.transport.messages.ErrorMessage; import org.apache.cassandra.utils.ByteBufferUtil; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.ByteToMessageDecoder; +import io.netty.handler.codec.MessageToMessageDecoder; +import io.netty.handler.codec.MessageToMessageEncoder; + public class Envelope { public static final byte PROTOCOL_VERSION_MASK = 0x7f; diff --git a/src/java/org/apache/cassandra/transport/Event.java b/src/java/org/apache/cassandra/transport/Event.java index 5e8e201d9a..a1209a13ea 100644 --- a/src/java/org/apache/cassandra/transport/Event.java +++ b/src/java/org/apache/cassandra/transport/Event.java @@ -23,11 +23,12 @@ import java.util.List; import com.google.common.base.Objects; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.cql3.functions.UDAggregate; import org.apache.cassandra.cql3.functions.UDFunction; import org.apache.cassandra.locator.InetAddressAndPort; +import io.netty.buffer.ByteBuf; + public abstract class Event { public enum Type diff --git a/src/java/org/apache/cassandra/transport/ExceptionHandlers.java b/src/java/org/apache/cassandra/transport/ExceptionHandlers.java index 1b60ba9020..12bfe4190d 100644 --- a/src/java/org/apache/cassandra/transport/ExceptionHandlers.java +++ b/src/java/org/apache/cassandra/transport/ExceptionHandlers.java @@ -32,13 +32,8 @@ import com.google.common.collect.ImmutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.Channel; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.channel.ChannelPromise; -import io.netty.channel.unix.Errors; -import org.apache.cassandra.exceptions.OverloadedException; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.exceptions.OverloadedException; import org.apache.cassandra.exceptions.OversizedCQLMessageException; import org.apache.cassandra.metrics.ClientMetrics; import org.apache.cassandra.net.FrameEncoder; @@ -47,6 +42,12 @@ import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.NoSpamLogger; import org.apache.cassandra.utils.Throwables; +import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.channel.ChannelPromise; +import io.netty.channel.unix.Errors; + public class ExceptionHandlers { private static final Logger logger = LoggerFactory.getLogger(ExceptionHandlers.class); diff --git a/src/java/org/apache/cassandra/transport/Flusher.java b/src/java/org/apache/cassandra/transport/Flusher.java index ebf708158a..d0b76e0a99 100644 --- a/src/java/org/apache/cassandra/transport/Flusher.java +++ b/src/java/org/apache/cassandra/transport/Flusher.java @@ -19,18 +19,20 @@ package org.apache.cassandra.transport; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ByteBuf; -import io.netty.channel.Channel; -import io.netty.channel.EventLoop; import org.apache.cassandra.net.FrameEncoder; import org.apache.cassandra.net.FrameEncoderCrc; import org.apache.cassandra.net.FrameEncoderLZ4; @@ -38,6 +40,10 @@ import org.apache.cassandra.transport.Message.Response; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.memory.BufferPool; +import io.netty.buffer.ByteBuf; +import io.netty.channel.Channel; +import io.netty.channel.EventLoop; + import static org.apache.cassandra.transport.CQLMessageHandler.envelopeSize; abstract class Flusher implements Runnable diff --git a/src/java/org/apache/cassandra/transport/InitialConnectionHandler.java b/src/java/org/apache/cassandra/transport/InitialConnectionHandler.java index 463d824c4c..556a560793 100644 --- a/src/java/org/apache/cassandra/transport/InitialConnectionHandler.java +++ b/src/java/org/apache/cassandra/transport/InitialConnectionHandler.java @@ -25,21 +25,22 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.cassandra.transport.ClientResourceLimits.Overload; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.cql3.QueryProcessor; +import org.apache.cassandra.net.AsyncChannelPromise; +import org.apache.cassandra.transport.ClientResourceLimits.Overload; +import org.apache.cassandra.transport.messages.ErrorMessage; +import org.apache.cassandra.transport.messages.StartupMessage; +import org.apache.cassandra.transport.messages.SupportedMessage; + import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; import io.netty.channel.VoidChannelPromise; import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.util.Attribute; -import org.apache.cassandra.cql3.QueryProcessor; -import org.apache.cassandra.net.AsyncChannelPromise; -import org.apache.cassandra.transport.messages.ErrorMessage; -import org.apache.cassandra.transport.messages.StartupMessage; -import org.apache.cassandra.transport.messages.SupportedMessage; /** * Added to the Netty pipeline whenever a new Channel is initialized. This handler only processes diff --git a/src/java/org/apache/cassandra/transport/Message.java b/src/java/org/apache/cassandra/transport/Message.java index 47d4289b07..d55e011b3a 100644 --- a/src/java/org/apache/cassandra/transport/Message.java +++ b/src/java/org/apache/cassandra/transport/Message.java @@ -25,21 +25,37 @@ import java.util.Map; import com.google.common.annotations.VisibleForTesting; -import io.netty.buffer.ByteBuf; -import io.netty.channel.*; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.service.QueryState; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tracing.Tracing; -import org.apache.cassandra.transport.messages.*; import org.apache.cassandra.transport.Envelope.Header.Flag; -import org.apache.cassandra.service.QueryState; +import org.apache.cassandra.transport.messages.AuthChallenge; +import org.apache.cassandra.transport.messages.AuthResponse; +import org.apache.cassandra.transport.messages.AuthSuccess; +import org.apache.cassandra.transport.messages.AuthenticateMessage; +import org.apache.cassandra.transport.messages.BatchMessage; +import org.apache.cassandra.transport.messages.ErrorMessage; +import org.apache.cassandra.transport.messages.EventMessage; +import org.apache.cassandra.transport.messages.ExecuteMessage; +import org.apache.cassandra.transport.messages.OptionsMessage; +import org.apache.cassandra.transport.messages.PrepareMessage; +import org.apache.cassandra.transport.messages.QueryMessage; +import org.apache.cassandra.transport.messages.ReadyMessage; +import org.apache.cassandra.transport.messages.RegisterMessage; +import org.apache.cassandra.transport.messages.ResultMessage; +import org.apache.cassandra.transport.messages.StartupMessage; +import org.apache.cassandra.transport.messages.SupportedMessage; +import org.apache.cassandra.transport.messages.UnsupportedMessageCodec; import org.apache.cassandra.utils.MonotonicClock; import org.apache.cassandra.utils.ReflectionUtils; import org.apache.cassandra.utils.TimeUUID; +import io.netty.buffer.ByteBuf; +import io.netty.channel.Channel; + import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; /** diff --git a/src/java/org/apache/cassandra/transport/PipelineConfigurator.java b/src/java/org/apache/cassandra/transport/PipelineConfigurator.java index dd92c1fe7a..3cb88bbb85 100644 --- a/src/java/org/apache/cassandra/transport/PipelineConfigurator.java +++ b/src/java/org/apache/cassandra/transport/PipelineConfigurator.java @@ -29,9 +29,32 @@ import com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.EncryptionOptions; +import org.apache.cassandra.net.AbstractMessageHandler; +import org.apache.cassandra.net.BufferPoolAllocator; +import org.apache.cassandra.net.FrameDecoder; +import org.apache.cassandra.net.FrameDecoderCrc; +import org.apache.cassandra.net.FrameDecoderLZ4; +import org.apache.cassandra.net.FrameEncoder; +import org.apache.cassandra.net.FrameEncoderCrc; +import org.apache.cassandra.net.FrameEncoderLZ4; +import org.apache.cassandra.net.GlobalBufferPoolAllocator; +import org.apache.cassandra.security.ISslContextFactory; +import org.apache.cassandra.security.SSLFactory; +import org.apache.cassandra.transport.messages.StartupMessage; + import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.ByteBuf; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; +import io.netty.channel.ChannelPipeline; +import io.netty.channel.EventLoopGroup; +import io.netty.channel.WriteBufferWaterMark; import io.netty.channel.epoll.EpollServerSocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.handler.codec.ByteToMessageDecoder; @@ -42,12 +65,6 @@ import io.netty.handler.ssl.SslHandler; import io.netty.handler.timeout.IdleStateEvent; import io.netty.handler.timeout.IdleStateHandler; import io.netty.util.Version; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.EncryptionOptions; -import org.apache.cassandra.net.*; -import org.apache.cassandra.security.ISslContextFactory; -import org.apache.cassandra.security.SSLFactory; -import org.apache.cassandra.transport.messages.StartupMessage; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_UNSAFE_VERBOSE_DEBUG_CLIENT_PROTOCOL; import static org.apache.cassandra.net.SocketFactory.newSslHandler; diff --git a/src/java/org/apache/cassandra/transport/PreV5Handlers.java b/src/java/org/apache/cassandra/transport/PreV5Handlers.java index 43cc3e2333..f5b9d82f02 100644 --- a/src/java/org/apache/cassandra/transport/PreV5Handlers.java +++ b/src/java/org/apache/cassandra/transport/PreV5Handlers.java @@ -21,23 +21,15 @@ package org.apache.cassandra.transport; import java.net.SocketAddress; import java.security.cert.CertificateException; import java.util.List; + import javax.net.ssl.SSLException; import com.google.common.base.Predicate; + import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.Channel; -import io.netty.channel.ChannelConfig; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelFutureListener; -import io.netty.channel.ChannelHandler; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.channel.SimpleChannelInboundHandler; -import io.netty.handler.codec.MessageToMessageDecoder; -import io.netty.handler.codec.MessageToMessageEncoder; import org.apache.cassandra.auth.AuthEvents; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.AuthenticationException; @@ -50,6 +42,17 @@ import org.apache.cassandra.transport.ClientResourceLimits.Overload; import org.apache.cassandra.transport.messages.ErrorMessage; import org.apache.cassandra.utils.JVMStabilityInspector; +import io.netty.channel.Channel; +import io.netty.channel.ChannelConfig; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.channel.SimpleChannelInboundHandler; +import io.netty.handler.codec.MessageToMessageDecoder; +import io.netty.handler.codec.MessageToMessageEncoder; + import static org.apache.cassandra.transport.CQLMessageHandler.RATE_LIMITER_DELAY_UNIT; import static org.apache.cassandra.transport.ClientResourceLimits.GLOBAL_REQUEST_LIMITER; diff --git a/src/java/org/apache/cassandra/transport/Server.java b/src/java/org/apache/cassandra/transport/Server.java index e657dd1257..d7af40eb96 100644 --- a/src/java/org/apache/cassandra/transport/Server.java +++ b/src/java/org/apache/cassandra/transport/Server.java @@ -20,7 +20,12 @@ package org.apache.cassandra.transport; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.UnknownHostException; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -31,17 +36,6 @@ import java.util.function.Predicate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.epoll.EpollEventLoopGroup; -import io.netty.channel.group.ChannelGroup; -import io.netty.channel.group.ChannelMatcher; -import io.netty.channel.group.DefaultChannelGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.util.concurrent.GlobalEventExecutor; -import io.netty.util.internal.logging.InternalLoggerFactory; -import io.netty.util.internal.logging.Slf4JLoggerFactory; import org.apache.cassandra.auth.AuthenticatedUser; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.EncryptionOptions; @@ -54,10 +48,25 @@ import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaChangeListener; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.service.*; +import org.apache.cassandra.service.CassandraDaemon; +import org.apache.cassandra.service.IEndpointLifecycleSubscriber; +import org.apache.cassandra.service.NativeTransportService; +import org.apache.cassandra.service.StorageService; import org.apache.cassandra.transport.messages.EventMessage; import org.apache.cassandra.utils.FBUtilities; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.channel.EventLoopGroup; +import io.netty.channel.epoll.EpollEventLoopGroup; +import io.netty.channel.group.ChannelGroup; +import io.netty.channel.group.ChannelMatcher; +import io.netty.channel.group.DefaultChannelGroup; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.util.concurrent.GlobalEventExecutor; +import io.netty.util.internal.logging.InternalLoggerFactory; +import io.netty.util.internal.logging.Slf4JLoggerFactory; + import static org.apache.cassandra.utils.Clock.Global.nanoTime; public class Server implements CassandraDaemon.Server diff --git a/src/java/org/apache/cassandra/transport/ServerConnection.java b/src/java/org/apache/cassandra/transport/ServerConnection.java index b47d0d9c66..50986d1b27 100644 --- a/src/java/org/apache/cassandra/transport/ServerConnection.java +++ b/src/java/org/apache/cassandra/transport/ServerConnection.java @@ -18,19 +18,22 @@ package org.apache.cassandra.transport; import java.security.cert.Certificate; + import javax.net.ssl.SSLPeerUnverifiedException; +import com.codahale.metrics.Counter; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.Channel; -import com.codahale.metrics.Counter; -import io.netty.handler.ssl.SslHandler; import org.apache.cassandra.auth.IAuthenticator; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; +import io.netty.channel.Channel; +import io.netty.handler.ssl.SslHandler; + public class ServerConnection extends Connection { private static final Logger logger = LoggerFactory.getLogger(ServerConnection.class); diff --git a/src/java/org/apache/cassandra/transport/SimpleClient.java b/src/java/org/apache/cassandra/transport/SimpleClient.java index dea3535757..5151a30a96 100644 --- a/src/java/org/apache/cassandra/transport/SimpleClient.java +++ b/src/java/org/apache/cassandra/transport/SimpleClient.java @@ -21,17 +21,63 @@ import java.io.Closeable; import java.io.IOException; import java.net.InetSocketAddress; import java.nio.ByteBuffer; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Queue; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.SynchronousQueue; // checkstyle: permit this import +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Ints; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.concurrent.NamedThreadFactory; +import org.apache.cassandra.config.EncryptionOptions; +import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.db.ConsistencyLevel; +import org.apache.cassandra.net.AbstractMessageHandler; +import org.apache.cassandra.net.AsyncChannelPromise; +import org.apache.cassandra.net.BufferPoolAllocator; +import org.apache.cassandra.net.FrameDecoder; +import org.apache.cassandra.net.FrameDecoderCrc; +import org.apache.cassandra.net.FrameDecoderLZ4; +import org.apache.cassandra.net.FrameEncoder; +import org.apache.cassandra.net.FrameEncoderCrc; +import org.apache.cassandra.net.FrameEncoderLZ4; +import org.apache.cassandra.net.GlobalBufferPoolAllocator; +import org.apache.cassandra.net.ResourceLimits; +import org.apache.cassandra.security.ISslContextFactory; +import org.apache.cassandra.security.SSLFactory; +import org.apache.cassandra.transport.ClientResourceLimits.Overload; +import org.apache.cassandra.transport.messages.ErrorMessage; +import org.apache.cassandra.transport.messages.EventMessage; +import org.apache.cassandra.transport.messages.ExecuteMessage; +import org.apache.cassandra.transport.messages.PrepareMessage; +import org.apache.cassandra.transport.messages.QueryMessage; +import org.apache.cassandra.transport.messages.ResultMessage; +import org.apache.cassandra.transport.messages.StartupMessage; +import org.apache.cassandra.utils.concurrent.NonBlockingRateLimiter; +import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; + import io.netty.bootstrap.Bootstrap; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; +import io.netty.channel.ChannelOutboundHandlerAdapter; +import io.netty.channel.ChannelPipeline; +import io.netty.channel.ChannelPromise; +import io.netty.channel.SimpleChannelInboundHandler; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.handler.codec.MessageToMessageDecoder; import io.netty.handler.codec.MessageToMessageEncoder; @@ -40,17 +86,6 @@ import io.netty.util.concurrent.Promise; // checkstyle: permit this import import io.netty.util.concurrent.PromiseCombiner; import io.netty.util.internal.logging.InternalLoggerFactory; import io.netty.util.internal.logging.Slf4JLoggerFactory; -import org.apache.cassandra.concurrent.NamedThreadFactory; -import org.apache.cassandra.config.EncryptionOptions; -import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.net.*; -import org.apache.cassandra.security.ISslContextFactory; -import org.apache.cassandra.security.SSLFactory; -import org.apache.cassandra.transport.ClientResourceLimits.Overload; -import org.apache.cassandra.transport.messages.*; -import org.apache.cassandra.utils.concurrent.NonBlockingRateLimiter; -import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; import static org.apache.cassandra.net.SocketFactory.newSslHandler; import static org.apache.cassandra.transport.CQLMessageHandler.envelopeSize; diff --git a/src/java/org/apache/cassandra/transport/messages/AuthChallenge.java b/src/java/org/apache/cassandra/transport/messages/AuthChallenge.java index fda83f9aa9..e8c68dc38e 100644 --- a/src/java/org/apache/cassandra/transport/messages/AuthChallenge.java +++ b/src/java/org/apache/cassandra/transport/messages/AuthChallenge.java @@ -17,12 +17,13 @@ */ package org.apache.cassandra.transport.messages; +import java.nio.ByteBuffer; + import org.apache.cassandra.transport.CBUtil; import org.apache.cassandra.transport.Message; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.transport.ProtocolVersion; -import java.nio.ByteBuffer; +import io.netty.buffer.ByteBuf; /** * SASL challenge sent from client to server diff --git a/src/java/org/apache/cassandra/transport/messages/AuthResponse.java b/src/java/org/apache/cassandra/transport/messages/AuthResponse.java index 19c92cac30..8be73bb6be 100644 --- a/src/java/org/apache/cassandra/transport/messages/AuthResponse.java +++ b/src/java/org/apache/cassandra/transport/messages/AuthResponse.java @@ -19,9 +19,14 @@ package org.apache.cassandra.transport.messages; import java.nio.ByteBuffer; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.service.QueryState; -import org.apache.cassandra.transport.*; +import org.apache.cassandra.transport.CBUtil; +import org.apache.cassandra.transport.Dispatcher; +import org.apache.cassandra.transport.Message; +import org.apache.cassandra.transport.ProtocolException; +import org.apache.cassandra.transport.ProtocolVersion; + +import io.netty.buffer.ByteBuf; /** * A SASL token message sent from client to server. Some SASL diff --git a/src/java/org/apache/cassandra/transport/messages/AuthSuccess.java b/src/java/org/apache/cassandra/transport/messages/AuthSuccess.java index b8ed7f0e55..507ef83d03 100644 --- a/src/java/org/apache/cassandra/transport/messages/AuthSuccess.java +++ b/src/java/org/apache/cassandra/transport/messages/AuthSuccess.java @@ -17,12 +17,13 @@ */ package org.apache.cassandra.transport.messages; +import java.nio.ByteBuffer; + import org.apache.cassandra.transport.CBUtil; import org.apache.cassandra.transport.Message; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.transport.ProtocolVersion; -import java.nio.ByteBuffer; +import io.netty.buffer.ByteBuf; /** * Indicates to the client that authentication has succeeded. diff --git a/src/java/org/apache/cassandra/transport/messages/AuthenticateMessage.java b/src/java/org/apache/cassandra/transport/messages/AuthenticateMessage.java index ee3f3faba0..5679d1919c 100644 --- a/src/java/org/apache/cassandra/transport/messages/AuthenticateMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/AuthenticateMessage.java @@ -17,12 +17,12 @@ */ package org.apache.cassandra.transport.messages; -import io.netty.buffer.ByteBuf; - import org.apache.cassandra.transport.CBUtil; import org.apache.cassandra.transport.Message; import org.apache.cassandra.transport.ProtocolVersion; +import io.netty.buffer.ByteBuf; + /** * Message to indicate that the server is ready to receive requests. */ diff --git a/src/java/org/apache/cassandra/transport/messages/BatchMessage.java b/src/java/org/apache/cassandra/transport/messages/BatchMessage.java index 5c0e09be42..d40b6d01cb 100644 --- a/src/java/org/apache/cassandra/transport/messages/BatchMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/BatchMessage.java @@ -22,7 +22,6 @@ import java.util.List; import com.google.common.collect.ImmutableMap; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.cql3.Attributes; import org.apache.cassandra.cql3.BatchQueryOptions; import org.apache.cassandra.cql3.CQLStatement; @@ -46,6 +45,8 @@ import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.MD5Digest; +import io.netty.buffer.ByteBuf; + import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; public class BatchMessage extends Message.Request diff --git a/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java b/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java index 5d29d3afd4..36b7f34eb3 100644 --- a/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java @@ -22,22 +22,51 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import io.netty.buffer.ByteBuf; -import io.netty.handler.codec.CodecException; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.cql3.functions.FunctionName; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.WriteType; -import org.apache.cassandra.exceptions.*; +import org.apache.cassandra.exceptions.AlreadyExistsException; +import org.apache.cassandra.exceptions.AuthenticationException; +import org.apache.cassandra.exceptions.CDCWriteException; +import org.apache.cassandra.exceptions.CasWriteTimeoutException; +import org.apache.cassandra.exceptions.CasWriteUnknownResultException; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.exceptions.ExceptionCode; +import org.apache.cassandra.exceptions.FunctionExecutionException; +import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.exceptions.IsBootstrappingException; +import org.apache.cassandra.exceptions.OverloadedException; +import org.apache.cassandra.exceptions.PreparedQueryNotFoundException; +import org.apache.cassandra.exceptions.ReadFailureException; +import org.apache.cassandra.exceptions.ReadTimeoutException; +import org.apache.cassandra.exceptions.RequestFailureException; +import org.apache.cassandra.exceptions.RequestFailureReason; +import org.apache.cassandra.exceptions.RequestTimeoutException; +import org.apache.cassandra.exceptions.SyntaxException; +import org.apache.cassandra.exceptions.TransportException; +import org.apache.cassandra.exceptions.TruncateException; +import org.apache.cassandra.exceptions.UnauthorizedException; +import org.apache.cassandra.exceptions.UnavailableException; +import org.apache.cassandra.exceptions.WriteFailureException; +import org.apache.cassandra.exceptions.WriteTimeoutException; import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.transport.*; +import org.apache.cassandra.transport.CBUtil; +import org.apache.cassandra.transport.Message; +import org.apache.cassandra.transport.ProtocolException; +import org.apache.cassandra.transport.ProtocolVersion; +import org.apache.cassandra.transport.ServerError; import org.apache.cassandra.utils.MD5Digest; +import io.netty.buffer.ByteBuf; +import io.netty.handler.codec.CodecException; + /** * Message to indicate an error to the client. */ diff --git a/src/java/org/apache/cassandra/transport/messages/EventMessage.java b/src/java/org/apache/cassandra/transport/messages/EventMessage.java index 0af9e14399..2a2df1dceb 100644 --- a/src/java/org/apache/cassandra/transport/messages/EventMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/EventMessage.java @@ -17,12 +17,12 @@ */ package org.apache.cassandra.transport.messages; -import io.netty.buffer.ByteBuf; - import org.apache.cassandra.transport.Event; import org.apache.cassandra.transport.Message; import org.apache.cassandra.transport.ProtocolVersion; +import io.netty.buffer.ByteBuf; + public class EventMessage extends Message.Response { public static final Message.Codec codec = new Message.Codec() diff --git a/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java b/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java index bf915a1c26..29cc9246b0 100644 --- a/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java @@ -23,7 +23,6 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.ImmutableMap; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.QueryEvents; @@ -44,6 +43,8 @@ import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.MD5Digest; import org.apache.cassandra.utils.NoSpamLogger; +import io.netty.buffer.ByteBuf; + import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; public class ExecuteMessage extends Message.Request diff --git a/src/java/org/apache/cassandra/transport/messages/OptionsMessage.java b/src/java/org/apache/cassandra/transport/messages/OptionsMessage.java index 1ed109db2e..77a76e3368 100644 --- a/src/java/org/apache/cassandra/transport/messages/OptionsMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/OptionsMessage.java @@ -22,8 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import io.netty.buffer.ByteBuf; - import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.Compressor; @@ -31,6 +29,8 @@ import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.transport.Message; import org.apache.cassandra.transport.ProtocolVersion; +import io.netty.buffer.ByteBuf; + /** * Message to indicate that the server is ready to receive requests. */ diff --git a/src/java/org/apache/cassandra/transport/messages/PrepareMessage.java b/src/java/org/apache/cassandra/transport/messages/PrepareMessage.java index bebea3cc5b..e92b69b16e 100644 --- a/src/java/org/apache/cassandra/transport/messages/PrepareMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/PrepareMessage.java @@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.cql3.QueryEvents; import org.apache.cassandra.cql3.QueryHandler; import org.apache.cassandra.service.ClientState; @@ -37,6 +36,8 @@ import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.NoSpamLogger; +import io.netty.buffer.ByteBuf; + import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; public class PrepareMessage extends Message.Request diff --git a/src/java/org/apache/cassandra/transport/messages/QueryMessage.java b/src/java/org/apache/cassandra/transport/messages/QueryMessage.java index 665d62a8cb..61f3a9cfbd 100644 --- a/src/java/org/apache/cassandra/transport/messages/QueryMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/QueryMessage.java @@ -19,7 +19,6 @@ package org.apache.cassandra.transport.messages; import com.google.common.collect.ImmutableMap; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QueryEvents; import org.apache.cassandra.cql3.QueryHandler; @@ -36,6 +35,8 @@ import org.apache.cassandra.transport.ProtocolException; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.JVMStabilityInspector; +import io.netty.buffer.ByteBuf; + import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; /** diff --git a/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java b/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java index 2ee888119d..3c42b42252 100644 --- a/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java @@ -17,11 +17,11 @@ */ package org.apache.cassandra.transport.messages; -import io.netty.buffer.ByteBuf; - import org.apache.cassandra.transport.Message; import org.apache.cassandra.transport.ProtocolVersion; +import io.netty.buffer.ByteBuf; + /** * Message to indicate that the server is ready to receive requests. */ diff --git a/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java b/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java index 83f9cac316..1944513788 100644 --- a/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java @@ -20,10 +20,18 @@ package org.apache.cassandra.transport.messages; import java.util.ArrayList; import java.util.List; -import io.netty.buffer.ByteBuf; - import org.apache.cassandra.service.QueryState; -import org.apache.cassandra.transport.*; +import org.apache.cassandra.transport.CBUtil; +import org.apache.cassandra.transport.Connection; +import org.apache.cassandra.transport.Dispatcher; +import org.apache.cassandra.transport.Event; +import org.apache.cassandra.transport.Message; +import org.apache.cassandra.transport.ProtocolException; +import org.apache.cassandra.transport.ProtocolVersion; +import org.apache.cassandra.transport.Server; +import org.apache.cassandra.transport.ServerConnection; + +import io.netty.buffer.ByteBuf; public class RegisterMessage extends Message.Request { diff --git a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java index a8d8daec28..a76cae5b65 100644 --- a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java @@ -20,12 +20,16 @@ package org.apache.cassandra.transport.messages; import com.google.common.annotations.VisibleForTesting; -import io.netty.buffer.ByteBuf; - import org.apache.cassandra.cql3.ResultSet; -import org.apache.cassandra.transport.*; +import org.apache.cassandra.transport.CBUtil; +import org.apache.cassandra.transport.Event; +import org.apache.cassandra.transport.Message; +import org.apache.cassandra.transport.ProtocolException; +import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.MD5Digest; +import io.netty.buffer.ByteBuf; + public abstract class ResultMessage extends Message.Response { public static final Message.Codec codec = new Message.Codec() diff --git a/src/java/org/apache/cassandra/transport/messages/StartupMessage.java b/src/java/org/apache/cassandra/transport/messages/StartupMessage.java index 570b0975d6..85c531c20a 100644 --- a/src/java/org/apache/cassandra/transport/messages/StartupMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/StartupMessage.java @@ -20,15 +20,21 @@ package org.apache.cassandra.transport.messages; import java.util.HashMap; import java.util.Map; -import io.netty.buffer.ByteBuf; - import org.apache.cassandra.auth.IAuthenticator; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; -import org.apache.cassandra.transport.*; +import org.apache.cassandra.transport.CBUtil; +import org.apache.cassandra.transport.Compressor; +import org.apache.cassandra.transport.Dispatcher; +import org.apache.cassandra.transport.Message; +import org.apache.cassandra.transport.ProtocolException; +import org.apache.cassandra.transport.ProtocolVersion; +import org.apache.cassandra.transport.ServerConnection; import org.apache.cassandra.utils.CassandraVersion; +import io.netty.buffer.ByteBuf; + import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized; diff --git a/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java b/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java index 0367b7884d..de2bb70cfc 100644 --- a/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java @@ -20,12 +20,12 @@ package org.apache.cassandra.transport.messages; import java.util.List; import java.util.Map; -import io.netty.buffer.ByteBuf; - import org.apache.cassandra.transport.CBUtil; import org.apache.cassandra.transport.Message; import org.apache.cassandra.transport.ProtocolVersion; +import io.netty.buffer.ByteBuf; + /** * Message to indicate that the server is ready to receive requests. */ diff --git a/src/java/org/apache/cassandra/transport/messages/UnsupportedMessageCodec.java b/src/java/org/apache/cassandra/transport/messages/UnsupportedMessageCodec.java index 563e5d63dd..2e4277b2e5 100644 --- a/src/java/org/apache/cassandra/transport/messages/UnsupportedMessageCodec.java +++ b/src/java/org/apache/cassandra/transport/messages/UnsupportedMessageCodec.java @@ -21,11 +21,12 @@ package org.apache.cassandra.transport.messages; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.transport.Message; import org.apache.cassandra.transport.ProtocolException; import org.apache.cassandra.transport.ProtocolVersion; +import io.netty.buffer.ByteBuf; + /** * Catch-all codec for any unsupported legacy messages. */ diff --git a/src/java/org/apache/cassandra/triggers/CustomClassLoader.java b/src/java/org/apache/cassandra/triggers/CustomClassLoader.java index 95be219fb9..cbc3754289 100644 --- a/src/java/org/apache/cassandra/triggers/CustomClassLoader.java +++ b/src/java/org/apache/cassandra/triggers/CustomClassLoader.java @@ -19,6 +19,7 @@ package org.apache.cassandra.triggers; * under the License. * */ + import java.io.IOException; import java.net.URL; import java.net.URLClassLoader; @@ -27,14 +28,14 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.BiPredicate; -import org.apache.cassandra.io.util.File; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.io.FSWriteError; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; -import static java.nio.file.Files.*; +import static java.nio.file.Files.copy; /** * Custom class loader will load the classes from the class path, CCL will load diff --git a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java index b3766b6a87..e3ded966ad 100644 --- a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java +++ b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java @@ -19,7 +19,11 @@ package org.apache.cassandra.triggers; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; import com.google.common.collect.ArrayListMultimap; diff --git a/src/java/org/apache/cassandra/utils/AbstractGuavaIterator.java b/src/java/org/apache/cassandra/utils/AbstractGuavaIterator.java index 00756df877..c6e272e957 100644 --- a/src/java/org/apache/cassandra/utils/AbstractGuavaIterator.java +++ b/src/java/org/apache/cassandra/utils/AbstractGuavaIterator.java @@ -22,10 +22,10 @@ package org.apache.cassandra.utils; import java.util.NoSuchElementException; -import com.google.common.collect.PeekingIterator; - import javax.annotation.concurrent.NotThreadSafe; +import com.google.common.collect.PeekingIterator; + import static com.google.common.base.Preconditions.checkState; /** diff --git a/src/java/org/apache/cassandra/utils/BloomFilter.java b/src/java/org/apache/cassandra/utils/BloomFilter.java index 2575b4b3ad..acd0e2eb20 100644 --- a/src/java/org/apache/cassandra/utils/BloomFilter.java +++ b/src/java/org/apache/cassandra/utils/BloomFilter.java @@ -21,13 +21,15 @@ import java.io.IOException; import com.google.common.annotations.VisibleForTesting; -import io.netty.util.concurrent.FastThreadLocal; import net.nicoulaj.compilecommand.annotations.Inline; + import org.apache.cassandra.io.util.DataOutputStreamPlus; import org.apache.cassandra.utils.concurrent.Ref; import org.apache.cassandra.utils.concurrent.WrappedSharedCloseable; import org.apache.cassandra.utils.obs.IBitSet; +import io.netty.util.concurrent.FastThreadLocal; + public class BloomFilter extends WrappedSharedCloseable implements IFilter { private final static FastThreadLocal reusableIndexes = new FastThreadLocal() diff --git a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java index 9e61fd2f26..5ba341f4d2 100644 --- a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java +++ b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java @@ -47,6 +47,7 @@ import java.util.stream.Collectors; import net.nicoulaj.compilecommand.annotations.DontInline; import net.nicoulaj.compilecommand.annotations.Inline; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.marshal.BooleanType; import org.apache.cassandra.db.marshal.BytesType; diff --git a/src/java/org/apache/cassandra/utils/ChecksumType.java b/src/java/org/apache/cassandra/utils/ChecksumType.java index fa920aaca8..b8817a6f3e 100644 --- a/src/java/org/apache/cassandra/utils/ChecksumType.java +++ b/src/java/org/apache/cassandra/utils/ChecksumType.java @@ -18,9 +18,9 @@ package org.apache.cassandra.utils; import java.nio.ByteBuffer; -import java.util.zip.Checksum; -import java.util.zip.CRC32; import java.util.zip.Adler32; +import java.util.zip.CRC32; +import java.util.zip.Checksum; import io.netty.util.concurrent.FastThreadLocal; diff --git a/src/java/org/apache/cassandra/utils/CollectionSerializers.java b/src/java/org/apache/cassandra/utils/CollectionSerializers.java index b2efd717ab..d354adb840 100644 --- a/src/java/org/apache/cassandra/utils/CollectionSerializers.java +++ b/src/java/org/apache/cassandra/utils/CollectionSerializers.java @@ -26,12 +26,14 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.IntFunction; + import javax.annotation.Nonnull; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.IPartitionerDependentSerializer; import org.apache.cassandra.io.AsymmetricParameterisedUnversionedSerializer; diff --git a/src/java/org/apache/cassandra/utils/DiagnosticSnapshotService.java b/src/java/org/apache/cassandra/utils/DiagnosticSnapshotService.java index caf2082bda..5cf37df085 100644 --- a/src/java/org/apache/cassandra/utils/DiagnosticSnapshotService.java +++ b/src/java/org/apache/cassandra/utils/DiagnosticSnapshotService.java @@ -31,6 +31,7 @@ import java.util.function.Predicate; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java index d366c855a7..c81f545a4d 100644 --- a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java +++ b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java @@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicLongArray; import java.util.function.DoubleToLongFunction; import com.google.common.base.Objects; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java index a4493f30a2..924dcd6118 100644 --- a/src/java/org/apache/cassandra/utils/FBUtilities.java +++ b/src/java/org/apache/cassandra/utils/FBUtilities.java @@ -57,6 +57,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.CRC32; import java.util.zip.Checksum; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -65,13 +66,16 @@ import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; +import com.vdurmont.semver4j.Semver; + import org.apache.commons.lang3.StringUtils; +import org.objectweb.asm.Opcodes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.async.AsyncResult; import accord.utils.async.AsyncResults; -import com.vdurmont.semver4j.Semver; + import org.apache.cassandra.audit.IAuditLogger; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.DecoratedKey; @@ -94,7 +98,6 @@ import org.apache.cassandra.security.AbstractCryptoProvider; import org.apache.cassandra.security.ISslContextFactory; import org.apache.cassandra.utils.concurrent.FutureCombiner; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; -import org.objectweb.asm.Opcodes; import static org.apache.cassandra.config.CassandraRelevantProperties.BUILD_DATE; import static org.apache.cassandra.config.CassandraRelevantProperties.GIT_SHA; diff --git a/src/java/org/apache/cassandra/utils/FastByteOperations.java b/src/java/org/apache/cassandra/utils/FastByteOperations.java index c37ee21a6e..5efba76456 100644 --- a/src/java/org/apache/cassandra/utils/FastByteOperations.java +++ b/src/java/org/apache/cassandra/utils/FastByteOperations.java @@ -24,9 +24,11 @@ import java.nio.ByteOrder; import java.security.AccessController; import java.security.PrivilegedAction; -import com.google.common.primitives.*; +import com.google.common.primitives.Longs; +import com.google.common.primitives.UnsignedBytes; import net.nicoulaj.compilecommand.annotations.Inline; + import sun.misc.Unsafe; /** diff --git a/src/java/org/apache/cassandra/utils/HeapUtils.java b/src/java/org/apache/cassandra/utils/HeapUtils.java index 6171866b40..89756cd852 100644 --- a/src/java/org/apache/cassandra/utils/HeapUtils.java +++ b/src/java/org/apache/cassandra/utils/HeapUtils.java @@ -26,14 +26,16 @@ import java.nio.file.FileStore; import java.nio.file.Path; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; + import javax.management.MBeanServer; +import com.sun.management.HotSpotDiagnosticMXBean; + import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.text.StrBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.management.HotSpotDiagnosticMXBean; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.PathUtils; diff --git a/src/java/org/apache/cassandra/utils/IntegerInterval.java b/src/java/org/apache/cassandra/utils/IntegerInterval.java index b26ac45f06..e214b1cfdb 100644 --- a/src/java/org/apache/cassandra/utils/IntegerInterval.java +++ b/src/java/org/apache/cassandra/utils/IntegerInterval.java @@ -18,7 +18,8 @@ package org.apache.cassandra.utils; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; import java.util.concurrent.atomic.AtomicLongFieldUpdater; import java.util.stream.Collectors; diff --git a/src/java/org/apache/cassandra/utils/IntervalTree.java b/src/java/org/apache/cassandra/utils/IntervalTree.java index e1527bf377..d519733b47 100644 --- a/src/java/org/apache/cassandra/utils/IntervalTree.java +++ b/src/java/org/apache/cassandra/utils/IntervalTree.java @@ -29,11 +29,13 @@ import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Stream; import java.util.stream.StreamSupport; + import javax.annotation.Nullable; import com.google.common.base.Joiner; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/utils/JMXServerUtils.java b/src/java/org/apache/cassandra/utils/JMXServerUtils.java index 0d61f2877d..72851d74ad 100644 --- a/src/java/org/apache/cassandra/utils/JMXServerUtils.java +++ b/src/java/org/apache/cassandra/utils/JMXServerUtils.java @@ -38,6 +38,7 @@ import java.rmi.server.RMIServerSocketFactory; import java.rmi.server.UnicastRemoteObject; import java.util.HashMap; import java.util.Map; + import javax.management.remote.JMXAuthenticator; import javax.management.remote.JMXConnectorServer; import javax.management.remote.JMXServiceURL; @@ -50,6 +51,7 @@ import javax.security.auth.Subject; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java b/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java index f445bf9e3e..738b4853ac 100644 --- a/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java +++ b/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java @@ -30,10 +30,11 @@ import java.util.function.Consumer; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; +import net.nicoulaj.compilecommand.annotations.Exclude; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.nicoulaj.compilecommand.annotations.Exclude; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; @@ -42,8 +43,8 @@ import org.apache.cassandra.exceptions.UnrecoverableIllegalStateException; import org.apache.cassandra.io.FSError; import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.journal.Params.FailurePolicy; -import org.apache.cassandra.service.DiskErrorsHandlerService; import org.apache.cassandra.metrics.StorageMetrics; +import org.apache.cassandra.service.DiskErrorsHandlerService; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; diff --git a/src/java/org/apache/cassandra/utils/JavaDriverUtils.java b/src/java/org/apache/cassandra/utils/JavaDriverUtils.java index 6c0567d03f..92290c4406 100644 --- a/src/java/org/apache/cassandra/utils/JavaDriverUtils.java +++ b/src/java/org/apache/cassandra/utils/JavaDriverUtils.java @@ -25,7 +25,6 @@ import java.lang.reflect.Method; import org.apache.cassandra.cql3.functions.types.CodecRegistry; import org.apache.cassandra.cql3.functions.types.DataType; import org.apache.cassandra.cql3.functions.types.TypeCodec; - import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.transport.ProtocolVersion; diff --git a/src/java/org/apache/cassandra/utils/JmxInvocationListener.java b/src/java/org/apache/cassandra/utils/JmxInvocationListener.java index cee473cc5f..c7875903d8 100644 --- a/src/java/org/apache/cassandra/utils/JmxInvocationListener.java +++ b/src/java/org/apache/cassandra/utils/JmxInvocationListener.java @@ -19,6 +19,7 @@ package org.apache.cassandra.utils; import java.lang.reflect.Method; + import javax.security.auth.Subject; /** diff --git a/src/java/org/apache/cassandra/utils/JsonUtils.java b/src/java/org/apache/cassandra/utils/JsonUtils.java index 4868fedd45..3c589c2c5b 100644 --- a/src/java/org/apache/cassandra/utils/JsonUtils.java +++ b/src/java/org/apache/cassandra/utils/JsonUtils.java @@ -34,6 +34,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.ser.InstantSerializer; + import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileInputStreamPlus; import org.apache.cassandra.io.util.FileOutputStreamPlus; diff --git a/src/java/org/apache/cassandra/utils/MBeanWrapper.java b/src/java/org/apache/cassandra/utils/MBeanWrapper.java index 0ef342da30..d1d82ca1f6 100644 --- a/src/java/org/apache/cassandra/utils/MBeanWrapper.java +++ b/src/java/org/apache/cassandra/utils/MBeanWrapper.java @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.Set; import java.util.UUID; import java.util.function.Consumer; + import javax.management.MBeanServer; import javax.management.MBeanServerFactory; import javax.management.MalformedObjectNameException; @@ -32,9 +33,9 @@ import javax.management.QueryExp; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.cassandra.config.CassandraRelevantProperties.ORG_APACHE_CASSANDRA_DISABLE_MBEAN_REGISTRATION; import static org.apache.cassandra.config.CassandraRelevantProperties.DTEST_IS_IN_JVM_DTEST; import static org.apache.cassandra.config.CassandraRelevantProperties.MBEAN_REGISTRATION_CLASS; +import static org.apache.cassandra.config.CassandraRelevantProperties.ORG_APACHE_CASSANDRA_DISABLE_MBEAN_REGISTRATION; /** * Helper class to avoid catching and rethrowing checked exceptions on MBean and diff --git a/src/java/org/apache/cassandra/utils/MergeIterator.java b/src/java/org/apache/cassandra/utils/MergeIterator.java index fdbae53d7f..1e441a2c18 100644 --- a/src/java/org/apache/cassandra/utils/MergeIterator.java +++ b/src/java/org/apache/cassandra/utils/MergeIterator.java @@ -17,7 +17,9 @@ */ package org.apache.cassandra.utils; -import java.util.*; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; import accord.utils.Invariants; diff --git a/src/java/org/apache/cassandra/utils/MerkleTree.java b/src/java/org/apache/cassandra/utils/MerkleTree.java index 9dcdc55901..a8197b426d 100644 --- a/src/java/org/apache/cassandra/utils/MerkleTree.java +++ b/src/java/org/apache/cassandra/utils/MerkleTree.java @@ -20,7 +20,11 @@ package org.apache.cassandra.utils; import java.io.DataInput; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; @@ -46,7 +50,9 @@ import org.apache.cassandra.utils.memory.MemoryUtil; import static java.lang.String.format; import static org.apache.cassandra.db.TypeSizes.sizeof; import static org.apache.cassandra.utils.ByteBufferUtil.compare; -import static org.apache.cassandra.utils.MerkleTree.Difference.*; +import static org.apache.cassandra.utils.MerkleTree.Difference.CONSISTENT; +import static org.apache.cassandra.utils.MerkleTree.Difference.FULLY_INCONSISTENT; +import static org.apache.cassandra.utils.MerkleTree.Difference.PARTIALLY_INCONSISTENT; /** * A MerkleTree implemented as a binary tree. diff --git a/src/java/org/apache/cassandra/utils/MerkleTrees.java b/src/java/org/apache/cassandra/utils/MerkleTrees.java index 15469d3f35..310c37fe66 100644 --- a/src/java/org/apache/cassandra/utils/MerkleTrees.java +++ b/src/java/org/apache/cassandra/utils/MerkleTrees.java @@ -19,11 +19,18 @@ package org.apache.cassandra.utils; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.AbstractIterator; import com.google.common.collect.PeekingIterator; + import org.slf4j.Logger; import org.apache.cassandra.db.TypeSizes; diff --git a/src/java/org/apache/cassandra/utils/MonotonicClock.java b/src/java/org/apache/cassandra/utils/MonotonicClock.java index c68ed5d9ef..f32d950478 100644 --- a/src/java/org/apache/cassandra/utils/MonotonicClock.java +++ b/src/java/org/apache/cassandra/utils/MonotonicClock.java @@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.LongSupplier; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/utils/NativeLibrary.java b/src/java/org/apache/cassandra/utils/NativeLibrary.java index 84232dfabf..ec00162e19 100644 --- a/src/java/org/apache/cassandra/utils/NativeLibrary.java +++ b/src/java/org/apache/cassandra/utils/NativeLibrary.java @@ -23,22 +23,22 @@ import java.lang.reflect.Field; import java.nio.channels.FileChannel; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.io.util.File; -import org.apache.cassandra.io.util.FileInputStreamPlus; +import com.sun.jna.LastErrorException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.jna.LastErrorException; - import org.apache.cassandra.io.FSWriteError; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileInputStreamPlus; import static org.apache.cassandra.config.CassandraRelevantProperties.IGNORE_MISSING_NATIVE_FILE_HINTS; import static org.apache.cassandra.config.CassandraRelevantProperties.OS_ARCH; import static org.apache.cassandra.config.CassandraRelevantProperties.OS_NAME; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; +import static org.apache.cassandra.utils.NativeLibrary.OSType.AIX; import static org.apache.cassandra.utils.NativeLibrary.OSType.LINUX; import static org.apache.cassandra.utils.NativeLibrary.OSType.MAC; -import static org.apache.cassandra.utils.NativeLibrary.OSType.AIX; public final class NativeLibrary { diff --git a/src/java/org/apache/cassandra/utils/NativeLibraryDarwin.java b/src/java/org/apache/cassandra/utils/NativeLibraryDarwin.java index c119311370..cc0ee05821 100644 --- a/src/java/org/apache/cassandra/utils/NativeLibraryDarwin.java +++ b/src/java/org/apache/cassandra/utils/NativeLibraryDarwin.java @@ -20,13 +20,13 @@ package org.apache.cassandra.utils; import java.util.Collections; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.sun.jna.LastErrorException; import com.sun.jna.Native; import com.sun.jna.Pointer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * A {@code NativeLibraryWrapper} implementation for Darwin/Mac. *

diff --git a/src/java/org/apache/cassandra/utils/NativeLibraryLinux.java b/src/java/org/apache/cassandra/utils/NativeLibraryLinux.java index 9c7bb3b73b..ab0ec78ed4 100644 --- a/src/java/org/apache/cassandra/utils/NativeLibraryLinux.java +++ b/src/java/org/apache/cassandra/utils/NativeLibraryLinux.java @@ -20,13 +20,13 @@ package org.apache.cassandra.utils; import java.util.Collections; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.sun.jna.LastErrorException; import com.sun.jna.Native; import com.sun.jna.Pointer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * A {@code NativeLibraryWrapper} implementation for Linux. *

diff --git a/src/java/org/apache/cassandra/utils/NoSpamLogger.java b/src/java/org/apache/cassandra/utils/NoSpamLogger.java index 94c5e7d103..41ffeec50d 100644 --- a/src/java/org/apache/cassandra/utils/NoSpamLogger.java +++ b/src/java/org/apache/cassandra/utils/NoSpamLogger.java @@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; + import org.cliffc.high_scale_lib.NonBlockingHashMap; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/utils/OverlapIterator.java b/src/java/org/apache/cassandra/utils/OverlapIterator.java index 7c1544af7e..9c74325ee8 100644 --- a/src/java/org/apache/cassandra/utils/OverlapIterator.java +++ b/src/java/org/apache/cassandra/utils/OverlapIterator.java @@ -20,7 +20,12 @@ */ package org.apache.cassandra.utils; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * A class for iterating sequentially through an ordered collection and efficiently diff --git a/src/java/org/apache/cassandra/utils/PojoToString.java b/src/java/org/apache/cassandra/utils/PojoToString.java index 369a386cdc..9c85de594e 100644 --- a/src/java/org/apache/cassandra/utils/PojoToString.java +++ b/src/java/org/apache/cassandra/utils/PojoToString.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.fasterxml.jackson.core.JsonProcessingException; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.DumperOptions.FlowStyle; import org.yaml.snakeyaml.Yaml; diff --git a/src/java/org/apache/cassandra/utils/RMIServerSocketFactoryImpl.java b/src/java/org/apache/cassandra/utils/RMIServerSocketFactoryImpl.java index 9baf0c749d..80420bcc66 100644 --- a/src/java/org/apache/cassandra/utils/RMIServerSocketFactoryImpl.java +++ b/src/java/org/apache/cassandra/utils/RMIServerSocketFactoryImpl.java @@ -25,6 +25,7 @@ import java.net.InetAddress; import java.net.ServerSocket; import java.net.SocketException; import java.rmi.server.RMIServerSocketFactory; + import javax.net.ServerSocketFactory; public class RMIServerSocketFactoryImpl implements RMIServerSocketFactory diff --git a/src/java/org/apache/cassandra/utils/RTree.java b/src/java/org/apache/cassandra/utils/RTree.java index 5b7affe373..0d2cb6f0d7 100644 --- a/src/java/org/apache/cassandra/utils/RTree.java +++ b/src/java/org/apache/cassandra/utils/RTree.java @@ -28,6 +28,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Stream; import java.util.stream.StreamSupport; + import javax.annotation.CheckForNull; import com.google.common.collect.AbstractIterator; diff --git a/src/java/org/apache/cassandra/utils/ResourceWatcher.java b/src/java/org/apache/cassandra/utils/ResourceWatcher.java index e8dcb85743..2ac3d13ecd 100644 --- a/src/java/org/apache/cassandra/utils/ResourceWatcher.java +++ b/src/java/org/apache/cassandra/utils/ResourceWatcher.java @@ -19,11 +19,11 @@ package org.apache.cassandra.utils; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.io.util.File; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.concurrent.ScheduledExecutors; +import org.apache.cassandra.io.util.File; public class ResourceWatcher { diff --git a/src/java/org/apache/cassandra/utils/SimpleBitSetSerializers.java b/src/java/org/apache/cassandra/utils/SimpleBitSetSerializers.java index 10191b8513..3430429282 100644 --- a/src/java/org/apache/cassandra/utils/SimpleBitSetSerializers.java +++ b/src/java/org/apache/cassandra/utils/SimpleBitSetSerializers.java @@ -24,6 +24,7 @@ import accord.utils.Invariants; import accord.utils.LargeBitSet; import accord.utils.SimpleBitSet; import accord.utils.SmallBitSet; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/utils/SyncUtil.java b/src/java/org/apache/cassandra/utils/SyncUtil.java index 96985cef63..121275d579 100644 --- a/src/java/org/apache/cassandra/utils/SyncUtil.java +++ b/src/java/org/apache/cassandra/utils/SyncUtil.java @@ -20,21 +20,24 @@ */ package org.apache.cassandra.utils; -import java.io.*; +import java.io.FileDescriptor; +import java.io.FileOutputStream; // checkstyle: permit this import +import java.io.IOException; +import java.io.SyncFailedException; import java.nio.MappedByteBuffer; import java.nio.channels.ClosedChannelException; import java.nio.channels.FileChannel; import com.google.common.base.Preconditions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.config.CassandraRelevantEnv; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.io.util.File; import org.apache.cassandra.utils.memory.MemoryUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /* * A wrapper around various mechanisms for syncing files that makes it possible to intercept * and skip syncing. Useful for unit tests in certain environments where syncs can have outliers diff --git a/src/java/org/apache/cassandra/utils/SystemInfo.java b/src/java/org/apache/cassandra/utils/SystemInfo.java index 7d8b974833..09a80e0162 100644 --- a/src/java/org/apache/cassandra/utils/SystemInfo.java +++ b/src/java/org/apache/cassandra/utils/SystemInfo.java @@ -24,14 +24,16 @@ import java.util.function.Supplier; import java.util.regex.Pattern; import com.vdurmont.semver4j.Semver; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import oshi.PlatformEnum; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; +import oshi.PlatformEnum; + import static java.lang.String.format; import static java.util.Optional.empty; import static java.util.Optional.of; diff --git a/src/java/org/apache/cassandra/utils/Throwables.java b/src/java/org/apache/cassandra/utils/Throwables.java index df9ad11138..d7b5380561 100644 --- a/src/java/org/apache/cassandra/utils/Throwables.java +++ b/src/java/org/apache/cassandra/utils/Throwables.java @@ -28,6 +28,7 @@ import java.util.concurrent.CompletionException; import java.util.concurrent.ExecutionException; import java.util.function.Predicate; import java.util.stream.Stream; + import javax.annotation.Nonnull; import com.google.common.annotations.VisibleForTesting; diff --git a/src/java/org/apache/cassandra/utils/binlog/BinLog.java b/src/java/org/apache/cassandra/utils/binlog/BinLog.java index 313d6b4549..195c358f24 100644 --- a/src/java/org/apache/cassandra/utils/binlog/BinLog.java +++ b/src/java/org/apache/cassandra/utils/binlog/BinLog.java @@ -31,21 +31,23 @@ import java.util.function.Function; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import org.apache.cassandra.io.util.File; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.openhft.chronicle.core.io.BackgroundResourceReleaser; import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.impl.single.SingleChronicleQueue; -import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.queue.ExcerptAppender; import net.openhft.chronicle.queue.RollCycles; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueue; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.wire.WireOut; import net.openhft.chronicle.wire.WriteMarshallable; import net.openhft.posix.PosixAPI; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.io.FSError; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.NoSpamLogger; import org.apache.cassandra.utils.Throwables; diff --git a/src/java/org/apache/cassandra/utils/binlog/DeletingArchiver.java b/src/java/org/apache/cassandra/utils/binlog/DeletingArchiver.java index 44bdc8e1df..d715db56d7 100644 --- a/src/java/org/apache/cassandra/utils/binlog/DeletingArchiver.java +++ b/src/java/org/apache/cassandra/utils/binlog/DeletingArchiver.java @@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/utils/binlog/ExternalArchiver.java b/src/java/org/apache/cassandra/utils/binlog/ExternalArchiver.java index a6b233502e..b1e39b60e4 100644 --- a/src/java/org/apache/cassandra/utils/binlog/ExternalArchiver.java +++ b/src/java/org/apache/cassandra/utils/binlog/ExternalArchiver.java @@ -32,10 +32,11 @@ import java.util.regex.Pattern; import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Longs; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueue; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.openhft.chronicle.queue.impl.single.SingleChronicleQueue; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; diff --git a/src/java/org/apache/cassandra/utils/btree/BTree.java b/src/java/org/apache/cassandra/utils/btree/BTree.java index 0f84b6a5a9..d7501137b2 100644 --- a/src/java/org/apache/cassandra/utils/btree/BTree.java +++ b/src/java/org/apache/cassandra/utils/btree/BTree.java @@ -18,7 +18,13 @@ */ package org.apache.cassandra.utils.btree; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; +import java.util.NoSuchElementException; +import java.util.Objects; +import java.util.SortedSet; import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Consumer; @@ -32,6 +38,7 @@ import com.google.common.collect.Iterators; import com.google.common.collect.Ordering; import accord.utils.Invariants; + import org.apache.cassandra.utils.BiLongAccumulator; import org.apache.cassandra.utils.BulkIterator; import org.apache.cassandra.utils.LongAccumulator; diff --git a/src/java/org/apache/cassandra/utils/btree/FullBTreeSearchIterator.java b/src/java/org/apache/cassandra/utils/btree/FullBTreeSearchIterator.java index a4cafde0ee..2f420c5eb3 100644 --- a/src/java/org/apache/cassandra/utils/btree/FullBTreeSearchIterator.java +++ b/src/java/org/apache/cassandra/utils/btree/FullBTreeSearchIterator.java @@ -17,11 +17,11 @@ */ package org.apache.cassandra.utils.btree; -import static org.apache.cassandra.utils.btree.BTree.size; - import java.util.Comparator; import java.util.NoSuchElementException; +import static org.apache.cassandra.utils.btree.BTree.size; + public class FullBTreeSearchIterator extends TreeCursor implements BTreeSearchIterator { private final boolean forwards; diff --git a/src/java/org/apache/cassandra/utils/btree/IntervalBTree.java b/src/java/org/apache/cassandra/utils/btree/IntervalBTree.java index a8e5e3dcd6..e5afce71e6 100644 --- a/src/java/org/apache/cassandra/utils/btree/IntervalBTree.java +++ b/src/java/org/apache/cassandra/utils/btree/IntervalBTree.java @@ -30,9 +30,11 @@ import accord.utils.AsymmetricComparator; import accord.utils.Invariants; import accord.utils.QuadFunction; import accord.utils.SortedArrays; -import io.netty.util.concurrent.FastThreadLocal; + import org.apache.cassandra.utils.caching.TinyThreadLocalPool; +import io.netty.util.concurrent.FastThreadLocal; + import static accord.utils.SortedArrays.Search.CEIL; import static accord.utils.SortedArrays.Search.FLOOR; import static org.apache.cassandra.utils.btree.BTree.BRANCH_FACTOR; diff --git a/src/java/org/apache/cassandra/utils/btree/NodeCursor.java b/src/java/org/apache/cassandra/utils/btree/NodeCursor.java index 4c7e993518..e4124765f6 100644 --- a/src/java/org/apache/cassandra/utils/btree/NodeCursor.java +++ b/src/java/org/apache/cassandra/utils/btree/NodeCursor.java @@ -21,7 +21,15 @@ package org.apache.cassandra.utils.btree; import java.util.Arrays; import java.util.Comparator; -import static org.apache.cassandra.utils.btree.BTree.*; +import static org.apache.cassandra.utils.btree.BTree.getBranchKeyEnd; +import static org.apache.cassandra.utils.btree.BTree.getChildCount; +import static org.apache.cassandra.utils.btree.BTree.getChildStart; +import static org.apache.cassandra.utils.btree.BTree.getKeyEnd; +import static org.apache.cassandra.utils.btree.BTree.getLeafKeyEnd; +import static org.apache.cassandra.utils.btree.BTree.treeIndexOfBranchKey; +import static org.apache.cassandra.utils.btree.BTree.treeIndexOfKey; +import static org.apache.cassandra.utils.btree.BTree.treeIndexOfLeafKey; +import static org.apache.cassandra.utils.btree.BTree.treeIndexOffsetOfChild; /** * A class for searching within one node of a btree: a linear chain (stack) of these is built of tree height diff --git a/src/java/org/apache/cassandra/utils/btree/TreeCursor.java b/src/java/org/apache/cassandra/utils/btree/TreeCursor.java index e99663dcc4..0405dcf398 100644 --- a/src/java/org/apache/cassandra/utils/btree/TreeCursor.java +++ b/src/java/org/apache/cassandra/utils/btree/TreeCursor.java @@ -21,7 +21,9 @@ package org.apache.cassandra.utils.btree; import java.util.Arrays; import java.util.Comparator; -import static org.apache.cassandra.utils.btree.BTree.*; +import static org.apache.cassandra.utils.btree.BTree.getKeyEnd; +import static org.apache.cassandra.utils.btree.BTree.getLeafKeyEnd; +import static org.apache.cassandra.utils.btree.BTree.sizeMap; /** * Supports two basic operations for moving around a BTree, either forwards or backwards: diff --git a/src/java/org/apache/cassandra/utils/caching/TinyThreadLocalPool.java b/src/java/org/apache/cassandra/utils/caching/TinyThreadLocalPool.java index 78ce8d0f26..5dcddaf1f1 100644 --- a/src/java/org/apache/cassandra/utils/caching/TinyThreadLocalPool.java +++ b/src/java/org/apache/cassandra/utils/caching/TinyThreadLocalPool.java @@ -19,6 +19,7 @@ package org.apache.cassandra.utils.caching; import accord.utils.Invariants; + import io.netty.util.concurrent.FastThreadLocal; public class TinyThreadLocalPool extends FastThreadLocal> diff --git a/src/java/org/apache/cassandra/utils/concurrent/AbstractFuture.java b/src/java/org/apache/cassandra/utils/concurrent/AbstractFuture.java index dca31cc1cf..e3319ca26d 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/AbstractFuture.java +++ b/src/java/org/apache/cassandra/utils/concurrent/AbstractFuture.java @@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; + import javax.annotation.Nullable; import com.google.common.base.Preconditions; @@ -35,8 +36,7 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.ListenableFuture; // checkstyle: permit this import import accord.utils.async.AsyncResult; -import io.netty.util.concurrent.GenericFutureListener; -import io.netty.util.internal.ThrowableUtil; + import org.apache.cassandra.utils.concurrent.ListenerList.CallbackBiConsumerListener; import org.apache.cassandra.utils.concurrent.ListenerList.CallbackLambdaListener; import org.apache.cassandra.utils.concurrent.ListenerList.CallbackListener; @@ -45,6 +45,9 @@ import org.apache.cassandra.utils.concurrent.ListenerList.GenericFutureListenerL import org.apache.cassandra.utils.concurrent.ListenerList.RunnableWithExecutor; import org.apache.cassandra.utils.concurrent.ListenerList.RunnableWithNotifyExecutor; +import io.netty.util.concurrent.GenericFutureListener; +import io.netty.util.internal.ThrowableUtil; + import static java.util.concurrent.atomic.AtomicReferenceFieldUpdater.newUpdater; import static org.apache.cassandra.utils.concurrent.ListenerList.notifyListener; diff --git a/src/java/org/apache/cassandra/utils/concurrent/AsyncFuture.java b/src/java/org/apache/cassandra/utils/concurrent/AsyncFuture.java index e381172f9b..055bef2fe1 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/AsyncFuture.java +++ b/src/java/org/apache/cassandra/utils/concurrent/AsyncFuture.java @@ -21,6 +21,7 @@ package org.apache.cassandra.utils.concurrent; import java.util.concurrent.Executor; import java.util.concurrent.locks.LockSupport; import java.util.function.Function; + import javax.annotation.Nullable; import com.google.common.util.concurrent.AsyncFunction; @@ -28,9 +29,11 @@ import com.google.common.util.concurrent.ListenableFuture; // checkstyle: permit import accord.utils.Invariants; import accord.utils.async.AsyncResult; -import io.netty.util.concurrent.GenericFutureListener; + import org.apache.cassandra.utils.concurrent.ListenerList.Waiting; +import io.netty.util.concurrent.GenericFutureListener; + import static org.apache.cassandra.utils.Clock.Global.nanoTime; /** diff --git a/src/java/org/apache/cassandra/utils/concurrent/Awaitable.java b/src/java/org/apache/cassandra/utils/concurrent/Awaitable.java index 25bdf02778..71f83df497 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/Awaitable.java +++ b/src/java/org/apache/cassandra/utils/concurrent/Awaitable.java @@ -23,13 +23,13 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.function.Predicate; import net.nicoulaj.compilecommand.annotations.Inline; -import org.apache.cassandra.utils.Shared; import org.apache.cassandra.utils.Intercept; +import org.apache.cassandra.utils.Shared; import static org.apache.cassandra.utils.Clock.Global.nanoTime; -import static org.apache.cassandra.utils.concurrent.WaitQueue.newWaitQueue; import static org.apache.cassandra.utils.Shared.Scope.SIMULATION; +import static org.apache.cassandra.utils.concurrent.WaitQueue.newWaitQueue; /** * A generic signal consumer, supporting all of the typical patterns used in Cassandra. diff --git a/src/java/org/apache/cassandra/utils/concurrent/Future.java b/src/java/org/apache/cassandra/utils/concurrent/Future.java index 629c2f1093..3085271e60 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/Future.java +++ b/src/java/org/apache/cassandra/utils/concurrent/Future.java @@ -29,11 +29,12 @@ import com.google.common.util.concurrent.ListenableFuture; // checkstyle: permit import accord.api.AsyncExecutor; import accord.utils.async.AsyncResult; -import io.netty.util.concurrent.GenericFutureListener; -import io.netty.util.internal.PlatformDependent; import org.apache.cassandra.utils.Shared; +import io.netty.util.concurrent.GenericFutureListener; +import io.netty.util.internal.PlatformDependent; + import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.cassandra.utils.Shared.Recursive.INTERFACES; import static org.apache.cassandra.utils.Shared.Scope.SIMULATION; diff --git a/src/java/org/apache/cassandra/utils/concurrent/FutureCombiner.java b/src/java/org/apache/cassandra/utils/concurrent/FutureCombiner.java index 709e5da608..dc1ad36e95 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/FutureCombiner.java +++ b/src/java/org/apache/cassandra/utils/concurrent/FutureCombiner.java @@ -17,9 +17,6 @@ */ package org.apache.cassandra.utils.concurrent; -import io.netty.util.concurrent.GenericFutureListener; -import io.netty.util.concurrent.GlobalEventExecutor; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -32,6 +29,9 @@ import java.util.stream.Collectors; import com.google.common.base.Preconditions; +import io.netty.util.concurrent.GenericFutureListener; +import io.netty.util.concurrent.GlobalEventExecutor; + /** * Netty's PromiseCombiner is not threadsafe, and we combine futures from multiple event executors. * diff --git a/src/java/org/apache/cassandra/utils/concurrent/IntrusiveStack.java b/src/java/org/apache/cassandra/utils/concurrent/IntrusiveStack.java index f50bb625c5..d00e3e954d 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/IntrusiveStack.java +++ b/src/java/org/apache/cassandra/utils/concurrent/IntrusiveStack.java @@ -25,8 +25,10 @@ import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; -import accord.utils.TriFunction; import net.nicoulaj.compilecommand.annotations.Inline; + +import accord.utils.TriFunction; + import org.apache.cassandra.utils.LongAccumulator; /** diff --git a/src/java/org/apache/cassandra/utils/concurrent/ListenerList.java b/src/java/org/apache/cassandra/utils/concurrent/ListenerList.java index 1ba3f83d50..49dd1796e4 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/ListenerList.java +++ b/src/java/org/apache/cassandra/utils/concurrent/ListenerList.java @@ -23,17 +23,20 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.concurrent.locks.LockSupport; import java.util.function.BiConsumer; import java.util.function.Consumer; + import javax.annotation.Nullable; import com.google.common.util.concurrent.FutureCallback; -import io.netty.util.concurrent.EventExecutor; -import io.netty.util.concurrent.GenericFutureListener; import net.nicoulaj.compilecommand.annotations.Inline; + import org.apache.cassandra.concurrent.ExecutionFailure; import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.concurrent.ImmediateExecutor; +import io.netty.util.concurrent.EventExecutor; +import io.netty.util.concurrent.GenericFutureListener; + import static org.apache.cassandra.utils.concurrent.ListenerList.Notifying.NOTIFYING; /** diff --git a/src/java/org/apache/cassandra/utils/concurrent/LoadingMap.java b/src/java/org/apache/cassandra/utils/concurrent/LoadingMap.java index 1d41a97db8..ade28d2bf4 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/LoadingMap.java +++ b/src/java/org/apache/cassandra/utils/concurrent/LoadingMap.java @@ -28,6 +28,7 @@ import java.util.function.Function; import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; + import org.cliffc.high_scale_lib.NonBlockingHashMap; /** diff --git a/src/java/org/apache/cassandra/utils/concurrent/NonBlockingRateLimiter.java b/src/java/org/apache/cassandra/utils/concurrent/NonBlockingRateLimiter.java index 2a98222407..1e3cfef69d 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/NonBlockingRateLimiter.java +++ b/src/java/org/apache/cassandra/utils/concurrent/NonBlockingRateLimiter.java @@ -18,14 +18,15 @@ package org.apache.cassandra.utils.concurrent; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; + +import javax.annotation.concurrent.ThreadSafe; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.base.Ticker; -import javax.annotation.concurrent.ThreadSafe; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; - import static java.lang.Math.toIntExact; /** diff --git a/src/java/org/apache/cassandra/utils/concurrent/Promise.java b/src/java/org/apache/cassandra/utils/concurrent/Promise.java index d9e46234a8..c7101d42e3 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/Promise.java +++ b/src/java/org/apache/cassandra/utils/concurrent/Promise.java @@ -24,9 +24,10 @@ import java.util.function.Consumer; import com.google.common.util.concurrent.FutureCallback; -import io.netty.util.concurrent.GenericFutureListener; import org.apache.cassandra.utils.Shared; +import io.netty.util.concurrent.GenericFutureListener; + import static org.apache.cassandra.utils.Shared.Recursive.INTERFACES; import static org.apache.cassandra.utils.Shared.Scope.SIMULATION; diff --git a/src/java/org/apache/cassandra/utils/concurrent/Ref.java b/src/java/org/apache/cassandra/utils/concurrent/Ref.java index 6719948e33..e69ce34a4e 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/Ref.java +++ b/src/java/org/apache/cassandra/utils/concurrent/Ref.java @@ -26,24 +26,46 @@ import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.IdentityHashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedDeque; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ConcurrentSkipListSet; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.DelayQueue; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; -import org.apache.cassandra.exceptions.UnaccessibleFieldException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import jdk.internal.ref.Cleaner; +import org.cliffc.high_scale_lib.NonBlockingHashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.concurrent.Shutdownable; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.lifecycle.View; +import org.apache.cassandra.exceptions.UnaccessibleFieldException; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.Memory; import org.apache.cassandra.io.util.SafeMemory; @@ -51,13 +73,12 @@ import org.apache.cassandra.utils.ExecutorUtils; import org.apache.cassandra.utils.NoSpamLogger; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.Shared; + +import jdk.internal.ref.Cleaner; import sun.misc.Unsafe; import sun.nio.ch.DirectBuffer; -import org.cliffc.high_scale_lib.NonBlockingHashMap; - import static java.util.Collections.emptyList; - import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; import static org.apache.cassandra.concurrent.InfiniteLoopExecutor.SimulatorSafe.UNSAFE; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_DEBUG_REF_COUNT; diff --git a/src/java/org/apache/cassandra/utils/concurrent/Refs.java b/src/java/org/apache/cassandra/utils/concurrent/Refs.java index fb6067e21d..716ddbb69b 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/Refs.java +++ b/src/java/org/apache/cassandra/utils/concurrent/Refs.java @@ -27,6 +27,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; + import javax.annotation.Nullable; import com.google.common.base.Function; diff --git a/src/java/org/apache/cassandra/utils/concurrent/SyncFuture.java b/src/java/org/apache/cassandra/utils/concurrent/SyncFuture.java index 6098f8d595..e06116fa0a 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/SyncFuture.java +++ b/src/java/org/apache/cassandra/utils/concurrent/SyncFuture.java @@ -27,6 +27,7 @@ import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.ListenableFuture; // checkstyle: permit this import import accord.utils.async.AsyncResult; + import io.netty.util.concurrent.GenericFutureListener; import static org.apache.cassandra.utils.concurrent.Awaitable.SyncAwaitable.waitUntil; diff --git a/src/java/org/apache/cassandra/utils/concurrent/WeightedQueue.java b/src/java/org/apache/cassandra/utils/concurrent/WeightedQueue.java index b1def451ca..bb2ded2bf6 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/WeightedQueue.java +++ b/src/java/org/apache/cassandra/utils/concurrent/WeightedQueue.java @@ -25,6 +25,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/utils/jmx/AbstractJmxSocketFactory.java b/src/java/org/apache/cassandra/utils/jmx/AbstractJmxSocketFactory.java index ef68f52486..9de93193df 100644 --- a/src/java/org/apache/cassandra/utils/jmx/AbstractJmxSocketFactory.java +++ b/src/java/org/apache/cassandra/utils/jmx/AbstractJmxSocketFactory.java @@ -21,6 +21,7 @@ package org.apache.cassandra.utils.jmx; import java.net.InetAddress; import java.util.HashMap; import java.util.Map; + import javax.net.ssl.SSLContext; import javax.net.ssl.SSLException; diff --git a/src/java/org/apache/cassandra/utils/jmx/DefaultJmxSocketFactory.java b/src/java/org/apache/cassandra/utils/jmx/DefaultJmxSocketFactory.java index 45d4df72dd..156b807f3f 100644 --- a/src/java/org/apache/cassandra/utils/jmx/DefaultJmxSocketFactory.java +++ b/src/java/org/apache/cassandra/utils/jmx/DefaultJmxSocketFactory.java @@ -22,6 +22,7 @@ import java.net.InetAddress; import java.util.Arrays; import java.util.Map; import java.util.stream.Collectors; + import javax.management.remote.rmi.RMIConnectorServer; import javax.net.ssl.SSLContext; import javax.rmi.ssl.SslRMIClientSocketFactory; diff --git a/src/java/org/apache/cassandra/utils/logging/AbstractVirtualTableAppender.java b/src/java/org/apache/cassandra/utils/logging/AbstractVirtualTableAppender.java index eea7347de2..f75291c1a4 100644 --- a/src/java/org/apache/cassandra/utils/logging/AbstractVirtualTableAppender.java +++ b/src/java/org/apache/cassandra/utils/logging/AbstractVirtualTableAppender.java @@ -22,13 +22,14 @@ import java.util.LinkedList; import java.util.List; import java.util.Optional; -import ch.qos.logback.classic.spi.LoggingEvent; -import ch.qos.logback.core.AppenderBase; import org.apache.cassandra.db.virtual.AbstractLoggerVirtualTable; import org.apache.cassandra.db.virtual.VirtualKeyspace; import org.apache.cassandra.db.virtual.VirtualKeyspaceRegistry; import org.apache.cassandra.db.virtual.VirtualTable; +import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.AppenderBase; + import static org.apache.cassandra.schema.SchemaConstants.VIRTUAL_VIEWS; public abstract class AbstractVirtualTableAppender extends AppenderBase diff --git a/src/java/org/apache/cassandra/utils/logging/LogbackLoggingSupport.java b/src/java/org/apache/cassandra/utils/logging/LogbackLoggingSupport.java index d8f83116bb..c4cc2d7890 100644 --- a/src/java/org/apache/cassandra/utils/logging/LogbackLoggingSupport.java +++ b/src/java/org/apache/cassandra/utils/logging/LogbackLoggingSupport.java @@ -26,9 +26,12 @@ import java.util.Map; import java.util.Optional; import com.google.common.collect.Maps; + import org.apache.commons.lang3.StringUtils; import org.slf4j.LoggerFactory; +import org.apache.cassandra.security.ThreadAwareSecurityManager; + import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; @@ -39,7 +42,6 @@ import ch.qos.logback.classic.turbo.TurboFilter; import ch.qos.logback.classic.util.ContextInitializer; import ch.qos.logback.core.Appender; import ch.qos.logback.core.hook.DefaultShutdownHook; -import org.apache.cassandra.security.ThreadAwareSecurityManager; /** * Encapsulates all logback-specific implementations in a central place. diff --git a/src/java/org/apache/cassandra/utils/logging/SlowQueriesAppender.java b/src/java/org/apache/cassandra/utils/logging/SlowQueriesAppender.java index 7a13ca397d..115b291b39 100644 --- a/src/java/org/apache/cassandra/utils/logging/SlowQueriesAppender.java +++ b/src/java/org/apache/cassandra/utils/logging/SlowQueriesAppender.java @@ -18,9 +18,10 @@ package org.apache.cassandra.utils.logging; -import ch.qos.logback.classic.spi.LoggingEvent; import org.apache.cassandra.db.virtual.SlowQueriesTable; +import ch.qos.logback.classic.spi.LoggingEvent; + public final class SlowQueriesAppender extends AbstractVirtualTableAppender { public static final String APPENDER_NAME = "SLOW_QUERIES_APPENDER"; diff --git a/src/java/org/apache/cassandra/utils/logging/VirtualTableAppender.java b/src/java/org/apache/cassandra/utils/logging/VirtualTableAppender.java index 6c12cd414e..eb808670be 100644 --- a/src/java/org/apache/cassandra/utils/logging/VirtualTableAppender.java +++ b/src/java/org/apache/cassandra/utils/logging/VirtualTableAppender.java @@ -22,10 +22,11 @@ import java.util.Set; import com.google.common.collect.ImmutableSet; -import ch.qos.logback.classic.spi.LoggingEvent; import org.apache.cassandra.audit.FileAuditLogger; import org.apache.cassandra.db.virtual.LogMessagesTable; +import ch.qos.logback.classic.spi.LoggingEvent; + /** * Appends Cassandra logs to virtual table system_views.system_logs */ diff --git a/src/java/org/apache/cassandra/utils/memory/BufferPool.java b/src/java/org/apache/cassandra/utils/memory/BufferPool.java index 952da3c3ec..c85368c3a8 100644 --- a/src/java/org/apache/cassandra/utils/memory/BufferPool.java +++ b/src/java/org/apache/cassandra/utils/memory/BufferPool.java @@ -26,37 +26,41 @@ import java.util.ArrayDeque; import java.util.Collections; import java.util.Queue; import java.util.Set; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import java.util.concurrent.atomic.LongAdder; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; +import java.util.concurrent.atomic.LongAdder; import java.util.function.BiPredicate; import java.util.function.Consumer; import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; -import jdk.internal.ref.Cleaner; import net.nicoulaj.compilecommand.annotations.Inline; -import org.apache.cassandra.concurrent.Shutdownable; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.util.concurrent.FastThreadLocal; - +import org.apache.cassandra.concurrent.Shutdownable; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.metrics.BufferPoolMetrics; import org.apache.cassandra.utils.NoSpamLogger; import org.apache.cassandra.utils.Shared; import org.apache.cassandra.utils.concurrent.Ref; import org.apache.cassandra.utils.concurrent.Ref.DirectBufferRef; + +import io.netty.util.concurrent.FastThreadLocal; +import jdk.internal.ref.Cleaner; import sun.nio.ch.DirectBuffer; import static com.google.common.collect.ImmutableList.of; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; import static org.apache.cassandra.concurrent.InfiniteLoopExecutor.SimulatorSafe.UNSAFE; -import static org.apache.cassandra.utils.ExecutorUtils.*; +import static org.apache.cassandra.utils.ExecutorUtils.shutdownAndWait; import static org.apache.cassandra.utils.FBUtilities.prettyPrintMemory; import static org.apache.cassandra.utils.Shared.Scope.SIMULATION; import static org.apache.cassandra.utils.memory.MemoryUtil.isExactlyDirect; diff --git a/src/java/org/apache/cassandra/utils/memory/EnsureOnHeap.java b/src/java/org/apache/cassandra/utils/memory/EnsureOnHeap.java index 34b9eaacd2..642b76df14 100644 --- a/src/java/org/apache/cassandra/utils/memory/EnsureOnHeap.java +++ b/src/java/org/apache/cassandra/utils/memory/EnsureOnHeap.java @@ -26,7 +26,12 @@ import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.DeletionInfo; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.BaseRowIterator; +import org.apache.cassandra.db.rows.RangeTombstoneMarker; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.RowIterator; +import org.apache.cassandra.db.rows.Rows; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.transform.Transformation; import org.apache.cassandra.utils.SearchIterator; diff --git a/src/java/org/apache/cassandra/utils/memory/MemtableAllocator.java b/src/java/org/apache/cassandra/utils/memory/MemtableAllocator.java index 54fac01611..ee83f92d64 100644 --- a/src/java/org/apache/cassandra/utils/memory/MemtableAllocator.java +++ b/src/java/org/apache/cassandra/utils/memory/MemtableAllocator.java @@ -21,11 +21,11 @@ package org.apache.cassandra.utils.memory; import java.util.concurrent.atomic.AtomicLongFieldUpdater; import java.util.concurrent.atomic.LongAdder; +import com.codahale.metrics.Timer; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Timer; - import org.apache.cassandra.utils.concurrent.OpOrder; import org.apache.cassandra.utils.concurrent.WaitQueue; diff --git a/src/java/org/apache/cassandra/utils/memory/MemtableCleanerThread.java b/src/java/org/apache/cassandra/utils/memory/MemtableCleanerThread.java index 20b320dc05..e1cc5718c0 100644 --- a/src/java/org/apache/cassandra/utils/memory/MemtableCleanerThread.java +++ b/src/java/org/apache/cassandra/utils/memory/MemtableCleanerThread.java @@ -18,20 +18,20 @@ */ package org.apache.cassandra.utils.memory; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.TimeUnit; - import org.apache.cassandra.concurrent.Interruptible; import org.apache.cassandra.utils.concurrent.WaitQueue; +import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; import static org.apache.cassandra.concurrent.InfiniteLoopExecutor.SimulatorSafe.SAFE; import static org.apache.cassandra.utils.concurrent.WaitQueue.newWaitQueue; -import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; /** * A thread that reclaims memory from a MemtablePool on demand. The actual reclaiming work is delegated to the diff --git a/src/java/org/apache/cassandra/utils/memory/MemtablePool.java b/src/java/org/apache/cassandra/utils/memory/MemtablePool.java index 479504f880..2693f5a26a 100644 --- a/src/java/org/apache/cassandra/utils/memory/MemtablePool.java +++ b/src/java/org/apache/cassandra/utils/memory/MemtablePool.java @@ -22,16 +22,16 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicLongFieldUpdater; +import com.codahale.metrics.Gauge; +import com.codahale.metrics.Timer; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import com.codahale.metrics.Gauge; -import com.codahale.metrics.Timer; import org.apache.cassandra.metrics.CassandraMetricsRegistry; import org.apache.cassandra.metrics.DefaultNameFactory; import org.apache.cassandra.metrics.MetricNameFactory; -import org.apache.cassandra.utils.concurrent.WaitQueue; import org.apache.cassandra.utils.ExecutorUtils; +import org.apache.cassandra.utils.concurrent.WaitQueue; import static org.apache.cassandra.utils.concurrent.WaitQueue.newWaitQueue; diff --git a/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java b/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java index cc30e7c4b7..531c7e1041 100644 --- a/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java +++ b/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java @@ -23,11 +23,17 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.NativeClustering; +import org.apache.cassandra.db.NativeDecoratedKey; +import org.apache.cassandra.db.rows.BTreeRow; +import org.apache.cassandra.db.rows.Cell; +import org.apache.cassandra.db.rows.NativeCell; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.utils.concurrent.OpOrder; -import org.apache.cassandra.utils.concurrent.Semaphore; import org.apache.cassandra.utils.concurrent.OpOrder.Group; +import org.apache.cassandra.utils.concurrent.Semaphore; import static org.apache.cassandra.utils.concurrent.Semaphore.newSemaphore; diff --git a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java index be0ecf556f..2d3899ef45 100644 --- a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java +++ b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java @@ -17,7 +17,9 @@ */ package org.apache.cassandra.utils.obs; -import java.io.*; +import java.io.DataInput; +import java.io.IOException; +import java.io.InputStream; import com.google.common.annotations.VisibleForTesting; diff --git a/src/java/org/apache/cassandra/utils/progress/jmx/JMXNotificationProgressListener.java b/src/java/org/apache/cassandra/utils/progress/jmx/JMXNotificationProgressListener.java index 346148744d..742edab586 100644 --- a/src/java/org/apache/cassandra/utils/progress/jmx/JMXNotificationProgressListener.java +++ b/src/java/org/apache/cassandra/utils/progress/jmx/JMXNotificationProgressListener.java @@ -18,6 +18,7 @@ package org.apache.cassandra.utils.progress.jmx; import java.util.Map; + import javax.management.Notification; import javax.management.NotificationListener; import javax.management.remote.JMXConnectionNotification; diff --git a/src/java/org/apache/cassandra/utils/progress/jmx/JMXProgressSupport.java b/src/java/org/apache/cassandra/utils/progress/jmx/JMXProgressSupport.java index 1d5023db04..6d540eeab2 100644 --- a/src/java/org/apache/cassandra/utils/progress/jmx/JMXProgressSupport.java +++ b/src/java/org/apache/cassandra/utils/progress/jmx/JMXProgressSupport.java @@ -20,6 +20,7 @@ package org.apache.cassandra.utils.progress.jmx; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; + import javax.management.Notification; import javax.management.NotificationBroadcasterSupport; diff --git a/src/java/org/apache/cassandra/utils/vint/VIntCoding.java b/src/java/org/apache/cassandra/utils/vint/VIntCoding.java index 4a8b77bc76..3cce3a1bc4 100644 --- a/src/java/org/apache/cassandra/utils/vint/VIntCoding.java +++ b/src/java/org/apache/cassandra/utils/vint/VIntCoding.java @@ -51,13 +51,15 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import io.netty.util.concurrent.FastThreadLocal; import net.nicoulaj.compilecommand.annotations.DontInline; import net.nicoulaj.compilecommand.annotations.Inline; + import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import io.netty.util.concurrent.FastThreadLocal; + /** * Borrows idea from * https://developers.google.com/protocol-buffers/docs/encoding#varints diff --git a/test/anttasks/org/apache/cassandra/anttasks/EchoEclipseProjectLibs.java b/test/anttasks/org/apache/cassandra/anttasks/EchoEclipseProjectLibs.java index c0cfb41097..3442e86180 100644 --- a/test/anttasks/org/apache/cassandra/anttasks/EchoEclipseProjectLibs.java +++ b/test/anttasks/org/apache/cassandra/anttasks/EchoEclipseProjectLibs.java @@ -18,14 +18,13 @@ package org.apache.cassandra.anttasks; -import org.apache.cassandra.io.util.File; - import org.apache.commons.io.FilenameUtils; - import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.Echo; +import org.apache.cassandra.io.util.File; + public class EchoEclipseProjectLibs extends Task { public void execute() diff --git a/test/anttasks/org/apache/cassandra/anttasks/TestNameCheckTask.java b/test/anttasks/org/apache/cassandra/anttasks/TestNameCheckTask.java index b1c17ad2c3..e439501883 100644 --- a/test/anttasks/org/apache/cassandra/anttasks/TestNameCheckTask.java +++ b/test/anttasks/org/apache/cassandra/anttasks/TestNameCheckTask.java @@ -37,7 +37,6 @@ import java.util.stream.Stream; import org.apache.commons.lang3.function.Consumers; import org.junit.Test; - import org.reflections.Reflections; import org.reflections.scanners.Scanners; import org.reflections.util.ConfigurationBuilder; diff --git a/test/burn/org/apache/cassandra/concurrent/LongOpOrderTest.java b/test/burn/org/apache/cassandra/concurrent/LongOpOrderTest.java index b236fb1ee6..da1d4cd604 100644 --- a/test/burn/org/apache/cassandra/concurrent/LongOpOrderTest.java +++ b/test/burn/org/apache/cassandra/concurrent/LongOpOrderTest.java @@ -36,8 +36,8 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.utils.concurrent.OpOrder; -import static org.junit.Assert.assertTrue; import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; +import static org.junit.Assert.assertTrue; // TODO: we don't currently test SAFE functionality at all! // TODO: should also test markBlocking and SyncOrdered diff --git a/test/burn/org/apache/cassandra/concurrent/LongSharedExecutorPoolTest.java b/test/burn/org/apache/cassandra/concurrent/LongSharedExecutorPoolTest.java index b5f5718f67..8b04705e4a 100644 --- a/test/burn/org/apache/cassandra/concurrent/LongSharedExecutorPoolTest.java +++ b/test/burn/org/apache/cassandra/concurrent/LongSharedExecutorPoolTest.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.LockSupport; import com.google.common.util.concurrent.Uninterruptibles; + import org.apache.commons.math3.distribution.WeibullDistribution; import org.junit.Ignore; import org.junit.Test; diff --git a/test/burn/org/apache/cassandra/net/ConnectionBurnTest.java b/test/burn/org/apache/cassandra/net/ConnectionBurnTest.java index abacb6e034..0d2fe9f486 100644 --- a/test/burn/org/apache/cassandra/net/ConnectionBurnTest.java +++ b/test/burn/org/apache/cassandra/net/ConnectionBurnTest.java @@ -43,14 +43,13 @@ import java.util.stream.IntStream; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.cassandra.utils.concurrent.FutureCombiner; +import net.openhft.chronicle.core.util.ThrowingBiConsumer; +import net.openhft.chronicle.core.util.ThrowingRunnable; + import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.Channel; -import net.openhft.chronicle.core.util.ThrowingBiConsumer; -import net.openhft.chronicle.core.util.ThrowingRunnable; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.io.IVersionedSerializer; @@ -60,11 +59,14 @@ import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.MessageGenerator.UniformPayloadGenerator; import org.apache.cassandra.utils.ExecutorUtils; import org.apache.cassandra.utils.MonotonicClock; +import org.apache.cassandra.utils.concurrent.FutureCombiner; import org.apache.cassandra.utils.memory.BufferPools; +import io.netty.channel.Channel; + import static java.lang.Math.min; -import static org.apache.cassandra.net.MessagingService.current_version; import static org.apache.cassandra.net.ConnectionType.LARGE_MESSAGES; +import static org.apache.cassandra.net.MessagingService.current_version; import static org.apache.cassandra.utils.Clock.Global.nanoTime; import static org.apache.cassandra.utils.MonotonicClock.Global.approxTime; import static org.apache.cassandra.utils.MonotonicClock.Global.preciseTime; diff --git a/test/burn/org/apache/cassandra/net/MessageGenerator.java b/test/burn/org/apache/cassandra/net/MessageGenerator.java index 945315747a..19039c3160 100644 --- a/test/burn/org/apache/cassandra/net/MessageGenerator.java +++ b/test/burn/org/apache/cassandra/net/MessageGenerator.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.utils.vint.VIntCoding; + import sun.misc.Unsafe; import static org.apache.cassandra.net.MessagingService.VERSION_40; diff --git a/test/burn/org/apache/cassandra/net/Verifier.java b/test/burn/org/apache/cassandra/net/Verifier.java index d1022b3121..e311220959 100644 --- a/test/burn/org/apache/cassandra/net/Verifier.java +++ b/test/burn/org/apache/cassandra/net/Verifier.java @@ -28,18 +28,21 @@ import java.util.concurrent.atomic.AtomicReferenceArray; import java.util.concurrent.locks.LockSupport; import java.util.function.Consumer; +import com.carrotsearch.hppc.LongObjectHashMap; +import com.carrotsearch.hppc.procedures.LongObjectProcedure; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.carrotsearch.hppc.LongObjectHashMap; -import com.carrotsearch.hppc.procedures.LongObjectProcedure; import org.apache.cassandra.net.Verifier.ExpiredMessageEvent.ExpirationType; import org.apache.cassandra.utils.concurrent.WaitQueue; -import static java.util.concurrent.TimeUnit.*; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static java.util.concurrent.TimeUnit.NANOSECONDS; +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.apache.cassandra.net.ConnectionType.LARGE_MESSAGES; import static org.apache.cassandra.net.MessagingService.VERSION_40; import static org.apache.cassandra.net.MessagingService.current_version; -import static org.apache.cassandra.net.ConnectionType.LARGE_MESSAGES; import static org.apache.cassandra.net.OutboundConnection.LargeMessageDelivery.DEFAULT_BUFFER_SIZE; import static org.apache.cassandra.net.OutboundConnections.LARGE_MESSAGE_THRESHOLD; import static org.apache.cassandra.net.Verifier.EventCategory.OTHER; @@ -51,8 +54,8 @@ import static org.apache.cassandra.net.Verifier.EventType.DESERIALIZE; import static org.apache.cassandra.net.Verifier.EventType.ENQUEUE; import static org.apache.cassandra.net.Verifier.EventType.FAILED_CLOSING; import static org.apache.cassandra.net.Verifier.EventType.FAILED_DESERIALIZE; -import static org.apache.cassandra.net.Verifier.EventType.FAILED_EXPIRED_ON_SEND; import static org.apache.cassandra.net.Verifier.EventType.FAILED_EXPIRED_ON_RECEIVE; +import static org.apache.cassandra.net.Verifier.EventType.FAILED_EXPIRED_ON_SEND; import static org.apache.cassandra.net.Verifier.EventType.FAILED_FRAME; import static org.apache.cassandra.net.Verifier.EventType.FAILED_OVERLOADED; import static org.apache.cassandra.net.Verifier.EventType.FAILED_SERIALIZE; diff --git a/test/burn/org/apache/cassandra/transport/BurnTestUtil.java b/test/burn/org/apache/cassandra/transport/BurnTestUtil.java index c8017d151f..75ccf4679a 100644 --- a/test/burn/org/apache/cassandra/transport/BurnTestUtil.java +++ b/test/burn/org/apache/cassandra/transport/BurnTestUtil.java @@ -25,6 +25,7 @@ import java.util.Random; import java.util.function.Function; import com.datastax.driver.core.SimpleStatement; + import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.QueryOptions; diff --git a/test/burn/org/apache/cassandra/transport/DriverBurnTest.java b/test/burn/org/apache/cassandra/transport/DriverBurnTest.java index 42b7c6bbaa..4f279d33c3 100644 --- a/test/burn/org/apache/cassandra/transport/DriverBurnTest.java +++ b/test/burn/org/apache/cassandra/transport/DriverBurnTest.java @@ -19,20 +19,31 @@ package org.apache.cassandra.transport; import java.nio.ByteBuffer; -import java.util.*; -import java.util.concurrent.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.ProtocolOptions; +import com.datastax.driver.core.ResultSetFuture; +import com.datastax.driver.core.Row; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.SimpleStatement; + import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.datastax.driver.core.*; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.service.NativeTransportService; import org.apache.cassandra.service.QueryState; @@ -40,6 +51,8 @@ import org.apache.cassandra.transport.messages.QueryMessage; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.AssertUtil; +import io.netty.buffer.ByteBuf; + import static org.apache.cassandra.config.EncryptionOptions.TlsEncryptionPolicy.UNENCRYPTED; import static org.apache.cassandra.transport.BurnTestUtil.SizeCaps; import static org.apache.cassandra.transport.BurnTestUtil.generateQueryMessage; diff --git a/test/burn/org/apache/cassandra/transport/SimpleClientBurnTest.java b/test/burn/org/apache/cassandra/transport/SimpleClientBurnTest.java index 3247051197..c58e6f3ba6 100644 --- a/test/burn/org/apache/cassandra/transport/SimpleClientBurnTest.java +++ b/test/burn/org/apache/cassandra/transport/SimpleClientBurnTest.java @@ -22,8 +22,14 @@ import java.net.InetAddress; import java.net.ServerSocket; import java.nio.ByteBuffer; import java.security.SecureRandom; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import org.junit.Assert; @@ -32,7 +38,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.auth.AllowAllAuthenticator; import org.apache.cassandra.auth.AllowAllAuthorizer; import org.apache.cassandra.auth.AllowAllNetworkAuthorizer; @@ -45,6 +50,8 @@ import org.apache.cassandra.transport.messages.QueryMessage; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.AssertUtil; +import io.netty.buffer.ByteBuf; + import static org.apache.cassandra.config.EncryptionOptions.TlsEncryptionPolicy.UNENCRYPTED; import static org.apache.cassandra.transport.BurnTestUtil.SizeCaps; import static org.apache.cassandra.transport.BurnTestUtil.generateQueryMessage; diff --git a/test/burn/org/apache/cassandra/transport/SimpleClientPerfTest.java b/test/burn/org/apache/cassandra/transport/SimpleClientPerfTest.java index ca5adfff02..cfd54f34e1 100644 --- a/test/burn/org/apache/cassandra/transport/SimpleClientPerfTest.java +++ b/test/burn/org/apache/cassandra/transport/SimpleClientPerfTest.java @@ -20,8 +20,13 @@ package org.apache.cassandra.transport; import java.net.InetAddress; import java.net.ServerSocket; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; @@ -30,6 +35,7 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; import com.google.common.util.concurrent.RateLimiter; + import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.junit.Assert; import org.junit.Before; @@ -37,7 +43,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.auth.AllowAllAuthenticator; import org.apache.cassandra.auth.AllowAllAuthorizer; import org.apache.cassandra.auth.AllowAllNetworkAuthorizer; @@ -51,6 +56,8 @@ import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.AssertUtil; import org.apache.cassandra.utils.Throwables; +import io.netty.buffer.ByteBuf; + import static org.apache.cassandra.transport.BurnTestUtil.SizeCaps; import static org.apache.cassandra.transport.BurnTestUtil.generateQueryMessage; import static org.apache.cassandra.transport.BurnTestUtil.generateRows; diff --git a/test/burn/org/apache/cassandra/utils/LongBTreeTest.java b/test/burn/org/apache/cassandra/utils/LongBTreeTest.java index d8a4f81637..69e0cfa764 100644 --- a/test/burn/org/apache/cassandra/utils/LongBTreeTest.java +++ b/test/burn/org/apache/cassandra/utils/LongBTreeTest.java @@ -22,7 +22,20 @@ import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.security.SecureRandom; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.NavigableMap; +import java.util.NavigableSet; +import java.util.Objects; +import java.util.Random; +import java.util.TreeMap; +import java.util.TreeSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; @@ -33,19 +46,22 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.IntStream; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Snapshot; +import com.codahale.metrics.Timer; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFutureTask; + import org.junit.Assert; import org.junit.Test; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.Snapshot; -import com.codahale.metrics.Timer; import org.apache.cassandra.concurrent.NamedThreadFactory; -import org.apache.cassandra.utils.btree.*; +import org.apache.cassandra.utils.btree.BTree; +import org.apache.cassandra.utils.btree.BTreeSet; +import org.apache.cassandra.utils.btree.UpdateFunction; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.Iterables.filter; @@ -53,8 +69,8 @@ import static com.google.common.collect.Iterables.transform; import static java.util.Comparator.naturalOrder; import static java.util.Comparator.reverseOrder; import static org.apache.cassandra.config.CassandraRelevantProperties.BTREE_FAN_FACTOR; -import static org.apache.cassandra.utils.btree.BTree.iterable; import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; +import static org.apache.cassandra.utils.btree.BTree.iterable; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/burn/org/apache/cassandra/utils/memory/LongBufferPoolTest.java b/test/burn/org/apache/cassandra/utils/memory/LongBufferPoolTest.java index caf8ec23d6..c8a072aaef 100644 --- a/test/burn/org/apache/cassandra/utils/memory/LongBufferPoolTest.java +++ b/test/burn/org/apache/cassandra/utils/memory/LongBufferPoolTest.java @@ -23,14 +23,24 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.BrokenBarrierException; +import java.util.concurrent.Callable; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicLong; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +50,10 @@ import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.utils.DynamicList; import static org.apache.cassandra.utils.Clock.Global.nanoTime; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Long BufferPool test - make sure that the BufferPool allocates and recycles diff --git a/test/distributed/org/apache/cassandra/distributed/Cluster.java b/test/distributed/org/apache/cassandra/distributed/Cluster.java index 07e64041c6..3ea4fa02ed 100644 --- a/test/distributed/org/apache/cassandra/distributed/Cluster.java +++ b/test/distributed/org/apache/cassandra/distributed/Cluster.java @@ -23,7 +23,10 @@ import java.util.function.Consumer; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.distributed.api.*; +import org.apache.cassandra.distributed.api.IInstanceConfig; +import org.apache.cassandra.distributed.api.IInvokableInstance; +import org.apache.cassandra.distributed.api.IIsolatedExecutor; +import org.apache.cassandra.distributed.api.IMessage; import org.apache.cassandra.distributed.impl.AbstractCluster; import org.apache.cassandra.distributed.impl.Instance; import org.apache.cassandra.distributed.shared.Versions; diff --git a/test/distributed/org/apache/cassandra/distributed/api/ICoordinator.java b/test/distributed/org/apache/cassandra/distributed/api/ICoordinator.java index 4adaff4c4d..96ea6a3690 100644 --- a/test/distributed/org/apache/cassandra/distributed/api/ICoordinator.java +++ b/test/distributed/org/apache/cassandra/distributed/api/ICoordinator.java @@ -18,13 +18,13 @@ package org.apache.cassandra.distributed.api; -import org.apache.cassandra.distributed.shared.FutureUtils; - import java.util.Iterator; import java.util.UUID; import java.util.concurrent.Future; import java.util.function.BiConsumer; +import org.apache.cassandra.distributed.shared.FutureUtils; + // The cross-version API requires that a Coordinator can be constructed without any constructor arguments public interface ICoordinator { diff --git a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java index 8ecdb5d267..fd87c86b6c 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java @@ -53,6 +53,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; + import javax.annotation.Nullable; import javax.annotation.concurrent.GuardedBy; @@ -60,7 +61,12 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; import com.google.common.collect.LinkedHashMultimap; + import org.junit.Assume; +import org.reflections.Reflections; +import org.reflections.scanners.Scanners; +import org.reflections.util.ConfigurationBuilder; +import org.reflections.util.NameHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -101,10 +107,6 @@ import org.apache.cassandra.utils.Isolated; import org.apache.cassandra.utils.Shared; import org.apache.cassandra.utils.Shared.Recursive; import org.apache.cassandra.utils.concurrent.Condition; -import org.reflections.Reflections; -import org.reflections.scanners.Scanners; -import org.reflections.util.ConfigurationBuilder; -import org.reflections.util.NameHelper; import static java.util.stream.Stream.of; import static org.apache.cassandra.distributed.impl.IsolatedExecutor.DEFAULT_SHUTDOWN_EXECUTOR; diff --git a/test/distributed/org/apache/cassandra/distributed/impl/AbstractClusterTest.java b/test/distributed/org/apache/cassandra/distributed/impl/AbstractClusterTest.java index 1b2a1ce0f5..35b93322e6 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/AbstractClusterTest.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/AbstractClusterTest.java @@ -23,8 +23,10 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Consumer; +import org.assertj.core.api.Assertions; import org.junit.AssumptionViolatedException; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.distributed.api.IInstanceConfig; import org.apache.cassandra.distributed.api.IInvokableInstance; @@ -32,8 +34,6 @@ import org.apache.cassandra.distributed.api.TokenSupplier; import org.apache.cassandra.distributed.impl.AbstractCluster.AbstractBuilder; import org.apache.cassandra.distributed.shared.Versions; import org.apache.cassandra.utils.FailingRunnable; -import org.assertj.core.api.Assertions; -import org.mockito.Mockito; public class AbstractClusterTest diff --git a/test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java b/test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java index d623bef85f..c1cf2f0760 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java @@ -30,6 +30,7 @@ import java.util.function.BiConsumer; import com.google.common.collect.Iterators; import accord.utils.Invariants; + import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.QueryProcessor; diff --git a/test/distributed/org/apache/cassandra/distributed/impl/DirectStreamingConnectionFactory.java b/test/distributed/org/apache/cassandra/distributed/impl/DirectStreamingConnectionFactory.java index bd674b3b1e..9f319dbe43 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/DirectStreamingConnectionFactory.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/DirectStreamingConnectionFactory.java @@ -29,24 +29,25 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import java.util.function.IntFunction; -import io.netty.util.concurrent.Future; import org.apache.cassandra.distributed.api.ICluster; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.io.util.BufferedDataOutputStreamPlus; import org.apache.cassandra.io.util.RebufferingInputStream; import org.apache.cassandra.net.OutboundConnectionSettings; import org.apache.cassandra.streaming.StreamDeserializingTask; +import org.apache.cassandra.streaming.StreamingChannel; import org.apache.cassandra.streaming.StreamingDataInputPlus; import org.apache.cassandra.streaming.StreamingDataOutputPlus; -import org.apache.cassandra.streaming.StreamingChannel; import org.apache.cassandra.streaming.StreamingDataOutputPlusFixed; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.concurrent.ImmediateFuture; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; +import io.netty.util.concurrent.Future; + import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; import static org.apache.cassandra.locator.InetAddressAndPort.getByAddress; -import static org.apache.cassandra.net.MessagingService.*; +import static org.apache.cassandra.net.MessagingService.current_version; // TODO: Simulator should schedule based on some streaming data rate public class DirectStreamingConnectionFactory diff --git a/test/distributed/org/apache/cassandra/distributed/impl/FileLogAction.java b/test/distributed/org/apache/cassandra/distributed/impl/FileLogAction.java index db2dfaa35f..3323e46dbb 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/FileLogAction.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/FileLogAction.java @@ -25,11 +25,11 @@ import java.util.function.Predicate; import com.google.common.io.Closeables; +import org.apache.cassandra.distributed.api.LineIterator; +import org.apache.cassandra.distributed.api.LogAction; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.utils.AbstractIterator; -import org.apache.cassandra.distributed.api.LogAction; -import org.apache.cassandra.distributed.api.LineIterator; public class FileLogAction implements LogAction { diff --git a/test/distributed/org/apache/cassandra/distributed/impl/INodeProvisionStrategy.java b/test/distributed/org/apache/cassandra/distributed/impl/INodeProvisionStrategy.java index 0c10ee64e1..34a182fe69 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/INodeProvisionStrategy.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/INodeProvisionStrategy.java @@ -19,6 +19,7 @@ package org.apache.cassandra.distributed.impl; import java.util.Map; + import javax.annotation.Nullable; import org.apache.cassandra.net.SocketUtils; diff --git a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java index f0a35d6d83..ac1da245d5 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java @@ -42,17 +42,19 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Stream; + import javax.annotation.Nullable; import javax.management.ListenerNotFoundException; import javax.management.Notification; import javax.management.NotificationListener; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; -import io.netty.util.concurrent.GlobalEventExecutor; + import org.apache.cassandra.Util; import org.apache.cassandra.audit.AuditLogManager; import org.apache.cassandra.auth.AuthCache; @@ -171,6 +173,8 @@ import org.apache.cassandra.utils.logging.LoggingSupportFactory; import org.apache.cassandra.utils.memory.BufferPools; import org.apache.cassandra.utils.progress.jmx.JMXBroadcastExecutor; +import io.netty.util.concurrent.GlobalEventExecutor; + import static java.util.concurrent.TimeUnit.MINUTES; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; import static org.apache.cassandra.config.CassandraRelevantProperties.CONSISTENT_RANGE_MOVEMENT; diff --git a/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java b/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java index 45ef68cb81..9c8065e6e4 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java @@ -30,6 +30,7 @@ import java.util.UUID; import java.util.function.Function; import com.vdurmont.semver4j.Semver; + import org.apache.cassandra.config.AccordSpec; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.OptionaldPositiveInt; diff --git a/test/distributed/org/apache/cassandra/distributed/impl/InstanceIDDefiner.java b/test/distributed/org/apache/cassandra/distributed/impl/InstanceIDDefiner.java index 2aa084c21f..33815bb372 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/InstanceIDDefiner.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/InstanceIDDefiner.java @@ -18,9 +18,10 @@ package org.apache.cassandra.distributed.impl; -import ch.qos.logback.core.PropertyDefinerBase; import org.apache.cassandra.concurrent.NamedThreadFactory; +import ch.qos.logback.core.PropertyDefinerBase; + /** * Used by logback to find/define property value, see logback-dtest.xml */ diff --git a/test/distributed/org/apache/cassandra/distributed/impl/InstanceMetrics.java b/test/distributed/org/apache/cassandra/distributed/impl/InstanceMetrics.java index 7bedce183f..8677bf6f66 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/InstanceMetrics.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/InstanceMetrics.java @@ -31,6 +31,7 @@ import com.codahale.metrics.Meter; import com.codahale.metrics.Metric; import com.codahale.metrics.Snapshot; import com.codahale.metrics.Timer; + import org.apache.cassandra.distributed.shared.Metrics; import org.apache.cassandra.metrics.CassandraMetricsRegistry; diff --git a/test/distributed/org/apache/cassandra/distributed/impl/IsolatedExecutor.java b/test/distributed/org/apache/cassandra/distributed/impl/IsolatedExecutor.java index 9e84d32df7..ddb3f2d746 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/IsolatedExecutor.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/IsolatedExecutor.java @@ -43,13 +43,14 @@ import java.util.function.Supplier; import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.LoggerContext; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.concurrent.ExecutorFactory; import org.apache.cassandra.distributed.api.IIsolatedExecutor; import org.apache.cassandra.utils.ExecutorUtils; import org.apache.cassandra.utils.Throwables; +import ch.qos.logback.classic.LoggerContext; +import io.netty.util.concurrent.FastThreadLocal; + import static java.util.concurrent.TimeUnit.SECONDS; public class IsolatedExecutor implements IIsolatedExecutor diff --git a/test/distributed/org/apache/cassandra/distributed/impl/IsolatedJmx.java b/test/distributed/org/apache/cassandra/distributed/impl/IsolatedJmx.java index 554b7a7317..f8a2ce2012 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/IsolatedJmx.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/IsolatedJmx.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.concurrent.TimeUnit; + import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorServer; import javax.management.remote.JMXServiceURL; @@ -40,11 +41,12 @@ import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.config.JMXServerOptions; import org.apache.cassandra.distributed.api.IInstance; import org.apache.cassandra.distributed.api.IInstanceConfig; +import org.apache.cassandra.distributed.shared.JMXUtil; import org.apache.cassandra.distributed.shared.jmx.RMICloseableClientSocketFactory; import org.apache.cassandra.distributed.shared.jmx.RMICloseableServerSocketFactory; -import org.apache.cassandra.distributed.shared.JMXUtil; import org.apache.cassandra.utils.JMXServerUtils; import org.apache.cassandra.utils.MBeanWrapper; + import sun.rmi.transport.tcp.TCPEndpoint; import static org.apache.cassandra.config.CassandraRelevantProperties.JAVA_RMI_DGC_LEASE_VALUE_IN_JVM_DTEST; diff --git a/test/distributed/org/apache/cassandra/distributed/impl/IsolatedJmxSocketFactory.java b/test/distributed/org/apache/cassandra/distributed/impl/IsolatedJmxSocketFactory.java index 108ca9f1bc..864943af6d 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/IsolatedJmxSocketFactory.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/IsolatedJmxSocketFactory.java @@ -22,6 +22,7 @@ import java.net.InetAddress; import java.util.Arrays; import java.util.Map; import java.util.stream.Collectors; + import javax.net.ssl.SSLContext; import org.slf4j.Logger; diff --git a/test/distributed/org/apache/cassandra/distributed/impl/JmxTestClientSslContextFactory.java b/test/distributed/org/apache/cassandra/distributed/impl/JmxTestClientSslContextFactory.java index 8247d8e9d4..753b540052 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/JmxTestClientSslContextFactory.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/JmxTestClientSslContextFactory.java @@ -22,6 +22,7 @@ import java.io.InputStream; import java.nio.file.Files; import java.security.KeyStore; import java.util.Map; + import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLException; diff --git a/test/distributed/org/apache/cassandra/distributed/impl/JmxTestClientSslSocketFactory.java b/test/distributed/org/apache/cassandra/distributed/impl/JmxTestClientSslSocketFactory.java index db802c031e..1eb645e54b 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/JmxTestClientSslSocketFactory.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/JmxTestClientSslSocketFactory.java @@ -21,6 +21,7 @@ package org.apache.cassandra.distributed.impl; import java.io.IOException; import java.io.Serializable; import java.net.Socket; + import javax.net.SocketFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; diff --git a/test/distributed/org/apache/cassandra/distributed/impl/RowUtil.java b/test/distributed/org/apache/cassandra/distributed/impl/RowUtil.java index f9086e9148..25ef172187 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/RowUtil.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/RowUtil.java @@ -24,11 +24,11 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.distributed.api.QueryResults; diff --git a/test/distributed/org/apache/cassandra/distributed/shared/Byteman.java b/test/distributed/org/apache/cassandra/distributed/shared/Byteman.java index c5c76e3ea2..61856ca7db 100644 --- a/test/distributed/org/apache/cassandra/distributed/shared/Byteman.java +++ b/test/distributed/org/apache/cassandra/distributed/shared/Byteman.java @@ -41,11 +41,12 @@ import java.util.stream.Stream; import com.google.common.base.StandardSystemProperty; import com.google.common.io.ByteStreams; import com.google.common.io.Files; -import org.apache.cassandra.io.util.File; + +import org.jboss.byteman.agent.Transformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.jboss.byteman.agent.Transformer; +import org.apache.cassandra.io.util.File; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_BYTEMAN_TRANSFORMATIONS_DEBUG; diff --git a/test/distributed/org/apache/cassandra/distributed/shared/ClusterUtils.java b/test/distributed/org/apache/cassandra/distributed/shared/ClusterUtils.java index fedc1a7c55..19986671ec 100644 --- a/test/distributed/org/apache/cassandra/distributed/shared/ClusterUtils.java +++ b/test/distributed/org/apache/cassandra/distributed/shared/ClusterUtils.java @@ -48,17 +48,15 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.common.util.concurrent.Futures; -import accord.topology.EpochReady; import org.agrona.collections.IntArrayList; -import org.apache.cassandra.tcm.compatibility.TokenRingUtils; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.Shared; import org.assertj.core.api.Assertions; import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.primitives.TxnId; +import accord.topology.EpochReady; + import org.apache.cassandra.db.virtual.AccordDebugKeyspace; import org.apache.cassandra.dht.Token; import org.apache.cassandra.distributed.Cluster; @@ -95,19 +93,22 @@ import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.Commit; import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.Transformation; +import org.apache.cassandra.tcm.compatibility.TokenRingUtils; import org.apache.cassandra.tcm.membership.NodeId; import org.apache.cassandra.tcm.ownership.ReplicaGroups; +import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Isolated; +import org.apache.cassandra.utils.Shared; import org.apache.cassandra.utils.concurrent.AsyncPromise; import org.apache.cassandra.utils.concurrent.CountDownLatch; import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; -import static org.assertj.core.api.Assertions.assertThat; import static org.apache.cassandra.config.CassandraRelevantProperties.BOOTSTRAP_SCHEMA_DELAY_MS; import static org.apache.cassandra.config.CassandraRelevantProperties.BROADCAST_INTERVAL_MS; import static org.apache.cassandra.config.CassandraRelevantProperties.REPLACE_ADDRESS_FIRST_BOOT; import static org.apache.cassandra.config.CassandraRelevantProperties.RING_DELAY; import static org.apache.cassandra.distributed.impl.TestEndpointCache.toCassandraInetAddressAndPort; +import static org.assertj.core.api.Assertions.assertThat; /** * Utilities for working with jvm-dtest clusters. diff --git a/test/distributed/org/apache/cassandra/distributed/test/AbstractEncryptionOptionsImpl.java b/test/distributed/org/apache/cassandra/distributed/test/AbstractEncryptionOptionsImpl.java index 7c3b91127a..8aea5f0416 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/AbstractEncryptionOptionsImpl.java +++ b/test/distributed/org/apache/cassandra/distributed/test/AbstractEncryptionOptionsImpl.java @@ -29,12 +29,18 @@ import javax.net.ssl.SSLSession; import com.google.common.collect.ImmutableMap; -import org.apache.cassandra.transport.TlsTestUtils; -import org.apache.cassandra.utils.concurrent.Condition; import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.EncryptionOptions; +import org.apache.cassandra.distributed.Cluster; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.security.ISslContextFactory; +import org.apache.cassandra.security.SSLFactory; +import org.apache.cassandra.transport.TlsTestUtils; +import org.apache.cassandra.utils.concurrent.Condition; + import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; @@ -49,11 +55,6 @@ import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslHandler; import io.netty.util.concurrent.FutureListener; -import org.apache.cassandra.config.EncryptionOptions; -import org.apache.cassandra.distributed.Cluster; -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.security.ISslContextFactory; -import org.apache.cassandra.security.SSLFactory; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.REQUIRED; diff --git a/test/distributed/org/apache/cassandra/distributed/test/AbstractHintWindowTest.java b/test/distributed/org/apache/cassandra/distributed/test/AbstractHintWindowTest.java index 5e441e27c1..c73d7248e4 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/AbstractHintWindowTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/AbstractHintWindowTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.distributed.test; import java.util.UUID; +import org.assertj.core.api.Assertions; import org.junit.Ignore; import org.apache.cassandra.auth.CassandraRoleManager; @@ -33,7 +34,6 @@ import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.metrics.StorageMetrics; import org.apache.cassandra.service.StorageService; -import org.assertj.core.api.Assertions; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/test/distributed/org/apache/cassandra/distributed/test/AbstractNetstatsStreaming.java b/test/distributed/org/apache/cassandra/distributed/test/AbstractNetstatsStreaming.java index 93d26f1235..10019a6f4a 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/AbstractNetstatsStreaming.java +++ b/test/distributed/org/apache/cassandra/distributed/test/AbstractNetstatsStreaming.java @@ -31,13 +31,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Stream; +import com.datastax.driver.core.Session; + import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.datastax.driver.core.Session; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.api.LogResult; diff --git a/test/distributed/org/apache/cassandra/distributed/test/AlterTest.java b/test/distributed/org/apache/cassandra/distributed/test/AlterTest.java index 15f7204458..2b569b890d 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/AlterTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/AlterTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.distributed.test; import java.util.List; import com.google.common.collect.ImmutableMap; + import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/test/distributed/org/apache/cassandra/distributed/test/AuthTest.java b/test/distributed/org/apache/cassandra/distributed/test/AuthTest.java index cd63a45ac9..6e66921ad8 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/AuthTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/AuthTest.java @@ -22,11 +22,12 @@ import java.io.IOException; import java.util.Collections; import java.util.function.Function; -import org.junit.Test; - import com.datastax.driver.core.PlainTextAuthProvider; import com.datastax.driver.core.Session; import com.datastax.driver.core.policies.DCAwareRoundRobinPolicy; + +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.ICoordinator; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ByteBuddyExamplesTest.java b/test/distributed/org/apache/cassandra/distributed/test/ByteBuddyExamplesTest.java index 33d486c940..e763ba13b4 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ByteBuddyExamplesTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ByteBuddyExamplesTest.java @@ -24,12 +24,13 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.statements.ModificationStatement; diff --git a/test/distributed/org/apache/cassandra/distributed/test/CASAddTest.java b/test/distributed/org/apache/cassandra/distributed/test/CASAddTest.java index 37e44f7794..790905580b 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/CASAddTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/CASAddTest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.distributed.test; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.config.CassandraRelevantProperties; @@ -25,7 +26,6 @@ import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.utils.AssertionUtils; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows; import static org.apache.cassandra.distributed.shared.AssertUtils.row; diff --git a/test/distributed/org/apache/cassandra/distributed/test/CASContentionTest.java b/test/distributed/org/apache/cassandra/distributed/test/CASContentionTest.java index c58a9458c9..8e31772525 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/CASContentionTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/CASContentionTest.java @@ -18,23 +18,25 @@ package org.apache.cassandra.distributed.test; +import java.util.Map; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; + import com.google.common.util.concurrent.Uninterruptibles; + +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInstanceConfig; import org.apache.cassandra.service.paxos.ContentionStrategy; import org.apache.cassandra.utils.FBUtilities; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import java.util.Map; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.function.Consumer; import static org.apache.cassandra.config.CassandraRelevantProperties.PAXOS_USE_SELF_EXECUTION; import static org.apache.cassandra.distributed.api.ConsistencyLevel.QUORUM; diff --git a/test/distributed/org/apache/cassandra/distributed/test/CasCriticalSectionTest.java b/test/distributed/org/apache/cassandra/distributed/test/CasCriticalSectionTest.java index 685e848cb4..e918cdc2d7 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/CasCriticalSectionTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/CasCriticalSectionTest.java @@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BooleanSupplier; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Assert; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/CasWriteTest.java b/test/distributed/org/apache/cassandra/distributed/test/CasWriteTest.java index d6bc4a39b2..603ff9ea02 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/CasWriteTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/CasWriteTest.java @@ -33,6 +33,9 @@ import java.util.function.Function; import java.util.function.Supplier; import com.google.common.util.concurrent.Uninterruptibles; + +import org.hamcrest.BaseMatcher; +import org.hamcrest.Description; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -67,8 +70,6 @@ import org.apache.cassandra.notifications.SSTableMetadataChanged; import org.apache.cassandra.service.paxos.Ballot; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.TimeUUID; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; import static org.apache.cassandra.db.ColumnFamilyStore.FlushReason.INTERNALLY_FORCED; import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ClearSnapshotTest.java b/test/distributed/org/apache/cassandra/distributed/test/ClearSnapshotTest.java index 1725f29f92..1a44b8ae08 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ClearSnapshotTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ClearSnapshotTest.java @@ -28,15 +28,16 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.Test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.db.Directories; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ClientNetworkStopStartTest.java b/test/distributed/org/apache/cassandra/distributed/test/ClientNetworkStopStartTest.java index 1d9029ba92..f9b5611d20 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ClientNetworkStopStartTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ClientNetworkStopStartTest.java @@ -20,9 +20,10 @@ package org.apache.cassandra.distributed.test; import java.io.IOException; +import com.datastax.driver.core.Session; + import org.junit.Test; -import com.datastax.driver.core.Session; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.Feature; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ClusterStorageUsageTest.java b/test/distributed/org/apache/cassandra/distributed/test/ClusterStorageUsageTest.java index 9c379d1d50..19f5ceeb3b 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ClusterStorageUsageTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ClusterStorageUsageTest.java @@ -22,13 +22,12 @@ import org.junit.Test; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.distributed.Cluster; +import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.api.IIsolatedExecutor.SerializableFunction; import org.apache.cassandra.metrics.DefaultNameFactory; -import org.apache.cassandra.distributed.Cluster; -import org.apache.cassandra.distributed.api.ConsistencyLevel; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/test/distributed/org/apache/cassandra/distributed/test/ColumnConstraintsTest.java b/test/distributed/org/apache/cassandra/distributed/test/ColumnConstraintsTest.java index 4abdd780aa..316810d218 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ColumnConstraintsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ColumnConstraintsTest.java @@ -22,14 +22,14 @@ import java.io.IOException; import java.util.Map; import java.util.Set; -import org.apache.cassandra.cql3.constraints.ConstraintViolationException; -import org.apache.cassandra.exceptions.InvalidRequestException; -import org.junit.Test; - -import org.apache.cassandra.distributed.Cluster; -import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.assertj.core.api.Assertions; import org.assertj.core.api.Condition; +import org.junit.Test; + +import org.apache.cassandra.cql3.constraints.ConstraintViolationException; +import org.apache.cassandra.distributed.Cluster; +import org.apache.cassandra.distributed.api.ConsistencyLevel; +import org.apache.cassandra.exceptions.InvalidRequestException; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ColumnMaskTest.java b/test/distributed/org/apache/cassandra/distributed/test/ColumnMaskTest.java index 1e5719f79f..c07e08a46c 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ColumnMaskTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ColumnMaskTest.java @@ -22,14 +22,15 @@ import java.io.IOException; import java.net.InetAddress; import java.util.function.Consumer; -import org.junit.Test; - import com.datastax.driver.core.ConsistencyLevel; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; import com.datastax.driver.core.policies.LoadBalancingPolicy; + +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.impl.RowUtil; diff --git a/test/distributed/org/apache/cassandra/distributed/test/CompactionDiskSpaceTest.java b/test/distributed/org/apache/cassandra/distributed/test/CompactionDiskSpaceTest.java index d6418e696b..36c5163e53 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/CompactionDiskSpaceTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/CompactionDiskSpaceTest.java @@ -26,20 +26,22 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import com.google.common.collect.ImmutableMap; -import org.apache.cassandra.io.util.File; -import org.apache.cassandra.io.util.FileStoreUtils; -import org.apache.cassandra.io.util.PathUtils; -import org.junit.Test; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.junit.Test; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.compaction.ActiveCompactions; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileStoreUtils; +import org.apache.cassandra.io.util.PathUtils; import static net.bytebuddy.matcher.ElementMatchers.named; import static org.junit.Assert.fail; diff --git a/test/distributed/org/apache/cassandra/distributed/test/CompactionOverlappingSSTableTest.java b/test/distributed/org/apache/cassandra/distributed/test/CompactionOverlappingSSTableTest.java index 44caf85ff6..b78bf168f2 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/CompactionOverlappingSSTableTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/CompactionOverlappingSSTableTest.java @@ -31,11 +31,13 @@ import java.util.stream.Collectors; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.Test; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.junit.Test; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.Keyspace; diff --git a/test/distributed/org/apache/cassandra/distributed/test/CryptoProviderTest.java b/test/distributed/org/apache/cassandra/distributed/test/CryptoProviderTest.java index f1e6428f08..b07a558b44 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/CryptoProviderTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/CryptoProviderTest.java @@ -22,13 +22,15 @@ import java.security.Provider; import java.security.Security; import java.util.HashMap; -import org.junit.Before; -import org.junit.Test; - import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; + import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.junit.Before; +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IIsolatedExecutor.SerializableCallable; import org.apache.cassandra.security.DefaultCryptoProvider; diff --git a/test/distributed/org/apache/cassandra/distributed/test/DecommissionTest.java b/test/distributed/org/apache/cassandra/distributed/test/DecommissionTest.java index fa25d691e4..ad0120513b 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/DecommissionTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/DecommissionTest.java @@ -22,13 +22,14 @@ import java.io.IOException; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; -import org.junit.BeforeClass; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.distributed.Cluster; diff --git a/test/distributed/org/apache/cassandra/distributed/test/DisableBinaryTest.java b/test/distributed/org/apache/cassandra/distributed/test/DisableBinaryTest.java index a5c0b1a5c3..543580e14a 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/DisableBinaryTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/DisableBinaryTest.java @@ -31,17 +31,19 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.LockSupport; -import org.junit.Assert; -import org.junit.Test; - import com.datastax.driver.core.PoolingOptions; import com.datastax.driver.core.Session; import com.datastax.driver.core.SocketOptions; import com.datastax.driver.core.exceptions.OverloadedException; + import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.statements.SelectStatement; import org.apache.cassandra.distributed.Cluster; diff --git a/test/distributed/org/apache/cassandra/distributed/test/DistributedRepairUtils.java b/test/distributed/org/apache/cassandra/distributed/test/DistributedRepairUtils.java index c71a611c01..f6c6a32fe5 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/DistributedRepairUtils.java +++ b/test/distributed/org/apache/cassandra/distributed/test/DistributedRepairUtils.java @@ -23,6 +23,7 @@ import java.util.Set; import java.util.function.Consumer; import com.google.common.collect.ImmutableSet; + import org.apache.commons.lang3.ArrayUtils; import org.junit.Assert; diff --git a/test/distributed/org/apache/cassandra/distributed/test/DropColumnTest.java b/test/distributed/org/apache/cassandra/distributed/test/DropColumnTest.java index e3b85a8c86..ee9c0cafc9 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/DropColumnTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/DropColumnTest.java @@ -25,6 +25,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Test; import org.apache.cassandra.db.Keyspace; diff --git a/test/distributed/org/apache/cassandra/distributed/test/DurableWritesTest.java b/test/distributed/org/apache/cassandra/distributed/test/DurableWritesTest.java index b3debad195..a6446f4946 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/DurableWritesTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/DurableWritesTest.java @@ -18,8 +18,8 @@ package org.apache.cassandra.distributed.test; -import org.junit.Test; import org.junit.Assert; +import org.junit.Test; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.commitlog.CommitLog; diff --git a/test/distributed/org/apache/cassandra/distributed/test/EphemeralSnapshotTest.java b/test/distributed/org/apache/cassandra/distributed/test/EphemeralSnapshotTest.java index 4a4d9ccf8d..7b395242b7 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/EphemeralSnapshotTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/EphemeralSnapshotTest.java @@ -25,11 +25,13 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.util.Map; + import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; import com.google.common.util.concurrent.Futures; + import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ExpandCQLTest.java b/test/distributed/org/apache/cassandra/distributed/test/ExpandCQLTest.java index 5c926834ef..a2ac5359b0 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ExpandCQLTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ExpandCQLTest.java @@ -22,12 +22,13 @@ import java.io.IOException; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.schema.IndexMetadata; import org.apache.cassandra.schema.KeyspaceMetadata; diff --git a/test/distributed/org/apache/cassandra/distributed/test/FailingMoveTest.java b/test/distributed/org/apache/cassandra/distributed/test/FailingMoveTest.java index 65e0c28c3a..f94a82de7e 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/FailingMoveTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/FailingMoveTest.java @@ -25,12 +25,14 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.Test; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.Feature; diff --git a/test/distributed/org/apache/cassandra/distributed/test/FailingRepairTest.java b/test/distributed/org/apache/cassandra/distributed/test/FailingRepairTest.java index 529c9f3d50..da3c8fdce4 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/FailingRepairTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/FailingRepairTest.java @@ -36,6 +36,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import com.google.common.util.concurrent.Uninterruptibles; + +import org.awaitility.Awaitility; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; @@ -74,7 +76,6 @@ import org.apache.cassandra.repair.messages.RepairOption; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ActiveRepairService.ParentRepairStatus; import org.apache.cassandra.service.StorageService; -import org.awaitility.Awaitility; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; diff --git a/test/distributed/org/apache/cassandra/distributed/test/FailingResponseDoesNotLogTest.java b/test/distributed/org/apache/cassandra/distributed/test/FailingResponseDoesNotLogTest.java index f410715add..1d06f8d8d1 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/FailingResponseDoesNotLogTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/FailingResponseDoesNotLogTest.java @@ -25,6 +25,8 @@ import java.util.List; import java.util.Map; import com.google.common.collect.ImmutableMap; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -49,7 +51,6 @@ import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.transport.SimpleClient; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.MD5Digest; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.config.CassandraRelevantProperties.CUSTOM_QUERY_HANDLER_CLASS; diff --git a/test/distributed/org/apache/cassandra/distributed/test/FailingTruncationTest.java b/test/distributed/org/apache/cassandra/distributed/test/FailingTruncationTest.java index 9ce2bf339d..8ef9a8d1cd 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/FailingTruncationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/FailingTruncationTest.java @@ -20,11 +20,12 @@ package org.apache.cassandra.distributed.test; import java.io.IOException; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.junit.Test; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ForBenchmarks.java b/test/distributed/org/apache/cassandra/distributed/test/ForBenchmarks.java index fc4dc57a7b..7eb2bdd2ae 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ForBenchmarks.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ForBenchmarks.java @@ -18,11 +18,11 @@ package org.apache.cassandra.distributed.test; +import java.io.IOException; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; -import java.io.IOException; - public class ForBenchmarks extends TestBaseImpl { public static void main(String[] args) throws IOException, InterruptedException { try (Cluster cluster = Cluster.build(3) diff --git a/test/distributed/org/apache/cassandra/distributed/test/GossipSettlesTest.java b/test/distributed/org/apache/cassandra/distributed/test/GossipSettlesTest.java index 341d85482d..e86dcdf383 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/GossipSettlesTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/GossipSettlesTest.java @@ -33,8 +33,8 @@ import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.schema.SystemDistributedKeyspace; import org.apache.cassandra.schema.SchemaConstants; +import org.apache.cassandra.schema.SystemDistributedKeyspace; import org.apache.cassandra.service.StorageProxy; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/test/distributed/org/apache/cassandra/distributed/test/GossipShutdownTest.java b/test/distributed/org/apache/cassandra/distributed/test/GossipShutdownTest.java index c05925fa0e..8c96f7f6e8 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/GossipShutdownTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/GossipShutdownTest.java @@ -26,7 +26,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.cassandra.utils.concurrent.Condition; import org.junit.Test; import org.apache.cassandra.distributed.Cluster; @@ -34,7 +33,7 @@ import org.apache.cassandra.gms.EndpointState; import org.apache.cassandra.gms.IEndpointStateChangeSubscriber; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.service.StorageService; - +import org.apache.cassandra.utils.concurrent.Condition; import static java.lang.Thread.sleep; import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL; diff --git a/test/distributed/org/apache/cassandra/distributed/test/GossipTest.java b/test/distributed/org/apache/cassandra/distributed/test/GossipTest.java index cb5cb1f470..46343c8bb8 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/GossipTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/GossipTest.java @@ -25,10 +25,12 @@ import java.util.Collections; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import com.google.monitoring.runtime.instrumentation.common.util.concurrent.Uninterruptibles; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; -import com.google.monitoring.runtime.instrumentation.common.util.concurrent.Uninterruptibles; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; @@ -49,7 +51,6 @@ import org.apache.cassandra.tcm.Transformation; import org.apache.cassandra.tcm.membership.NodeState; import org.apache.cassandra.tcm.ownership.UniformRangePlacement; import org.apache.cassandra.tcm.transformations.PrepareMove; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.config.CassandraRelevantProperties.JOIN_RING; import static org.apache.cassandra.distributed.action.GossipHelper.withProperty; diff --git a/test/distributed/org/apache/cassandra/distributed/test/GroupByTest.java b/test/distributed/org/apache/cassandra/distributed/test/GroupByTest.java index 789321de3d..6dcc5f5e26 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/GroupByTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/GroupByTest.java @@ -21,13 +21,14 @@ package org.apache.cassandra.distributed.test; import java.util.Date; import java.util.Iterator; -import com.google.common.collect.Iterators; -import org.junit.Assert; -import org.junit.Test; - import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; +import com.google.common.collect.Iterators; + +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.Feature; diff --git a/test/distributed/org/apache/cassandra/distributed/test/HintDataReappearingTest.java b/test/distributed/org/apache/cassandra/distributed/test/HintDataReappearingTest.java index 21177f20cd..91b142fd90 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/HintDataReappearingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/HintDataReappearingTest.java @@ -18,7 +18,10 @@ package org.apache.cassandra.distributed.test; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicBoolean; @@ -27,24 +30,22 @@ import java.util.stream.IntStream; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import org.apache.cassandra.db.SystemKeyspace; -import org.apache.cassandra.distributed.api.IIsolatedExecutor; -import org.apache.cassandra.exceptions.WriteTimeoutException; -import org.apache.cassandra.hints.HintsService; - import org.apache.commons.lang3.ArrayUtils; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; - -import org.apache.cassandra.distributed.Cluster; -import org.apache.cassandra.distributed.api.IInvokableInstance; -import org.apache.cassandra.distributed.api.SimpleQueryResult; -import org.apache.cassandra.net.Verb; -import org.assertj.core.api.Assertions; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.distributed.Cluster; +import org.apache.cassandra.distributed.api.IInvokableInstance; +import org.apache.cassandra.distributed.api.IIsolatedExecutor; +import org.apache.cassandra.distributed.api.SimpleQueryResult; +import org.apache.cassandra.exceptions.WriteTimeoutException; +import org.apache.cassandra.hints.HintsService; +import org.apache.cassandra.net.Verb; + import static java.lang.String.format; import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL; import static org.apache.cassandra.distributed.api.ConsistencyLevel.LOCAL_QUORUM; diff --git a/test/distributed/org/apache/cassandra/distributed/test/HintedHandoffAddRemoveNodesTest.java b/test/distributed/org/apache/cassandra/distributed/test/HintedHandoffAddRemoveNodesTest.java index 45f028929e..e62fb4af1a 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/HintedHandoffAddRemoveNodesTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/HintedHandoffAddRemoveNodesTest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.distributed.test; +import org.awaitility.Awaitility; import org.junit.Test; import org.apache.cassandra.config.CassandraRelevantProperties; @@ -31,7 +32,6 @@ import org.apache.cassandra.distributed.shared.WithProperties; import org.apache.cassandra.metrics.HintsServiceMetrics; import org.apache.cassandra.metrics.StorageMetrics; import org.apache.cassandra.service.StorageService; -import org.awaitility.Awaitility; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.cassandra.config.DatabaseDescriptor.setProgressBarrierMinConsistencyLevel; diff --git a/test/distributed/org/apache/cassandra/distributed/test/HungBootstrapDoesNotHangTest.java b/test/distributed/org/apache/cassandra/distributed/test/HungBootstrapDoesNotHangTest.java index 474c555ab4..cf07dbfe98 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/HungBootstrapDoesNotHangTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/HungBootstrapDoesNotHangTest.java @@ -22,11 +22,13 @@ import java.io.IOException; import java.util.Collection; import java.util.concurrent.ForkJoinPool; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.assertj.core.api.Assertions; +import org.junit.Test; + import org.apache.cassandra.dht.Token; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.Constants; @@ -41,7 +43,6 @@ import org.apache.cassandra.tcm.sequences.BootstrapAndJoin; import org.apache.cassandra.utils.Shared; import org.apache.cassandra.utils.concurrent.CountDownLatch; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; -import org.assertj.core.api.Assertions; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; diff --git a/test/distributed/org/apache/cassandra/distributed/test/IPMembershipTest.java b/test/distributed/org/apache/cassandra/distributed/test/IPMembershipTest.java index c51e8163a6..6485f40672 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/IPMembershipTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/IPMembershipTest.java @@ -25,6 +25,8 @@ import java.util.Set; import java.util.UUID; import com.google.common.collect.ImmutableSet; + +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; @@ -37,7 +39,6 @@ import org.apache.cassandra.distributed.shared.ClusterUtils; import org.apache.cassandra.locator.NoOpProximity; import org.apache.cassandra.locator.SimpleLocationProvider; import org.apache.cassandra.tools.ToolRunner; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.distributed.shared.ClusterUtils.assertRingIs; import static org.apache.cassandra.distributed.shared.ClusterUtils.getDirectories; diff --git a/test/distributed/org/apache/cassandra/distributed/test/IncRepairAdminTest.java b/test/distributed/org/apache/cassandra/distributed/test/IncRepairAdminTest.java index b94dd483b7..27326f012f 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/IncRepairAdminTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/IncRepairAdminTest.java @@ -27,6 +27,7 @@ import java.util.stream.Collectors; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Test; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/test/distributed/org/apache/cassandra/distributed/test/IncRepairTruncationTest.java b/test/distributed/org/apache/cassandra/distributed/test/IncRepairTruncationTest.java index 989e0ab998..437b4c1ffc 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/IncRepairTruncationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/IncRepairTruncationTest.java @@ -26,7 +26,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.cassandra.utils.concurrent.Condition; + import org.junit.Test; import org.apache.cassandra.db.ColumnFamilyStore; @@ -36,7 +36,7 @@ import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.IMessage; import org.apache.cassandra.distributed.api.NodeToolResult; import org.apache.cassandra.net.Verb; - +import org.apache.cassandra.utils.concurrent.Condition; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NETWORK; diff --git a/test/distributed/org/apache/cassandra/distributed/test/IncrementalRepairCleanupAfterNodeAddingTest.java b/test/distributed/org/apache/cassandra/distributed/test/IncrementalRepairCleanupAfterNodeAddingTest.java index b1ba255c84..9b13598589 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/IncrementalRepairCleanupAfterNodeAddingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/IncrementalRepairCleanupAfterNodeAddingTest.java @@ -23,6 +23,7 @@ import java.util.Map; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; + import org.junit.Assert; import org.junit.Test; @@ -50,8 +51,8 @@ import static org.apache.cassandra.distributed.api.Feature.NETWORK; import static org.apache.cassandra.distributed.test.ExecUtil.rethrow; import static org.apache.cassandra.repair.consistent.LocalSessionInfo.STATE; import static org.apache.cassandra.repair.messages.RepairOption.INCREMENTAL_KEY; -import static org.awaitility.Awaitility.await; import static org.apache.cassandra.utils.concurrent.Condition.newOneTimeCondition; +import static org.awaitility.Awaitility.await; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; public class IncrementalRepairCleanupAfterNodeAddingTest extends TestBaseImpl diff --git a/test/distributed/org/apache/cassandra/distributed/test/IndexDroppingTest.java b/test/distributed/org/apache/cassandra/distributed/test/IndexDroppingTest.java index a7cc1ad32d..a4526290c6 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/IndexDroppingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/IndexDroppingTest.java @@ -23,6 +23,7 @@ import java.time.Instant; import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/IntegrationTestBase.java b/test/distributed/org/apache/cassandra/distributed/test/IntegrationTestBase.java index e05b52e06d..f626a3e48b 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/IntegrationTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/IntegrationTestBase.java @@ -26,6 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInstanceConfig; diff --git a/test/distributed/org/apache/cassandra/distributed/test/InternodeEncryptionEnforcementTest.java b/test/distributed/org/apache/cassandra/distributed/test/InternodeEncryptionEnforcementTest.java index 142a95b362..4365dfb145 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/InternodeEncryptionEnforcementTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/InternodeEncryptionEnforcementTest.java @@ -34,11 +34,14 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.collect.ImmutableMap; -import org.junit.Test; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.awaitility.Awaitility; +import org.junit.Test; + import org.apache.cassandra.auth.AllowAllInternodeAuthenticator; import org.apache.cassandra.auth.IInternodeAuthenticator; import org.apache.cassandra.config.DatabaseDescriptor; @@ -58,7 +61,6 @@ import org.apache.cassandra.net.Verb; import org.apache.cassandra.transport.TlsTestUtils; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; -import org.awaitility.Awaitility; import static com.google.common.collect.Iterables.getOnlyElement; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/test/distributed/org/apache/cassandra/distributed/test/InternodeEncryptionOptionsTest.java b/test/distributed/org/apache/cassandra/distributed/test/InternodeEncryptionOptionsTest.java index a955757c9b..fe03b57488 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/InternodeEncryptionOptionsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/InternodeEncryptionOptionsTest.java @@ -23,6 +23,7 @@ import java.util.Collections; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; + import org.junit.Assert; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/InternodeErrorExclusionTest.java b/test/distributed/org/apache/cassandra/distributed/test/InternodeErrorExclusionTest.java index 81d0e80eaf..d4b85ceb4c 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/InternodeErrorExclusionTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/InternodeErrorExclusionTest.java @@ -23,6 +23,7 @@ import java.util.Arrays; import java.util.concurrent.TimeoutException; import com.google.common.collect.ImmutableMap; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/JVMDTestTest.java b/test/distributed/org/apache/cassandra/distributed/test/JVMDTestTest.java index c764df16bf..2b917233fc 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/JVMDTestTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/JVMDTestTest.java @@ -26,7 +26,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import com.google.common.collect.ImmutableMap; -import org.apache.cassandra.utils.JVMStabilityInspector; + +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.concurrent.Stage; @@ -37,14 +38,14 @@ import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.LogAction; import org.apache.cassandra.utils.FBUtilities; -import org.assertj.core.api.Assertions; +import org.apache.cassandra.utils.JVMStabilityInspector; -import static org.apache.cassandra.distributed.shared.AssertUtils.row; import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows; +import static org.apache.cassandra.distributed.shared.AssertUtils.row; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class JVMDTestTest extends TestBaseImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/JavaDriverUtils.java b/test/distributed/org/apache/cassandra/distributed/test/JavaDriverUtils.java index 9bfde92563..c0ac29063e 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/JavaDriverUtils.java +++ b/test/distributed/org/apache/cassandra/distributed/test/JavaDriverUtils.java @@ -25,6 +25,7 @@ import java.util.stream.Collectors; import com.datastax.driver.core.ConsistencyLevel; import com.datastax.driver.core.ProtocolVersion; + import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.ICluster; import org.apache.cassandra.distributed.api.IInstance; diff --git a/test/distributed/org/apache/cassandra/distributed/test/LeveledCompactionTaskTest.java b/test/distributed/org/apache/cassandra/distributed/test/LeveledCompactionTaskTest.java index d89f3c0079..6e9c369c04 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/LeveledCompactionTaskTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/LeveledCompactionTaskTest.java @@ -22,11 +22,12 @@ import java.io.IOException; import java.nio.file.FileStore; import java.util.Map; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.junit.Test; + import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.distributed.Cluster; diff --git a/test/distributed/org/apache/cassandra/distributed/test/MessageFiltersTest.java b/test/distributed/org/apache/cassandra/distributed/test/MessageFiltersTest.java index ac4e952fe6..39aaa8b806 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/MessageFiltersTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/MessageFiltersTest.java @@ -27,6 +27,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.collect.Sets; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; @@ -45,7 +47,6 @@ import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.NoPayload; import org.apache.cassandra.net.Verb; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NETWORK; diff --git a/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java b/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java index 700679534b..a60c1c44b9 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java @@ -35,8 +35,8 @@ import org.junit.Assert; import org.junit.Test; import org.apache.cassandra.concurrent.Stage; -import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.Cluster; +import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.impl.IsolatedExecutor; import org.apache.cassandra.distributed.impl.TracingUtil; import org.apache.cassandra.distributed.shared.WithProperties; diff --git a/test/distributed/org/apache/cassandra/distributed/test/MessageTimestampTest.java b/test/distributed/org/apache/cassandra/distributed/test/MessageTimestampTest.java index 11f6ab5ad0..a00fb3759e 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/MessageTimestampTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/MessageTimestampTest.java @@ -25,13 +25,14 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Assert; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.config.Config; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; diff --git a/test/distributed/org/apache/cassandra/distributed/test/MetricsTest.java b/test/distributed/org/apache/cassandra/distributed/test/MetricsTest.java index c9e110ad14..bbeac0a5e8 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/MetricsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/MetricsTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.distributed.test; import com.google.common.collect.ImmutableMap; + import org.junit.Assert; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/MixedModeFuzzTest.java b/test/distributed/org/apache/cassandra/distributed/test/MixedModeFuzzTest.java index 8b2d58ac6d..5117d66a78 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/MixedModeFuzzTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/MixedModeFuzzTest.java @@ -32,11 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; -import org.junit.Assert; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Host; @@ -44,10 +39,17 @@ import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.PreparedStatementHelper; import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.InvalidQueryException; + import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.DynamicType; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.junit.Assert; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QueryHandler.Prepared; import org.apache.cassandra.cql3.QueryProcessor; @@ -56,9 +58,9 @@ import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.ICluster; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.impl.RowUtil; -import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.distributed.shared.ClusterUtils; import org.apache.cassandra.distributed.test.log.FuzzTestBase; +import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.CassandraVersion; diff --git a/test/distributed/org/apache/cassandra/distributed/test/MoveTest.java b/test/distributed/org/apache/cassandra/distributed/test/MoveTest.java index 0ce1b8be3b..a5517dc043 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/MoveTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/MoveTest.java @@ -23,6 +23,7 @@ import java.util.List; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; + import org.junit.Assert; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/NativeMixedVersionTest.java b/test/distributed/org/apache/cassandra/distributed/test/NativeMixedVersionTest.java index 29605f0c1f..5e41fc4417 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/NativeMixedVersionTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/NativeMixedVersionTest.java @@ -22,16 +22,17 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.List; -import org.junit.Test; - import com.datastax.driver.core.ProtocolVersion; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; + +import org.assertj.core.api.Assertions; +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.shared.WithProperties; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.config.CassandraRelevantProperties.IO_NETTY_EVENTLOOP_THREADS; diff --git a/test/distributed/org/apache/cassandra/distributed/test/NativeProtocolTest.java b/test/distributed/org/apache/cassandra/distributed/test/NativeProtocolTest.java index 10bc2a5248..8fe630313a 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/NativeProtocolTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/NativeProtocolTest.java @@ -20,22 +20,23 @@ package org.apache.cassandra.distributed.test; import java.net.InetSocketAddress; -import org.apache.cassandra.distributed.Cluster; -import org.apache.cassandra.distributed.api.IInstance; -import org.apache.cassandra.distributed.api.IInstanceConfig; -import org.apache.cassandra.distributed.api.IInvokableInstance; -import org.apache.cassandra.distributed.api.IIsolatedExecutor; -import org.apache.cassandra.service.StorageService; -import org.junit.Assert; -import org.junit.Test; - import com.datastax.driver.core.ConsistencyLevel; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; + +import org.junit.Assert; +import org.junit.Test; + +import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ICluster; +import org.apache.cassandra.distributed.api.IInstance; +import org.apache.cassandra.distributed.api.IInstanceConfig; +import org.apache.cassandra.distributed.api.IInvokableInstance; +import org.apache.cassandra.distributed.api.IIsolatedExecutor; import org.apache.cassandra.distributed.impl.RowUtil; +import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.config.CassandraRelevantProperties.JOIN_RING; diff --git a/test/distributed/org/apache/cassandra/distributed/test/NativeTransportEncryptionOptionsTest.java b/test/distributed/org/apache/cassandra/distributed/test/NativeTransportEncryptionOptionsTest.java index b23f501e69..5fc9ea4f91 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/NativeTransportEncryptionOptionsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/NativeTransportEncryptionOptionsTest.java @@ -27,17 +27,18 @@ import java.util.Collections; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.TrustManagerFactory; +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 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; import org.apache.cassandra.transport.TlsTestUtils; diff --git a/test/distributed/org/apache/cassandra/distributed/test/NodeToolEnableDisableBinaryTest.java b/test/distributed/org/apache/cassandra/distributed/test/NodeToolEnableDisableBinaryTest.java index 2417ad6ef5..793f311a5b 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/NodeToolEnableDisableBinaryTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/NodeToolEnableDisableBinaryTest.java @@ -20,15 +20,16 @@ package org.apache.cassandra.distributed.test; import java.io.IOException; +import com.datastax.driver.core.Session; + +import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; -import com.datastax.driver.core.Session; import org.apache.cassandra.distributed.api.ICluster; import org.apache.cassandra.tools.ToolRunner; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NATIVE_PROTOCOL; diff --git a/test/distributed/org/apache/cassandra/distributed/test/OptimiseStreamsRepairTest.java b/test/distributed/org/apache/cassandra/distributed/test/OptimiseStreamsRepairTest.java index cec5fdb2e5..41caa77b2d 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/OptimiseStreamsRepairTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/OptimiseStreamsRepairTest.java @@ -31,12 +31,13 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.distributed.Cluster; @@ -44,8 +45,8 @@ import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.NodeToolResult; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.repair.AsymmetricRemoteSyncTask; -import org.apache.cassandra.repair.RepairJob; import org.apache.cassandra.repair.LocalSyncTask; +import org.apache.cassandra.repair.RepairJob; import org.apache.cassandra.repair.SyncTask; import org.apache.cassandra.repair.TreeResponse; diff --git a/test/distributed/org/apache/cassandra/distributed/test/OverloadTest.java b/test/distributed/org/apache/cassandra/distributed/test/OverloadTest.java index fdb21b131e..a7811fb0f5 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/OverloadTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/OverloadTest.java @@ -28,9 +28,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Assert; -import org.junit.Test; - import com.datastax.driver.core.PoolingOptions; import com.datastax.driver.core.ProtocolVersion; import com.datastax.driver.core.Session; @@ -38,10 +35,15 @@ import com.datastax.driver.core.SocketOptions; import com.datastax.driver.core.exceptions.OperationTimedOutException; import com.datastax.driver.core.exceptions.OverloadedException; import com.datastax.driver.core.exceptions.ReadTimeoutException; + import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.statements.SelectStatement; import org.apache.cassandra.distributed.Cluster; diff --git a/test/distributed/org/apache/cassandra/distributed/test/OversizedMutationTest.java b/test/distributed/org/apache/cassandra/distributed/test/OversizedMutationTest.java index fcd600c88b..2bbfadfec5 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/OversizedMutationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/OversizedMutationTest.java @@ -19,10 +19,10 @@ package org.apache.cassandra.distributed.test; import org.apache.commons.lang3.StringUtils; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.distributed.Cluster; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL; diff --git a/test/distributed/org/apache/cassandra/distributed/test/PagingTest.java b/test/distributed/org/apache/cassandra/distributed/test/PagingTest.java index 3dcb490801..8d987dd907 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/PagingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/PagingTest.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.Iterator; import com.google.common.collect.Iterators; + import org.junit.Test; import org.apache.cassandra.distributed.Cluster; diff --git a/test/distributed/org/apache/cassandra/distributed/test/PartitionDenylistTest.java b/test/distributed/org/apache/cassandra/distributed/test/PartitionDenylistTest.java index 4108ece08f..f40d6a2744 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/PartitionDenylistTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/PartitionDenylistTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/test/distributed/org/apache/cassandra/distributed/test/PaxosEpochSerializationTest.java b/test/distributed/org/apache/cassandra/distributed/test/PaxosEpochSerializationTest.java index ab23628fa3..91c21a9534 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/PaxosEpochSerializationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/PaxosEpochSerializationTest.java @@ -18,15 +18,16 @@ package org.apache.cassandra.distributed.test; +import org.junit.Assert; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.transformations.CustomTransformation; -import org.junit.Assert; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import static org.apache.cassandra.net.Verb.PAXOS_COMMIT_REQ; diff --git a/test/distributed/org/apache/cassandra/distributed/test/PaxosRepair2Test.java b/test/distributed/org/apache/cassandra/distributed/test/PaxosRepair2Test.java index 6f0dc8e714..d6e61161c3 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/PaxosRepair2Test.java +++ b/test/distributed/org/apache/cassandra/distributed/test/PaxosRepair2Test.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.Iterators; import com.google.common.collect.Sets; + import org.awaitility.Awaitility; import org.junit.Assert; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/PaxosRepairTest.java b/test/distributed/org/apache/cassandra/distributed/test/PaxosRepairTest.java index ad750b0b7d..762b9315de 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/PaxosRepairTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/PaxosRepairTest.java @@ -38,6 +38,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; @@ -69,9 +70,9 @@ import org.apache.cassandra.distributed.api.IInstance; import org.apache.cassandra.distributed.api.IInstanceConfig; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.api.IMessageFilters; -import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.distributed.api.TokenSupplier; import org.apache.cassandra.distributed.shared.NetworkTopology; +import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.repair.RepairParallelism; import org.apache.cassandra.repair.SharedContext; diff --git a/test/distributed/org/apache/cassandra/distributed/test/PrepareBatchStatementsTest.java b/test/distributed/org/apache/cassandra/distributed/test/PrepareBatchStatementsTest.java index 92969ee35b..e0092993b8 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/PrepareBatchStatementsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/PrepareBatchStatementsTest.java @@ -21,15 +21,16 @@ package org.apache.cassandra.distributed.test; import java.util.List; import java.util.stream.Collectors; -import org.junit.Test; - import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; + +import org.assertj.core.util.Lists; +import org.junit.Test; + import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.distributed.api.ICluster; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.service.StorageService; -import org.assertj.core.util.Lists; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NATIVE_PROTOCOL; diff --git a/test/distributed/org/apache/cassandra/distributed/test/PreparedStatementInvalidationRaceTest.java b/test/distributed/org/apache/cassandra/distributed/test/PreparedStatementInvalidationRaceTest.java index 0a12855753..23af92b8ce 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/PreparedStatementInvalidationRaceTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/PreparedStatementInvalidationRaceTest.java @@ -23,14 +23,16 @@ import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; - import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; + import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.cql3.QueryHandler; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.statements.SelectStatement; diff --git a/test/distributed/org/apache/cassandra/distributed/test/PreparedStatementInvalidationTest.java b/test/distributed/org/apache/cassandra/distributed/test/PreparedStatementInvalidationTest.java index fe58dc91a9..3044863671 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/PreparedStatementInvalidationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/PreparedStatementInvalidationTest.java @@ -18,10 +18,11 @@ package org.apache.cassandra.distributed.test; -import org.junit.Test; - import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; + +import org.junit.Test; + import org.apache.cassandra.distributed.api.ICluster; import org.apache.cassandra.distributed.api.IInvokableInstance; diff --git a/test/distributed/org/apache/cassandra/distributed/test/PreviewRepairSnapshotTest.java b/test/distributed/org/apache/cassandra/distributed/test/PreviewRepairSnapshotTest.java index 10c7dc187a..de5e4dea4e 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/PreviewRepairSnapshotTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/PreviewRepairSnapshotTest.java @@ -24,6 +24,7 @@ import java.util.HashSet; import java.util.Set; import com.google.common.collect.Sets; + import org.junit.Test; import org.apache.cassandra.Util; diff --git a/test/distributed/org/apache/cassandra/distributed/test/PreviewRepairTest.java b/test/distributed/org/apache/cassandra/distributed/test/PreviewRepairTest.java index 82c81f221d..9a7b6a93a3 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/PreviewRepairTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/PreviewRepairTest.java @@ -35,12 +35,10 @@ import java.util.concurrent.atomic.AtomicInteger; import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.cassandra.Util; -import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.concurrent.Condition; import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; @@ -56,17 +54,19 @@ import org.apache.cassandra.distributed.api.IMessage; import org.apache.cassandra.distributed.api.NodeToolResult; import org.apache.cassandra.distributed.shared.ClusterUtils; import org.apache.cassandra.distributed.shared.RepairResult; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.Verb; -import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.repair.RepairParallelism; import org.apache.cassandra.repair.messages.FinalizePropose; import org.apache.cassandra.repair.messages.RepairMessage; import org.apache.cassandra.repair.messages.RepairOption; import org.apache.cassandra.repair.messages.ValidationRequest; import org.apache.cassandra.service.ActiveRepairService; +import org.apache.cassandra.service.StorageService; import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.concurrent.Condition; import static com.google.common.collect.ImmutableList.of; import static java.util.concurrent.TimeUnit.MINUTES; @@ -78,7 +78,9 @@ import static org.apache.cassandra.distributed.test.PreviewRepairTest.DelayFirst import static org.apache.cassandra.net.Verb.VALIDATION_REQ; import static org.apache.cassandra.service.StorageService.instance; import static org.apache.cassandra.utils.concurrent.Condition.newOneTimeCondition; -import static org.apache.cassandra.utils.progress.ProgressEventType.*; +import static org.apache.cassandra.utils.progress.ProgressEventType.COMPLETE; +import static org.apache.cassandra.utils.progress.ProgressEventType.ERROR; +import static org.apache.cassandra.utils.progress.ProgressEventType.NOTIFICATION; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ProfileLoadTest.java b/test/distributed/org/apache/cassandra/distributed/test/ProfileLoadTest.java index a83ea7cedc..fe27e11b79 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ProfileLoadTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ProfileLoadTest.java @@ -18,18 +18,20 @@ package org.apache.cassandra.distributed.test; -import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.cassandra.distributed.Cluster; -import org.apache.cassandra.distributed.api.ConsistencyLevel; -import org.apache.cassandra.distributed.api.IInvokableInstance; -import org.junit.Assert; -import org.junit.Test; - import java.io.IOException; import java.util.List; import java.util.Random; import java.util.concurrent.TimeUnit; +import com.google.common.util.concurrent.Uninterruptibles; + +import org.junit.Assert; +import org.junit.Test; + +import org.apache.cassandra.distributed.Cluster; +import org.apache.cassandra.distributed.api.ConsistencyLevel; +import org.apache.cassandra.distributed.api.IInvokableInstance; + public class ProfileLoadTest extends TestBaseImpl { @Test diff --git a/test/distributed/org/apache/cassandra/distributed/test/QueriesTableTest.java b/test/distributed/org/apache/cassandra/distributed/test/QueriesTableTest.java index d30220f631..2ca8fe564f 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/QueriesTableTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/QueriesTableTest.java @@ -22,18 +22,21 @@ import java.util.Arrays; import java.util.concurrent.Callable; import java.util.concurrent.CyclicBarrier; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - import com.datastax.driver.core.ConsistencyLevel; import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; + import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.awaitility.Awaitility; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.ReadCommand; @@ -45,7 +48,6 @@ import org.apache.cassandra.distributed.api.Row; import org.apache.cassandra.distributed.api.SimpleQueryResult; import org.apache.cassandra.service.consensus.TransactionalMode; import org.apache.cassandra.utils.Throwables; -import org.awaitility.Awaitility; import static com.google.common.base.Preconditions.checkState; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ReadFailureTest.java b/test/distributed/org/apache/cassandra/distributed/test/ReadFailureTest.java index be8db6c778..a414cd283f 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ReadFailureTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ReadFailureTest.java @@ -21,17 +21,17 @@ package org.apache.cassandra.distributed.test; import org.apache.commons.lang3.exception.ExceptionUtils; import org.junit.Test; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.distributed.Cluster; +import org.apache.cassandra.distributed.api.ConsistencyLevel; +import org.apache.cassandra.distributed.api.ICluster; +import org.apache.cassandra.exceptions.RequestFailureReason; + import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.distributed.api.ICluster; -import org.apache.cassandra.distributed.Cluster; -import org.apache.cassandra.distributed.api.ConsistencyLevel; -import org.apache.cassandra.exceptions.RequestFailureReason; - public class ReadFailureTest extends TestBaseImpl { static final int TOMBSTONE_FAIL_THRESHOLD = 20; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ReadRepairTest.java b/test/distributed/org/apache/cassandra/distributed/test/ReadRepairTest.java index e9db6a9235..14b81dc9ac 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ReadRepairTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ReadRepairTest.java @@ -27,15 +27,18 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.google.common.util.concurrent.FutureCallback; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + import org.apache.cassandra.concurrent.ExecutorFactory; import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.config.DatabaseDescriptor; @@ -61,7 +64,6 @@ import org.apache.cassandra.service.reads.repair.BlockingReadRepair; import org.apache.cassandra.service.reads.repair.ReadRepairStrategy; import org.apache.cassandra.utils.concurrent.Condition; import org.apache.cassandra.utils.concurrent.Future; -import org.checkerframework.checker.nullness.qual.Nullable; import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.cassandra.config.CassandraRelevantProperties.ALLOW_ALTER_RF_DURING_RANGE_MOVEMENT; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ReadRepairTester.java b/test/distributed/org/apache/cassandra/distributed/test/ReadRepairTester.java index a73d9687d3..881cc22a07 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ReadRepairTester.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ReadRepairTester.java @@ -21,6 +21,7 @@ package org.apache.cassandra.distributed.test; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.collect.Iterators; + import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ReadSpeculationTest.java b/test/distributed/org/apache/cassandra/distributed/test/ReadSpeculationTest.java index 98b98aa1e5..63e54bb0b2 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ReadSpeculationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ReadSpeculationTest.java @@ -25,16 +25,16 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.junit.Assert; -import org.junit.Test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Assert; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.concurrent.ScheduledThreadPoolExecutorPlus; import org.apache.cassandra.config.Config; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ReconnectToInternalIPTest.java b/test/distributed/org/apache/cassandra/distributed/test/ReconnectToInternalIPTest.java index 6d798d5aa9..41bd7c1893 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ReconnectToInternalIPTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ReconnectToInternalIPTest.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.awaitility.Awaitility; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; @@ -42,7 +43,6 @@ import org.apache.cassandra.locator.InitialLocationProvider; import org.apache.cassandra.locator.NetworkTopologyProximity; import org.apache.cassandra.locator.SnitchProperties; import org.apache.cassandra.tcm.membership.Location; -import org.awaitility.Awaitility; import static org.apache.cassandra.locator.Ec2LocationProvider.ZONE_NAME_QUERY; import static org.apache.cassandra.locator.Ec2MultiRegionAddressConfig.PRIVATE_IP_QUERY; diff --git a/test/distributed/org/apache/cassandra/distributed/test/RepairBoundaryTest.java b/test/distributed/org/apache/cassandra/distributed/test/RepairBoundaryTest.java index b4b77886d2..8e1f67e89c 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/RepairBoundaryTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/RepairBoundaryTest.java @@ -23,7 +23,6 @@ import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Map; -import org.apache.cassandra.utils.concurrent.Condition; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -31,10 +30,11 @@ import org.junit.Test; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.IInvokableInstance; +import org.apache.cassandra.utils.concurrent.Condition; import static com.google.common.collect.ImmutableList.of; import static java.util.concurrent.TimeUnit.MINUTES; -import static org.apache.cassandra.dht.Murmur3Partitioner.*; +import static org.apache.cassandra.dht.Murmur3Partitioner.LongToken; import static org.apache.cassandra.dht.Murmur3Partitioner.LongToken.keyForToken; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NETWORK; diff --git a/test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorFast.java b/test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorFast.java index 22786f8c81..6a5fd2a5ad 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorFast.java +++ b/test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorFast.java @@ -22,6 +22,7 @@ import java.time.Duration; import java.util.Set; import com.google.common.collect.Iterables; + import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorNeighbourDown.java b/test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorNeighbourDown.java index 1d6060c082..bbdfd8bf25 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorNeighbourDown.java +++ b/test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorNeighbourDown.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/RepairDigestTrackingTest.java b/test/distributed/org/apache/cassandra/distributed/test/RepairDigestTrackingTest.java index 2e1cb4b16d..ff1cd9c14c 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/RepairDigestTrackingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/RepairDigestTrackingTest.java @@ -29,13 +29,15 @@ import java.util.stream.IntStream; import java.util.stream.Stream; import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.Assert; -import org.junit.Test; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.Util; import org.apache.cassandra.concurrent.SEPExecutor; import org.apache.cassandra.config.CassandraRelevantProperties; diff --git a/test/distributed/org/apache/cassandra/distributed/test/RepairErrorsTest.java b/test/distributed/org/apache/cassandra/distributed/test/RepairErrorsTest.java index 7f2ef5ca01..25ec8fde04 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/RepairErrorsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/RepairErrorsTest.java @@ -27,6 +27,7 @@ import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + import org.assertj.core.api.Assertions; import org.junit.Test; @@ -46,16 +47,15 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.RangesAtEndpoint; -import org.apache.cassandra.streaming.StreamSession; import org.apache.cassandra.service.ActiveRepairService; +import org.apache.cassandra.streaming.StreamSession; import org.apache.cassandra.utils.TimeUUID; import static net.bytebuddy.matcher.ElementMatchers.named; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NETWORK; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class RepairErrorsTest extends TestBaseImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/RepairOperationalTest.java b/test/distributed/org/apache/cassandra/distributed/test/RepairOperationalTest.java index 9eccb45ac6..d2e9a985b3 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/RepairOperationalTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/RepairOperationalTest.java @@ -20,18 +20,19 @@ package org.apache.cassandra.distributed.test; import java.io.IOException; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.assertj.core.api.Assertions; +import org.junit.Test; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.locator.MetaStrategy; -import org.assertj.core.api.Assertions; import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; diff --git a/test/distributed/org/apache/cassandra/distributed/test/RepairTest.java b/test/distributed/org/apache/cassandra/distributed/test/RepairTest.java index 857c05eeb4..cd50ce9f8f 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/RepairTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/RepairTest.java @@ -26,19 +26,19 @@ import java.util.function.Consumer; import com.google.common.collect.ImmutableMap; -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.distributed.shared.ClusterUtils; -import org.apache.cassandra.utils.concurrent.Condition; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ICluster; import org.apache.cassandra.distributed.api.IInstanceConfig; import org.apache.cassandra.distributed.api.IInvokableInstance; +import org.apache.cassandra.distributed.shared.ClusterUtils; import org.apache.cassandra.service.StorageService; +import org.apache.cassandra.utils.concurrent.Condition; import static com.google.common.collect.ImmutableList.of; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ReprepareFuzzTest.java b/test/distributed/org/apache/cassandra/distributed/test/ReprepareFuzzTest.java index 9988234743..1f90acb59d 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ReprepareFuzzTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ReprepareFuzzTest.java @@ -30,19 +30,21 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.PreparedStatementHelper; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.exceptions.InvalidQueryException; + +import net.bytebuddy.ByteBuddy; +import net.bytebuddy.dynamic.DynamicType; +import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; +import net.bytebuddy.implementation.MethodDelegation; + import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.datastax.driver.core.PreparedStatement; -import com.datastax.driver.core.PreparedStatementHelper; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.exceptions.InvalidQueryException; -import net.bytebuddy.ByteBuddy; -import net.bytebuddy.dynamic.DynamicType; -import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; -import net.bytebuddy.implementation.MethodDelegation; import org.apache.cassandra.cql3.QueryHandler.Prepared; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.db.SystemKeyspace; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ReprepareNewBehaviourTest.java b/test/distributed/org/apache/cassandra/distributed/test/ReprepareNewBehaviourTest.java index 9023e1e957..6c1c033e52 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ReprepareNewBehaviourTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ReprepareNewBehaviourTest.java @@ -18,12 +18,13 @@ package org.apache.cassandra.distributed.test; -import org.junit.Assert; -import org.junit.Test; - import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; + +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.distributed.api.ICluster; import org.apache.cassandra.distributed.api.IInvokableInstance; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ReprepareOldBehaviourTest.java b/test/distributed/org/apache/cassandra/distributed/test/ReprepareOldBehaviourTest.java index 2139485161..28a44c38f4 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ReprepareOldBehaviourTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ReprepareOldBehaviourTest.java @@ -18,10 +18,11 @@ package org.apache.cassandra.distributed.test; -import org.junit.Test; - import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; + +import org.junit.Test; + import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.distributed.api.ICluster; import org.apache.cassandra.distributed.api.IInvokableInstance; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ReprepareTestBase.java b/test/distributed/org/apache/cassandra/distributed/test/ReprepareTestBase.java index 31b3aed249..7561002c96 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ReprepareTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ReprepareTestBase.java @@ -26,9 +26,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.BiConsumer; -import com.google.common.collect.Iterators; -import org.junit.Assert; - import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Host; import com.datastax.driver.core.HostDistance; @@ -37,10 +34,15 @@ import com.datastax.driver.core.Session; import com.datastax.driver.core.Statement; import com.datastax.driver.core.exceptions.DriverInternalError; import com.datastax.driver.core.policies.LoadBalancingPolicy; +import com.google.common.collect.Iterators; + import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.FixedValue; import net.bytebuddy.implementation.MethodDelegation; + +import org.junit.Assert; + import org.apache.cassandra.cql3.QueryHandler; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.distributed.api.ICluster; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ResourceLeakTest.java b/test/distributed/org/apache/cassandra/distributed/test/ResourceLeakTest.java index b0dd6c7baa..40458a64f5 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ResourceLeakTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ResourceLeakTest.java @@ -26,22 +26,24 @@ import java.sql.Date; import java.text.SimpleDateFormat; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; + import javax.management.MBeanServer; import javax.management.MBeanServerConnection; import javax.management.remote.JMXConnector; -import org.apache.cassandra.distributed.shared.Uninterruptibles; -import org.apache.cassandra.distributed.shared.InstanceClassLoader; +import com.sun.management.HotSpotDiagnosticMXBean; + import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; -import com.sun.management.HotSpotDiagnosticMXBean; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.IInstanceConfig; import org.apache.cassandra.distributed.api.IInvokableInstance; +import org.apache.cassandra.distributed.shared.InstanceClassLoader; import org.apache.cassandra.distributed.shared.JMXUtil; +import org.apache.cassandra.distributed.shared.Uninterruptibles; import org.apache.cassandra.io.util.File; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/distributed/org/apache/cassandra/distributed/test/SSTableIdGenerationTest.java b/test/distributed/org/apache/cassandra/distributed/test/SSTableIdGenerationTest.java index 75b0806899..89e8161f97 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/SSTableIdGenerationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/SSTableIdGenerationTest.java @@ -28,7 +28,10 @@ import java.util.function.Function; import java.util.stream.Collectors; import com.google.common.collect.ImmutableSet; + import org.apache.commons.io.FileUtils; +import org.assertj.core.api.Assertions; +import org.assertj.core.data.Offset; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -58,8 +61,6 @@ import org.apache.cassandra.service.snapshot.SnapshotOptions; import org.apache.cassandra.service.snapshot.TableSnapshot; import org.apache.cassandra.tools.SystemExitException; import org.apache.cassandra.utils.TimeUUID; -import org.assertj.core.api.Assertions; -import org.assertj.core.data.Offset; import static java.lang.String.format; import static org.apache.cassandra.Util.bulkLoadSSTables; diff --git a/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java b/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java index 305788f30b..43bed87309 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.List; import com.google.common.collect.ImmutableMap; + import org.apache.commons.io.FileUtils; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -34,18 +35,17 @@ import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.io.util.File; +import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tools.BulkLoader; import org.apache.cassandra.tools.ToolRunner; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.NativeSSTableLoaderClient; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; - import static com.google.common.collect.Lists.transform; -import static org.apache.cassandra.distributed.test.ExecUtil.rethrow; import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows; import static org.apache.cassandra.distributed.shared.AssertUtils.row; +import static org.apache.cassandra.distributed.test.ExecUtil.rethrow; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; public class SSTableLoaderEncryptionOptionsTest extends AbstractEncryptionOptionsImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/SSTableReadLogsQueryTest.java b/test/distributed/org/apache/cassandra/distributed/test/SSTableReadLogsQueryTest.java index 1336c10e8e..db1055efc9 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/SSTableReadLogsQueryTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/SSTableReadLogsQueryTest.java @@ -19,12 +19,13 @@ package org.apache.cassandra.distributed.test; import org.junit.Test; -import static org.junit.Assert.assertEquals; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.distributed.Cluster; +import static org.junit.Assert.assertEquals; + public class SSTableReadLogsQueryTest extends TestBaseImpl { @Test diff --git a/test/distributed/org/apache/cassandra/distributed/test/SSTableSkippingReadTest.java b/test/distributed/org/apache/cassandra/distributed/test/SSTableSkippingReadTest.java index 84b90c7331..ed1098b4fa 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/SSTableSkippingReadTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/SSTableSkippingReadTest.java @@ -26,9 +26,9 @@ import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.io.sstable.format.SSTableReader; +import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL; import static org.apache.cassandra.distributed.shared.AssertUtils.assertEquals; import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows; -import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL; public class SSTableSkippingReadTest extends TestBaseImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/SchemaDisagreementTest.java b/test/distributed/org/apache/cassandra/distributed/test/SchemaDisagreementTest.java index ba4edc4ae9..f7bf8dddf9 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/SchemaDisagreementTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/SchemaDisagreementTest.java @@ -22,8 +22,8 @@ import org.junit.Test; import org.apache.cassandra.distributed.Cluster; -import static org.apache.cassandra.distributed.api.Feature.NETWORK; import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL; +import static org.apache.cassandra.distributed.api.Feature.NETWORK; public class SchemaDisagreementTest extends TestBaseImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/SchemaTest.java b/test/distributed/org/apache/cassandra/distributed/test/SchemaTest.java index 7a09d94fdf..2df2aa52f9 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/SchemaTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/SchemaTest.java @@ -20,6 +20,8 @@ package org.apache.cassandra.distributed.test; import java.util.concurrent.Callable; +import org.awaitility.Awaitility; +import org.awaitility.core.ConditionFactory; import org.junit.Test; import org.apache.cassandra.distributed.Cluster; @@ -30,8 +32,6 @@ import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.transformations.AlterSchema; -import org.awaitility.Awaitility; -import org.awaitility.core.ConditionFactory; import static java.time.Duration.ofSeconds; import static org.apache.cassandra.distributed.shared.ClusterUtils.pauseAfterEnacting; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ShortReadProtectionTest.java b/test/distributed/org/apache/cassandra/distributed/test/ShortReadProtectionTest.java index 2586531a4f..559f897510 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ShortReadProtectionTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ShortReadProtectionTest.java @@ -29,6 +29,7 @@ import java.util.function.Function; import java.util.stream.IntStream; import com.google.common.collect.ImmutableList; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; diff --git a/test/distributed/org/apache/cassandra/distributed/test/SimpleReadWriteTest.java b/test/distributed/org/apache/cassandra/distributed/test/SimpleReadWriteTest.java index 727812141b..f53bbb95a6 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/SimpleReadWriteTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/SimpleReadWriteTest.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.collect.Iterators; + import org.apache.commons.lang3.ArrayUtils; import org.junit.After; import org.junit.AfterClass; diff --git a/test/distributed/org/apache/cassandra/distributed/test/SnapshotsTest.java b/test/distributed/org/apache/cassandra/distributed/test/SnapshotsTest.java index 4d2c42bcb6..a0ab20b0d7 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/SnapshotsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/SnapshotsTest.java @@ -55,10 +55,10 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.toList; import static org.apache.cassandra.config.CassandraRelevantProperties.SNAPSHOT_MANIFEST_ENRICH_OR_CREATE_ENABLED; import static org.apache.cassandra.distributed.shared.ClusterUtils.stopUnchecked; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.apache.cassandra.schema.SchemaConstants.LOCAL_SYSTEM_KEYSPACE_NAMES; import static org.apache.cassandra.schema.SchemaConstants.REPLICATED_SYSTEM_KEYSPACE_NAMES; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/test/distributed/org/apache/cassandra/distributed/test/StreamPrepareFailTest.java b/test/distributed/org/apache/cassandra/distributed/test/StreamPrepareFailTest.java index 2553d83e73..d9240a002d 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/StreamPrepareFailTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/StreamPrepareFailTest.java @@ -20,11 +20,12 @@ package org.apache.cassandra.distributed.test; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.streaming.StreamSession; diff --git a/test/distributed/org/apache/cassandra/distributed/test/StreamingTest.java b/test/distributed/org/apache/cassandra/distributed/test/StreamingTest.java index 72fd7f9e2c..3550b3ccf5 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/StreamingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/StreamingTest.java @@ -31,6 +31,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; + import org.junit.Assert; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/StreamsDiskSpaceTest.java b/test/distributed/org/apache/cassandra/distributed/test/StreamsDiskSpaceTest.java index 5d72660fe1..f2a20fdf8e 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/StreamsDiskSpaceTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/StreamsDiskSpaceTest.java @@ -22,18 +22,19 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import org.apache.cassandra.io.util.File; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.junit.Test; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.compaction.ActiveCompactions; import org.apache.cassandra.db.compaction.CompactionStrategyManager; import org.apache.cassandra.distributed.Cluster; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.streaming.StreamManager; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/test/distributed/org/apache/cassandra/distributed/test/TableEstimatesTest.java b/test/distributed/org/apache/cassandra/distributed/test/TableEstimatesTest.java index 7d01e4304e..713e1e97bc 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/TableEstimatesTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/TableEstimatesTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.distributed.test; import java.io.IOException; +import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.Assume; import org.junit.BeforeClass; @@ -29,7 +30,6 @@ import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.IInstance; import org.apache.cassandra.distributed.api.QueryResult; -import org.assertj.core.api.Assertions; /** * @see org.apache.cassandra.tools.nodetool.RefreshSizeEstimates diff --git a/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java b/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java index 1f76eda33e..7e91f5a7fb 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java +++ b/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java @@ -39,13 +39,16 @@ import java.util.stream.Collectors; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFutureTask; + +import net.openhft.chronicle.core.util.SerializablePredicate; + import org.junit.After; import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.messages.NoWaitRequest; -import net.openhft.chronicle.core.util.SerializablePredicate; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.Duration; diff --git a/test/distributed/org/apache/cassandra/distributed/test/TopPartitionsTest.java b/test/distributed/org/apache/cassandra/distributed/test/TopPartitionsTest.java index 9df6726c6f..12270806ba 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/TopPartitionsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/TopPartitionsTest.java @@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -39,7 +40,6 @@ import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.NodeToolResult; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NETWORK; diff --git a/test/distributed/org/apache/cassandra/distributed/test/TopologyChangeTest.java b/test/distributed/org/apache/cassandra/distributed/test/TopologyChangeTest.java index 0fff01c659..bc61c9ac10 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/TopologyChangeTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/TopologyChangeTest.java @@ -26,13 +26,14 @@ import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; +import com.datastax.driver.core.Host; +import com.datastax.driver.core.Session; + import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import com.datastax.driver.core.Host; -import com.datastax.driver.core.Session; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.impl.INodeProvisionStrategy.Strategy; diff --git a/test/distributed/org/apache/cassandra/distributed/test/TransientRangeMovementTest.java b/test/distributed/org/apache/cassandra/distributed/test/TransientRangeMovementTest.java index 7f1759ae98..72103bf9c8 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/TransientRangeMovementTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/TransientRangeMovementTest.java @@ -30,6 +30,7 @@ import java.util.concurrent.ExecutionException; import java.util.function.Function; import com.google.common.collect.Sets; + import org.junit.Test; import org.apache.cassandra.distributed.Cluster; diff --git a/test/distributed/org/apache/cassandra/distributed/test/UnableToParseClientMessageFromBlockedSubnetTest.java b/test/distributed/org/apache/cassandra/distributed/test/UnableToParseClientMessageFromBlockedSubnetTest.java index 27dcd2c7ea..e3ba98f493 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/UnableToParseClientMessageFromBlockedSubnetTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/UnableToParseClientMessageFromBlockedSubnetTest.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.concurrent.TimeoutException; import com.google.common.collect.ImmutableMap; + +import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -42,7 +44,6 @@ import org.apache.cassandra.transport.Message; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.transport.SimpleClient; import org.apache.cassandra.transport.messages.ErrorMessage; -import org.assertj.core.api.Assertions; @RunWith(Parameterized.class) public class UnableToParseClientMessageFromBlockedSubnetTest extends TestBaseImpl diff --git a/test/distributed/org/apache/cassandra/distributed/test/UnableToParseClientMessageTest.java b/test/distributed/org/apache/cassandra/distributed/test/UnableToParseClientMessageTest.java index 62969f03cf..2e2bce9611 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/UnableToParseClientMessageTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/UnableToParseClientMessageTest.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Objects; import java.util.function.Predicate; +import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -31,8 +32,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.distributed.Cluster; @@ -46,7 +45,9 @@ import org.apache.cassandra.transport.Message; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.transport.SimpleClient; import org.apache.cassandra.transport.messages.OptionsMessage; -import org.assertj.core.api.Assertions; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; /** * If a client sends a message that can not be parsed by the server then we need to detect this and update metrics diff --git a/test/distributed/org/apache/cassandra/distributed/test/UnifiedCompactionDensitiesTest.java b/test/distributed/org/apache/cassandra/distributed/test/UnifiedCompactionDensitiesTest.java index 4ba721cdca..984d0a7d33 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/UnifiedCompactionDensitiesTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/UnifiedCompactionDensitiesTest.java @@ -21,8 +21,8 @@ package org.apache.cassandra.distributed.test; import java.io.IOException; import java.util.LongSummaryStatistics; +import org.hamcrest.Matchers; import org.junit.Test; - import org.slf4j.LoggerFactory; import org.apache.cassandra.db.ColumnFamilyStore; @@ -31,7 +31,6 @@ import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.utils.FBUtilities; -import org.hamcrest.Matchers; import static org.apache.cassandra.cql3.TombstonesWithIndexedSSTableTest.makeRandomString; import static org.junit.Assert.assertThat; diff --git a/test/distributed/org/apache/cassandra/distributed/test/UpdateSystemAuthAfterDCExpansionTest.java b/test/distributed/org/apache/cassandra/distributed/test/UpdateSystemAuthAfterDCExpansionTest.java index 1074fe8368..781f93cca4 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/UpdateSystemAuthAfterDCExpansionTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/UpdateSystemAuthAfterDCExpansionTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.distributed.test; import java.util.Collections; import com.google.common.collect.ImmutableList; + import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; diff --git a/test/distributed/org/apache/cassandra/distributed/test/UpgradeSSTablesTest.java b/test/distributed/org/apache/cassandra/distributed/test/UpgradeSSTablesTest.java index 0e25d5d0e6..e9919d7b91 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/UpgradeSSTablesTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/UpgradeSSTablesTest.java @@ -24,13 +24,14 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.junit.Assert; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.compaction.ActiveCompactions; diff --git a/test/distributed/org/apache/cassandra/distributed/test/VirtualTableFromInternodeTest.java b/test/distributed/org/apache/cassandra/distributed/test/VirtualTableFromInternodeTest.java index 229dd96277..250009c811 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/VirtualTableFromInternodeTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/VirtualTableFromInternodeTest.java @@ -22,6 +22,7 @@ import java.util.HashSet; import java.util.Set; import com.google.common.collect.ImmutableSet; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/VirtualTableLogsTest.java b/test/distributed/org/apache/cassandra/distributed/test/VirtualTableLogsTest.java index bf9f58123e..c53c8dd987 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/VirtualTableLogsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/VirtualTableLogsTest.java @@ -23,7 +23,6 @@ import java.util.List; import org.junit.Test; -import ch.qos.logback.classic.Level; import org.apache.cassandra.db.virtual.LogMessagesTable; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.Constants; @@ -33,6 +32,8 @@ import org.apache.cassandra.distributed.shared.WithProperties; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.utils.logging.VirtualTableAppender; +import ch.qos.logback.classic.Level; + import static java.lang.String.format; import static org.apache.cassandra.config.CassandraRelevantProperties.LOGBACK_CONFIGURATION_FILE; import static org.apache.cassandra.db.virtual.LogMessagesTable.LEVEL_COLUMN_NAME; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordBootstrapTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordBootstrapTest.java index 131bdfca3f..1548e1e512 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordBootstrapTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordBootstrapTest.java @@ -34,6 +34,7 @@ import accord.primitives.RoutingKeys; import accord.primitives.Timestamp; import accord.topology.EpochReady; import accord.topology.TopologyManager; + import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.dht.Range; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordBootstrapTestBase.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordBootstrapTestBase.java index 8e1d28d070..cf1bc3efa9 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordBootstrapTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordBootstrapTestBase.java @@ -21,11 +21,13 @@ package org.apache.cassandra.distributed.test.accord; import java.util.concurrent.TimeUnit; import java.util.function.Function; +import org.assertj.core.api.Assertions; import org.junit.Assert; import accord.topology.EpochReady; import accord.topology.TopologyManager; import accord.utils.async.AsyncResult; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.dht.IPartitioner; @@ -43,7 +45,6 @@ import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.service.accord.AccordService.toFuture; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordCQLTestBase.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordCQLTestBase.java index f3c7fceede..dbf6d6553f 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordCQLTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordCQLTestBase.java @@ -40,6 +40,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -50,19 +51,19 @@ import accord.primitives.Unseekables; import accord.topology.SelectShards; import accord.topology.Topologies; import accord.topology.TopologyException; + import org.apache.cassandra.config.Config.PaxosVariant; import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.cql3.ast.Symbol; import org.apache.cassandra.cql3.ast.AssignmentOperator; import org.apache.cassandra.cql3.ast.Literal; import org.apache.cassandra.cql3.ast.Mutation; import org.apache.cassandra.cql3.ast.Reference; import org.apache.cassandra.cql3.ast.Select; import org.apache.cassandra.cql3.ast.Statement; +import org.apache.cassandra.cql3.ast.Symbol; import org.apache.cassandra.cql3.ast.Txn; import org.apache.cassandra.cql3.functions.types.utils.Bytes; import org.apache.cassandra.cql3.statements.TransactionStatement; -import org.apache.cassandra.distributed.util.QueryResultUtil; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.ListType; import org.apache.cassandra.db.marshal.MapType; @@ -76,6 +77,7 @@ import org.apache.cassandra.distributed.api.QueryResults; import org.apache.cassandra.distributed.api.SimpleQueryResult; import org.apache.cassandra.distributed.shared.AssertUtils; import org.apache.cassandra.distributed.test.sai.SAIUtil; +import org.apache.cassandra.distributed.util.QueryResultUtil; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.service.accord.AccordService; import org.apache.cassandra.service.accord.AccordTestUtils; @@ -85,7 +87,6 @@ import org.apache.cassandra.utils.AssertionUtils; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FailingConsumer; import org.apache.cassandra.utils.Pair; -import org.assertj.core.api.Assertions; import static java.lang.String.format; import static java.util.Collections.singletonList; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordCommandStoreTryExecuteListeningTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordCommandStoreTryExecuteListeningTest.java index ea7e0d871d..8639e87db1 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordCommandStoreTryExecuteListeningTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordCommandStoreTryExecuteListeningTest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.distributed.test.accord; +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.api.Journal; @@ -41,6 +42,7 @@ import accord.primitives.TxnId; import accord.topology.TopologyException; import accord.utils.ImmutableBitSet; import accord.utils.LargeBitSet; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.dht.IPartitioner; @@ -55,7 +57,6 @@ import org.apache.cassandra.service.accord.AccordService; import org.apache.cassandra.service.accord.api.PartitionKey; import org.apache.cassandra.service.accord.serializers.ResultSerializers; import org.apache.cassandra.utils.ByteBufferUtil; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NETWORK; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordDropTableBase.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordDropTableBase.java index a71e779b3c..927f6a5016 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordDropTableBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordDropTableBase.java @@ -20,6 +20,8 @@ package org.apache.cassandra.distributed.test.accord; import com.google.common.base.Throwables; +import org.assertj.core.api.Assertions; + import accord.api.RoutingKey; import accord.local.CommandStores; import accord.local.LoadKeys; @@ -30,6 +32,7 @@ import accord.primitives.Ranges; import accord.primitives.Routable; import accord.primitives.Txn; import accord.primitives.TxnId; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.ICoordinator; @@ -43,7 +46,6 @@ import org.apache.cassandra.service.accord.AccordSafeCommandStore; import org.apache.cassandra.service.accord.AccordSafeCommandsForKey; import org.apache.cassandra.service.accord.AccordService; import org.apache.cassandra.service.accord.TokenRange; -import org.assertj.core.api.Assertions; import static accord.local.LoadKeysFor.READ_WRITE; import static org.apache.cassandra.config.DatabaseDescriptor.getPartitioner; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordFeatureFlagTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordFeatureFlagTest.java index 133d2659a8..6d850e2bce 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordFeatureFlagTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordFeatureFlagTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.distributed.test.accord; import java.io.IOException; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.distributed.Cluster; @@ -27,7 +28,6 @@ import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.utils.AssertionUtils; -import org.assertj.core.api.Assertions; public class AccordFeatureFlagTest extends TestBaseImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordIncrementalRepairTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordIncrementalRepairTest.java index bbb8a7f4cb..2810407087 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordIncrementalRepairTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordIncrementalRepairTest.java @@ -22,7 +22,18 @@ import java.util.Collection; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; + import javax.annotation.Nullable; + +import com.google.common.collect.Iterables; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import accord.local.Node; import accord.local.SafeCommand; import accord.local.StoreParticipants; @@ -37,7 +48,7 @@ import accord.primitives.Timestamp; import accord.primitives.TxnId; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncResult; -import com.google.common.collect.Iterables; + import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.ColumnFamilyStore; @@ -60,13 +71,6 @@ import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.service.consensus.TransactionalMode; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Clock; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import static java.lang.String.format; import static org.apache.cassandra.distributed.test.accord.AccordTestBase.executeWithRetry; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordInteroperabilityTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordInteroperabilityTest.java index d38f07ef9b..6ef73555c7 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordInteroperabilityTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordInteroperabilityTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.distributed.test.accord; import java.io.IOException; import java.util.function.Function; +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; @@ -33,7 +34,6 @@ import org.apache.cassandra.distributed.shared.AssertUtils; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.service.accord.IAccordService; import org.apache.cassandra.utils.AssertionUtils; -import org.assertj.core.api.Assertions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordJournalIntegrationTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordJournalIntegrationTest.java index d0d3db5e01..c1bd8d6b48 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordJournalIntegrationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordJournalIntegrationTest.java @@ -24,13 +24,13 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.cassandra.distributed.api.IInvokableInstance; import org.junit.Assert; import org.junit.Test; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; +import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.shared.ClusterUtils; import org.apache.cassandra.distributed.shared.WithProperties; import org.apache.cassandra.distributed.test.TestBaseImpl; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordLoadTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordLoadTest.java index be260c352f..e878607535 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordLoadTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordLoadTest.java @@ -36,6 +36,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.util.concurrent.RateLimiter; + import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMetricsTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMetricsTest.java index 9efb7bb035..897c0d0e6d 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMetricsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMetricsTest.java @@ -26,6 +26,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.function.Function; +import org.assertj.core.api.Assertions; +import org.assertj.core.data.Offset; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -35,6 +37,7 @@ import org.slf4j.LoggerFactory; import accord.api.ProtocolModifiers; import accord.primitives.TxnId.FastPath; import accord.primitives.TxnId.FastPaths; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.virtual.AccordDebugKeyspace; import org.apache.cassandra.distributed.api.ConsistencyLevel; @@ -55,8 +58,6 @@ import org.apache.cassandra.service.accord.exceptions.AccordReadPreemptedExcepti import org.apache.cassandra.service.accord.exceptions.AccordWritePreemptedException; import org.apache.cassandra.service.consensus.TransactionalMode; import org.apache.cassandra.utils.AssertionUtils; -import org.assertj.core.api.Assertions; -import org.assertj.core.data.Offset; import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationReadRaceTestBase.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationReadRaceTestBase.java index 47e044bf14..de3d854721 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationReadRaceTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationReadRaceTestBase.java @@ -41,6 +41,9 @@ import java.util.stream.Collectors; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; + +import org.assertj.core.api.Assertions; +import org.eclipse.jetty.util.ConcurrentHashSet; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -52,6 +55,7 @@ import accord.coordinate.Coordination; import accord.coordinate.Coordination.CoordinationKind; import accord.primitives.Ranges; import accord.utils.TinyEnumSet; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.Util; import org.apache.cassandra.config.CassandraRelevantProperties; @@ -89,8 +93,6 @@ import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.Throwables.ThrowingRunnable; -import org.assertj.core.api.Assertions; -import org.eclipse.jetty.util.ConcurrentHashSet; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.lang.String.format; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java index 75f01e909a..869fb3487b 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java @@ -29,9 +29,12 @@ import java.util.UUID; import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; + import javax.annotation.Nonnull; +import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.collect.ImmutableList; + import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -39,8 +42,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.yaml.snakeyaml.Yaml; -import com.fasterxml.jackson.core.type.TypeReference; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.Config.PaxosVariant; @@ -96,7 +99,6 @@ import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.JsonUtils; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.PojoToString; -import org.yaml.snakeyaml.Yaml; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.lang.String.format; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationWriteRaceTestBase.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationWriteRaceTestBase.java index a5038ceec3..1f0cf45fc6 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationWriteRaceTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationWriteRaceTestBase.java @@ -35,6 +35,9 @@ import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFutureTask; + +import org.assertj.core.api.Assertions; +import org.eclipse.jetty.util.ConcurrentHashSet; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -51,6 +54,7 @@ import accord.primitives.Ranges; import accord.primitives.Routable.Domain; import accord.primitives.Route; import accord.utils.TinyEnumSet; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.Util; import org.apache.cassandra.batchlog.BatchlogManager; @@ -104,8 +108,6 @@ import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.concurrent.AsyncPromise; import org.apache.cassandra.utils.concurrent.Promise; -import org.assertj.core.api.Assertions; -import org.eclipse.jetty.util.ConcurrentHashSet; import static java.lang.String.format; import static org.apache.cassandra.Util.expectException; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMoveTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMoveTest.java index 930d3c67e7..4d600f0c71 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMoveTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMoveTest.java @@ -25,6 +25,7 @@ import org.junit.Test; import accord.primitives.RoutingKeys; import accord.primitives.Timestamp; + import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.DecoratedKey; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordNodetoolTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordNodetoolTest.java index 5502f7fe5d..2ceaec63e7 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordNodetoolTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordNodetoolTest.java @@ -23,17 +23,18 @@ import java.util.HashMap; import java.util.Map; import com.google.common.collect.ImmutableSet; + import org.junit.Test; import accord.local.Node; -import org.apache.cassandra.tcm.ClusterMetadata; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.test.TestBaseImpl; +import org.apache.cassandra.tcm.ClusterMetadata; - -import static org.junit.Assert.assertEquals; import static org.apache.cassandra.distributed.shared.ClusterUtils.getNodeId; +import static org.junit.Assert.assertEquals; public class AccordNodetoolTest extends TestBaseImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordReadInteroperabilityTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordReadInteroperabilityTest.java index f01ff612fd..f7bee99fdf 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordReadInteroperabilityTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordReadInteroperabilityTest.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; + import javax.annotation.Nonnull; import org.junit.After; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordRecoverFromAvailabilityLossTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordRecoverFromAvailabilityLossTest.java index fd223de906..79cf938c7e 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordRecoverFromAvailabilityLossTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordRecoverFromAvailabilityLossTest.java @@ -33,6 +33,7 @@ import accord.primitives.RoutingKeys; import accord.primitives.Timestamp; import accord.topology.EpochReady; import accord.topology.TopologyManager; + import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.dht.Range; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordSimpleFastPathTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordSimpleFastPathTest.java index 01632f1cd3..909096370d 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordSimpleFastPathTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordSimpleFastPathTest.java @@ -23,28 +23,29 @@ import java.util.Comparator; import java.util.HashSet; import java.util.Set; -import accord.topology.TopologyManager; -import org.apache.cassandra.service.accord.AccordFastPath; -import org.apache.cassandra.tcm.ClusterMetadataService; -import org.apache.cassandra.tcm.Epoch; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.service.consensus.TransactionalMode; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import accord.local.Node; import accord.topology.Topology; +import accord.topology.TopologyManager; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.service.accord.AccordFastPath; import org.apache.cassandra.service.accord.AccordService; +import org.apache.cassandra.service.consensus.TransactionalMode; import org.apache.cassandra.tcm.ClusterMetadata; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.cassandra.tcm.ClusterMetadataService; +import org.apache.cassandra.tcm.Epoch; +import org.apache.cassandra.utils.FBUtilities; public class AccordSimpleFastPathTest extends TestBaseImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTestBase.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTestBase.java index 47db6443d0..8613f8beef 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTestBase.java @@ -32,11 +32,19 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; + import javax.annotation.Nullable; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; + +import net.bytebuddy.ByteBuddy; +import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; +import net.bytebuddy.implementation.MethodDelegation; +import net.bytebuddy.implementation.bind.annotation.SuperCall; +import net.bytebuddy.implementation.bind.annotation.This; + import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -51,11 +59,7 @@ import accord.primitives.KeyRoute; import accord.primitives.Routable.Domain; import accord.primitives.Route; import accord.primitives.TxnId; -import net.bytebuddy.ByteBuddy; -import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; -import net.bytebuddy.implementation.MethodDelegation; -import net.bytebuddy.implementation.bind.annotation.SuperCall; -import net.bytebuddy.implementation.bind.annotation.This; + import org.apache.cassandra.Util; import org.apache.cassandra.batchlog.BatchlogManager; import org.apache.cassandra.cql3.CQLStatement; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTimestampPreservationTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTimestampPreservationTest.java index 58b0825137..f68feb7a74 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTimestampPreservationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTimestampPreservationTest.java @@ -18,7 +18,17 @@ package org.apache.cassandra.distributed.test.accord; +import java.io.IOException; +import java.nio.ByteBuffer; + import com.google.common.collect.ImmutableList; + +import org.junit.After; +import org.junit.BeforeClass; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; @@ -37,14 +47,6 @@ import org.apache.cassandra.locator.ReplicaPlans; import org.apache.cassandra.service.StorageProxy; import org.apache.cassandra.service.consensus.migration.ConsensusKeyMigrationState; import org.apache.cassandra.service.consensus.migration.ConsensusRequestRouter; -import org.junit.After; -import org.junit.BeforeClass; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.nio.ByteBuffer; import static java.lang.String.format; import static org.apache.cassandra.Util.spinAssertEquals; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordWriteInteroperabilityTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordWriteInteroperabilityTest.java index e2ea2ef8e3..b2302bb69f 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordWriteInteroperabilityTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordWriteInteroperabilityTest.java @@ -25,9 +25,11 @@ import java.util.Collections; import java.util.List; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; + import javax.annotation.Nonnull; import com.google.common.collect.ImmutableList; + import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/InteropTokenRangeTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/InteropTokenRangeTest.java index 202fdb2c87..4a14b18ecd 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/InteropTokenRangeTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/InteropTokenRangeTest.java @@ -27,9 +27,12 @@ import java.util.Collections; import java.util.List; import java.util.NavigableSet; import java.util.TreeSet; + import javax.annotation.Nullable; import com.google.common.collect.Sets; + +import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -43,7 +46,6 @@ import org.apache.cassandra.distributed.api.ICoordinator; import org.apache.cassandra.distributed.api.QueryResult; import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.service.consensus.TransactionalMode; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.dht.Murmur3Partitioner.LongToken.keyForToken; import static org.apache.cassandra.distributed.api.ConsistencyLevel.QUORUM; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/NewSchemaTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/NewSchemaTest.java index 4a6fab41fe..4a4fe659a5 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/NewSchemaTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/NewSchemaTest.java @@ -23,6 +23,7 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.List; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; @@ -32,7 +33,6 @@ import org.apache.cassandra.cql3.ast.Select; import org.apache.cassandra.cql3.ast.Txn; import org.apache.cassandra.distributed.api.SimpleQueryResult; import org.apache.cassandra.service.accord.AccordService; -import org.assertj.core.api.Assertions; import static java.util.function.UnaryOperator.identity; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/journal/AccordJournalReplayTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/journal/AccordJournalReplayTest.java index ba11a39a69..4c9f77f628 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/journal/AccordJournalReplayTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/journal/AccordJournalReplayTest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.distributed.test.accord.journal; +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.api.Journal; @@ -46,6 +47,7 @@ import accord.primitives.Writes; import accord.topology.TopologyException; import accord.utils.ImmutableBitSet; import accord.utils.LargeBitSet; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DecoratedKey; @@ -63,7 +65,6 @@ import org.apache.cassandra.service.accord.AccordTestUtils; import org.apache.cassandra.service.accord.api.PartitionKey; import org.apache.cassandra.service.accord.serializers.ResultSerializers; import org.apache.cassandra.utils.ByteBufferUtil; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.Util.spinUntilTrue; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/journal/JournalAccessRouteIndexOnStartupRaceTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/journal/JournalAccessRouteIndexOnStartupRaceTest.java index 039bfde51c..4a0a9cafde 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/journal/JournalAccessRouteIndexOnStartupRaceTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/journal/JournalAccessRouteIndexOnStartupRaceTest.java @@ -22,18 +22,19 @@ import java.io.IOException; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import net.bytebuddy.ByteBuddy; +import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; +import net.bytebuddy.implementation.MethodDelegation; +import net.bytebuddy.implementation.bind.annotation.SuperCall; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.local.durability.DurabilityService; import accord.primitives.Ranges; import accord.primitives.Timestamp; -import net.bytebuddy.ByteBuddy; -import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; -import net.bytebuddy.implementation.MethodDelegation; -import net.bytebuddy.implementation.bind.annotation.SuperCall; + import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInvokableInstance; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/journal/StatefulJournalRestartTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/journal/StatefulJournalRestartTest.java index acdd4da331..c98a99c745 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/journal/StatefulJournalRestartTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/journal/StatefulJournalRestartTest.java @@ -32,6 +32,7 @@ import accord.primitives.Ranges; import accord.primitives.Timestamp; import accord.utils.Property; import accord.utils.Property.SimpleCommand; + import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInvokableInstance; diff --git a/test/distributed/org/apache/cassandra/distributed/test/auth/AuthAuditLoggingTest.java b/test/distributed/org/apache/cassandra/distributed/test/auth/AuthAuditLoggingTest.java index 6c6ed6ffe1..5dfb75b3d3 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/auth/AuthAuditLoggingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/auth/AuthAuditLoggingTest.java @@ -26,7 +26,10 @@ import java.util.Collections; import java.util.Queue; import java.util.concurrent.TimeUnit; +import com.datastax.driver.core.SSLOptions; +import com.datastax.driver.core.Session; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -34,8 +37,6 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.datastax.driver.core.SSLOptions; -import com.datastax.driver.core.Session; import org.apache.cassandra.audit.AuditLogEntry; import org.apache.cassandra.audit.AuditLogManager; import org.apache.cassandra.audit.InMemoryAuditLogger; diff --git a/test/distributed/org/apache/cassandra/distributed/test/auth/CIDRAuthorizerConfigTest.java b/test/distributed/org/apache/cassandra/distributed/test/auth/CIDRAuthorizerConfigTest.java index 084a85542d..26859e104c 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/auth/CIDRAuthorizerConfigTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/auth/CIDRAuthorizerConfigTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.distributed.test.auth; import java.io.IOException; import com.google.common.collect.ImmutableMap; + import org.junit.Test; import org.apache.cassandra.config.ParameterizedClass; diff --git a/test/distributed/org/apache/cassandra/distributed/test/auth/MutualTlsCertificateValidityPeriodTest.java b/test/distributed/org/apache/cassandra/distributed/test/auth/MutualTlsCertificateValidityPeriodTest.java index b2247b5b4b..3cccccf135 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/auth/MutualTlsCertificateValidityPeriodTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/auth/MutualTlsCertificateValidityPeriodTest.java @@ -28,6 +28,14 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.stream.StreamSupport; +import com.codahale.metrics.Histogram; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.SimpleStatement; + +import org.assertj.core.api.Assertions; +import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -35,11 +43,6 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.codahale.metrics.Histogram; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.SimpleStatement; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.ICluster; @@ -50,8 +53,6 @@ import org.apache.cassandra.metrics.ClearableHistogram; import org.apache.cassandra.metrics.MutualTlsMetrics; import org.apache.cassandra.utils.tls.CertificateBuilder; import org.apache.cassandra.utils.tls.CertificateBundle; -import org.assertj.core.api.Assertions; -import org.assertj.core.api.InstanceOfAssertFactories; import static org.apache.cassandra.transport.TlsTestUtils.CLIENT_SPIFFE_IDENTITY; import static org.apache.cassandra.transport.TlsTestUtils.SERVER_KEYSTORE_PASSWORD; diff --git a/test/distributed/org/apache/cassandra/distributed/test/auth/RoleRevocationTest.java b/test/distributed/org/apache/cassandra/distributed/test/auth/RoleRevocationTest.java index 5b3ae35128..9c39987bde 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/auth/RoleRevocationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/auth/RoleRevocationTest.java @@ -20,12 +20,14 @@ package org.apache.cassandra.distributed.test.auth; import java.util.function.Consumer; -import org.junit.Test; - import com.datastax.driver.core.PlainTextAuthProvider; import com.datastax.driver.core.Session; import com.datastax.driver.core.policies.ConstantReconnectionPolicy; import com.datastax.driver.core.policies.ReconnectionPolicy; + +import org.assertj.core.api.Assertions; +import org.junit.Test; + import org.apache.cassandra.auth.AuthenticatedUser; import org.apache.cassandra.auth.IRoleManager; import org.apache.cassandra.auth.RoleOptions; @@ -39,7 +41,6 @@ import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.test.JavaDriverUtils; import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.service.StorageService; -import org.assertj.core.api.Assertions; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cdc/ToggleCDCOnRepair.java b/test/distributed/org/apache/cassandra/distributed/test/cdc/ToggleCDCOnRepair.java index 0fd09c6828..45b13de640 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cdc/ToggleCDCOnRepair.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cdc/ToggleCDCOnRepair.java @@ -20,7 +20,6 @@ package org.apache.cassandra.distributed.test.cdc; import java.util.function.Consumer; - import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.commitlog.CommitLogSegment; import org.apache.cassandra.distributed.Cluster; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/AccordInteropMultiNodeTableWalkBase.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/AccordInteropMultiNodeTableWalkBase.java index 170d9ea8f6..bee81471f9 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/AccordInteropMultiNodeTableWalkBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/AccordInteropMultiNodeTableWalkBase.java @@ -22,6 +22,7 @@ import javax.annotation.Nullable; import accord.utils.Property; import accord.utils.RandomSource; + import org.apache.cassandra.cql3.KnownIssue; import org.apache.cassandra.cql3.ast.Mutation; import org.apache.cassandra.cql3.ast.Txn; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/AccordInteropMultiNodeTokenConflictBase.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/AccordInteropMultiNodeTokenConflictBase.java index e96675689e..4b6b178798 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/AccordInteropMultiNodeTokenConflictBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/AccordInteropMultiNodeTokenConflictBase.java @@ -20,6 +20,7 @@ package org.apache.cassandra.distributed.test.cql3; import accord.utils.Property; import accord.utils.RandomSource; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.service.consensus.TransactionalMode; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/CasMultiNodeTableWalkBase.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/CasMultiNodeTableWalkBase.java index d812eadec1..3f64462039 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/CasMultiNodeTableWalkBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/CasMultiNodeTableWalkBase.java @@ -20,6 +20,7 @@ package org.apache.cassandra.distributed.test.cql3; import accord.utils.Gen; import accord.utils.RandomSource; + import org.apache.cassandra.config.Config; import org.apache.cassandra.cql3.KnownIssue; import org.apache.cassandra.cql3.ast.CasCondition; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/FullAccordInteropMultiNodeTableWalkTest.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/FullAccordInteropMultiNodeTableWalkTest.java index 3e6468a0a5..6be3c64464 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/FullAccordInteropMultiNodeTableWalkTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/FullAccordInteropMultiNodeTableWalkTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.distributed.test.cql3; import accord.utils.Property; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.service.consensus.TransactionalMode; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/FullAccordInteropMultiNodeTokenConflictTest.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/FullAccordInteropMultiNodeTokenConflictTest.java index 7858d18443..79b29c3fe6 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/FullAccordInteropMultiNodeTokenConflictTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/FullAccordInteropMultiNodeTokenConflictTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.distributed.test.cql3; import accord.utils.Property; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.service.consensus.TransactionalMode; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/MixedReadsAccordInteropMultiNodeTableWalkTest.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/MixedReadsAccordInteropMultiNodeTableWalkTest.java index c4e2a3bcd1..e22e5e27ce 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/MixedReadsAccordInteropMultiNodeTableWalkTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/MixedReadsAccordInteropMultiNodeTableWalkTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.distributed.test.cql3; import accord.utils.Property; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.service.consensus.TransactionalMode; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/MixedReadsAccordInteropMultiNodeTokenConflictTest.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/MixedReadsAccordInteropMultiNodeTokenConflictTest.java index 6d2110b54f..ab0c8f2270 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/MixedReadsAccordInteropMultiNodeTokenConflictTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/MixedReadsAccordInteropMultiNodeTokenConflictTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.distributed.test.cql3; import accord.utils.Property; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.service.consensus.TransactionalMode; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTableWalkBase.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTableWalkBase.java index 126f9ec908..d9fe8ab51d 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTableWalkBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTableWalkBase.java @@ -20,10 +20,12 @@ package org.apache.cassandra.distributed.test.cql3; import java.io.IOException; -import accord.utils.RandomSource; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import accord.utils.RandomSource; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.IInstanceConfig; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTableWalkWithReadRepairTest.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTableWalkWithReadRepairTest.java index a864766871..8921eb35cd 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTableWalkWithReadRepairTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTableWalkWithReadRepairTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.distributed.test.cql3; import accord.utils.Property; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.service.reads.repair.ReadRepairStrategy; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTableWalkWithoutReadRepairTest.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTableWalkWithoutReadRepairTest.java index 5a0ce66ccc..426067e6ec 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTableWalkWithoutReadRepairTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTableWalkWithoutReadRepairTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.distributed.test.cql3; import accord.utils.Property; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.service.reads.repair.ReadRepairStrategy; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTokenConflictTest.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTokenConflictTest.java index 081a200618..b6495906f4 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTokenConflictTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/MultiNodeTokenConflictTest.java @@ -24,6 +24,7 @@ import javax.annotation.Nullable; import accord.utils.Property; import accord.utils.RandomSource; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.IInstanceConfig; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/PaxosV1MultiNodeTableWalkTest.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/PaxosV1MultiNodeTableWalkTest.java index 0cf333d2ab..826923f9e9 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/PaxosV1MultiNodeTableWalkTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/PaxosV1MultiNodeTableWalkTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.distributed.test.cql3; import accord.utils.Property; + import org.apache.cassandra.config.Config; import org.apache.cassandra.distributed.Cluster; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/PaxosV2MultiNodeTableWalkTest.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/PaxosV2MultiNodeTableWalkTest.java index fa098edaac..b1c68740b0 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/PaxosV2MultiNodeTableWalkTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/PaxosV2MultiNodeTableWalkTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.distributed.test.cql3; import accord.utils.Property; + import org.apache.cassandra.config.Config; import org.apache.cassandra.distributed.Cluster; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/SingleNodeTableWalkTest.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/SingleNodeTableWalkTest.java index a463e06bdb..938065467e 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/SingleNodeTableWalkTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/SingleNodeTableWalkTest.java @@ -34,6 +34,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,6 +43,7 @@ import accord.utils.Gen; import accord.utils.Gens; import accord.utils.Property; import accord.utils.RandomSource; + import org.apache.cassandra.cql3.KnownIssue; import org.apache.cassandra.cql3.ast.Bind; import org.apache.cassandra.cql3.ast.Conditional.Where.Inequality; @@ -60,7 +62,6 @@ import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.test.sai.SAIUtil; -import org.apache.cassandra.utils.LoggingCommand; import org.apache.cassandra.harry.model.BytesPartitionState; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.TableMetadata; @@ -72,6 +73,7 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.CassandraGenerators.TableMetadataBuilder; import org.apache.cassandra.utils.Generators; import org.apache.cassandra.utils.ImmutableUniqueList; +import org.apache.cassandra.utils.LoggingCommand; import static accord.utils.Property.commands; import static accord.utils.Property.stateful; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/SingleNodeTokenConflictTest.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/SingleNodeTokenConflictTest.java index 2d27394ac3..7c8665f216 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/SingleNodeTokenConflictTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/SingleNodeTokenConflictTest.java @@ -36,6 +36,7 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; import org.junit.Test; +import org.quicktheories.generators.SourceDSL; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,6 +44,7 @@ import accord.utils.Gen; import accord.utils.Gens; import accord.utils.Property; import accord.utils.RandomSource; + import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.KnownIssue; import org.apache.cassandra.cql3.ast.Conditional.Where.Inequality; @@ -67,7 +69,6 @@ import org.apache.cassandra.utils.AbstractTypeGenerators.TypeSupport; import org.apache.cassandra.utils.CassandraGenerators.TableMetadataBuilder; import org.apache.cassandra.utils.Generators; import org.apache.cassandra.utils.ImmutableUniqueList; -import org.quicktheories.generators.SourceDSL; import static accord.utils.Property.commands; import static accord.utils.Property.stateful; diff --git a/test/distributed/org/apache/cassandra/distributed/test/cql3/StatefulASTBase.java b/test/distributed/org/apache/cassandra/distributed/test/cql3/StatefulASTBase.java index ce43be6373..0771b8f847 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/cql3/StatefulASTBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/cql3/StatefulASTBase.java @@ -30,18 +30,23 @@ import java.util.function.Consumer; import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.annotation.Nullable; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.SocketOptions; import com.google.common.collect.ImmutableList; + +import org.assertj.core.api.Assertions; import org.assertj.core.api.ThrowableAssert; +import org.quicktheories.generators.SourceDSL; import org.slf4j.Logger; import accord.utils.Gen; import accord.utils.Gens; import accord.utils.Property; import accord.utils.RandomSource; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.SocketOptions; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.KnownIssue; @@ -85,8 +90,6 @@ import org.apache.cassandra.utils.AbstractTypeGenerators; import org.apache.cassandra.utils.CassandraGenerators; import org.apache.cassandra.utils.FastByteOperations; import org.apache.cassandra.utils.Generators; -import org.assertj.core.api.Assertions; -import org.quicktheories.generators.SourceDSL; import static accord.utils.Property.ignoreCommand; import static accord.utils.Property.multistep; diff --git a/test/distributed/org/apache/cassandra/distributed/test/fql/FqlReplayDDLExclusionTest.java b/test/distributed/org/apache/cassandra/distributed/test/fql/FqlReplayDDLExclusionTest.java index f3aecd82cc..ebea616dc2 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/fql/FqlReplayDDLExclusionTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/fql/FqlReplayDDLExclusionTest.java @@ -18,11 +18,12 @@ package org.apache.cassandra.distributed.test.fql; +import com.datastax.driver.core.Session; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.datastax.driver.core.Session; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.api.QueryResults; diff --git a/test/distributed/org/apache/cassandra/distributed/test/fql/FqlTombstoneHandlingTest.java b/test/distributed/org/apache/cassandra/distributed/test/fql/FqlTombstoneHandlingTest.java index 45e10ab1b0..afdff6f514 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/fql/FqlTombstoneHandlingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/fql/FqlTombstoneHandlingTest.java @@ -18,27 +18,28 @@ package org.apache.cassandra.distributed.test.fql; +import com.datastax.driver.core.BatchStatement; +import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.Session; import com.google.common.collect.Sets; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.datastax.driver.core.BatchStatement; -import com.datastax.driver.core.PreparedStatement; -import com.datastax.driver.core.Session; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.tools.ToolRunner; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NATIVE_PROTOCOL; import static org.apache.cassandra.distributed.api.Feature.NETWORK; import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows; import static org.apache.cassandra.distributed.shared.AssertUtils.row; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class FqlTombstoneHandlingTest extends TestBaseImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/gossip/GossipExpiryTestBase.java b/test/distributed/org/apache/cassandra/distributed/test/gossip/GossipExpiryTestBase.java index 51d340a70c..79cd431904 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/gossip/GossipExpiryTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/gossip/GossipExpiryTestBase.java @@ -27,14 +27,16 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.awaitility.Awaitility; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.shared.ClusterUtils; @@ -44,7 +46,6 @@ import org.apache.cassandra.gms.GossipExpiryHelper; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.listeners.LegacyStateListener; import org.apache.cassandra.tcm.membership.NodeId; -import org.awaitility.Awaitility; import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.cassandra.config.CassandraRelevantProperties.VERY_LONG_TIME_MS; diff --git a/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailCollectionSizeOnSSTableWriteTest.java b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailCollectionSizeOnSSTableWriteTest.java index 3405185d45..8d12d238e4 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailCollectionSizeOnSSTableWriteTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailCollectionSizeOnSSTableWriteTest.java @@ -20,12 +20,13 @@ package org.apache.cassandra.distributed.test.guardrails; import java.io.IOException; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.SimpleStatement; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.SimpleStatement; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.guardrails.Guardrails; diff --git a/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailDiskUsageTest.java b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailDiskUsageTest.java index fab351a1eb..05962ee6f5 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailDiskUsageTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailDiskUsageTest.java @@ -22,18 +22,21 @@ import java.io.IOException; import java.util.List; import java.util.concurrent.Callable; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.AuthenticationException; import com.datastax.driver.core.exceptions.InvalidQueryException; + import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.assertj.core.api.Assertions; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.Util; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.db.guardrails.Guardrails; @@ -45,7 +48,6 @@ import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.service.disk.usage.DiskUsageBroadcaster; import org.apache.cassandra.service.disk.usage.DiskUsageMonitor; import org.apache.cassandra.service.disk.usage.DiskUsageState; -import org.assertj.core.api.Assertions; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailNonPartitionRestrictedQueryTest.java b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailNonPartitionRestrictedQueryTest.java index 24d13fd025..a9b1361f2c 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailNonPartitionRestrictedQueryTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailNonPartitionRestrictedQueryTest.java @@ -23,15 +23,17 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.exceptions.InvalidQueryException; import com.google.common.util.concurrent.Uninterruptibles; + +import org.awaitility.Awaitility; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.exceptions.InvalidQueryException; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; @@ -48,7 +50,6 @@ import org.apache.cassandra.index.SecondaryIndexManager; import org.apache.cassandra.service.ClientWarn; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.service.reads.thresholds.CoordinatorWarnings; -import org.awaitility.Awaitility; import static com.google.common.collect.Iterables.getOnlyElement; import static org.apache.cassandra.db.ConsistencyLevel.ALL; diff --git a/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailPasswordPolicyTest.java b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailPasswordPolicyTest.java index 51d52e0ccc..31c151f157 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailPasswordPolicyTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailPasswordPolicyTest.java @@ -19,14 +19,16 @@ package org.apache.cassandra.distributed.test.guardrails; import java.util.Map; + import javax.management.Attribute; import javax.management.MBeanServerConnection; import javax.management.ObjectName; import javax.management.remote.JMXConnector; +import com.fasterxml.jackson.core.type.TypeReference; + import org.junit.Test; -import com.fasterxml.jackson.core.type.TypeReference; import org.apache.cassandra.db.guardrails.CassandraPasswordGenerator; import org.apache.cassandra.db.guardrails.CassandraPasswordValidator; import org.apache.cassandra.db.guardrails.CustomGuardrailConfig; diff --git a/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailTester.java b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailTester.java index 376f6a310b..da05380991 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailTester.java +++ b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailTester.java @@ -24,16 +24,17 @@ import java.util.concurrent.atomic.AtomicInteger; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; -import org.apache.cassandra.distributed.util.Auth; + +import org.assertj.core.api.Assertions; +import org.assertj.core.api.ListAssert; import org.junit.After; import org.junit.Before; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInstance; import org.apache.cassandra.distributed.test.TestBaseImpl; +import org.apache.cassandra.distributed.util.Auth; import org.apache.cassandra.exceptions.InvalidRequestException; -import org.assertj.core.api.Assertions; -import org.assertj.core.api.ListAssert; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/test/distributed/org/apache/cassandra/distributed/test/guardrails/IntersectFilteringQueryTest.java b/test/distributed/org/apache/cassandra/distributed/test/guardrails/IntersectFilteringQueryTest.java index cbf0f42fe5..ee056db81a 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/guardrails/IntersectFilteringQueryTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/guardrails/IntersectFilteringQueryTest.java @@ -21,23 +21,23 @@ package org.apache.cassandra.distributed.test.guardrails; import java.io.IOException; import java.util.List; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.exceptions.InvalidQueryException; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.exceptions.InvalidQueryException; import org.apache.cassandra.db.guardrails.Guardrails; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IIsolatedExecutor; import org.apache.cassandra.distributed.test.sai.SAIUtil; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NATIVE_PROTOCOL; import static org.apache.cassandra.distributed.api.Feature.NETWORK; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; public class IntersectFilteringQueryTest extends GuardrailTester { diff --git a/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/FailedBootstrapTest.java b/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/FailedBootstrapTest.java index 3b28c20c69..7b7da0d830 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/FailedBootstrapTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/FailedBootstrapTest.java @@ -25,14 +25,15 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeoutException; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.This; + +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.IInstanceConfig; diff --git a/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/HostReplacementOfDownedClusterTest.java b/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/HostReplacementOfDownedClusterTest.java index 5ed24ad400..4cd43bfc8d 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/HostReplacementOfDownedClusterTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/HostReplacementOfDownedClusterTest.java @@ -25,11 +25,13 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import com.google.monitoring.runtime.instrumentation.common.util.concurrent.Uninterruptibles; + +import org.assertj.core.api.Assertions; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.monitoring.runtime.instrumentation.common.util.concurrent.Uninterruptibles; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.Feature; @@ -40,10 +42,8 @@ import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.gms.EndpointState; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.locator.InetAddressAndPort; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.config.CassandraRelevantProperties.GOSSIPER_QUARANTINE_DELAY; - import static org.apache.cassandra.distributed.shared.ClusterUtils.addInstance; import static org.apache.cassandra.distributed.shared.ClusterUtils.assertNotInRing; import static org.apache.cassandra.distributed.shared.ClusterUtils.assertRingIs; diff --git a/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/HostReplacementTest.java b/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/HostReplacementTest.java index 34520636c6..700ee8b892 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/HostReplacementTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/HostReplacementTest.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +48,6 @@ import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.membership.NodeId; import org.apache.cassandra.tcm.membership.NodeState; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.config.CassandraRelevantProperties.BOOTSTRAP_SKIP_SCHEMA_CHECK; import static org.apache.cassandra.config.CassandraRelevantProperties.GOSSIPER_QUARANTINE_DELAY; diff --git a/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/NodeCannotJoinAsHibernatingNodeWithoutReplaceAddressTest.java b/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/NodeCannotJoinAsHibernatingNodeWithoutReplaceAddressTest.java index 53a94bba3b..202164aada 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/NodeCannotJoinAsHibernatingNodeWithoutReplaceAddressTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/NodeCannotJoinAsHibernatingNodeWithoutReplaceAddressTest.java @@ -24,12 +24,14 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.TimeUnit; -import org.junit.Assert; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.assertj.core.api.Assertions; +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.Constants; @@ -43,7 +45,6 @@ import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.Shared; -import org.assertj.core.api.Assertions; import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.cassandra.distributed.Constants.KEY_DTEST_FULL_STARTUP; diff --git a/test/distributed/org/apache/cassandra/distributed/test/jmx/JMXFeatureTest.java b/test/distributed/org/apache/cassandra/distributed/test/jmx/JMXFeatureTest.java index 99b90a2ec0..6554b37ab4 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/jmx/JMXFeatureTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/jmx/JMXFeatureTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.distributed.test.jmx; import java.util.HashSet; import java.util.Set; + import javax.management.MBeanServerConnection; import javax.management.remote.JMXConnector; diff --git a/test/distributed/org/apache/cassandra/distributed/test/jmx/JMXSslConfigDistributedTest.java b/test/distributed/org/apache/cassandra/distributed/test/jmx/JMXSslConfigDistributedTest.java index b923229ec0..0ec6957243 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/jmx/JMXSslConfigDistributedTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/jmx/JMXSslConfigDistributedTest.java @@ -22,11 +22,13 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.management.remote.rmi.RMIConnectorServer; import javax.net.ssl.SSLException; import javax.rmi.ssl.SslRMIClientSocketFactory; import com.google.common.collect.ImmutableMap; + import org.junit.Test; import org.apache.cassandra.distributed.Cluster; diff --git a/test/distributed/org/apache/cassandra/distributed/test/jmx/JMXTestsUtil.java b/test/distributed/org/apache/cassandra/distributed/test/jmx/JMXTestsUtil.java index 9c7514353c..205ec38e74 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/jmx/JMXTestsUtil.java +++ b/test/distributed/org/apache/cassandra/distributed/test/jmx/JMXTestsUtil.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; + import javax.management.JMRuntimeException; import javax.management.MBeanAttributeInfo; import javax.management.MBeanInfo; @@ -34,6 +35,7 @@ import javax.management.ObjectName; import javax.management.remote.JMXConnector; import com.google.common.collect.ImmutableSet; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/distributed/org/apache/cassandra/distributed/test/jmx/StorageServiceJmxTest.java b/test/distributed/org/apache/cassandra/distributed/test/jmx/StorageServiceJmxTest.java index a25260b713..3476e66b5e 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/jmx/StorageServiceJmxTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/jmx/StorageServiceJmxTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.distributed.test.jmx; import java.io.IOException; import java.util.HashMap; import java.util.List; + import javax.management.InstanceNotFoundException; import javax.management.MBeanException; import javax.management.MBeanServerConnection; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/AlterTopologyTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/AlterTopologyTest.java index 85c7040a58..6d05fc9817 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/AlterTopologyTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/AlterTopologyTest.java @@ -21,6 +21,8 @@ package org.apache.cassandra.distributed.test.log; import java.util.HashMap; import java.util.Map; +import org.awaitility.Awaitility; +import org.awaitility.core.ConditionFactory; import org.junit.Test; import org.apache.cassandra.cql3.QueryProcessor; @@ -47,8 +49,6 @@ import org.apache.cassandra.tcm.sequences.SequencesUtils.ClearLockedRanges; import org.apache.cassandra.tcm.sequences.SequencesUtils.LockRanges; import org.apache.cassandra.tcm.transformations.AlterTopology; import org.apache.cassandra.tcm.transformations.CustomTransformation; -import org.awaitility.Awaitility; -import org.awaitility.core.ConditionFactory; import static java.time.Duration.ofSeconds; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/BounceGossipTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/BounceGossipTest.java index 3bcac51f64..ed6faf26aa 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/BounceGossipTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/BounceGossipTest.java @@ -27,8 +27,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.LockSupport; import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.Test; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +39,6 @@ import org.apache.cassandra.gms.ApplicationState; import org.apache.cassandra.gms.EndpointState; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.harry.SchemaSpec; -import org.apache.cassandra.harry.op.Visit; import org.apache.cassandra.harry.dsl.HistoryBuilder; import org.apache.cassandra.harry.dsl.HistoryBuilderHelper; import org.apache.cassandra.harry.execution.CQLVisitExecutor; @@ -47,6 +46,7 @@ import org.apache.cassandra.harry.execution.InJvmDTestVisitExecutor; import org.apache.cassandra.harry.gen.Generator; import org.apache.cassandra.harry.gen.Generators; import org.apache.cassandra.harry.gen.SchemaGenerators; +import org.apache.cassandra.harry.op.Visit; import org.apache.cassandra.locator.InetAddressAndPort; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/BounceIndexRebuildTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/BounceIndexRebuildTest.java index 43bb78f44b..a4f2f3a38c 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/BounceIndexRebuildTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/BounceIndexRebuildTest.java @@ -18,13 +18,13 @@ package org.apache.cassandra.distributed.test.log; -import org.apache.cassandra.distributed.test.sai.SAIUtil; import org.junit.Assert; import org.junit.Test; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.test.TestBaseImpl; +import org.apache.cassandra.distributed.test.sai.SAIUtil; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NETWORK; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/CMSMembershipMetricsTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/CMSMembershipMetricsTest.java index 58a33400b7..0302b45ce2 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/CMSMembershipMetricsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/CMSMembershipMetricsTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.distributed.test.log; import java.net.InetSocketAddress; import java.util.concurrent.TimeUnit; +import org.awaitility.Awaitility; import org.junit.Test; import org.apache.cassandra.distributed.Cluster; @@ -31,7 +32,6 @@ import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.metrics.TCMMetrics; import org.apache.cassandra.tcm.sequences.AddToCMS; -import org.awaitility.Awaitility; import static org.junit.Assert.assertEquals; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/ClusterMetadataSerializationRoundTripTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/ClusterMetadataSerializationRoundTripTest.java index 9ac01cb551..f5ceffd89b 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/ClusterMetadataSerializationRoundTripTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/ClusterMetadataSerializationRoundTripTest.java @@ -20,11 +20,12 @@ package org.apache.cassandra.distributed.test.log; import java.io.IOException; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.test.TestBaseImpl; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/ClusterMetadataTestHelper.java b/test/distributed/org/apache/cassandra/distributed/test/log/ClusterMetadataTestHelper.java index cbdcc22394..063f94857c 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/ClusterMetadataTestHelper.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/ClusterMetadataTestHelper.java @@ -53,12 +53,13 @@ import org.apache.cassandra.schema.DistributedSchema; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Keyspaces; -import org.apache.cassandra.schema.ReplicationParams; import org.apache.cassandra.schema.MemtableParams; +import org.apache.cassandra.schema.ReplicationParams; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.schema.SchemaTestUtil; import org.apache.cassandra.schema.SchemaTransformation; import org.apache.cassandra.service.ClientState; +import org.apache.cassandra.service.accord.AccordFastPath; import org.apache.cassandra.service.accord.AccordStaleReplicas; import org.apache.cassandra.service.consensus.migration.ConsensusMigrationState; import org.apache.cassandra.tcm.AtomicLongBackedProcessor; @@ -71,7 +72,6 @@ import org.apache.cassandra.tcm.RegistrationStatus; import org.apache.cassandra.tcm.Transformation; import org.apache.cassandra.tcm.log.LocalLog; import org.apache.cassandra.tcm.membership.Directory; -import org.apache.cassandra.service.accord.AccordFastPath; import org.apache.cassandra.tcm.membership.Location; import org.apache.cassandra.tcm.membership.NodeAddresses; import org.apache.cassandra.tcm.membership.NodeId; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/CoordinatorPathTestBase.java b/test/distributed/org/apache/cassandra/distributed/test/log/CoordinatorPathTestBase.java index 6ddb44f1be..28125692ac 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/CoordinatorPathTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/CoordinatorPathTestBase.java @@ -64,28 +64,38 @@ import org.apache.cassandra.distributed.shared.NetworkTopology; import org.apache.cassandra.distributed.test.log.PlacementSimulator.Transformations; import org.apache.cassandra.gms.GossipDigestAck; import org.apache.cassandra.gms.GossipDigestSyn; +import org.apache.cassandra.harry.dsl.TestRunner; import org.apache.cassandra.harry.model.TokenPlacementModel; import org.apache.cassandra.harry.model.TokenPlacementModel.Node; import org.apache.cassandra.harry.model.TokenPlacementModel.NodeFactory; import org.apache.cassandra.harry.util.ByteUtils; -import org.apache.cassandra.harry.dsl.TestRunner; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.SimpleSeedProvider; -import org.apache.cassandra.tcm.*; -import org.apache.cassandra.tcm.log.Entry; -import org.apache.cassandra.tcm.log.LocalLog; -import org.apache.cassandra.tcm.log.LogState; -import org.apache.cassandra.tcm.log.LogStorage; -import org.apache.cassandra.tcm.transformations.cms.Initialize; -import org.apache.cassandra.tcm.transformations.Register; import org.apache.cassandra.net.IVerbHandler; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.NoPayload; import org.apache.cassandra.net.Verb; +import org.apache.cassandra.tcm.AtomicLongBackedProcessor; +import org.apache.cassandra.tcm.ClusterMetadata; +import org.apache.cassandra.tcm.ClusterMetadataService; +import org.apache.cassandra.tcm.Commit; +import org.apache.cassandra.tcm.Discovery; +import org.apache.cassandra.tcm.Epoch; +import org.apache.cassandra.tcm.FetchCMSLog; +import org.apache.cassandra.tcm.MetadataSnapshots; +import org.apache.cassandra.tcm.Processor; +import org.apache.cassandra.tcm.Retry; +import org.apache.cassandra.tcm.Transformation; +import org.apache.cassandra.tcm.log.Entry; +import org.apache.cassandra.tcm.log.LocalLog; +import org.apache.cassandra.tcm.log.LogState; +import org.apache.cassandra.tcm.log.LogStorage; import org.apache.cassandra.tcm.membership.Location; import org.apache.cassandra.tcm.membership.NodeAddresses; import org.apache.cassandra.tcm.membership.NodeVersion; import org.apache.cassandra.tcm.ownership.UniformRangePlacement; +import org.apache.cassandra.tcm.transformations.Register; +import org.apache.cassandra.tcm.transformations.cms.Initialize; import org.apache.cassandra.utils.AssertUtil; import org.apache.cassandra.utils.Closeable; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/DiscoverCMSTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/DiscoverCMSTest.java index d3a4f420a2..19bfa3490a 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/DiscoverCMSTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/DiscoverCMSTest.java @@ -24,11 +24,12 @@ import java.util.List; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.test.TestBaseImpl; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/DistributedLogTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/DistributedLogTest.java index f4473d9c76..727bca85b1 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/DistributedLogTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/DistributedLogTest.java @@ -31,8 +31,8 @@ import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.Epoch; -import org.apache.cassandra.tcm.log.LogStorage; import org.apache.cassandra.tcm.log.Entry; +import org.apache.cassandra.tcm.log.LogStorage; import org.apache.cassandra.tcm.transformations.CustomTransformation; import org.apache.cassandra.utils.concurrent.CountDownLatch; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/FailedLeaveTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/FailedLeaveTest.java index a5f88d9247..d64a1bdff9 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/FailedLeaveTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/FailedLeaveTest.java @@ -26,13 +26,14 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BiFunction; -import org.junit.Assert; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.IInvokableInstance; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/FetchLogFromPeersTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/FetchLogFromPeersTest.java index 70f31181bb..d1473fc185 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/FetchLogFromPeersTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/FetchLogFromPeersTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Assert; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/GossipDeadlockTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/GossipDeadlockTest.java index 362b94fd1e..9295468f00 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/GossipDeadlockTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/GossipDeadlockTest.java @@ -25,13 +25,15 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; - import com.google.monitoring.runtime.instrumentation.common.util.concurrent.Uninterruptibles; + import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.concurrent.ExecutorFactory; import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.dht.Murmur3Partitioner; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/MetadataChangeSimulationTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/MetadataChangeSimulationTest.java index f9ae0e3abe..82e864b3ef 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/MetadataChangeSimulationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/MetadataChangeSimulationTest.java @@ -35,9 +35,9 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/PlacementSimulator.java b/test/distributed/org/apache/cassandra/distributed/test/log/PlacementSimulator.java index 6bd3cd7e25..f70c90d493 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/PlacementSimulator.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/PlacementSimulator.java @@ -24,7 +24,18 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NavigableMap; +import java.util.Optional; +import java.util.Random; +import java.util.Set; +import java.util.TreeMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; import java.util.function.Predicate; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/QuorumIntersectionSimulatorTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/QuorumIntersectionSimulatorTest.java index cc6723a6ff..937b0c3cee 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/QuorumIntersectionSimulatorTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/QuorumIntersectionSimulatorTest.java @@ -18,7 +18,12 @@ package org.apache.cassandra.distributed.test.log; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/ReconfigureCMSStreamingFailureTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/ReconfigureCMSStreamingFailureTest.java index e0364736e6..c98ef6e3a2 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/ReconfigureCMSStreamingFailureTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/ReconfigureCMSStreamingFailureTest.java @@ -24,12 +24,13 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.test.TestBaseImpl; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/RegisterTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/RegisterTest.java index a50c105998..393e9efd77 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/RegisterTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/RegisterTest.java @@ -49,8 +49,8 @@ import org.apache.cassandra.tcm.sequences.UnbootstrapAndLeave; import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.tcm.transformations.PrepareLeave; import org.apache.cassandra.tcm.transformations.Register; -import org.apache.cassandra.tcm.transformations.TriggerSnapshot; import org.apache.cassandra.tcm.transformations.Startup; +import org.apache.cassandra.tcm.transformations.TriggerSnapshot; import org.apache.cassandra.tcm.transformations.Unregister; import org.apache.cassandra.utils.CassandraVersion; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/ReplayPersistedTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/ReplayPersistedTest.java index 0b0da8c445..bc6e139e7f 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/ReplayPersistedTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/ReplayPersistedTest.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Random; import com.google.common.collect.ImmutableList; + import org.junit.Test; import org.apache.cassandra.concurrent.ScheduledExecutors; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/RequestCurrentEpochTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/RequestCurrentEpochTest.java index 43c318c114..5a16ace931 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/RequestCurrentEpochTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/RequestCurrentEpochTest.java @@ -28,8 +28,8 @@ import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.shared.ClusterUtils; import org.apache.cassandra.tcm.ClusterMetadataService; -import org.apache.cassandra.tcm.log.Entry; import org.apache.cassandra.tcm.Epoch; +import org.apache.cassandra.tcm.log.Entry; import org.apache.cassandra.tcm.transformations.CustomTransformation; import static org.junit.Assert.assertEquals; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/SimulatedOperation.java b/test/distributed/org/apache/cassandra/distributed/test/log/SimulatedOperation.java index c6fa2da54b..5275471476 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/SimulatedOperation.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/SimulatedOperation.java @@ -40,9 +40,9 @@ import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.MultiStepOperation; import org.apache.cassandra.tcm.Transformation; -import org.apache.cassandra.tcm.ownership.VersionedEndpoints; import org.apache.cassandra.tcm.membership.Location; import org.apache.cassandra.tcm.membership.NodeId; +import org.apache.cassandra.tcm.ownership.VersionedEndpoints; import org.apache.cassandra.tcm.sequences.BootstrapAndJoin; import org.apache.cassandra.tcm.sequences.BootstrapAndReplace; import org.apache.cassandra.tcm.sequences.LeaveStreams; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/SnapshotTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/SnapshotTest.java index 11f8f0b1f1..e355fdccc8 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/SnapshotTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/SnapshotTest.java @@ -28,8 +28,8 @@ import org.apache.cassandra.distributed.api.TokenSupplier; import org.apache.cassandra.distributed.shared.ClusterUtils; import org.apache.cassandra.distributed.shared.NetworkTopology; import org.apache.cassandra.distributed.test.TestBaseImpl; -import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.ClusterMetadata; +import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.transformations.CustomTransformation; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/SystemKeyspaceStorageTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/SystemKeyspaceStorageTest.java index c4a4079225..3e158ac41c 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/SystemKeyspaceStorageTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/SystemKeyspaceStorageTest.java @@ -22,20 +22,21 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Random; + import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.distributed.test.ExecUtil; import org.apache.cassandra.harry.model.TokenPlacementModel; -import org.apache.cassandra.tcm.ClusterMetadataService; -import org.apache.cassandra.tcm.Epoch; -import org.apache.cassandra.tcm.log.Entry; -import org.apache.cassandra.tcm.log.LogState; -import org.apache.cassandra.tcm.FetchCMSLog; -import org.apache.cassandra.tcm.transformations.CustomTransformation; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.tcm.ClusterMetadata; +import org.apache.cassandra.tcm.ClusterMetadataService; +import org.apache.cassandra.tcm.Epoch; +import org.apache.cassandra.tcm.FetchCMSLog; +import org.apache.cassandra.tcm.log.Entry; +import org.apache.cassandra.tcm.log.LogState; +import org.apache.cassandra.tcm.transformations.CustomTransformation; import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.db.SystemKeyspace.SNAPSHOT_TABLE_NAME; diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/TestProcessor.java b/test/distributed/org/apache/cassandra/distributed/test/log/TestProcessor.java index 6853bfa031..f7f5c50262 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/TestProcessor.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/TestProcessor.java @@ -25,6 +25,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BiFunction; import java.util.function.Predicate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.Commit; import org.apache.cassandra.tcm.Epoch; @@ -33,8 +36,6 @@ import org.apache.cassandra.tcm.Retry; import org.apache.cassandra.tcm.Transformation; import org.apache.cassandra.tcm.log.Entry; import org.apache.cassandra.utils.concurrent.WaitQueue; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class TestProcessor implements Processor { diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/TriggeredReconfigureCMSTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/TriggeredReconfigureCMSTest.java index d800a3d6bc..81c9611669 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/log/TriggeredReconfigureCMSTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/log/TriggeredReconfigureCMSTest.java @@ -26,6 +26,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Test; import org.apache.cassandra.config.CassandraRelevantProperties; diff --git a/test/distributed/org/apache/cassandra/distributed/test/metric/TableMetricTest.java b/test/distributed/org/apache/cassandra/distributed/test/metric/TableMetricTest.java index 1ea737b191..cfb34e7696 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/metric/TableMetricTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/metric/TableMetricTest.java @@ -27,6 +27,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.stream.Collectors; + import javax.management.InstanceAlreadyExistsException; import javax.management.InstanceNotFoundException; import javax.management.MBeanServer; @@ -34,6 +35,7 @@ import javax.management.ObjectName; import javax.management.QueryExp; import com.google.common.collect.ImmutableSet; + import org.junit.Assert; import org.junit.Test; @@ -43,14 +45,14 @@ import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.test.TestBaseImpl; -import org.apache.cassandra.schema.SystemDistributedKeyspace; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaKeyspace; +import org.apache.cassandra.schema.SystemDistributedKeyspace; import org.apache.cassandra.tracing.TraceKeyspace; import org.apache.cassandra.utils.MBeanWrapper; -import static org.apache.cassandra.config.CassandraRelevantProperties.ORG_APACHE_CASSANDRA_DISABLE_MBEAN_REGISTRATION; import static org.apache.cassandra.config.CassandraRelevantProperties.MBEAN_REGISTRATION_CLASS; +import static org.apache.cassandra.config.CassandraRelevantProperties.ORG_APACHE_CASSANDRA_DISABLE_MBEAN_REGISTRATION; public class TableMetricTest extends TestBaseImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/metrics/HintsServiceMetricsTest.java b/test/distributed/org/apache/cassandra/distributed/test/metrics/HintsServiceMetricsTest.java index 42b274e628..06971bea2b 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/metrics/HintsServiceMetricsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/metrics/HintsServiceMetricsTest.java @@ -23,12 +23,14 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.awaitility.core.ThrowingRunnable; +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ICoordinator; import org.apache.cassandra.distributed.api.IInvokableInstance; @@ -38,7 +40,6 @@ import org.apache.cassandra.hints.Hint; import org.apache.cassandra.metrics.HintsServiceMetrics; import org.apache.cassandra.net.Verb; import org.apache.cassandra.utils.concurrent.Future; -import org.awaitility.core.ThrowingRunnable; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/test/distributed/org/apache/cassandra/distributed/test/metrics/RequestTimeoutTest.java b/test/distributed/org/apache/cassandra/distributed/test/metrics/RequestTimeoutTest.java index 8d519fd4ba..6b7cdeee02 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/metrics/RequestTimeoutTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/metrics/RequestTimeoutTest.java @@ -26,34 +26,35 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; import net.bytebuddy.implementation.bind.annotation.SuperMethod; import net.bytebuddy.implementation.bind.annotation.This; + +import org.assertj.core.api.Assertions; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.config.Config; import org.apache.cassandra.cql3.statements.BatchStatement; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.test.TestBaseImpl; +import org.apache.cassandra.exceptions.CasWriteTimeoutException; +import org.apache.cassandra.exceptions.ReadTimeoutException; import org.apache.cassandra.exceptions.RequestFailureReason; +import org.apache.cassandra.exceptions.WriteTimeoutException; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.RequestCallback; -import org.apache.cassandra.utils.AssertionUtils; -import org.apache.cassandra.exceptions.CasWriteTimeoutException; -import org.apache.cassandra.exceptions.ReadTimeoutException; -import org.apache.cassandra.exceptions.WriteTimeoutException; import org.apache.cassandra.net.Verb; import org.apache.cassandra.service.paxos.Paxos; +import org.apache.cassandra.utils.AssertionUtils; import org.apache.cassandra.utils.concurrent.Condition; -import org.assertj.core.api.Assertions; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; diff --git a/test/distributed/org/apache/cassandra/distributed/test/metrics/StreamingMetricsTest.java b/test/distributed/org/apache/cassandra/distributed/test/metrics/StreamingMetricsTest.java index 02c0518a4f..1be0a76d37 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/metrics/StreamingMetricsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/metrics/StreamingMetricsTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.distributed.test.metrics; import java.net.InetSocketAddress; import java.util.stream.Stream; -import org.apache.cassandra.db.ColumnFamilyStore; import org.junit.Test; +import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; @@ -33,9 +33,9 @@ import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.metrics.StreamingMetrics; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; -import static org.assertj.core.api.Assertions.assertThat; import static org.apache.cassandra.distributed.api.Feature.NETWORK; import static org.apache.cassandra.net.Verb.MUTATION_REQ; +import static org.assertj.core.api.Assertions.assertThat; public class StreamingMetricsTest extends TestBaseImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/repair/AutoRepairSchedulerDisallowParallelReplicaRepairAcrossSchedulesTest.java b/test/distributed/org/apache/cassandra/distributed/test/repair/AutoRepairSchedulerDisallowParallelReplicaRepairAcrossSchedulesTest.java index e1ccbcb8da..1bc6aacdb3 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/repair/AutoRepairSchedulerDisallowParallelReplicaRepairAcrossSchedulesTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/repair/AutoRepairSchedulerDisallowParallelReplicaRepairAcrossSchedulesTest.java @@ -23,16 +23,15 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.ImmutableMap; -import org.apache.cassandra.Util; -import org.apache.cassandra.metrics.AutoRepairMetrics; -import org.apache.cassandra.metrics.AutoRepairMetricsManager; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.Util; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.test.TestBaseImpl; +import org.apache.cassandra.metrics.AutoRepairMetrics; +import org.apache.cassandra.metrics.AutoRepairMetricsManager; import org.apache.cassandra.repair.autorepair.AutoRepair; import org.apache.cassandra.repair.autorepair.AutoRepairConfig; import org.apache.cassandra.service.AutoRepairService; diff --git a/test/distributed/org/apache/cassandra/distributed/test/repair/AutoRepairSchedulerStatsHelper.java b/test/distributed/org/apache/cassandra/distributed/test/repair/AutoRepairSchedulerStatsHelper.java index 7e7089348e..e8d5ddd564 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/repair/AutoRepairSchedulerStatsHelper.java +++ b/test/distributed/org/apache/cassandra/distributed/test/repair/AutoRepairSchedulerStatsHelper.java @@ -28,6 +28,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import com.google.common.collect.ImmutableMap; + import org.junit.Assert; import org.apache.cassandra.Util; diff --git a/test/distributed/org/apache/cassandra/distributed/test/repair/AutoRepairSchedulerTest.java b/test/distributed/org/apache/cassandra/distributed/test/repair/AutoRepairSchedulerTest.java index adca507082..9e111e2bb6 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/repair/AutoRepairSchedulerTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/repair/AutoRepairSchedulerTest.java @@ -26,23 +26,22 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.ImmutableMap; -import org.apache.cassandra.Util; -import org.apache.cassandra.config.DurationSpec; -import org.apache.cassandra.distributed.api.TokenSupplier; -import org.apache.cassandra.metrics.AutoRepairMetrics; -import org.apache.cassandra.metrics.AutoRepairMetricsManager; -import org.apache.cassandra.schema.SystemDistributedKeyspace; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.Util; +import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; +import org.apache.cassandra.distributed.api.TokenSupplier; import org.apache.cassandra.distributed.test.TestBaseImpl; +import org.apache.cassandra.metrics.AutoRepairMetrics; +import org.apache.cassandra.metrics.AutoRepairMetricsManager; import org.apache.cassandra.repair.autorepair.AutoRepair; import org.apache.cassandra.repair.autorepair.AutoRepairConfig; +import org.apache.cassandra.schema.SystemDistributedKeyspace; import org.apache.cassandra.service.AutoRepairService; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/distributed/org/apache/cassandra/distributed/test/repair/ConcurrentValidationRequestsTest.java b/test/distributed/org/apache/cassandra/distributed/test/repair/ConcurrentValidationRequestsTest.java index 82a0b73371..ce31d5d554 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/repair/ConcurrentValidationRequestsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/repair/ConcurrentValidationRequestsTest.java @@ -21,12 +21,13 @@ package org.apache.cassandra.distributed.test.repair; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.NodeToolResult; diff --git a/test/distributed/org/apache/cassandra/distributed/test/repair/ForceRepairTest.java b/test/distributed/org/apache/cassandra/distributed/test/repair/ForceRepairTest.java index 946c41e0e2..8f7ade21da 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/repair/ForceRepairTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/repair/ForceRepairTest.java @@ -24,11 +24,13 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import com.carrotsearch.hppc.LongArrayList; import com.google.common.util.concurrent.Uninterruptibles; + import org.apache.commons.lang3.ArrayUtils; +import org.assertj.core.api.Assertions; import org.junit.Test; -import com.carrotsearch.hppc.LongArrayList; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.lifecycle.View; import org.apache.cassandra.distributed.Cluster; @@ -47,7 +49,6 @@ import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.FBUtilities; -import org.assertj.core.api.Assertions; public class ForceRepairTest extends TestBaseImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/repair/NoTombstonePurgingTest.java b/test/distributed/org/apache/cassandra/distributed/test/repair/NoTombstonePurgingTest.java index adcb2b3e2c..f473fbbcf2 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/repair/NoTombstonePurgingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/repair/NoTombstonePurgingTest.java @@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Test; import org.apache.cassandra.db.Keyspace; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ring/BootstrapTest.java b/test/distributed/org/apache/cassandra/distributed/test/ring/BootstrapTest.java index 2d846fdd92..bc7abb85ef 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ring/BootstrapTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ring/BootstrapTest.java @@ -27,19 +27,21 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.IntStream; + import javax.management.MBeanAttributeInfo; import javax.management.MBeanInfo; import javax.management.MBeanServerConnection; import javax.management.ObjectName; import javax.management.remote.JMXConnector; -import org.junit.Ignore; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Ignore; +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.Constants; import org.apache.cassandra.distributed.api.ConsistencyLevel; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ring/DecommissionTest.java b/test/distributed/org/apache/cassandra/distributed/test/ring/DecommissionTest.java index 156a957f94..307956828e 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ring/DecommissionTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ring/DecommissionTest.java @@ -25,15 +25,18 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.Nullable; import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.Test; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.distributed.Cluster; diff --git a/test/distributed/org/apache/cassandra/distributed/test/ring/StopProcessingExceptionTest.java b/test/distributed/org/apache/cassandra/distributed/test/ring/StopProcessingExceptionTest.java index 244589a7c5..6ab106197d 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ring/StopProcessingExceptionTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ring/StopProcessingExceptionTest.java @@ -21,12 +21,13 @@ package org.apache.cassandra.distributed.test.ring; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.cql3.statements.schema.CreateKeyspaceStatement; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; diff --git a/test/distributed/org/apache/cassandra/distributed/test/sai/ImportIndexedSSTablesTest.java b/test/distributed/org/apache/cassandra/distributed/test/sai/ImportIndexedSSTablesTest.java index 1b9997aeee..f7eaa1f4f8 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/sai/ImportIndexedSSTablesTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/sai/ImportIndexedSSTablesTest.java @@ -25,6 +25,9 @@ import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.apache.lucene.index.CorruptIndexException; +import org.apache.lucene.store.IndexInput; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -38,15 +41,12 @@ import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.index.sai.StorageAttachedIndexBuilder; import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; import org.apache.cassandra.utils.Throwables; -import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.store.IndexInput; import static net.bytebuddy.matcher.ElementMatchers.named; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NETWORK; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; public class ImportIndexedSSTablesTest extends TestBaseImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/sai/IndexAvailabilityTest.java b/test/distributed/org/apache/cassandra/distributed/test/sai/IndexAvailabilityTest.java index 66a63fa11b..0bdc4a19a3 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/sai/IndexAvailabilityTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/sai/IndexAvailabilityTest.java @@ -27,11 +27,13 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import com.google.common.base.Objects; -import org.junit.Test; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.IInvokableInstance; diff --git a/test/distributed/org/apache/cassandra/distributed/test/sai/IndexHintsDistributedTest.java b/test/distributed/org/apache/cassandra/distributed/test/sai/IndexHintsDistributedTest.java index 262cb97513..68e8690c58 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/sai/IndexHintsDistributedTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/sai/IndexHintsDistributedTest.java @@ -18,12 +18,13 @@ package org.apache.cassandra.distributed.test.sai; -import org.assertj.core.api.Assertions; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.assertj.core.api.Assertions; +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.ICoordinator; diff --git a/test/distributed/org/apache/cassandra/distributed/test/sai/IndexStreamingFailureTest.java b/test/distributed/org/apache/cassandra/distributed/test/sai/IndexStreamingFailureTest.java index cb9795b307..62c3529757 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/sai/IndexStreamingFailureTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/sai/IndexStreamingFailureTest.java @@ -20,11 +20,14 @@ package org.apache.cassandra.distributed.test.sai; import java.io.IOException; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.apache.lucene.index.CorruptIndexException; +import org.apache.lucene.store.IndexInput; +import org.junit.Test; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInvokableInstance; @@ -34,8 +37,6 @@ import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentBuilder; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; -import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.store.IndexInput; import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; diff --git a/test/distributed/org/apache/cassandra/distributed/test/sai/IndexStreamingTest.java b/test/distributed/org/apache/cassandra/distributed/test/sai/IndexStreamingTest.java index c3f1f42073..db3d841bdd 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/sai/IndexStreamingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/sai/IndexStreamingTest.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -36,7 +37,6 @@ import org.apache.cassandra.distributed.api.SimpleQueryResult; import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.distributed.util.QueryResultUtil; import org.apache.cassandra.index.sai.disk.v1.V1OnDiskFormat; -import org.assertj.core.api.Assertions; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/distributed/org/apache/cassandra/distributed/test/sai/PartialUpdateHandlingTest.java b/test/distributed/org/apache/cassandra/distributed/test/sai/PartialUpdateHandlingTest.java index b4825adbb0..d59b42b7cd 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/sai/PartialUpdateHandlingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/sai/PartialUpdateHandlingTest.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.Objects; import com.google.common.collect.Lists; + import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -42,13 +43,13 @@ import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.index.sai.plan.Expression; -import static org.junit.Assert.assertEquals; import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NETWORK; import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows; import static org.apache.cassandra.index.sai.plan.Expression.IndexOperator.EQ; import static org.apache.cassandra.index.sai.plan.Expression.IndexOperator.RANGE; +import static org.junit.Assert.assertEquals; /** * SAI queries, like all filtering queries, must correctly resolve divergent views of row data across replicas. In diff --git a/test/distributed/org/apache/cassandra/distributed/test/sai/PartialWritesWithRepairTest.java b/test/distributed/org/apache/cassandra/distributed/test/sai/PartialWritesWithRepairTest.java index 703137c5c1..f07db81be4 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/sai/PartialWritesWithRepairTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/sai/PartialWritesWithRepairTest.java @@ -18,6 +18,14 @@ package org.apache.cassandra.distributed.test.sai; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + +import org.junit.Test; + import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; @@ -25,13 +33,6 @@ import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.shared.ClusterUtils; import org.apache.cassandra.distributed.shared.ClusterUtils.Range; import org.apache.cassandra.distributed.test.TestBaseImpl; -import org.junit.Test; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; public class PartialWritesWithRepairTest extends TestBaseImpl { diff --git a/test/distributed/org/apache/cassandra/distributed/test/sai/SAIUtil.java b/test/distributed/org/apache/cassandra/distributed/test/sai/SAIUtil.java index c00e5699ba..eb10603a93 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/sai/SAIUtil.java +++ b/test/distributed/org/apache/cassandra/distributed/test/sai/SAIUtil.java @@ -26,6 +26,8 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import org.assertj.core.util.Streams; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.IInstance; @@ -35,7 +37,6 @@ import org.apache.cassandra.index.IndexStatusManager; import org.apache.cassandra.index.SecondaryIndexManager; import org.apache.cassandra.index.sai.virtual.ColumnIndexesSystemView; import org.apache.cassandra.locator.InetAddressAndPort; -import org.assertj.core.util.Streams; import static org.awaitility.Awaitility.await; diff --git a/test/distributed/org/apache/cassandra/distributed/test/sai/StrictFilteringTest.java b/test/distributed/org/apache/cassandra/distributed/test/sai/StrictFilteringTest.java index b23e3f4587..cece824fa7 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/sai/StrictFilteringTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/sai/StrictFilteringTest.java @@ -30,12 +30,11 @@ import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.test.TestBaseImpl; -import static org.junit.Assert.assertEquals; - import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NETWORK; import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows; import static org.apache.cassandra.distributed.shared.AssertUtils.row; +import static org.junit.Assert.assertEquals; /** * This class contains a small set of hand-crafted tests that document corner cases around how SAI handles diff --git a/test/distributed/org/apache/cassandra/distributed/test/sai/VectorDistributedTest.java b/test/distributed/org/apache/cassandra/distributed/test/sai/VectorDistributedTest.java index c64dbb2ec6..8cb4249063 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/sai/VectorDistributedTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/sai/VectorDistributedTest.java @@ -29,6 +29,7 @@ import java.util.stream.IntStream; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -40,7 +41,6 @@ import org.junit.rules.TestWatcher; import org.junit.runner.Description; import org.junit.runners.MethodSorters; -import io.github.jbellis.jvector.vector.VectorSimilarityFunction; import org.apache.cassandra.config.Config; import org.apache.cassandra.cql3.statements.SelectStatement; import org.apache.cassandra.db.Keyspace; @@ -53,6 +53,8 @@ import org.apache.cassandra.index.sai.SAITester; import org.apache.cassandra.index.sai.disk.v1.IndexWriterConfig; import org.apache.cassandra.index.sai.utils.Glove; +import io.github.jbellis.jvector.vector.VectorSimilarityFunction; + import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_RANDOM_SEED; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NETWORK; diff --git a/test/distributed/org/apache/cassandra/distributed/test/streaming/AbstractStreamFailureLogs.java b/test/distributed/org/apache/cassandra/distributed/test/streaming/AbstractStreamFailureLogs.java index 28aa6b0bcc..9bfb4f3573 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/streaming/AbstractStreamFailureLogs.java +++ b/test/distributed/org/apache/cassandra/distributed/test/streaming/AbstractStreamFailureLogs.java @@ -26,12 +26,15 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.assertj.core.api.Assertions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.streaming.CassandraIncomingFile; import org.apache.cassandra.distributed.Cluster; @@ -43,7 +46,7 @@ import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.io.sstable.RangeAwareSSTableWriter; import org.apache.cassandra.io.sstable.SSTableZeroCopyWriter; import org.apache.cassandra.io.util.SequentialWriter; -import org.assertj.core.api.Assertions; + import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; diff --git a/test/distributed/org/apache/cassandra/distributed/test/streaming/IndexBuildFailsAfterStreamingTest.java b/test/distributed/org/apache/cassandra/distributed/test/streaming/IndexBuildFailsAfterStreamingTest.java index 21e6bf5eec..90326700a7 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/streaming/IndexBuildFailsAfterStreamingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/streaming/IndexBuildFailsAfterStreamingTest.java @@ -22,11 +22,12 @@ import java.io.IOException; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; diff --git a/test/distributed/org/apache/cassandra/distributed/test/streaming/RebuildStreamingTest.java b/test/distributed/org/apache/cassandra/distributed/test/streaming/RebuildStreamingTest.java index ee41ec42d7..a26e8ac929 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/streaming/RebuildStreamingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/streaming/RebuildStreamingTest.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.Collections; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.distributed.Cluster; @@ -30,7 +31,6 @@ import org.apache.cassandra.distributed.api.Row; import org.apache.cassandra.distributed.api.SimpleQueryResult; import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.distributed.util.QueryResultUtil; -import org.assertj.core.api.Assertions; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamCloseInMiddleTest.java b/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamCloseInMiddleTest.java index 9a7c27f7a4..fd3cacf357 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamCloseInMiddleTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamCloseInMiddleTest.java @@ -22,13 +22,15 @@ import java.nio.ByteBuffer; import java.util.concurrent.Callable; import java.util.stream.Collectors; -import org.junit.Assert; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.assertj.core.api.Assertions; +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.streaming.CassandraIncomingFile; import org.apache.cassandra.distributed.Cluster; @@ -40,7 +42,6 @@ import org.apache.cassandra.distributed.test.TestBaseImpl; import org.apache.cassandra.io.sstable.RangeAwareSSTableWriter; import org.apache.cassandra.io.sstable.SSTableZeroCopyWriter; import org.apache.cassandra.io.util.SequentialWriter; -import org.assertj.core.api.Assertions; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; diff --git a/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamDisconnectedWhileReceivingTest.java b/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamDisconnectedWhileReceivingTest.java index c2c1611729..23f1440b4e 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamDisconnectedWhileReceivingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamDisconnectedWhileReceivingTest.java @@ -20,15 +20,15 @@ package org.apache.cassandra.distributed.test.streaming; import java.io.IOException; import java.util.concurrent.Callable; -import org.junit.Test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.IInvokableInstance; diff --git a/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailedAfterReceivingTest.java b/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailedAfterReceivingTest.java index acffd1eee1..9cb1c69c28 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailedAfterReceivingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailedAfterReceivingTest.java @@ -25,11 +25,13 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.Test; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; diff --git a/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailedAfterTransferTest.java b/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailedAfterTransferTest.java index b91cbf60a9..ee220b0597 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailedAfterTransferTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailedAfterTransferTest.java @@ -25,11 +25,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.Test; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; diff --git a/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailedWhileReceivingTest.java b/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailedWhileReceivingTest.java index fb1fe3e8bc..cc58c177a8 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailedWhileReceivingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailedWhileReceivingTest.java @@ -21,12 +21,13 @@ import java.io.IOException; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.streaming.CassandraEntireSSTableStreamReader; diff --git a/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailureLogsFailureDueToSessionTimeoutTest.java b/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailureLogsFailureDueToSessionTimeoutTest.java index b473597a5b..16e4dae1bc 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailureLogsFailureDueToSessionTimeoutTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/streaming/StreamFailureLogsFailureDueToSessionTimeoutTest.java @@ -25,12 +25,15 @@ import java.util.concurrent.ForkJoinPool; import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.UncheckedTimeoutException; -import org.junit.Test; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.awaitility.Awaitility; +import org.junit.Test; + import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.streaming.CassandraIncomingFile; import org.apache.cassandra.distributed.Cluster; @@ -40,7 +43,6 @@ import org.apache.cassandra.io.sstable.SSTableZeroCopyWriter; import org.apache.cassandra.io.util.SequentialWriter; import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.Shared; -import org.awaitility.Awaitility; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; diff --git a/test/distributed/org/apache/cassandra/distributed/test/tcm/CMSPlacementAfterMoveTest.java b/test/distributed/org/apache/cassandra/distributed/test/tcm/CMSPlacementAfterMoveTest.java index 389e3acc6d..7b1b284d79 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/tcm/CMSPlacementAfterMoveTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/tcm/CMSPlacementAfterMoveTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.distributed.test.tcm; import java.io.IOException; import com.google.common.collect.ImmutableList; + import org.junit.Test; import org.apache.cassandra.dht.Murmur3Partitioner; diff --git a/test/distributed/org/apache/cassandra/distributed/test/tcm/CMSShutdownTest.java b/test/distributed/org/apache/cassandra/distributed/test/tcm/CMSShutdownTest.java index 736f8335e9..6d8debdd7f 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/tcm/CMSShutdownTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/tcm/CMSShutdownTest.java @@ -21,12 +21,13 @@ package org.apache.cassandra.distributed.test.tcm; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; diff --git a/test/distributed/org/apache/cassandra/distributed/test/tcm/FailureDetectorRecomputeTest.java b/test/distributed/org/apache/cassandra/distributed/test/tcm/FailureDetectorRecomputeTest.java index 7abfd7386c..068b2e9f54 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/tcm/FailureDetectorRecomputeTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/tcm/FailureDetectorRecomputeTest.java @@ -19,9 +19,6 @@ package org.apache.cassandra.distributed.test.tcm; import java.io.IOException; - -import org.junit.Test; - import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; @@ -29,6 +26,9 @@ import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.test.TestBaseImpl; diff --git a/test/distributed/org/apache/cassandra/distributed/test/tcm/SplitBrainTest.java b/test/distributed/org/apache/cassandra/distributed/test/tcm/SplitBrainTest.java index 1382f8b063..4fbdc6ce4f 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/tcm/SplitBrainTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/tcm/SplitBrainTest.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; +import org.awaitility.Awaitility; import org.junit.Assert; import org.junit.Test; @@ -47,7 +48,6 @@ import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.Verb; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.log.LogState; -import org.awaitility.Awaitility; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; import static org.apache.cassandra.distributed.api.Feature.NETWORK; diff --git a/test/distributed/org/apache/cassandra/distributed/test/thresholds/AbstractClientSizeWarning.java b/test/distributed/org/apache/cassandra/distributed/test/thresholds/AbstractClientSizeWarning.java index 2355403cb1..0cc918018b 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/thresholds/AbstractClientSizeWarning.java +++ b/test/distributed/org/apache/cassandra/distributed/test/thresholds/AbstractClientSizeWarning.java @@ -28,14 +28,16 @@ import java.util.List; import java.util.Random; import java.util.function.Consumer; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.SimpleStatement; import com.google.common.collect.ImmutableSet; + +import org.assertj.core.api.Condition; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.SimpleStatement; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.distributed.Cluster; @@ -52,7 +54,6 @@ import org.apache.cassandra.exceptions.RequestFailureReason; import org.apache.cassandra.service.ClientWarn; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.service.reads.thresholds.CoordinatorWarnings; -import org.assertj.core.api.Condition; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/distributed/org/apache/cassandra/distributed/test/thresholds/CoordinatorReadSizeWarningTest.java b/test/distributed/org/apache/cassandra/distributed/test/thresholds/CoordinatorReadSizeWarningTest.java index 31469aff18..ed50fb339c 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/thresholds/CoordinatorReadSizeWarningTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/thresholds/CoordinatorReadSizeWarningTest.java @@ -21,7 +21,7 @@ package org.apache.cassandra.distributed.test.thresholds; import java.io.IOException; import java.util.List; -import org.junit.*; +import org.junit.BeforeClass; import org.apache.cassandra.config.DataStorageSpec; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/test/distributed/org/apache/cassandra/distributed/test/thresholds/TombstoneCountWarningTest.java b/test/distributed/org/apache/cassandra/distributed/test/thresholds/TombstoneCountWarningTest.java index 054256a08f..989eae43dd 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/thresholds/TombstoneCountWarningTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/thresholds/TombstoneCountWarningTest.java @@ -28,8 +28,19 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.SimpleStatement; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; + +import net.bytebuddy.ByteBuddy; +import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; +import net.bytebuddy.implementation.MethodDelegation; +import net.bytebuddy.implementation.bind.annotation.SuperCall; +import net.bytebuddy.implementation.bind.annotation.This; + +import org.assertj.core.api.Assertions; +import org.assertj.core.api.Condition; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; @@ -38,13 +49,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.SimpleStatement; -import net.bytebuddy.ByteBuddy; -import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; -import net.bytebuddy.implementation.MethodDelegation; -import net.bytebuddy.implementation.bind.annotation.SuperCall; -import net.bytebuddy.implementation.bind.annotation.This; import org.apache.cassandra.concurrent.SEPExecutor; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.QueryProcessor; @@ -66,8 +70,6 @@ import org.apache.cassandra.service.QueryState; import org.apache.cassandra.service.reads.ReadCallback; import org.apache.cassandra.service.reads.thresholds.CoordinatorWarnings; import org.apache.cassandra.utils.Shared; -import org.assertj.core.api.Assertions; -import org.assertj.core.api.Condition; import static net.bytebuddy.matcher.ElementMatchers.named; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/distributed/org/apache/cassandra/distributed/test/topology/DecommissionAvoidTimeouts.java b/test/distributed/org/apache/cassandra/distributed/test/topology/DecommissionAvoidTimeouts.java index ddf59ae840..b775238fbd 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/topology/DecommissionAvoidTimeouts.java +++ b/test/distributed/org/apache/cassandra/distributed/test/topology/DecommissionAvoidTimeouts.java @@ -31,12 +31,13 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.distributed.Cluster; diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeAssassinateTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeAssassinateTest.java index 7712a040d9..c020fdcc66 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeAssassinateTest.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeAssassinateTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.distributed.upgrade; import com.google.common.collect.Streams; + import org.junit.Test; import org.apache.cassandra.distributed.api.Feature; diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeDelayedInitializeTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeDelayedInitializeTest.java index dc16786f0b..e1fffc74b7 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeDelayedInitializeTest.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeDelayedInitializeTest.java @@ -28,14 +28,16 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Consumer; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.awaitility.Awaitility; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.distributed.UpgradeableCluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.Feature; @@ -51,7 +53,6 @@ import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Shared; -import org.awaitility.Awaitility; import static net.bytebuddy.matcher.ElementMatchers.named; import static org.junit.Assert.assertEquals; diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHintsTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHintsTest.java index a55515f80f..0e854ca14d 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHintsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHintsTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.distributed.upgrade; import java.util.concurrent.TimeUnit; +import org.awaitility.Awaitility; import org.junit.Test; import org.apache.cassandra.distributed.api.ConsistencyLevel; @@ -27,7 +28,6 @@ import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.api.SimpleQueryResult; import org.apache.cassandra.metrics.HintsServiceMetrics; -import org.awaitility.Awaitility; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHostIdTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHostIdTest.java index 6f6ffb756e..3965555e8d 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHostIdTest.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHostIdTest.java @@ -24,6 +24,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Test; import org.apache.cassandra.distributed.Constants; diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeJoinRingTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeJoinRingTest.java index d9c2ef8b4c..76a9696cb5 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeJoinRingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeJoinRingTest.java @@ -18,10 +18,11 @@ package org.apache.cassandra.distributed.upgrade; -import org.junit.Test; - import java.util.Map; import java.util.concurrent.TimeUnit; + +import org.junit.Test; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.distributed.UpgradeableCluster; import org.apache.cassandra.distributed.api.Feature; diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeUnexpectedFailureTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeUnexpectedFailureTest.java index 8ab8dda4cc..646d4b8222 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeUnexpectedFailureTest.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeUnexpectedFailureTest.java @@ -23,12 +23,13 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; -import org.junit.Test; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import org.junit.Test; + import org.apache.cassandra.distributed.Constants; import org.apache.cassandra.distributed.UpgradeableCluster; import org.apache.cassandra.distributed.api.Feature; diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingWithProtocolTester.java b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingWithProtocolTester.java index 358bb8863e..69fb36574b 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingWithProtocolTester.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStoragePagingWithProtocolTester.java @@ -21,8 +21,6 @@ package org.apache.cassandra.distributed.upgrade; import java.nio.ByteBuffer; import java.util.List; -import org.junit.Test; - import com.datastax.driver.core.Cluster; import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.DataType; @@ -33,6 +31,9 @@ import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; import com.vdurmont.semver4j.Semver; + +import org.junit.Test; + import org.apache.cassandra.distributed.api.ConsistencyLevel; import static org.apache.cassandra.distributed.api.Feature.GOSSIP; diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactionHistorySystemTableUpgradeTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactionHistorySystemTableUpgradeTest.java index bd62bf7cf2..077ec6542b 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactionHistorySystemTableUpgradeTest.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactionHistorySystemTableUpgradeTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.distributed.upgrade; import com.google.common.collect.ImmutableMap; + import org.junit.Test; import org.apache.cassandra.db.compaction.OperationType; diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/ConfigCompatibilityTestGenerate.java b/test/distributed/org/apache/cassandra/distributed/upgrade/ConfigCompatibilityTestGenerate.java index 841bec92e1..23a3f21669 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/ConfigCompatibilityTestGenerate.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/ConfigCompatibilityTestGenerate.java @@ -20,9 +20,10 @@ package org.apache.cassandra.distributed.upgrade; import java.io.File; import java.util.Arrays; +import com.vdurmont.semver4j.Semver; + import org.apache.commons.lang3.ArrayUtils; -import com.vdurmont.semver4j.Semver; import org.apache.cassandra.config.Config; import org.apache.cassandra.distributed.UpgradeableCluster; import org.apache.cassandra.distributed.api.ICluster; diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeIndexTestBase.java b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeIndexTestBase.java index 1b1a656dac..37c3d73f4b 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeIndexTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeIndexTestBase.java @@ -25,6 +25,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import com.vdurmont.semver4j.Semver; + import org.apache.cassandra.distributed.UpgradeableCluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.Feature; diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java index 55092ab9b2..766bbef542 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java @@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.awaitility.Awaitility; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,9 +31,9 @@ import org.apache.cassandra.distributed.UpgradeableCluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.IUpgradeableInstance; -import org.awaitility.Awaitility; -import static org.apache.cassandra.distributed.shared.AssertUtils.*; +import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows; +import static org.apache.cassandra.distributed.shared.AssertUtils.row; public class MixedModeMessageForwardTest extends UpgradeTestBase { diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadRepairTTLTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadRepairTTLTest.java index ed7a9d7416..1fd2590bba 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadRepairTTLTest.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadRepairTTLTest.java @@ -23,10 +23,9 @@ import org.junit.Test; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.metrics.DefaultNameFactory; -import static org.junit.Assert.assertEquals; - import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows; import static org.apache.cassandra.distributed.shared.AssertUtils.row; +import static org.junit.Assert.assertEquals; /** * Test read repair on rows with TTLs when the cluster nodes are on different versions. diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTestBase.java b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTestBase.java index 95db3bebed..618f3ebb2e 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTestBase.java @@ -23,14 +23,15 @@ import java.util.function.BiConsumer; import java.util.stream.Stream; import org.agrona.collections.IntHashSet; +import org.assertj.core.api.Assertions; +import org.assertj.core.data.Offset; + import org.apache.cassandra.cql3.Attributes; import org.apache.cassandra.distributed.UpgradeableCluster; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.ICoordinator; import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.StorageCompatibilityMode; -import org.assertj.core.api.Assertions; -import org.assertj.core.data.Offset; import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL; import static org.apache.cassandra.distributed.api.ConsistencyLevel.LOCAL_ONE; diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeWritetimeOrTTLTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeWritetimeOrTTLTest.java index ad7143b158..6674335bd5 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeWritetimeOrTTLTest.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeWritetimeOrTTLTest.java @@ -22,12 +22,12 @@ import java.util.Arrays; import java.util.List; import java.util.Set; +import org.agrona.collections.IntHashSet; +import org.assertj.core.api.Assertions; import org.junit.Test; -import org.agrona.collections.IntHashSet; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.ICoordinator; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL; import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows; diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/Pre40MessageFilterTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/Pre40MessageFilterTest.java index 83895e6671..4aba07b5fb 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/Pre40MessageFilterTest.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/Pre40MessageFilterTest.java @@ -18,13 +18,13 @@ package org.apache.cassandra.distributed.upgrade; -import org.apache.cassandra.distributed.api.Feature; -import org.apache.cassandra.distributed.api.IInstanceConfig; +import java.util.function.Consumer; + import org.junit.Test; import org.apache.cassandra.distributed.api.ConsistencyLevel; - -import java.util.function.Consumer; +import org.apache.cassandra.distributed.api.Feature; +import org.apache.cassandra.distributed.api.IInstanceConfig; public class Pre40MessageFilterTest extends UpgradeTestBase { diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTest.java index 76977a7055..2005341eaf 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTest.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTest.java @@ -23,7 +23,8 @@ import org.junit.Test; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.Feature; -import static org.apache.cassandra.distributed.shared.AssertUtils.*; +import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows; +import static org.apache.cassandra.distributed.shared.AssertUtils.row; public class UpgradeTest extends UpgradeTestBase { diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java b/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java index 33c4139878..f7e4f8a5d7 100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java @@ -31,14 +31,15 @@ import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; +import com.vdurmont.semver4j.Semver; +import com.vdurmont.semver4j.Semver.SemverType; + import org.junit.After; import org.junit.Assume; import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.vdurmont.semver4j.Semver; -import com.vdurmont.semver4j.Semver.SemverType; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.distributed.UpgradeableCluster; diff --git a/test/distributed/org/apache/cassandra/distributed/util/DriverUtils.java b/test/distributed/org/apache/cassandra/distributed/util/DriverUtils.java index 46ed21ee9a..52d2c93335 100644 --- a/test/distributed/org/apache/cassandra/distributed/util/DriverUtils.java +++ b/test/distributed/org/apache/cassandra/distributed/util/DriverUtils.java @@ -23,8 +23,6 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import com.google.common.collect.Maps; - import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.Host; import com.datastax.driver.core.ResultSet; @@ -33,6 +31,8 @@ import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.exceptions.ReadFailureException; import com.datastax.driver.core.exceptions.WriteFailureException; +import com.google.common.collect.Maps; + import org.apache.cassandra.cql3.ast.Statement; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.IInstance; diff --git a/test/distributed/org/apache/cassandra/distributed/util/QueryResultUtil.java b/test/distributed/org/apache/cassandra/distributed/util/QueryResultUtil.java index bb6b975ca2..0d3fdff151 100644 --- a/test/distributed/org/apache/cassandra/distributed/util/QueryResultUtil.java +++ b/test/distributed/org/apache/cassandra/distributed/util/QueryResultUtil.java @@ -26,13 +26,15 @@ import java.util.function.Function; import java.util.function.Predicate; import com.google.monitoring.runtime.instrumentation.common.collect.Iterators; + +import org.assertj.core.api.Assertions; +import org.assertj.core.data.Index; + import org.apache.cassandra.distributed.api.QueryResults; import org.apache.cassandra.distributed.api.Row; import org.apache.cassandra.distributed.api.SimpleQueryResult; import org.apache.cassandra.distributed.shared.AssertUtils; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; -import org.assertj.core.api.Assertions; -import org.assertj.core.data.Index; public class QueryResultUtil { diff --git a/test/distributed/org/apache/cassandra/distributed/util/SingleHostLoadBalancingPolicy.java b/test/distributed/org/apache/cassandra/distributed/util/SingleHostLoadBalancingPolicy.java index 198baae8bb..653624d558 100644 --- a/test/distributed/org/apache/cassandra/distributed/util/SingleHostLoadBalancingPolicy.java +++ b/test/distributed/org/apache/cassandra/distributed/util/SingleHostLoadBalancingPolicy.java @@ -24,13 +24,12 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import com.google.common.collect.Iterators; - import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Host; import com.datastax.driver.core.HostDistance; import com.datastax.driver.core.Statement; import com.datastax.driver.core.policies.LoadBalancingPolicy; +import com.google.common.collect.Iterators; /** * A CQL driver {@link LoadBalancingPolicy} that only connects to a fixed host. diff --git a/test/distributed/org/apache/cassandra/distributed/util/byterewrite/Undead.java b/test/distributed/org/apache/cassandra/distributed/util/byterewrite/Undead.java index fec7dfe53a..6c8cbdf2ca 100644 --- a/test/distributed/org/apache/cassandra/distributed/util/byterewrite/Undead.java +++ b/test/distributed/org/apache/cassandra/distributed/util/byterewrite/Undead.java @@ -22,6 +22,7 @@ import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.SuperCall; + import org.apache.cassandra.gms.EndpointState; import org.apache.cassandra.utils.Shared; diff --git a/test/distributed/org/apache/cassandra/fuzz/ring/ConsistentLeaveTest.java b/test/distributed/org/apache/cassandra/fuzz/ring/ConsistentLeaveTest.java index 218575e7bf..bb9fd4867c 100644 --- a/test/distributed/org/apache/cassandra/fuzz/ring/ConsistentLeaveTest.java +++ b/test/distributed/org/apache/cassandra/fuzz/ring/ConsistentLeaveTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Assert; import org.junit.Test; diff --git a/test/distributed/org/apache/cassandra/fuzz/ring/ConsistentMoveTest.java b/test/distributed/org/apache/cassandra/fuzz/ring/ConsistentMoveTest.java index 8fcac18f04..7f4d3ad5df 100644 --- a/test/distributed/org/apache/cassandra/fuzz/ring/ConsistentMoveTest.java +++ b/test/distributed/org/apache/cassandra/fuzz/ring/ConsistentMoveTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/distributed/org/apache/cassandra/fuzz/sai/SingleNodeSAITestBase.java b/test/distributed/org/apache/cassandra/fuzz/sai/SingleNodeSAITestBase.java index c0879d07d6..bbe74c34a1 100644 --- a/test/distributed/org/apache/cassandra/fuzz/sai/SingleNodeSAITestBase.java +++ b/test/distributed/org/apache/cassandra/fuzz/sai/SingleNodeSAITestBase.java @@ -27,6 +27,7 @@ import java.util.function.Consumer; import java.util.function.Supplier; import com.google.common.collect.Streams; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/distributed/org/apache/cassandra/fuzz/snapshots/SnapshotsTest.java b/test/distributed/org/apache/cassandra/fuzz/snapshots/SnapshotsTest.java index 2145a0ac6a..cf261fcab5 100644 --- a/test/distributed/org/apache/cassandra/fuzz/snapshots/SnapshotsTest.java +++ b/test/distributed/org/apache/cassandra/fuzz/snapshots/SnapshotsTest.java @@ -33,16 +33,22 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; import java.util.concurrent.TimeUnit; + import javax.management.openmbean.TabularData; import com.google.common.collect.MapDifference; import com.google.common.collect.MapDifference.ValueDifference; import com.google.common.collect.Maps; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Test; +import org.quicktheories.core.RandomnessSource; +import org.quicktheories.generators.SourceDSL; +import org.quicktheories.impl.JavaRandom; import accord.utils.Property.StateOnlyCommand; import accord.utils.RandomSource; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.IInvokableInstance; @@ -61,9 +67,6 @@ import org.apache.cassandra.service.snapshot.TableSnapshot; import org.apache.cassandra.utils.Generators; import org.apache.cassandra.utils.LocalizeString; import org.apache.cassandra.utils.Pair; -import org.quicktheories.core.RandomnessSource; -import org.quicktheories.generators.SourceDSL; -import org.quicktheories.impl.JavaRandom; import static accord.utils.Property.commands; import static accord.utils.Property.stateful; diff --git a/test/distributed/org/apache/cassandra/fuzz/topology/AccordBounceTest.java b/test/distributed/org/apache/cassandra/fuzz/topology/AccordBounceTest.java index b6aeb6231d..69d12bf9ee 100644 --- a/test/distributed/org/apache/cassandra/fuzz/topology/AccordBounceTest.java +++ b/test/distributed/org/apache/cassandra/fuzz/topology/AccordBounceTest.java @@ -18,7 +18,18 @@ package org.apache.cassandra.fuzz.topology; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Supplier; + +import org.junit.Test; + import accord.primitives.Range; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.shared.ClusterUtils; @@ -32,10 +43,6 @@ import org.apache.cassandra.harry.gen.Generator; import org.apache.cassandra.harry.gen.SchemaGenerators; import org.apache.cassandra.service.accord.AccordService; import org.apache.cassandra.service.consensus.TransactionalMode; -import org.junit.Test; - -import java.util.*; -import java.util.function.Supplier; import static org.apache.cassandra.harry.checker.TestHelper.withRandom; diff --git a/test/distributed/org/apache/cassandra/fuzz/topology/AccordTopologyMixupTest.java b/test/distributed/org/apache/cassandra/fuzz/topology/AccordTopologyMixupTest.java index e12b4860dc..3f5a8ef12c 100644 --- a/test/distributed/org/apache/cassandra/fuzz/topology/AccordTopologyMixupTest.java +++ b/test/distributed/org/apache/cassandra/fuzz/topology/AccordTopologyMixupTest.java @@ -27,8 +27,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.annotation.Nullable; +import org.quicktheories.generators.SourceDSL; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,6 +46,7 @@ import accord.utils.Invariants; import accord.utils.Property; import accord.utils.Property.Command; import accord.utils.RandomSource; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.Config; import org.apache.cassandra.cql3.ast.CQLFormatter; @@ -76,7 +79,6 @@ import org.apache.cassandra.utils.Generators; import org.apache.cassandra.utils.Isolated; import org.apache.cassandra.utils.Retry; import org.apache.cassandra.utils.Shared; -import org.quicktheories.generators.SourceDSL; import static org.apache.cassandra.schema.SchemaConstants.VIRTUAL_VIEWS; import static org.apache.cassandra.utils.AbstractTypeGenerators.overridePrimitiveTypeSupport; diff --git a/test/distributed/org/apache/cassandra/fuzz/topology/HarryOnAccordTopologyMixupTest.java b/test/distributed/org/apache/cassandra/fuzz/topology/HarryOnAccordTopologyMixupTest.java index f133540146..fd92c55e22 100644 --- a/test/distributed/org/apache/cassandra/fuzz/topology/HarryOnAccordTopologyMixupTest.java +++ b/test/distributed/org/apache/cassandra/fuzz/topology/HarryOnAccordTopologyMixupTest.java @@ -23,6 +23,7 @@ import accord.utils.Gen; import accord.utils.Invariants; import accord.utils.Property; import accord.utils.RandomSource; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.distributed.api.IInstanceConfig; import org.apache.cassandra.distributed.shared.ClusterUtils; diff --git a/test/distributed/org/apache/cassandra/fuzz/topology/HarryTopologyMixupTest.java b/test/distributed/org/apache/cassandra/fuzz/topology/HarryTopologyMixupTest.java index 816c38f11a..d54ffc3367 100644 --- a/test/distributed/org/apache/cassandra/fuzz/topology/HarryTopologyMixupTest.java +++ b/test/distributed/org/apache/cassandra/fuzz/topology/HarryTopologyMixupTest.java @@ -24,9 +24,12 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; + import javax.annotation.Nullable; import com.google.common.base.Throwables; + +import org.assertj.core.api.Condition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,6 +40,7 @@ import accord.utils.Property.Command; import accord.utils.Property.PreCheckResult; import accord.utils.Property.SimpleCommand; import accord.utils.RandomSource; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.IInstanceConfig; import org.apache.cassandra.distributed.shared.ClusterUtils; @@ -54,7 +58,6 @@ import org.apache.cassandra.harry.gen.rng.JdkRandomEntropySource; import org.apache.cassandra.harry.op.Operations; import org.apache.cassandra.service.consensus.TransactionalMode; import org.apache.cassandra.utils.AssertionUtils; -import org.assertj.core.api.Condition; import static org.apache.cassandra.distributed.shared.ClusterUtils.waitForCMSToQuiesce; diff --git a/test/distributed/org/apache/cassandra/fuzz/topology/JournalGCTest.java b/test/distributed/org/apache/cassandra/fuzz/topology/JournalGCTest.java index e4c497657d..d70192f136 100644 --- a/test/distributed/org/apache/cassandra/fuzz/topology/JournalGCTest.java +++ b/test/distributed/org/apache/cassandra/fuzz/topology/JournalGCTest.java @@ -26,6 +26,7 @@ import org.junit.Assert; import org.junit.Test; import accord.primitives.TxnId; + import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; diff --git a/test/distributed/org/apache/cassandra/fuzz/topology/TopologyMixupTestBase.java b/test/distributed/org/apache/cassandra/fuzz/topology/TopologyMixupTestBase.java index a4341dddeb..9fa798bb63 100644 --- a/test/distributed/org/apache/cassandra/fuzz/topology/TopologyMixupTestBase.java +++ b/test/distributed/org/apache/cassandra/fuzz/topology/TopologyMixupTestBase.java @@ -18,7 +18,6 @@ package org.apache.cassandra.fuzz.topology; -import javax.annotation.Nullable; import java.io.IOException; import java.io.UncheckedIOException; import java.net.InetSocketAddress; @@ -43,17 +42,15 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; +import javax.annotation.Nullable; + import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + import org.agrona.collections.Int2ObjectHashMap; import org.agrona.collections.IntArrayList; import org.agrona.collections.IntHashSet; -import org.apache.cassandra.distributed.Constants; -import org.apache.cassandra.distributed.api.ICoordinator; -import org.apache.cassandra.distributed.api.QueryResults; -import org.apache.cassandra.distributed.api.SimpleQueryResult; - import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,13 +62,18 @@ import accord.utils.Property; import accord.utils.Property.Command; import accord.utils.Property.SimpleCommand; import accord.utils.RandomSource; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.YamlConfigurationLoader; import org.apache.cassandra.distributed.Cluster; +import org.apache.cassandra.distributed.Constants; import org.apache.cassandra.distributed.api.Feature; +import org.apache.cassandra.distributed.api.ICoordinator; import org.apache.cassandra.distributed.api.IInstanceConfig; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.api.NodeToolResult; +import org.apache.cassandra.distributed.api.QueryResults; +import org.apache.cassandra.distributed.api.SimpleQueryResult; import org.apache.cassandra.distributed.api.TokenSupplier; import org.apache.cassandra.distributed.impl.INodeProvisionStrategy; import org.apache.cassandra.distributed.impl.InstanceConfig; @@ -92,7 +94,11 @@ import static accord.utils.Property.commands; import static accord.utils.Property.ignoreCommand; import static accord.utils.Property.multistep; import static accord.utils.Property.stateful; -import static org.apache.cassandra.harry.model.TokenPlacementModel.*; +import static org.apache.cassandra.harry.model.TokenPlacementModel.Range; +import static org.apache.cassandra.harry.model.TokenPlacementModel.Replica; +import static org.apache.cassandra.harry.model.TokenPlacementModel.ReplicatedRanges; +import static org.apache.cassandra.harry.model.TokenPlacementModel.ReplicationFactor; +import static org.apache.cassandra.harry.model.TokenPlacementModel.SimpleReplicationFactor; /** * These tests can create many instances, so mac users may need to run the following to avoid address bind failures diff --git a/test/distributed/org/apache/cassandra/service/accord/AccordJournalBurnTest.java b/test/distributed/org/apache/cassandra/service/accord/AccordJournalBurnTest.java index 2d27acbc4c..aba9a8c69e 100644 --- a/test/distributed/org/apache/cassandra/service/accord/AccordJournalBurnTest.java +++ b/test/distributed/org/apache/cassandra/service/accord/AccordJournalBurnTest.java @@ -30,6 +30,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; + import javax.annotation.Nullable; import org.junit.Before; @@ -53,6 +54,7 @@ import accord.utils.DefaultRandom; import accord.utils.Invariants; import accord.utils.PersistentField; import accord.utils.RandomSource; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; diff --git a/test/distributed/org/apache/cassandra/service/accord/AccordJournalCompactionTest.java b/test/distributed/org/apache/cassandra/service/accord/AccordJournalCompactionTest.java index 2585a8c87b..3290a0e7a1 100644 --- a/test/distributed/org/apache/cassandra/service/accord/AccordJournalCompactionTest.java +++ b/test/distributed/org/apache/cassandra/service/accord/AccordJournalCompactionTest.java @@ -23,6 +23,7 @@ import java.util.NavigableMap; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.collect.ImmutableSortedMap; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -39,6 +40,7 @@ import accord.utils.AccordGens; import accord.utils.DefaultRandom; import accord.utils.Gen; import accord.utils.RandomSource; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/test/distributed/org/apache/cassandra/service/accord/BurnTestKeySerializers.java b/test/distributed/org/apache/cassandra/service/accord/BurnTestKeySerializers.java index b11191219f..50936d902c 100644 --- a/test/distributed/org/apache/cassandra/service/accord/BurnTestKeySerializers.java +++ b/test/distributed/org/apache/cassandra/service/accord/BurnTestKeySerializers.java @@ -40,6 +40,7 @@ import accord.primitives.Keys; import accord.primitives.Range; import accord.primitives.Seekables; import accord.primitives.TxnId; + import org.apache.cassandra.io.ParameterisedVersionedSerializer; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/test/distributed/org/apache/cassandra/service/accord/NemesisAccordSegmentCompactor.java b/test/distributed/org/apache/cassandra/service/accord/NemesisAccordSegmentCompactor.java index 9c8a4f869c..a8c1139737 100644 --- a/test/distributed/org/apache/cassandra/service/accord/NemesisAccordSegmentCompactor.java +++ b/test/distributed/org/apache/cassandra/service/accord/NemesisAccordSegmentCompactor.java @@ -23,6 +23,7 @@ import java.util.HashSet; import java.util.Set; import accord.utils.RandomSource; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.rows.EncodingStats; diff --git a/test/harry/main/org/apache/cassandra/harry/ColumnSpec.java b/test/harry/main/org/apache/cassandra/harry/ColumnSpec.java index 1bad365240..6015b6b644 100644 --- a/test/harry/main/org/apache/cassandra/harry/ColumnSpec.java +++ b/test/harry/main/org/apache/cassandra/harry/ColumnSpec.java @@ -33,6 +33,7 @@ import java.util.Objects; import java.util.UUID; import accord.utils.Invariants; + import org.apache.cassandra.cql3.ast.Symbol; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.AsciiType; diff --git a/test/harry/main/org/apache/cassandra/harry/cql/DeleteHelper.java b/test/harry/main/org/apache/cassandra/harry/cql/DeleteHelper.java index 1a237f5828..8b0e1ccea2 100644 --- a/test/harry/main/org/apache/cassandra/harry/cql/DeleteHelper.java +++ b/test/harry/main/org/apache/cassandra/harry/cql/DeleteHelper.java @@ -27,8 +27,8 @@ import org.apache.cassandra.cql3.ast.Symbol; import org.apache.cassandra.harry.ColumnSpec; import org.apache.cassandra.harry.Relations; import org.apache.cassandra.harry.SchemaSpec; -import org.apache.cassandra.harry.op.Operations; import org.apache.cassandra.harry.execution.CompiledStatement; +import org.apache.cassandra.harry.op.Operations; import org.apache.cassandra.harry.util.BitSet; public class DeleteHelper diff --git a/test/harry/main/org/apache/cassandra/harry/cql/SelectHelper.java b/test/harry/main/org/apache/cassandra/harry/cql/SelectHelper.java index 599a28be17..8e71ae114e 100644 --- a/test/harry/main/org/apache/cassandra/harry/cql/SelectHelper.java +++ b/test/harry/main/org/apache/cassandra/harry/cql/SelectHelper.java @@ -28,10 +28,10 @@ import org.apache.cassandra.cql3.ast.FunctionCall; import org.apache.cassandra.cql3.ast.Select; import org.apache.cassandra.cql3.ast.Symbol; import org.apache.cassandra.harry.ColumnSpec; -import org.apache.cassandra.harry.op.Operations; import org.apache.cassandra.harry.Relations; import org.apache.cassandra.harry.SchemaSpec; import org.apache.cassandra.harry.execution.CompiledStatement; +import org.apache.cassandra.harry.op.Operations; public class SelectHelper { diff --git a/test/harry/main/org/apache/cassandra/harry/cql/WriteHelper.java b/test/harry/main/org/apache/cassandra/harry/cql/WriteHelper.java index b3143a7043..48e9f10ed6 100644 --- a/test/harry/main/org/apache/cassandra/harry/cql/WriteHelper.java +++ b/test/harry/main/org/apache/cassandra/harry/cql/WriteHelper.java @@ -21,6 +21,7 @@ package org.apache.cassandra.harry.cql; import java.util.List; import accord.utils.Invariants; + import org.apache.cassandra.harry.ColumnSpec; import org.apache.cassandra.harry.MagicConstants; import org.apache.cassandra.harry.SchemaSpec; diff --git a/test/harry/main/org/apache/cassandra/harry/dsl/HistoryBuilder.java b/test/harry/main/org/apache/cassandra/harry/dsl/HistoryBuilder.java index c4565a0a74..36514296cc 100644 --- a/test/harry/main/org/apache/cassandra/harry/dsl/HistoryBuilder.java +++ b/test/harry/main/org/apache/cassandra/harry/dsl/HistoryBuilder.java @@ -36,9 +36,9 @@ import org.apache.cassandra.harry.gen.IndexGenerators; import org.apache.cassandra.harry.gen.InvertibleGenerator; import org.apache.cassandra.harry.gen.ValueGenerators; import org.apache.cassandra.harry.gen.rng.JdkRandomEntropySource; +import org.apache.cassandra.harry.model.Model; import org.apache.cassandra.harry.op.Operations; import org.apache.cassandra.harry.op.Visit; -import org.apache.cassandra.harry.model.Model; import org.apache.cassandra.harry.util.BitSet; import org.apache.cassandra.harry.util.IteratorsUtil; diff --git a/test/harry/main/org/apache/cassandra/harry/dsl/SingleOperationVisitBuilder.java b/test/harry/main/org/apache/cassandra/harry/dsl/SingleOperationVisitBuilder.java index 263f15648c..bd8579fef7 100644 --- a/test/harry/main/org/apache/cassandra/harry/dsl/SingleOperationVisitBuilder.java +++ b/test/harry/main/org/apache/cassandra/harry/dsl/SingleOperationVisitBuilder.java @@ -27,17 +27,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + +import org.apache.cassandra.harry.MagicConstants; +import org.apache.cassandra.harry.Relations; import org.apache.cassandra.harry.gen.IndexGenerators; import org.apache.cassandra.harry.gen.rng.PCGFastPure; import org.apache.cassandra.harry.gen.rng.PureRng; import org.apache.cassandra.harry.gen.rng.SeedableEntropySource; -import org.apache.cassandra.harry.MagicConstants; -import org.apache.cassandra.harry.Relations; import org.apache.cassandra.harry.op.Operations; import org.apache.cassandra.harry.op.Visit; import org.apache.cassandra.harry.util.BitSet; -import static org.apache.cassandra.harry.dsl.HistoryBuilder.*; +import static org.apache.cassandra.harry.dsl.HistoryBuilder.IndexedValueGenerators; import static org.apache.cassandra.harry.op.Operations.Kind; import static org.apache.cassandra.harry.op.Operations.Operation; import static org.apache.cassandra.harry.op.Operations.WriteOp; diff --git a/test/harry/main/org/apache/cassandra/harry/dsl/TestRunner.java b/test/harry/main/org/apache/cassandra/harry/dsl/TestRunner.java index 1bbf6b56c8..19ad49ff75 100644 --- a/test/harry/main/org/apache/cassandra/harry/dsl/TestRunner.java +++ b/test/harry/main/org/apache/cassandra/harry/dsl/TestRunner.java @@ -24,8 +24,8 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; -import org.apache.cassandra.harry.gen.Generator; import org.apache.cassandra.harry.gen.EntropySource; +import org.apache.cassandra.harry.gen.Generator; public class TestRunner { diff --git a/test/harry/main/org/apache/cassandra/harry/execution/CQLTesterVisitExecutor.java b/test/harry/main/org/apache/cassandra/harry/execution/CQLTesterVisitExecutor.java index 752ea37379..4a514169d0 100644 --- a/test/harry/main/org/apache/cassandra/harry/execution/CQLTesterVisitExecutor.java +++ b/test/harry/main/org/apache/cassandra/harry/execution/CQLTesterVisitExecutor.java @@ -26,14 +26,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.harry.ColumnSpec; import org.apache.cassandra.harry.SchemaSpec; -import org.apache.cassandra.harry.op.Visit; -import org.apache.cassandra.harry.op.Operations; import org.apache.cassandra.harry.model.Model; +import org.apache.cassandra.harry.op.Operations; +import org.apache.cassandra.harry.op.Visit; -import static org.apache.cassandra.harry.MagicConstants.*; +import static org.apache.cassandra.harry.MagicConstants.LTS_UNKNOWN; +import static org.apache.cassandra.harry.MagicConstants.NIL_DESCR; +import static org.apache.cassandra.harry.MagicConstants.NIL_KEY; +import static org.apache.cassandra.harry.MagicConstants.UNKNOWN_DESCR; +import static org.apache.cassandra.harry.MagicConstants.UNSET_DESCR; public class CQLTesterVisitExecutor extends CQLVisitExecutor { diff --git a/test/harry/main/org/apache/cassandra/harry/execution/CQLVisitExecutor.java b/test/harry/main/org/apache/cassandra/harry/execution/CQLVisitExecutor.java index dc4eb227c4..c482842b6a 100644 --- a/test/harry/main/org/apache/cassandra/harry/execution/CQLVisitExecutor.java +++ b/test/harry/main/org/apache/cassandra/harry/execution/CQLVisitExecutor.java @@ -26,6 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.harry.SchemaSpec; import org.apache.cassandra.harry.model.Model; diff --git a/test/harry/main/org/apache/cassandra/harry/execution/DataTracker.java b/test/harry/main/org/apache/cassandra/harry/execution/DataTracker.java index c27d52385e..ec2b1d95c9 100644 --- a/test/harry/main/org/apache/cassandra/harry/execution/DataTracker.java +++ b/test/harry/main/org/apache/cassandra/harry/execution/DataTracker.java @@ -28,9 +28,10 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicLong; import accord.utils.Invariants; -import org.apache.cassandra.harry.op.Visit; -import org.apache.cassandra.harry.op.Operations; + import org.apache.cassandra.harry.model.Model; +import org.apache.cassandra.harry.op.Operations; +import org.apache.cassandra.harry.op.Visit; import static org.apache.cassandra.harry.op.Operations.Kind.CUSTOM; import static org.apache.cassandra.harry.op.Operations.Kind.SELECT_CUSTOM; diff --git a/test/harry/main/org/apache/cassandra/harry/execution/InJvmDTestVisitExecutor.java b/test/harry/main/org/apache/cassandra/harry/execution/InJvmDTestVisitExecutor.java index 282e02505c..ee00dfaaa8 100644 --- a/test/harry/main/org/apache/cassandra/harry/execution/InJvmDTestVisitExecutor.java +++ b/test/harry/main/org/apache/cassandra/harry/execution/InJvmDTestVisitExecutor.java @@ -25,10 +25,12 @@ import java.util.List; import java.util.function.Function; import com.google.common.base.Throwables; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.ICluster; import org.apache.cassandra.exceptions.RequestTimeoutException; @@ -46,7 +48,7 @@ import static org.apache.cassandra.harry.MagicConstants.NIL_DESCR; import static org.apache.cassandra.harry.MagicConstants.NIL_KEY; import static org.apache.cassandra.harry.MagicConstants.UNKNOWN_DESCR; import static org.apache.cassandra.harry.MagicConstants.UNSET_DESCR; -import static org.apache.cassandra.harry.execution.QueryBuildingVisitExecutor.*; +import static org.apache.cassandra.harry.execution.QueryBuildingVisitExecutor.WrapQueries; public class InJvmDTestVisitExecutor extends CQLVisitExecutor { diff --git a/test/harry/main/org/apache/cassandra/harry/execution/QueryBuildingVisitExecutor.java b/test/harry/main/org/apache/cassandra/harry/execution/QueryBuildingVisitExecutor.java index e791f6f12c..a22e393141 100644 --- a/test/harry/main/org/apache/cassandra/harry/execution/QueryBuildingVisitExecutor.java +++ b/test/harry/main/org/apache/cassandra/harry/execution/QueryBuildingVisitExecutor.java @@ -28,6 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + import org.apache.cassandra.harry.SchemaSpec; import org.apache.cassandra.harry.cql.DeleteHelper; import org.apache.cassandra.harry.cql.SelectHelper; diff --git a/test/harry/main/org/apache/cassandra/harry/execution/ResultSetRow.java b/test/harry/main/org/apache/cassandra/harry/execution/ResultSetRow.java index 3bc40dbb1e..bc06f479ae 100644 --- a/test/harry/main/org/apache/cassandra/harry/execution/ResultSetRow.java +++ b/test/harry/main/org/apache/cassandra/harry/execution/ResultSetRow.java @@ -18,14 +18,14 @@ package org.apache.cassandra.harry.execution; -import org.apache.cassandra.harry.gen.Bijections; -import org.apache.cassandra.harry.gen.ValueGenerators; -import org.apache.cassandra.harry.util.StringUtils; - import java.util.Arrays; import java.util.Objects; import java.util.function.IntFunction; +import org.apache.cassandra.harry.gen.Bijections; +import org.apache.cassandra.harry.gen.ValueGenerators; +import org.apache.cassandra.harry.util.StringUtils; + public class ResultSetRow { public final long pd; diff --git a/test/harry/main/org/apache/cassandra/harry/execution/RingAwareInJvmDTestVisitExecutor.java b/test/harry/main/org/apache/cassandra/harry/execution/RingAwareInJvmDTestVisitExecutor.java index 5489707bad..9905e86b6f 100644 --- a/test/harry/main/org/apache/cassandra/harry/execution/RingAwareInJvmDTestVisitExecutor.java +++ b/test/harry/main/org/apache/cassandra/harry/execution/RingAwareInJvmDTestVisitExecutor.java @@ -26,17 +26,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.ICluster; import org.apache.cassandra.distributed.api.ICoordinator; import org.apache.cassandra.distributed.api.IInstance; import org.apache.cassandra.harry.SchemaSpec; -import org.apache.cassandra.harry.op.Visit; -import org.apache.cassandra.harry.op.Operations; import org.apache.cassandra.harry.model.Model; import org.apache.cassandra.harry.model.QuiescentChecker; import org.apache.cassandra.harry.model.TokenPlacementModel; +import org.apache.cassandra.harry.op.Operations; +import org.apache.cassandra.harry.op.Visit; import org.apache.cassandra.harry.util.ByteUtils; import org.apache.cassandra.harry.util.TokenUtil; diff --git a/test/harry/main/org/apache/cassandra/harry/gen/Generators.java b/test/harry/main/org/apache/cassandra/harry/gen/Generators.java index 94825d020b..c8e166956b 100644 --- a/test/harry/main/org/apache/cassandra/harry/gen/Generators.java +++ b/test/harry/main/org/apache/cassandra/harry/gen/Generators.java @@ -32,6 +32,7 @@ import java.util.UUID; import java.util.function.Supplier; import accord.utils.Invariants; + import org.apache.cassandra.harry.util.BitSet; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.utils.TimeUUID; diff --git a/test/harry/main/org/apache/cassandra/harry/gen/InvertibleGenerator.java b/test/harry/main/org/apache/cassandra/harry/gen/InvertibleGenerator.java index f16185da37..295ffdff80 100644 --- a/test/harry/main/org/apache/cassandra/harry/gen/InvertibleGenerator.java +++ b/test/harry/main/org/apache/cassandra/harry/gen/InvertibleGenerator.java @@ -27,8 +27,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import accord.utils.Invariants; import org.agrona.collections.IntHashSet; + +import accord.utils.Invariants; + import org.apache.cassandra.harry.ColumnSpec; import org.apache.cassandra.harry.MagicConstants; import org.apache.cassandra.harry.dsl.HistoryBuilder; diff --git a/test/harry/main/org/apache/cassandra/harry/gen/Surjections.java b/test/harry/main/org/apache/cassandra/harry/gen/Surjections.java index 2358884ccb..3e9c11c366 100644 --- a/test/harry/main/org/apache/cassandra/harry/gen/Surjections.java +++ b/test/harry/main/org/apache/cassandra/harry/gen/Surjections.java @@ -27,6 +27,7 @@ import java.util.function.LongFunction; import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; + import org.apache.cassandra.harry.gen.rng.PcgRSUFast; import org.apache.cassandra.harry.gen.rng.RngUtils; diff --git a/test/harry/main/org/apache/cassandra/harry/gen/rng/SeedableEntropySource.java b/test/harry/main/org/apache/cassandra/harry/gen/rng/SeedableEntropySource.java index 48afebe4c2..2306966aeb 100644 --- a/test/harry/main/org/apache/cassandra/harry/gen/rng/SeedableEntropySource.java +++ b/test/harry/main/org/apache/cassandra/harry/gen/rng/SeedableEntropySource.java @@ -21,9 +21,10 @@ package org.apache.cassandra.harry.gen.rng; import java.util.function.Consumer; import java.util.function.Function; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.harry.gen.EntropySource; +import io.netty.util.concurrent.FastThreadLocal; + public class SeedableEntropySource { private static final FastThreadLocal THREAD_LOCAL = new FastThreadLocal<>(); diff --git a/test/harry/main/org/apache/cassandra/harry/model/ASTSingleTableModel.java b/test/harry/main/org/apache/cassandra/harry/model/ASTSingleTableModel.java index 805857ea98..52c30be260 100644 --- a/test/harry/main/org/apache/cassandra/harry/model/ASTSingleTableModel.java +++ b/test/harry/main/org/apache/cassandra/harry/model/ASTSingleTableModel.java @@ -40,20 +40,24 @@ import java.util.function.Function; import java.util.function.IntFunction; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.annotation.Nullable; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import org.assertj.core.api.Assertions; +import org.assertj.core.api.ThrowableAssert; import accord.utils.Invariants; + import org.apache.cassandra.cql3.KnownIssue; import org.apache.cassandra.cql3.ast.AssignmentOperator; import org.apache.cassandra.cql3.ast.CasCondition; import org.apache.cassandra.cql3.ast.CollectionAccess; -import org.apache.cassandra.cql3.ast.Conditional.Where.Inequality; import org.apache.cassandra.cql3.ast.Conditional; +import org.apache.cassandra.cql3.ast.Conditional.Where.Inequality; import org.apache.cassandra.cql3.ast.Element; import org.apache.cassandra.cql3.ast.Expression; import org.apache.cassandra.cql3.ast.ExpressionEvaluator; @@ -89,8 +93,6 @@ import org.apache.cassandra.utils.AssertionUtils; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.ImmutableUniqueList; import org.apache.cassandra.utils.Pair; -import org.assertj.core.api.Assertions; -import org.assertj.core.api.ThrowableAssert; import static org.apache.cassandra.cql3.ast.Elements.symbols; import static org.apache.cassandra.harry.MagicConstants.NO_TIMESTAMP; diff --git a/test/harry/main/org/apache/cassandra/harry/model/ASTSingleTableModelTest.java b/test/harry/main/org/apache/cassandra/harry/model/ASTSingleTableModelTest.java index fbd9e07832..7115d4eefb 100644 --- a/test/harry/main/org/apache/cassandra/harry/model/ASTSingleTableModelTest.java +++ b/test/harry/main/org/apache/cassandra/harry/model/ASTSingleTableModelTest.java @@ -34,6 +34,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import com.google.common.collect.ImmutableList; + import org.junit.Test; import org.apache.cassandra.cql3.ast.AssignmentOperator; diff --git a/test/harry/main/org/apache/cassandra/harry/model/BytesPartitionState.java b/test/harry/main/org/apache/cassandra/harry/model/BytesPartitionState.java index 1c9c361c4b..b64d9613bb 100644 --- a/test/harry/main/org/apache/cassandra/harry/model/BytesPartitionState.java +++ b/test/harry/main/org/apache/cassandra/harry/model/BytesPartitionState.java @@ -30,6 +30,7 @@ import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.annotation.Nullable; import com.google.common.collect.Sets; diff --git a/test/harry/main/org/apache/cassandra/harry/model/Model.java b/test/harry/main/org/apache/cassandra/harry/model/Model.java index 642488014d..08b72c25d1 100644 --- a/test/harry/main/org/apache/cassandra/harry/model/Model.java +++ b/test/harry/main/org/apache/cassandra/harry/model/Model.java @@ -20,8 +20,8 @@ package org.apache.cassandra.harry.model; import java.util.List; -import org.apache.cassandra.harry.op.Operations; import org.apache.cassandra.harry.execution.ResultSetRow; +import org.apache.cassandra.harry.op.Operations; import org.apache.cassandra.harry.op.Visit; public interface Model diff --git a/test/harry/main/org/apache/cassandra/harry/model/PartitionState.java b/test/harry/main/org/apache/cassandra/harry/model/PartitionState.java index 6c426e8fcc..8701c452ce 100644 --- a/test/harry/main/org/apache/cassandra/harry/model/PartitionState.java +++ b/test/harry/main/org/apache/cassandra/harry/model/PartitionState.java @@ -18,6 +18,21 @@ package org.apache.cassandra.harry.model; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NavigableMap; +import java.util.TreeMap; +import java.util.function.IntFunction; +import java.util.stream.LongStream; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.harry.MagicConstants; import org.apache.cassandra.harry.Relations; import org.apache.cassandra.harry.gen.Bijections; @@ -25,12 +40,6 @@ import org.apache.cassandra.harry.gen.ValueGenerators; import org.apache.cassandra.harry.op.Operations; import org.apache.cassandra.harry.util.BitSet; import org.apache.cassandra.harry.util.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; -import java.util.function.IntFunction; -import java.util.stream.LongStream; public class PartitionState implements Iterable { diff --git a/test/harry/main/org/apache/cassandra/harry/model/PartitionStateBuilder.java b/test/harry/main/org/apache/cassandra/harry/model/PartitionStateBuilder.java index d67a9ed215..d70ecad1b4 100644 --- a/test/harry/main/org/apache/cassandra/harry/model/PartitionStateBuilder.java +++ b/test/harry/main/org/apache/cassandra/harry/model/PartitionStateBuilder.java @@ -26,11 +26,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.harry.MagicConstants; -import org.apache.cassandra.harry.gen.ValueGenerators; import org.apache.cassandra.harry.execution.VisitExecutor; +import org.apache.cassandra.harry.gen.ValueGenerators; -import static org.apache.cassandra.harry.op.Operations.*; +import static org.apache.cassandra.harry.op.Operations.DeleteColumnsOp; +import static org.apache.cassandra.harry.op.Operations.DeleteRange; +import static org.apache.cassandra.harry.op.Operations.DeleteRow; import static org.apache.cassandra.harry.op.Operations.Kind.INSERT; +import static org.apache.cassandra.harry.op.Operations.Operation; +import static org.apache.cassandra.harry.op.Operations.WriteOp; class PartitionStateBuilder extends VisitExecutor { diff --git a/test/harry/main/org/apache/cassandra/harry/model/QuiescentChecker.java b/test/harry/main/org/apache/cassandra/harry/model/QuiescentChecker.java index 1b2efb14e9..600f388515 100644 --- a/test/harry/main/org/apache/cassandra/harry/model/QuiescentChecker.java +++ b/test/harry/main/org/apache/cassandra/harry/model/QuiescentChecker.java @@ -25,10 +25,11 @@ import java.util.List; import java.util.NavigableMap; import accord.utils.Invariants; + import org.apache.cassandra.harry.execution.DataTracker; -import org.apache.cassandra.harry.op.Operations; import org.apache.cassandra.harry.execution.ResultSetRow; import org.apache.cassandra.harry.gen.ValueGenerators; +import org.apache.cassandra.harry.op.Operations; import static org.apache.cassandra.harry.MagicConstants.LTS_UNKNOWN; import static org.apache.cassandra.harry.MagicConstants.NIL_DESCR; diff --git a/test/harry/main/org/apache/cassandra/harry/model/Reconciler.java b/test/harry/main/org/apache/cassandra/harry/model/Reconciler.java index c0956d51c2..557e368af0 100644 --- a/test/harry/main/org/apache/cassandra/harry/model/Reconciler.java +++ b/test/harry/main/org/apache/cassandra/harry/model/Reconciler.java @@ -23,8 +23,8 @@ import java.util.Iterator; import java.util.Map; import org.apache.cassandra.harry.gen.ValueGenerators; -import org.apache.cassandra.harry.op.Visit; import org.apache.cassandra.harry.op.Operations; +import org.apache.cassandra.harry.op.Visit; import static org.apache.cassandra.harry.op.Operations.Operation; diff --git a/test/harry/main/org/apache/cassandra/harry/model/TokenPlacementModel.java b/test/harry/main/org/apache/cassandra/harry/model/TokenPlacementModel.java index c9dcbcb137..a1bc0a37a4 100644 --- a/test/harry/main/org/apache/cassandra/harry/model/TokenPlacementModel.java +++ b/test/harry/main/org/apache/cassandra/harry/model/TokenPlacementModel.java @@ -20,7 +20,19 @@ package org.apache.cassandra.harry.model; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NavigableMap; +import java.util.Objects; +import java.util.Set; +import java.util.TreeMap; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/test/harry/main/org/apache/cassandra/harry/op/Operations.java b/test/harry/main/org/apache/cassandra/harry/op/Operations.java index 0a3eee1ffd..0b9c15832b 100644 --- a/test/harry/main/org/apache/cassandra/harry/op/Operations.java +++ b/test/harry/main/org/apache/cassandra/harry/op/Operations.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import accord.utils.Invariants; + import org.apache.cassandra.harry.ColumnSpec; import org.apache.cassandra.harry.MagicConstants; import org.apache.cassandra.harry.Relations; diff --git a/test/harry/main/org/apache/cassandra/harry/test/HarryCompactionTest.java b/test/harry/main/org/apache/cassandra/harry/test/HarryCompactionTest.java index 90a86c09ef..983215f20d 100644 --- a/test/harry/main/org/apache/cassandra/harry/test/HarryCompactionTest.java +++ b/test/harry/main/org/apache/cassandra/harry/test/HarryCompactionTest.java @@ -31,6 +31,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import accord.utils.Invariants; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/test/harry/main/org/apache/cassandra/harry/test/HarryCompactionWithRangeDeletionsTest.java b/test/harry/main/org/apache/cassandra/harry/test/HarryCompactionWithRangeDeletionsTest.java index 4855bd3de6..c3b1e94086 100644 --- a/test/harry/main/org/apache/cassandra/harry/test/HarryCompactionWithRangeDeletionsTest.java +++ b/test/harry/main/org/apache/cassandra/harry/test/HarryCompactionWithRangeDeletionsTest.java @@ -31,6 +31,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import accord.utils.Invariants; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/test/harry/main/org/apache/cassandra/harry/test/HarrySSTableWriterTest.java b/test/harry/main/org/apache/cassandra/harry/test/HarrySSTableWriterTest.java index 9b3b8e818c..e83b342570 100644 --- a/test/harry/main/org/apache/cassandra/harry/test/HarrySSTableWriterTest.java +++ b/test/harry/main/org/apache/cassandra/harry/test/HarrySSTableWriterTest.java @@ -32,6 +32,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import accord.utils.Invariants; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.harry.ColumnSpec; diff --git a/test/harry/main/org/apache/cassandra/harry/test/SimpleBijectionTest.java b/test/harry/main/org/apache/cassandra/harry/test/SimpleBijectionTest.java index 9e090895da..e1a04fb00c 100644 --- a/test/harry/main/org/apache/cassandra/harry/test/SimpleBijectionTest.java +++ b/test/harry/main/org/apache/cassandra/harry/test/SimpleBijectionTest.java @@ -18,16 +18,18 @@ package org.apache.cassandra.harry.test; +import java.util.ArrayList; +import java.util.List; + +import org.junit.Assert; +import org.junit.Test; + import accord.utils.Invariants; + import org.apache.cassandra.harry.ColumnSpec; import org.apache.cassandra.harry.SchemaSpec; import org.apache.cassandra.harry.dsl.HistoryBuilder; import org.apache.cassandra.harry.gen.InvertibleGenerator; -import org.junit.Assert; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.List; import static org.apache.cassandra.harry.checker.TestHelper.withRandom; import static org.apache.cassandra.harry.gen.InvertibleGenerator.MAX_ENTROPY; diff --git a/test/harry/main/org/apache/cassandra/harry/test/TestStateTest.java b/test/harry/main/org/apache/cassandra/harry/test/TestStateTest.java index f63717e7d2..30a9dbe70d 100644 --- a/test/harry/main/org/apache/cassandra/harry/test/TestStateTest.java +++ b/test/harry/main/org/apache/cassandra/harry/test/TestStateTest.java @@ -27,8 +27,8 @@ import static org.apache.cassandra.harry.ColumnSpec.booleanType; import static org.apache.cassandra.harry.ColumnSpec.int64Type; import static org.apache.cassandra.harry.ColumnSpec.int8Type; import static org.apache.cassandra.harry.ColumnSpec.regularColumn; -import static org.apache.cassandra.harry.gen.InvertibleGenerator.MAX_ENTROPY; import static org.apache.cassandra.harry.SchemaSpec.cumulativeEntropy; +import static org.apache.cassandra.harry.gen.InvertibleGenerator.MAX_ENTROPY; public class TestStateTest { diff --git a/test/harry/main/org/apache/cassandra/io/sstable/HarrySSTableWriter.java b/test/harry/main/org/apache/cassandra/io/sstable/HarrySSTableWriter.java index db1bef6622..020c3ac6df 100644 --- a/test/harry/main/org/apache/cassandra/io/sstable/HarrySSTableWriter.java +++ b/test/harry/main/org/apache/cassandra/io/sstable/HarrySSTableWriter.java @@ -34,6 +34,7 @@ import java.util.stream.Collectors; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/long/org/apache/cassandra/cql3/CorruptionTest.java b/test/long/org/apache/cassandra/cql3/CorruptionTest.java index b021407a1d..c1b95f4731 100644 --- a/test/long/org/apache/cassandra/cql3/CorruptionTest.java +++ b/test/long/org/apache/cassandra/cql3/CorruptionTest.java @@ -25,10 +25,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.ConsistencyLevel; @@ -38,6 +34,11 @@ import com.datastax.driver.core.Session; import com.datastax.driver.core.policies.LoggingRetryPolicy; import com.datastax.driver.core.policies.Policies; import com.datastax.driver.core.utils.Bytes; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.ConfigurationException; diff --git a/test/long/org/apache/cassandra/cql3/ViewLongTest.java b/test/long/org/apache/cassandra/cql3/ViewLongTest.java index 2a9415fab6..5408ce2659 100644 --- a/test/long/org/apache/cassandra/cql3/ViewLongTest.java +++ b/test/long/org/apache/cassandra/cql3/ViewLongTest.java @@ -24,11 +24,12 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CyclicBarrier; -import org.junit.Test; - import com.datastax.driver.core.Row; import com.datastax.driver.core.exceptions.NoHostAvailableException; import com.datastax.driver.core.exceptions.WriteTimeoutException; + +import org.junit.Test; + import org.apache.cassandra.Util; import org.apache.cassandra.batchlog.BatchlogManager; import org.apache.cassandra.concurrent.NamedThreadFactory; diff --git a/test/long/org/apache/cassandra/db/commitlog/CommitLogStressTest.java b/test/long/org/apache/cassandra/db/commitlog/CommitLogStressTest.java index cf2e384769..5d1c005153 100644 --- a/test/long/org/apache/cassandra/db/commitlog/CommitLogStressTest.java +++ b/test/long/org/apache/cassandra/db/commitlog/CommitLogStressTest.java @@ -23,15 +23,23 @@ package org.apache.cassandra.db.commitlog; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import com.google.common.util.concurrent.RateLimiter; -import org.apache.cassandra.io.util.File; -import org.apache.cassandra.io.util.FileInputStreamPlus; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -39,24 +47,31 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runners.Parameterized.Parameters; -import io.netty.util.concurrent.FastThreadLocalThread; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.Util; import org.apache.cassandra.UpdateBuilder; -import org.apache.cassandra.config.*; +import org.apache.cassandra.Util; +import org.apache.cassandra.config.Config; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.ParameterizedClass; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.partitions.PartitionUpdate; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.Cell; +import org.apache.cassandra.db.rows.DeserializationHelper; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.io.compress.DeflateCompressor; import org.apache.cassandra.io.compress.LZ4Compressor; import org.apache.cassandra.io.compress.SnappyCompressor; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataInputPlus; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileInputStreamPlus; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.security.EncryptionContext; import org.apache.cassandra.security.EncryptionContextGenerator; +import io.netty.util.concurrent.FastThreadLocalThread; + import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; @Ignore diff --git a/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java b/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java index e7043ba5ae..9097191337 100644 --- a/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java +++ b/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java @@ -18,26 +18,35 @@ */ package org.apache.cassandra.db.compaction; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.junit.BeforeClass; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.UpdateBuilder; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.UpdateBuilder; import org.apache.cassandra.Util; -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.partitions.*; -import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; +import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.SSTableUtils; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.schema.CompactionParams; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Schema; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyCQLTest.java b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyCQLTest.java index 6569b54ae4..1d11f8c3c9 100644 --- a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyCQLTest.java +++ b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyCQLTest.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java index 51500d0bab..3e22534dd1 100644 --- a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java +++ b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java @@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.google.common.collect.Lists; + import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/long/org/apache/cassandra/dht/tokenallocator/AbstractReplicationAwareTokenAllocatorTest.java b/test/long/org/apache/cassandra/dht/tokenallocator/AbstractReplicationAwareTokenAllocatorTest.java index 26d454df96..5b15c79ab8 100644 --- a/test/long/org/apache/cassandra/dht/tokenallocator/AbstractReplicationAwareTokenAllocatorTest.java +++ b/test/long/org/apache/cassandra/dht/tokenallocator/AbstractReplicationAwareTokenAllocatorTest.java @@ -17,14 +17,20 @@ */ package org.apache.cassandra.dht.tokenallocator; -import java.util.*; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NavigableMap; +import java.util.Random; +import java.util.Set; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.apache.commons.math3.stat.descriptive.SummaryStatistics; - import org.junit.Assert; import org.junit.Ignore; diff --git a/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java b/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java index 6835f2c5b0..4b44ee6a81 100644 --- a/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java +++ b/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java @@ -25,6 +25,7 @@ import java.util.PriorityQueue; import java.util.Random; import com.google.common.collect.Maps; + import org.apache.commons.math3.stat.descriptive.SummaryStatistics; import org.junit.Assert; import org.junit.Test; diff --git a/test/long/org/apache/cassandra/hints/HintsWriteThenReadTest.java b/test/long/org/apache/cassandra/hints/HintsWriteThenReadTest.java index 7a20787889..ce95ea81c0 100644 --- a/test/long/org/apache/cassandra/hints/HintsWriteThenReadTest.java +++ b/test/long/org/apache/cassandra/hints/HintsWriteThenReadTest.java @@ -28,7 +28,6 @@ import java.util.zip.CRC32; import com.google.common.collect.Iterables; -import org.apache.cassandra.io.util.File; import org.junit.Test; import org.apache.cassandra.SchemaLoader; @@ -36,6 +35,7 @@ import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableMetadata; @@ -44,12 +44,11 @@ import org.apache.cassandra.utils.memory.MemoryUtil; import static org.apache.cassandra.Util.dk; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; +import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; - public class HintsWriteThenReadTest { private static final String KEYSPACE = "hints_write_then_read_test"; diff --git a/test/long/org/apache/cassandra/io/compress/CompressorPerformance.java b/test/long/org/apache/cassandra/io/compress/CompressorPerformance.java index 9fbf24da66..17a7c98961 100644 --- a/test/long/org/apache/cassandra/io/compress/CompressorPerformance.java +++ b/test/long/org/apache/cassandra/io/compress/CompressorPerformance.java @@ -20,13 +20,13 @@ */ package org.apache.cassandra.io.compress; -import org.apache.cassandra.io.util.FileInputStreamPlus; - import java.io.IOException; import java.nio.ByteBuffer; import java.util.Collections; import java.util.concurrent.ThreadLocalRandom; +import org.apache.cassandra.io.util.FileInputStreamPlus; + import static org.apache.cassandra.utils.Clock.Global.nanoTime; public class CompressorPerformance diff --git a/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java b/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java index 4e07430415..7986562d65 100644 --- a/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java +++ b/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java @@ -24,9 +24,10 @@ import java.util.Random; import com.google.common.io.Files; -import org.apache.cassandra.io.util.File; import org.junit.Test; +import org.apache.cassandra.io.util.File; + public class CQLSSTableWriterLongTest { @Test diff --git a/test/long/org/apache/cassandra/locator/DynamicEndpointSnitchLongTest.java b/test/long/org/apache/cassandra/locator/DynamicEndpointSnitchLongTest.java index 1f3edcf446..ea27d162d2 100644 --- a/test/long/org/apache/cassandra/locator/DynamicEndpointSnitchLongTest.java +++ b/test/long/org/apache/cassandra/locator/DynamicEndpointSnitchLongTest.java @@ -20,7 +20,7 @@ package org.apache.cassandra.locator; import java.io.IOException; -import java.util.*; +import java.util.Random; import org.junit.Test; @@ -28,7 +28,6 @@ import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.service.StorageService; - import org.apache.cassandra.utils.FBUtilities; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/test/long/org/apache/cassandra/streaming/LongStreamingTest.java b/test/long/org/apache/cassandra/streaming/LongStreamingTest.java index 5b7829cc65..0ff94753e0 100644 --- a/test/long/org/apache/cassandra/streaming/LongStreamingTest.java +++ b/test/long/org/apache/cassandra/streaming/LongStreamingTest.java @@ -24,12 +24,11 @@ import java.util.concurrent.TimeUnit; import com.google.common.io.Files; -import org.apache.cassandra.ServerTestUtils; -import org.apache.cassandra.io.util.File; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; @@ -37,6 +36,7 @@ import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.io.sstable.CQLSSTableWriter; import org.apache.cassandra.io.sstable.SSTableLoader; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.locator.Replica; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.schema.CompressionParams; diff --git a/test/memory/org/apache/cassandra/db/compaction/CompactionAllocationTest.java b/test/memory/org/apache/cassandra/db/compaction/CompactionAllocationTest.java index c800963c01..d4e8c8aa01 100644 --- a/test/memory/org/apache/cassandra/db/compaction/CompactionAllocationTest.java +++ b/test/memory/org/apache/cassandra/db/compaction/CompactionAllocationTest.java @@ -36,9 +36,10 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.Uninterruptibles; +import com.google.monitoring.runtime.instrumentation.AllocationRecorder; +import com.google.monitoring.runtime.instrumentation.Sampler; +import com.sun.management.ThreadMXBean; -import org.apache.cassandra.Util; -import org.apache.cassandra.index.internal.CollatedViewIndexBuilder; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -46,10 +47,8 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.monitoring.runtime.instrumentation.AllocationRecorder; -import com.google.monitoring.runtime.instrumentation.Sampler; -import com.sun.management.ThreadMXBean; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.Util; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.statements.SelectStatement; @@ -64,6 +63,7 @@ import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; import org.apache.cassandra.db.partitions.UnfilteredPartitionIterators; import org.apache.cassandra.index.Index; import org.apache.cassandra.index.SecondaryIndexBuilder; +import org.apache.cassandra.index.internal.CollatedViewIndexBuilder; import org.apache.cassandra.io.sstable.ReducingKeyIterator; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.DataOutputPlus; diff --git a/test/microbench/org/apache/cassandra/test/microbench/AbstractTypeByteSourceDecodingBench.java b/test/microbench/org/apache/cassandra/test/microbench/AbstractTypeByteSourceDecodingBench.java index 9496172834..abe047fafe 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/AbstractTypeByteSourceDecodingBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/AbstractTypeByteSourceDecodingBench.java @@ -29,14 +29,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; import net.nicoulaj.compilecommand.annotations.Inline; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.BytesType; -import org.apache.cassandra.db.marshal.DecimalType; -import org.apache.cassandra.db.marshal.IntegerType; -import org.apache.cassandra.db.marshal.TypeParser; -import org.apache.cassandra.db.marshal.UTF8Type; -import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import org.apache.cassandra.utils.bytecomparable.ByteSource; + import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -51,6 +44,15 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.DecimalType; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.TypeParser; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.utils.bytecomparable.ByteComparable; +import org.apache.cassandra.utils.bytecomparable.ByteSource; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MICROSECONDS) @Warmup(iterations = 5, time = 1) diff --git a/test/microbench/org/apache/cassandra/test/microbench/BTreeBuildBench.java b/test/microbench/org/apache/cassandra/test/microbench/BTreeBuildBench.java index f9ab004c21..99b71ffa38 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/BTreeBuildBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/BTreeBuildBench.java @@ -23,8 +23,6 @@ import java.util.Comparator; import java.util.List; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.utils.btree.BTree; -import org.apache.cassandra.utils.btree.UpdateFunction; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -39,6 +37,9 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.utils.btree.BTree; +import org.apache.cassandra.utils.btree.UpdateFunction; + @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 4, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/BTreeSearchIteratorBench.java b/test/microbench/org/apache/cassandra/test/microbench/BTreeSearchIteratorBench.java index d7cf8dc68c..0214fe2326 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/BTreeSearchIteratorBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/BTreeSearchIteratorBench.java @@ -24,12 +24,6 @@ import java.util.Comparator; import java.util.UUID; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.utils.btree.BTreeSearchIterator; -import org.apache.cassandra.utils.btree.BTree; -import org.apache.cassandra.utils.btree.BTree.Dir; -import org.apache.cassandra.utils.btree.FullBTreeSearchIterator; -import org.apache.cassandra.utils.btree.LeafBTreeSearchIterator; -import org.apache.cassandra.utils.btree.UpdateFunction; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -44,6 +38,13 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.utils.btree.BTree; +import org.apache.cassandra.utils.btree.BTree.Dir; +import org.apache.cassandra.utils.btree.BTreeSearchIterator; +import org.apache.cassandra.utils.btree.FullBTreeSearchIterator; +import org.apache.cassandra.utils.btree.LeafBTreeSearchIterator; +import org.apache.cassandra.utils.btree.UpdateFunction; + @BenchmarkMode(Mode.SampleTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @Warmup(iterations = 1, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/BatchStatementBench.java b/test/microbench/org/apache/cassandra/test/microbench/BatchStatementBench.java index 98abda9cda..87eb237f92 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/BatchStatementBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/BatchStatementBench.java @@ -23,6 +23,25 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.profile.GCProfiler; +import org.openjdk.jmh.results.Result; +import org.openjdk.jmh.results.RunResult; +import org.openjdk.jmh.runner.Runner; +import org.openjdk.jmh.runner.options.Options; +import org.openjdk.jmh.runner.options.OptionsBuilder; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.Attributes; import org.apache.cassandra.cql3.BatchQueryOptions; @@ -43,24 +62,6 @@ import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.utils.ByteArrayUtil; import org.apache.cassandra.utils.FBUtilities; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.BenchmarkMode; -import org.openjdk.jmh.annotations.Fork; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Mode; -import org.openjdk.jmh.annotations.OutputTimeUnit; -import org.openjdk.jmh.annotations.Param; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; -import org.openjdk.jmh.profile.GCProfiler; -import org.openjdk.jmh.results.Result; -import org.openjdk.jmh.results.RunResult; -import org.openjdk.jmh.runner.Runner; -import org.openjdk.jmh.runner.options.Options; -import org.openjdk.jmh.runner.options.OptionsBuilder; @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/BloomFilterSerializerBench.java b/test/microbench/org/apache/cassandra/test/microbench/BloomFilterSerializerBench.java index b03372e4a3..466d436aae 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/BloomFilterSerializerBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/BloomFilterSerializerBench.java @@ -22,6 +22,17 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Warmup; + import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.io.util.File; @@ -33,16 +44,6 @@ import org.apache.cassandra.utils.BloomFilterSerializer; import org.apache.cassandra.utils.FilterFactory; import org.apache.cassandra.utils.IFilter; import org.apache.cassandra.utils.SerializationsTest; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.BenchmarkMode; -import org.openjdk.jmh.annotations.Fork; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Mode; -import org.openjdk.jmh.annotations.OutputTimeUnit; -import org.openjdk.jmh.annotations.Param; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Warmup; @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MICROSECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/CIDRAuthorizerBench.java b/test/microbench/org/apache/cassandra/test/microbench/CIDRAuthorizerBench.java index 57ab736326..88ff3c726a 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/CIDRAuthorizerBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/CIDRAuthorizerBench.java @@ -31,11 +31,6 @@ import java.util.Random; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.auth.AuthTestUtils; -import org.apache.cassandra.auth.AuthenticatedUser; -import org.apache.cassandra.cql3.CIDR; -import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.exceptions.UnauthorizedException; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -50,6 +45,12 @@ import org.openjdk.jmh.annotations.TearDown; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.auth.AuthTestUtils; +import org.apache.cassandra.auth.AuthenticatedUser; +import org.apache.cassandra.cql3.CIDR; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.exceptions.UnauthorizedException; + /** * Benchmark CIDR authorizer (enforce mode) */ diff --git a/test/microbench/org/apache/cassandra/test/microbench/CacheLoaderBench.java b/test/microbench/org/apache/cassandra/test/microbench/CacheLoaderBench.java index 1aa55298da..68eab3fe00 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/CacheLoaderBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/CacheLoaderBench.java @@ -24,6 +24,20 @@ import java.util.Random; import java.util.concurrent.TimeUnit; import org.junit.Assert; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.Util; @@ -44,20 +58,6 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.service.CacheService; import org.apache.cassandra.utils.ByteBufferUtil; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.BenchmarkMode; -import org.openjdk.jmh.annotations.Fork; -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Mode; -import org.openjdk.jmh.annotations.OutputTimeUnit; -import org.openjdk.jmh.annotations.Param; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; -import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; @SuppressWarnings("unused") @BenchmarkMode(Mode.SampleTime) diff --git a/test/microbench/org/apache/cassandra/test/microbench/CachingBenchTest.java b/test/microbench/org/apache/cassandra/test/microbench/CachingBenchTest.java index 8ffd8150be..5e19d5dbed 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/CachingBenchTest.java +++ b/test/microbench/org/apache/cassandra/test/microbench/CachingBenchTest.java @@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Predicate; import com.google.common.collect.Iterables; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/microbench/org/apache/cassandra/test/microbench/ChecksumBench.java b/test/microbench/org/apache/cassandra/test/microbench/ChecksumBench.java index 5615f8c41f..2464b63670 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/ChecksumBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/ChecksumBench.java @@ -18,10 +18,14 @@ package org.apache.cassandra.test.microbench; +import java.security.NoSuchAlgorithmException; +import java.util.Random; +import java.util.concurrent.TimeUnit; + import com.google.common.hash.Hasher; import com.google.common.hash.Hashing; import com.google.common.primitives.Longs; -import org.apache.cassandra.utils.ChecksumType; + import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -36,9 +40,7 @@ import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; import org.xerial.snappy.PureJavaCrc32C; -import java.security.NoSuchAlgorithmException; -import java.util.Random; -import java.util.concurrent.TimeUnit; +import org.apache.cassandra.utils.ChecksumType; @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/CompactionBench.java b/test/microbench/org/apache/cassandra/test/microbench/CompactionBench.java index 8205fd02b3..393e088e51 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/CompactionBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/CompactionBench.java @@ -21,7 +21,23 @@ package org.apache.cassandra.test.microbench; import java.io.IOException; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; @@ -33,7 +49,6 @@ import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.service.snapshot.SnapshotManager; import org.apache.cassandra.tcm.ClusterMetadataService; -import org.openjdk.jmh.annotations.*; @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/DecayingEstimatedHistogramBench.java b/test/microbench/org/apache/cassandra/test/microbench/DecayingEstimatedHistogramBench.java index 79be0a13ea..8314af88ca 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/DecayingEstimatedHistogramBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/DecayingEstimatedHistogramBench.java @@ -21,8 +21,6 @@ package org.apache.cassandra.test.microbench; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoir; -import org.apache.cassandra.utils.MonotonicClock; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -41,6 +39,9 @@ import org.openjdk.jmh.runner.RunnerException; import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; +import org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoir; +import org.apache.cassandra.utils.MonotonicClock; + import static org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoir.DEFAULT_BUCKET_COUNT; import static org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoir.DEFAULT_STRIPE_COUNT; import static org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoir.DEFAULT_ZERO_CONSIDERATION; diff --git a/test/microbench/org/apache/cassandra/test/microbench/DeletionTimeDeSerBench.java b/test/microbench/org/apache/cassandra/test/microbench/DeletionTimeDeSerBench.java index 84a98ac1ec..f9b2744fe0 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/DeletionTimeDeSerBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/DeletionTimeDeSerBench.java @@ -28,14 +28,6 @@ import java.util.ArrayList; import java.util.Random; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.db.DeletionTime; -import org.apache.cassandra.db.DeletionTime.Serializer; -import org.apache.cassandra.io.util.DataInputBuffer; -import org.apache.cassandra.io.util.DataInputPlus; -import org.apache.cassandra.io.util.DataOutputBuffer; -import org.apache.cassandra.io.util.DataOutputStreamPlus; -import org.apache.cassandra.io.util.FileInputStreamPlus; -import org.apache.cassandra.io.util.FileOutputStreamPlus; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -50,6 +42,15 @@ import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.DeletionTime.Serializer; +import org.apache.cassandra.io.util.DataInputBuffer; +import org.apache.cassandra.io.util.DataInputPlus; +import org.apache.cassandra.io.util.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputStreamPlus; +import org.apache.cassandra.io.util.FileInputStreamPlus; +import org.apache.cassandra.io.util.FileOutputStreamPlus; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @Warmup(iterations = 2, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/DiagnosticEventPersistenceBench.java b/test/microbench/org/apache/cassandra/test/microbench/DiagnosticEventPersistenceBench.java index 5ddf0c5587..efb3e52310 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/DiagnosticEventPersistenceBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/DiagnosticEventPersistenceBench.java @@ -20,12 +20,6 @@ package org.apache.cassandra.test.microbench; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.OverrideConfigurationLoader; -import org.apache.cassandra.diag.DiagnosticEvent; -import org.apache.cassandra.diag.DiagnosticEventPersistence; -import org.apache.cassandra.diag.DiagnosticEventService; -import org.apache.cassandra.test.microbench.DiagnosticEventServiceBench.DummyEvent; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -38,6 +32,13 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.OverrideConfigurationLoader; +import org.apache.cassandra.diag.DiagnosticEvent; +import org.apache.cassandra.diag.DiagnosticEventPersistence; +import org.apache.cassandra.diag.DiagnosticEventService; +import org.apache.cassandra.test.microbench.DiagnosticEventServiceBench.DummyEvent; + @BenchmarkMode(Mode.All) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 4, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/DiagnosticEventServiceBench.java b/test/microbench/org/apache/cassandra/test/microbench/DiagnosticEventServiceBench.java index 351138e000..a81a25a312 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/DiagnosticEventServiceBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/DiagnosticEventServiceBench.java @@ -23,10 +23,6 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.OverrideConfigurationLoader; -import org.apache.cassandra.diag.DiagnosticEvent; -import org.apache.cassandra.diag.DiagnosticEventService; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -40,6 +36,11 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.OverrideConfigurationLoader; +import org.apache.cassandra.diag.DiagnosticEvent; +import org.apache.cassandra.diag.DiagnosticEventService; + @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 4, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/DirectorySizerBench.java b/test/microbench/org/apache/cassandra/test/microbench/DirectorySizerBench.java index ad72f3d02c..48371fd7ea 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/DirectorySizerBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/DirectorySizerBench.java @@ -24,11 +24,24 @@ import java.nio.file.Files; import java.util.UUID; import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; + import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.DirectorySizeCalculator; -import org.openjdk.jmh.annotations.*; -import org.openjdk.jmh.infra.Blackhole; @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/FastThreadLocalBench.java b/test/microbench/org/apache/cassandra/test/microbench/FastThreadLocalBench.java index ec244131c3..54e601ca5f 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/FastThreadLocalBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/FastThreadLocalBench.java @@ -20,7 +20,6 @@ package org.apache.cassandra.test.microbench; import java.util.concurrent.TimeUnit; -import io.netty.util.concurrent.FastThreadLocal; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -34,6 +33,8 @@ import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; +import io.netty.util.concurrent.FastThreadLocal; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @Warmup(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/FunctionWithTerminalArgsBench.java b/test/microbench/org/apache/cassandra/test/microbench/FunctionWithTerminalArgsBench.java index ce37836ed5..bf1b0a3742 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/FunctionWithTerminalArgsBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/FunctionWithTerminalArgsBench.java @@ -21,13 +21,6 @@ package org.apache.cassandra.test.microbench; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.OverrideConfigurationLoader; -import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.cql3.UntypedResultSet; -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.db.commitlog.CommitLog; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -42,6 +35,14 @@ import org.openjdk.jmh.annotations.TearDown; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.OverrideConfigurationLoader; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.cql3.UntypedResultSet; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.commitlog.CommitLog; + /** * Benchmarks the performance of CQL functions calls with terminal arguments. */ diff --git a/test/microbench/org/apache/cassandra/test/microbench/GcCompactionBenchTest.java b/test/microbench/org/apache/cassandra/test/microbench/GcCompactionBenchTest.java index cd905e10d3..c18e2db81e 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/GcCompactionBenchTest.java +++ b/test/microbench/org/apache/cassandra/test/microbench/GcCompactionBenchTest.java @@ -29,12 +29,12 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Predicate; import com.google.common.collect.Iterables; + +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.Assert; - import org.apache.cassandra.config.Config.CommitLogSync; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; diff --git a/test/microbench/org/apache/cassandra/test/microbench/LatencyTrackingBench.java b/test/microbench/org/apache/cassandra/test/microbench/LatencyTrackingBench.java index 8db3f34149..f2d261bdd9 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/LatencyTrackingBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/LatencyTrackingBench.java @@ -20,10 +20,6 @@ package org.apache.cassandra.test.microbench; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.metrics.CassandraMetricsRegistry; -import org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoir; -import org.apache.cassandra.metrics.LatencyMetrics; -import org.apache.cassandra.metrics.MetricNameFactory; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -39,6 +35,11 @@ import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; +import org.apache.cassandra.metrics.CassandraMetricsRegistry; +import org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoir; +import org.apache.cassandra.metrics.LatencyMetrics; +import org.apache.cassandra.metrics.MetricNameFactory; + @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.SECONDS) @Warmup(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/LocatorBench.java b/test/microbench/org/apache/cassandra/test/microbench/LocatorBench.java index 28bf600b8d..390a6dc770 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/LocatorBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/LocatorBench.java @@ -26,19 +26,6 @@ import java.util.Random; import java.util.UUID; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.dht.Murmur3Partitioner; -import org.apache.cassandra.distributed.api.TokenSupplier; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.tcm.ClusterMetadata; -import org.apache.cassandra.tcm.RegistrationStatus; -import org.apache.cassandra.tcm.membership.Location; -import org.apache.cassandra.tcm.membership.NodeAddresses; -import org.apache.cassandra.tcm.membership.NodeId; -import org.apache.cassandra.tcm.membership.NodeVersion; -import org.apache.cassandra.tcm.ownership.PlacementProvider; -import org.apache.cassandra.tcm.ownership.UniformRangePlacement; -import org.apache.cassandra.tcm.transformations.UnsafeJoin; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -55,6 +42,20 @@ import org.openjdk.jmh.runner.RunnerException; import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.dht.Murmur3Partitioner; +import org.apache.cassandra.distributed.api.TokenSupplier; +import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.tcm.ClusterMetadata; +import org.apache.cassandra.tcm.RegistrationStatus; +import org.apache.cassandra.tcm.membership.Location; +import org.apache.cassandra.tcm.membership.NodeAddresses; +import org.apache.cassandra.tcm.membership.NodeId; +import org.apache.cassandra.tcm.membership.NodeVersion; +import org.apache.cassandra.tcm.ownership.PlacementProvider; +import org.apache.cassandra.tcm.ownership.UniformRangePlacement; +import org.apache.cassandra.tcm.transformations.UnsafeJoin; + @State(Scope.Benchmark) @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/LongestMatchingCIDRBench.java b/test/microbench/org/apache/cassandra/test/microbench/LongestMatchingCIDRBench.java index 2cb555ed78..8d9e705e94 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/LongestMatchingCIDRBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/LongestMatchingCIDRBench.java @@ -25,8 +25,6 @@ import java.util.List; import java.util.Random; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.auth.CIDRGroupsMappingTable; -import org.apache.cassandra.cql3.CIDR; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -40,6 +38,9 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.auth.CIDRGroupsMappingTable; +import org.apache.cassandra.cql3.CIDR; + /** * Benchmark algorithm(s) of the Longest matching CIDR for given IP */ diff --git a/test/microbench/org/apache/cassandra/test/microbench/MessageOutBench.java b/test/microbench/org/apache/cassandra/test/microbench/MessageOutBench.java index 201ce9ae1b..61e15e23b7 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/MessageOutBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/MessageOutBench.java @@ -25,17 +25,6 @@ import java.util.concurrent.TimeUnit; import com.google.common.net.InetAddresses; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.io.util.DataInputBuffer; -import org.apache.cassandra.io.util.DataOutputBuffer; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.net.Message; -import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.net.NoPayload; -import org.apache.cassandra.net.ParamType; -import org.apache.cassandra.utils.TimeUUID; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -48,6 +37,19 @@ import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.io.util.DataInputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; +import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.net.Message; +import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.net.NoPayload; +import org.apache.cassandra.net.ParamType; +import org.apache.cassandra.utils.TimeUUID; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; + import static org.apache.cassandra.net.Verb.ECHO_REQ; import static org.apache.cassandra.utils.Clock.Global.nanoTime; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; diff --git a/test/microbench/org/apache/cassandra/test/microbench/MetadataCollectorBench.java b/test/microbench/org/apache/cassandra/test/microbench/MetadataCollectorBench.java index 85cffafb98..170627cdbd 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/MetadataCollectorBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/MetadataCollectorBench.java @@ -23,6 +23,19 @@ import java.util.Arrays; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; +import org.jctools.util.Pow2; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Warmup; + import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.ClusteringBound; import org.apache.cassandra.db.ClusteringBoundary; @@ -33,8 +46,6 @@ import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.TableMetadata; -import org.jctools.util.Pow2; -import org.openjdk.jmh.annotations.*; @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/MetersBench.java b/test/microbench/org/apache/cassandra/test/microbench/MetersBench.java index 5afef15dd1..e1771b11c5 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/MetersBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/MetersBench.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLongArray; -import org.apache.cassandra.metrics.Meter; -import org.apache.cassandra.metrics.ThreadLocalMeter; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -39,6 +37,9 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.metrics.Meter; +import org.apache.cassandra.metrics.ThreadLocalMeter; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @Warmup(iterations = 4, time = 10, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/MutationBench.java b/test/microbench/org/apache/cassandra/test/microbench/MutationBench.java index 50691f851a..608326a03c 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/MutationBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/MutationBench.java @@ -24,20 +24,6 @@ import java.nio.ByteBuffer; import java.util.Collection; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.UpdateBuilder; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; -import org.apache.cassandra.db.Mutation; -import org.apache.cassandra.dht.Murmur3Partitioner; -import org.apache.cassandra.io.util.DataInputBuffer; -import org.apache.cassandra.io.util.DataOutputBuffer; -import org.apache.cassandra.io.util.DataOutputBufferFixed; -import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.schema.KeyspaceMetadata; -import org.apache.cassandra.schema.KeyspaceParams; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.schema.SchemaTestUtil; -import org.apache.cassandra.schema.TableMetadata; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -56,6 +42,21 @@ import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; +import org.apache.cassandra.UpdateBuilder; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; +import org.apache.cassandra.db.Mutation; +import org.apache.cassandra.dht.Murmur3Partitioner; +import org.apache.cassandra.io.util.DataInputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBufferFixed; +import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.SchemaTestUtil; +import org.apache.cassandra.schema.TableMetadata; + @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/OutputStreamBench.java b/test/microbench/org/apache/cassandra/test/microbench/OutputStreamBench.java index 890f74c43a..eb03f2eb88 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/OutputStreamBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/OutputStreamBench.java @@ -18,12 +18,6 @@ package org.apache.cassandra.test.microbench; -import org.apache.cassandra.io.util.BufferedDataOutputStreamPlus; -import org.apache.cassandra.io.util.BufferedDataOutputStreamTest; -import org.apache.cassandra.io.util.WrappedDataOutputStreamPlus; -import org.openjdk.jmh.annotations.*; -import org.openjdk.jmh.infra.Blackhole; - import java.io.BufferedOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -31,6 +25,23 @@ import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; + +import org.apache.cassandra.io.util.BufferedDataOutputStreamPlus; +import org.apache.cassandra.io.util.BufferedDataOutputStreamTest; +import org.apache.cassandra.io.util.WrappedDataOutputStreamPlus; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/PreaggregatedByteBufsBench.java b/test/microbench/org/apache/cassandra/test/microbench/PreaggregatedByteBufsBench.java index 5948cc81e5..a558f4b008 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/PreaggregatedByteBufsBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/PreaggregatedByteBufsBench.java @@ -20,8 +20,6 @@ package org.apache.cassandra.test.microbench; import java.util.concurrent.TimeUnit; -import io.netty.buffer.ByteBuf; -import io.netty.channel.embedded.EmbeddedChannel; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -34,6 +32,9 @@ import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Warmup; +import io.netty.buffer.ByteBuf; +import io.netty.channel.embedded.EmbeddedChannel; + @State(Scope.Thread) @Warmup(iterations = 4, time = 1, timeUnit = TimeUnit.SECONDS) @Measurement(iterations = 8, time = 4, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/ReadWriteBench.java b/test/microbench/org/apache/cassandra/test/microbench/ReadWriteBench.java index 06d7c77e1a..2219c7fed2 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/ReadWriteBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/ReadWriteBench.java @@ -20,12 +20,26 @@ package org.apache.cassandra.test.microbench; import java.io.IOException; -import java.util.concurrent.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; -import org.openjdk.jmh.annotations.*; @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/ReplicaGroupsBench.java b/test/microbench/org/apache/cassandra/test/microbench/ReplicaGroupsBench.java index 7de7a8ef54..f0627c1678 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/ReplicaGroupsBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/ReplicaGroupsBench.java @@ -24,25 +24,6 @@ import java.util.Random; import java.util.UUID; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.dht.Murmur3Partitioner; -import org.apache.cassandra.dht.Token; -import org.apache.cassandra.distributed.api.TokenSupplier; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.schema.KeyspaceMetadata; -import org.apache.cassandra.schema.KeyspaceParams; -import org.apache.cassandra.schema.Keyspaces; -import org.apache.cassandra.schema.ReplicationParams; -import org.apache.cassandra.tcm.ClusterMetadata; -import org.apache.cassandra.tcm.Epoch; -import org.apache.cassandra.tcm.membership.Location; -import org.apache.cassandra.tcm.membership.NodeAddresses; -import org.apache.cassandra.tcm.membership.NodeId; -import org.apache.cassandra.tcm.membership.NodeVersion; -import org.apache.cassandra.tcm.ownership.ReplicaGroups; -import org.apache.cassandra.tcm.ownership.PlacementProvider; -import org.apache.cassandra.tcm.ownership.UniformRangePlacement; -import org.apache.cassandra.tcm.transformations.UnsafeJoin; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -59,6 +40,26 @@ import org.openjdk.jmh.runner.RunnerException; import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.dht.Murmur3Partitioner; +import org.apache.cassandra.dht.Token; +import org.apache.cassandra.distributed.api.TokenSupplier; +import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Keyspaces; +import org.apache.cassandra.schema.ReplicationParams; +import org.apache.cassandra.tcm.ClusterMetadata; +import org.apache.cassandra.tcm.Epoch; +import org.apache.cassandra.tcm.membership.Location; +import org.apache.cassandra.tcm.membership.NodeAddresses; +import org.apache.cassandra.tcm.membership.NodeId; +import org.apache.cassandra.tcm.membership.NodeVersion; +import org.apache.cassandra.tcm.ownership.PlacementProvider; +import org.apache.cassandra.tcm.ownership.ReplicaGroups; +import org.apache.cassandra.tcm.ownership.UniformRangePlacement; +import org.apache.cassandra.tcm.transformations.UnsafeJoin; + @State(Scope.Benchmark) @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/SampleBench.java b/test/microbench/org/apache/cassandra/test/microbench/SampleBench.java index 59763646e6..0130cb7356 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/SampleBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/SampleBench.java @@ -18,16 +18,28 @@ package org.apache.cassandra.test.microbench; -import net.jpountz.lz4.LZ4Compressor; -import net.jpountz.lz4.LZ4Factory; -import net.jpountz.lz4.LZ4SafeDecompressor; -import org.openjdk.jmh.annotations.*; -import org.xerial.snappy.Snappy; - import java.io.IOException; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; +import net.jpountz.lz4.LZ4Compressor; +import net.jpountz.lz4.LZ4Factory; +import net.jpountz.lz4.LZ4SafeDecompressor; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.xerial.snappy.Snappy; + @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/SnapshotListingBench.java b/test/microbench/org/apache/cassandra/test/microbench/SnapshotListingBench.java index 92d687159a..0decc5ebc0 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/SnapshotListingBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/SnapshotListingBench.java @@ -19,7 +19,6 @@ package org.apache.cassandra.test.microbench; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.service.snapshot.SnapshotManager; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -34,6 +33,8 @@ import org.openjdk.jmh.annotations.TearDown; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.service.snapshot.SnapshotManager; + @OutputTimeUnit(TimeUnit.MILLISECONDS) @Fork(value = 1) @State(Scope.Benchmark) diff --git a/test/microbench/org/apache/cassandra/test/microbench/SnapshotTrueSizeBench.java b/test/microbench/org/apache/cassandra/test/microbench/SnapshotTrueSizeBench.java index b8d9ffe23c..90be1d0ead 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/SnapshotTrueSizeBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/SnapshotTrueSizeBench.java @@ -20,7 +20,6 @@ package org.apache.cassandra.test.microbench; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.service.snapshot.SnapshotManager; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -35,6 +34,8 @@ import org.openjdk.jmh.annotations.TearDown; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.service.snapshot.SnapshotManager; + @OutputTimeUnit(TimeUnit.MILLISECONDS) @Fork(value = 1) @State(Scope.Benchmark) diff --git a/test/microbench/org/apache/cassandra/test/microbench/StreamingTombstoneHistogramBuilderBench.java b/test/microbench/org/apache/cassandra/test/microbench/StreamingTombstoneHistogramBuilderBench.java index 0dd51f268e..bef9a2ad25 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/StreamingTombstoneHistogramBuilderBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/StreamingTombstoneHistogramBuilderBench.java @@ -19,14 +19,26 @@ package org.apache.cassandra.test.microbench; -import java.util.concurrent.TimeUnit; import java.util.Random; +import java.util.concurrent.TimeUnit; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.profile.GCProfiler; +import org.openjdk.jmh.runner.Runner; +import org.openjdk.jmh.runner.options.Options; +import org.openjdk.jmh.runner.options.OptionsBuilder; import org.apache.cassandra.utils.streamhist.StreamingTombstoneHistogramBuilder; -import org.openjdk.jmh.annotations.*; -import org.openjdk.jmh.profile.*; -import org.openjdk.jmh.runner.*; -import org.openjdk.jmh.runner.options.*; import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; diff --git a/test/microbench/org/apache/cassandra/test/microbench/StringsEncodeBench.java b/test/microbench/org/apache/cassandra/test/microbench/StringsEncodeBench.java index 2193532fa4..610ac2b385 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/StringsEncodeBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/StringsEncodeBench.java @@ -20,11 +20,6 @@ package org.apache.cassandra.test.microbench; import java.util.concurrent.TimeUnit; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufUtil; -import io.netty.buffer.Unpooled; -import org.apache.cassandra.db.TypeSizes; -import org.apache.cassandra.transport.CBUtil; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -35,6 +30,13 @@ import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.db.TypeSizes; +import org.apache.cassandra.transport.CBUtil; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufUtil; +import io.netty.buffer.Unpooled; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @Warmup(iterations = 3, time = 1) diff --git a/test/microbench/org/apache/cassandra/test/microbench/ThreadLocalMetricsBench.java b/test/microbench/org/apache/cassandra/test/microbench/ThreadLocalMetricsBench.java index 5a3e80b1f7..8a514b554b 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/ThreadLocalMetricsBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/ThreadLocalMetricsBench.java @@ -24,8 +24,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLongArray; import java.util.concurrent.atomic.LongAdder; -import org.apache.cassandra.metrics.Counter; -import org.apache.cassandra.metrics.ThreadLocalCounter; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -40,6 +38,9 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.metrics.Counter; +import org.apache.cassandra.metrics.ThreadLocalCounter; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @Warmup(iterations = 4, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/TimedMonitorBench.java b/test/microbench/org/apache/cassandra/test/microbench/TimedMonitorBench.java index 2420b71847..3af0d938b6 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/TimedMonitorBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/TimedMonitorBench.java @@ -18,11 +18,23 @@ package org.apache.cassandra.test.microbench; -import org.openjdk.jmh.annotations.*; - import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + @BenchmarkMode(Mode.SampleTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @Warmup(iterations = 1, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/UTF8ValidatorBench.java b/test/microbench/org/apache/cassandra/test/microbench/UTF8ValidatorBench.java index 06db9d9df0..50ff8f1b56 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/UTF8ValidatorBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/UTF8ValidatorBench.java @@ -22,9 +22,6 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.db.marshal.ByteArrayAccessor; -import org.apache.cassandra.db.marshal.ByteBufferAccessor; -import org.apache.cassandra.serializers.UTF8Serializer; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -39,6 +36,10 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.db.marshal.ByteArrayAccessor; +import org.apache.cassandra.db.marshal.ByteBufferAccessor; +import org.apache.cassandra.serializers.UTF8Serializer; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/VIntCodingBench.java b/test/microbench/org/apache/cassandra/test/microbench/VIntCodingBench.java index a60d9f2910..777b4eeeeb 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/VIntCodingBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/VIntCodingBench.java @@ -18,12 +18,6 @@ package org.apache.cassandra.test.microbench; -import org.apache.cassandra.io.util.BufferedDataOutputStreamPlus; -import org.apache.cassandra.io.util.DataOutputPlus; -import org.apache.cassandra.utils.vint.VIntCoding; -import org.openjdk.jmh.annotations.*; -import org.openjdk.jmh.infra.Blackhole; - import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; @@ -34,6 +28,24 @@ import java.util.PrimitiveIterator; import java.util.Random; import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; + +import org.apache.cassandra.io.util.BufferedDataOutputStreamPlus; +import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.utils.vint.VIntCoding; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/ZeroCopyStreamingBench.java b/test/microbench/org/apache/cassandra/test/microbench/ZeroCopyStreamingBench.java index 07ff3edce9..de54ca648e 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/ZeroCopyStreamingBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/ZeroCopyStreamingBench.java @@ -27,12 +27,18 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOutboundHandlerAdapter; -import io.netty.channel.ChannelPromise; -import io.netty.channel.DefaultFileRegion; -import io.netty.channel.embedded.EmbeddedChannel; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; @@ -66,17 +72,13 @@ import org.apache.cassandra.streaming.async.NettyStreamingConnectionFactory; import org.apache.cassandra.streaming.messages.StreamMessageHeader; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.BenchmarkMode; -import org.openjdk.jmh.annotations.Fork; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Mode; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; -import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelOutboundHandlerAdapter; +import io.netty.channel.ChannelPromise; +import io.netty.channel.DefaultFileRegion; +import io.netty.channel.embedded.EmbeddedChannel; import static java.util.Collections.emptyList; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; diff --git a/test/microbench/org/apache/cassandra/test/microbench/ZstdDictionaryCompressorBenchBase.java b/test/microbench/org/apache/cassandra/test/microbench/ZstdDictionaryCompressorBenchBase.java index 12036d6d77..ad00e806f7 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/ZstdDictionaryCompressorBenchBase.java +++ b/test/microbench/org/apache/cassandra/test/microbench/ZstdDictionaryCompressorBenchBase.java @@ -25,6 +25,7 @@ import java.util.Random; import java.util.UUID; import com.github.luben.zstd.ZstdDictTrainer; + import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/test/microbench/org/apache/cassandra/test/microbench/btree/AtomicBTreePartitionUpdateBench.java b/test/microbench/org/apache/cassandra/test/microbench/btree/AtomicBTreePartitionUpdateBench.java index 20f3af6d03..d1b1c01970 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/btree/AtomicBTreePartitionUpdateBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/btree/AtomicBTreePartitionUpdateBench.java @@ -35,6 +35,20 @@ import java.util.stream.IntStream; import com.google.common.collect.ImmutableList; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.BufferDecoratedKey; @@ -77,19 +91,6 @@ import org.apache.cassandra.utils.memory.ByteBufferCloner; import org.apache.cassandra.utils.memory.Cloner; import org.apache.cassandra.utils.memory.HeapPool; import org.apache.cassandra.utils.memory.MemtableAllocator; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.BenchmarkMode; -import org.openjdk.jmh.annotations.Fork; -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Mode; -import org.openjdk.jmh.annotations.OutputTimeUnit; -import org.openjdk.jmh.annotations.Param; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; import static java.lang.Long.min; import static java.lang.Math.max; diff --git a/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeBuildBench.java b/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeBuildBench.java index cdddd61b53..6893d91f57 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeBuildBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeBuildBench.java @@ -22,9 +22,6 @@ import java.util.Comparator; import java.util.List; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.utils.BulkIterator; -import org.apache.cassandra.utils.btree.BTree; -import org.apache.cassandra.utils.btree.UpdateFunction; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -36,6 +33,10 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.utils.BulkIterator; +import org.apache.cassandra.utils.btree.BTree; +import org.apache.cassandra.utils.btree.UpdateFunction; + @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 6, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeTransformBench.java b/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeTransformBench.java index a459316b6b..24d842b3a5 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeTransformBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeTransformBench.java @@ -24,9 +24,6 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.function.Function; -import org.apache.cassandra.utils.BulkIterator; -import org.apache.cassandra.utils.btree.BTree; -import org.apache.cassandra.utils.btree.UpdateFunction; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -41,6 +38,10 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.utils.BulkIterator; +import org.apache.cassandra.utils.btree.BTree; +import org.apache.cassandra.utils.btree.UpdateFunction; + @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeUpdateBench.java b/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeUpdateBench.java index c7ad81ca09..aeefc7ea6f 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeUpdateBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeUpdateBench.java @@ -26,9 +26,6 @@ import java.util.function.IntFunction; import java.util.function.Supplier; import java.util.stream.IntStream; -import org.apache.cassandra.utils.Pair; -import org.apache.cassandra.utils.btree.BTree; -import org.apache.cassandra.utils.btree.UpdateFunction; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -43,6 +40,10 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.utils.Pair; +import org.apache.cassandra.utils.btree.BTree; +import org.apache.cassandra.utils.btree.UpdateFunction; + @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 10, time = 1) diff --git a/test/microbench/org/apache/cassandra/test/microbench/instance/ReadBenchBase.java b/test/microbench/org/apache/cassandra/test/microbench/instance/ReadBenchBase.java index 3e2d64fcd4..49c9a22233 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/instance/ReadBenchBase.java +++ b/test/microbench/org/apache/cassandra/test/microbench/instance/ReadBenchBase.java @@ -26,11 +26,16 @@ import java.util.function.Supplier; import com.google.common.base.Throwables; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.memtable.Memtable; import org.apache.cassandra.utils.FBUtilities; -import org.openjdk.jmh.annotations.*; @State(Scope.Benchmark) public abstract class ReadBenchBase extends SimpleTableWriter diff --git a/test/microbench/org/apache/cassandra/test/microbench/instance/SimpleTableWriter.java b/test/microbench/org/apache/cassandra/test/microbench/instance/SimpleTableWriter.java index cc78e03e3a..debda13473 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/instance/SimpleTableWriter.java +++ b/test/microbench/org/apache/cassandra/test/microbench/instance/SimpleTableWriter.java @@ -28,6 +28,12 @@ import java.util.concurrent.TimeUnit; import com.google.common.base.Throwables; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; @@ -35,11 +41,6 @@ import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.memtable.Memtable; import org.apache.cassandra.utils.FBUtilities; -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Param; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; @State(Scope.Benchmark) public abstract class SimpleTableWriter extends CQLTester diff --git a/test/microbench/org/apache/cassandra/test/microbench/instance/WriteBench.java b/test/microbench/org/apache/cassandra/test/microbench/instance/WriteBench.java index 6738955475..860180a0cc 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/instance/WriteBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/instance/WriteBench.java @@ -21,8 +21,21 @@ package org.apache.cassandra.test.microbench.instance; import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + import org.apache.cassandra.db.ColumnFamilyStore; -import org.openjdk.jmh.annotations.*; @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/sai/KeyLookupBench.java b/test/microbench/org/apache/cassandra/test/microbench/sai/KeyLookupBench.java index 78f700d83f..4e5daf732c 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sai/KeyLookupBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sai/KeyLookupBench.java @@ -23,6 +23,20 @@ import java.nio.file.Files; import java.util.Arrays; import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + import org.apache.cassandra.Util; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; @@ -41,19 +55,6 @@ import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.File; import org.apache.cassandra.schema.TableMetadata; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.BenchmarkMode; -import org.openjdk.jmh.annotations.Fork; -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Mode; -import org.openjdk.jmh.annotations.OutputTimeUnit; -import org.openjdk.jmh.annotations.Param; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; import static org.apache.cassandra.index.sai.SAITester.getRandom; import static org.mockito.Mockito.mock; diff --git a/test/microbench/org/apache/cassandra/test/microbench/sstable/CompactionLargeCellBench.java b/test/microbench/org/apache/cassandra/test/microbench/sstable/CompactionLargeCellBench.java index 0a17d7ae95..129939e6ba 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sstable/CompactionLargeCellBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sstable/CompactionLargeCellBench.java @@ -23,9 +23,6 @@ import java.nio.ByteBuffer; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.test.microbench.CompactionBench; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Measurement; @@ -37,6 +34,10 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.test.microbench.CompactionBench; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 25, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/sstable/CompactionStringsBench.java b/test/microbench/org/apache/cassandra/test/microbench/sstable/CompactionStringsBench.java index ee1af71e4d..9df4e40fa7 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sstable/CompactionStringsBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sstable/CompactionStringsBench.java @@ -22,9 +22,6 @@ package org.apache.cassandra.test.microbench.sstable; import java.util.Random; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.test.microbench.CompactionBench; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Measurement; @@ -36,6 +33,10 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.test.microbench.CompactionBench; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 25, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/sstable/CompactionWideRowBench.java b/test/microbench/org/apache/cassandra/test/microbench/sstable/CompactionWideRowBench.java index 3b0e0745e8..230d1af069 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sstable/CompactionWideRowBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sstable/CompactionWideRowBench.java @@ -21,9 +21,6 @@ package org.apache.cassandra.test.microbench.sstable; import java.util.Arrays; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.test.microbench.CompactionBench; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Measurement; @@ -35,6 +32,10 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.test.microbench.CompactionBench; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 25, time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableAbstractBench.java b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableAbstractBench.java index 836394deb6..77eeaf376a 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableAbstractBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableAbstractBench.java @@ -22,13 +22,6 @@ import java.io.IOException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.cql3.UntypedResultSet; -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.db.commitlog.CommitLog; -import org.apache.cassandra.io.sstable.format.SSTableReader; -import org.apache.cassandra.tcm.ClusterMetadataService; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Level; @@ -42,6 +35,14 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.TearDown; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.cql3.UntypedResultSet; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.commitlog.CommitLog; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.tcm.ClusterMetadataService; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 10, time = 1) diff --git a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableAbstractPipeBench.java b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableAbstractPipeBench.java index 98c6cbb19a..a672ce4fcd 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableAbstractPipeBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableAbstractPipeBench.java @@ -22,15 +22,16 @@ import java.io.File; import java.nio.file.Files; import java.util.List; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; + import org.apache.cassandra.db.Directories; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.snapshot.SnapshotManager; import org.apache.cassandra.tools.Util; -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; @State(Scope.Benchmark) diff --git a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableCursorPipeUtil.java b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableCursorPipeUtil.java index a2b8b5661b..b998a14d6c 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableCursorPipeUtil.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableCursorPipeUtil.java @@ -21,15 +21,24 @@ package org.apache.cassandra.test.microbench.sstable; import java.io.IOException; import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.ReusableLivenessInfo; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.io.sstable.PartitionDescriptor; -import org.apache.cassandra.db.ReusableLivenessInfo; import org.apache.cassandra.io.sstable.SSTableCursorReader; import org.apache.cassandra.io.sstable.SSTableCursorWriter; import org.apache.cassandra.io.sstable.UnfilteredDescriptor; -import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.*; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.CELL_END; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.CELL_HEADER_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.CELL_VALUE_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.DONE; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.PARTITION_END; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.PARTITION_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.ROW_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.STATIC_ROW_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.TOMBSTONE_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.UNFILTERED_END; public class SSTableCursorPipeUtil { diff --git a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTablePipeBench.java b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTablePipeBench.java index e69900007e..cb4340d540 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTablePipeBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTablePipeBench.java @@ -21,6 +21,12 @@ package org.apache.cassandra.test.microbench.sstable; import java.io.File; import java.util.stream.Stream; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; + import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.compaction.OperationType; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; @@ -30,11 +36,6 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.tools.Util; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; @State(Scope.Benchmark) diff --git a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTablePipeCursorBench.java b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTablePipeCursorBench.java index 83fc957ac8..4adcc08c7b 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTablePipeCursorBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTablePipeCursorBench.java @@ -20,18 +20,19 @@ package org.apache.cassandra.test.microbench.sstable; import java.io.File; -import org.apache.cassandra.io.sstable.SSTableCursorReader; -import org.apache.cassandra.io.sstable.SSTableCursorWriter; -import org.apache.cassandra.db.compaction.CompactionManager; -import org.apache.cassandra.db.compaction.OperationType; -import org.apache.cassandra.db.lifecycle.LifecycleTransaction; -import org.apache.cassandra.io.sstable.format.SortedTableWriter; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.TearDown; +import org.apache.cassandra.db.compaction.CompactionManager; +import org.apache.cassandra.db.compaction.OperationType; +import org.apache.cassandra.db.lifecycle.LifecycleTransaction; +import org.apache.cassandra.io.sstable.SSTableCursorReader; +import org.apache.cassandra.io.sstable.SSTableCursorWriter; +import org.apache.cassandra.io.sstable.format.SortedTableWriter; + @State(Scope.Benchmark) public class SSTablePipeCursorBench extends SSTableAbstractPipeBench diff --git a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableRawVisitorBench.java b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableRawVisitorBench.java index 5d4db56cc5..cfa9d1dd2e 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableRawVisitorBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableRawVisitorBench.java @@ -22,6 +22,13 @@ import java.io.IOException; import com.google.common.collect.ImmutableList; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; + import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.rows.UnfilteredSerializer; import org.apache.cassandra.io.sstable.format.SSTableReader; @@ -30,12 +37,6 @@ import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.vint.VIntCoding; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; @State(Scope.Benchmark) public class SSTableRawVisitorBench extends SSTableAbstractBench diff --git a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingBench.java b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingBench.java index d6a820ee4d..f6b53e00b0 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingBench.java @@ -21,11 +21,6 @@ package org.apache.cassandra.test.microbench.sstable; import java.io.IOException; import java.util.stream.Stream; -import org.apache.cassandra.db.rows.Row; -import org.apache.cassandra.db.rows.UnfilteredRowIterator; -import org.apache.cassandra.io.sstable.ISSTableScanner; -import org.apache.cassandra.io.sstable.format.SSTableReader; -import org.apache.cassandra.tools.Util; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Scope; @@ -33,6 +28,12 @@ import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.TearDown; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.io.sstable.ISSTableScanner; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.tools.Util; + @State(Scope.Benchmark) public class SSTableReadingBench extends SSTableAbstractBench { diff --git a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingCursorBench.java b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingCursorBench.java index e5c5d957cc..f4e75ef0ac 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingCursorBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingCursorBench.java @@ -20,8 +20,6 @@ package org.apache.cassandra.test.microbench.sstable; import java.io.IOException; -import org.apache.cassandra.io.sstable.SSTableCursorReader; -import org.apache.cassandra.io.sstable.format.SSTableReader; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Scope; @@ -29,6 +27,9 @@ import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.TearDown; +import org.apache.cassandra.io.sstable.SSTableCursorReader; +import org.apache.cassandra.io.sstable.format.SSTableReader; + @State(Scope.Benchmark) public class SSTableReadingCursorBench extends SSTableAbstractBench { diff --git a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingFileBench.java b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingFileBench.java index dab8faa36b..ef156866cd 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingFileBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingFileBench.java @@ -23,16 +23,6 @@ import java.io.IOException; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.rows.Row; -import org.apache.cassandra.db.rows.UnfilteredRowIterator; -import org.apache.cassandra.io.sstable.Descriptor; -import org.apache.cassandra.io.sstable.ISSTableScanner; -import org.apache.cassandra.io.sstable.format.SSTableReader; -import org.apache.cassandra.io.util.File; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.schema.TableMetadataRef; -import org.apache.cassandra.tools.Util; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -47,6 +37,17 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.TearDown; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.io.sstable.Descriptor; +import org.apache.cassandra.io.sstable.ISSTableScanner; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.TableMetadataRef; +import org.apache.cassandra.tools.Util; + import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_UTIL_ALLOW_TOOL_REINIT_FOR_TEST; @BenchmarkMode(Mode.AverageTime) diff --git a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingFileCursorBench.java b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingFileCursorBench.java index a7d2ebf444..5e73ed604b 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingFileCursorBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/sstable/SSTableReadingFileCursorBench.java @@ -23,13 +23,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.io.sstable.PartitionDescriptor; -import org.apache.cassandra.io.sstable.UnfilteredDescriptor; -import org.apache.cassandra.io.sstable.SSTableCursorReader; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.io.sstable.Descriptor; -import org.apache.cassandra.io.util.File; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -44,8 +37,24 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.TearDown; import org.openjdk.jmh.annotations.Warmup; -import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.*; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.io.sstable.Descriptor; +import org.apache.cassandra.io.sstable.PartitionDescriptor; +import org.apache.cassandra.io.sstable.SSTableCursorReader; +import org.apache.cassandra.io.sstable.UnfilteredDescriptor; +import org.apache.cassandra.io.util.File; + import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_UTIL_ALLOW_TOOL_REINIT_FOR_TEST; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.CELL_END; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.CELL_VALUE_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.DONE; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.PARTITION_END; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.PARTITION_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.ROW_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.STATIC_ROW_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.TOMBSTONE_START; +import static org.apache.cassandra.io.sstable.SSTableCursorReader.State.UNFILTERED_END; @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/tries/ComparisonReadBench.java b/test/microbench/org/apache/cassandra/test/microbench/tries/ComparisonReadBench.java index f52ab28d6b..91dc6970e8 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/tries/ComparisonReadBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/tries/ComparisonReadBench.java @@ -34,14 +34,6 @@ import java.util.function.Consumer; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; -import org.apache.cassandra.db.marshal.DecimalType; -import org.apache.cassandra.db.marshal.IntegerType; -import org.apache.cassandra.db.tries.InMemoryTrie; -import org.apache.cassandra.io.compress.BufferType; -import org.apache.cassandra.utils.ByteArrayUtil; -import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import org.apache.cassandra.utils.bytecomparable.ByteSource; -import org.apache.cassandra.utils.bytecomparable.ByteSourceInverse; import org.github.jamm.MemoryMeter; import org.github.jamm.MemoryMeter.Guess; import org.openjdk.jmh.annotations.Benchmark; @@ -58,6 +50,15 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; +import org.apache.cassandra.db.marshal.DecimalType; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.tries.InMemoryTrie; +import org.apache.cassandra.io.compress.BufferType; +import org.apache.cassandra.utils.ByteArrayUtil; +import org.apache.cassandra.utils.bytecomparable.ByteComparable; +import org.apache.cassandra.utils.bytecomparable.ByteSource; +import org.apache.cassandra.utils.bytecomparable.ByteSourceInverse; + @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 2, time = 1) diff --git a/test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieReadBench.java b/test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieReadBench.java index 52fc63ad39..889a5b1fe8 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieReadBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieReadBench.java @@ -22,13 +22,26 @@ import java.util.Random; import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + import org.apache.cassandra.db.tries.Direction; import org.apache.cassandra.db.tries.InMemoryTrie; import org.apache.cassandra.db.tries.Trie; import org.apache.cassandra.db.tries.TrieEntriesWalker; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import org.openjdk.jmh.annotations.*; @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieUnionBench.java b/test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieUnionBench.java index e32e20f7e6..7cfd3290f5 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieUnionBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieUnionBench.java @@ -25,11 +25,24 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.Iterables; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + import org.apache.cassandra.db.tries.InMemoryTrie; import org.apache.cassandra.db.tries.Trie; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import org.openjdk.jmh.annotations.*; @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieWriteBench.java b/test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieWriteBench.java index f2be11dd8a..915a6d62f7 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieWriteBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieWriteBench.java @@ -21,11 +21,22 @@ import java.nio.ByteBuffer; import java.util.Random; import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; + import org.apache.cassandra.db.tries.InMemoryTrie; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import org.openjdk.jmh.annotations.*; -import org.openjdk.jmh.infra.Blackhole; @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/test/simulator/main/org/apache/cassandra/simulator/Action.java b/test/simulator/main/org/apache/cassandra/simulator/Action.java index 76c22cef4b..7f633f2385 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/Action.java +++ b/test/simulator/main/org/apache/cassandra/simulator/Action.java @@ -29,15 +29,25 @@ import java.util.Queue; import com.google.common.base.Preconditions; -import io.netty.util.internal.DefaultPriorityQueue; -import io.netty.util.internal.PriorityQueue; -import io.netty.util.internal.PriorityQueueNode; import org.apache.cassandra.simulator.Ordered.StrictlyOrdered; import org.apache.cassandra.simulator.systems.SimulatedTime; import org.apache.cassandra.utils.Throwables; +import io.netty.util.internal.DefaultPriorityQueue; +import io.netty.util.internal.PriorityQueue; +import io.netty.util.internal.PriorityQueueNode; + import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_SIMULATOR_DEBUG; -import static org.apache.cassandra.simulator.Action.Modifier.*; +import static org.apache.cassandra.simulator.Action.Modifier.DAEMON; +import static org.apache.cassandra.simulator.Action.Modifier.ORPHAN; +import static org.apache.cassandra.simulator.Action.Modifier.ORPHAN_TO_GRANDPARENT; +import static org.apache.cassandra.simulator.Action.Modifier.PSEUDO_ORPHAN; +import static org.apache.cassandra.simulator.Action.Modifier.RELIABLE; +import static org.apache.cassandra.simulator.Action.Modifier.STRICT_CHILD_OF_PARENT_ORDER; +import static org.apache.cassandra.simulator.Action.Modifier.STRICT_CHILD_ORDER; +import static org.apache.cassandra.simulator.Action.Modifier.THREAD_SIGNAL; +import static org.apache.cassandra.simulator.Action.Modifier.WAKEUP; +import static org.apache.cassandra.simulator.Action.Modifier.WITHHOLD; import static org.apache.cassandra.simulator.Action.Modifiers.NONE; import static org.apache.cassandra.simulator.Action.Phase.CANCELLED; import static org.apache.cassandra.simulator.Action.Phase.CONSEQUENCE; @@ -49,8 +59,8 @@ import static org.apache.cassandra.simulator.Action.Phase.WITHHELD; import static org.apache.cassandra.simulator.Action.RegisteredType.CHILD; import static org.apache.cassandra.simulator.Action.RegisteredType.LISTENER; import static org.apache.cassandra.simulator.ActionListener.Before.DROP; -import static org.apache.cassandra.simulator.ActionListener.Before.INVALIDATE; import static org.apache.cassandra.simulator.ActionListener.Before.EXECUTE; +import static org.apache.cassandra.simulator.ActionListener.Before.INVALIDATE; import static org.apache.cassandra.simulator.utils.CompactLists.append; import static org.apache.cassandra.simulator.utils.CompactLists.remove; import static org.apache.cassandra.simulator.utils.CompactLists.safeForEach; diff --git a/test/simulator/main/org/apache/cassandra/simulator/ActionSchedule.java b/test/simulator/main/org/apache/cassandra/simulator/ActionSchedule.java index 92ad5681e7..de181ef688 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/ActionSchedule.java +++ b/test/simulator/main/org/apache/cassandra/simulator/ActionSchedule.java @@ -31,11 +31,10 @@ import java.util.function.LongSupplier; import java.util.stream.Stream; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.util.internal.DefaultPriorityQueue; -import io.netty.util.internal.PriorityQueue; import org.apache.cassandra.simulator.OrderOn.OrderOnId; import org.apache.cassandra.simulator.Ordered.Sequence; import org.apache.cassandra.simulator.systems.SimulatedTime; @@ -43,6 +42,9 @@ import org.apache.cassandra.simulator.utils.SafeCollections; import org.apache.cassandra.utils.CloseableIterator; import org.apache.cassandra.utils.Throwables; +import io.netty.util.internal.DefaultPriorityQueue; +import io.netty.util.internal.PriorityQueue; + import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_SIMULATOR_DEBUG; import static org.apache.cassandra.simulator.Action.Modifier.DAEMON; import static org.apache.cassandra.simulator.Action.Modifier.STREAM; @@ -54,8 +56,8 @@ import static org.apache.cassandra.simulator.Action.Phase.SEQUENCED_POST_SCHEDUL import static org.apache.cassandra.simulator.Action.Phase.SEQUENCED_PRE_SCHEDULED; import static org.apache.cassandra.simulator.ActionSchedule.Mode.TIME_LIMITED; import static org.apache.cassandra.simulator.ActionSchedule.Mode.UNLIMITED; -import static org.apache.cassandra.simulator.SimulatorUtils.failWithOOM; import static org.apache.cassandra.simulator.SimulatorUtils.dumpStackTraces; +import static org.apache.cassandra.simulator.SimulatorUtils.failWithOOM; /** * TODO (feature): support total stalls on specific nodes diff --git a/test/simulator/main/org/apache/cassandra/simulator/Debug.java b/test/simulator/main/org/apache/cassandra/simulator/Debug.java index cf0be67092..ccca3a1720 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/Debug.java +++ b/test/simulator/main/org/apache/cassandra/simulator/Debug.java @@ -28,6 +28,7 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; + import javax.annotation.Nullable; import org.slf4j.Logger; diff --git a/test/simulator/main/org/apache/cassandra/simulator/SimulationRunner.java b/test/simulator/main/org/apache/cassandra/simulator/SimulationRunner.java index 11aa42c88d..8bca236f0d 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/SimulationRunner.java +++ b/test/simulator/main/org/apache/cassandra/simulator/SimulationRunner.java @@ -30,13 +30,13 @@ import java.util.function.ToDoubleFunction; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; + import javax.inject.Inject; import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.simulator.Debug.Info; import org.apache.cassandra.simulator.Debug.Levels; @@ -53,6 +53,8 @@ import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Hex; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; + +import io.netty.util.concurrent.FastThreadLocal; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/test/simulator/main/org/apache/cassandra/simulator/SimulatorUtils.java b/test/simulator/main/org/apache/cassandra/simulator/SimulatorUtils.java index 805cc4badc..1a76566f18 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/SimulatorUtils.java +++ b/test/simulator/main/org/apache/cassandra/simulator/SimulatorUtils.java @@ -29,8 +29,9 @@ import java.util.stream.Collectors; import org.slf4j.Logger; -import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.utils.concurrent.Threads; + +import io.netty.util.concurrent.FastThreadLocal; import picocli.CommandLine; public class SimulatorUtils diff --git a/test/simulator/main/org/apache/cassandra/simulator/asm/NemesisFieldSelectors.java b/test/simulator/main/org/apache/cassandra/simulator/asm/NemesisFieldSelectors.java index e8c420d343..0e1afa622f 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/asm/NemesisFieldSelectors.java +++ b/test/simulator/main/org/apache/cassandra/simulator/asm/NemesisFieldSelectors.java @@ -26,11 +26,12 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.stream.Stream; -import org.apache.cassandra.utils.Nemesis; import org.reflections.Reflections; import org.reflections.scanners.FieldAnnotationsScanner; import org.reflections.util.ConfigurationBuilder; +import org.apache.cassandra.utils.Nemesis; + import static java.util.Collections.emptyMap; import static org.apache.cassandra.simulator.asm.InterceptClasses.dotsToSlashes; import static org.apache.cassandra.simulator.asm.NemesisFieldKind.SIMPLE; diff --git a/test/simulator/main/org/apache/cassandra/simulator/cluster/ClusterActions.java b/test/simulator/main/org/apache/cassandra/simulator/cluster/ClusterActions.java index 4d215ceefa..1ef3bcae8a 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/cluster/ClusterActions.java +++ b/test/simulator/main/org/apache/cassandra/simulator/cluster/ClusterActions.java @@ -32,6 +32,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import com.google.common.base.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/simulator/main/org/apache/cassandra/simulator/cluster/ClusterReliableAction.java b/test/simulator/main/org/apache/cassandra/simulator/cluster/ClusterReliableAction.java index 591f2b9fa2..cf736f41fa 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/cluster/ClusterReliableAction.java +++ b/test/simulator/main/org/apache/cassandra/simulator/cluster/ClusterReliableAction.java @@ -18,7 +18,7 @@ package org.apache.cassandra.simulator.cluster; -import static org.apache.cassandra.distributed.api.IIsolatedExecutor.*; +import static org.apache.cassandra.distributed.api.IIsolatedExecutor.SerializableRunnable; import static org.apache.cassandra.simulator.Action.Modifiers.RELIABLE_NO_TIMEOUTS; public class ClusterReliableAction extends ClusterAction diff --git a/test/simulator/main/org/apache/cassandra/simulator/debug/SelfReconcilingRandom.java b/test/simulator/main/org/apache/cassandra/simulator/debug/SelfReconcilingRandom.java index 99df4b987e..3e4a5d995f 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/debug/SelfReconcilingRandom.java +++ b/test/simulator/main/org/apache/cassandra/simulator/debug/SelfReconcilingRandom.java @@ -21,6 +21,7 @@ package org.apache.cassandra.simulator.debug; import java.util.function.Supplier; import org.agrona.collections.Long2LongHashMap; + import org.apache.cassandra.simulator.RandomSource; import static org.apache.cassandra.simulator.SimulatorUtils.failWithOOM; diff --git a/test/simulator/main/org/apache/cassandra/simulator/logging/RunStartDefiner.java b/test/simulator/main/org/apache/cassandra/simulator/logging/RunStartDefiner.java index 6d541eb7c3..b0a7e6d0c5 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/logging/RunStartDefiner.java +++ b/test/simulator/main/org/apache/cassandra/simulator/logging/RunStartDefiner.java @@ -19,9 +19,11 @@ package org.apache.cassandra.simulator.logging; import accord.utils.Invariants; -import ch.qos.logback.core.PropertyDefinerBase; + import org.apache.cassandra.config.CassandraRelevantProperties; +import ch.qos.logback.core.PropertyDefinerBase; + public class RunStartDefiner extends PropertyDefinerBase { static diff --git a/test/simulator/main/org/apache/cassandra/simulator/logging/SeedDefiner.java b/test/simulator/main/org/apache/cassandra/simulator/logging/SeedDefiner.java index 12d1ca8d2d..17f18a24e0 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/logging/SeedDefiner.java +++ b/test/simulator/main/org/apache/cassandra/simulator/logging/SeedDefiner.java @@ -18,9 +18,10 @@ package org.apache.cassandra.simulator.logging; -import ch.qos.logback.core.PropertyDefinerBase; import org.apache.cassandra.config.CassandraRelevantProperties; +import ch.qos.logback.core.PropertyDefinerBase; + public class SeedDefiner extends PropertyDefinerBase { public static void setSeed(long seed) diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/AbstractPairOfSequencesPaxosSimulation.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/AbstractPairOfSequencesPaxosSimulation.java index c0fec09c43..97114bee9f 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/AbstractPairOfSequencesPaxosSimulation.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/AbstractPairOfSequencesPaxosSimulation.java @@ -30,6 +30,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/AccordSimulationRunner.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/AccordSimulationRunner.java index b8502a1147..c6fa1a620a 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/AccordSimulationRunner.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/AccordSimulationRunner.java @@ -28,6 +28,7 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.simulator.SimulationRunner; import org.apache.cassandra.simulator.SimulatorUtils; import org.apache.cassandra.utils.StorageCompatibilityMode; + import picocli.CommandLine; import picocli.CommandLine.Command; diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/LinearizabilityValidator.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/LinearizabilityValidator.java index 47a88aec89..3b23257ba8 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/LinearizabilityValidator.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/LinearizabilityValidator.java @@ -19,6 +19,7 @@ package org.apache.cassandra.simulator.paxos; import java.util.function.Consumer; + import javax.annotation.Nullable; import com.carrotsearch.hppc.IntObjectHashMap; diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/LoggingHistoryValidator.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/LoggingHistoryValidator.java index f51cbe3b00..231c20885c 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/LoggingHistoryValidator.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/LoggingHistoryValidator.java @@ -19,6 +19,7 @@ package org.apache.cassandra.simulator.paxos; import java.util.Arrays; + import javax.annotation.Nullable; import org.slf4j.Logger; diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/PairOfSequencesAccordSimulation.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/PairOfSequencesAccordSimulation.java index 35deb18744..391cd654c0 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/PairOfSequencesAccordSimulation.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/PairOfSequencesAccordSimulation.java @@ -28,14 +28,16 @@ import java.util.function.LongSupplier; import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.annotation.Nullable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import com.carrotsearch.hppc.IntArrayList; import com.carrotsearch.hppc.IntHashSet; import com.carrotsearch.hppc.cursors.IntCursor; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.Clustering; diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/PairOfSequencesPaxosSimulation.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/PairOfSequencesPaxosSimulation.java index fbda896451..d4a887c22b 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/PairOfSequencesPaxosSimulation.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/PairOfSequencesPaxosSimulation.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.function.BiFunction; import java.util.function.LongSupplier; import java.util.function.Supplier; + import javax.annotation.Nullable; import org.apache.commons.lang3.ArrayUtils; diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/PaxosSimulation.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/PaxosSimulation.java index e58e691962..759fb8807b 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/PaxosSimulation.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/PaxosSimulation.java @@ -32,16 +32,18 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; import java.util.function.LongSupplier; import java.util.stream.Stream; + import javax.annotation.Nullable; import com.google.common.base.Throwables; -import org.apache.cassandra.gms.FailureDetector; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.coordinate.CoordinationFailed; import accord.coordinate.Invalidated; import accord.coordinate.Preempted; + import org.apache.cassandra.concurrent.ExecutorFactory; import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.distributed.Cluster; @@ -49,6 +51,7 @@ import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.api.IIsolatedExecutor; import org.apache.cassandra.distributed.api.SimpleQueryResult; import org.apache.cassandra.exceptions.RequestExecutionException; +import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.service.paxos.BallotGenerator; import org.apache.cassandra.simulator.ActionList; import org.apache.cassandra.simulator.ActionPlan; diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/PaxosSimulationRunner.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/PaxosSimulationRunner.java index 5e19bda1bb..2d72e4779a 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/PaxosSimulationRunner.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/PaxosSimulationRunner.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.lang.reflect.Field; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; + import javax.inject.Inject; import org.apache.cassandra.config.Config; @@ -29,6 +30,7 @@ import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.simulator.ClusterSimulation; import org.apache.cassandra.simulator.SimulationRunner; import org.apache.cassandra.simulator.SimulatorUtils; + import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/StrictSerializabilityValidator.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/StrictSerializabilityValidator.java index 5691d7ce02..d1e6e8d238 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/StrictSerializabilityValidator.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/StrictSerializabilityValidator.java @@ -20,10 +20,11 @@ package org.apache.cassandra.simulator.paxos; import javax.annotation.Nullable; -import accord.verify.StrictSerializabilityVerifier; import com.carrotsearch.hppc.IntIntHashMap; import com.carrotsearch.hppc.IntIntMap; +import accord.verify.StrictSerializabilityVerifier; + public class StrictSerializabilityValidator implements HistoryValidator { private final StrictSerializabilityVerifier verifier; diff --git a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptibleThread.java b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptibleThread.java index 0d1e38b298..0bc2b594f7 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptibleThread.java +++ b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptibleThread.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.locks.LockSupport; -import io.netty.util.concurrent.FastThreadLocalThread; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.api.IMessage; import org.apache.cassandra.simulator.OrderOn; @@ -31,6 +30,8 @@ import org.apache.cassandra.simulator.systems.SimulatedTime.LocalTime; import org.apache.cassandra.utils.Shared; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; +import io.netty.util.concurrent.FastThreadLocalThread; + import static org.apache.cassandra.simulator.systems.InterceptedWait.Kind.UNBOUNDED_WAIT; import static org.apache.cassandra.simulator.systems.InterceptedWait.Kind.WAIT_UNTIL; import static org.apache.cassandra.simulator.systems.InterceptedWait.Trigger.INTERRUPT; diff --git a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingAwaitable.java b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingAwaitable.java index 0719cdd59d..d8f448095b 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingAwaitable.java +++ b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingAwaitable.java @@ -32,8 +32,8 @@ import org.apache.cassandra.utils.concurrent.CountDownLatch; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; import org.apache.cassandra.utils.concurrent.WaitQueue; -import static org.apache.cassandra.simulator.systems.InterceptedWait.Kind.WAIT_UNTIL; import static org.apache.cassandra.simulator.systems.InterceptedWait.Kind.UNBOUNDED_WAIT; +import static org.apache.cassandra.simulator.systems.InterceptedWait.Kind.WAIT_UNTIL; import static org.apache.cassandra.simulator.systems.InterceptedWait.Trigger.SIGNAL; import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.captureWaitSite; import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted; diff --git a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingExecutor.java b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingExecutor.java index 1c38cd813d..bd3acdcbc7 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingExecutor.java +++ b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingExecutor.java @@ -65,8 +65,8 @@ import static org.apache.cassandra.simulator.systems.SimulatedAction.Kind.SCHEDU import static org.apache.cassandra.simulator.systems.SimulatedAction.Kind.SCHEDULED_TASK; import static org.apache.cassandra.simulator.systems.SimulatedAction.Kind.SCHEDULED_TIMEOUT; import static org.apache.cassandra.simulator.systems.SimulatedExecution.callable; -import static org.apache.cassandra.simulator.systems.SimulatedTime.Global.localToRelativeNanos; import static org.apache.cassandra.simulator.systems.SimulatedTime.Global.localToGlobalNanos; +import static org.apache.cassandra.simulator.systems.SimulatedTime.Global.localToRelativeNanos; import static org.apache.cassandra.simulator.systems.SimulatedTime.Global.relativeToGlobalNanos; import static org.apache.cassandra.simulator.systems.SimulatedTime.Global.relativeToLocalNanos; import static org.apache.cassandra.utils.Shared.Recursive.INTERFACES; diff --git a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingExecutorFactory.java b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingExecutorFactory.java index d4b58ef890..68c718b59b 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingExecutorFactory.java +++ b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingExecutorFactory.java @@ -32,7 +32,7 @@ import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; import accord.utils.UnhandledEnum; -import io.netty.util.concurrent.FastThreadLocal; + import org.apache.cassandra.concurrent.ExecutorBuilder; import org.apache.cassandra.concurrent.ExecutorBuilderFactory; import org.apache.cassandra.concurrent.ExecutorFactory; @@ -40,12 +40,12 @@ import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.concurrent.InfiniteLoopExecutor; import org.apache.cassandra.concurrent.InfiniteLoopExecutor.Interrupts; import org.apache.cassandra.concurrent.InfiniteLoopExecutor.SimulatorSafe; +import org.apache.cassandra.concurrent.Interruptible; import org.apache.cassandra.concurrent.Interruptible.Task; import org.apache.cassandra.concurrent.LocalAwareExecutorPlus; import org.apache.cassandra.concurrent.LocalAwareSequentialExecutorPlus; import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.concurrent.SequentialExecutorPlus; -import org.apache.cassandra.concurrent.Interruptible; import org.apache.cassandra.concurrent.SyncFutureTask; import org.apache.cassandra.concurrent.TaskFactory; import org.apache.cassandra.distributed.api.IIsolatedExecutor; @@ -58,17 +58,19 @@ import org.apache.cassandra.distributed.impl.IsolatedExecutor; import org.apache.cassandra.simulator.systems.InterceptibleThreadFactory.ConcreteInterceptibleThreadFactory; import org.apache.cassandra.simulator.systems.InterceptibleThreadFactory.PlainThreadFactory; import org.apache.cassandra.simulator.systems.InterceptingExecutor.DiscardingSequentialExecutor; -import org.apache.cassandra.simulator.systems.InterceptingExecutor.InterceptingTaskFactory; import org.apache.cassandra.simulator.systems.InterceptingExecutor.InterceptingLocalAwareSequentialExecutor; import org.apache.cassandra.simulator.systems.InterceptingExecutor.InterceptingPooledExecutor; import org.apache.cassandra.simulator.systems.InterceptingExecutor.InterceptingPooledLocalAwareExecutor; import org.apache.cassandra.simulator.systems.InterceptingExecutor.InterceptingSequentialExecutor; +import org.apache.cassandra.simulator.systems.InterceptingExecutor.InterceptingTaskFactory; import org.apache.cassandra.simulator.systems.InterceptorOfExecution.InterceptExecution; import org.apache.cassandra.simulator.systems.SimulatedTime.LocalTime; import org.apache.cassandra.utils.Closeable; import org.apache.cassandra.utils.WithResources; import org.apache.cassandra.utils.concurrent.RunnableFuture; +import io.netty.util.concurrent.FastThreadLocal; + import static org.apache.cassandra.simulator.systems.SimulatedAction.Kind.INFINITE_LOOP; import static org.apache.cassandra.simulator.systems.SimulatedAction.Kind.SCHEDULED_DAEMON; import static org.apache.cassandra.simulator.systems.SimulatedAction.Kind.THREAD; diff --git a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingMonitors.java b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingMonitors.java index 1fcc4a8354..d32a62b30d 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingMonitors.java +++ b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingMonitors.java @@ -26,10 +26,11 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import net.nicoulaj.compilecommand.annotations.Inline; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.nicoulaj.compilecommand.annotations.Inline; import org.apache.cassandra.simulator.RandomSource; import org.apache.cassandra.simulator.systems.InterceptedWait.InterceptedConditionWait; import org.apache.cassandra.utils.Clock; diff --git a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptorOfGlobalMethods.java b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptorOfGlobalMethods.java index 503c73b702..ccbf3568cc 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptorOfGlobalMethods.java +++ b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptorOfGlobalMethods.java @@ -25,10 +25,11 @@ import java.util.function.IntSupplier; import java.util.function.LongConsumer; import java.util.function.ToIntFunction; +import net.openhft.chronicle.core.util.WeakIdentityHashMap; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.openhft.chronicle.core.util.WeakIdentityHashMap; import org.apache.cassandra.simulator.systems.InterceptedWait.CaptureSites; import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.Closeable; diff --git a/test/simulator/main/org/apache/cassandra/simulator/systems/SimulatedAction.java b/test/simulator/main/org/apache/cassandra/simulator/systems/SimulatedAction.java index 9943110de1..484d982d70 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/systems/SimulatedAction.java +++ b/test/simulator/main/org/apache/cassandra/simulator/systems/SimulatedAction.java @@ -25,6 +25,7 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; import java.util.concurrent.Executor; + import javax.annotation.Nullable; import com.google.common.base.Preconditions; diff --git a/test/simulator/test/org/apache/cassandra/simulator/paxos/AbstractPairOfSequencesPaxosSimulationTest.java b/test/simulator/test/org/apache/cassandra/simulator/paxos/AbstractPairOfSequencesPaxosSimulationTest.java index 32af571748..fcdc7deb41 100644 --- a/test/simulator/test/org/apache/cassandra/simulator/paxos/AbstractPairOfSequencesPaxosSimulationTest.java +++ b/test/simulator/test/org/apache/cassandra/simulator/paxos/AbstractPairOfSequencesPaxosSimulationTest.java @@ -21,12 +21,12 @@ package org.apache.cassandra.simulator.paxos; import java.util.Collections; import java.util.List; +import org.assertj.core.api.Assertions; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.distributed.api.LogAction; import org.apache.cassandra.distributed.api.LogResult; -import org.assertj.core.api.Assertions; -import org.mockito.Mockito; public class AbstractPairOfSequencesPaxosSimulationTest { diff --git a/test/simulator/test/org/apache/cassandra/simulator/paxos/HistoryValidatorTest.java b/test/simulator/test/org/apache/cassandra/simulator/paxos/HistoryValidatorTest.java index 46b4345ab4..53408c1362 100644 --- a/test/simulator/test/org/apache/cassandra/simulator/paxos/HistoryValidatorTest.java +++ b/test/simulator/test/org/apache/cassandra/simulator/paxos/HistoryValidatorTest.java @@ -30,7 +30,14 @@ import java.util.regex.Pattern; import java.util.stream.IntStream; import java.util.stream.Stream; -import org.apache.cassandra.config.CassandraRelevantProperties; +import com.carrotsearch.hppc.IntHashSet; +import com.carrotsearch.hppc.IntIntHashMap; +import com.carrotsearch.hppc.IntIntMap; +import com.carrotsearch.hppc.IntSet; +import com.carrotsearch.hppc.cursors.IntCursor; + +import org.assertj.core.api.AbstractThrowableAssert; +import org.assertj.core.api.Assertions; import org.junit.Assume; import org.junit.FixMethodOrder; import org.junit.Test; @@ -40,15 +47,9 @@ import org.junit.runners.Parameterized; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.carrotsearch.hppc.IntHashSet; -import com.carrotsearch.hppc.IntIntHashMap; -import com.carrotsearch.hppc.IntIntMap; -import com.carrotsearch.hppc.IntSet; -import com.carrotsearch.hppc.cursors.IntCursor; +import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.distributed.api.QueryResults; import org.apache.cassandra.utils.Clock; -import org.assertj.core.api.AbstractThrowableAssert; -import org.assertj.core.api.Assertions; import static org.apache.commons.lang3.ArrayUtils.add; import static org.apache.commons.lang3.ArrayUtils.swap; diff --git a/test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java b/test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java index d220374cab..377c63031a 100644 --- a/test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java +++ b/test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java @@ -25,6 +25,7 @@ import java.util.zip.Checksum; import com.google.common.collect.ImmutableMap; import com.google.common.jimfs.Jimfs; + import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; @@ -35,9 +36,9 @@ import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.config.AccordSpec; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.config.ParameterizedClass; import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.io.filesystem.ListenableFileSystem; diff --git a/test/simulator/test/org/apache/cassandra/simulator/test/EpochStressTest.java b/test/simulator/test/org/apache/cassandra/simulator/test/EpochStressTest.java index 64e47e9802..c318a45d71 100644 --- a/test/simulator/test/org/apache/cassandra/simulator/test/EpochStressTest.java +++ b/test/simulator/test/org/apache/cassandra/simulator/test/EpochStressTest.java @@ -28,8 +28,8 @@ import java.util.function.Consumer; import java.util.function.Supplier; import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.Test; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,6 +37,7 @@ import accord.local.Node; import accord.primitives.Ranges; import accord.topology.EpochReady; import accord.topology.TopologyManager; + import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.service.accord.AccordService; import org.apache.cassandra.service.consensus.TransactionalMode; diff --git a/test/simulator/test/org/apache/cassandra/simulator/test/HarrySimulatorTest.java b/test/simulator/test/org/apache/cassandra/simulator/test/HarrySimulatorTest.java index ba4d0d9caf..0d0122309f 100644 --- a/test/simulator/test/org/apache/cassandra/simulator/test/HarrySimulatorTest.java +++ b/test/simulator/test/org/apache/cassandra/simulator/test/HarrySimulatorTest.java @@ -41,6 +41,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; @@ -102,6 +103,7 @@ import org.apache.cassandra.tcm.sequences.SingleNodeSequences; import org.apache.cassandra.tcm.transformations.PrepareJoin; import org.apache.cassandra.utils.CloseableIterator; import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; + import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/test/simulator/test/org/apache/cassandra/simulator/test/HarryValidatingQuery.java b/test/simulator/test/org/apache/cassandra/simulator/test/HarryValidatingQuery.java index 3e34bf69b1..fd2526f5e1 100644 --- a/test/simulator/test/org/apache/cassandra/simulator/test/HarryValidatingQuery.java +++ b/test/simulator/test/org/apache/cassandra/simulator/test/HarryValidatingQuery.java @@ -24,17 +24,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; import org.apache.cassandra.distributed.api.IInstance; -import org.apache.cassandra.harry.gen.EntropySource; -import org.apache.cassandra.harry.op.Visit; -import org.apache.cassandra.harry.op.Operations; import org.apache.cassandra.harry.execution.CompiledStatement; import org.apache.cassandra.harry.execution.InJvmDTestVisitExecutor; import org.apache.cassandra.harry.execution.QueryBuildingVisitExecutor; import org.apache.cassandra.harry.execution.ResultSetRow; +import org.apache.cassandra.harry.gen.EntropySource; import org.apache.cassandra.harry.model.TokenPlacementModel; +import org.apache.cassandra.harry.op.Operations; +import org.apache.cassandra.harry.op.Visit; import org.apache.cassandra.harry.util.ByteUtils; import org.apache.cassandra.harry.util.TokenUtil; import org.apache.cassandra.simulator.systems.InterceptedExecution; diff --git a/test/simulator/test/org/apache/cassandra/simulator/test/SimulationTestBase.java b/test/simulator/test/org/apache/cassandra/simulator/test/SimulationTestBase.java index 38af502f71..195a4f23a5 100644 --- a/test/simulator/test/org/apache/cassandra/simulator/test/SimulationTestBase.java +++ b/test/simulator/test/org/apache/cassandra/simulator/test/SimulationTestBase.java @@ -32,14 +32,15 @@ import java.util.function.Predicate; import javax.annotation.Nullable; import com.google.common.collect.Iterators; + import org.junit.BeforeClass; import org.apache.cassandra.concurrent.ExecutorFactory; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.distributed.Cluster; import org.apache.cassandra.distributed.api.ConsistencyLevel; -import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.api.IInstanceConfig; +import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.api.IIsolatedExecutor; import org.apache.cassandra.distributed.api.IMessage; import org.apache.cassandra.distributed.impl.AbstractCluster; diff --git a/test/simulator/test/org/apache/cassandra/simulator/test/SingleNodeSingleTableASTTest.java b/test/simulator/test/org/apache/cassandra/simulator/test/SingleNodeSingleTableASTTest.java index 7924343dfd..8c66544bde 100644 --- a/test/simulator/test/org/apache/cassandra/simulator/test/SingleNodeSingleTableASTTest.java +++ b/test/simulator/test/org/apache/cassandra/simulator/test/SingleNodeSingleTableASTTest.java @@ -30,6 +30,7 @@ import accord.utils.Gen; import accord.utils.Gens; import accord.utils.RandomSource; import accord.utils.SeedProvider; + import org.apache.cassandra.net.Verb; import org.apache.cassandra.simulator.AlwaysDeliverNetworkScheduler; import org.apache.cassandra.simulator.ClusterSimulation; diff --git a/test/simulator/test/org/apache/cassandra/simulator/test/SingleTableASTSimulation.java b/test/simulator/test/org/apache/cassandra/simulator/test/SingleTableASTSimulation.java index 3b963aed88..d90c794f52 100644 --- a/test/simulator/test/org/apache/cassandra/simulator/test/SingleTableASTSimulation.java +++ b/test/simulator/test/org/apache/cassandra/simulator/test/SingleTableASTSimulation.java @@ -28,6 +28,7 @@ import java.util.function.Consumer; import javax.annotation.Nullable; +import org.quicktheories.generators.SourceDSL; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,6 +36,7 @@ import accord.utils.DefaultRandom; import accord.utils.Gen; import accord.utils.Gens; import accord.utils.RandomSource; + import org.apache.cassandra.cql3.ast.CQLFormatter; import org.apache.cassandra.cql3.ast.Mutation; import org.apache.cassandra.cql3.ast.Select; @@ -74,7 +76,6 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.CassandraGenerators; import org.apache.cassandra.utils.FastByteOperations; import org.apache.cassandra.utils.Generators; -import org.quicktheories.generators.SourceDSL; import static org.apache.cassandra.simulator.cluster.ClusterActions.InitialConfiguration.initializeAll; import static org.apache.cassandra.utils.AbstractTypeGenerators.overridePrimitiveTypeSupport; diff --git a/test/unit/org/apache/cassandra/AbstractSerializationsTester.java b/test/unit/org/apache/cassandra/AbstractSerializationsTester.java index 92d9cc9522..171507a973 100644 --- a/test/unit/org/apache/cassandra/AbstractSerializationsTester.java +++ b/test/unit/org/apache/cassandra/AbstractSerializationsTester.java @@ -19,14 +19,18 @@ */ package org.apache.cassandra; -import org.apache.cassandra.io.IVersionedSerializer; -import org.apache.cassandra.io.util.*; -import org.apache.cassandra.net.MessagingService; - import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.apache.cassandra.io.IVersionedSerializer; +import org.apache.cassandra.io.util.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputStreamPlus; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileInputStreamPlus; +import org.apache.cassandra.io.util.FileOutputStreamPlus; +import org.apache.cassandra.net.MessagingService; + import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_VERSION; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_SERIALIZATION_WRITES; diff --git a/test/unit/org/apache/cassandra/CassandraBriefJUnitResultFormatter.java b/test/unit/org/apache/cassandra/CassandraBriefJUnitResultFormatter.java index dc9b8f86b1..7b310382db 100644 --- a/test/unit/org/apache/cassandra/CassandraBriefJUnitResultFormatter.java +++ b/test/unit/org/apache/cassandra/CassandraBriefJUnitResultFormatter.java @@ -24,9 +24,6 @@ import java.io.OutputStream; import java.io.StringWriter; import java.text.NumberFormat; -import junit.framework.AssertionFailedError; // checkstyle: permit this import -import junit.framework.Test; // checkstyle: permit this import - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.optional.junit.IgnoredTestListener; import org.apache.tools.ant.taskdefs.optional.junit.JUnitResultFormatter; @@ -36,6 +33,9 @@ import org.apache.tools.ant.taskdefs.optional.junit.JUnitVersionHelper; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.StringUtils; +import junit.framework.AssertionFailedError; // checkstyle: permit this import +import junit.framework.Test; // checkstyle: permit this import + import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_CASSANDRA_KEEPBRIEFBRIEF; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_CASSANDRA_TESTTAG; diff --git a/test/unit/org/apache/cassandra/CassandraXMLJUnitResultFormatter.java b/test/unit/org/apache/cassandra/CassandraXMLJUnitResultFormatter.java index 7a9df05a48..bd6093d1c7 100644 --- a/test/unit/org/apache/cassandra/CassandraXMLJUnitResultFormatter.java +++ b/test/unit/org/apache/cassandra/CassandraXMLJUnitResultFormatter.java @@ -33,9 +33,6 @@ import java.util.Properties; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import junit.framework.AssertionFailedError; // checkstyle: permit this import -import junit.framework.Test; // checkstyle: permit this import - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.optional.junit.IgnoredTestListener; import org.apache.tools.ant.taskdefs.optional.junit.JUnitResultFormatter; @@ -50,9 +47,12 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Text; +import junit.framework.AssertionFailedError; // checkstyle: permit this import +import junit.framework.Test; // checkstyle: permit this import + +import static org.apache.cassandra.config.CassandraRelevantProperties.SUN_JAVA_COMMAND; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_CASSANDRA_SUITENAME; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_CASSANDRA_TESTTAG; -import static org.apache.cassandra.config.CassandraRelevantProperties.SUN_JAVA_COMMAND; import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; /** diff --git a/test/unit/org/apache/cassandra/LogbackStatusListener.java b/test/unit/org/apache/cassandra/LogbackStatusListener.java index 834d51fca2..e05d952426 100644 --- a/test/unit/org/apache/cassandra/LogbackStatusListener.java +++ b/test/unit/org/apache/cassandra/LogbackStatusListener.java @@ -28,13 +28,14 @@ import org.slf4j.ILoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.CassandraRelevantProperties; +import org.apache.cassandra.distributed.shared.InstanceClassLoader; + import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.LoggerContextListener; import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusListener; -import org.apache.cassandra.config.CassandraRelevantProperties; -import org.apache.cassandra.distributed.shared.InstanceClassLoader; import static org.apache.cassandra.config.CassandraRelevantProperties.SUN_STDERR_ENCODING; import static org.apache.cassandra.config.CassandraRelevantProperties.SUN_STDOUT_ENCODING; diff --git a/test/unit/org/apache/cassandra/MethodComparator.java b/test/unit/org/apache/cassandra/MethodComparator.java index 6422d5a736..f7b3574536 100644 --- a/test/unit/org/apache/cassandra/MethodComparator.java +++ b/test/unit/org/apache/cassandra/MethodComparator.java @@ -21,9 +21,6 @@ package org.apache.cassandra; */ -import org.junit.Ignore; -import org.junit.runners.model.FrameworkMethod; - import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -31,6 +28,9 @@ import java.io.LineNumberReader; import java.lang.reflect.Method; import java.util.Comparator; +import org.junit.Ignore; +import org.junit.runners.model.FrameworkMethod; + public class MethodComparator implements Comparator { private static final char[] METHOD_SEPARATORS = {1, 7}; diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java index 53f98859e5..7f80138930 100644 --- a/test/unit/org/apache/cassandra/SchemaLoader.java +++ b/test/unit/org/apache/cassandra/SchemaLoader.java @@ -37,14 +37,37 @@ import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.cql3.statements.schema.IndexTarget; import org.apache.cassandra.db.RowUpdateBuilder; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.CounterColumnType; +import org.apache.cassandra.db.marshal.DoubleType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.index.StubIndex; import org.apache.cassandra.index.sasi.SASIIndex; import org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.CachingParams; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.CompactionParams; +import org.apache.cassandra.schema.CompressionParams; +import org.apache.cassandra.schema.IndexMetadata; +import org.apache.cassandra.schema.Indexes; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.SchemaTestUtil; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.Tables; +import org.apache.cassandra.schema.Types; +import org.apache.cassandra.schema.UserFunctions; +import org.apache.cassandra.schema.Views; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/unit/org/apache/cassandra/ServerTestUtils.java b/test/unit/org/apache/cassandra/ServerTestUtils.java index 702e2b6871..ebc5bf1df5 100644 --- a/test/unit/org/apache/cassandra/ServerTestUtils.java +++ b/test/unit/org/apache/cassandra/ServerTestUtils.java @@ -31,6 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.impl.basic.SimulatedFault; + import org.apache.cassandra.audit.AuditLogManager; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; @@ -45,10 +46,10 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.big.BigTableReader; import org.apache.cassandra.io.sstable.indexsummary.IndexSummarySupport; import org.apache.cassandra.io.util.File; +import org.apache.cassandra.locator.BaseProximity; import org.apache.cassandra.locator.Endpoint; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.Replica; -import org.apache.cassandra.locator.BaseProximity; import org.apache.cassandra.security.ThreadAwareSecurityManager; import org.apache.cassandra.service.DiskErrorsHandlerService; import org.apache.cassandra.service.EmbeddedCassandraService; diff --git a/test/unit/org/apache/cassandra/UpdateBuilder.java b/test/unit/org/apache/cassandra/UpdateBuilder.java index 0f3c918bec..81270bb167 100644 --- a/test/unit/org/apache/cassandra/UpdateBuilder.java +++ b/test/unit/org/apache/cassandra/UpdateBuilder.java @@ -17,10 +17,13 @@ */ package org.apache.cassandra; +import org.apache.cassandra.db.ConsistencyLevel; +import org.apache.cassandra.db.CounterMutation; +import org.apache.cassandra.db.IMutation; +import org.apache.cassandra.db.Mutation; +import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.*; -import org.apache.cassandra.db.partitions.*; /** diff --git a/test/unit/org/apache/cassandra/Util.java b/test/unit/org/apache/cassandra/Util.java index eb41f5b864..9f7a12a854 100644 --- a/test/unit/org/apache/cassandra/Util.java +++ b/test/unit/org/apache/cassandra/Util.java @@ -58,11 +58,17 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; import org.apache.commons.lang3.StringUtils; +import org.awaitility.Awaitility; +import org.awaitility.core.ThrowingRunnable; +import org.hamcrest.Matcher; import org.junit.Assume; +import org.mockito.Mockito; +import org.mockito.internal.stubbing.defaultanswers.ForwardsInvocations; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.Invariants; + import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnIdentifier; @@ -156,11 +162,6 @@ import org.apache.cassandra.utils.CounterId; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.FilterFactory; import org.apache.cassandra.utils.OutputHandler; -import org.awaitility.Awaitility; -import org.awaitility.core.ThrowingRunnable; -import org.hamcrest.Matcher; -import org.mockito.Mockito; -import org.mockito.internal.stubbing.defaultanswers.ForwardsInvocations; import static com.google.common.base.Preconditions.checkState; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/test/unit/org/apache/cassandra/audit/AuditLogEntryTest.java b/test/unit/org/apache/cassandra/audit/AuditLogEntryTest.java index 40285fe310..f3ab2dee21 100644 --- a/test/unit/org/apache/cassandra/audit/AuditLogEntryTest.java +++ b/test/unit/org/apache/cassandra/audit/AuditLogEntryTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.audit; import java.net.InetSocketAddress; import com.google.common.collect.ImmutableMap; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/audit/AuditLogOptionsTest.java b/test/unit/org/apache/cassandra/audit/AuditLogOptionsTest.java index cdb9ff6e07..76efa96d4e 100644 --- a/test/unit/org/apache/cassandra/audit/AuditLogOptionsTest.java +++ b/test/unit/org/apache/cassandra/audit/AuditLogOptionsTest.java @@ -20,11 +20,11 @@ package org.apache.cassandra.audit; import java.util.Collections; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; import org.apache.cassandra.exceptions.ConfigurationException; -import org.assertj.core.api.Assertions; public class AuditLogOptionsTest { diff --git a/test/unit/org/apache/cassandra/audit/AuditLoggerAuthTest.java b/test/unit/org/apache/cassandra/audit/AuditLoggerAuthTest.java index 4c7935642c..33856d9ed6 100644 --- a/test/unit/org/apache/cassandra/audit/AuditLoggerAuthTest.java +++ b/test/unit/org/apache/cassandra/audit/AuditLoggerAuthTest.java @@ -23,28 +23,28 @@ import java.util.Collections; import java.util.List; import java.util.Queue; -import org.apache.cassandra.auth.CassandraAuthorizer; -import org.apache.cassandra.auth.CassandraRoleManager; -import org.apache.cassandra.auth.PasswordAuthenticator; - -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.AuthenticationException; import com.datastax.driver.core.exceptions.SyntaxError; import com.datastax.driver.core.exceptions.UnauthorizedException; + +import org.hamcrest.CoreMatchers; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.ServerTestUtils; +import org.apache.cassandra.auth.CassandraAuthorizer; +import org.apache.cassandra.auth.CassandraRoleManager; +import org.apache.cassandra.auth.PasswordAuthenticator; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.OverrideConfigurationLoader; import org.apache.cassandra.config.ParameterizedClass; import org.apache.cassandra.cql3.PasswordObfuscator; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.service.EmbeddedCassandraService; -import org.hamcrest.CoreMatchers; import static org.apache.cassandra.config.CassandraRelevantProperties.SUPERUSER_SETUP_DELAY_MS; import static org.hamcrest.CoreMatchers.containsString; diff --git a/test/unit/org/apache/cassandra/audit/AuditLoggerCleanupTest.java b/test/unit/org/apache/cassandra/audit/AuditLoggerCleanupTest.java index ebc5ead713..5d8ecf4558 100644 --- a/test/unit/org/apache/cassandra/audit/AuditLoggerCleanupTest.java +++ b/test/unit/org/apache/cassandra/audit/AuditLoggerCleanupTest.java @@ -25,16 +25,18 @@ import java.nio.file.Path; import java.util.UUID; import java.util.stream.Stream; +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.Session; + +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueue; +import net.openhft.chronicle.queue.impl.table.SingleTableStore; + import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; -import net.openhft.chronicle.queue.impl.single.SingleChronicleQueue; -import net.openhft.chronicle.queue.impl.table.SingleTableStore; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.OverrideConfigurationLoader; import org.apache.cassandra.service.EmbeddedCassandraService; diff --git a/test/unit/org/apache/cassandra/audit/AuditLoggerTest.java b/test/unit/org/apache/cassandra/audit/AuditLoggerTest.java index 311c08b93f..c07cdc4a2f 100644 --- a/test/unit/org/apache/cassandra/audit/AuditLoggerTest.java +++ b/test/unit/org/apache/cassandra/audit/AuditLoggerTest.java @@ -27,6 +27,7 @@ import java.rmi.server.RMISocketFactory; import java.util.Collections; import java.util.HashMap; import java.util.Map; + import javax.management.JMX; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -34,12 +35,6 @@ import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - import com.datastax.driver.core.BatchStatement; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; @@ -48,7 +43,16 @@ import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; import com.datastax.driver.core.exceptions.NoHostAvailableException; import com.datastax.driver.core.exceptions.SyntaxError; + import net.openhft.chronicle.queue.RollCycles; + +import org.assertj.core.api.Assertions; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.auth.AuthEvents; import org.apache.cassandra.auth.AuthenticatedUser; import org.apache.cassandra.auth.IAuthorizer; @@ -66,7 +70,6 @@ import org.apache.cassandra.db.ColumnFamilyStoreMBean; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.JMXServerUtils; -import org.assertj.core.api.Assertions; import static com.datastax.driver.core.ConsistencyLevel.QUORUM; import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_JMX_AUTHORIZER; diff --git a/test/unit/org/apache/cassandra/audit/BinAuditLoggerTest.java b/test/unit/org/apache/cassandra/audit/BinAuditLoggerTest.java index ea1bbbd41a..d93522c883 100644 --- a/test/unit/org/apache/cassandra/audit/BinAuditLoggerTest.java +++ b/test/unit/org/apache/cassandra/audit/BinAuditLoggerTest.java @@ -19,16 +19,18 @@ package org.apache.cassandra.audit; import java.nio.file.Path; -import org.junit.BeforeClass; -import org.junit.Test; - import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; + import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.queue.ExcerptTailer; import net.openhft.chronicle.queue.RollCycles; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; + +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.ParameterizedClass; import org.apache.cassandra.cql3.CQLTester; diff --git a/test/unit/org/apache/cassandra/auth/AllowAllCIDRAuthorizerTest.java b/test/unit/org/apache/cassandra/auth/AllowAllCIDRAuthorizerTest.java index 4f7637d9c3..467b70e3a0 100644 --- a/test/unit/org/apache/cassandra/auth/AllowAllCIDRAuthorizerTest.java +++ b/test/unit/org/apache/cassandra/auth/AllowAllCIDRAuthorizerTest.java @@ -23,6 +23,7 @@ import java.util.Collections; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/auth/AuthTestUtils.java b/test/unit/org/apache/cassandra/auth/AuthTestUtils.java index 228c93b396..d17d39ec4e 100644 --- a/test/unit/org/apache/cassandra/auth/AuthTestUtils.java +++ b/test/unit/org/apache/cassandra/auth/AuthTestUtils.java @@ -18,8 +18,6 @@ package org.apache.cassandra.auth; -import java.util.List; -import java.util.Map; import java.io.IOException; import java.io.InputStream; import java.net.InetAddress; @@ -30,11 +28,14 @@ import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.util.Collection; +import java.util.List; +import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableMap; + import org.apache.commons.lang3.RandomStringUtils; import org.apache.cassandra.auth.jmx.AuthorizationProxy; diff --git a/test/unit/org/apache/cassandra/auth/CIDRGroupsMappingManagerTest.java b/test/unit/org/apache/cassandra/auth/CIDRGroupsMappingManagerTest.java index 44d5ef435a..d22b15b61b 100644 --- a/test/unit/org/apache/cassandra/auth/CIDRGroupsMappingManagerTest.java +++ b/test/unit/org/apache/cassandra/auth/CIDRGroupsMappingManagerTest.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.Set; import com.google.common.collect.ImmutableSet; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/auth/CIDRGroupsMappingTableTest.java b/test/unit/org/apache/cassandra/auth/CIDRGroupsMappingTableTest.java index 9353d96fba..877e0b03cb 100644 --- a/test/unit/org/apache/cassandra/auth/CIDRGroupsMappingTableTest.java +++ b/test/unit/org/apache/cassandra/auth/CIDRGroupsMappingTableTest.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Set; import com.google.common.collect.Sets; + import org.junit.Test; import org.apache.cassandra.cql3.CIDR; diff --git a/test/unit/org/apache/cassandra/auth/CacheRefresherTest.java b/test/unit/org/apache/cassandra/auth/CacheRefresherTest.java index 7600c29cb0..4d5c87fd9e 100644 --- a/test/unit/org/apache/cassandra/auth/CacheRefresherTest.java +++ b/test/unit/org/apache/cassandra/auth/CacheRefresherTest.java @@ -23,11 +23,11 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BooleanSupplier; -import com.google.common.util.concurrent.MoreExecutors; - import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; +import com.google.common.util.concurrent.MoreExecutors; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/auth/CassandraCIDRAuthorizerEnforceModeTest.java b/test/unit/org/apache/cassandra/auth/CassandraCIDRAuthorizerEnforceModeTest.java index 25079e4913..0cbb15670a 100644 --- a/test/unit/org/apache/cassandra/auth/CassandraCIDRAuthorizerEnforceModeTest.java +++ b/test/unit/org/apache/cassandra/auth/CassandraCIDRAuthorizerEnforceModeTest.java @@ -27,6 +27,8 @@ import java.util.Map; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -45,7 +47,6 @@ import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.UnauthorizedException; import org.apache.cassandra.service.ClientState; -import org.assertj.core.api.Assertions; import static java.lang.String.format; import static org.apache.cassandra.auth.AuthKeyspace.CIDR_GROUPS; diff --git a/test/unit/org/apache/cassandra/auth/CassandraNetworkAuthorizerTest.java b/test/unit/org/apache/cassandra/auth/CassandraNetworkAuthorizerTest.java index aa22f5be4f..83af7a95aa 100644 --- a/test/unit/org/apache/cassandra/auth/CassandraNetworkAuthorizerTest.java +++ b/test/unit/org/apache/cassandra/auth/CassandraNetworkAuthorizerTest.java @@ -22,7 +22,9 @@ import java.util.Set; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + import org.apache.commons.lang3.RandomStringUtils; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -38,7 +40,6 @@ import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.UnauthorizedException; import org.apache.cassandra.service.ClientState; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.auth.AuthKeyspace.NETWORK_PERMISSIONS; import static org.apache.cassandra.auth.AuthTestUtils.auth; diff --git a/test/unit/org/apache/cassandra/auth/CassandraRoleManagerTest.java b/test/unit/org/apache/cassandra/auth/CassandraRoleManagerTest.java index 0ee9587164..174e1a76c7 100644 --- a/test/unit/org/apache/cassandra/auth/CassandraRoleManagerTest.java +++ b/test/unit/org/apache/cassandra/auth/CassandraRoleManagerTest.java @@ -23,10 +23,10 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,9 +35,19 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.service.StorageService; -import org.assertj.core.api.Assertions; -import static org.apache.cassandra.auth.AuthTestUtils.*; +import static org.apache.cassandra.auth.AuthTestUtils.ALL_ROLES; +import static org.apache.cassandra.auth.AuthTestUtils.ROLE_A; +import static org.apache.cassandra.auth.AuthTestUtils.ROLE_B; +import static org.apache.cassandra.auth.AuthTestUtils.ROLE_B_1; +import static org.apache.cassandra.auth.AuthTestUtils.ROLE_B_2; +import static org.apache.cassandra.auth.AuthTestUtils.ROLE_B_3; +import static org.apache.cassandra.auth.AuthTestUtils.ROLE_C; +import static org.apache.cassandra.auth.AuthTestUtils.ROLE_C_1; +import static org.apache.cassandra.auth.AuthTestUtils.ROLE_C_2; +import static org.apache.cassandra.auth.AuthTestUtils.ROLE_C_3; +import static org.apache.cassandra.auth.AuthTestUtils.getRolesReadCount; +import static org.apache.cassandra.auth.AuthTestUtils.grantRolesTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/auth/CreateAndAlterRoleTest.java b/test/unit/org/apache/cassandra/auth/CreateAndAlterRoleTest.java index 39e0098489..94347cadd9 100644 --- a/test/unit/org/apache/cassandra/auth/CreateAndAlterRoleTest.java +++ b/test/unit/org/apache/cassandra/auth/CreateAndAlterRoleTest.java @@ -21,11 +21,12 @@ package org.apache.cassandra.auth; import java.util.HashSet; import java.util.Set; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.exceptions.InvalidQueryException; + import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.exceptions.InvalidQueryException; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; diff --git a/test/unit/org/apache/cassandra/auth/GrantAndRevokeTest.java b/test/unit/org/apache/cassandra/auth/GrantAndRevokeTest.java index 44abc70805..2c81d61635 100644 --- a/test/unit/org/apache/cassandra/auth/GrantAndRevokeTest.java +++ b/test/unit/org/apache/cassandra/auth/GrantAndRevokeTest.java @@ -21,12 +21,13 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import com.datastax.driver.core.ResultSet; import com.google.common.collect.Iterables; + import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.ResultSet; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/test/unit/org/apache/cassandra/auth/MutualTlsCertificateValidityPeriodValidatorTest.java b/test/unit/org/apache/cassandra/auth/MutualTlsCertificateValidityPeriodValidatorTest.java index 7170d3a9e9..68bd43805c 100644 --- a/test/unit/org/apache/cassandra/auth/MutualTlsCertificateValidityPeriodValidatorTest.java +++ b/test/unit/org/apache/cassandra/auth/MutualTlsCertificateValidityPeriodValidatorTest.java @@ -22,10 +22,10 @@ import java.security.cert.Certificate; import java.security.cert.CertificateException; import java.util.concurrent.TimeUnit; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.config.DurationSpec; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.auth.AuthTestUtils.loadCertificateChain; import static org.apache.cassandra.auth.SpiffeCertificateValidatorTest.CERTIFICATE_PATH; diff --git a/test/unit/org/apache/cassandra/auth/MutualTlsUtilTest.java b/test/unit/org/apache/cassandra/auth/MutualTlsUtilTest.java index 033fa033ed..55ba5b6553 100644 --- a/test/unit/org/apache/cassandra/auth/MutualTlsUtilTest.java +++ b/test/unit/org/apache/cassandra/auth/MutualTlsUtilTest.java @@ -18,9 +18,8 @@ package org.apache.cassandra.auth; -import org.junit.Test; - import org.assertj.core.api.Assertions; +import org.junit.Test; import static org.apache.cassandra.auth.MutualTlsUtil.toHumanReadableCertificateExpiration; diff --git a/test/unit/org/apache/cassandra/auth/PasswordAuthenticatorTest.java b/test/unit/org/apache/cassandra/auth/PasswordAuthenticatorTest.java index fb6adb8276..d40bdc6343 100644 --- a/test/unit/org/apache/cassandra/auth/PasswordAuthenticatorTest.java +++ b/test/unit/org/apache/cassandra/auth/PasswordAuthenticatorTest.java @@ -21,21 +21,21 @@ package org.apache.cassandra.auth; import java.nio.charset.StandardCharsets; import java.util.Map; +import com.datastax.driver.core.Authenticator; +import com.datastax.driver.core.EndPoint; +import com.datastax.driver.core.PlainTextAuthProvider; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; - -import org.apache.cassandra.distributed.shared.WithProperties; -import org.apache.cassandra.ServerTestUtils; import org.mindrot.jbcrypt.BCrypt; -import com.datastax.driver.core.Authenticator; -import com.datastax.driver.core.EndPoint; -import com.datastax.driver.core.PlainTextAuthProvider; +import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.distributed.shared.WithProperties; import org.apache.cassandra.exceptions.AuthenticationException; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.schema.SchemaConstants; diff --git a/test/unit/org/apache/cassandra/auth/RoleOptionsTest.java b/test/unit/org/apache/cassandra/auth/RoleOptionsTest.java index 019066b085..a52babb53a 100644 --- a/test/unit/org/apache/cassandra/auth/RoleOptionsTest.java +++ b/test/unit/org/apache/cassandra/auth/RoleOptionsTest.java @@ -18,13 +18,21 @@ package org.apache.cassandra.auth; import java.lang.reflect.Field; -import java.util.*; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import com.google.common.collect.ImmutableSet; + import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.exceptions.*; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.exceptions.RequestExecutionException; +import org.apache.cassandra.exceptions.RequestValidationException; +import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.utils.FBUtilities; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/auth/RolesTest.java b/test/unit/org/apache/cassandra/auth/RolesTest.java index 90cf57f054..77520e3631 100644 --- a/test/unit/org/apache/cassandra/auth/RolesTest.java +++ b/test/unit/org/apache/cassandra/auth/RolesTest.java @@ -24,6 +24,8 @@ import java.util.Set; import java.util.stream.Collectors; import com.google.common.collect.Iterables; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -31,7 +33,6 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ConsistencyLevel; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.auth.AuthTestUtils.ALL_ROLES; import static org.apache.cassandra.auth.AuthTestUtils.ROLE_A; diff --git a/test/unit/org/apache/cassandra/auth/StubAuthorizer.java b/test/unit/org/apache/cassandra/auth/StubAuthorizer.java index e9f7d2218b..566cf97cfd 100644 --- a/test/unit/org/apache/cassandra/auth/StubAuthorizer.java +++ b/test/unit/org/apache/cassandra/auth/StubAuthorizer.java @@ -18,7 +18,10 @@ package org.apache.cassandra.auth; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import com.google.common.collect.Sets; diff --git a/test/unit/org/apache/cassandra/auth/TxnAuthTest.java b/test/unit/org/apache/cassandra/auth/TxnAuthTest.java index 2b291ab148..705e37d5d4 100644 --- a/test/unit/org/apache/cassandra/auth/TxnAuthTest.java +++ b/test/unit/org/apache/cassandra/auth/TxnAuthTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.auth; import java.net.InetSocketAddress; import java.util.Collections; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -36,7 +37,6 @@ import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.transport.messages.ResultMessage; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.auth.AuthTestUtils.auth; import static org.apache.cassandra.db.ConsistencyLevel.NODE_LOCAL; diff --git a/test/unit/org/apache/cassandra/auth/jmx/AbstractJMXAuthTest.java b/test/unit/org/apache/cassandra/auth/jmx/AbstractJMXAuthTest.java index 625795c10a..eea07ed2c8 100644 --- a/test/unit/org/apache/cassandra/auth/jmx/AbstractJMXAuthTest.java +++ b/test/unit/org/apache/cassandra/auth/jmx/AbstractJMXAuthTest.java @@ -23,6 +23,7 @@ import java.rmi.server.RMISocketFactory; import java.util.HashMap; import java.util.Map; import java.util.Queue; + import javax.management.JMX; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -36,6 +37,8 @@ import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; import com.google.common.collect.ImmutableSet; + +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -57,7 +60,6 @@ import org.apache.cassandra.config.JMXServerOptions; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStoreMBean; import org.apache.cassandra.utils.JMXServerUtils; -import org.assertj.core.api.Assertions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/test/unit/org/apache/cassandra/auth/jmx/AuthorizationProxyTest.java b/test/unit/org/apache/cassandra/auth/jmx/AuthorizationProxyTest.java index 85b1f7f013..f7ab44b671 100644 --- a/test/unit/org/apache/cassandra/auth/jmx/AuthorizationProxyTest.java +++ b/test/unit/org/apache/cassandra/auth/jmx/AuthorizationProxyTest.java @@ -18,22 +18,32 @@ package org.apache.cassandra.auth.jmx; -import java.util.*; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BooleanSupplier; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; + import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import javax.security.auth.Subject; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; + import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.auth.*; +import org.apache.cassandra.auth.CassandraPrincipal; +import org.apache.cassandra.auth.IResource; +import org.apache.cassandra.auth.JMXResource; +import org.apache.cassandra.auth.Permission; +import org.apache.cassandra.auth.PermissionDetails; +import org.apache.cassandra.auth.RoleResource; import org.apache.cassandra.config.DatabaseDescriptor; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/batchlog/BatchlogEndpointFilterTest.java b/test/unit/org/apache/cassandra/batchlog/BatchlogEndpointFilterTest.java index 4b3e048134..2eb52c6f93 100644 --- a/test/unit/org/apache/cassandra/batchlog/BatchlogEndpointFilterTest.java +++ b/test/unit/org/apache/cassandra/batchlog/BatchlogEndpointFilterTest.java @@ -56,7 +56,11 @@ import org.apache.cassandra.utils.FBUtilities; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.assertj.core.api.Assertions.assertThat; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.either; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.hasItems; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java b/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java index f8599f4c6e..5c29fd438d 100644 --- a/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java +++ b/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.concurrent.ExecutionException; import com.google.common.collect.Lists; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/batchlog/BatchlogTest.java b/test/unit/org/apache/cassandra/batchlog/BatchlogTest.java index 194ae91ea1..a102524af0 100644 --- a/test/unit/org/apache/cassandra/batchlog/BatchlogTest.java +++ b/test/unit/org/apache/cassandra/batchlog/BatchlogTest.java @@ -27,7 +27,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.RowUpdateBuilder; @@ -38,6 +37,7 @@ import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.TimeUUID; diff --git a/test/unit/org/apache/cassandra/cache/CacheProviderTest.java b/test/unit/org/apache/cassandra/cache/CacheProviderTest.java index 8ec536b759..7dad14f98b 100644 --- a/test/unit/org/apache/cassandra/cache/CacheProviderTest.java +++ b/test/unit/org/apache/cassandra/cache/CacheProviderTest.java @@ -23,10 +23,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import com.github.benmanes.caffeine.cache.Weigher; + import org.junit.BeforeClass; import org.junit.Test; -import com.github.benmanes.caffeine.cache.Weigher; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.db.Digest; diff --git a/test/unit/org/apache/cassandra/concurrent/AdaptingScheduledExecutorPlus.java b/test/unit/org/apache/cassandra/concurrent/AdaptingScheduledExecutorPlus.java index 9a84b2600d..9ada41807f 100644 --- a/test/unit/org/apache/cassandra/concurrent/AdaptingScheduledExecutorPlus.java +++ b/test/unit/org/apache/cassandra/concurrent/AdaptingScheduledExecutorPlus.java @@ -20,12 +20,13 @@ package org.apache.cassandra.concurrent; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.Executors; // checkstyle: permit this import +import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import accord.utils.async.AsyncChain; + import org.apache.cassandra.utils.WithResources; import org.apache.cassandra.utils.concurrent.AsyncPromise; import org.apache.cassandra.utils.concurrent.Future; diff --git a/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java b/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java index c719d6bca6..ff3be281f3 100644 --- a/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java +++ b/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java @@ -27,11 +27,10 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.Assert; - import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.service.EmbeddedCassandraService; import org.apache.cassandra.service.StorageService; diff --git a/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java b/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java index 061957d23d..3efecc26a1 100644 --- a/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java +++ b/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java @@ -22,12 +22,18 @@ package org.apache.cassandra.concurrent; import java.lang.Thread.UncaughtExceptionHandler; -import java.util.concurrent.*; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.RunnableFuture; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; import com.google.common.net.InetAddresses; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -42,11 +48,10 @@ import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.FailingRunnable; import org.apache.cassandra.utils.WrappedRunnable; -import static org.apache.cassandra.utils.Clock.Global.nanoTime; -import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; -import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; - import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; +import static org.apache.cassandra.utils.Clock.Global.nanoTime; +import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; import static org.assertj.core.api.Assertions.assertThat; public class DebuggableThreadPoolExecutorTest diff --git a/test/unit/org/apache/cassandra/concurrent/ManualExecutor.java b/test/unit/org/apache/cassandra/concurrent/ManualExecutor.java index 2b98d13d6a..bb1ddf380b 100644 --- a/test/unit/org/apache/cassandra/concurrent/ManualExecutor.java +++ b/test/unit/org/apache/cassandra/concurrent/ManualExecutor.java @@ -17,11 +17,6 @@ */ package org.apache.cassandra.concurrent; -import accord.utils.Invariants; -import org.apache.cassandra.utils.Closeable; -import org.apache.cassandra.utils.WithResources; -import org.apache.cassandra.utils.concurrent.Future; - import java.util.ArrayDeque; import java.util.Collections; import java.util.List; @@ -29,6 +24,12 @@ import java.util.Queue; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import accord.utils.Invariants; + +import org.apache.cassandra.utils.Closeable; +import org.apache.cassandra.utils.WithResources; +import org.apache.cassandra.utils.concurrent.Future; + public class ManualExecutor implements ExecutorPlus { private final Queue tasks = new ArrayDeque<>(); diff --git a/test/unit/org/apache/cassandra/concurrent/ManyToOneConcurrentLinkedQueueTest.java b/test/unit/org/apache/cassandra/concurrent/ManyToOneConcurrentLinkedQueueTest.java index d1baae7e10..3acd6f3b4b 100644 --- a/test/unit/org/apache/cassandra/concurrent/ManyToOneConcurrentLinkedQueueTest.java +++ b/test/unit/org/apache/cassandra/concurrent/ManyToOneConcurrentLinkedQueueTest.java @@ -24,7 +24,10 @@ import java.util.concurrent.Executors; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; @SuppressWarnings("ConstantConditions") public class ManyToOneConcurrentLinkedQueueTest diff --git a/test/unit/org/apache/cassandra/concurrent/SEPExecutorTest.java b/test/unit/org/apache/cassandra/concurrent/SEPExecutorTest.java index 7a682edb29..f7c3f3ac83 100644 --- a/test/unit/org/apache/cassandra/concurrent/SEPExecutorTest.java +++ b/test/unit/org/apache/cassandra/concurrent/SEPExecutorTest.java @@ -21,8 +21,8 @@ package org.apache.cassandra.concurrent; import java.io.OutputStream; import java.io.PrintStream; import java.util.Arrays; -import java.util.concurrent.ExecutorService; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; diff --git a/test/unit/org/apache/cassandra/concurrent/SimulatedExecutorFactory.java b/test/unit/org/apache/cassandra/concurrent/SimulatedExecutorFactory.java index e4ae9282e7..5119b47246 100644 --- a/test/unit/org/apache/cassandra/concurrent/SimulatedExecutorFactory.java +++ b/test/unit/org/apache/cassandra/concurrent/SimulatedExecutorFactory.java @@ -41,6 +41,7 @@ import javax.annotation.Nullable; import accord.utils.Gens; import accord.utils.RandomSource; + import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.Generators; import org.apache.cassandra.utils.concurrent.Future; diff --git a/test/unit/org/apache/cassandra/concurrent/WaitQueueTest.java b/test/unit/org/apache/cassandra/concurrent/WaitQueueTest.java index 721c9094a9..42639742ac 100644 --- a/test/unit/org/apache/cassandra/concurrent/WaitQueueTest.java +++ b/test/unit/org/apache/cassandra/concurrent/WaitQueueTest.java @@ -21,17 +21,19 @@ package org.apache.cassandra.concurrent; */ -import org.apache.cassandra.Util; -import org.apache.cassandra.utils.concurrent.WaitQueue; -import org.junit.*; - import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import org.junit.Test; + +import org.apache.cassandra.Util; +import org.apache.cassandra.utils.concurrent.WaitQueue; + import static org.apache.cassandra.utils.concurrent.WaitQueue.newWaitQueue; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.fail; public class WaitQueueTest { diff --git a/test/unit/org/apache/cassandra/config/CassandraRelevantPropertiesTest.java b/test/unit/org/apache/cassandra/config/CassandraRelevantPropertiesTest.java index 7a3e0cd9be..0589dc4346 100644 --- a/test/unit/org/apache/cassandra/config/CassandraRelevantPropertiesTest.java +++ b/test/unit/org/apache/cassandra/config/CassandraRelevantPropertiesTest.java @@ -18,12 +18,12 @@ package org.apache.cassandra.config; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; import org.apache.cassandra.distributed.shared.WithProperties; import org.apache.cassandra.exceptions.ConfigurationException; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_CASSANDRA_RELEVANT_PROPERTIES; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java b/test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java index 12f2573d9f..eb249da15e 100644 --- a/test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java +++ b/test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java @@ -32,12 +32,6 @@ import java.util.SortedMap; import java.util.TreeMap; import java.util.TreeSet; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -51,9 +45,16 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.node.TextNode; import com.fasterxml.jackson.databind.ser.std.StdSerializer; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import org.apache.cassandra.distributed.upgrade.ConfigCompatibilityTestGenerate; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; + +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.introspector.Property; +import org.apache.cassandra.distributed.upgrade.ConfigCompatibilityTestGenerate; + import static org.apache.cassandra.db.virtual.SettingsTable.BACKWARDS_COMPATIBLE_NAMES; /** diff --git a/test/unit/org/apache/cassandra/config/DataRateSpecTest.java b/test/unit/org/apache/cassandra/config/DataRateSpecTest.java index be0973e0fa..4cb704d655 100644 --- a/test/unit/org/apache/cassandra/config/DataRateSpecTest.java +++ b/test/unit/org/apache/cassandra/config/DataRateSpecTest.java @@ -18,12 +18,12 @@ package org.apache.cassandra.config; import org.junit.Test; - import org.quicktheories.core.Gen; import org.quicktheories.generators.SourceDSL; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.quicktheories.QuickTheory.qt; public class DataRateSpecTest diff --git a/test/unit/org/apache/cassandra/config/DataStorageSpecTest.java b/test/unit/org/apache/cassandra/config/DataStorageSpecTest.java index ff89693d5c..d4022bf8d1 100644 --- a/test/unit/org/apache/cassandra/config/DataStorageSpecTest.java +++ b/test/unit/org/apache/cassandra/config/DataStorageSpecTest.java @@ -20,7 +20,6 @@ package org.apache.cassandra.config; import java.util.Locale; import org.junit.Test; - import org.quicktheories.core.Gen; import org.quicktheories.generators.SourceDSL; @@ -30,7 +29,8 @@ import static org.apache.cassandra.config.DataStorageSpec.DataStorageUnit.KIBIBY import static org.apache.cassandra.config.DataStorageSpec.DataStorageUnit.MEBIBYTES; import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.quicktheories.QuickTheory.qt; public class DataStorageSpecTest diff --git a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java index dcd617adcf..678f6746f1 100644 --- a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java +++ b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java @@ -31,9 +31,12 @@ import java.util.Enumeration; import java.util.function.Consumer; import com.google.common.base.Throwables; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.MockedStatic; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.distributed.shared.WithProperties; @@ -42,8 +45,6 @@ import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.PathUtils; import org.apache.cassandra.security.EncryptionContext; import org.apache.cassandra.security.EncryptionContextGenerator; -import org.assertj.core.api.Assertions; -import org.mockito.MockedStatic; import static org.apache.cassandra.config.CassandraRelevantProperties.ALLOW_UNLIMITED_CONCURRENT_VALIDATIONS; import static org.apache.cassandra.config.CassandraRelevantProperties.CONFIG_LOADER; diff --git a/test/unit/org/apache/cassandra/config/DefaultLoaderTest.java b/test/unit/org/apache/cassandra/config/DefaultLoaderTest.java index 6e122f8d85..a41fe88bf9 100644 --- a/test/unit/org/apache/cassandra/config/DefaultLoaderTest.java +++ b/test/unit/org/apache/cassandra/config/DefaultLoaderTest.java @@ -17,9 +17,9 @@ */ package org.apache.cassandra.config; -import org.junit.Test; - import com.fasterxml.jackson.annotation.JsonIgnore; + +import org.junit.Test; import org.yaml.snakeyaml.introspector.FieldProperty; import org.yaml.snakeyaml.introspector.MethodProperty; import org.yaml.snakeyaml.introspector.Property; diff --git a/test/unit/org/apache/cassandra/config/DurationSpecTest.java b/test/unit/org/apache/cassandra/config/DurationSpecTest.java index b0c73dedf2..e965d2cdb2 100644 --- a/test/unit/org/apache/cassandra/config/DurationSpecTest.java +++ b/test/unit/org/apache/cassandra/config/DurationSpecTest.java @@ -20,7 +20,6 @@ package org.apache.cassandra.config; import java.util.concurrent.TimeUnit; import org.junit.Test; - import org.quicktheories.core.Gen; import org.quicktheories.generators.SourceDSL; @@ -29,7 +28,8 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.quicktheories.QuickTheory.qt; public class DurationSpecTest diff --git a/test/unit/org/apache/cassandra/config/EncryptionOptionsTest.java b/test/unit/org/apache/cassandra/config/EncryptionOptionsTest.java index cec982d0c5..46515d03d3 100644 --- a/test/unit/org/apache/cassandra/config/EncryptionOptionsTest.java +++ b/test/unit/org/apache/cassandra/config/EncryptionOptionsTest.java @@ -23,13 +23,14 @@ import java.util.HashMap; import java.util.Map; import com.google.common.collect.ImmutableMap; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; +import org.yaml.snakeyaml.constructor.ConstructorException; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.util.File; -import org.assertj.core.api.Assertions; -import org.yaml.snakeyaml.constructor.ConstructorException; import static org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions.InternodeEncryption.all; import static org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions.InternodeEncryption.dc; diff --git a/test/unit/org/apache/cassandra/config/FailStartupDuplicateParamsTest.java b/test/unit/org/apache/cassandra/config/FailStartupDuplicateParamsTest.java index f14c68b727..25870fe1ee 100644 --- a/test/unit/org/apache/cassandra/config/FailStartupDuplicateParamsTest.java +++ b/test/unit/org/apache/cassandra/config/FailStartupDuplicateParamsTest.java @@ -28,6 +28,7 @@ import java.util.List; import java.util.function.Predicate; import com.google.common.collect.ImmutableList; + import org.junit.Before; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/config/LoaderTest.java b/test/unit/org/apache/cassandra/config/LoaderTest.java index 5637e9836e..ee4962d9d4 100644 --- a/test/unit/org/apache/cassandra/config/LoaderTest.java +++ b/test/unit/org/apache/cassandra/config/LoaderTest.java @@ -21,9 +21,8 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import org.junit.Test; - import org.assertj.core.api.Assertions; +import org.junit.Test; import org.yaml.snakeyaml.introspector.Property; public class LoaderTest diff --git a/test/unit/org/apache/cassandra/config/PropertiesTest.java b/test/unit/org/apache/cassandra/config/PropertiesTest.java index 075dcf1f0d..91a2a9ce5e 100644 --- a/test/unit/org/apache/cassandra/config/PropertiesTest.java +++ b/test/unit/org/apache/cassandra/config/PropertiesTest.java @@ -22,8 +22,8 @@ import java.util.Set; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import org.junit.Test; +import org.junit.Test; import org.yaml.snakeyaml.introspector.Property; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/config/SnakeYamlLoader.java b/test/unit/org/apache/cassandra/config/SnakeYamlLoader.java index 90c9a1cc5f..c280924b8a 100644 --- a/test/unit/org/apache/cassandra/config/SnakeYamlLoader.java +++ b/test/unit/org/apache/cassandra/config/SnakeYamlLoader.java @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Set; import com.fasterxml.jackson.annotation.JsonIgnore; + import org.yaml.snakeyaml.error.YAMLException; import org.yaml.snakeyaml.introspector.BeanAccess; import org.yaml.snakeyaml.introspector.Property; diff --git a/test/unit/org/apache/cassandra/config/UnitConfigOverride.java b/test/unit/org/apache/cassandra/config/UnitConfigOverride.java index bd6294f0bd..3e9fcd178c 100644 --- a/test/unit/org/apache/cassandra/config/UnitConfigOverride.java +++ b/test/unit/org/apache/cassandra/config/UnitConfigOverride.java @@ -27,6 +27,7 @@ import java.io.UncheckedIOException; import java.nio.file.Files; import java.util.Arrays; import java.util.List; + import javax.annotation.Nullable; public class UnitConfigOverride diff --git a/test/unit/org/apache/cassandra/config/YamlConfigurationLoaderTest.java b/test/unit/org/apache/cassandra/config/YamlConfigurationLoaderTest.java index afa820d60e..1992a50dd5 100644 --- a/test/unit/org/apache/cassandra/config/YamlConfigurationLoaderTest.java +++ b/test/unit/org/apache/cassandra/config/YamlConfigurationLoaderTest.java @@ -32,20 +32,21 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Predicate; -import com.google.common.collect.ImmutableMap; -import org.junit.Assert; -import org.junit.Test; - -import org.apache.cassandra.distributed.shared.WithEnvironment; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; +import com.google.common.collect.ImmutableMap; + +import org.assertj.core.api.Assertions; +import org.junit.Assert; +import org.junit.Test; +import org.yaml.snakeyaml.error.YAMLException; + +import org.apache.cassandra.distributed.shared.WithEnvironment; import org.apache.cassandra.distributed.shared.WithProperties; import org.apache.cassandra.io.util.File; -import org.apache.cassandra.service.StartupChecks; import org.apache.cassandra.repair.autorepair.AutoRepairConfig; -import org.assertj.core.api.Assertions; -import org.yaml.snakeyaml.error.YAMLException; +import org.apache.cassandra.service.StartupChecks; import static org.apache.cassandra.config.CassandraRelevantProperties.CONFIG_ALLOW_ENVIRONMENT_VARIABLES; import static org.apache.cassandra.config.CassandraRelevantProperties.CONFIG_ALLOW_SYSTEM_PROPERTIES; @@ -54,7 +55,6 @@ import static org.apache.cassandra.config.YamlConfigurationLoader.ENVIRONMENT_VA import static org.apache.cassandra.config.YamlConfigurationLoader.SYSTEM_PROPERTY_PREFIX; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/constraints/ConstraintsSatisfiabilityTest.java b/test/unit/org/apache/cassandra/constraints/ConstraintsSatisfiabilityTest.java index c22bb7ea53..0d00670a06 100644 --- a/test/unit/org/apache/cassandra/constraints/ConstraintsSatisfiabilityTest.java +++ b/test/unit/org/apache/cassandra/constraints/ConstraintsSatisfiabilityTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.constraints; import java.util.List; +import org.assertj.core.api.ThrowableAssert; import org.junit.Test; import org.apache.cassandra.cql3.ColumnIdentifier; @@ -31,7 +32,6 @@ import org.apache.cassandra.cql3.constraints.ScalarColumnConstraint.Raw; import org.apache.cassandra.db.marshal.IntegerType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.schema.ColumnMetadata; -import org.assertj.core.api.ThrowableAssert; import static java.util.List.of; import static org.apache.cassandra.cql3.Operator.EQ; diff --git a/test/unit/org/apache/cassandra/constraints/CqlConstraintValidationTester.java b/test/unit/org/apache/cassandra/constraints/CqlConstraintValidationTester.java index cb853dab1b..0e2f47ea85 100644 --- a/test/unit/org/apache/cassandra/constraints/CqlConstraintValidationTester.java +++ b/test/unit/org/apache/cassandra/constraints/CqlConstraintValidationTester.java @@ -21,6 +21,7 @@ package org.apache.cassandra.constraints; import java.util.Map; import com.datastax.driver.core.ResultSet; + import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.CqlBuilder; import org.apache.cassandra.schema.CompactionParams; diff --git a/test/unit/org/apache/cassandra/constraints/CreateTableWithColumnCqlConstraintValidationTest.java b/test/unit/org/apache/cassandra/constraints/CreateTableWithColumnCqlConstraintValidationTest.java index f68ee1ab69..dacbaf3977 100644 --- a/test/unit/org/apache/cassandra/constraints/CreateTableWithColumnCqlConstraintValidationTest.java +++ b/test/unit/org/apache/cassandra/constraints/CreateTableWithColumnCqlConstraintValidationTest.java @@ -30,10 +30,10 @@ import org.apache.cassandra.cql3.constraints.InvalidConstraintDefinitionExceptio import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.utils.Generators; +import static accord.utils.Property.qt; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static accord.utils.Property.qt; import static org.quicktheories.generators.SourceDSL.doubles; import static org.quicktheories.generators.SourceDSL.integers; diff --git a/test/unit/org/apache/cassandra/constraints/JsonConstraintTest.java b/test/unit/org/apache/cassandra/constraints/JsonConstraintTest.java index 9dc964dd60..428d4a666e 100644 --- a/test/unit/org/apache/cassandra/constraints/JsonConstraintTest.java +++ b/test/unit/org/apache/cassandra/constraints/JsonConstraintTest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.constraints; +import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import org.junit.Test; import org.apache.cassandra.cql3.ColumnIdentifier; @@ -28,7 +29,6 @@ import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.IntegerType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.schema.ColumnMetadata; -import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import static java.util.List.of; import static org.apache.cassandra.cql3.constraints.JsonConstraint.FUNCTION_NAME; diff --git a/test/unit/org/apache/cassandra/constraints/RegexpConstraintTest.java b/test/unit/org/apache/cassandra/constraints/RegexpConstraintTest.java index ddbff0c45d..e4b41e6381 100644 --- a/test/unit/org/apache/cassandra/constraints/RegexpConstraintTest.java +++ b/test/unit/org/apache/cassandra/constraints/RegexpConstraintTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.constraints; import java.util.List; +import org.assertj.core.api.ThrowableAssert; import org.junit.Test; import org.apache.cassandra.cql3.ColumnIdentifier; @@ -33,7 +34,6 @@ import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.IntegerType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.schema.ColumnMetadata; -import org.assertj.core.api.ThrowableAssert; import static java.util.List.of; import static org.apache.cassandra.schema.ColumnMetadata.Kind.REGULAR; diff --git a/test/unit/org/apache/cassandra/cql/jdbc/JdbcDecimalTest.java b/test/unit/org/apache/cassandra/cql/jdbc/JdbcDecimalTest.java index e7ab712f5d..f6a40b1e6b 100644 --- a/test/unit/org/apache/cassandra/cql/jdbc/JdbcDecimalTest.java +++ b/test/unit/org/apache/cassandra/cql/jdbc/JdbcDecimalTest.java @@ -21,10 +21,11 @@ package org.apache.cassandra.cql.jdbc; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.apache.cassandra.serializers.DecimalSerializer; import org.junit.Assert; import org.junit.Test; +import org.apache.cassandra.serializers.DecimalSerializer; + public class JdbcDecimalTest { @Test diff --git a/test/unit/org/apache/cassandra/cql3/BatchTest.java b/test/unit/org/apache/cassandra/cql3/BatchTest.java index 6e2a65ecdd..71edaa6599 100644 --- a/test/unit/org/apache/cassandra/cql3/BatchTest.java +++ b/test/unit/org/apache/cassandra/cql3/BatchTest.java @@ -17,21 +17,22 @@ */ package org.apache.cassandra.cql3; +import java.io.IOException; + import com.datastax.driver.core.BatchStatement; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.InvalidQueryException; -import org.apache.cassandra.ServerTestUtils; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.service.EmbeddedCassandraService; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import java.io.IOException; +import org.apache.cassandra.ServerTestUtils; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.service.EmbeddedCassandraService; public class BatchTest { diff --git a/test/unit/org/apache/cassandra/cql3/CIDRTest.java b/test/unit/org/apache/cassandra/cql3/CIDRTest.java index 7099b478f6..35cc6eb8a4 100644 --- a/test/unit/org/apache/cassandra/cql3/CIDRTest.java +++ b/test/unit/org/apache/cassandra/cql3/CIDRTest.java @@ -24,7 +24,9 @@ import java.net.UnknownHostException; import org.junit.Test; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class CIDRTest { diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java index 192b6a059e..9f0369b79c 100644 --- a/test/unit/org/apache/cassandra/cql3/CQLTester.java +++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java @@ -53,6 +53,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; import java.util.stream.StreamSupport; + import javax.annotation.Nullable; import javax.management.MBeanServerConnection; import javax.management.remote.JMXConnector; @@ -62,31 +63,6 @@ import javax.management.remote.JMXServiceURL; import javax.management.remote.rmi.RMIConnectorServer; import javax.net.ssl.SSLException; -import com.google.common.base.Objects; -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; - -import org.assertj.core.api.Assertions; -import org.awaitility.Awaitility; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.rules.TestName; -import org.junit.rules.TestWatcher; -import org.junit.runner.Description; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import accord.utils.DefaultRandom; -import accord.utils.Gen; -import accord.utils.Property; -import accord.utils.RandomSource; import com.codahale.metrics.Gauge; import com.datastax.driver.core.CloseFuture; import com.datastax.driver.core.Cluster; @@ -104,6 +80,32 @@ import com.datastax.driver.core.UDTValue; import com.datastax.driver.core.UserType; import com.datastax.driver.core.exceptions.UnauthorizedException; import com.datastax.shaded.netty.channel.EventLoopGroup; +import com.google.common.base.Objects; +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; + +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; +import org.assertj.core.api.Assertions; +import org.awaitility.Awaitility; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.rules.TestName; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import accord.utils.DefaultRandom; +import accord.utils.Gen; +import accord.utils.Property; +import accord.utils.RandomSource; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.Util; @@ -205,12 +207,6 @@ import org.apache.cassandra.utils.LazyToString; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.TimeUUID; -import static org.apache.cassandra.utils.CassandraGenerators.regularKeyspace; -import static org.apache.cassandra.utils.CassandraGenerators.regularTable; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.apache.cassandra.config.CassandraRelevantProperties.SYSTEM_DISTRIBUTED_DEFAULT_RF; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_DRIVER_CONNECTION_TIMEOUT_MS; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_DRIVER_READ_TIMEOUT_MS; @@ -225,7 +221,13 @@ import static org.apache.cassandra.cql3.SchemaElement.SchemaElementType.TABLE; import static org.apache.cassandra.cql3.SchemaElement.SchemaElementType.TYPE; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.createMetricsKeyspaceTables; import static org.apache.cassandra.schema.SchemaConstants.VIRTUAL_METRICS; +import static org.apache.cassandra.utils.CassandraGenerators.regularKeyspace; +import static org.apache.cassandra.utils.CassandraGenerators.regularTable; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Base class for CQL tests. diff --git a/test/unit/org/apache/cassandra/cql3/CQLTesterTest.java b/test/unit/org/apache/cassandra/cql3/CQLTesterTest.java index 052ced34da..498f64838a 100644 --- a/test/unit/org/apache/cassandra/cql3/CQLTesterTest.java +++ b/test/unit/org/apache/cassandra/cql3/CQLTesterTest.java @@ -18,10 +18,10 @@ package org.apache.cassandra.cql3; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.utils.Pair; -import org.assertj.core.api.Assertions; public class CQLTesterTest extends CQLTester { diff --git a/test/unit/org/apache/cassandra/cql3/ColumnIdentifierTest.java b/test/unit/org/apache/cassandra/cql3/ColumnIdentifierTest.java index c37d82a337..901f34391e 100644 --- a/test/unit/org/apache/cassandra/cql3/ColumnIdentifierTest.java +++ b/test/unit/org/apache/cassandra/cql3/ColumnIdentifierTest.java @@ -21,13 +21,14 @@ package org.apache.cassandra.cql3; import java.nio.ByteBuffer; import java.util.concurrent.ThreadLocalRandom; +import org.junit.Assert; import org.junit.Test; -import org.junit.Assert; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.utils.ByteBufferUtil; + import static org.junit.Assert.assertEquals; public class ColumnIdentifierTest diff --git a/test/unit/org/apache/cassandra/cql3/CqlParserTest.java b/test/unit/org/apache/cassandra/cql3/CqlParserTest.java index 4871c09ebc..e1c24f2bc4 100644 --- a/test/unit/org/apache/cassandra/cql3/CqlParserTest.java +++ b/test/unit/org/apache/cassandra/cql3/CqlParserTest.java @@ -17,17 +17,18 @@ */ package org.apache.cassandra.cql3; -import org.junit.Test; - import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.BaseRecognizer; import org.antlr.runtime.CharStream; import org.antlr.runtime.CommonTokenStream; import org.antlr.runtime.RecognitionException; import org.antlr.runtime.TokenStream; +import org.junit.Test; + import org.apache.cassandra.cql3.statements.PropertyDefinitions; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; public class CqlParserTest { diff --git a/test/unit/org/apache/cassandra/cql3/CustomNowInSecondsTest.java b/test/unit/org/apache/cassandra/cql3/CustomNowInSecondsTest.java index bb35572478..7da53c435a 100644 --- a/test/unit/org/apache/cassandra/cql3/CustomNowInSecondsTest.java +++ b/test/unit/org/apache/cassandra/cql3/CustomNowInSecondsTest.java @@ -22,6 +22,8 @@ import java.util.Collections; import java.util.List; import com.google.common.collect.ImmutableList; + +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; @@ -38,7 +40,6 @@ import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.FBUtilities; -import org.assertj.core.api.Assertions; import static java.lang.String.format; import static java.util.Collections.emptyMap; diff --git a/test/unit/org/apache/cassandra/cql3/DeleteTest.java b/test/unit/org/apache/cassandra/cql3/DeleteTest.java index 3c95a6cb8f..bc65b62668 100644 --- a/test/unit/org/apache/cassandra/cql3/DeleteTest.java +++ b/test/unit/org/apache/cassandra/cql3/DeleteTest.java @@ -17,15 +17,15 @@ */ package org.apache.cassandra.cql3; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import com.datastax.driver.core.ConsistencyLevel; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSetFuture; import com.datastax.driver.core.Session; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + public class DeleteTest extends CQLTester { private static PreparedStatement pstmtI; diff --git a/test/unit/org/apache/cassandra/cql3/DurationTest.java b/test/unit/org/apache/cassandra/cql3/DurationTest.java index 9b63242e56..f348a56af1 100644 --- a/test/unit/org/apache/cassandra/cql3/DurationTest.java +++ b/test/unit/org/apache/cassandra/cql3/DurationTest.java @@ -30,10 +30,13 @@ import org.junit.Test; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.serializers.TimeSerializer; +import static org.apache.cassandra.cql3.Duration.NANOS_PER_HOUR; +import static org.apache.cassandra.cql3.Duration.NANOS_PER_MICRO; +import static org.apache.cassandra.cql3.Duration.NANOS_PER_MILLI; +import static org.apache.cassandra.cql3.Duration.NANOS_PER_MINUTE; +import static org.apache.cassandra.cql3.Duration.NANOS_PER_SECOND; import static org.junit.Assert.assertEquals; -import static org.apache.cassandra.cql3.Duration.*; - public class DurationTest { @Test diff --git a/test/unit/org/apache/cassandra/cql3/EarlyOpenCompactionTest.java b/test/unit/org/apache/cassandra/cql3/EarlyOpenCompactionTest.java index 869b5480f9..82f48b6a56 100644 --- a/test/unit/org/apache/cassandra/cql3/EarlyOpenCompactionTest.java +++ b/test/unit/org/apache/cassandra/cql3/EarlyOpenCompactionTest.java @@ -28,13 +28,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import org.hamcrest.Matchers; import org.junit.After; import org.junit.Assert; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; -import org.hamcrest.Matchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/cql3/EmptyValuesTest.java b/test/unit/org/apache/cassandra/cql3/EmptyValuesTest.java index 139132ea0e..a4b343442f 100644 --- a/test/unit/org/apache/cassandra/cql3/EmptyValuesTest.java +++ b/test/unit/org/apache/cassandra/cql3/EmptyValuesTest.java @@ -22,13 +22,13 @@ import java.io.ByteArrayOutputStream; import java.nio.charset.StandardCharsets; import java.util.regex.Pattern; -import org.apache.commons.io.IOUtils; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; +import org.apache.commons.io.IOUtils; import org.junit.Assert; import org.junit.Test; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.marshal.BytesType; diff --git a/test/unit/org/apache/cassandra/cql3/GcCompactionTest.java b/test/unit/org/apache/cassandra/cql3/GcCompactionTest.java index 7e118e7928..67795ccb5e 100644 --- a/test/unit/org/apache/cassandra/cql3/GcCompactionTest.java +++ b/test/unit/org/apache/cassandra/cql3/GcCompactionTest.java @@ -18,9 +18,6 @@ package org.apache.cassandra.cql3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -28,11 +25,16 @@ import java.util.Set; import java.util.function.ToIntFunction; import com.google.common.collect.Iterables; + import org.junit.Test; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.compaction.CompactionManager; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.ColumnData; +import org.apache.cassandra.db.rows.ComplexColumnData; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.io.sstable.ISSTableScanner; import org.apache.cassandra.io.sstable.SSTableId; import org.apache.cassandra.io.sstable.SSTableIdFactory; @@ -41,6 +43,9 @@ import org.apache.cassandra.schema.CompactionParams; import org.apache.cassandra.schema.CompactionParams.TombstoneOption; import org.apache.cassandra.utils.FBUtilities; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class GcCompactionTest extends CQLTester { static final int KEY_COUNT = 10; diff --git a/test/unit/org/apache/cassandra/cql3/IndexQueryPagingTest.java b/test/unit/org/apache/cassandra/cql3/IndexQueryPagingTest.java index e2220ac4cb..ebd77780b6 100644 --- a/test/unit/org/apache/cassandra/cql3/IndexQueryPagingTest.java +++ b/test/unit/org/apache/cassandra/cql3/IndexQueryPagingTest.java @@ -20,12 +20,12 @@ */ package org.apache.cassandra.cql3; -import org.junit.Test; - import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; +import org.junit.Test; + import static org.junit.Assert.assertEquals; public class IndexQueryPagingTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/cql3/NodeLocalConsistencyTest.java b/test/unit/org/apache/cassandra/cql3/NodeLocalConsistencyTest.java index be9fcb6136..00b46d7589 100644 --- a/test/unit/org/apache/cassandra/cql3/NodeLocalConsistencyTest.java +++ b/test/unit/org/apache/cassandra/cql3/NodeLocalConsistencyTest.java @@ -22,13 +22,12 @@ import org.junit.Test; import org.apache.cassandra.config.CassandraRelevantProperties; -import static org.junit.Assert.assertEquals; - import static org.apache.cassandra.db.ConsistencyLevel.NODE_LOCAL; import static org.apache.cassandra.metrics.ClientRequestsMetricsHolder.readMetrics; import static org.apache.cassandra.metrics.ClientRequestsMetricsHolder.readMetricsForLevel; import static org.apache.cassandra.metrics.ClientRequestsMetricsHolder.writeMetrics; import static org.apache.cassandra.metrics.ClientRequestsMetricsHolder.writeMetricsForLevel; +import static org.junit.Assert.assertEquals; public class NodeLocalConsistencyTest extends CQLTester { diff --git a/test/unit/org/apache/cassandra/cql3/OutOfSpaceTest.java b/test/unit/org/apache/cassandra/cql3/OutOfSpaceTest.java index 1df61ffc27..8d09384bea 100644 --- a/test/unit/org/apache/cassandra/cql3/OutOfSpaceTest.java +++ b/test/unit/org/apache/cassandra/cql3/OutOfSpaceTest.java @@ -29,9 +29,9 @@ import org.apache.cassandra.Util; import org.apache.cassandra.config.Config.DiskFailurePolicy; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.commitlog.CommitLogSegment; -import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.io.FSWriteError; diff --git a/test/unit/org/apache/cassandra/cql3/PagingQueryTest.java b/test/unit/org/apache/cassandra/cql3/PagingQueryTest.java index 8f5f2828b4..123cd67e65 100644 --- a/test/unit/org/apache/cassandra/cql3/PagingQueryTest.java +++ b/test/unit/org/apache/cassandra/cql3/PagingQueryTest.java @@ -21,10 +21,12 @@ package org.apache.cassandra.cql3; import java.util.Iterator; import java.util.concurrent.ThreadLocalRandom; -import org.junit.Test; - -import com.datastax.driver.core.*; import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.SimpleStatement; + +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/unit/org/apache/cassandra/cql3/PagingTest.java b/test/unit/org/apache/cassandra/cql3/PagingTest.java index eddc7aebd5..0b79335243 100644 --- a/test/unit/org/apache/cassandra/cql3/PagingTest.java +++ b/test/unit/org/apache/cassandra/cql3/PagingTest.java @@ -19,23 +19,24 @@ package org.apache.cassandra.cql3; import java.util.Iterator; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - import com.datastax.driver.core.Cluster; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.locator.BaseProximity; import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.locator.NodeProximity; import org.apache.cassandra.locator.Replica; import org.apache.cassandra.locator.ReplicaCollection; -import org.apache.cassandra.locator.NodeProximity; -import org.apache.cassandra.locator.BaseProximity; import org.apache.cassandra.service.EmbeddedCassandraService; import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_CONFIG; diff --git a/test/unit/org/apache/cassandra/cql3/PasswordObfuscatorTest.java b/test/unit/org/apache/cassandra/cql3/PasswordObfuscatorTest.java index 96f97b626d..d3781a9878 100644 --- a/test/unit/org/apache/cassandra/cql3/PasswordObfuscatorTest.java +++ b/test/unit/org/apache/cassandra/cql3/PasswordObfuscatorTest.java @@ -23,8 +23,9 @@ import org.junit.Test; import org.apache.cassandra.auth.RoleOptions; -import static org.apache.cassandra.cql3.PasswordObfuscator.*; import static java.lang.String.format; +import static org.apache.cassandra.cql3.PasswordObfuscator.OBFUSCATION_TOKEN; +import static org.apache.cassandra.cql3.PasswordObfuscator.obfuscate; import static org.junit.Assert.assertEquals; public class PasswordObfuscatorTest diff --git a/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java b/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java index 850f64a134..95b4f830b1 100644 --- a/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java +++ b/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java @@ -25,18 +25,20 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.Assume; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - import com.datastax.driver.core.Cluster; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.SyntaxError; import com.datastax.driver.core.exceptions.WriteTimeoutException; +import com.google.common.util.concurrent.Uninterruptibles; + +import org.assertj.core.api.Assertions; +import org.junit.Assume; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ConsistencyLevel; @@ -51,7 +53,6 @@ import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.transport.SimpleClient; import org.apache.cassandra.transport.messages.ResultMessage; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.service.consensus.TransactionalMode.test_unsafe; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java b/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java index 59dfdadf75..27699b0b96 100644 --- a/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java +++ b/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java @@ -30,6 +30,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMRules; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -46,9 +49,6 @@ import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.MD5Digest; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMRules; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static java.util.Collections.emptyMap; import static org.apache.cassandra.service.QueryState.forInternalCalls; diff --git a/test/unit/org/apache/cassandra/cql3/QueryEventsTest.java b/test/unit/org/apache/cassandra/cql3/QueryEventsTest.java index 1b97d1eb71..74b02b3164 100644 --- a/test/unit/org/apache/cassandra/cql3/QueryEventsTest.java +++ b/test/unit/org/apache/cassandra/cql3/QueryEventsTest.java @@ -22,15 +22,17 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; -import org.junit.Test; +import javax.annotation.Nullable; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; + +import org.junit.Test; + import org.apache.cassandra.cql3.statements.BatchStatement; import org.apache.cassandra.cql3.statements.ModificationStatement; import org.apache.cassandra.cql3.statements.SelectStatement; @@ -40,6 +42,7 @@ import org.apache.cassandra.transport.Message; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.ByteArrayUtil; +import static com.google.common.collect.Lists.newArrayList; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -48,8 +51,6 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static com.google.common.collect.Lists.newArrayList; - public class QueryEventsTest extends CQLTester { @Test diff --git a/test/unit/org/apache/cassandra/cql3/RandomSchemaTest.java b/test/unit/org/apache/cassandra/cql3/RandomSchemaTest.java index 84fd815378..c4c8815866 100644 --- a/test/unit/org/apache/cassandra/cql3/RandomSchemaTest.java +++ b/test/unit/org/apache/cassandra/cql3/RandomSchemaTest.java @@ -27,8 +27,13 @@ import java.util.List; import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.Test; +import org.quicktheories.core.Gen; +import org.quicktheories.core.RandomnessSource; +import org.quicktheories.generators.SourceDSL; +import org.quicktheories.impl.JavaRandom; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; @@ -47,10 +52,6 @@ import org.apache.cassandra.utils.CassandraGenerators; import org.apache.cassandra.utils.CassandraGenerators.TableMetadataBuilder; import org.apache.cassandra.utils.FailingConsumer; import org.apache.cassandra.utils.Generators; -import org.quicktheories.core.Gen; -import org.quicktheories.core.RandomnessSource; -import org.quicktheories.generators.SourceDSL; -import org.quicktheories.impl.JavaRandom; import static org.apache.cassandra.utils.Generators.IDENTIFIER_GEN; import static org.junit.Assert.assertNotNull; diff --git a/test/unit/org/apache/cassandra/cql3/RelationTest.java b/test/unit/org/apache/cassandra/cql3/RelationTest.java index 852da6f6d3..d600df542d 100644 --- a/test/unit/org/apache/cassandra/cql3/RelationTest.java +++ b/test/unit/org/apache/cassandra/cql3/RelationTest.java @@ -33,7 +33,10 @@ import org.apache.cassandra.cql3.terms.Tuples; import static java.util.Arrays.asList; import static org.apache.cassandra.cql3.Operator.EQ; -import static org.apache.cassandra.cql3.Relation.*; +import static org.apache.cassandra.cql3.Relation.mapElement; +import static org.apache.cassandra.cql3.Relation.multiColumn; +import static org.apache.cassandra.cql3.Relation.singleColumn; +import static org.apache.cassandra.cql3.Relation.token; import static org.apache.cassandra.cql3.conditions.ColumnCondition.Raw.collectionElementCondition; import static org.apache.cassandra.cql3.conditions.ColumnCondition.Raw.udtFieldCondition; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/cql3/ReservedKeywordsTest.java b/test/unit/org/apache/cassandra/cql3/ReservedKeywordsTest.java index fc891bfba4..ef7a4b7ec2 100644 --- a/test/unit/org/apache/cassandra/cql3/ReservedKeywordsTest.java +++ b/test/unit/org/apache/cassandra/cql3/ReservedKeywordsTest.java @@ -20,12 +20,11 @@ package org.apache.cassandra.cql3; import java.lang.reflect.Modifier; +import org.assertj.core.api.SoftAssertions; +import org.junit.Assert; import org.junit.Test; -import org.junit.Assert; - import org.apache.cassandra.exceptions.SyntaxException; -import org.assertj.core.api.SoftAssertions; public class ReservedKeywordsTest { diff --git a/test/unit/org/apache/cassandra/cql3/SecondaryIndexSSTableExportTest.java b/test/unit/org/apache/cassandra/cql3/SecondaryIndexSSTableExportTest.java index 9d016cb343..973317cd04 100644 --- a/test/unit/org/apache/cassandra/cql3/SecondaryIndexSSTableExportTest.java +++ b/test/unit/org/apache/cassandra/cql3/SecondaryIndexSSTableExportTest.java @@ -22,20 +22,21 @@ package org.apache.cassandra.cql3; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.tools.SSTableExport; -import org.apache.cassandra.tools.ToolRunner; -import org.apache.cassandra.utils.Pair; + +import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.tools.SSTableExport; +import org.apache.cassandra.tools.ToolRunner; import org.apache.cassandra.utils.JsonUtils; -import org.assertj.core.api.Assertions; +import org.apache.cassandra.utils.Pair; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_UTIL_ALLOW_TOOL_REINIT_FOR_TEST; import static org.junit.Assert.assertFalse; diff --git a/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java b/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java index ed49d70dca..ff81373622 100644 --- a/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java +++ b/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java @@ -22,9 +22,8 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.ThreadLocalRandom; -import org.junit.Test; - import org.junit.Assert; +import org.junit.Test; public class SerializationMirrorTest extends CQLTester { diff --git a/test/unit/org/apache/cassandra/cql3/StatementSourceTest.java b/test/unit/org/apache/cassandra/cql3/StatementSourceTest.java index b6362747d5..c1102418fb 100644 --- a/test/unit/org/apache/cassandra/cql3/StatementSourceTest.java +++ b/test/unit/org/apache/cassandra/cql3/StatementSourceTest.java @@ -18,9 +18,8 @@ package org.apache.cassandra.cql3; -import org.junit.Test; - import org.antlr.runtime.Token; +import org.junit.Test; import org.mockito.Mockito; import static org.apache.cassandra.cql3.StatementSource.create; diff --git a/test/unit/org/apache/cassandra/cql3/SystemKeyspaceTablesNamesTest.java b/test/unit/org/apache/cassandra/cql3/SystemKeyspaceTablesNamesTest.java index fa7404c87c..ba85b40199 100644 --- a/test/unit/org/apache/cassandra/cql3/SystemKeyspaceTablesNamesTest.java +++ b/test/unit/org/apache/cassandra/cql3/SystemKeyspaceTablesNamesTest.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; + import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/cql3/TraceCqlTest.java b/test/unit/org/apache/cassandra/cql3/TraceCqlTest.java index 74b407ef56..a3f9ad636e 100644 --- a/test/unit/org/apache/cassandra/cql3/TraceCqlTest.java +++ b/test/unit/org/apache/cassandra/cql3/TraceCqlTest.java @@ -23,10 +23,6 @@ import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.CodecRegistry; import com.datastax.driver.core.DataType; @@ -36,6 +32,11 @@ import com.datastax.driver.core.QueryTrace; import com.datastax.driver.core.Session; import com.datastax.driver.core.TupleType; import com.datastax.driver.core.TupleValue; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.tracing.TraceStateImpl; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/cql3/UntypedResultSetTest.java b/test/unit/org/apache/cassandra/cql3/UntypedResultSetTest.java index 4973cae87d..a99ef45ea8 100644 --- a/test/unit/org/apache/cassandra/cql3/UntypedResultSetTest.java +++ b/test/unit/org/apache/cassandra/cql3/UntypedResultSetTest.java @@ -27,6 +27,7 @@ import org.junit.Test; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.DoubleType; import org.apache.cassandra.utils.AbstractTypeGenerators; diff --git a/test/unit/org/apache/cassandra/cql3/ViewAbstractParameterizedTest.java b/test/unit/org/apache/cassandra/cql3/ViewAbstractParameterizedTest.java index 3455bb674d..5dbaaf47bd 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewAbstractParameterizedTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewAbstractParameterizedTest.java @@ -21,12 +21,13 @@ package org.apache.cassandra.cql3; import java.util.Collection; import java.util.stream.Collectors; +import com.datastax.driver.core.ResultSet; + import org.junit.Before; import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import com.datastax.driver.core.ResultSet; import org.apache.cassandra.transport.ProtocolVersion; @Ignore diff --git a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java index 3231d3b851..13f8b019c4 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map; import com.google.common.base.Objects; + import org.junit.Test; import org.apache.cassandra.Util; diff --git a/test/unit/org/apache/cassandra/cql3/ViewPKTest.java b/test/unit/org/apache/cassandra/cql3/ViewPKTest.java index 1c2b9a6bb1..064e7feb5e 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewPKTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewPKTest.java @@ -20,16 +20,17 @@ package org.apache.cassandra.cql3; import java.util.HashSet; +import com.datastax.driver.core.ResultSet; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; -import com.datastax.driver.core.ResultSet; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.TableMetadata; -import org.assertj.core.api.Assertions; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java b/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java index 7f3e0b6910..ba7a6bd3e6 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java @@ -27,10 +27,12 @@ import java.util.Date; import java.util.HashSet; import java.util.UUID; +import com.datastax.driver.core.exceptions.InvalidQueryException; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; -import com.datastax.driver.core.exceptions.InvalidQueryException; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.SchemaCQLHelper; @@ -41,7 +43,6 @@ import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.serializers.SimpleDateSerializer; import org.apache.cassandra.serializers.TimeSerializer; import org.apache.cassandra.utils.ByteBufferUtil; -import org.assertj.core.api.Assertions; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/cql3/ViewTest.java b/test/unit/org/apache/cassandra/cql3/ViewTest.java index ac0ef6b142..19db5a4635 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewTest.java @@ -23,11 +23,17 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; +import com.datastax.driver.core.ResultSet; + +import org.assertj.core.api.Assertions; +import org.awaitility.Awaitility; +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMRules; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import com.datastax.driver.core.ResultSet; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; @@ -42,11 +48,6 @@ import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.schema.SchemaKeyspaceTables; import org.apache.cassandra.service.ClientWarn; import org.apache.cassandra.utils.FBUtilities; -import org.assertj.core.api.Assertions; -import org.awaitility.Awaitility; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMRules; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/cql3/ViewTimesTest.java b/test/unit/org/apache/cassandra/cql3/ViewTimesTest.java index 9c45936391..fb8419ae57 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewTimesTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewTimesTest.java @@ -21,15 +21,16 @@ package org.apache.cassandra.cql3; import java.util.List; import java.util.concurrent.TimeUnit; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; import org.apache.cassandra.Util; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.exceptions.InvalidRequestException; -import org.assertj.core.api.Assertions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/test/unit/org/apache/cassandra/cql3/ast/CQLFormatterPrettyPrintTest.java b/test/unit/org/apache/cassandra/cql3/ast/CQLFormatterPrettyPrintTest.java index dc09a9d2c1..a6f3785db6 100644 --- a/test/unit/org/apache/cassandra/cql3/ast/CQLFormatterPrettyPrintTest.java +++ b/test/unit/org/apache/cassandra/cql3/ast/CQLFormatterPrettyPrintTest.java @@ -18,11 +18,11 @@ package org.apache.cassandra.cql3.ast; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.schema.TableMetadata; -import org.assertj.core.api.Assertions; public class CQLFormatterPrettyPrintTest { diff --git a/test/unit/org/apache/cassandra/cql3/ast/ExpressionTest.java b/test/unit/org/apache/cassandra/cql3/ast/ExpressionTest.java index 12174e0a26..384dc8fc22 100644 --- a/test/unit/org/apache/cassandra/cql3/ast/ExpressionTest.java +++ b/test/unit/org/apache/cassandra/cql3/ast/ExpressionTest.java @@ -22,14 +22,15 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.cql3.ast.Conditional.And; import org.apache.cassandra.cql3.ast.Conditional.Where; import org.apache.cassandra.db.marshal.Int32Type; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/cql3/ast/Mutation.java b/test/unit/org/apache/cassandra/cql3/ast/Mutation.java index 1a598b6555..0cd556d7e2 100644 --- a/test/unit/org/apache/cassandra/cql3/ast/Mutation.java +++ b/test/unit/org/apache/cassandra/cql3/ast/Mutation.java @@ -29,6 +29,7 @@ import java.util.Optional; import java.util.Set; import java.util.function.Function; import java.util.stream.Stream; + import javax.annotation.Nullable; import org.apache.cassandra.db.marshal.AbstractType; diff --git a/test/unit/org/apache/cassandra/cql3/ast/Select.java b/test/unit/org/apache/cassandra/cql3/ast/Select.java index ed8e0f1e72..8a451c849a 100644 --- a/test/unit/org/apache/cassandra/cql3/ast/Select.java +++ b/test/unit/org/apache/cassandra/cql3/ast/Select.java @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.stream.Stream; + import javax.annotation.Nullable; import com.google.common.collect.ImmutableList; diff --git a/test/unit/org/apache/cassandra/cql3/ast/Statement.java b/test/unit/org/apache/cassandra/cql3/ast/Statement.java index 71d85c5fb1..7c405b4afd 100644 --- a/test/unit/org/apache/cassandra/cql3/ast/Statement.java +++ b/test/unit/org/apache/cassandra/cql3/ast/Statement.java @@ -25,6 +25,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import accord.utils.Invariants; + import org.apache.cassandra.utils.ByteBufferUtil; public interface Statement extends Element diff --git a/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java b/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java index ea19dd381d..df2de479a0 100644 --- a/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java +++ b/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java @@ -27,12 +27,15 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; +import org.quicktheories.generators.SourceDSL; import accord.utils.Gen; import accord.utils.Gens; import accord.utils.RandomSource; + import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.ColumnsExpression; import org.apache.cassandra.cql3.FieldIdentifier; @@ -70,8 +73,6 @@ import org.apache.cassandra.utils.CassandraGenerators; import org.apache.cassandra.utils.Generators; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.TimeUUID; -import org.assertj.core.api.Assertions; -import org.quicktheories.generators.SourceDSL; import static accord.utils.Property.qt; import static java.util.Arrays.asList; diff --git a/test/unit/org/apache/cassandra/cql3/functions/CastFctsTest.java b/test/unit/org/apache/cassandra/cql3/functions/CastFctsTest.java index c1f6791c8c..1a1321277e 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/CastFctsTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/CastFctsTest.java @@ -25,13 +25,13 @@ import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.util.Date; +import org.junit.Test; + import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.serializers.SimpleDateSerializer; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.TimeUUID; -import org.junit.Test; - public class CastFctsTest extends CQLTester { @Test diff --git a/test/unit/org/apache/cassandra/cql3/functions/ClusterMetadataFctsTest.java b/test/unit/org/apache/cassandra/cql3/functions/ClusterMetadataFctsTest.java index 408889e088..dd6ea42fad 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/ClusterMetadataFctsTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/ClusterMetadataFctsTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.cql3.functions; import java.nio.charset.CharacterCodingException; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.db.marshal.Int32Type; @@ -27,7 +28,6 @@ import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.tcm.Transformation; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.cql3.functions.ClusterMetadataFcts.transformationKind; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/cql3/functions/FormatBytesFctTest.java b/test/unit/org/apache/cassandra/cql3/functions/FormatBytesFctTest.java index 7dbba2f68b..453a936110 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/FormatBytesFctTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/FormatBytesFctTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.cql3.functions; import org.junit.Test; + import org.apache.cassandra.exceptions.InvalidRequestException; import static java.util.List.of; diff --git a/test/unit/org/apache/cassandra/cql3/functions/FormatTimeFctTest.java b/test/unit/org/apache/cassandra/cql3/functions/FormatTimeFctTest.java index 9888fd36fb..08790d00a3 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/FormatTimeFctTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/FormatTimeFctTest.java @@ -19,6 +19,8 @@ package org.apache.cassandra.cql3.functions; import org.junit.Test; +import org.quicktheories.WithQuickTheories; + import org.apache.cassandra.exceptions.InvalidRequestException; import static java.util.List.of; @@ -31,7 +33,6 @@ import static org.apache.cassandra.cql3.CQL3Type.Native.TINYINT; import static org.apache.cassandra.cql3.CQL3Type.Native.VARINT; import static org.apache.cassandra.cql3.functions.FormatFcts.format; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.quicktheories.WithQuickTheories; public class FormatTimeFctTest extends AbstractFormatFctTest implements WithQuickTheories { diff --git a/test/unit/org/apache/cassandra/cql3/functions/LengthFctsTest.java b/test/unit/org/apache/cassandra/cql3/functions/LengthFctsTest.java index b1f1354bc2..411c96f6cb 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/LengthFctsTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/LengthFctsTest.java @@ -24,9 +24,9 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import org.junit.Test; +import org.quicktheories.WithQuickTheories; import org.apache.cassandra.cql3.CQLTester; -import org.quicktheories.WithQuickTheories; public class LengthFctsTest extends CQLTester implements WithQuickTheories { diff --git a/test/unit/org/apache/cassandra/cql3/functions/MathFctsTest.java b/test/unit/org/apache/cassandra/cql3/functions/MathFctsTest.java index 5cc42fd4e9..127a5fe28e 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/MathFctsTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/MathFctsTest.java @@ -25,13 +25,13 @@ import java.nio.ByteBuffer; import org.junit.Assert; import org.junit.Test; +import org.apache.cassandra.db.marshal.ByteType; import org.apache.cassandra.db.marshal.CounterColumnType; +import org.apache.cassandra.db.marshal.DecimalType; import org.apache.cassandra.db.marshal.DoubleType; import org.apache.cassandra.db.marshal.FloatType; -import org.apache.cassandra.db.marshal.IntegerType; -import org.apache.cassandra.db.marshal.ByteType; -import org.apache.cassandra.db.marshal.DecimalType; import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.IntegerType; import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.db.marshal.NumberType; import org.apache.cassandra.db.marshal.ShortType; diff --git a/test/unit/org/apache/cassandra/cql3/functions/NativeFunctionsTest.java b/test/unit/org/apache/cassandra/cql3/functions/NativeFunctionsTest.java index 4ecfc7d99b..1c689d900b 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/NativeFunctionsTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/NativeFunctionsTest.java @@ -23,11 +23,11 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.lang3.StringUtils; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.schema.UserFunctions; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; diff --git a/test/unit/org/apache/cassandra/cql3/functions/TimeFctsTest.java b/test/unit/org/apache/cassandra/cql3/functions/TimeFctsTest.java index 35a21e351d..ac49673eb5 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/TimeFctsTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/TimeFctsTest.java @@ -18,7 +18,10 @@ package org.apache.cassandra.cql3.functions; import java.nio.ByteBuffer; -import java.time.*; +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.Date; @@ -32,7 +35,9 @@ import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.TimeUUID; -import static org.apache.cassandra.cql3.functions.TimeFcts.*; +import static org.apache.cassandra.cql3.functions.TimeFcts.toDate; +import static org.apache.cassandra.cql3.functions.TimeFcts.toTimestamp; +import static org.apache.cassandra.cql3.functions.TimeFcts.toUnixTimestamp; import static org.apache.cassandra.utils.TimeUUID.Generator.atUnixMillisAsBytes; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/test/unit/org/apache/cassandra/cql3/functions/VectorFctsTest.java b/test/unit/org/apache/cassandra/cql3/functions/VectorFctsTest.java index 691f8b6ef3..055185f7af 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/VectorFctsTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/VectorFctsTest.java @@ -26,9 +26,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import io.github.jbellis.jvector.vector.VectorSimilarityFunction; import org.apache.cassandra.cql3.CQLTester; +import io.github.jbellis.jvector.vector.VectorSimilarityFunction; + import static org.assertj.core.api.Assertions.assertThatThrownBy; @RunWith(Parameterized.class) diff --git a/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskQueryTester.java b/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskQueryTester.java index 15a87fb369..b74a09909f 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskQueryTester.java +++ b/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskQueryTester.java @@ -18,13 +18,13 @@ package org.apache.cassandra.cql3.functions.masking; +import com.datastax.driver.core.ResultSet; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import com.datastax.driver.core.ResultSet; - import static java.lang.String.format; /** diff --git a/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskTest.java b/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskTest.java index 0f42a6a643..36cdd864a9 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskTest.java @@ -22,11 +22,12 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.List; -import org.junit.Test; - import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; + +import org.junit.Test; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.functions.Arguments; diff --git a/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskTester.java b/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskTester.java index eadc7520f5..fe0e308971 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskTester.java +++ b/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskTester.java @@ -21,6 +21,7 @@ package org.apache.cassandra.cql3.functions.masking; import java.nio.ByteBuffer; import java.util.Collections; import java.util.List; + import javax.annotation.Nullable; import org.junit.Before; diff --git a/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskWithUDFTest.java b/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskWithUDFTest.java index 61c2496599..aa770f2f45 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskWithUDFTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/masking/ColumnMaskWithUDFTest.java @@ -18,12 +18,13 @@ package org.apache.cassandra.cql3.functions.masking; -import org.junit.Test; - import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.Session; -import org.apache.cassandra.exceptions.InvalidRequestException; + import org.assertj.core.api.Assertions; +import org.junit.Test; + +import org.apache.cassandra.exceptions.InvalidRequestException; import static java.lang.String.format; import static org.junit.Assert.assertNull; diff --git a/test/unit/org/apache/cassandra/cql3/functions/masking/HashMaskingFunctionTest.java b/test/unit/org/apache/cassandra/cql3/functions/masking/HashMaskingFunctionTest.java index 10fe755464..5d2ac04117 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/masking/HashMaskingFunctionTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/masking/HashMaskingFunctionTest.java @@ -20,12 +20,13 @@ package org.apache.cassandra.cql3.functions.masking; import java.nio.ByteBuffer; -import org.junit.Assert; -import org.junit.BeforeClass; - import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.DataType; import com.datastax.driver.core.ResultSet; + +import org.junit.Assert; +import org.junit.BeforeClass; + import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.schema.SchemaConstants; diff --git a/test/unit/org/apache/cassandra/cql3/functions/masking/MaskingFunctionTester.java b/test/unit/org/apache/cassandra/cql3/functions/masking/MaskingFunctionTester.java index fcbda1b8e0..f9d7b9301f 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/masking/MaskingFunctionTester.java +++ b/test/unit/org/apache/cassandra/cql3/functions/masking/MaskingFunctionTester.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.UUID; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/cql3/functions/masking/PartialMaskingFunctionTest.java b/test/unit/org/apache/cassandra/cql3/functions/masking/PartialMaskingFunctionTest.java index 3a1d455169..71797a1d98 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/masking/PartialMaskingFunctionTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/masking/PartialMaskingFunctionTest.java @@ -18,17 +18,18 @@ package org.apache.cassandra.cql3.functions.masking; -import org.junit.Assert; -import org.junit.Test; - import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.DataType; import com.datastax.driver.core.ResultSet; + +import org.assertj.core.api.Assertions; +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.db.marshal.StringType; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.schema.SchemaConstants; -import org.assertj.core.api.Assertions; import static java.lang.String.format; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; diff --git a/test/unit/org/apache/cassandra/cql3/functions/masking/SelectMaskedPermissionTest.java b/test/unit/org/apache/cassandra/cql3/functions/masking/SelectMaskedPermissionTest.java index 34e491f2f6..db9343ad11 100644 --- a/test/unit/org/apache/cassandra/cql3/functions/masking/SelectMaskedPermissionTest.java +++ b/test/unit/org/apache/cassandra/cql3/functions/masking/SelectMaskedPermissionTest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.cql3.functions.masking; +import org.awaitility.core.ThrowingRunnable; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -25,7 +26,6 @@ import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; -import org.awaitility.core.ThrowingRunnable; import static java.lang.String.format; diff --git a/test/unit/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictionsTest.java b/test/unit/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictionsTest.java index d1bc875681..fe37b8e3e1 100644 --- a/test/unit/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictionsTest.java +++ b/test/unit/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictionsTest.java @@ -18,26 +18,30 @@ package org.apache.cassandra.cql3.restrictions; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.cql3.ColumnsExpression; +import org.apache.cassandra.cql3.Operator; +import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.terms.MultiElements; import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.terms.Terms; +import org.apache.cassandra.db.ClusteringBound; +import org.apache.cassandra.db.Slice; +import org.apache.cassandra.db.Slices; import org.apache.cassandra.db.filter.IndexHints; -import org.apache.cassandra.db.marshal.TupleType; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.*; - -import org.apache.cassandra.db.*; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.ReversedType; +import org.apache.cassandra.db.marshal.TupleType; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.ByteBufferUtil; import static java.util.Arrays.asList; diff --git a/test/unit/org/apache/cassandra/cql3/restrictions/ClusteringElementsTest.java b/test/unit/org/apache/cassandra/cql3/restrictions/ClusteringElementsTest.java index 8ad94d4638..cf27c1ee6a 100644 --- a/test/unit/org/apache/cassandra/cql3/restrictions/ClusteringElementsTest.java +++ b/test/unit/org/apache/cassandra/cql3/restrictions/ClusteringElementsTest.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.stream.Collectors; import com.google.common.collect.RangeSet; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java b/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java index 58f4a3364e..98788e312c 100644 --- a/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java +++ b/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java @@ -26,15 +26,33 @@ import java.util.List; import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.CQLStatement; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.cql3.ColumnSpecification; +import org.apache.cassandra.cql3.FieldIdentifier; +import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.cql3.QueryProcessor; +import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.cql3.statements.SelectStatement; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.ListType; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.MapType; +import org.apache.cassandra.db.marshal.SetType; +import org.apache.cassandra.db.marshal.TimeUUIDType; +import org.apache.cassandra.db.marshal.TupleType; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.dht.ByteOrderedPartitioner; import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.exceptions.RequestValidationException; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.Schema; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/test/unit/org/apache/cassandra/cql3/selection/SelectorSerializationTest.java b/test/unit/org/apache/cassandra/cql3/selection/SelectorSerializationTest.java index 977a0af01d..3c59c279fb 100644 --- a/test/unit/org/apache/cassandra/cql3/selection/SelectorSerializationTest.java +++ b/test/unit/org/apache/cassandra/cql3/selection/SelectorSerializationTest.java @@ -25,14 +25,23 @@ import java.util.List; import org.junit.Test; -import org.apache.cassandra.cql3.*; -import org.apache.cassandra.cql3.terms.Constants.Literal; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.cql3.FieldIdentifier; +import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.cql3.VariableSpecifications; import org.apache.cassandra.cql3.functions.AggregateFcts; import org.apache.cassandra.cql3.functions.Function; import org.apache.cassandra.cql3.functions.TimeFcts; import org.apache.cassandra.cql3.selection.Selectable.RawIdentifier; import org.apache.cassandra.cql3.selection.Selector.Serializer; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.cql3.terms.Constants.Literal; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.DurationType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.MapType; +import org.apache.cassandra.db.marshal.TimestampType; +import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.MessagingService; @@ -44,7 +53,6 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; import static java.util.Arrays.asList; - import static org.junit.Assert.assertEquals; public class SelectorSerializationTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/cql3/selection/TermSelectionTest.java b/test/unit/org/apache/cassandra/cql3/selection/TermSelectionTest.java index fb46809ff4..7e6d01eb01 100644 --- a/test/unit/org/apache/cassandra/cql3/selection/TermSelectionTest.java +++ b/test/unit/org/apache/cassandra/cql3/selection/TermSelectionTest.java @@ -19,12 +19,20 @@ package org.apache.cassandra.cql3.selection; import java.math.BigDecimal; -import java.util.*; +import java.util.List; +import java.util.UUID; import org.junit.Test; -import org.apache.cassandra.cql3.*; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.cql3.ColumnSpecification; +import org.apache.cassandra.cql3.Duration; +import org.apache.cassandra.cql3.UntypedResultSet; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.DecimalType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.TypeParser; +import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.transport.messages.ResultMessage; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/cql3/statements/AlterRoleStatementTest.java b/test/unit/org/apache/cassandra/cql3/statements/AlterRoleStatementTest.java index 3526d672bb..28b3cbc0fe 100644 --- a/test/unit/org/apache/cassandra/cql3/statements/AlterRoleStatementTest.java +++ b/test/unit/org/apache/cassandra/cql3/statements/AlterRoleStatementTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.cql3.statements; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/cql3/statements/CreateRoleStatementTest.java b/test/unit/org/apache/cassandra/cql3/statements/CreateRoleStatementTest.java index 3dd1afd2a0..fd5cfb5731 100644 --- a/test/unit/org/apache/cassandra/cql3/statements/CreateRoleStatementTest.java +++ b/test/unit/org/apache/cassandra/cql3/statements/CreateRoleStatementTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.cql3.statements; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/cql3/statements/DescribeStatementTest.java b/test/unit/org/apache/cassandra/cql3/statements/DescribeStatementTest.java index 36355144a5..f82c25b3ad 100644 --- a/test/unit/org/apache/cassandra/cql3/statements/DescribeStatementTest.java +++ b/test/unit/org/apache/cassandra/cql3/statements/DescribeStatementTest.java @@ -22,15 +22,16 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import org.apache.commons.lang3.ArrayUtils; -import org.junit.Test; - import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.exceptions.InvalidQueryException; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; + +import org.apache.commons.lang3.ArrayUtils; +import org.junit.Test; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.CqlBuilder; @@ -45,12 +46,6 @@ import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.transport.ProtocolVersion; import static java.lang.String.format; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.apache.cassandra.schema.SchemaConstants.ACCORD_KEYSPACE_NAME; import static org.apache.cassandra.schema.SchemaConstants.AUTH_KEYSPACE_NAME; import static org.apache.cassandra.schema.SchemaConstants.DISTRIBUTED_KEYSPACE_NAME; @@ -59,6 +54,12 @@ import static org.apache.cassandra.schema.SchemaConstants.SCHEMA_KEYSPACE_NAME; import static org.apache.cassandra.schema.SchemaConstants.SYSTEM_KEYSPACE_NAME; import static org.apache.cassandra.schema.SchemaConstants.TRACE_KEYSPACE_NAME; import static org.apache.cassandra.schema.SchemaConstants.VIRTUAL_SCHEMA; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class DescribeStatementTest extends CQLTester { diff --git a/test/unit/org/apache/cassandra/cql3/statements/ListSuperUsersStatementTest.java b/test/unit/org/apache/cassandra/cql3/statements/ListSuperUsersStatementTest.java index 4b4c48b2a4..3c3bb098ef 100644 --- a/test/unit/org/apache/cassandra/cql3/statements/ListSuperUsersStatementTest.java +++ b/test/unit/org/apache/cassandra/cql3/statements/ListSuperUsersStatementTest.java @@ -20,18 +20,19 @@ package org.apache.cassandra.cql3.statements; import java.util.Collections; -import org.junit.BeforeClass; -import org.junit.Test; - import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.exceptions.UnauthorizedException; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockito.MockedStatic; + import org.apache.cassandra.auth.Roles; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.messages.ResultMessage; -import org.mockito.MockedStatic; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/cql3/statements/PropertyDefinitionsTest.java b/test/unit/org/apache/cassandra/cql3/statements/PropertyDefinitionsTest.java index a34fbecd1b..4b288728bb 100644 --- a/test/unit/org/apache/cassandra/cql3/statements/PropertyDefinitionsTest.java +++ b/test/unit/org/apache/cassandra/cql3/statements/PropertyDefinitionsTest.java @@ -24,15 +24,14 @@ import java.util.Collections; import java.util.HashMap; import java.util.function.BiConsumer; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.cql3.QualifiedName; import org.apache.cassandra.exceptions.SyntaxException; -import org.assertj.core.api.Assertions; - -import static org.junit.Assert.assertEquals; import static org.apache.cassandra.cql3.statements.PropertyDefinitions.parseBoolean; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/cql3/statements/TxnDataNameTest.java b/test/unit/org/apache/cassandra/cql3/statements/TxnDataNameTest.java index 22703609f5..d1c1c85951 100644 --- a/test/unit/org/apache/cassandra/cql3/statements/TxnDataNameTest.java +++ b/test/unit/org/apache/cassandra/cql3/statements/TxnDataNameTest.java @@ -19,12 +19,12 @@ package org.apache.cassandra.cql3.statements; import org.junit.Test; - -import org.apache.cassandra.service.accord.txn.TxnData.TxnDataNameKind; import org.quicktheories.core.Gen; import org.quicktheories.generators.SourceDSL; import org.quicktheories.impl.Constraint; +import org.apache.cassandra.service.accord.txn.TxnData.TxnDataNameKind; + import static org.apache.cassandra.service.accord.txn.TxnData.TXN_DATA_NAME_INDEX_MAX; import static org.apache.cassandra.service.accord.txn.TxnData.txnDataName; import static org.apache.cassandra.service.accord.txn.TxnData.txnDataNameIndex; diff --git a/test/unit/org/apache/cassandra/cql3/terms/ListsTest.java b/test/unit/org/apache/cassandra/cql3/terms/ListsTest.java index a45c2930cb..3e3180e6b8 100644 --- a/test/unit/org/apache/cassandra/cql3/terms/ListsTest.java +++ b/test/unit/org/apache/cassandra/cql3/terms/ListsTest.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.UUID; import com.google.common.collect.Iterators; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/CollectionsTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/CollectionsTest.java index ed9c837bd9..9a8ca923ad 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/CollectionsTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/CollectionsTest.java @@ -17,15 +17,21 @@ */ package org.apache.cassandra.cql3.validation.entities; -import java.util.*; - -import org.junit.Test; +import java.util.Arrays; +import java.util.Iterator; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.UUID; import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.DataType; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; import com.datastax.driver.core.utils.UUIDs; + +import org.junit.Test; + import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.UntypedResultSet; diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java index 2976c014bf..b0fcb458b5 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java @@ -17,27 +17,34 @@ */ package org.apache.cassandra.cql3.validation.entities; -import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.cql3.Duration; -import org.apache.cassandra.cql3.UntypedResultSet; -import org.apache.cassandra.dht.ByteOrderedPartitioner; - -import org.apache.cassandra.serializers.SimpleDateSerializer; -import org.apache.cassandra.serializers.TimeSerializer; -import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.JsonUtils; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.net.InetAddress; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Random; +import java.util.TimeZone; +import java.util.UUID; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.InetAddress; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.concurrent.*; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.cql3.Duration; +import org.apache.cassandra.cql3.UntypedResultSet; +import org.apache.cassandra.dht.ByteOrderedPartitioner; +import org.apache.cassandra.serializers.SimpleDateSerializer; +import org.apache.cassandra.serializers.TimeSerializer; +import org.apache.cassandra.service.StorageService; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.JsonUtils; import static org.apache.cassandra.utils.Clock.Global.nanoTime; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexOnStaticColumnTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexOnStaticColumnTest.java index 1d10eabf71..4e06d0a849 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexOnStaticColumnTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexOnStaticColumnTest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.cql3.validation.entities; import org.junit.Test; + import org.apache.cassandra.cql3.CQLTester; public class SecondaryIndexOnStaticColumnTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java index e12682a63f..ca5049ef55 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java @@ -30,8 +30,6 @@ import org.apache.commons.lang3.StringUtils; import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.ColumnIdentifier; @@ -52,7 +50,9 @@ import org.apache.cassandra.index.internal.CassandraIndex; import org.apache.cassandra.index.internal.CustomCassandraIndex; import org.apache.cassandra.index.sai.StorageAttachedIndex; import org.apache.cassandra.index.sasi.SASIIndex; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.IndexMetadata; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java index 08e021ca1d..dcf0cfccba 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java @@ -24,8 +24,8 @@ import org.junit.Test; import org.apache.cassandra.cql3.CQLTester; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; public class StaticColumnsTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/TimestampTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/TimestampTest.java index 94baf82e53..5901fe653c 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/TimestampTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/TimestampTest.java @@ -20,9 +20,9 @@ package org.apache.cassandra.cql3.validation.entities; import java.util.Arrays; import java.util.List; +import org.junit.Assert; import org.junit.Test; -import org.junit.Assert; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.utils.Pair; diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/TupleTypeTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/TupleTypeTest.java index 2a7bb8e74a..030fff2ce2 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/TupleTypeTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/TupleTypeTest.java @@ -30,6 +30,8 @@ import java.util.SortedMap; import java.util.TreeMap; import org.junit.Test; +import org.quicktheories.core.Gen; +import org.quicktheories.generators.SourceDSL; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.UntypedResultSet; @@ -39,8 +41,6 @@ import org.apache.cassandra.db.marshal.DurationType; import org.apache.cassandra.db.marshal.TupleType; import org.apache.cassandra.utils.AbstractTypeGenerators; import org.apache.cassandra.utils.AbstractTypeGenerators.TypeSupport; -import org.quicktheories.core.Gen; -import org.quicktheories.generators.SourceDSL; import static org.apache.cassandra.db.SchemaCQLHelper.toCqlType; import static org.apache.cassandra.utils.AbstractTypeGenerators.getTypeSupport; diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/TypeTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/TypeTest.java index 119a0fe0f5..b79513cc24 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/TypeTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/TypeTest.java @@ -17,10 +17,11 @@ */ package org.apache.cassandra.cql3.validation.entities; -import org.apache.cassandra.cql3.UntypedResultSet; -import org.apache.cassandra.cql3.CQLTester; - import org.junit.Test; + +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.cql3.UntypedResultSet; + import static org.junit.Assert.assertEquals; public class TypeTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/UFAuthTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/UFAuthTest.java index 9681827493..d12aa9e5b5 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFAuthTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFAuthTest.java @@ -18,23 +18,37 @@ package org.apache.cassandra.cql3.validation.entities; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.auth.*; +import org.apache.cassandra.auth.AuthenticatedUser; +import org.apache.cassandra.auth.DataResource; +import org.apache.cassandra.auth.FunctionResource; +import org.apache.cassandra.auth.IAuthorizer; +import org.apache.cassandra.auth.Permission; +import org.apache.cassandra.auth.RoleResource; +import org.apache.cassandra.auth.StubAuthorizer; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.functions.UserFunction; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.Attributes; +import org.apache.cassandra.cql3.CQLStatement; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.cql3.QueryProcessor; +import org.apache.cassandra.cql3.VariableSpecifications; import org.apache.cassandra.cql3.functions.FunctionName; +import org.apache.cassandra.cql3.functions.UserFunction; import org.apache.cassandra.cql3.statements.BatchStatement; import org.apache.cassandra.cql3.statements.ModificationStatement; -import org.apache.cassandra.exceptions.*; +import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.exceptions.UnauthorizedException; +import org.apache.cassandra.schema.Schema; import org.apache.cassandra.service.ClientState; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/UFIdentificationTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/UFIdentificationTest.java index bba5c92b3b..9f13e282ed 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFIdentificationTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFIdentificationTest.java @@ -17,22 +17,26 @@ */ package org.apache.cassandra.cql3.validation.entities; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; import com.google.common.base.Joiner; import com.google.common.collect.Iterables; + import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.apache.cassandra.cql3.Attributes; import org.apache.cassandra.cql3.CQLStatement; +import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.VariableSpecifications; import org.apache.cassandra.cql3.functions.Function; import org.apache.cassandra.cql3.statements.BatchStatement; import org.apache.cassandra.cql3.statements.ModificationStatement; -import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.service.ClientState; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/UFJavaTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/UFJavaTest.java index 4c9962afab..99db19ea03 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFJavaTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFJavaTest.java @@ -26,14 +26,15 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import org.junit.Assert; -import org.junit.Test; - import com.datastax.driver.core.DataType; import com.datastax.driver.core.Row; import com.datastax.driver.core.TupleType; import com.datastax.driver.core.TupleValue; import com.datastax.driver.core.UDTValue; + +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.ColumnIdentifier; diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java index 56795c2dfc..f0dc4e8a22 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java @@ -23,10 +23,11 @@ import java.util.Arrays; import java.util.Date; import java.util.List; +import com.datastax.driver.core.exceptions.InvalidQueryException; + import org.junit.Assert; import org.junit.Test; -import com.datastax.driver.core.exceptions.InvalidQueryException; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTypesTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTypesTest.java index eb94fe5649..dc52df7024 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTypesTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTypesTest.java @@ -28,10 +28,11 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.UUID; +import com.datastax.driver.core.Row; + import org.junit.Assert; import org.junit.Test; -import com.datastax.driver.core.Row; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.transport.Event.SchemaChange.Change; diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/UFVerifierTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/UFVerifierTest.java index 542db5c788..463b5de939 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFVerifierTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFVerifierTest.java @@ -31,7 +31,25 @@ import org.junit.Test; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.functions.UDFByteCodeVerifier; -import org.apache.cassandra.cql3.validation.entities.udfverify.*; +import org.apache.cassandra.cql3.validation.entities.udfverify.CallClone; +import org.apache.cassandra.cql3.validation.entities.udfverify.CallFinalize; +import org.apache.cassandra.cql3.validation.entities.udfverify.CallOrgApache; +import org.apache.cassandra.cql3.validation.entities.udfverify.ClassWithField; +import org.apache.cassandra.cql3.validation.entities.udfverify.ClassWithInitializer; +import org.apache.cassandra.cql3.validation.entities.udfverify.ClassWithInitializer2; +import org.apache.cassandra.cql3.validation.entities.udfverify.ClassWithInitializer3; +import org.apache.cassandra.cql3.validation.entities.udfverify.ClassWithInnerClass; +import org.apache.cassandra.cql3.validation.entities.udfverify.ClassWithInnerClass2; +import org.apache.cassandra.cql3.validation.entities.udfverify.ClassWithStaticInitializer; +import org.apache.cassandra.cql3.validation.entities.udfverify.ClassWithStaticInnerClass; +import org.apache.cassandra.cql3.validation.entities.udfverify.GoodClass; +import org.apache.cassandra.cql3.validation.entities.udfverify.UseOfSynchronized; +import org.apache.cassandra.cql3.validation.entities.udfverify.UseOfSynchronizedWithNotify; +import org.apache.cassandra.cql3.validation.entities.udfverify.UseOfSynchronizedWithNotifyAll; +import org.apache.cassandra.cql3.validation.entities.udfverify.UseOfSynchronizedWithWait; +import org.apache.cassandra.cql3.validation.entities.udfverify.UseOfSynchronizedWithWaitL; +import org.apache.cassandra.cql3.validation.entities.udfverify.UseOfSynchronizedWithWaitLI; +import org.apache.cassandra.cql3.validation.entities.udfverify.UsingMapEntry; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/VirtualTableTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/VirtualTableTest.java index 38a6df7c45..a0ecb730dd 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/VirtualTableTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/VirtualTableTest.java @@ -21,24 +21,22 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import java.util.NavigableMap; - +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nonnull; +import com.datastax.driver.core.exceptions.InvalidQueryException; import com.google.common.collect.ImmutableList; import com.google.common.collect.Range; import org.apache.commons.lang3.tuple.Pair; - import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.exceptions.InvalidQueryException; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.marshal.Int32Type; diff --git a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CommentAndSecurityLabelTest.java b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CommentAndSecurityLabelTest.java index 1c25af2390..59a19a467d 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CommentAndSecurityLabelTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CommentAndSecurityLabelTest.java @@ -18,9 +18,10 @@ package org.apache.cassandra.cql3.validation.miscellaneous; +import com.datastax.driver.core.ResultSet; + import org.junit.Test; -import com.datastax.driver.core.ResultSet; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.FieldIdentifier; diff --git a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java index b7d142536a..385b777a10 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java @@ -22,9 +22,9 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import com.google.common.collect.Iterables; -import org.junit.Test; import org.junit.Assert; +import org.junit.Test; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java index 9092f9456e..ad340c5baf 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java @@ -25,9 +25,9 @@ import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.utils.ByteBufferUtil; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; /** diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/AlterNTSTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/AlterNTSTest.java index 491e8f436c..fd763adf18 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/AlterNTSTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/AlterNTSTest.java @@ -20,16 +20,17 @@ package org.apache.cassandra.cql3.validation.operations; import java.util.List; +import com.datastax.driver.core.PreparedStatement; + +import org.assertj.core.api.Assertions; import org.junit.Test; -import com.datastax.driver.core.PreparedStatement; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.service.ClientWarn; -import org.assertj.core.api.Assertions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/AutoSnapshotTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/AutoSnapshotTest.java index bcb0be6440..cd951abef9 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/AutoSnapshotTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/AutoSnapshotTest.java @@ -23,6 +23,8 @@ import java.util.Collection; import java.util.Map; import com.google.common.util.concurrent.Uninterruptibles; + +import org.assertj.core.api.Condition; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -38,10 +40,9 @@ import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.service.snapshot.SnapshotType; import org.apache.cassandra.service.snapshot.TableSnapshot; -import org.assertj.core.api.Condition; -import static java.util.concurrent.TimeUnit.SECONDS; import static java.lang.String.format; +import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThat; @RunWith(Parameterized.class) diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/CQLVectorTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/CQLVectorTest.java index 6b034af523..da27781332 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/CQLVectorTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/CQLVectorTest.java @@ -22,6 +22,7 @@ import java.math.BigInteger; import java.nio.ByteBuffer; import java.util.List; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; @@ -37,7 +38,6 @@ import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.schema.SchemaKeyspace; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; -import org.assertj.core.api.Assertions; import static java.lang.String.format; diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/DropRecreateAndRestoreTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/DropRecreateAndRestoreTest.java index d85a494406..9cae224e74 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/DropRecreateAndRestoreTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/DropRecreateAndRestoreTest.java @@ -19,7 +19,6 @@ package org.apache.cassandra.cql3.validation.operations; import java.util.List; -import org.apache.cassandra.io.util.File; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; @@ -28,6 +27,7 @@ import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.exceptions.AlreadyExistsException; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; public class DropRecreateAndRestoreTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertInvalidateSizedRecordsTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertInvalidateSizedRecordsTest.java index f5658e4ef3..8f31e77246 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertInvalidateSizedRecordsTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertInvalidateSizedRecordsTest.java @@ -27,16 +27,17 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.UUID; +import com.datastax.driver.core.exceptions.InvalidQueryException; import com.google.common.base.StandardSystemProperty; + +import org.assertj.core.api.Assertions; import org.junit.Test; -import com.datastax.driver.core.exceptions.InvalidQueryException; import org.apache.cassandra.Util; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.io.util.File; import org.apache.cassandra.tools.ToolRunner; import org.apache.cassandra.utils.FBUtilities; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.utils.ByteBufferUtil.EMPTY_BYTE_BUFFER; diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertTest.java index 03da925f98..db6902bfae 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertTest.java @@ -22,10 +22,10 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.HashMap; import java.util.Set; import org.junit.Assert; diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectGroupByTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectGroupByTest.java index 0a0aecb7e8..f4e0d720e0 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectGroupByTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectGroupByTest.java @@ -17,16 +17,16 @@ */ package org.apache.cassandra.cql3.validation.operations; -import org.junit.Test; - -import com.datastax.driver.core.LocalDate; - import java.time.LocalDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.UUID; +import com.datastax.driver.core.LocalDate; + +import org.junit.Test; + import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.serializers.SimpleDateSerializer; import org.apache.cassandra.serializers.TimeSerializer; diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java index 2fe3cffa7f..783f4314f6 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java @@ -17,10 +17,10 @@ */ package org.apache.cassandra.cql3.validation.operations; -import org.junit.Test; - import java.nio.ByteBuffer; +import org.junit.Test; + import org.apache.cassandra.Util; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.restrictions.StatementRestrictions; diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java index cac9131976..4fe87a5832 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java @@ -20,8 +20,8 @@ package org.apache.cassandra.cql3.validation.operations; import java.nio.ByteBuffer; import java.util.UUID; -import org.junit.Test; import org.junit.Assert; +import org.junit.Test; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; @@ -34,7 +34,9 @@ import org.apache.cassandra.index.internal.CassandraIndex; import static org.apache.cassandra.utils.ByteBufferUtil.EMPTY_BYTE_BUFFER; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/TTLTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/TTLTest.java index 609f17a5ee..220f7e93bc 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/TTLTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/TTLTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.cql3.validation.operations; import java.io.IOException; +import org.assertj.core.data.Offset; import org.junit.After; import org.junit.Assume; import org.junit.Before; @@ -49,7 +50,6 @@ import org.apache.cassandra.tools.ToolRunner; import org.apache.cassandra.tools.ToolRunner.ToolResult; import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.StorageCompatibilityMode; -import org.assertj.core.data.Offset; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_UTIL_ALLOW_TOOL_REINIT_FOR_TEST; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/UpdateTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/UpdateTest.java index 3331230eac..d5ef0822db 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/UpdateTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/UpdateTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.cql3.validation.operations; import java.util.Arrays; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.cql3.Attributes; @@ -29,10 +30,9 @@ import org.apache.cassandra.cql3.UntypedResultSet.Row; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.exceptions.InvalidRequestException; -import org.assertj.core.api.Assertions; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class UpdateTest extends CQLTester { diff --git a/test/unit/org/apache/cassandra/db/AbstractReadQueryToCQLStringTest.java b/test/unit/org/apache/cassandra/db/AbstractReadQueryToCQLStringTest.java index 019a70e819..c7aac0c296 100644 --- a/test/unit/org/apache/cassandra/db/AbstractReadQueryToCQLStringTest.java +++ b/test/unit/org/apache/cassandra/db/AbstractReadQueryToCQLStringTest.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import com.google.common.collect.ImmutableList; + import org.junit.Test; import org.apache.cassandra.cql3.CQLStatement; diff --git a/test/unit/org/apache/cassandra/db/CellSpecTest.java b/test/unit/org/apache/cassandra/db/CellSpecTest.java index b35ab0b071..2e1cbc1322 100644 --- a/test/unit/org/apache/cassandra/db/CellSpecTest.java +++ b/test/unit/org/apache/cassandra/db/CellSpecTest.java @@ -46,8 +46,8 @@ import org.apache.cassandra.utils.memory.NativeAllocator; import org.apache.cassandra.utils.memory.NativePool; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; -import static org.assertj.core.api.Assertions.assertThat; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; +import static org.assertj.core.api.Assertions.assertThat; @RunWith(Parameterized.class) public class CellSpecTest diff --git a/test/unit/org/apache/cassandra/db/CellTest.java b/test/unit/org/apache/cassandra/db/CellTest.java index 1e96e8c51a..bb69dca325 100644 --- a/test/unit/org/apache/cassandra/db/CellTest.java +++ b/test/unit/org/apache/cassandra/db/CellTest.java @@ -22,6 +22,8 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; +import org.assertj.core.api.Assertions; +import org.assertj.core.api.ThrowableAssert; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -51,8 +53,6 @@ import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import org.assertj.core.api.Assertions; -import org.assertj.core.api.ThrowableAssert; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/db/CleanupTest.java b/test/unit/org/apache/cassandra/db/CleanupTest.java index d474fd1a19..3c3efa292d 100644 --- a/test/unit/org/apache/cassandra/db/CleanupTest.java +++ b/test/unit/org/apache/cassandra/db/CleanupTest.java @@ -32,6 +32,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import com.google.common.collect.Sets; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/ClusteringHeapSizeTest.java b/test/unit/org/apache/cassandra/db/ClusteringHeapSizeTest.java index 07561760f3..b25369ab43 100644 --- a/test/unit/org/apache/cassandra/db/ClusteringHeapSizeTest.java +++ b/test/unit/org/apache/cassandra/db/ClusteringHeapSizeTest.java @@ -21,6 +21,7 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Collection; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -30,7 +31,6 @@ import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.concurrent.ImmediateFuture; import org.apache.cassandra.utils.concurrent.OpOrder; import org.apache.cassandra.utils.memory.NativePool; -import org.assertj.core.api.Assertions; @RunWith(Parameterized.class) public class ClusteringHeapSizeTest diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java index 75e311e13a..b398351306 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java @@ -21,15 +21,16 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Collection; -import org.junit.BeforeClass; -import org.junit.Test; - import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; import com.codahale.metrics.Meter; import com.codahale.metrics.MetricRegistryListener; import com.codahale.metrics.Timer; + +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.io.sstable.format.SSTableReader; @@ -43,7 +44,11 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class ColumnFamilyMetricTest { diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreMBeanTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreMBeanTest.java index 006ace0fb5..63d6ed824e 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreMBeanTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreMBeanTest.java @@ -21,8 +21,13 @@ import java.util.Arrays; import java.util.Random; import com.google.common.collect.ImmutableSet; + +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mockito; +import org.quicktheories.core.Gen; +import org.quicktheories.impl.Constraint; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.ByteOrderedPartitioner; @@ -32,10 +37,6 @@ import org.apache.cassandra.dht.OrderPreservingPartitioner; import org.apache.cassandra.dht.RandomPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; -import org.assertj.core.api.Assertions; -import org.mockito.Mockito; -import org.quicktheories.core.Gen; -import org.quicktheories.impl.Constraint; import static org.assertj.core.api.Assertions.assertThat; import static org.quicktheories.QuickTheory.qt; diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java index 67bb3c6929..00881fedcf 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java @@ -37,13 +37,14 @@ import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterators; +import com.googlecode.concurrenttrees.common.Iterables; + import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.googlecode.concurrenttrees.common.Iterables; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.UpdateBuilder; import org.apache.cassandra.Util; @@ -85,9 +86,9 @@ import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.schema.SchemaTestUtil; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.reads.SpeculativeRetryPolicy; -import org.apache.cassandra.service.snapshot.SnapshotOptions; import org.apache.cassandra.service.snapshot.SnapshotManager; import org.apache.cassandra.service.snapshot.SnapshotManifest; +import org.apache.cassandra.service.snapshot.SnapshotOptions; import org.apache.cassandra.service.snapshot.SnapshotType; import org.apache.cassandra.service.snapshot.TableSnapshot; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/test/unit/org/apache/cassandra/db/ColumnsTest.java b/test/unit/org/apache/cassandra/db/ColumnsTest.java index 00a9b1a443..f43ad32f80 100644 --- a/test/unit/org/apache/cassandra/db/ColumnsTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnsTest.java @@ -19,7 +19,12 @@ package org.apache.cassandra.db; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; import java.util.concurrent.ThreadLocalRandom; import java.util.function.Predicate; @@ -27,13 +32,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import org.apache.cassandra.ServerTestUtils; -import org.apache.cassandra.db.commitlog.CommitLog; - import org.junit.AfterClass; +import org.junit.Assert; import org.junit.Test; -import org.junit.Assert; +import org.apache.cassandra.ServerTestUtils; +import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.SetType; import org.apache.cassandra.db.marshal.UTF8Type; diff --git a/test/unit/org/apache/cassandra/db/CounterCellTest.java b/test/unit/org/apache/cassandra/db/CounterCellTest.java index a0f9f37b32..16bbaa7adb 100644 --- a/test/unit/org/apache/cassandra/db/CounterCellTest.java +++ b/test/unit/org/apache/cassandra/db/CounterCellTest.java @@ -26,21 +26,24 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.db.context.CounterContext; import org.apache.cassandra.db.marshal.ByteBufferAccessor; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.db.rows.BTreeRow; import org.apache.cassandra.db.rows.BufferCell; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.Cells; -import org.apache.cassandra.db.context.CounterContext; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.serializers.AsciiSerializer; -import org.apache.cassandra.utils.*; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.CounterId; -import static org.junit.Assert.*; import static org.apache.cassandra.db.context.CounterContext.ContextState; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; public class CounterCellTest { diff --git a/test/unit/org/apache/cassandra/db/CounterMutationTest.java b/test/unit/org/apache/cassandra/db/CounterMutationTest.java index 5f25c72185..a84c877898 100644 --- a/test/unit/org/apache/cassandra/db/CounterMutationTest.java +++ b/test/unit/org/apache/cassandra/db/CounterMutationTest.java @@ -20,13 +20,13 @@ package org.apache.cassandra.db; import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.Util; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.Util; import org.apache.cassandra.db.context.CounterContext; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.WriteTimeoutException; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/test/unit/org/apache/cassandra/db/CounterMutationVerbHandlerOutOfRangeTest.java b/test/unit/org/apache/cassandra/db/CounterMutationVerbHandlerOutOfRangeTest.java index da58eccfa0..8da674ff81 100644 --- a/test/unit/org/apache/cassandra/db/CounterMutationVerbHandlerOutOfRangeTest.java +++ b/test/unit/org/apache/cassandra/db/CounterMutationVerbHandlerOutOfRangeTest.java @@ -22,6 +22,7 @@ import java.nio.ByteBuffer; import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.ListenableFuture; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -51,10 +52,6 @@ import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.membership.NodeState; import org.apache.cassandra.utils.FBUtilities; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.MessageDelivery; import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.broadcastAddress; import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.bytesToken; @@ -62,6 +59,9 @@ import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelpe import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.randomInt; import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.registerOutgoingMessageSink; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class CounterMutationVerbHandlerOutOfRangeTest { diff --git a/test/unit/org/apache/cassandra/db/DeletePartitionTest.java b/test/unit/org/apache/cassandra/db/DeletePartitionTest.java index 34a2b83a12..35bb684d6e 100644 --- a/test/unit/org/apache/cassandra/db/DeletePartitionTest.java +++ b/test/unit/org/apache/cassandra/db/DeletePartitionTest.java @@ -23,9 +23,11 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.db.partitions.FilteredPartition; +import org.apache.cassandra.db.partitions.ImmutableBTreePartition; +import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.db.rows.Row; -import org.apache.cassandra.db.partitions.*; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/unit/org/apache/cassandra/db/DigestTest.java b/test/unit/org/apache/cassandra/db/DigestTest.java index 4719726979..050dd73c66 100644 --- a/test/unit/org/apache/cassandra/db/DigestTest.java +++ b/test/unit/org/apache/cassandra/db/DigestTest.java @@ -22,6 +22,7 @@ import java.nio.ByteBuffer; import java.util.Arrays; import com.google.common.hash.Hashing; + import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/test/unit/org/apache/cassandra/db/DirectoriesTest.java b/test/unit/org/apache/cassandra/db/DirectoriesTest.java index 4963125034..35323fd388 100644 --- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java +++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java @@ -49,6 +49,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import com.google.common.collect.Sets; + import org.apache.commons.lang3.StringUtils; import org.junit.After; import org.junit.AfterClass; @@ -57,16 +58,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; - import org.slf4j.LoggerFactory; import org.slf4j.MDC; -// Our version of Sfl4j seems to be missing the ListAppender class. -// Future sfl4j versions have one. At that time the below imports can be -// replaced with `org.slf4j.*` equivalents. -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.read.ListAppender; import org.apache.cassandra.Util; import org.apache.cassandra.auth.AuthKeyspace; @@ -101,6 +94,11 @@ import org.apache.cassandra.service.snapshot.SnapshotManifest; import org.apache.cassandra.service.snapshot.TableSnapshot; import org.apache.cassandra.utils.JVMStabilityInspector; +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.read.ListAppender; + import static org.apache.cassandra.schema.MockSchema.sstableId; import static org.apache.cassandra.utils.Clock.Global.nanoTime; import static org.apache.cassandra.utils.FBUtilities.now; @@ -111,6 +109,10 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +/** + * Our version of slf4j seems to be missing the ListAppender class. Future slf4j versions have one. + * At that time the imports {@code ch.qos.logback.*} can be replaced with `org.slf4j.*` equivalents. + */ @RunWith(Parameterized.class) public class DirectoriesTest { diff --git a/test/unit/org/apache/cassandra/db/DiskBoundaryManagerTest.java b/test/unit/org/apache/cassandra/db/DiskBoundaryManagerTest.java index 606bdf33de..ade4eb5ae7 100644 --- a/test/unit/org/apache/cassandra/db/DiskBoundaryManagerTest.java +++ b/test/unit/org/apache/cassandra/db/DiskBoundaryManagerTest.java @@ -28,6 +28,7 @@ import java.util.stream.Collectors; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/db/ImportTest.java b/test/unit/org/apache/cassandra/db/ImportTest.java index 8b0faf598e..ee2b870cf9 100644 --- a/test/unit/org/apache/cassandra/db/ImportTest.java +++ b/test/unit/org/apache/cassandra/db/ImportTest.java @@ -31,6 +31,7 @@ import java.util.Set; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/db/KeyspaceTest.java b/test/unit/org/apache/cassandra/db/KeyspaceTest.java index a42359de46..ba55d4ed52 100644 --- a/test/unit/org/apache/cassandra/db/KeyspaceTest.java +++ b/test/unit/org/apache/cassandra/db/KeyspaceTest.java @@ -22,6 +22,7 @@ import java.nio.ByteBuffer; import java.util.Collection; import java.util.List; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; @@ -46,7 +47,6 @@ import org.apache.cassandra.service.snapshot.SnapshotManager; import org.apache.cassandra.service.snapshot.TableSnapshot; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import org.assertj.core.api.Assertions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/unit/org/apache/cassandra/db/LivenessInfoTest.java b/test/unit/org/apache/cassandra/db/LivenessInfoTest.java index 124231810f..37c6de9815 100644 --- a/test/unit/org/apache/cassandra/db/LivenessInfoTest.java +++ b/test/unit/org/apache/cassandra/db/LivenessInfoTest.java @@ -18,11 +18,14 @@ package org.apache.cassandra.db; -import static org.junit.Assert.*; +import org.junit.Test; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.utils.FBUtilities; -import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class LivenessInfoTest extends CQLTester { diff --git a/test/unit/org/apache/cassandra/db/MmapFileTest.java b/test/unit/org/apache/cassandra/db/MmapFileTest.java index c3b9482db8..c2b307e7b9 100644 --- a/test/unit/org/apache/cassandra/db/MmapFileTest.java +++ b/test/unit/org/apache/cassandra/db/MmapFileTest.java @@ -21,16 +21,17 @@ import java.lang.management.ManagementFactory; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; import java.nio.file.StandardOpenOption; + import javax.management.MBeanServer; import javax.management.ObjectName; -import org.apache.cassandra.Util; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.io.util.File; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.Util; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.memory.MemoryUtil; diff --git a/test/unit/org/apache/cassandra/db/MultiKeyspaceTest.java b/test/unit/org/apache/cassandra/db/MultiKeyspaceTest.java index 5ecd5b0228..f66f69cfd8 100644 --- a/test/unit/org/apache/cassandra/db/MultiKeyspaceTest.java +++ b/test/unit/org/apache/cassandra/db/MultiKeyspaceTest.java @@ -20,11 +20,11 @@ package org.apache.cassandra.db; * */ +import org.junit.Test; + import org.apache.cassandra.Util; import org.apache.cassandra.cql3.CQLTester; -import org.junit.Test; - public class MultiKeyspaceTest extends CQLTester { diff --git a/test/unit/org/apache/cassandra/db/MutationExceededMaxSizeExceptionTest.java b/test/unit/org/apache/cassandra/db/MutationExceededMaxSizeExceptionTest.java index 09ab8a1e21..ee74f86e64 100644 --- a/test/unit/org/apache/cassandra/db/MutationExceededMaxSizeExceptionTest.java +++ b/test/unit/org/apache/cassandra/db/MutationExceededMaxSizeExceptionTest.java @@ -25,7 +25,7 @@ import java.util.List; import org.junit.Test; import static org.apache.cassandra.db.MutationExceededMaxSizeException.makeTopKeysString; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class MutationExceededMaxSizeExceptionTest { diff --git a/test/unit/org/apache/cassandra/db/MutationVerbHandlerOutOfRangeTest.java b/test/unit/org/apache/cassandra/db/MutationVerbHandlerOutOfRangeTest.java index 77ef47192e..c01cc41285 100644 --- a/test/unit/org/apache/cassandra/db/MutationVerbHandlerOutOfRangeTest.java +++ b/test/unit/org/apache/cassandra/db/MutationVerbHandlerOutOfRangeTest.java @@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import com.google.common.util.concurrent.ListenableFuture; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -51,9 +52,6 @@ import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.membership.NodeState; import org.apache.cassandra.utils.FBUtilities; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.MessageDelivery; import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.broadcastAddress; import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.bytesToken; @@ -61,6 +59,8 @@ import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelpe import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.randomInt; import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.registerOutgoingMessageSink; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; public class MutationVerbHandlerOutOfRangeTest { diff --git a/test/unit/org/apache/cassandra/db/NameSortTest.java b/test/unit/org/apache/cassandra/db/NameSortTest.java index 2fdd735300..f7c48a613a 100644 --- a/test/unit/org/apache/cassandra/db/NameSortTest.java +++ b/test/unit/org/apache/cassandra/db/NameSortTest.java @@ -21,19 +21,20 @@ package org.apache.cassandra.db; import java.io.IOException; import java.nio.ByteBuffer; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.db.rows.Row; -import org.apache.cassandra.db.partitions.*; import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.partitions.FilteredPartition; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; import static org.junit.Assert.assertEquals; -import org.junit.BeforeClass; -import org.junit.Test; public class NameSortTest { diff --git a/test/unit/org/apache/cassandra/db/NativeCellTest.java b/test/unit/org/apache/cassandra/db/NativeCellTest.java index ebc956947e..6ef4c0c092 100644 --- a/test/unit/org/apache/cassandra/db/NativeCellTest.java +++ b/test/unit/org/apache/cassandra/db/NativeCellTest.java @@ -27,18 +27,21 @@ import java.util.concurrent.ThreadLocalRandom; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.io.util.DataOutputBuffer; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.marshal.SetType; import org.apache.cassandra.db.marshal.UTF8Type; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.BTreeRow; +import org.apache.cassandra.db.rows.BufferCell; +import org.apache.cassandra.db.rows.Cell; +import org.apache.cassandra.db.rows.CellPath; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.io.util.DataOutputBuffer; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.concurrent.ImmediateFuture; import org.apache.cassandra.utils.concurrent.OpOrder; diff --git a/test/unit/org/apache/cassandra/db/PartitionRangeReadCommandCQLTest.java b/test/unit/org/apache/cassandra/db/PartitionRangeReadCommandCQLTest.java index 3ad1277bae..c0ef2cb477 100644 --- a/test/unit/org/apache/cassandra/db/PartitionRangeReadCommandCQLTest.java +++ b/test/unit/org/apache/cassandra/db/PartitionRangeReadCommandCQLTest.java @@ -17,9 +17,8 @@ */ package org.apache.cassandra.db; -import org.junit.Test; - import org.assertj.core.api.Assertions; +import org.junit.Test; public class PartitionRangeReadCommandCQLTest extends ReadCommandCQLTester { diff --git a/test/unit/org/apache/cassandra/db/PartitionTest.java b/test/unit/org/apache/cassandra/db/PartitionTest.java index edf2a8254e..44b3144336 100644 --- a/test/unit/org/apache/cassandra/db/PartitionTest.java +++ b/test/unit/org/apache/cassandra/db/PartitionTest.java @@ -25,18 +25,21 @@ import java.util.Arrays; import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.db.rows.UnfilteredRowIterator; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.db.rows.EncodingStats; -import org.apache.cassandra.db.rows.UnfilteredRowIterators; +import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.Util; import org.apache.cassandra.db.marshal.AsciiType; -import org.apache.cassandra.db.partitions.*; +import org.apache.cassandra.db.partitions.CachedBTreePartition; +import org.apache.cassandra.db.partitions.CachedPartition; +import org.apache.cassandra.db.partitions.ImmutableBTreePartition; +import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.rows.EncodingStats; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.db.rows.UnfilteredRowIterators; +import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.Util; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java index 2eb521c688..ef03f2d140 100644 --- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java +++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java @@ -19,30 +19,41 @@ package org.apache.cassandra.db; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterators; + import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.UpdateBuilder; import org.apache.cassandra.Util; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.cql3.statements.schema.IndexTarget; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.UTF8Type; -import org.apache.cassandra.db.partitions.*; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.partitions.FilteredPartition; +import org.apache.cassandra.db.partitions.ImmutableBTreePartition; +import org.apache.cassandra.db.partitions.Partition; +import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; +import org.apache.cassandra.db.rows.RangeTombstoneMarker; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.index.StubIndex; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.metadata.StatsMetadata; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.IndexMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.SchemaTestUtil; diff --git a/test/unit/org/apache/cassandra/db/ReadCommandCQLTester.java b/test/unit/org/apache/cassandra/db/ReadCommandCQLTester.java index dfee540ff8..7d0c5f4bf3 100644 --- a/test/unit/org/apache/cassandra/db/ReadCommandCQLTester.java +++ b/test/unit/org/apache/cassandra/db/ReadCommandCQLTester.java @@ -17,9 +17,10 @@ */ package org.apache.cassandra.db; -import org.apache.cassandra.cql3.CQLTester; import org.assertj.core.api.Assertions; +import org.apache.cassandra.cql3.CQLTester; + public abstract class ReadCommandCQLTester extends CQLTester { protected abstract T parseCommand(String query); diff --git a/test/unit/org/apache/cassandra/db/ReadCommandTest.java b/test/unit/org/apache/cassandra/db/ReadCommandTest.java index 51a49c4365..b458cd78a5 100644 --- a/test/unit/org/apache/cassandra/db/ReadCommandTest.java +++ b/test/unit/org/apache/cassandra/db/ReadCommandTest.java @@ -22,13 +22,21 @@ import java.io.IOException; import java.io.OutputStream; import java.net.UnknownHostException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.function.Supplier; import java.util.stream.IntStream; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -47,11 +55,17 @@ import org.apache.cassandra.db.marshal.CounterColumnType; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.ReversedType; import org.apache.cassandra.db.marshal.SetType; -import org.apache.cassandra.db.partitions.*; +import org.apache.cassandra.db.partitions.FilteredPartition; +import org.apache.cassandra.db.partitions.ImmutableBTreePartition; +import org.apache.cassandra.db.partitions.Partition; +import org.apache.cassandra.db.partitions.PartitionIterator; +import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; +import org.apache.cassandra.db.partitions.UnfilteredPartitionIterators; +import org.apache.cassandra.db.rows.DeserializationHelper; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.rows.RowIterator; import org.apache.cassandra.db.rows.Unfiltered; -import org.apache.cassandra.db.rows.DeserializationHelper; import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.rows.UnfilteredRowIterators; import org.apache.cassandra.dht.Range; @@ -65,8 +79,8 @@ import org.apache.cassandra.io.util.WrappedDataOutputStreamPlus; import org.apache.cassandra.locator.EndpointsForToken; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.ReplicaUtils; -import org.apache.cassandra.net.Message; import org.apache.cassandra.metrics.ClearableHistogram; +import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.Verb; import org.apache.cassandra.repair.consistent.LocalSessionAccessor; diff --git a/test/unit/org/apache/cassandra/db/ReadCommandVerbHandlerOutOfRangeTest.java b/test/unit/org/apache/cassandra/db/ReadCommandVerbHandlerOutOfRangeTest.java index 180aa45d4f..5b42b98b1a 100644 --- a/test/unit/org/apache/cassandra/db/ReadCommandVerbHandlerOutOfRangeTest.java +++ b/test/unit/org/apache/cassandra/db/ReadCommandVerbHandlerOutOfRangeTest.java @@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import com.google.common.util.concurrent.ListenableFuture; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/ReadMessageTest.java b/test/unit/org/apache/cassandra/db/ReadMessageTest.java index 5b052536fb..3e11c0c0e7 100644 --- a/test/unit/org/apache/cassandra/db/ReadMessageTest.java +++ b/test/unit/org/apache/cassandra/db/ReadMessageTest.java @@ -18,34 +18,37 @@ */ package org.apache.cassandra.db; -import static org.junit.Assert.*; - -import java.io.*; +import java.io.IOException; import com.google.common.base.Predicate; import org.junit.BeforeClass; import org.junit.Test; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.commitlog.CommitLogTestReplayer; -import org.apache.cassandra.db.partitions.PartitionUpdate; -import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.partitions.FilteredPartition; +import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.ByteBufferUtil; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class ReadMessageTest { private static final String KEYSPACE1 = "ReadMessageTest1"; diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerMissingHeaderTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerMissingHeaderTest.java index e8444fba4f..b2eb3f4af9 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManagerMissingHeaderTest.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManagerMissingHeaderTest.java @@ -23,7 +23,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import org.apache.cassandra.io.util.File; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -36,13 +35,14 @@ import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.ParameterizedClass; -import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.commitlog.CommitLog; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.compress.DeflateCompressor; import org.apache.cassandra.io.compress.LZ4Compressor; import org.apache.cassandra.io.compress.SnappyCompressor; import org.apache.cassandra.io.compress.ZstdCompressor; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.security.EncryptionContext; diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java index 6270b25eb7..f069f3282f 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java @@ -23,6 +23,13 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; @@ -37,14 +44,7 @@ import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.security.EncryptionContext; import org.apache.cassandra.security.EncryptionContextGenerator; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; /** * Test for the truncate operation. diff --git a/test/unit/org/apache/cassandra/db/RepairedDataInfoTest.java b/test/unit/org/apache/cassandra/db/RepairedDataInfoTest.java index 11a507d083..ab942ebcf2 100644 --- a/test/unit/org/apache/cassandra/db/RepairedDataInfoTest.java +++ b/test/unit/org/apache/cassandra/db/RepairedDataInfoTest.java @@ -28,10 +28,9 @@ import org.junit.Test; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.db.commitlog.CommitLog; -import org.apache.cassandra.db.marshal.Int32Type; -import org.apache.cassandra.schema.MockSchema; import org.apache.cassandra.db.filter.DataLimits; import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.partitions.AbstractUnfilteredPartitionIterator; import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; @@ -46,12 +45,14 @@ import org.apache.cassandra.db.rows.Rows; import org.apache.cassandra.db.rows.Unfiltered; import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.MockSchema; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.Util.clustering; import static org.apache.cassandra.Util.dk; -import static org.apache.cassandra.utils.ByteBufferUtil.*; +import static org.apache.cassandra.utils.ByteBufferUtil.bytes; +import static org.apache.cassandra.utils.ByteBufferUtil.getArray; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/db/RepairedDataTombstonesTest.java b/test/unit/org/apache/cassandra/db/RepairedDataTombstonesTest.java index dc2eaae930..32646b1573 100644 --- a/test/unit/org/apache/cassandra/db/RepairedDataTombstonesTest.java +++ b/test/unit/org/apache/cassandra/db/RepairedDataTombstonesTest.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.util.Collections; import com.google.common.collect.Iterables; + import org.junit.Test; import org.apache.cassandra.Util; diff --git a/test/unit/org/apache/cassandra/db/RowCacheCQLTest.java b/test/unit/org/apache/cassandra/db/RowCacheCQLTest.java index 27cfebd68e..db3e5e94af 100644 --- a/test/unit/org/apache/cassandra/db/RowCacheCQLTest.java +++ b/test/unit/org/apache/cassandra/db/RowCacheCQLTest.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.service.CacheService; + import static org.junit.Assert.assertEquals; public class RowCacheCQLTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/db/RowCacheTest.java b/test/unit/org/apache/cassandra/db/RowCacheTest.java index f7a87b1341..2d2c9b11d6 100644 --- a/test/unit/org/apache/cassandra/db/RowCacheTest.java +++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java @@ -25,6 +25,7 @@ import java.util.Iterator; import java.util.TreeSet; import com.google.common.collect.Lists; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/RowIterationTest.java b/test/unit/org/apache/cassandra/db/RowIterationTest.java index 81a93e1f20..4556c9b153 100644 --- a/test/unit/org/apache/cassandra/db/RowIterationTest.java +++ b/test/unit/org/apache/cassandra/db/RowIterationTest.java @@ -20,8 +20,8 @@ package org.apache.cassandra.db; import org.junit.Test; -import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.Util; +import org.apache.cassandra.cql3.CQLTester; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/unit/org/apache/cassandra/db/RowTest.java b/test/unit/org/apache/cassandra/db/RowTest.java index e7f2a25ff2..b514c300bd 100644 --- a/test/unit/org/apache/cassandra/db/RowTest.java +++ b/test/unit/org/apache/cassandra/db/RowTest.java @@ -23,23 +23,31 @@ import java.util.HashMap; import java.util.Map; import com.google.common.collect.ImmutableList; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnIdentifier; -import org.apache.cassandra.db.rows.*; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.rows.BTreeRow; +import org.apache.cassandra.db.rows.BufferCell; +import org.apache.cassandra.db.rows.Cell; +import org.apache.cassandra.db.rows.RangeTombstoneBoundMarker; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.db.rows.UnfilteredRowIterators; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/unit/org/apache/cassandra/db/RowUpdateBuilder.java b/test/unit/org/apache/cassandra/db/RowUpdateBuilder.java index f59c2a97be..5392339faf 100644 --- a/test/unit/org/apache/cassandra/db/RowUpdateBuilder.java +++ b/test/unit/org/apache/cassandra/db/RowUpdateBuilder.java @@ -18,15 +18,16 @@ package org.apache.cassandra.db; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.context.CounterContext; +import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.rows.*; -import org.apache.cassandra.db.partitions.*; -import org.apache.cassandra.utils.*; +import org.apache.cassandra.utils.FBUtilities; /** * Convenience object to create single row updates for tests. diff --git a/test/unit/org/apache/cassandra/db/SSTableAndMemTableDigestMatchTest.java b/test/unit/org/apache/cassandra/db/SSTableAndMemTableDigestMatchTest.java index 6f3158a8d4..92a2a54754 100644 --- a/test/unit/org/apache/cassandra/db/SSTableAndMemTableDigestMatchTest.java +++ b/test/unit/org/apache/cassandra/db/SSTableAndMemTableDigestMatchTest.java @@ -25,6 +25,7 @@ import java.util.NavigableSet; import java.util.function.Function; import com.google.common.collect.Sets; + import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/test/unit/org/apache/cassandra/db/SchemaCQLHelperTest.java b/test/unit/org/apache/cassandra/db/SchemaCQLHelperTest.java index 9f3a0fab36..4d81d1baab 100644 --- a/test/unit/org/apache/cassandra/db/SchemaCQLHelperTest.java +++ b/test/unit/org/apache/cassandra/db/SchemaCQLHelperTest.java @@ -18,30 +18,6 @@ package org.apache.cassandra.db; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.io.Files; - -import org.apache.cassandra.service.accord.fastpath.FastPathStrategy; -import org.junit.Assert; -import org.junit.Test; - -import com.fasterxml.jackson.databind.JsonNode; -import org.apache.cassandra.*; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.*; -import org.apache.cassandra.cql3.statements.schema.IndexTarget; -import org.apache.cassandra.db.marshal.*; -import org.apache.cassandra.index.internal.CassandraIndex; -import org.apache.cassandra.index.sasi.SASIIndex; -import org.apache.cassandra.schema.*; -import org.apache.cassandra.service.reads.SpeculativeRetryPolicy; -import org.apache.cassandra.service.snapshot.SnapshotManager; -import org.apache.cassandra.service.snapshot.SnapshotOptions; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.JsonUtils; - import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.Arrays; @@ -49,6 +25,45 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; +import com.fasterxml.jackson.databind.JsonNode; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.io.Files; + +import org.junit.Assert; +import org.junit.Test; + +import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.cql3.FieldIdentifier; +import org.apache.cassandra.cql3.statements.schema.IndexTarget; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.ListType; +import org.apache.cassandra.db.marshal.MapType; +import org.apache.cassandra.db.marshal.ReversedType; +import org.apache.cassandra.db.marshal.UserType; +import org.apache.cassandra.index.internal.CassandraIndex; +import org.apache.cassandra.index.sasi.SASIIndex; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.CompactionParams; +import org.apache.cassandra.schema.CompressionParams; +import org.apache.cassandra.schema.IndexMetadata; +import org.apache.cassandra.schema.Indexes; +import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.Tables; +import org.apache.cassandra.schema.Types; +import org.apache.cassandra.service.accord.fastpath.FastPathStrategy; +import org.apache.cassandra.service.reads.SpeculativeRetryPolicy; +import org.apache.cassandra.service.snapshot.SnapshotManager; +import org.apache.cassandra.service.snapshot.SnapshotOptions; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.JsonUtils; + import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.startsWith; diff --git a/test/unit/org/apache/cassandra/db/SerializationHeaderTest.java b/test/unit/org/apache/cassandra/db/SerializationHeaderTest.java index 661e3651d3..33f1a63238 100644 --- a/test/unit/org/apache/cassandra/db/SerializationHeaderTest.java +++ b/test/unit/org/apache/cassandra/db/SerializationHeaderTest.java @@ -26,6 +26,7 @@ import java.util.function.Function; import java.util.function.Supplier; import com.google.common.io.Files; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java b/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java index 93fe4d3dfb..b70b1692cc 100644 --- a/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java +++ b/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java @@ -32,15 +32,13 @@ import java.util.stream.Collectors; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnIdentifier; @@ -68,7 +66,10 @@ import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/unit/org/apache/cassandra/db/SystemKeyspaceMigrator41Test.java b/test/unit/org/apache/cassandra/db/SystemKeyspaceMigrator41Test.java index f9a09608a4..789e19e279 100644 --- a/test/unit/org/apache/cassandra/db/SystemKeyspaceMigrator41Test.java +++ b/test/unit/org/apache/cassandra/db/SystemKeyspaceMigrator41Test.java @@ -27,6 +27,7 @@ import java.util.UUID; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; + import org.apache.commons.lang3.StringUtils; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java b/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java index 7eb8f9c578..5f43209f1c 100644 --- a/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java +++ b/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java @@ -19,7 +19,12 @@ package org.apache.cassandra.db; import java.io.IOException; import java.net.UnknownHostException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/TimeSortTest.java b/test/unit/org/apache/cassandra/db/TimeSortTest.java index b45ab9679a..739f5d7fa8 100644 --- a/test/unit/org/apache/cassandra/db/TimeSortTest.java +++ b/test/unit/org/apache/cassandra/db/TimeSortTest.java @@ -19,11 +19,12 @@ package org.apache.cassandra.db; import java.util.Iterator; + import org.junit.Test; +import org.apache.cassandra.Util; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.UntypedResultSet; -import org.apache.cassandra.Util; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/db/TransformerTest.java b/test/unit/org/apache/cassandra/db/TransformerTest.java index 41e47a2515..293ac24c9f 100644 --- a/test/unit/org/apache/cassandra/db/TransformerTest.java +++ b/test/unit/org/apache/cassandra/db/TransformerTest.java @@ -21,19 +21,26 @@ package org.apache.cassandra.db; import java.util.ArrayList; import java.util.List; +import org.junit.Assert; import org.junit.Test; -import org.junit.Assert; import org.apache.cassandra.Util; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.marshal.Int32Type; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.BTreeRow; +import org.apache.cassandra.db.rows.BaseRowIterator; +import org.apache.cassandra.db.rows.BufferCell; +import org.apache.cassandra.db.rows.EncodingStats; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.RowIterator; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.transform.FilteredRows; import org.apache.cassandra.db.transform.MoreRows; import org.apache.cassandra.db.transform.Transformation; import org.apache.cassandra.dht.Murmur3Partitioner; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.AbstractIterator; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/test/unit/org/apache/cassandra/db/aggregation/GroupMakerTest.java b/test/unit/org/apache/cassandra/db/aggregation/GroupMakerTest.java index 59f1808082..0191f15d3a 100644 --- a/test/unit/org/apache/cassandra/db/aggregation/GroupMakerTest.java +++ b/test/unit/org/apache/cassandra/db/aggregation/GroupMakerTest.java @@ -27,13 +27,13 @@ import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnIdentifier; -import org.apache.cassandra.cql3.terms.Constants.Literal; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.VariableSpecifications; import org.apache.cassandra.cql3.functions.ScalarFunction; import org.apache.cassandra.cql3.functions.TimeFcts; import org.apache.cassandra.cql3.selection.Selectable; import org.apache.cassandra.cql3.selection.Selector; +import org.apache.cassandra.cql3.terms.Constants.Literal; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.db.DecoratedKey; diff --git a/test/unit/org/apache/cassandra/db/columniterator/SSTableReverseIteratorTest.java b/test/unit/org/apache/cassandra/db/columniterator/SSTableReverseIteratorTest.java index 169318d4e8..9750da3070 100644 --- a/test/unit/org/apache/cassandra/db/columniterator/SSTableReverseIteratorTest.java +++ b/test/unit/org/apache/cassandra/db/columniterator/SSTableReverseIteratorTest.java @@ -22,6 +22,7 @@ import java.nio.ByteBuffer; import java.util.Random; import com.google.common.collect.Iterables; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/db/commitlog/BatchCommitLogTest.java b/test/unit/org/apache/cassandra/db/commitlog/BatchCommitLogTest.java index e9ec640e79..673d4a5542 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/BatchCommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/BatchCommitLogTest.java @@ -34,8 +34,8 @@ import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.security.EncryptionContext; -import static org.junit.Assert.assertEquals; import static org.apache.cassandra.utils.Clock.Global.nanoTime; +import static org.junit.Assert.assertEquals; public class BatchCommitLogTest extends CommitLogTest { diff --git a/test/unit/org/apache/cassandra/db/commitlog/CDCTestReplayer.java b/test/unit/org/apache/cassandra/db/commitlog/CDCTestReplayer.java index 762459097c..3972ac39b5 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CDCTestReplayer.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CDCTestReplayer.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db.commitlog; import java.io.IOException; -import org.apache.cassandra.io.util.File; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,6 +26,7 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.rows.DeserializationHelper; import org.apache.cassandra.io.util.DataInputBuffer; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.RebufferingInputStream; /** diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogArchiverTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogArchiverTest.java index 4a491c86b1..14387c194b 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogArchiverTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogArchiverTest.java @@ -29,6 +29,8 @@ import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.mockito.MockedStatic; +import org.mockito.Mockito; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; @@ -36,8 +38,6 @@ import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.PathUtils; -import org.mockito.MockedStatic; -import org.mockito.Mockito; import static org.apache.cassandra.io.util.PathUtils.forEach; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogChainedMarkersTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogChainedMarkersTest.java index b5e417b6e4..269ef27ab9 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogChainedMarkersTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogChainedMarkersTest.java @@ -23,6 +23,8 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Random; +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; @@ -40,8 +42,6 @@ import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.io.util.File; import org.apache.cassandra.schema.KeyspaceParams; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; /** * Tests the commitlog to make sure we can replay it - explicitly for the case where we update the chained markers diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogDescriptorTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogDescriptorTest.java index 5ef83b48a1..520b7038dc 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogDescriptorTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogDescriptorTest.java @@ -25,6 +25,8 @@ import java.util.HashMap; import java.util.Map; import com.google.common.collect.ImmutableMap; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -40,7 +42,6 @@ import org.apache.cassandra.io.util.FileSegmentInputStream; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.security.EncryptionContext; import org.apache.cassandra.security.EncryptionContextGenerator; -import org.assertj.core.api.Assertions; public class CommitLogDescriptorTest { diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogFailurePolicyTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogFailurePolicyTest.java index dd245f11e8..d8def3ba51 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogFailurePolicyTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogFailurePolicyTest.java @@ -22,6 +22,7 @@ package org.apache.cassandra.db.commitlog; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogInitWithExceptionTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogInitWithExceptionTest.java index 05acf17f8d..c552edb8c4 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogInitWithExceptionTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogInitWithExceptionTest.java @@ -19,17 +19,18 @@ package org.apache.cassandra.db.commitlog; -import org.apache.cassandra.Util; -import org.apache.cassandra.service.DiskErrorsHandlerService; -import org.apache.cassandra.utils.concurrent.Condition; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.apache.cassandra.CassandraIsolatedJunit4ClassRunner; +import org.apache.cassandra.Util; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.service.DiskErrorsHandlerService; import org.apache.cassandra.utils.JVMStabilityInspector; +import org.apache.cassandra.utils.concurrent.Condition; @RunWith(CassandraIsolatedJunit4ClassRunner.class) diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogReaderTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogReaderTest.java index 2f291a26ce..a0dde6c6f0 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogReaderTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogReaderTest.java @@ -23,28 +23,28 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.apache.cassandra.distributed.shared.WithProperties; -import org.apache.cassandra.io.util.File; -import org.apache.cassandra.security.EncryptionContextGenerator; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.distributed.shared.WithProperties; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.security.EncryptionContextGenerator; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.KillerForTests; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.config.CassandraRelevantProperties.COMMITLOG_IGNORE_REPLAY_ERRORS; diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentBackpressureTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentBackpressureTest.java index 6a8521485a..7f6ffc34ea 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentBackpressureTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentBackpressureTest.java @@ -27,6 +27,9 @@ import java.util.concurrent.Semaphore; import com.google.common.collect.ImmutableMap; +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMRules; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -44,9 +47,6 @@ import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.schema.KeyspaceParams; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMRules; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; /** * Since this test depends on byteman rules being setup during initialization, you shouldn't add tests to this class diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java index f23e16788e..6f56089259 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java @@ -23,18 +23,19 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.cassandra.ServerTestUtils; -import org.apache.cassandra.io.util.File; -import org.apache.cassandra.io.util.FileReader; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; @@ -42,6 +43,8 @@ import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.db.commitlog.CommitLogSegment.CDCState; import org.apache.cassandra.exceptions.CDCWriteException; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileReader; import org.apache.cassandra.schema.TableMetadata; public class CommitLogSegmentManagerCDCTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java index 79a32c0a8b..27be62cbb0 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java @@ -18,10 +18,6 @@ */ package org.apache.cassandra.db.commitlog; -import org.apache.cassandra.config.CassandraRelevantProperties; -import org.apache.cassandra.distributed.shared.WithProperties; -import org.apache.cassandra.io.util.File; - import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.DataOutputStream; @@ -44,13 +40,12 @@ import java.util.function.BiConsumer; import java.util.stream.Collectors; import java.util.zip.CRC32; import java.util.zip.Checksum; + import javax.crypto.Cipher; import com.google.common.collect.Iterables; import com.google.common.io.Files; -import org.apache.cassandra.io.util.FileOutputStreamPlus; - import org.junit.After; import org.junit.AfterClass; import org.junit.Assume; @@ -63,6 +58,7 @@ import org.junit.runners.Parameterized.Parameters; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; +import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.Config.DiskFailurePolicy; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.ParameterizedClass; @@ -83,6 +79,7 @@ import org.apache.cassandra.db.memtable.Memtable; import org.apache.cassandra.db.memtable.SkipListMemtable; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.distributed.shared.WithProperties; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.compress.DeflateCompressor; @@ -90,6 +87,8 @@ import org.apache.cassandra.io.compress.LZ4Compressor; import org.apache.cassandra.io.compress.SnappyCompressor; import org.apache.cassandra.io.compress.ZstdCompressor; import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileOutputStreamPlus; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.net.MessagingService; diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogTestReplayer.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogTestReplayer.java index 0519af925c..8dc4fd5a85 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogTestReplayer.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogTestReplayer.java @@ -18,16 +18,17 @@ */ package org.apache.cassandra.db.commitlog; -import org.apache.cassandra.io.util.File; import java.io.IOException; import com.google.common.base.Predicate; + import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.rows.DeserializationHelper; import org.apache.cassandra.io.util.DataInputBuffer; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.RebufferingInputStream; /** diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java index 42fcadb017..cb45a16962 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java @@ -26,6 +26,7 @@ import java.nio.ByteBuffer; import java.util.Properties; import com.google.common.base.Predicate; + import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTestMaker.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTestMaker.java index b97cad2c09..a5e00f3926 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTestMaker.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTestMaker.java @@ -33,23 +33,31 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import com.google.common.util.concurrent.RateLimiter; -import org.apache.cassandra.io.util.File; -import org.apache.cassandra.io.util.FileInputStreamPlus; -import org.apache.cassandra.io.util.FileOutputStreamPlus; + import org.junit.Assert; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.Util; import org.apache.cassandra.UpdateBuilder; +import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.schema.Schema; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileInputStreamPlus; +import org.apache.cassandra.io.util.FileOutputStreamPlus; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Schema; import org.apache.cassandra.utils.FBUtilities; -import static org.apache.cassandra.db.commitlog.CommitLogUpgradeTest.*; +import static org.apache.cassandra.db.commitlog.CommitLogUpgradeTest.CELLS_PROPERTY; +import static org.apache.cassandra.db.commitlog.CommitLogUpgradeTest.CFID_PROPERTY; +import static org.apache.cassandra.db.commitlog.CommitLogUpgradeTest.HASH_PROPERTY; +import static org.apache.cassandra.db.commitlog.CommitLogUpgradeTest.KEYSPACE; +import static org.apache.cassandra.db.commitlog.CommitLogUpgradeTest.PROPERTIES_FILE; +import static org.apache.cassandra.db.commitlog.CommitLogUpgradeTest.TABLE; +import static org.apache.cassandra.db.commitlog.CommitLogUpgradeTest.hash; +import static org.apache.cassandra.db.commitlog.CommitLogUpgradeTest.metadata; public class CommitLogUpgradeTestMaker { diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitlogShutdownTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitlogShutdownTest.java index e3e5662112..298f568ef7 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitlogShutdownTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitlogShutdownTest.java @@ -26,6 +26,9 @@ import java.util.List; import java.util.Random; import com.google.common.collect.ImmutableMap; + +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -43,8 +46,6 @@ import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.StorageService; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; /** * Since this test depends on byteman rules being setup during initialization, you shouldn't add tests to this class diff --git a/test/unit/org/apache/cassandra/db/commitlog/DirectIOSegmentBytemanTest.java b/test/unit/org/apache/cassandra/db/commitlog/DirectIOSegmentBytemanTest.java index 15d8616165..b752fac238 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/DirectIOSegmentBytemanTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/DirectIOSegmentBytemanTest.java @@ -18,8 +18,12 @@ package org.apache.cassandra.db.commitlog; -import org.apache.cassandra.io.util.File; +import java.io.IOException; +import java.nio.file.Files; +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMRules; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -27,12 +31,7 @@ import org.junit.runner.RunWith; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.ConfigurationException; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMRules; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; - -import java.io.IOException; -import java.nio.file.Files; +import org.apache.cassandra.io.util.File; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; diff --git a/test/unit/org/apache/cassandra/db/commitlog/DirectIOSegmentTest.java b/test/unit/org/apache/cassandra/db/commitlog/DirectIOSegmentTest.java index 27d3946b2a..f0f5574ee4 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/DirectIOSegmentTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/DirectIOSegmentTest.java @@ -25,17 +25,19 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.concurrent.atomic.AtomicLong; +import net.openhft.chronicle.core.util.ThrowingFunction; + import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.internal.creation.MockSettingsImpl; -import net.openhft.chronicle.core.util.ThrowingFunction; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.SimpleCachedBufferPool; import org.apache.cassandra.utils.Generators; -import org.mockito.ArgumentCaptor; -import org.mockito.internal.creation.MockSettingsImpl; + import sun.nio.ch.DirectBuffer; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java b/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java index 4166759070..e3d839f20e 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.db.commitlog; -import org.apache.cassandra.io.util.*; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; @@ -40,10 +39,15 @@ import org.apache.cassandra.io.compress.ICompressor; import org.apache.cassandra.io.compress.LZ4Compressor; import org.apache.cassandra.io.compress.SnappyCompressor; import org.apache.cassandra.io.compress.ZstdCompressor; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileDataInput; +import org.apache.cassandra.io.util.FileOutputStreamPlus; +import org.apache.cassandra.io.util.FileUtils; +import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.security.CipherFactory; -import org.apache.cassandra.security.EncryptionUtils; import org.apache.cassandra.security.EncryptionContext; import org.apache.cassandra.security.EncryptionContextGenerator; +import org.apache.cassandra.security.EncryptionUtils; import org.apache.cassandra.utils.ByteBufferUtil; public class SegmentReaderTest diff --git a/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java index 043778092e..625b8a57d2 100644 --- a/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java @@ -21,11 +21,12 @@ package org.apache.cassandra.db.compaction; import java.util.Collections; import com.google.common.collect.Iterables; + import org.junit.After; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.Assert; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/test/unit/org/apache/cassandra/db/compaction/ActiveCompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/ActiveCompactionsTest.java index 4f915f7956..c7a47b1803 100644 --- a/test/unit/org/apache/cassandra/db/compaction/ActiveCompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/ActiveCompactionsTest.java @@ -33,6 +33,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Test; import org.apache.cassandra.Util; diff --git a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionBytemanTest.java b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionBytemanTest.java index c858930509..df37cfabc9 100644 --- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionBytemanTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionBytemanTest.java @@ -28,6 +28,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; + +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMRules; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,14 +42,11 @@ import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.RangesAtEndpoint; import org.apache.cassandra.locator.Replica; -import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.utils.FBUtilities; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMRules; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java index 2b1181e6c6..cb55129909 100644 --- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java @@ -32,45 +32,50 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.apache.cassandra.Util; -import org.apache.cassandra.io.util.File; +import org.junit.After; import org.junit.Assert; import org.junit.BeforeClass; -import org.junit.After; import org.junit.Test; +import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.UpdateBuilder; +import org.apache.cassandra.Util; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.RowUpdateBuilder; +import org.apache.cassandra.db.SerializationHeader; +import org.apache.cassandra.db.lifecycle.LifecycleTransaction; +import org.apache.cassandra.db.lifecycle.SSTableSet; +import org.apache.cassandra.db.rows.EncodingStats; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken; import org.apache.cassandra.dht.Murmur3Partitioner; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; +import org.apache.cassandra.io.sstable.Descriptor; +import org.apache.cassandra.io.sstable.ISSTableScanner; +import org.apache.cassandra.io.sstable.SSTableTxnWriter; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.RangesAtEndpoint; import org.apache.cassandra.locator.Replica; import org.apache.cassandra.repair.NoSuchRepairSessionException; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.MockSchema; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.lifecycle.LifecycleTransaction; -import org.apache.cassandra.db.rows.EncodingStats; -import org.apache.cassandra.db.lifecycle.SSTableSet; -import org.apache.cassandra.db.rows.UnfilteredRowIterator; -import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; -import org.apache.cassandra.io.sstable.*; -import org.apache.cassandra.io.sstable.format.SSTableReader; -import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.ActiveRepairService; -import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.concurrent.Refs; -import org.apache.cassandra.UpdateBuilder; import org.apache.cassandra.utils.concurrent.Transactional; +import static org.apache.cassandra.Util.assertOnDiskState; import static org.apache.cassandra.service.ActiveRepairService.NO_PENDING_REPAIR; import static org.apache.cassandra.service.ActiveRepairService.UNREPAIRED_SSTABLE; -import static org.apache.cassandra.Util.assertOnDiskState; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/db/compaction/CancelCompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CancelCompactionsTest.java index 3c792442e4..f707a16763 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CancelCompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CancelCompactionsTest.java @@ -33,6 +33,7 @@ import java.util.stream.Collectors; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Assume; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionAccordIteratorsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionAccordIteratorsTest.java index e483ff49ca..04cd92fc89 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionAccordIteratorsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionAccordIteratorsTest.java @@ -30,6 +30,7 @@ import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -59,6 +60,7 @@ import accord.primitives.Status; import accord.primitives.Txn; import accord.primitives.Txn.Kind; import accord.primitives.TxnId; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.cql3.QueryProcessor; @@ -97,8 +99,8 @@ import static accord.primitives.Timestamp.Flag.SHARD_BOUND; import static org.apache.cassandra.Util.spinAssertEquals; import static org.apache.cassandra.cql3.statements.schema.CreateTableStatement.parse; import static org.apache.cassandra.schema.SchemaConstants.ACCORD_KEYSPACE_NAME; -import static org.apache.cassandra.service.accord.AccordKeyspace.COMMANDS_FOR_KEY; import static org.apache.cassandra.service.accord.AccordKeyspace.CFKAccessor; +import static org.apache.cassandra.service.accord.AccordKeyspace.COMMANDS_FOR_KEY; import static org.apache.cassandra.service.accord.AccordService.getBlocking; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionControllerTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionControllerTest.java index f46150cffc..a259611c90 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionControllerTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionControllerTest.java @@ -29,6 +29,10 @@ import java.util.function.LongPredicate; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; + +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMRules; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,7 +41,6 @@ import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.Util; import org.apache.cassandra.config.CassandraRelevantProperties; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Keyspace; @@ -48,16 +51,14 @@ import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMRules; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; @RunWith(BMUnitRunner.class) public class CompactionControllerTest extends SchemaLoader diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java index 813d12e196..9743310f0e 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java @@ -21,12 +21,13 @@ package org.apache.cassandra.db.compaction; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.concurrent.ExecutorFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.apache.cassandra.concurrent.ExecutorFactory; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionInfoTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionInfoTest.java index 753a18505d..c4ae274809 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionInfoTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionInfoTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.db.compaction; import java.util.ArrayList; import java.util.UUID; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.db.ColumnFamilyStore; @@ -28,7 +29,6 @@ import org.apache.cassandra.db.repair.AbstractPendingAntiCompactionTest; import org.apache.cassandra.schema.MockSchema; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.utils.TimeUUID; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionIteratorTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionIteratorTest.java index 5d09a91bfe..ac6c529fc5 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionIteratorTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionIteratorTest.java @@ -36,6 +36,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; + import org.junit.BeforeClass; import org.junit.Test; @@ -65,15 +66,14 @@ import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import static org.apache.cassandra.config.CassandraRelevantProperties.DIAGNOSTIC_SNAPSHOT_INTERVAL_NANOS; import static org.apache.cassandra.db.transform.DuplicateRowCheckerTest.assertCommandIssued; import static org.apache.cassandra.db.transform.DuplicateRowCheckerTest.makeRow; import static org.apache.cassandra.db.transform.DuplicateRowCheckerTest.partition; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class CompactionIteratorTest extends CQLTester { diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerPendingRepairTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerPendingRepairTest.java index c8eca664bd..911f11511a 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerPendingRepairTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerPendingRepairTest.java @@ -24,18 +24,17 @@ import java.util.List; import com.google.common.collect.Iterables; -import org.apache.cassandra.Util; -import org.apache.cassandra.repair.consistent.LocalSession; - import org.junit.Assert; import org.junit.Test; +import org.apache.cassandra.Util; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.notifications.SSTableAddedNotification; import org.apache.cassandra.notifications.SSTableDeletingNotification; import org.apache.cassandra.notifications.SSTableListChangedNotification; import org.apache.cassandra.notifications.SSTableRepairStatusChanged; import org.apache.cassandra.repair.NoSuchRepairSessionException; +import org.apache.cassandra.repair.consistent.LocalSession; import org.apache.cassandra.repair.consistent.LocalSessionAccessor; import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerTest.java index 20420aeef3..7907b1dd30 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerTest.java @@ -34,6 +34,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.io.Files; + import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsBytemanTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsBytemanTest.java index e49847b443..d5d94be92b 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsBytemanTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsBytemanTest.java @@ -24,6 +24,9 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.stream.Collectors; +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMRules; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,9 +39,6 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Throwables; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMRules; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java index 756b51dd08..57113b4feb 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java @@ -17,13 +17,35 @@ */ package org.apache.cassandra.db.compaction; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.file.FileStore; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; + import com.google.common.collect.Iterables; + +import org.apache.commons.lang3.StringUtils; +import org.assertj.core.api.Assertions; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import org.apache.cassandra.Util; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.UntypedResultSet; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.Directories; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.compaction.writers.CompactionAwareWriter; import org.apache.cassandra.db.compaction.writers.MaxSSTableSizeWriter; @@ -42,20 +64,13 @@ import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.PathUtils; import org.apache.cassandra.schema.CompactionParams; import org.apache.cassandra.serializers.MarshalException; -import org.apache.commons.lang3.StringUtils; -import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.file.FileStore; -import java.util.*; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class CompactionsCQLTest extends CQLTester { diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java index 9916bffa74..315e268abe 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.concurrent.ExecutionException; import com.google.common.collect.Iterables; + import org.junit.BeforeClass; import org.junit.Test; @@ -30,10 +31,14 @@ import org.apache.cassandra.Util; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.Mutation; +import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.db.partitions.ImmutableBTreePartition; -import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.schema.CachingParams; @@ -41,8 +46,10 @@ import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import static org.junit.Assert.*; import static org.apache.cassandra.Util.dk; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class CompactionsPurgeTest { diff --git a/test/unit/org/apache/cassandra/db/compaction/CorruptedSSTablesCompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CorruptedSSTablesCompactionsTest.java index 1705256c76..0ab6b873b0 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CorruptedSSTablesCompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CorruptedSSTablesCompactionsTest.java @@ -31,6 +31,7 @@ import java.util.Random; import java.util.Set; import com.google.common.collect.ImmutableMap; + import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java index e000b9a94d..954bc312c1 100644 --- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java @@ -35,6 +35,8 @@ import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + +import org.awaitility.Awaitility; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -72,7 +74,6 @@ import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.TimeUUID; -import org.awaitility.Awaitility; import static java.util.Collections.singleton; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledGenerationsTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledGenerationsTest.java index fb9c75c6e0..5f74529d67 100644 --- a/test/unit/org/apache/cassandra/db/compaction/LeveledGenerationsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledGenerationsTest.java @@ -24,6 +24,7 @@ import java.util.List; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; + import org.junit.BeforeClass; import org.junit.Test; @@ -37,8 +38,8 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.schema.MockSchema; import org.apache.cassandra.utils.ByteBufferUtil; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; public class LeveledGenerationsTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/db/compaction/PendingRepairManagerTest.java b/test/unit/org/apache/cassandra/db/compaction/PendingRepairManagerTest.java index 8c5535c1eb..8f7306a0b8 100644 --- a/test/unit/org/apache/cassandra/db/compaction/PendingRepairManagerTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/PendingRepairManagerTest.java @@ -23,6 +23,7 @@ import java.util.Collections; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/compaction/ShardManagerTest.java b/test/unit/org/apache/cassandra/db/compaction/ShardManagerTest.java index 7917b48f61..6e0070aefd 100644 --- a/test/unit/org/apache/cassandra/db/compaction/ShardManagerTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/ShardManagerTest.java @@ -27,12 +27,13 @@ import java.util.Set; import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; -import org.apache.cassandra.dht.*; + +import org.agrona.collections.IntArrayList; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.mockito.Mockito; -import org.agrona.collections.IntArrayList; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.BufferDecoratedKey; @@ -40,9 +41,14 @@ import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.DiskBoundaries; import org.apache.cassandra.db.PartitionPosition; +import org.apache.cassandra.dht.Bounds; +import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.dht.Murmur3Partitioner; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Splitter; +import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.utils.Pair; -import org.mockito.Mockito; import static org.apache.cassandra.db.ColumnFamilyStore.RING_VERSION_IRRELEVANT; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/db/compaction/SingleSSTableLCSTaskTest.java b/test/unit/org/apache/cassandra/db/compaction/SingleSSTableLCSTaskTest.java index e14d48eae0..4473721c89 100644 --- a/test/unit/org/apache/cassandra/db/compaction/SingleSSTableLCSTaskTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/SingleSSTableLCSTaskTest.java @@ -23,6 +23,7 @@ import java.nio.channels.FileChannel; import java.util.Random; import com.google.common.collect.Iterables; + import org.apache.commons.lang3.StringUtils; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java index 97bd03851b..1930ee013b 100644 --- a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java @@ -24,6 +24,7 @@ import java.util.Set; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; + import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java index 5387732a71..a2996045c8 100644 --- a/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; + import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/compaction/UnifiedCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/UnifiedCompactionStrategyTest.java index d03cfe85fa..dde7f4b7f1 100644 --- a/test/unit/org/apache/cassandra/db/compaction/UnifiedCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/UnifiedCompactionStrategyTest.java @@ -32,13 +32,18 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.google.common.collect.Iterables; +import com.google.monitoring.runtime.instrumentation.common.collect.ImmutableList; + import org.apache.commons.math3.random.JDKRandomGenerator; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Answers; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; -import com.google.monitoring.runtime.instrumentation.common.collect.ImmutableList; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.BufferDecoratedKey; @@ -68,10 +73,6 @@ import org.apache.cassandra.utils.Overlaps; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.concurrent.Transactional; -import org.mockito.Answers; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; import static org.apache.cassandra.io.sstable.format.SSTableReader.UNIQUE_IDENTIFIER_FACTORY; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/db/compaction/ValidationExecutorTest.java b/test/unit/org/apache/cassandra/db/compaction/ValidationExecutorTest.java index a5f20721ef..d674a10a2a 100644 --- a/test/unit/org/apache/cassandra/db/compaction/ValidationExecutorTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/ValidationExecutorTest.java @@ -33,7 +33,6 @@ import org.junit.Test; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; - import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/db/compaction/unified/BackgroundCompactionTrackingTest.java b/test/unit/org/apache/cassandra/db/compaction/unified/BackgroundCompactionTrackingTest.java index 33e615ce75..164260925f 100644 --- a/test/unit/org/apache/cassandra/db/compaction/unified/BackgroundCompactionTrackingTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/unified/BackgroundCompactionTrackingTest.java @@ -27,6 +27,9 @@ import java.util.Random; import java.util.Set; import java.util.stream.Collectors; +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMUnitConfig; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -39,9 +42,6 @@ import org.apache.cassandra.db.compaction.CompactionInfo; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.utils.TimeUUID; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMUnitConfig; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/db/compaction/unified/ControllerTest.java b/test/unit/org/apache/cassandra/db/compaction/unified/ControllerTest.java index eaa4d6f77a..127ec327c0 100644 --- a/test/unit/org/apache/cassandra/db/compaction/unified/ControllerTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/unified/ControllerTest.java @@ -25,10 +25,13 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; @@ -41,8 +44,6 @@ import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Overlaps; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import static java.lang.String.format; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; diff --git a/test/unit/org/apache/cassandra/db/compaction/unified/ParallelizedTasksTest.java b/test/unit/org/apache/cassandra/db/compaction/unified/ParallelizedTasksTest.java index 7e20e2d5a6..89273984c3 100644 --- a/test/unit/org/apache/cassandra/db/compaction/unified/ParallelizedTasksTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/unified/ParallelizedTasksTest.java @@ -27,6 +27,7 @@ import java.util.stream.Collectors; import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.db.ColumnFamilyStore; @@ -43,7 +44,6 @@ import org.apache.cassandra.db.lifecycle.PartialLifecycleTransaction; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.concurrent.Transactional; -import org.mockito.Mockito; import static org.apache.cassandra.db.ColumnFamilyStore.RING_VERSION_IRRELEVANT; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/db/compaction/unified/ShardedMultiWriterTest.java b/test/unit/org/apache/cassandra/db/compaction/unified/ShardedMultiWriterTest.java index 4ede151ef4..38df7b6481 100644 --- a/test/unit/org/apache/cassandra/db/compaction/unified/ShardedMultiWriterTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/unified/ShardedMultiWriterTest.java @@ -23,6 +23,7 @@ import java.util.Random; import org.junit.BeforeClass; import org.junit.Test; + import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/test/unit/org/apache/cassandra/db/compaction/writers/CompactionAwareWriterTest.java b/test/unit/org/apache/cassandra/db/compaction/writers/CompactionAwareWriterTest.java index dc8c78c54e..f3d83bec87 100644 --- a/test/unit/org/apache/cassandra/db/compaction/writers/CompactionAwareWriterTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/writers/CompactionAwareWriterTest.java @@ -31,6 +31,7 @@ import java.util.Random; import java.util.Set; import com.google.common.primitives.Longs; + import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/db/composites/CTypeTest.java b/test/unit/org/apache/cassandra/db/composites/CTypeTest.java index fc06d4321f..74d7132940 100644 --- a/test/unit/org/apache/cassandra/db/composites/CTypeTest.java +++ b/test/unit/org/apache/cassandra/db/composites/CTypeTest.java @@ -17,11 +17,17 @@ */ package org.apache.cassandra.db.composites; -import org.apache.cassandra.db.marshal.*; -import org.apache.cassandra.utils.ByteBufferUtil; +import java.nio.ByteBuffer; + import org.junit.Test; -import java.nio.ByteBuffer; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.ByteBufferAccessor; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.CompositeType; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.UUIDType; +import org.apache.cassandra.utils.ByteBufferUtil; public class CTypeTest { diff --git a/test/unit/org/apache/cassandra/db/compression/CompressionDictionaryCacheTest.java b/test/unit/org/apache/cassandra/db/compression/CompressionDictionaryCacheTest.java index bd76e5137d..99ef5592ec 100644 --- a/test/unit/org/apache/cassandra/db/compression/CompressionDictionaryCacheTest.java +++ b/test/unit/org/apache/cassandra/db/compression/CompressionDictionaryCacheTest.java @@ -25,12 +25,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import com.github.luben.zstd.ZstdDictTrainer; + import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.github.luben.zstd.ZstdDictTrainer; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.utils.concurrent.Ref; diff --git a/test/unit/org/apache/cassandra/db/compression/CompressionDictionaryDataObjectTest.java b/test/unit/org/apache/cassandra/db/compression/CompressionDictionaryDataObjectTest.java index 99ac4c916b..47be2334fd 100644 --- a/test/unit/org/apache/cassandra/db/compression/CompressionDictionaryDataObjectTest.java +++ b/test/unit/org/apache/cassandra/db/compression/CompressionDictionaryDataObjectTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.compression; import java.util.function.Consumer; + import javax.management.openmbean.CompositeData; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/compression/CompressionDictionaryIntegrationTest.java b/test/unit/org/apache/cassandra/db/compression/CompressionDictionaryIntegrationTest.java index 0d5a997464..9227580838 100644 --- a/test/unit/org/apache/cassandra/db/compression/CompressionDictionaryIntegrationTest.java +++ b/test/unit/org/apache/cassandra/db/compression/CompressionDictionaryIntegrationTest.java @@ -25,8 +25,8 @@ import org.junit.Before; import org.junit.Test; import org.apache.cassandra.config.Config; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.DataStorageSpec; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; diff --git a/test/unit/org/apache/cassandra/db/compression/ZstdCompressionDictionaryTest.java b/test/unit/org/apache/cassandra/db/compression/ZstdCompressionDictionaryTest.java index 8c04a7d03f..b649a9ff9c 100644 --- a/test/unit/org/apache/cassandra/db/compression/ZstdCompressionDictionaryTest.java +++ b/test/unit/org/apache/cassandra/db/compression/ZstdCompressionDictionaryTest.java @@ -29,12 +29,13 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import com.github.luben.zstd.ZstdDictCompress; +import com.github.luben.zstd.ZstdDictDecompress; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.github.luben.zstd.ZstdDictCompress; -import com.github.luben.zstd.ZstdDictDecompress; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.compression.CompressionDictionary.DictId; import org.apache.cassandra.db.compression.CompressionDictionary.Kind; diff --git a/test/unit/org/apache/cassandra/db/compression/ZstdDictionaryTrainerTest.java b/test/unit/org/apache/cassandra/db/compression/ZstdDictionaryTrainerTest.java index d3ddf257dd..504bb6368b 100644 --- a/test/unit/org/apache/cassandra/db/compression/ZstdDictionaryTrainerTest.java +++ b/test/unit/org/apache/cassandra/db/compression/ZstdDictionaryTrainerTest.java @@ -25,8 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -import org.apache.cassandra.utils.concurrent.Future; - import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -36,6 +34,7 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.compression.ICompressionDictionaryTrainer.TrainingStatus; import org.apache.cassandra.schema.CompressionParams; import org.apache.cassandra.utils.Clock; +import org.apache.cassandra.utils.concurrent.Future; import static org.apache.cassandra.db.compression.CompressionDictionary.Kind; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java index d0070dd3ab..a436ca0814 100644 --- a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java +++ b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java @@ -38,14 +38,13 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.CounterId; import org.apache.cassandra.utils.FBUtilities; +import static org.apache.cassandra.db.context.CounterContext.ContextState; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import static org.apache.cassandra.db.context.CounterContext.ContextState; - public class CounterContextTest { private static final CounterContext cc = new CounterContext(); diff --git a/test/unit/org/apache/cassandra/db/filter/IndexHintsTest.java b/test/unit/org/apache/cassandra/db/filter/IndexHintsTest.java index d827774ee9..95d793acef 100644 --- a/test/unit/org/apache/cassandra/db/filter/IndexHintsTest.java +++ b/test/unit/org/apache/cassandra/db/filter/IndexHintsTest.java @@ -25,6 +25,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.assertj.core.api.Assertions; +import org.assertj.core.api.ThrowableAssert; import org.junit.BeforeClass; import org.junit.Test; @@ -49,8 +51,6 @@ import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.IndexMetadata; import org.apache.cassandra.utils.Pair; -import org.assertj.core.api.Assertions; -import org.assertj.core.api.ThrowableAssert; import static java.lang.String.format; import static org.apache.cassandra.cql3.restrictions.StatementRestrictions.REQUIRES_ALLOW_FILTERING_MESSAGE; diff --git a/test/unit/org/apache/cassandra/db/filter/RowFilterTest.java b/test/unit/org/apache/cassandra/db/filter/RowFilterTest.java index d73f796c90..8540d23f11 100644 --- a/test/unit/org/apache/cassandra/db/filter/RowFilterTest.java +++ b/test/unit/org/apache/cassandra/db/filter/RowFilterTest.java @@ -24,6 +24,7 @@ import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.collect.ImmutableList; + import org.junit.Test; import org.apache.cassandra.cql3.ColumnIdentifier; diff --git a/test/unit/org/apache/cassandra/db/guardrails/CassandraPasswordGeneratorTest.java b/test/unit/org/apache/cassandra/db/guardrails/CassandraPasswordGeneratorTest.java index 8ce8556297..dd988a97ac 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/CassandraPasswordGeneratorTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/CassandraPasswordGeneratorTest.java @@ -21,9 +21,8 @@ package org.apache.cassandra.db.guardrails; import java.util.Arrays; import java.util.List; -import org.junit.Test; - import org.assertj.core.api.Assertions; +import org.junit.Test; import org.passay.CharacterRule; import org.passay.EnglishCharacterData; import org.passay.LengthRule; diff --git a/test/unit/org/apache/cassandra/db/guardrails/CassandraPasswordValidatorTest.java b/test/unit/org/apache/cassandra/db/guardrails/CassandraPasswordValidatorTest.java index 3acad3c431..06d5fbf80b 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/CassandraPasswordValidatorTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/CassandraPasswordValidatorTest.java @@ -24,11 +24,11 @@ import java.util.Optional; import java.util.function.Supplier; import org.junit.Test; +import org.passay.IllegalSequenceRule; import org.apache.cassandra.db.guardrails.ValueValidator.ValidationViolation; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.util.File; -import org.passay.IllegalSequenceRule; import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionListSizeTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionListSizeTest.java index b118f954f3..d1e9258b45 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionListSizeTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionListSizeTest.java @@ -22,6 +22,7 @@ package org.apache.cassandra.db.guardrails; import java.nio.ByteBuffer; import com.google.common.collect.ImmutableList; + import org.junit.Test; import org.apache.cassandra.db.marshal.BytesType; diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionMapSizeTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionMapSizeTest.java index b4b99c1f1c..15a7ecbf96 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionMapSizeTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionMapSizeTest.java @@ -23,6 +23,7 @@ import java.nio.ByteBuffer; import java.util.Collections; import com.google.common.collect.ImmutableMap; + import org.junit.Test; import org.apache.cassandra.db.marshal.BytesType; diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionSetSizeTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionSetSizeTest.java index 2914e2ef6a..ea6c42da28 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionSetSizeTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionSetSizeTest.java @@ -22,6 +22,7 @@ package org.apache.cassandra.db.guardrails; import java.nio.ByteBuffer; import com.google.common.collect.ImmutableSet; + import org.junit.Test; import org.apache.cassandra.db.marshal.BytesType; diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionSizeTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionSizeTest.java index b15f85a125..04c0064a71 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionSizeTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionSizeTest.java @@ -25,6 +25,7 @@ import java.util.Collections; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; + import org.junit.After; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionTypeSpecificSizeTester.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionTypeSpecificSizeTester.java index 073e72d574..45abca8854 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionTypeSpecificSizeTester.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailCollectionTypeSpecificSizeTester.java @@ -23,7 +23,9 @@ import java.util.Arrays; import java.util.function.Function; import org.junit.After; + import org.apache.cassandra.config.DataStorageSpec; + import static org.apache.cassandra.config.DataStorageSpec.DataStorageUnit.BYTES; /** diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailColumnAsciiValueSizeTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailColumnAsciiValueSizeTest.java index c6d93f2ad4..484bd6436c 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailColumnAsciiValueSizeTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailColumnAsciiValueSizeTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.guardrails; import org.apache.cassandra.config.DataStorageSpec; + import static org.apache.cassandra.config.DataStorageSpec.DataStorageUnit.BYTES; /** diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailDiskUsageTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailDiskUsageTest.java index 86e4df07b8..02c5a8daa4 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailDiskUsageTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailDiskUsageTest.java @@ -27,10 +27,14 @@ import java.util.function.Consumer; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; + +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mockito; import org.apache.cassandra.config.DataStorageSpec; import org.apache.cassandra.db.ConsistencyLevel; @@ -46,9 +50,6 @@ import org.apache.cassandra.service.disk.usage.DiskUsageBroadcaster; import org.apache.cassandra.service.disk.usage.DiskUsageMonitor; import org.apache.cassandra.service.disk.usage.DiskUsageState; import org.apache.cassandra.utils.FBUtilities; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; -import org.mockito.Mockito; import static org.apache.cassandra.service.disk.usage.DiskUsageState.FULL; import static org.apache.cassandra.service.disk.usage.DiskUsageState.NOT_AVAILABLE; diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailKeyspacePropertiesTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailKeyspacePropertiesTest.java index 479dbd5121..749ff94dec 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailKeyspacePropertiesTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailKeyspacePropertiesTest.java @@ -18,8 +18,6 @@ package org.apache.cassandra.db.guardrails; -import static java.lang.String.format; - import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -27,15 +25,18 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; + +import org.junit.Before; +import org.junit.Test; + import org.apache.cassandra.config.GuardrailsOptions; import org.apache.cassandra.cql3.statements.schema.KeyspaceAttributes; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.LocalizeString; -import org.junit.Before; -import org.junit.Test; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; +import static java.lang.String.format; /** * Tests the guardrail for keyspace properties, {@link Guardrails#keyspaceProperties}. diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailMaximumReplicationFactorTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailMaximumReplicationFactorTest.java index d35673a847..096b9bb8ee 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailMaximumReplicationFactorTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailMaximumReplicationFactorTest.java @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Test; @@ -31,7 +32,6 @@ import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.service.ClientWarn; -import org.assertj.core.api.Assertions; import static java.lang.String.format; diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailMinimumReplicationFactorTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailMinimumReplicationFactorTest.java index 9b376e2f0e..83d82f4b24 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailMinimumReplicationFactorTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailMinimumReplicationFactorTest.java @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -34,7 +35,6 @@ import org.apache.cassandra.service.ClientWarn; import org.apache.cassandra.tcm.membership.Location; import org.apache.cassandra.tcm.membership.NodeAddresses; import org.apache.cassandra.tcm.transformations.Register; -import org.assertj.core.api.Assertions; import static java.lang.String.format; import static org.junit.Assert.assertNotNull; diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailPasswordPolicyTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailPasswordPolicyTest.java index 6672423da3..72b7970573 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailPasswordPolicyTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailPasswordPolicyTest.java @@ -23,10 +23,10 @@ import java.util.Map; import java.util.Optional; import org.junit.Test; +import org.mindrot.jbcrypt.BCrypt; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.transport.messages.ResultMessage; -import org.mindrot.jbcrypt.BCrypt; import static java.lang.String.format; import static java.util.Collections.singletonList; diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailSaiVectorTermSizeTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailSaiVectorTermSizeTest.java index 6269f4d98c..24505a42b5 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailSaiVectorTermSizeTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailSaiVectorTermSizeTest.java @@ -22,6 +22,7 @@ import java.nio.ByteBuffer; import java.util.List; import com.google.common.primitives.Floats; + import org.junit.Test; import org.apache.cassandra.config.DataStorageSpec; diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailSecondaryIndexesPerTableTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailSecondaryIndexesPerTableTest.java index 628aead4eb..65ea35ed44 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailSecondaryIndexesPerTableTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailSecondaryIndexesPerTableTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.guardrails; import com.google.common.base.Strings; + import org.junit.Test; import static java.lang.String.format; diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailTablePropertiesTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailTablePropertiesTest.java index cdd34f8c1d..f70a4244b8 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailTablePropertiesTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailTablePropertiesTest.java @@ -27,8 +27,10 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import com.google.common.collect.ImmutableSet; + import org.junit.Before; import org.junit.Test; + import org.apache.cassandra.config.GuardrailsOptions; import org.apache.cassandra.cql3.statements.schema.TableAttributes; diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailTester.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailTester.java index 4d88d7d761..b9fe9d6ea0 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailTester.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailTester.java @@ -33,9 +33,12 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; + import javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; + +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -60,7 +63,6 @@ import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.transport.messages.ResultMessage; -import org.assertj.core.api.Assertions; import static java.lang.String.format; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/db/guardrails/GuardrailsConfigProviderTest.java b/test/unit/org/apache/cassandra/db/guardrails/GuardrailsConfigProviderTest.java index 36fbc7cd08..79f6d51be0 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/GuardrailsConfigProviderTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/GuardrailsConfigProviderTest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.db.guardrails; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.config.Config; @@ -25,7 +26,6 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.GuardrailsOptions; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.service.ClientState; -import org.assertj.core.api.Assertions; import static java.lang.String.format; diff --git a/test/unit/org/apache/cassandra/db/guardrails/InvalidRoleNameGenerator.java b/test/unit/org/apache/cassandra/db/guardrails/InvalidRoleNameGenerator.java index 155dc269e8..1225a0197a 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/InvalidRoleNameGenerator.java +++ b/test/unit/org/apache/cassandra/db/guardrails/InvalidRoleNameGenerator.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.guardrails; import java.util.Map; + import javax.annotation.Nonnull; import org.apache.cassandra.exceptions.ConfigurationException; diff --git a/test/unit/org/apache/cassandra/db/guardrails/TestRoleNameValidator.java b/test/unit/org/apache/cassandra/db/guardrails/TestRoleNameValidator.java index f3f3f532f1..62eb74a85f 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/TestRoleNameValidator.java +++ b/test/unit/org/apache/cassandra/db/guardrails/TestRoleNameValidator.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.guardrails; import java.util.Optional; + import javax.annotation.Nonnull; import org.apache.commons.lang3.StringUtils; diff --git a/test/unit/org/apache/cassandra/db/guardrails/ThresholdTester.java b/test/unit/org/apache/cassandra/db/guardrails/ThresholdTester.java index 7f79078733..a300071f8d 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/ThresholdTester.java +++ b/test/unit/org/apache/cassandra/db/guardrails/ThresholdTester.java @@ -25,11 +25,10 @@ import java.util.function.Function; import java.util.function.ToIntFunction; import java.util.function.ToLongFunction; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; -import org.assertj.core.api.Assertions; - import static java.lang.String.format; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/test/unit/org/apache/cassandra/db/guardrails/ValueGeneratorTest.java b/test/unit/org/apache/cassandra/db/guardrails/ValueGeneratorTest.java index 78a3fdea5e..9afb60b966 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/ValueGeneratorTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/ValueGeneratorTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.guardrails; import java.util.Arrays; import java.util.Map; + import javax.annotation.Nonnull; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/guardrails/ValueValidatorTest.java b/test/unit/org/apache/cassandra/db/guardrails/ValueValidatorTest.java index 3813e504ed..7bc717e4bc 100644 --- a/test/unit/org/apache/cassandra/db/guardrails/ValueValidatorTest.java +++ b/test/unit/org/apache/cassandra/db/guardrails/ValueValidatorTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.guardrails; import java.util.Optional; + import javax.annotation.Nonnull; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java b/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java index 53efbc6f24..3c4629c88b 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java @@ -27,11 +27,10 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.Assert; - import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.commitlog.CommitLog; diff --git a/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java b/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java index 53459a4af6..8a7905dffc 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java index 7c76331500..79ac2bde96 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java @@ -37,7 +37,7 @@ import java.util.stream.Stream; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import org.apache.cassandra.db.streaming.ComponentContext; + import org.junit.Test; import org.apache.cassandra.Util; @@ -47,6 +47,7 @@ import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.compaction.OperationType; +import org.apache.cassandra.db.streaming.ComponentContext; import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.Component; @@ -77,9 +78,9 @@ import org.apache.cassandra.utils.concurrent.Transactional; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java b/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java index b29dadc60f..6031e4e611 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java @@ -25,12 +25,11 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import org.junit.Assert; -import org.apache.cassandra.ServerTestUtils; -import org.apache.cassandra.io.util.File; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.SerializationHeader; @@ -43,6 +42,7 @@ import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.SSTableRewriter; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableMetadataRef; diff --git a/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java b/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java index bac8109fdf..90aa9f7ba8 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java @@ -29,6 +29,7 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java b/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java index 6e5b049417..6bd3896fb9 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java @@ -28,6 +28,7 @@ import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/marshal/AbstractCompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/AbstractCompositeTypeTest.java index dc78bb9f29..ead691c745 100644 --- a/test/unit/org/apache/cassandra/db/marshal/AbstractCompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/AbstractCompositeTypeTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.db.marshal; import org.junit.Test; + import static org.junit.Assert.assertEquals; public class AbstractCompositeTypeTest diff --git a/test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java index 482b222ccb..6a573def7d 100644 --- a/test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java @@ -55,27 +55,37 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; import com.google.common.collect.Streams; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.minidev.json.JSONArray; import net.minidev.json.JSONObject; import net.minidev.json.parser.JSONParser; import net.minidev.json.parser.ParseException; import net.openhft.chronicle.core.util.ThrowingFunction; + +import org.assertj.core.api.Assertions; +import org.assertj.core.api.SoftAssertions; +import org.assertj.core.description.Description; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; +import org.quicktheories.core.Gen; +import org.quicktheories.generators.SourceDSL; +import org.reflections.Reflections; +import org.reflections.scanners.Scanners; +import org.reflections.util.ConfigurationBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.AssignmentTestable; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.ColumnSpecification; -import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.Json; import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.VariableSpecifications; +import org.apache.cassandra.cql3.terms.Constants; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.rows.BTreeRow; @@ -112,14 +122,6 @@ import org.apache.cassandra.utils.asserts.SoftAssertionsWithLimit; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; import org.apache.cassandra.utils.bytecomparable.ByteSourceInverse; -import org.assertj.core.api.Assertions; -import org.assertj.core.api.SoftAssertions; -import org.assertj.core.description.Description; -import org.quicktheories.core.Gen; -import org.quicktheories.generators.SourceDSL; -import org.reflections.Reflections; -import org.reflections.scanners.Scanners; -import org.reflections.util.ConfigurationBuilder; import static org.apache.cassandra.db.marshal.AbstractType.ComparisonType.CUSTOM; import static org.apache.cassandra.utils.AbstractTypeGenerators.TypeKind.COMPOSITE; diff --git a/test/unit/org/apache/cassandra/db/marshal/BytesTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/BytesTypeTest.java index 0e8a5fe924..b9aa8fef13 100644 --- a/test/unit/org/apache/cassandra/db/marshal/BytesTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/BytesTypeTest.java @@ -21,10 +21,11 @@ package org.apache.cassandra.db.marshal; import java.util.Arrays; +import org.junit.Test; + import org.apache.cassandra.cql3.FieldIdentifier; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.ByteBufferUtil; -import org.junit.Test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/db/marshal/CollectionTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/CollectionTypeTest.java index 92990e9597..ae1633fbe3 100644 --- a/test/unit/org/apache/cassandra/db/marshal/CollectionTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/CollectionTypeTest.java @@ -18,19 +18,29 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import org.junit.Test; + +import org.apache.cassandra.serializers.ListSerializer; +import org.apache.cassandra.serializers.MapSerializer; +import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.SetSerializer; +import org.apache.cassandra.serializers.TypeSerializer; +import org.apache.cassandra.utils.ByteBufferUtil; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.serializers.*; - public class CollectionTypeTest { @Test diff --git a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java index 994b026c7b..382ddd506c 100644 --- a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java @@ -20,34 +20,44 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import java.util.UUID; import com.google.common.collect.Lists; + +import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; - -import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; -import static org.junit.Assert.fail; -import static org.junit.Assert.assertEquals; -import static org.quicktheories.QuickTheory.qt; +import org.quicktheories.generators.SourceDSL; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.RowUpdateBuilder; +import org.apache.cassandra.db.partitions.ImmutableBTreePartition; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.Row; -import org.apache.cassandra.db.partitions.ImmutableBTreePartition; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.SyntaxException; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.UUIDSerializer; -import org.apache.cassandra.utils.*; -import org.assertj.core.api.Assertions; -import org.quicktheories.generators.SourceDSL; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.TimeUUID; + +import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import static org.quicktheories.QuickTheory.qt; public class CompositeTypeTest { diff --git a/test/unit/org/apache/cassandra/db/marshal/DecimalTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/DecimalTypeTest.java index b1f4a439c9..5bd4b36500 100644 --- a/test/unit/org/apache/cassandra/db/marshal/DecimalTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/DecimalTypeTest.java @@ -18,15 +18,17 @@ */ package org.apache.cassandra.db.marshal; -import static org.junit.Assert.*; - import java.math.BigDecimal; import java.nio.ByteBuffer; import java.util.Arrays; -import org.apache.cassandra.utils.ByteBufferUtil; import org.junit.Test; +import org.apache.cassandra.utils.ByteBufferUtil; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class DecimalTypeTest { private static final String LOW = "12.34"; diff --git a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java index c7952e6d84..85c48c8c72 100644 --- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java @@ -26,24 +26,29 @@ import java.util.Map; import java.util.UUID; import com.google.common.collect.ImmutableMap; + +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; -import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; -import static org.junit.Assert.fail; - import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.RowUpdateBuilder; +import org.apache.cassandra.db.partitions.ImmutableBTreePartition; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.Row; -import org.apache.cassandra.db.partitions.ImmutableBTreePartition; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.serializers.MarshalException; -import org.apache.cassandra.utils.*; -import org.assertj.core.api.Assertions; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.UUIDGen; + +import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; +import static org.junit.Assert.fail; public class DynamicCompositeTypeTest { diff --git a/test/unit/org/apache/cassandra/db/marshal/EmptyTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/EmptyTypeTest.java index 6a2b44ebc1..b0819a2abf 100644 --- a/test/unit/org/apache/cassandra/db/marshal/EmptyTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/EmptyTypeTest.java @@ -21,12 +21,12 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.ByteBufferUtil; -import org.mockito.Mockito; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/test/unit/org/apache/cassandra/db/marshal/IntegerTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/IntegerTypeTest.java index 0eafc4ad80..4ba5f57e74 100644 --- a/test/unit/org/apache/cassandra/db/marshal/IntegerTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/IntegerTypeTest.java @@ -18,10 +18,6 @@ */ package org.apache.cassandra.db.marshal; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.math.BigInteger; import java.nio.ByteBuffer; import java.util.Arrays; @@ -30,6 +26,10 @@ import java.util.Random; import org.junit.ComparisonFailure; import org.junit.Test; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class IntegerTypeTest { private static void assertSignum(String message, int expected, double value) diff --git a/test/unit/org/apache/cassandra/db/marshal/JsonConversionTest.java b/test/unit/org/apache/cassandra/db/marshal/JsonConversionTest.java index e89a722840..0f59275ca0 100644 --- a/test/unit/org/apache/cassandra/db/marshal/JsonConversionTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/JsonConversionTest.java @@ -18,16 +18,16 @@ */ package org.apache.cassandra.db.marshal; -import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; -import static org.junit.Assert.assertEquals; - import java.nio.ByteBuffer; +import org.junit.Test; + import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.JsonUtils; -import org.junit.Test; +import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; +import static org.junit.Assert.assertEquals; public class JsonConversionTest { diff --git a/test/unit/org/apache/cassandra/db/marshal/NativeAccessorTest.java b/test/unit/org/apache/cassandra/db/marshal/NativeAccessorTest.java index f53d536154..5eec118fa6 100644 --- a/test/unit/org/apache/cassandra/db/marshal/NativeAccessorTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/NativeAccessorTest.java @@ -28,6 +28,7 @@ import java.util.function.BiFunction; import java.util.function.Function; import com.google.common.primitives.UnsignedBytes; + import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/db/marshal/PartitionerDefinedOrderTest.java b/test/unit/org/apache/cassandra/db/marshal/PartitionerDefinedOrderTest.java index efd6ba5b6c..cba095262f 100644 --- a/test/unit/org/apache/cassandra/db/marshal/PartitionerDefinedOrderTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/PartitionerDefinedOrderTest.java @@ -18,10 +18,11 @@ package org.apache.cassandra.db.marshal; -import org.apache.cassandra.transport.ProtocolVersion; import org.assertj.core.api.Assertions; import org.junit.Test; +import org.apache.cassandra.transport.ProtocolVersion; + import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/db/marshal/ReversedTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/ReversedTypeTest.java index 7dfbc2746b..6f86cd6c15 100644 --- a/test/unit/org/apache/cassandra/db/marshal/ReversedTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/ReversedTypeTest.java @@ -20,8 +20,8 @@ package org.apache.cassandra.db.marshal; import org.junit.Test; -import static org.apache.cassandra.utils.ByteBufferUtil.bytes; import static org.apache.cassandra.utils.ByteBufferUtil.EMPTY_BYTE_BUFFER; +import static org.apache.cassandra.utils.ByteBufferUtil.bytes; public class ReversedTypeTest { diff --git a/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java b/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java index 9a4711ac3b..f3dba9664e 100644 --- a/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java @@ -20,17 +20,24 @@ package org.apache.cassandra.db.marshal; * */ -import org.apache.cassandra.serializers.*; -import org.apache.cassandra.utils.Hex; -import org.apache.cassandra.utils.TimeUUID; -import org.apache.cassandra.utils.UUIDGen; -import org.junit.Test; - import java.math.BigInteger; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.UUID; +import org.junit.Test; + +import org.apache.cassandra.serializers.AsciiSerializer; +import org.apache.cassandra.serializers.BytesSerializer; +import org.apache.cassandra.serializers.Int32Serializer; +import org.apache.cassandra.serializers.IntegerSerializer; +import org.apache.cassandra.serializers.LongSerializer; +import org.apache.cassandra.serializers.UTF8Serializer; +import org.apache.cassandra.serializers.UUIDSerializer; +import org.apache.cassandra.utils.Hex; +import org.apache.cassandra.utils.TimeUUID; +import org.apache.cassandra.utils.UUIDGen; + import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; public class RoundTripTest diff --git a/test/unit/org/apache/cassandra/db/marshal/SimpleDateTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/SimpleDateTypeTest.java index f45c55f50e..f4726c28ac 100644 --- a/test/unit/org/apache/cassandra/db/marshal/SimpleDateTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/SimpleDateTypeTest.java @@ -22,6 +22,7 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import org.junit.Test; + import org.apache.cassandra.serializers.SimpleDateSerializer; public class SimpleDateTypeTest diff --git a/test/unit/org/apache/cassandra/db/marshal/TimeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/TimeTypeTest.java index 26a2b15c75..4ff7a40d4d 100644 --- a/test/unit/org/apache/cassandra/db/marshal/TimeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/TimeTypeTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; -import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.serializers.TimeSerializer; public class TimeTypeTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java index 8e2dc318b5..a55ff975eb 100644 --- a/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java @@ -22,16 +22,16 @@ import java.nio.ByteBuffer; import java.util.UUID; import org.junit.Assert; -import org.apache.cassandra.serializers.MarshalException; import org.junit.Test; -import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; -import static org.junit.Assert.assertEquals; - +import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.UUIDSerializer; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.UUIDGen; +import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; +import static org.junit.Assert.assertEquals; + public class TimeUUIDTypeTest { TimeUUIDType timeUUIDType = new TimeUUIDType(); diff --git a/test/unit/org/apache/cassandra/db/marshal/TimestampTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/TimestampTypeTest.java index 3ec63c04c8..61cbd09272 100644 --- a/test/unit/org/apache/cassandra/db/marshal/TimestampTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/TimestampTypeTest.java @@ -20,10 +20,10 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import java.util.Date; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.utils.AbstractTypeGenerators.TypeSupport; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.utils.AbstractTypeGenerators.getTypeSupport; import static org.quicktheories.QuickTheory.qt; diff --git a/test/unit/org/apache/cassandra/db/marshal/TypeCompareTest.java b/test/unit/org/apache/cassandra/db/marshal/TypeCompareTest.java index 04b030e13a..bbbcf923ff 100644 --- a/test/unit/org/apache/cassandra/db/marshal/TypeCompareTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/TypeCompareTest.java @@ -26,10 +26,10 @@ import java.util.Arrays; import java.util.Random; import java.util.UUID; -import org.apache.cassandra.utils.ByteBufferUtil; - import org.junit.Test; +import org.apache.cassandra.utils.ByteBufferUtil; + public class TypeCompareTest { @Test diff --git a/test/unit/org/apache/cassandra/db/marshal/TypeParserTest.java b/test/unit/org/apache/cassandra/db/marshal/TypeParserTest.java index 0247681c1d..e9b2e3c764 100644 --- a/test/unit/org/apache/cassandra/db/marshal/TypeParserTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/TypeParserTest.java @@ -18,22 +18,27 @@ */ package org.apache.cassandra.db.marshal; +import java.util.function.Consumer; + import com.google.common.collect.Lists; + import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.dht.ByteOrderedPartitioner; +import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.dht.Murmur3Partitioner; +import org.apache.cassandra.dht.OrderPreservingPartitioner; +import org.apache.cassandra.dht.RandomPartitioner; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.exceptions.SyntaxException; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.dht.*; -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.exceptions.SyntaxException; - -import java.util.function.Consumer; - public class TypeParserTest { @BeforeClass diff --git a/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java b/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java index ef264dfa14..f7f082d279 100644 --- a/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java @@ -18,24 +18,24 @@ package org.apache.cassandra.db.marshal; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.util.UUID; + +import org.assertj.core.api.Assertions; +import org.junit.Test; +import org.mockito.Mockito; +import org.quicktheories.core.Gen; +import org.quicktheories.generators.SourceDSL; + import org.apache.cassandra.Util; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.AbstractTypeGenerators; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.UUIDGen; -import org.assertj.core.api.Assertions; -import org.mockito.Mockito; -import org.quicktheories.core.Gen; -import org.quicktheories.generators.SourceDSL; - -import org.junit.Test; - -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.nio.ByteBuffer; -import java.nio.CharBuffer; -import java.util.UUID; import static org.apache.cassandra.utils.AbstractTypeGenerators.getTypeSupport; import static org.apache.cassandra.utils.AbstractTypeGenerators.primitiveTypeGen; diff --git a/test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java index 87cbbe9331..7b1ccb4afb 100644 --- a/test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java @@ -21,22 +21,22 @@ package org.apache.cassandra.db.marshal; * */ -import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; -import static org.junit.Assert.assertEquals; - import java.nio.ByteBuffer; import java.util.Iterator; import java.util.Random; import java.util.UUID; -import org.junit.Test; - import org.junit.Assert; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.UUIDGen; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; +import static org.junit.Assert.assertEquals; public class UUIDTypeTest { diff --git a/test/unit/org/apache/cassandra/db/marshal/ValueAccessorTest.java b/test/unit/org/apache/cassandra/db/marshal/ValueAccessorTest.java index cb9d6ee322..1e8af9b260 100644 --- a/test/unit/org/apache/cassandra/db/marshal/ValueAccessorTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/ValueAccessorTest.java @@ -22,16 +22,16 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.Arrays; +import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.quicktheories.core.Gen; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.vint.VIntCoding; -import org.assertj.core.api.Assertions; -import org.quicktheories.core.Gen; import static org.apache.cassandra.utils.ByteArrayUtil.bytesToHex; import static org.apache.cassandra.utils.ByteBufferUtil.bytesToHex; diff --git a/test/unit/org/apache/cassandra/db/marshal/VectorTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/VectorTypeTest.java index 34540cf148..0938c27b35 100644 --- a/test/unit/org/apache/cassandra/db/marshal/VectorTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/VectorTypeTest.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; - import org.quicktheories.core.Gen; import org.quicktheories.generators.SourceDSL; diff --git a/test/unit/org/apache/cassandra/db/memtable/MemtableQuickTest.java b/test/unit/org/apache/cassandra/db/memtable/MemtableQuickTest.java index e07dd9afe6..b06ced531c 100644 --- a/test/unit/org/apache/cassandra/db/memtable/MemtableQuickTest.java +++ b/test/unit/org/apache/cassandra/db/memtable/MemtableQuickTest.java @@ -22,12 +22,12 @@ import java.util.Collection; import java.util.List; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java index efc992ee7f..03d2923039 100644 --- a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java +++ b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java @@ -22,11 +22,13 @@ import java.lang.reflect.Field; import java.util.List; import com.google.common.collect.ImmutableList; + +import org.github.jamm.MemoryMeter; +import org.github.jamm.MemoryMeter.Guess; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,8 +42,6 @@ import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; -import org.github.jamm.MemoryMeter; -import org.github.jamm.MemoryMeter.Guess; // Note: This test can be run in idea with the allocation type configured in the test yaml and memtable using the // value memtableClass is initialized with. diff --git a/test/unit/org/apache/cassandra/db/memtable/ShardedMemtableConfigTest.java b/test/unit/org/apache/cassandra/db/memtable/ShardedMemtableConfigTest.java index ef5079b35e..f0df525a89 100644 --- a/test/unit/org/apache/cassandra/db/memtable/ShardedMemtableConfigTest.java +++ b/test/unit/org/apache/cassandra/db/memtable/ShardedMemtableConfigTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.memtable; import java.io.IOException; + import javax.management.Attribute; import javax.management.AttributeNotFoundException; import javax.management.InstanceNotFoundException; diff --git a/test/unit/org/apache/cassandra/db/memtable/TrieMemtableFlushSetTestBase.java b/test/unit/org/apache/cassandra/db/memtable/TrieMemtableFlushSetTestBase.java index d5149ca855..30096f8438 100644 --- a/test/unit/org/apache/cassandra/db/memtable/TrieMemtableFlushSetTestBase.java +++ b/test/unit/org/apache/cassandra/db/memtable/TrieMemtableFlushSetTestBase.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/test/unit/org/apache/cassandra/db/partition/PartitionImplementationTest.java b/test/unit/org/apache/cassandra/db/partition/PartitionImplementationTest.java index 2b4ab06309..96acf45d22 100644 --- a/test/unit/org/apache/cassandra/db/partition/PartitionImplementationTest.java +++ b/test/unit/org/apache/cassandra/db/partition/PartitionImplementationTest.java @@ -17,10 +17,20 @@ */ package org.apache.cassandra.db.partition; -import static org.junit.Assert.*; - import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Deque; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.NavigableSet; +import java.util.Random; +import java.util.Set; +import java.util.TreeSet; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; @@ -36,21 +46,38 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.cql3.ColumnIdentifier; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.BufferClusteringBound; +import org.apache.cassandra.db.Clusterable; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.Slice; +import org.apache.cassandra.db.Slices; import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.partitions.AbstractBTreePartition; import org.apache.cassandra.db.partitions.ImmutableBTreePartition; import org.apache.cassandra.db.partitions.Partition; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.BTreeRow; +import org.apache.cassandra.db.rows.BufferCell; +import org.apache.cassandra.db.rows.Cell; +import org.apache.cassandra.db.rows.RangeTombstoneBoundMarker; +import org.apache.cassandra.db.rows.RangeTombstoneBoundaryMarker; +import org.apache.cassandra.db.rows.RangeTombstoneMarker; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.rows.Row.Deletion; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.ByteBufferUtil; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; + public class PartitionImplementationTest { private static final String KEYSPACE = "PartitionImplementationTest"; diff --git a/test/unit/org/apache/cassandra/db/partition/PartitionUpdateTest.java b/test/unit/org/apache/cassandra/db/partition/PartitionUpdateTest.java index 8c1c8ce7ba..ea952022e4 100644 --- a/test/unit/org/apache/cassandra/db/partition/PartitionUpdateTest.java +++ b/test/unit/org/apache/cassandra/db/partition/PartitionUpdateTest.java @@ -17,15 +17,15 @@ */ package org.apache.cassandra.db.partition; +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.UpdateBuilder; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.FBUtilities; -import org.junit.Test; - -import org.junit.Assert; public class PartitionUpdateTest extends CQLTester { diff --git a/test/unit/org/apache/cassandra/db/partitions/AtomicBTreePartitionMemtableAccountingTest.java b/test/unit/org/apache/cassandra/db/partitions/AtomicBTreePartitionMemtableAccountingTest.java index fa3c5d8c3b..e1dc8b8132 100644 --- a/test/unit/org/apache/cassandra/db/partitions/AtomicBTreePartitionMemtableAccountingTest.java +++ b/test/unit/org/apache/cassandra/db/partitions/AtomicBTreePartitionMemtableAccountingTest.java @@ -31,12 +31,10 @@ import org.junit.runners.Parameterized; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; - import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.DeletionTime; - import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.SetType; diff --git a/test/unit/org/apache/cassandra/db/partitions/PurgeFunctionTest.java b/test/unit/org/apache/cassandra/db/partitions/PurgeFunctionTest.java index 8853688b7e..8f0a21b021 100644 --- a/test/unit/org/apache/cassandra/db/partitions/PurgeFunctionTest.java +++ b/test/unit/org/apache/cassandra/db/partitions/PurgeFunctionTest.java @@ -22,25 +22,35 @@ import java.util.Iterator; import java.util.function.LongPredicate; import com.google.common.collect.Iterators; + import org.junit.Before; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.BufferClusteringBound; +import org.apache.cassandra.db.BufferClusteringBoundary; +import org.apache.cassandra.db.ClusteringPrefix; import org.apache.cassandra.db.ClusteringPrefix.Kind; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.UTF8Type; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.AbstractUnfilteredRowIterator; +import org.apache.cassandra.db.rows.EncodingStats; +import org.apache.cassandra.db.rows.RangeTombstoneBoundMarker; +import org.apache.cassandra.db.rows.RangeTombstoneBoundaryMarker; +import org.apache.cassandra.db.rows.Rows; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.transform.Transformation; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.FBUtilities; +import static org.apache.cassandra.utils.ByteBufferUtil.bytes; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.apache.cassandra.utils.ByteBufferUtil.bytes; - public final class PurgeFunctionTest { private static final String KEYSPACE = "PurgeFunctionTest"; diff --git a/test/unit/org/apache/cassandra/db/repair/AbstractPendingAntiCompactionTest.java b/test/unit/org/apache/cassandra/db/repair/AbstractPendingAntiCompactionTest.java index 2489e3e79d..6e83590499 100644 --- a/test/unit/org/apache/cassandra/db/repair/AbstractPendingAntiCompactionTest.java +++ b/test/unit/org/apache/cassandra/db/repair/AbstractPendingAntiCompactionTest.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Collections; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/db/repair/CompactionManagerGetSSTablesForValidationTest.java b/test/unit/org/apache/cassandra/db/repair/CompactionManagerGetSSTablesForValidationTest.java index 4c7932888b..75b034f33e 100644 --- a/test/unit/org/apache/cassandra/db/repair/CompactionManagerGetSSTablesForValidationTest.java +++ b/test/unit/org/apache/cassandra/db/repair/CompactionManagerGetSSTablesForValidationTest.java @@ -23,6 +23,7 @@ import java.util.Set; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -30,23 +31,23 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.repair.SharedContext; -import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; -import org.apache.cassandra.repair.state.ValidationState; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.schema.Schema; import org.apache.cassandra.cql3.QueryProcessor; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.repair.RepairJobDesc; +import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.repair.Validator; +import org.apache.cassandra.repair.state.ValidationState; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ActiveRepairService; +import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.TimeUUID; diff --git a/test/unit/org/apache/cassandra/db/repair/PendingAntiCompactionBytemanTest.java b/test/unit/org/apache/cassandra/db/repair/PendingAntiCompactionBytemanTest.java index 795c7fe82c..01bcb6725c 100644 --- a/test/unit/org/apache/cassandra/db/repair/PendingAntiCompactionBytemanTest.java +++ b/test/unit/org/apache/cassandra/db/repair/PendingAntiCompactionBytemanTest.java @@ -26,8 +26,13 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import com.google.common.collect.Lists; + +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMRules; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Test; import org.junit.runner.RunWith; + import org.apache.cassandra.db.compaction.CompactionInterruptedException; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.dht.Range; @@ -36,9 +41,6 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.locator.RangesAtEndpoint; import org.apache.cassandra.locator.Replica; import org.apache.cassandra.utils.TimeUUID; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMRules; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/db/repair/PendingAntiCompactionTest.java b/test/unit/org/apache/cassandra/db/repair/PendingAntiCompactionTest.java index 4afd42d411..f39eeaf1be 100644 --- a/test/unit/org/apache/cassandra/db/repair/PendingAntiCompactionTest.java +++ b/test/unit/org/apache/cassandra/db/repair/PendingAntiCompactionTest.java @@ -46,6 +46,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.Util; import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.concurrent.FutureTask; import org.apache.cassandra.concurrent.ImmediateExecutor; @@ -75,11 +76,10 @@ import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.streaming.PreviewKind; -import org.apache.cassandra.Util; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.concurrent.Future; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.WrappedRunnable; +import org.apache.cassandra.utils.concurrent.Future; import org.apache.cassandra.utils.concurrent.Transactional; import static java.util.Collections.emptyList; diff --git a/test/unit/org/apache/cassandra/db/rows/ColumnMetadataVersionComparatorTest.java b/test/unit/org/apache/cassandra/db/rows/ColumnMetadataVersionComparatorTest.java index d2988624a8..633aea8cb6 100644 --- a/test/unit/org/apache/cassandra/db/rows/ColumnMetadataVersionComparatorTest.java +++ b/test/unit/org/apache/cassandra/db/rows/ColumnMetadataVersionComparatorTest.java @@ -24,7 +24,19 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.CompositeType; +import org.apache.cassandra.db.marshal.EmptyType; +import org.apache.cassandra.db.marshal.InetAddressType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.ListType; +import org.apache.cassandra.db.marshal.MapType; +import org.apache.cassandra.db.marshal.SetType; +import org.apache.cassandra.db.marshal.TupleType; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.schema.ColumnMetadata; import static java.util.Arrays.asList; diff --git a/test/unit/org/apache/cassandra/db/rows/EncodingStatsTest.java b/test/unit/org/apache/cassandra/db/rows/EncodingStatsTest.java index 1ac092ab80..19f42e5db4 100644 --- a/test/unit/org/apache/cassandra/db/rows/EncodingStatsTest.java +++ b/test/unit/org/apache/cassandra/db/rows/EncodingStatsTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.db.rows; import java.util.function.Function; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java b/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java index ce80b88160..13ccf31502 100644 --- a/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java +++ b/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java @@ -29,23 +29,36 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.filter.ColumnFilter; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.cql3.ColumnIdentifier; -import org.apache.cassandra.db.partitions.PartitionUpdate; -import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.db.BufferClusteringBound; +import org.apache.cassandra.db.ClusteringBound; +import org.apache.cassandra.db.ClusteringBoundOrBoundary; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.RangeTombstone; +import org.apache.cassandra.db.RangeTombstoneList; +import org.apache.cassandra.db.Slice; +import org.apache.cassandra.db.filter.ColumnFilter; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class RowAndDeletionMergeIteratorTest { diff --git a/test/unit/org/apache/cassandra/db/rows/RowsMergingTest.java b/test/unit/org/apache/cassandra/db/rows/RowsMergingTest.java index a4c1f275fd..5b4ddda25b 100644 --- a/test/unit/org/apache/cassandra/db/rows/RowsMergingTest.java +++ b/test/unit/org/apache/cassandra/db/rows/RowsMergingTest.java @@ -19,12 +19,13 @@ package org.apache.cassandra.db.rows; import java.util.Arrays; -import org.apache.cassandra.cql3.CQLTester; +import com.google.common.base.Joiner; + import org.apache.commons.lang3.StringUtils; import org.junit.BeforeClass; import org.junit.Test; -import com.google.common.base.Joiner; +import org.apache.cassandra.cql3.CQLTester; import static org.apache.cassandra.config.CassandraRelevantProperties.BTREE_BRANCH_SHIFT; diff --git a/test/unit/org/apache/cassandra/db/rows/RowsTest.java b/test/unit/org/apache/cassandra/db/rows/RowsTest.java index 865d33a8b6..899dae6a43 100644 --- a/test/unit/org/apache/cassandra/db/rows/RowsTest.java +++ b/test/unit/org/apache/cassandra/db/rows/RowsTest.java @@ -30,18 +30,22 @@ import java.util.Set; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.Test; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.db.LivenessInfo; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.MapType; import org.apache.cassandra.db.partitions.PartitionStatisticsCollector; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/unit/org/apache/cassandra/db/rows/ThrottledUnfilteredIteratorTest.java b/test/unit/org/apache/cassandra/db/rows/ThrottledUnfilteredIteratorTest.java index e11618c9a0..b48fa16f06 100644 --- a/test/unit/org/apache/cassandra/db/rows/ThrottledUnfilteredIteratorTest.java +++ b/test/unit/org/apache/cassandra/db/rows/ThrottledUnfilteredIteratorTest.java @@ -18,9 +18,6 @@ package org.apache.cassandra.db.rows; -import static org.apache.cassandra.SchemaLoader.standardCFMD; -import static org.junit.Assert.*; - import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -31,6 +28,7 @@ import java.util.SortedMap; import java.util.TreeMap; import com.google.common.collect.Iterators; + import org.junit.Test; import org.apache.cassandra.SchemaLoader; @@ -64,6 +62,14 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.CloseableIterator; import org.apache.cassandra.utils.FBUtilities; +import static org.apache.cassandra.SchemaLoader.standardCFMD; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class ThrottledUnfilteredIteratorTest extends CQLTester { private static final String KSNAME = "ThrottledUnfilteredIteratorTest"; diff --git a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorWithLowerBoundTest.java b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorWithLowerBoundTest.java index d6fd93f603..a2cb220276 100644 --- a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorWithLowerBoundTest.java +++ b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorWithLowerBoundTest.java @@ -23,6 +23,7 @@ import java.math.BigInteger; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; @@ -51,7 +52,6 @@ import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import org.mockito.Mockito; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java index 246a0baac2..f39dbaeb62 100644 --- a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java +++ b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java @@ -18,7 +18,14 @@ package org.apache.cassandra.db.rows; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Optional; +import java.util.Random; import java.util.function.IntUnaryOperator; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -31,12 +38,21 @@ import org.junit.Assert; import org.junit.Test; import org.apache.cassandra.Util; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.BufferClusteringBound; +import org.apache.cassandra.db.Clusterable; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringBound; +import org.apache.cassandra.db.ClusteringBoundary; +import org.apache.cassandra.db.ClusteringComparator; +import org.apache.cassandra.db.ClusteringPrefix; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.LivenessInfo; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.rows.Unfiltered.Kind; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.FBUtilities; public class UnfilteredRowIteratorsMergeTest diff --git a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsTest.java b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsTest.java index 0a4ad2b64e..c51866cb41 100644 --- a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsTest.java +++ b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.db.rows; import java.util.Arrays; import java.util.Iterator; +import org.junit.Assert; import org.junit.Test; -import org.junit.Assert; import org.apache.cassandra.Util; import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.DecoratedKey; diff --git a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowsGenerator.java b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowsGenerator.java index 4941d0fa87..a4a5c35f53 100644 --- a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowsGenerator.java +++ b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowsGenerator.java @@ -18,14 +18,27 @@ package org.apache.cassandra.db.rows; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Random; import java.util.function.IntUnaryOperator; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.junit.Assert; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.BufferClusteringBound; +import org.apache.cassandra.db.Clusterable; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringBound; +import org.apache.cassandra.db.ClusteringBoundary; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.LivenessInfo; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.rows.Unfiltered.Kind; import org.apache.cassandra.schema.TableMetadata; diff --git a/test/unit/org/apache/cassandra/db/streaming/CassandraEntireSSTableStreamWriterTest.java b/test/unit/org/apache/cassandra/db/streaming/CassandraEntireSSTableStreamWriterTest.java index a87878c70b..3cb982b89b 100644 --- a/test/unit/org/apache/cassandra/db/streaming/CassandraEntireSSTableStreamWriterTest.java +++ b/test/unit/org/apache/cassandra/db/streaming/CassandraEntireSSTableStreamWriterTest.java @@ -27,13 +27,6 @@ import java.util.Queue; import org.junit.BeforeClass; import org.junit.Test; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOutboundHandlerAdapter; -import io.netty.channel.ChannelPromise; -import io.netty.channel.DefaultFileRegion; -import io.netty.channel.embedded.EmbeddedChannel; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.db.ColumnFamilyStore; @@ -63,6 +56,14 @@ import org.apache.cassandra.streaming.messages.StreamMessageHeader; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelOutboundHandlerAdapter; +import io.netty.channel.ChannelPromise; +import io.netty.channel.DefaultFileRegion; +import io.netty.channel.embedded.EmbeddedChannel; + import static java.util.Collections.emptyList; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/db/streaming/CassandraStreamManagerTest.java b/test/unit/org/apache/cassandra/db/streaming/CassandraStreamManagerTest.java index 7085ddf18a..e61169061b 100644 --- a/test/unit/org/apache/cassandra/db/streaming/CassandraStreamManagerTest.java +++ b/test/unit/org/apache/cassandra/db/streaming/CassandraStreamManagerTest.java @@ -33,6 +33,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -58,13 +59,13 @@ import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ActiveRepairService; -import org.apache.cassandra.streaming.StreamSummary; -import org.apache.cassandra.streaming.StreamingChannel; -import org.apache.cassandra.streaming.async.NettyStreamingConnectionFactory; import org.apache.cassandra.streaming.OutgoingStream; import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.streaming.StreamOperation; import org.apache.cassandra.streaming.StreamSession; +import org.apache.cassandra.streaming.StreamSummary; +import org.apache.cassandra.streaming.StreamingChannel; +import org.apache.cassandra.streaming.async.NettyStreamingConnectionFactory; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.concurrent.Ref; diff --git a/test/unit/org/apache/cassandra/db/streaming/CassandraStreamReceiverTest.java b/test/unit/org/apache/cassandra/db/streaming/CassandraStreamReceiverTest.java index 8bf96329ba..603b38283b 100644 --- a/test/unit/org/apache/cassandra/db/streaming/CassandraStreamReceiverTest.java +++ b/test/unit/org/apache/cassandra/db/streaming/CassandraStreamReceiverTest.java @@ -20,18 +20,18 @@ package org.apache.cassandra.db.streaming; import java.util.Collections; -import org.apache.cassandra.config.DatabaseDescriptor; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.streaming.StreamOperation; import org.apache.cassandra.streaming.StreamSession; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/db/streaming/EntireSSTableStreamConcurrentComponentMutationTest.java b/test/unit/org/apache/cassandra/db/streaming/EntireSSTableStreamConcurrentComponentMutationTest.java index 3f19da0ad7..372cd1603a 100644 --- a/test/unit/org/apache/cassandra/db/streaming/EntireSSTableStreamConcurrentComponentMutationTest.java +++ b/test/unit/org/apache/cassandra/db/streaming/EntireSSTableStreamConcurrentComponentMutationTest.java @@ -31,6 +31,9 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; + +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -38,12 +41,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOutboundHandlerAdapter; -import io.netty.channel.ChannelPromise; -import io.netty.channel.embedded.EmbeddedChannel; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.db.ColumnFamilyStore; @@ -86,8 +83,13 @@ import org.apache.cassandra.streaming.messages.StreamMessageHeader; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Throwables; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelOutboundHandlerAdapter; +import io.netty.channel.ChannelPromise; +import io.netty.channel.embedded.EmbeddedChannel; import static java.util.Collections.emptyList; import static org.apache.cassandra.service.ActiveRepairService.NO_PENDING_REPAIR; diff --git a/test/unit/org/apache/cassandra/db/transform/DuplicateRowCheckerTest.java b/test/unit/org/apache/cassandra/db/transform/DuplicateRowCheckerTest.java index 9e60b6365e..ad812fc01e 100644 --- a/test/unit/org/apache/cassandra/db/transform/DuplicateRowCheckerTest.java +++ b/test/unit/org/apache/cassandra/db/transform/DuplicateRowCheckerTest.java @@ -24,16 +24,34 @@ import java.util.HashMap; import java.util.Iterator; import com.google.common.collect.Iterators; -import org.junit.*; + +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.LivenessInfo; +import org.apache.cassandra.db.SnapshotCommand; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.partitions.*; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.partitions.PartitionIterator; +import org.apache.cassandra.db.partitions.SingletonUnfilteredPartitionIterator; +import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; +import org.apache.cassandra.db.rows.AbstractUnfilteredRowIterator; +import org.apache.cassandra.db.rows.BTreeRow; +import org.apache.cassandra.db.rows.EncodingStats; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.RowIterator; +import org.apache.cassandra.db.rows.Rows; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.net.*; +import org.apache.cassandra.net.Message; +import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.DiagnosticSnapshotService; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/unit/org/apache/cassandra/db/transform/RTTransformationsTest.java b/test/unit/org/apache/cassandra/db/transform/RTTransformationsTest.java index 2820f38915..b223c0843e 100644 --- a/test/unit/org/apache/cassandra/db/transform/RTTransformationsTest.java +++ b/test/unit/org/apache/cassandra/db/transform/RTTransformationsTest.java @@ -18,34 +18,47 @@ package org.apache.cassandra.db.transform; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Iterator; + +import com.google.common.collect.Iterators; import org.junit.Before; import org.junit.Test; -import com.google.common.collect.Iterators; - import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.BufferClusteringBound; +import org.apache.cassandra.db.BufferClusteringBoundary; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ClusteringPrefix; import org.apache.cassandra.db.ClusteringPrefix.Kind; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.LivenessInfo; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.partitions.SingletonUnfilteredPartitionIterator; import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.rows.AbstractUnfilteredRowIterator; +import org.apache.cassandra.db.rows.BTreeRow; +import org.apache.cassandra.db.rows.EncodingStats; +import org.apache.cassandra.db.rows.RangeTombstoneBoundMarker; +import org.apache.cassandra.db.rows.RangeTombstoneBoundaryMarker; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.Rows; +import org.apache.cassandra.db.rows.Unfiltered; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.transform.RTBoundValidator.Stage; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.db.transform.RTBoundCloser.close; +import static org.apache.cassandra.db.transform.RTBoundValidator.validate; +import static org.apache.cassandra.utils.ByteBufferUtil.bytes; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.apache.cassandra.db.transform.RTBoundValidator.validate; -import static org.apache.cassandra.utils.ByteBufferUtil.bytes; - public final class RTTransformationsTest { private static final String KEYSPACE = "RTBoundCloserTest"; diff --git a/test/unit/org/apache/cassandra/db/tries/CollectionMergeTrieTest.java b/test/unit/org/apache/cassandra/db/tries/CollectionMergeTrieTest.java index 8c2049e54a..20791f0ad5 100644 --- a/test/unit/org/apache/cassandra/db/tries/CollectionMergeTrieTest.java +++ b/test/unit/org/apache/cassandra/db/tries/CollectionMergeTrieTest.java @@ -27,12 +27,17 @@ import java.util.SortedMap; import java.util.TreeMap; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.Test; import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.*; +import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.FORWARD_COMPARATOR; +import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.addToInMemoryTrie; +import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.assertSameContent; +import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.generateKeys; +import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.makeInMemoryTrie; import static org.apache.cassandra.db.tries.MergeTrieTest.removeDuplicates; public class CollectionMergeTrieTest diff --git a/test/unit/org/apache/cassandra/db/tries/InMemoryTrieTestBase.java b/test/unit/org/apache/cassandra/db/tries/InMemoryTrieTestBase.java index 151cd9f00e..b537db1dd0 100644 --- a/test/unit/org/apache/cassandra/db/tries/InMemoryTrieTestBase.java +++ b/test/unit/org/apache/cassandra/db/tries/InMemoryTrieTestBase.java @@ -19,7 +19,17 @@ package org.apache.cassandra.db.tries; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.TreeSet; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -28,13 +38,14 @@ import com.google.common.collect.HashMultiset; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Multiset; + import org.junit.Assert; import org.junit.Test; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.ObjectSizes; +import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/db/tries/MergeTrieTest.java b/test/unit/org/apache/cassandra/db/tries/MergeTrieTest.java index cfc5c0a461..bf45b9b754 100644 --- a/test/unit/org/apache/cassandra/db/tries/MergeTrieTest.java +++ b/test/unit/org/apache/cassandra/db/tries/MergeTrieTest.java @@ -28,7 +28,11 @@ import org.junit.Test; import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.*; +import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.FORWARD_COMPARATOR; +import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.addToInMemoryTrie; +import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.assertSameContent; +import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.generateKeys; +import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.makeInMemoryTrie; public class MergeTrieTest { diff --git a/test/unit/org/apache/cassandra/db/tries/SlicedTrieTest.java b/test/unit/org/apache/cassandra/db/tries/SlicedTrieTest.java index 69d2a0a955..570dc1d5f8 100644 --- a/test/unit/org/apache/cassandra/db/tries/SlicedTrieTest.java +++ b/test/unit/org/apache/cassandra/db/tries/SlicedTrieTest.java @@ -29,17 +29,18 @@ import java.util.Random; import java.util.SortedMap; import java.util.TreeMap; +import com.googlecode.concurrenttrees.common.Iterables; + import org.junit.Assert; import org.junit.Test; -import com.googlecode.concurrenttrees.common.Iterables; import org.apache.cassandra.utils.bytecomparable.ByteComparable; +import static java.util.Arrays.asList; import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.asString; import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.assertSameContent; import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.generateKeys; import static org.apache.cassandra.db.tries.InMemoryTrieTestBase.makeInMemoryTrie; -import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; public class SlicedTrieTest diff --git a/test/unit/org/apache/cassandra/db/virtual/AbstractLoggerVirtualTableTest.java b/test/unit/org/apache/cassandra/db/virtual/AbstractLoggerVirtualTableTest.java index 40a926fda7..0734224fea 100644 --- a/test/unit/org/apache/cassandra/db/virtual/AbstractLoggerVirtualTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/AbstractLoggerVirtualTableTest.java @@ -24,16 +24,18 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import com.datastax.driver.core.Row; import com.google.common.collect.ImmutableList; + import org.junit.Ignore; import org.junit.Test; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.spi.LoggingEvent; -import com.datastax.driver.core.Row; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.DataRange; +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.spi.LoggingEvent; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/db/virtual/AccordDebugKeyspaceTest.java b/test/unit/org/apache/cassandra/db/virtual/AccordDebugKeyspaceTest.java index ffa8cd62db..78cdc3f330 100644 --- a/test/unit/org/apache/cassandra/db/virtual/AccordDebugKeyspaceTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/AccordDebugKeyspaceTest.java @@ -18,8 +18,8 @@ package org.apache.cassandra.db.virtual; -import java.util.Collections; import java.util.ArrayList; +import java.util.Collections; import java.util.EnumSet; import java.util.List; import java.util.Set; @@ -30,14 +30,16 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.function.BiPredicate; +import org.assertj.core.api.Assertions; +import org.awaitility.Awaitility; import org.junit.After; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import accord.api.ProtocolModifiers; -import accord.messages.NoWaitRequest; import accord.api.RoutingKey; +import accord.messages.NoWaitRequest; import accord.primitives.Keys; import accord.primitives.Ranges; import accord.primitives.Routable; @@ -45,6 +47,7 @@ import accord.primitives.SaveStatus; import accord.primitives.Status.Durability.HasOutcome; import accord.primitives.Txn; import accord.primitives.TxnId; + import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.OptionaldPositiveInt; @@ -72,8 +75,6 @@ import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.concurrent.Condition; -import org.assertj.core.api.Assertions; -import org.awaitility.Awaitility; import static accord.api.ProtocolModifiers.Toggles.SendStableMessages.TO_ALL; import static accord.primitives.TxnId.FastPath.Unoptimised; diff --git a/test/unit/org/apache/cassandra/db/virtual/AccordVirtualTablesTest.java b/test/unit/org/apache/cassandra/db/virtual/AccordVirtualTablesTest.java index ce927926d9..2c830d2dde 100644 --- a/test/unit/org/apache/cassandra/db/virtual/AccordVirtualTablesTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/AccordVirtualTablesTest.java @@ -25,6 +25,7 @@ import java.util.Set; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mockito; import accord.Utils; import accord.api.MessageSink; @@ -41,6 +42,7 @@ import accord.topology.Topology; import accord.topology.TopologyManager; import accord.utils.SortedArrays; import accord.utils.async.AsyncResults; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.schema.Schema; @@ -49,7 +51,6 @@ import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.accord.AccordService; import org.apache.cassandra.service.accord.IAccordService; import org.apache.cassandra.service.accord.TokenRange; -import org.mockito.Mockito; import static org.apache.cassandra.config.DatabaseDescriptor.getPartitioner; import static org.apache.cassandra.schema.SchemaConstants.VIRTUAL_VIEWS; diff --git a/test/unit/org/apache/cassandra/db/virtual/BatchMetricsTableTest.java b/test/unit/org/apache/cassandra/db/virtual/BatchMetricsTableTest.java index ed187324bf..05bb78917f 100644 --- a/test/unit/org/apache/cassandra/db/virtual/BatchMetricsTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/BatchMetricsTableTest.java @@ -20,13 +20,14 @@ package org.apache.cassandra.db.virtual; import java.util.concurrent.atomic.AtomicInteger; -import com.google.common.collect.ImmutableList; -import org.junit.Before; -import org.junit.Test; - import com.codahale.metrics.Histogram; import com.codahale.metrics.Snapshot; import com.datastax.driver.core.ResultSet; +import com.google.common.collect.ImmutableList; + +import org.junit.Before; +import org.junit.Test; + import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.statements.BatchStatement; import org.apache.cassandra.metrics.BatchMetrics; diff --git a/test/unit/org/apache/cassandra/db/virtual/CIDRFilteringMetricsTableTest.java b/test/unit/org/apache/cassandra/db/virtual/CIDRFilteringMetricsTableTest.java index b9d78ac464..91e3c8ff07 100644 --- a/test/unit/org/apache/cassandra/db/virtual/CIDRFilteringMetricsTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/CIDRFilteringMetricsTableTest.java @@ -26,13 +26,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import com.codahale.metrics.Snapshot; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.codahale.metrics.Snapshot; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.auth.AuthCacheService; import org.apache.cassandra.auth.AuthTestUtils; diff --git a/test/unit/org/apache/cassandra/db/virtual/CQLMetricsTableTest.java b/test/unit/org/apache/cassandra/db/virtual/CQLMetricsTableTest.java index a048cf6222..cb13db4e28 100644 --- a/test/unit/org/apache/cassandra/db/virtual/CQLMetricsTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/CQLMetricsTableTest.java @@ -20,13 +20,10 @@ package org.apache.cassandra.db.virtual; import java.util.concurrent.atomic.AtomicInteger; -import com.google.common.collect.ImmutableList; - import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; - -import static org.junit.Assert.assertEquals; +import com.google.common.collect.ImmutableList; import org.junit.Test; @@ -34,6 +31,8 @@ import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.metrics.CQLMetrics; +import static org.junit.Assert.assertEquals; + public class CQLMetricsTableTest extends CQLTester { private static final String KS_NAME = "vts"; diff --git a/test/unit/org/apache/cassandra/db/virtual/ClientsTableKeyspaceColTest.java b/test/unit/org/apache/cassandra/db/virtual/ClientsTableKeyspaceColTest.java index c282cac687..f202241891 100644 --- a/test/unit/org/apache/cassandra/db/virtual/ClientsTableKeyspaceColTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/ClientsTableKeyspaceColTest.java @@ -22,14 +22,15 @@ import java.io.IOException; import java.net.InetAddress; import java.util.List; +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.Row; +import com.datastax.driver.core.Session; import com.google.common.collect.ImmutableList; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Row; -import com.datastax.driver.core.Session; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.service.EmbeddedCassandraService; diff --git a/test/unit/org/apache/cassandra/db/virtual/ClientsTableTest.java b/test/unit/org/apache/cassandra/db/virtual/ClientsTableTest.java index 7b3c243ffd..73d3c5794a 100644 --- a/test/unit/org/apache/cassandra/db/virtual/ClientsTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/ClientsTableTest.java @@ -21,15 +21,16 @@ package org.apache.cassandra.db.virtual; import java.net.InetAddress; import java.util.Collections; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; import org.apache.cassandra.auth.AuthTestUtils; import org.apache.cassandra.auth.IAuthenticator; import org.apache.cassandra.auth.MutualTlsAuthenticator; @@ -37,7 +38,6 @@ import org.apache.cassandra.auth.SpiffeCertificateValidator; import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.transport.TlsTestUtils; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.auth.AuthTestUtils.waitForExistingRoles; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/db/virtual/CollectionVirtualTableAdapterTest.java b/test/unit/org/apache/cassandra/db/virtual/CollectionVirtualTableAdapterTest.java index 2a009b791c..8a1e03db29 100644 --- a/test/unit/org/apache/cassandra/db/virtual/CollectionVirtualTableAdapterTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/CollectionVirtualTableAdapterTest.java @@ -26,12 +26,13 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; + import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.virtual.model.CollectionEntry; import org.apache.cassandra.db.virtual.model.CollectionEntryTestRow; diff --git a/test/unit/org/apache/cassandra/db/virtual/CredentialsCacheKeysTableTest.java b/test/unit/org/apache/cassandra/db/virtual/CredentialsCacheKeysTableTest.java index 9126168461..0b1f2de428 100644 --- a/test/unit/org/apache/cassandra/db/virtual/CredentialsCacheKeysTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/CredentialsCacheKeysTableTest.java @@ -18,14 +18,15 @@ package org.apache.cassandra.db.virtual; +import com.datastax.driver.core.EndPoint; +import com.datastax.driver.core.PlainTextAuthProvider; import com.google.common.collect.ImmutableList; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.EndPoint; -import com.datastax.driver.core.PlainTextAuthProvider; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.auth.AuthTestUtils; import org.apache.cassandra.auth.AuthenticatedUser; diff --git a/test/unit/org/apache/cassandra/db/virtual/ExceptionsTableTest.java b/test/unit/org/apache/cassandra/db/virtual/ExceptionsTableTest.java index c9799e1a9f..e01c73f106 100644 --- a/test/unit/org/apache/cassandra/db/virtual/ExceptionsTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/ExceptionsTableTest.java @@ -25,6 +25,7 @@ import java.util.function.Consumer; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Test; import org.apache.cassandra.cql3.CQLTester; diff --git a/test/unit/org/apache/cassandra/db/virtual/JmxPermissionsCacheKeysTableTest.java b/test/unit/org/apache/cassandra/db/virtual/JmxPermissionsCacheKeysTableTest.java index 782d282570..8993d6c595 100644 --- a/test/unit/org/apache/cassandra/db/virtual/JmxPermissionsCacheKeysTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/JmxPermissionsCacheKeysTableTest.java @@ -21,9 +21,11 @@ package org.apache.cassandra.db.virtual; import java.util.Arrays; import java.util.List; import java.util.Set; + import javax.security.auth.Subject; import com.google.common.collect.ImmutableList; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/db/virtual/LazyVirtualTableTest.java b/test/unit/org/apache/cassandra/db/virtual/LazyVirtualTableTest.java index 496659c728..76c332d78f 100644 --- a/test/unit/org/apache/cassandra/db/virtual/LazyVirtualTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/LazyVirtualTableTest.java @@ -27,6 +27,9 @@ import java.util.concurrent.TimeUnit; import java.util.function.IntUnaryOperator; import java.util.stream.IntStream; +import net.openhft.chronicle.core.util.IntBiPredicate; + +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.utils.Invariants; @@ -34,7 +37,7 @@ import accord.utils.LargeBitSet; import accord.utils.RandomSource; import accord.utils.RandomTestRunner; import accord.utils.UnhandledEnum; -import net.openhft.chronicle.core.util.IntBiPredicate; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.QueryProcessor; @@ -43,7 +46,6 @@ import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.dht.LocalPartitioner; import org.apache.cassandra.schema.TableMetadata; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.db.virtual.AbstractLazyVirtualTable.OnTimeout.FAIL; import static org.apache.cassandra.db.virtual.LazyVirtualTableTest.Cmp.CMPS; diff --git a/test/unit/org/apache/cassandra/db/virtual/LocalRepairTablesTest.java b/test/unit/org/apache/cassandra/db/virtual/LocalRepairTablesTest.java index 75d335dafc..d99a82cea8 100644 --- a/test/unit/org/apache/cassandra/db/virtual/LocalRepairTablesTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/LocalRepairTablesTest.java @@ -26,6 +26,7 @@ import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -38,8 +39,8 @@ import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.repair.CommonRange; -import org.apache.cassandra.repair.RepairJobDesc; import org.apache.cassandra.repair.RepairCoordinator; +import org.apache.cassandra.repair.RepairJobDesc; import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.repair.messages.PrepareMessage; import org.apache.cassandra.repair.messages.RepairOption; diff --git a/test/unit/org/apache/cassandra/db/virtual/LogMessagesTableTest.java b/test/unit/org/apache/cassandra/db/virtual/LogMessagesTableTest.java index 7025e8ad4c..8cff6f2b3f 100644 --- a/test/unit/org/apache/cassandra/db/virtual/LogMessagesTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/LogMessagesTableTest.java @@ -22,10 +22,11 @@ import java.time.Instant; import java.util.Date; import java.util.List; +import com.datastax.driver.core.Row; + import org.junit.Test; import ch.qos.logback.classic.spi.LoggingEvent; -import com.datastax.driver.core.Row; import static org.apache.cassandra.config.CassandraRelevantProperties.LOGS_VIRTUAL_TABLE_MAX_ROWS; import static org.apache.cassandra.db.virtual.LogMessagesTable.LOGS_VIRTUAL_TABLE_DEFAULT_ROWS; diff --git a/test/unit/org/apache/cassandra/db/virtual/NetworkPermissionsCacheKeysTableTest.java b/test/unit/org/apache/cassandra/db/virtual/NetworkPermissionsCacheKeysTableTest.java index b3ebdea2f5..1b23581563 100644 --- a/test/unit/org/apache/cassandra/db/virtual/NetworkPermissionsCacheKeysTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/NetworkPermissionsCacheKeysTableTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.virtual; import com.google.common.collect.ImmutableList; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/db/virtual/PartitionKeyStatsTableTest.java b/test/unit/org/apache/cassandra/db/virtual/PartitionKeyStatsTableTest.java index 1d0a9e43e1..e78c46ebb3 100644 --- a/test/unit/org/apache/cassandra/db/virtual/PartitionKeyStatsTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/PartitionKeyStatsTableTest.java @@ -28,22 +28,23 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; +import com.datastax.driver.core.exceptions.InvalidQueryException; import com.google.common.collect.ImmutableList; + +import org.bouncycastle.util.encoders.Hex; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; -import com.datastax.driver.core.exceptions.InvalidQueryException; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.io.sstable.format.bti.BtiFormat; -import org.bouncycastle.util.encoders.Hex; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/db/virtual/PermissionsCacheKeysTableTest.java b/test/unit/org/apache/cassandra/db/virtual/PermissionsCacheKeysTableTest.java index eb684bddf3..86597c840a 100644 --- a/test/unit/org/apache/cassandra/db/virtual/PermissionsCacheKeysTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/PermissionsCacheKeysTableTest.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Set; import com.google.common.collect.ImmutableList; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/db/virtual/RolesCacheKeysTableTest.java b/test/unit/org/apache/cassandra/db/virtual/RolesCacheKeysTableTest.java index 7c809faa50..9128d970ce 100644 --- a/test/unit/org/apache/cassandra/db/virtual/RolesCacheKeysTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/RolesCacheKeysTableTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.virtual; import com.google.common.collect.ImmutableList; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/db/virtual/SSTableTasksTableTest.java b/test/unit/org/apache/cassandra/db/virtual/SSTableTasksTableTest.java index 5d387f1d9e..3a7ec83894 100644 --- a/test/unit/org/apache/cassandra/db/virtual/SSTableTasksTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/SSTableTasksTableTest.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import com.google.common.collect.ImmutableList; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/virtual/SchemaMetadataTableTest.java b/test/unit/org/apache/cassandra/db/virtual/SchemaMetadataTableTest.java index b16c4078fb..dcd0d55ae8 100644 --- a/test/unit/org/apache/cassandra/db/virtual/SchemaMetadataTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/SchemaMetadataTableTest.java @@ -17,7 +17,11 @@ */ package org.apache.cassandra.db.virtual; +import java.util.Arrays; +import java.util.Collection; + import com.google.common.collect.ImmutableList; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -28,9 +32,6 @@ import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.exceptions.InvalidRequestException; -import java.util.Arrays; -import java.util.Collection; - /** * Parameterized tests for schema metadata virtual tables. *

diff --git a/test/unit/org/apache/cassandra/db/virtual/SettingsTableTest.java b/test/unit/org/apache/cassandra/db/virtual/SettingsTableTest.java index e89fdabbd4..305a3c8b1c 100644 --- a/test/unit/org/apache/cassandra/db/virtual/SettingsTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/SettingsTableTest.java @@ -26,33 +26,34 @@ import java.util.Set; import java.util.TreeMap; import java.util.stream.Collectors; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.yaml.snakeyaml.introspector.Property; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.Config; -import org.apache.cassandra.config.Redacted; import org.apache.cassandra.config.DefaultLoader; import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions.Builder; import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions.InternodeEncryption; import org.apache.cassandra.config.JMXServerOptions; import org.apache.cassandra.config.ParameterizedClass; +import org.apache.cassandra.config.Redacted; import org.apache.cassandra.config.TransparentDataEncryptionOptions; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.distributed.shared.WithProperties; import org.apache.cassandra.security.SSLFactory; import org.apache.cassandra.utils.JsonUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.yaml.snakeyaml.introspector.Property; -import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.REQUIRED; import static java.util.stream.Collectors.toMap; +import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.REQUIRED; public class SettingsTableTest extends CQLTester { diff --git a/test/unit/org/apache/cassandra/db/virtual/SlowQueriesTableTest.java b/test/unit/org/apache/cassandra/db/virtual/SlowQueriesTableTest.java index 1c261e7cc9..f9cbeb2a0e 100644 --- a/test/unit/org/apache/cassandra/db/virtual/SlowQueriesTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/SlowQueriesTableTest.java @@ -22,13 +22,14 @@ import java.util.List; import java.util.Random; import org.junit.Test; +import org.quicktheories.impl.JavaRandom; -import ch.qos.logback.classic.spi.LoggingEvent; import org.apache.cassandra.db.monitoring.MonitorableImpl; import org.apache.cassandra.db.monitoring.MonitoringTask; import org.apache.cassandra.db.monitoring.MonitoringTask.Operation; import org.apache.cassandra.utils.Generators; -import org.quicktheories.impl.JavaRandom; + +import ch.qos.logback.classic.spi.LoggingEvent; import static org.apache.cassandra.config.CassandraRelevantProperties.LOGS_SLOW_QUERIES_VIRTUAL_TABLE_MAX_ROWS; import static org.apache.cassandra.db.virtual.SlowQueriesTable.LOGS_VIRTUAL_TABLE_DEFAULT_ROWS; diff --git a/test/unit/org/apache/cassandra/db/virtual/SnapshotsTableTest.java b/test/unit/org/apache/cassandra/db/virtual/SnapshotsTableTest.java index 0d4ed611c4..636118426e 100644 --- a/test/unit/org/apache/cassandra/db/virtual/SnapshotsTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/SnapshotsTableTest.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import com.google.common.collect.ImmutableList; + import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -33,8 +34,8 @@ import org.junit.Test; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.service.snapshot.SnapshotOptions; import org.apache.cassandra.service.snapshot.SnapshotManager; +import org.apache.cassandra.service.snapshot.SnapshotOptions; import org.apache.cassandra.service.snapshot.TableSnapshot; public class SnapshotsTableTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/db/virtual/StreamingVirtualTableTest.java b/test/unit/org/apache/cassandra/db/virtual/StreamingVirtualTableTest.java index b008151978..76f8b23580 100644 --- a/test/unit/org/apache/cassandra/db/virtual/StreamingVirtualTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/StreamingVirtualTableTest.java @@ -30,6 +30,8 @@ import java.util.concurrent.ThreadLocalRandom; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; + +import org.assertj.core.util.Throwables; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -52,7 +54,6 @@ import org.apache.cassandra.streaming.StreamSummary; import org.apache.cassandra.streaming.StreamingChannel; import org.apache.cassandra.streaming.StreamingState; import org.apache.cassandra.utils.FBUtilities; -import org.assertj.core.util.Throwables; import static java.util.Collections.emptyList; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; diff --git a/test/unit/org/apache/cassandra/db/virtual/SystemPropertiesTableTest.java b/test/unit/org/apache/cassandra/db/virtual/SystemPropertiesTableTest.java index 2eb346de74..a0c5a03eaf 100644 --- a/test/unit/org/apache/cassandra/db/virtual/SystemPropertiesTableTest.java +++ b/test/unit/org/apache/cassandra/db/virtual/SystemPropertiesTableTest.java @@ -25,17 +25,17 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; import org.apache.cassandra.cql3.CQLTester; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Maps; - // checkstyle: suppress below 'blockSystemPropertyUsage' public class SystemPropertiesTableTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/dht/AccordSplitterTest.java b/test/unit/org/apache/cassandra/dht/AccordSplitterTest.java index ec05ebc6fa..5abda133b5 100644 --- a/test/unit/org/apache/cassandra/dht/AccordSplitterTest.java +++ b/test/unit/org/apache/cassandra/dht/AccordSplitterTest.java @@ -22,6 +22,7 @@ import java.math.BigInteger; import java.util.ArrayList; import java.util.List; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; @@ -30,10 +31,10 @@ import accord.primitives.Range; import accord.primitives.Ranges; import accord.utils.Gens; import accord.utils.RandomSource; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.utils.AccordGenerators; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java index 4cb8b2fd0e..32e040f965 100644 --- a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java +++ b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java @@ -23,14 +23,17 @@ import java.util.Collection; import java.util.List; import java.util.Random; import java.util.Set; -import java.util.stream.Collectors; import java.util.concurrent.atomic.AtomicBoolean; - +import java.util.stream.Collectors; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; + +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMRules; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -56,9 +59,6 @@ import org.apache.cassandra.tcm.membership.NodeId; import org.apache.cassandra.tcm.ownership.MovementMap; import org.apache.cassandra.tcm.sequences.BootstrapAndJoin; import org.apache.cassandra.utils.Pair; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMRules; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/test/unit/org/apache/cassandra/dht/IPartitionerTest.java b/test/unit/org/apache/cassandra/dht/IPartitionerTest.java index 14c8154e59..9ad2ed9910 100644 --- a/test/unit/org/apache/cassandra/dht/IPartitionerTest.java +++ b/test/unit/org/apache/cassandra/dht/IPartitionerTest.java @@ -25,7 +25,12 @@ import java.util.Objects; import java.util.Set; import com.google.common.collect.Sets; + +import org.assertj.core.api.Assertions; import org.junit.Test; +import org.reflections.Reflections; +import org.reflections.scanners.Scanners; +import org.reflections.util.ConfigurationBuilder; import org.apache.cassandra.io.util.File; import org.apache.cassandra.utils.AbstractTypeGenerators; @@ -33,10 +38,6 @@ import org.apache.cassandra.utils.AccordGenerators; import org.apache.cassandra.utils.CassandraGenerators; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; -import org.assertj.core.api.Assertions; -import org.reflections.Reflections; -import org.reflections.scanners.Scanners; -import org.reflections.util.ConfigurationBuilder; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/dht/LengthPartitioner.java b/test/unit/org/apache/cassandra/dht/LengthPartitioner.java index 401c0e0cd4..235d5eefba 100644 --- a/test/unit/org/apache/cassandra/dht/LengthPartitioner.java +++ b/test/unit/org/apache/cassandra/dht/LengthPartitioner.java @@ -28,6 +28,7 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.function.Function; import accord.primitives.Ranges; + import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.AbstractType; diff --git a/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java b/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java index df84f589af..cf8aae4685 100644 --- a/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java +++ b/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java @@ -31,6 +31,7 @@ import org.junit.BeforeClass; import org.junit.Test; import accord.primitives.Ranges; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.service.StorageService; diff --git a/test/unit/org/apache/cassandra/dht/RangeFetchMapCalculatorTest.java b/test/unit/org/apache/cassandra/dht/RangeFetchMapCalculatorTest.java index 12015249ba..c062a78b07 100644 --- a/test/unit/org/apache/cassandra/dht/RangeFetchMapCalculatorTest.java +++ b/test/unit/org/apache/cassandra/dht/RangeFetchMapCalculatorTest.java @@ -26,12 +26,13 @@ import java.util.Collections; import java.util.Map; import com.google.common.collect.Multimap; -import org.apache.cassandra.locator.EndpointsByRange; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.locator.EndpointsByRange; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.Locator; import org.apache.cassandra.locator.Replica; diff --git a/test/unit/org/apache/cassandra/dht/RangeTest.java b/test/unit/org/apache/cassandra/dht/RangeTest.java index cac2594ddc..4c071f3a26 100644 --- a/test/unit/org/apache/cassandra/dht/RangeTest.java +++ b/test/unit/org/apache/cassandra/dht/RangeTest.java @@ -31,6 +31,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; + import org.apache.commons.lang3.StringUtils; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/dht/SplitterTest.java b/test/unit/org/apache/cassandra/dht/SplitterTest.java index 560bc82413..9acc6b3b4c 100644 --- a/test/unit/org/apache/cassandra/dht/SplitterTest.java +++ b/test/unit/org/apache/cassandra/dht/SplitterTest.java @@ -27,12 +27,12 @@ import java.util.Random; import java.util.Set; import java.util.stream.Collectors; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.utils.Pair; -import org.assertj.core.api.Assertions; import static com.google.common.collect.Sets.newHashSet; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/dht/tokenallocator/OfflineTokenAllocatorTestUtils.java b/test/unit/org/apache/cassandra/dht/tokenallocator/OfflineTokenAllocatorTestUtils.java index c139760fce..e44ec5d016 100644 --- a/test/unit/org/apache/cassandra/dht/tokenallocator/OfflineTokenAllocatorTestUtils.java +++ b/test/unit/org/apache/cassandra/dht/tokenallocator/OfflineTokenAllocatorTestUtils.java @@ -23,9 +23,10 @@ import java.util.List; import com.google.common.collect.Lists; +import org.assertj.core.api.Assertions; + import org.apache.cassandra.dht.Token; import org.apache.cassandra.utils.OutputHandler; -import org.assertj.core.api.Assertions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/test/unit/org/apache/cassandra/dht/tokenallocator/TokenAllocationTest.java b/test/unit/org/apache/cassandra/dht/tokenallocator/TokenAllocationTest.java index 7099565e3e..22519a4e67 100644 --- a/test/unit/org/apache/cassandra/dht/tokenallocator/TokenAllocationTest.java +++ b/test/unit/org/apache/cassandra/dht/tokenallocator/TokenAllocationTest.java @@ -32,10 +32,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.CassandraTestBase; import org.apache.cassandra.CassandraTestBase.DDDaemonInitialization; import org.apache.cassandra.CassandraTestBase.UseMurmur3Partitioner; +import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Token; import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; diff --git a/test/unit/org/apache/cassandra/diag/DiagnosticEventServiceTest.java b/test/unit/org/apache/cassandra/diag/DiagnosticEventServiceTest.java index 548ce62d1c..0997275322 100644 --- a/test/unit/org/apache/cassandra/diag/DiagnosticEventServiceTest.java +++ b/test/unit/org/apache/cassandra/diag/DiagnosticEventServiceTest.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.function.Consumer; import com.google.common.collect.ImmutableList; + import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/fql/FullQueryLoggerTest.java b/test/unit/org/apache/cassandra/fql/FullQueryLoggerTest.java index ec3ac0df91..3d4296fda1 100644 --- a/test/unit/org/apache/cassandra/fql/FullQueryLoggerTest.java +++ b/test/unit/org/apache/cassandra/fql/FullQueryLoggerTest.java @@ -31,28 +31,28 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nullable; -import org.apache.cassandra.io.util.File; +import net.openhft.chronicle.queue.ChronicleQueue; +import net.openhft.chronicle.queue.ExcerptTailer; +import net.openhft.chronicle.queue.RollCycles; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; +import net.openhft.chronicle.wire.ValueIn; +import net.openhft.chronicle.wire.WireOut; + import org.apache.commons.lang3.StringUtils; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import io.netty.buffer.Unpooled; -import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; -import net.openhft.chronicle.queue.ExcerptTailer; -import net.openhft.chronicle.queue.RollCycles; -import net.openhft.chronicle.wire.ValueIn; -import net.openhft.chronicle.wire.WireOut; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.statements.BatchStatement; -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.fql.FullQueryLogger.Query; -import org.apache.cassandra.fql.FullQueryLogger.Batch; import org.apache.cassandra.cql3.statements.BatchStatement.Type; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.fql.FullQueryLogger.Batch; +import org.apache.cassandra.fql.FullQueryLogger.Query; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; @@ -62,9 +62,7 @@ import org.apache.cassandra.utils.ByteArrayUtil; import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.binlog.BinLogTest; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import io.netty.buffer.Unpooled; import static org.apache.cassandra.fql.FullQueryLogger.BATCH; import static org.apache.cassandra.fql.FullQueryLogger.BATCH_TYPE; @@ -79,6 +77,9 @@ import static org.apache.cassandra.fql.FullQueryLogger.SINGLE_QUERY; import static org.apache.cassandra.fql.FullQueryLogger.TYPE; import static org.apache.cassandra.fql.FullQueryLogger.VALUES; import static org.apache.cassandra.fql.FullQueryLogger.VERSION; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; public class FullQueryLoggerTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java b/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java index 3a07ea36d7..2ab03d247f 100644 --- a/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java +++ b/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java @@ -21,8 +21,6 @@ package org.apache.cassandra.gms; */ -import static org.junit.Assert.*; - import org.junit.BeforeClass; import org.junit.Test; @@ -30,6 +28,8 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.utils.FBUtilities; +import static org.junit.Assert.assertEquals; + public class ArrivalWindowTest { @BeforeClass diff --git a/test/unit/org/apache/cassandra/gms/GossipDigestTest.java b/test/unit/org/apache/cassandra/gms/GossipDigestTest.java index cb67a54585..38ca534a03 100644 --- a/test/unit/org/apache/cassandra/gms/GossipDigestTest.java +++ b/test/unit/org/apache/cassandra/gms/GossipDigestTest.java @@ -18,17 +18,17 @@ */ package org.apache.cassandra.gms; -import static org.junit.Assert.*; - import java.io.IOException; +import org.junit.Test; + import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputBuffer; - import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.MessagingService; -import org.junit.Test; + +import static org.junit.Assert.assertEquals; public class GossipDigestTest { diff --git a/test/unit/org/apache/cassandra/gms/GossipShutdownTest.java b/test/unit/org/apache/cassandra/gms/GossipShutdownTest.java index d8f92fe53e..de82ac2c88 100644 --- a/test/unit/org/apache/cassandra/gms/GossipShutdownTest.java +++ b/test/unit/org/apache/cassandra/gms/GossipShutdownTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.gms; import java.io.IOException; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; @@ -32,7 +33,6 @@ import org.apache.cassandra.net.NoPayload; import org.apache.cassandra.net.Verb; import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.StubClusterMetadataService; -import org.assertj.core.api.Assertions; public class GossipShutdownTest { diff --git a/test/unit/org/apache/cassandra/gms/GossiperTest.java b/test/unit/org/apache/cassandra/gms/GossiperTest.java index 1dfe194b22..97dac490ec 100644 --- a/test/unit/org/apache/cassandra/gms/GossiperTest.java +++ b/test/unit/org/apache/cassandra/gms/GossiperTest.java @@ -33,12 +33,16 @@ import java.util.function.Consumer; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.net.InetAddresses; + +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.quicktheories.core.Gen; +import org.quicktheories.impl.Constraint; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.Util; @@ -53,9 +57,6 @@ import org.apache.cassandra.locator.SeedProvider; import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.StubClusterMetadataService; import org.apache.cassandra.utils.CassandraGenerators; -import org.assertj.core.api.Assertions; -import org.quicktheories.core.Gen; -import org.quicktheories.impl.Constraint; import static org.apache.cassandra.config.CassandraRelevantProperties.GOSSIP_DISABLE_THREAD_VALIDATION; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/gms/NewGossiperTest.java b/test/unit/org/apache/cassandra/gms/NewGossiperTest.java index 54cd8fe43a..a11b3d0208 100644 --- a/test/unit/org/apache/cassandra/gms/NewGossiperTest.java +++ b/test/unit/org/apache/cassandra/gms/NewGossiperTest.java @@ -28,6 +28,7 @@ import java.util.UUID; import java.util.concurrent.ExecutionException; import com.google.common.collect.Sets; + import org.junit.Test; import org.apache.cassandra.ServerTestUtils; @@ -40,7 +41,11 @@ import org.apache.cassandra.net.RequestCallback; import org.apache.cassandra.tcm.compatibility.GossipHelper; import org.apache.cassandra.utils.concurrent.Future; -import static org.apache.cassandra.gms.ApplicationState.*; +import static org.apache.cassandra.gms.ApplicationState.DC; +import static org.apache.cassandra.gms.ApplicationState.HOST_ID; +import static org.apache.cassandra.gms.ApplicationState.RACK; +import static org.apache.cassandra.gms.ApplicationState.RELEASE_VERSION; +import static org.apache.cassandra.gms.ApplicationState.TOKENS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/gms/VersionedValueTest.java b/test/unit/org/apache/cassandra/gms/VersionedValueTest.java index af0177e357..32d70ade3a 100644 --- a/test/unit/org/apache/cassandra/gms/VersionedValueTest.java +++ b/test/unit/org/apache/cassandra/gms/VersionedValueTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.gms; import org.junit.Test; import accord.utils.Gen; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.IVersionedSerializers; import org.apache.cassandra.io.util.DataOutputBuffer; diff --git a/test/unit/org/apache/cassandra/hints/AlteredHints.java b/test/unit/org/apache/cassandra/hints/AlteredHints.java index d9296c1bff..9ae619c38f 100644 --- a/test/unit/org/apache/cassandra/hints/AlteredHints.java +++ b/test/unit/org/apache/cassandra/hints/AlteredHints.java @@ -27,17 +27,18 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; -import org.apache.cassandra.io.util.File; + +import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.BeforeClass; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.RowUpdateBuilder; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.schema.KeyspaceParams; -import org.hamcrest.Matchers; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.TableMetadata; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; diff --git a/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java b/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java index da9f7dde45..b4deea5171 100644 --- a/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java +++ b/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java @@ -17,19 +17,27 @@ */ package org.apache.cassandra.hints; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.io.util.*; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; -import org.junit.BeforeClass; -import org.junit.Test; - import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.zip.CRC32; -import static org.junit.Assert.*; +import org.junit.BeforeClass; +import org.junit.Test; + +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.io.util.DataOutputBuffer; +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileUtils; +import org.apache.cassandra.io.util.RandomAccessReader; +import org.apache.cassandra.io.util.SequentialWriter; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.FBUtilities; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class ChecksummedDataInputTest { diff --git a/test/unit/org/apache/cassandra/hints/HintMessageTest.java b/test/unit/org/apache/cassandra/hints/HintMessageTest.java index 91eddc0b0e..ed3dabdac0 100644 --- a/test/unit/org/apache/cassandra/hints/HintMessageTest.java +++ b/test/unit/org/apache/cassandra/hints/HintMessageTest.java @@ -24,8 +24,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.io.util.DataInputBuffer; @@ -33,6 +31,8 @@ import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.hints.HintsTestUtil.assertHintsEqual; diff --git a/test/unit/org/apache/cassandra/hints/HintServiceBytemanTest.java b/test/unit/org/apache/cassandra/hints/HintServiceBytemanTest.java index 1beaa123a8..66e4991a42 100644 --- a/test/unit/org/apache/cassandra/hints/HintServiceBytemanTest.java +++ b/test/unit/org/apache/cassandra/hints/HintServiceBytemanTest.java @@ -23,6 +23,9 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; +import org.awaitility.Awaitility; +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -38,11 +41,8 @@ import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.StorageService; -import org.awaitility.Awaitility; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; - import org.apache.cassandra.utils.MockFailureDetector; + import static org.apache.cassandra.hints.HintsTestUtil.sendHintsAndResponses; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/hints/HintWriteTTLTest.java b/test/unit/org/apache/cassandra/hints/HintWriteTTLTest.java index 1aec822f28..bef89521d0 100644 --- a/test/unit/org/apache/cassandra/hints/HintWriteTTLTest.java +++ b/test/unit/org/apache/cassandra/hints/HintWriteTTLTest.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.io.util.File; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -38,6 +37,7 @@ import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.io.util.DataInputBuffer; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.TableMetadata; diff --git a/test/unit/org/apache/cassandra/hints/HintsBufferPoolTest.java b/test/unit/org/apache/cassandra/hints/HintsBufferPoolTest.java index d658c88985..97779ebd38 100644 --- a/test/unit/org/apache/cassandra/hints/HintsBufferPoolTest.java +++ b/test/unit/org/apache/cassandra/hints/HintsBufferPoolTest.java @@ -17,18 +17,19 @@ */ package org.apache.cassandra.hints; -import org.apache.cassandra.Util; +import java.util.Queue; +import java.util.UUID; +import java.util.concurrent.ConcurrentLinkedQueue; + +import com.google.common.collect.ImmutableList; + import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import com.google.common.collect.ImmutableList; - -import java.util.Queue; -import java.util.UUID; -import java.util.concurrent.ConcurrentLinkedQueue; +import org.apache.cassandra.Util; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/hints/HintsBufferTest.java b/test/unit/org/apache/cassandra/hints/HintsBufferTest.java index 9509262553..e3256df2ef 100644 --- a/test/unit/org/apache/cassandra/hints/HintsBufferTest.java +++ b/test/unit/org/apache/cassandra/hints/HintsBufferTest.java @@ -19,11 +19,19 @@ package org.apache.cassandra.hints; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.zip.CRC32; import com.google.common.collect.Iterables; + import org.junit.BeforeClass; import org.junit.Test; @@ -41,15 +49,14 @@ import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableMetadata; +import static org.apache.cassandra.utils.ByteBufferUtil.bytes; +import static org.apache.cassandra.utils.FBUtilities.updateChecksum; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.apache.cassandra.utils.ByteBufferUtil.bytes; -import static org.apache.cassandra.utils.FBUtilities.updateChecksum; - public class HintsBufferTest { private static final String KEYSPACE = "hints_buffer_test"; diff --git a/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java b/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java index 1406e25ed9..3b9cf346fe 100644 --- a/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java +++ b/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java @@ -19,9 +19,15 @@ package org.apache.cassandra.hints; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.UUID; import com.google.common.collect.ImmutableMap; + +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.io.util.File; @@ -30,11 +36,7 @@ import org.apache.cassandra.schema.Schema; import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.FBUtilities; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; - +import static org.apache.cassandra.Util.dk; import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -43,8 +45,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.apache.cassandra.Util.dk; - public class HintsCatalogTest { private static final String KEYSPACE = "hint_test"; diff --git a/test/unit/org/apache/cassandra/hints/HintsCompressionTest.java b/test/unit/org/apache/cassandra/hints/HintsCompressionTest.java index faa8d2791d..b4a9f79cb4 100644 --- a/test/unit/org/apache/cassandra/hints/HintsCompressionTest.java +++ b/test/unit/org/apache/cassandra/hints/HintsCompressionTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.hints; import com.google.common.collect.ImmutableMap; + import org.junit.Test; import org.apache.cassandra.config.ParameterizedClass; diff --git a/test/unit/org/apache/cassandra/hints/HintsDescriptorTest.java b/test/unit/org/apache/cassandra/hints/HintsDescriptorTest.java index 596727fad1..994a65c521 100644 --- a/test/unit/org/apache/cassandra/hints/HintsDescriptorTest.java +++ b/test/unit/org/apache/cassandra/hints/HintsDescriptorTest.java @@ -26,17 +26,18 @@ import java.util.UUID; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteStreams; -import org.apache.cassandra.io.util.File; + import org.junit.Test; import org.apache.cassandra.io.compress.LZ4Compressor; import org.apache.cassandra.io.util.DataOutputBuffer; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.net.MessagingService; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.fail; -import static org.assertj.core.api.Assertions.assertThat; public class HintsDescriptorTest { diff --git a/test/unit/org/apache/cassandra/hints/HintsEncryptionTest.java b/test/unit/org/apache/cassandra/hints/HintsEncryptionTest.java index beb95d143b..71c70f4d68 100644 --- a/test/unit/org/apache/cassandra/hints/HintsEncryptionTest.java +++ b/test/unit/org/apache/cassandra/hints/HintsEncryptionTest.java @@ -22,6 +22,7 @@ import java.util.Arrays; import javax.crypto.Cipher; import com.google.common.collect.ImmutableMap; + import org.junit.Before; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/hints/HintsReaderTest.java b/test/unit/org/apache/cassandra/hints/HintsReaderTest.java index a47d0f4ab8..56645de3aa 100644 --- a/test/unit/org/apache/cassandra/hints/HintsReaderTest.java +++ b/test/unit/org/apache/cassandra/hints/HintsReaderTest.java @@ -29,9 +29,7 @@ import java.util.function.Function; import com.google.common.collect.Iterables; -import org.apache.cassandra.exceptions.CoordinatorBehindException; -import org.apache.cassandra.io.util.File; - +import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -42,20 +40,21 @@ import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.db.marshal.ValueAccessors; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.exceptions.CoordinatorBehindException; import org.apache.cassandra.exceptions.UnknownTableException; import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.util.DataInputBuffer; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaTestUtil; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.memory.MemoryUtil; -import org.hamcrest.Matchers; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.apache.cassandra.Util.dk; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; public class HintsReaderTest { diff --git a/test/unit/org/apache/cassandra/hints/HintsServiceTest.java b/test/unit/org/apache/cassandra/hints/HintsServiceTest.java index 773b30f677..3f220f120c 100644 --- a/test/unit/org/apache/cassandra/hints/HintsServiceTest.java +++ b/test/unit/org/apache/cassandra/hints/HintsServiceTest.java @@ -21,11 +21,14 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; + import javax.annotation.Nullable; +import com.datastax.driver.core.utils.MoreFutures; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; + import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -33,7 +36,7 @@ import org.junit.Test; import accord.primitives.Keys; import accord.primitives.TxnId; -import com.datastax.driver.core.utils.MoreFutures; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/test/unit/org/apache/cassandra/hints/HintsStoreTest.java b/test/unit/org/apache/cassandra/hints/HintsStoreTest.java index fdb2206cc9..5c0a1ea405 100644 --- a/test/unit/org/apache/cassandra/hints/HintsStoreTest.java +++ b/test/unit/org/apache/cassandra/hints/HintsStoreTest.java @@ -30,28 +30,28 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.Uninterruptibles; + +import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.io.util.File; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.RowUpdateBuilder; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.memory.MemoryUtil; -import org.hamcrest.Matchers; +import static org.apache.cassandra.utils.ByteBufferUtil.bytes; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.apache.cassandra.utils.ByteBufferUtil.bytes; - public class HintsStoreTest { private static final String KEYSPACE = "hints_store_test"; diff --git a/test/unit/org/apache/cassandra/hints/HintsUpgradeTest.java b/test/unit/org/apache/cassandra/hints/HintsUpgradeTest.java index 78b8f56b50..3f0320aedc 100644 --- a/test/unit/org/apache/cassandra/hints/HintsUpgradeTest.java +++ b/test/unit/org/apache/cassandra/hints/HintsUpgradeTest.java @@ -24,6 +24,7 @@ import java.util.UUID; import java.util.function.Consumer; import com.google.common.collect.ImmutableMap; + import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/index/CustomIndexTest.java b/test/unit/org/apache/cassandra/index/CustomIndexTest.java index 3cd756b9e3..0ff2c8ab7a 100644 --- a/test/unit/org/apache/cassandra/index/CustomIndexTest.java +++ b/test/unit/org/apache/cassandra/index/CustomIndexTest.java @@ -38,17 +38,18 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; +import com.datastax.driver.core.exceptions.QueryValidationException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import com.google.common.util.concurrent.Uninterruptibles; + +import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; -import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.Assert; import org.junit.Test; -import com.datastax.driver.core.exceptions.QueryValidationException; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; @@ -57,11 +58,10 @@ import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.cql3.restrictions.IndexRestrictions; import org.apache.cassandra.cql3.restrictions.StatementRestrictions; import org.apache.cassandra.cql3.statements.ModificationStatement; -import org.apache.cassandra.db.ColumnFamilyStore.FlushReason; -import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.cql3.statements.schema.IndexTarget; import org.apache.cassandra.db.CassandraWriteContext; import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.ColumnFamilyStore.FlushReason; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.db.Keyspace; @@ -70,6 +70,7 @@ import org.apache.cassandra.db.ReadCommand; import org.apache.cassandra.db.ReadExecutionController; import org.apache.cassandra.db.RegularAndStaticColumns; import org.apache.cassandra.db.WriteContext; +import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.db.lifecycle.ILifecycleTransaction; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.Int32Type; diff --git a/test/unit/org/apache/cassandra/index/SecondaryIndexManagerTest.java b/test/unit/org/apache/cassandra/index/SecondaryIndexManagerTest.java index 45485876f9..6eaa6e7dcc 100644 --- a/test/unit/org/apache/cassandra/index/SecondaryIndexManagerTest.java +++ b/test/unit/org/apache/cassandra/index/SecondaryIndexManagerTest.java @@ -28,6 +28,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.collect.Sets; + import org.junit.After; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/index/StubIndex.java b/test/unit/org/apache/cassandra/index/StubIndex.java index f4b9df069c..39877306bf 100644 --- a/test/unit/org/apache/cassandra/index/StubIndex.java +++ b/test/unit/org/apache/cassandra/index/StubIndex.java @@ -18,22 +18,35 @@ package org.apache.cassandra.index; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Optional; import java.util.concurrent.Callable; import org.apache.cassandra.Util; -import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; -import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.cql3.Operator; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.PartitionRangeReadCommand; +import org.apache.cassandra.db.RangeTombstone; +import org.apache.cassandra.db.ReadCommand; +import org.apache.cassandra.db.ReadExecutionController; +import org.apache.cassandra.db.RegularAndStaticColumns; +import org.apache.cassandra.db.SinglePartitionReadCommand; +import org.apache.cassandra.db.WriteContext; import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.memtable.Memtable; import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.index.transactions.IndexTransaction; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.IndexMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.utils.Pair; diff --git a/test/unit/org/apache/cassandra/index/StubIndexGroup.java b/test/unit/org/apache/cassandra/index/StubIndexGroup.java index ec7f457d34..2f65bcc95d 100644 --- a/test/unit/org/apache/cassandra/index/StubIndexGroup.java +++ b/test/unit/org/apache/cassandra/index/StubIndexGroup.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.function.Predicate; + import javax.annotation.Nullable; import org.apache.cassandra.db.DecoratedKey; diff --git a/test/unit/org/apache/cassandra/index/accord/AccordIndexUtil.java b/test/unit/org/apache/cassandra/index/accord/AccordIndexUtil.java index 093001021c..58e681593e 100644 --- a/test/unit/org/apache/cassandra/index/accord/AccordIndexUtil.java +++ b/test/unit/org/apache/cassandra/index/accord/AccordIndexUtil.java @@ -22,6 +22,7 @@ import javax.annotation.Nullable; import accord.local.MaxDecidedRX; import accord.primitives.TxnId; + import org.apache.cassandra.service.accord.TokenRange; import org.apache.cassandra.service.accord.api.TokenKey; diff --git a/test/unit/org/apache/cassandra/index/accord/CheckpointIntervalArrayIndexTest.java b/test/unit/org/apache/cassandra/index/accord/CheckpointIntervalArrayIndexTest.java index 489c47d1f9..2ccaabbeba 100644 --- a/test/unit/org/apache/cassandra/index/accord/CheckpointIntervalArrayIndexTest.java +++ b/test/unit/org/apache/cassandra/index/accord/CheckpointIntervalArrayIndexTest.java @@ -35,6 +35,8 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import com.google.common.collect.ImmutableMap; + +import org.assertj.core.api.Assertions; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -45,6 +47,7 @@ import accord.primitives.TxnId; import accord.utils.Gen; import accord.utils.Gens; import accord.utils.RandomSource; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.db.marshal.ByteBufferAccessor; @@ -61,7 +64,6 @@ import org.apache.cassandra.utils.ByteArrayUtil; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; import org.apache.cassandra.utils.bytecomparable.ByteSourceInverse; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; diff --git a/test/unit/org/apache/cassandra/index/accord/RangeMemoryIndexTest.java b/test/unit/org/apache/cassandra/index/accord/RangeMemoryIndexTest.java index 8e4fed96f4..5fdde25bf1 100644 --- a/test/unit/org/apache/cassandra/index/accord/RangeMemoryIndexTest.java +++ b/test/unit/org/apache/cassandra/index/accord/RangeMemoryIndexTest.java @@ -23,8 +23,10 @@ import java.util.List; import java.util.NavigableSet; import java.util.TreeSet; import java.util.function.Predicate; + import javax.annotation.Nullable; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,6 +38,7 @@ import accord.primitives.Txn; import accord.primitives.TxnId; import accord.utils.Property; import accord.utils.RandomSource; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.dht.Murmur3Partitioner; @@ -44,7 +47,6 @@ import org.apache.cassandra.service.accord.AccordKeyspace; import org.apache.cassandra.service.accord.JournalKey; import org.apache.cassandra.service.accord.TokenRange; import org.apache.cassandra.service.accord.api.TokenKey; -import org.assertj.core.api.Assertions; import static accord.utils.Property.commands; import static accord.utils.Property.stateful; diff --git a/test/unit/org/apache/cassandra/index/accord/RouteIndexTest.java b/test/unit/org/apache/cassandra/index/accord/RouteIndexTest.java index 92b825ba35..17460f4d54 100644 --- a/test/unit/org/apache/cassandra/index/accord/RouteIndexTest.java +++ b/test/unit/org/apache/cassandra/index/accord/RouteIndexTest.java @@ -29,9 +29,20 @@ import java.util.Set; import java.util.TreeSet; import java.util.function.Supplier; import java.util.stream.Collectors; + import javax.annotation.Nullable; -import accord.topology.EpochReady; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; + +import org.agrona.collections.Int2ObjectHashMap; +import org.agrona.collections.Long2ObjectHashMap; +import org.agrona.collections.ObjectHashSet; +import org.assertj.core.api.Assertions; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + import accord.api.Journal; import accord.api.RoutingKey; import accord.local.CommandStores; @@ -52,16 +63,13 @@ import accord.primitives.Route; import accord.primitives.SaveStatus; import accord.primitives.Txn; import accord.primitives.TxnId; +import accord.topology.EpochReady; import accord.utils.Gen; import accord.utils.Gens; import accord.utils.Property.Command; import accord.utils.Property.UnitCommand; import accord.utils.RandomSource; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; -import org.agrona.collections.Int2ObjectHashMap; -import org.agrona.collections.Long2ObjectHashMap; -import org.agrona.collections.ObjectHashSet; + import org.apache.cassandra.concurrent.ExecutorFactory; import org.apache.cassandra.concurrent.ForwardingExecutorFactory; import org.apache.cassandra.concurrent.ForwardingExecutorPlus; @@ -94,11 +102,6 @@ import org.apache.cassandra.utils.LazyToString; import org.apache.cassandra.utils.RTree; import org.apache.cassandra.utils.RangeTree; import org.apache.cassandra.utils.concurrent.CountDownLatch; -import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - import static accord.local.RedundantStatus.SomeStatus.NONE; import static accord.utils.Property.commands; diff --git a/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java b/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java index 39ee219c96..2dd72c594f 100644 --- a/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java +++ b/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java @@ -28,6 +28,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.awaitility.Awaitility; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java b/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java index 2a06a715bb..5833819267 100644 --- a/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java +++ b/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java @@ -31,6 +31,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; import com.google.common.collect.ImmutableSet; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/unit/org/apache/cassandra/index/sai/SAITester.java b/test/unit/org/apache/cassandra/index/sai/SAITester.java index 83940cf2f5..00896a850c 100644 --- a/test/unit/org/apache/cassandra/index/sai/SAITester.java +++ b/test/unit/org/apache/cassandra/index/sai/SAITester.java @@ -41,12 +41,20 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; + import javax.annotation.Nullable; import javax.management.AttributeNotFoundException; import javax.management.ObjectName; +import com.carrotsearch.randomizedtesting.generators.RandomInts; +import com.carrotsearch.randomizedtesting.generators.RandomStrings; +import com.datastax.driver.core.QueryTrace; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Session; import com.google.common.collect.Sets; import com.google.common.primitives.Ints; + +import org.apache.lucene.codecs.CodecUtil; import org.junit.After; import org.junit.Assert; import org.junit.BeforeClass; @@ -55,11 +63,6 @@ import org.junit.rules.TestRule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.carrotsearch.randomizedtesting.generators.RandomInts; -import com.carrotsearch.randomizedtesting.generators.RandomStrings; -import com.datastax.driver.core.QueryTrace; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Session; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.Config; @@ -80,11 +83,11 @@ import org.apache.cassandra.index.Index; import org.apache.cassandra.index.sai.disk.SSTableIndex; import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.format.OnDiskFormat; import org.apache.cassandra.index.sai.disk.format.Version; import org.apache.cassandra.index.sai.disk.v1.V1OnDiskFormat; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentBuilder; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.IndexTermType; import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.index.sai.utils.ResourceLeakDetector; @@ -109,7 +112,6 @@ import org.apache.cassandra.utils.ConfigGenBuilder; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.Throwables; import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import org.apache.lucene.codecs.CodecUtil; import static org.apache.cassandra.inject.ActionBuilder.newActionBuilder; import static org.apache.cassandra.inject.Expression.quote; diff --git a/test/unit/org/apache/cassandra/index/sai/analyzer/filter/BasicFiltersTest.java b/test/unit/org/apache/cassandra/index/sai/analyzer/filter/BasicFiltersTest.java index 9e7886e9bb..31fd832f14 100644 --- a/test/unit/org/apache/cassandra/index/sai/analyzer/filter/BasicFiltersTest.java +++ b/test/unit/org/apache/cassandra/index/sai/analyzer/filter/BasicFiltersTest.java @@ -20,10 +20,10 @@ package org.apache.cassandra.index.sai.analyzer.filter; import java.text.Normalizer; +import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter; import org.junit.Test; import org.apache.cassandra.index.sai.SAITester; -import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/index/sai/cql/AbstractQueryTester.java b/test/unit/org/apache/cassandra/index/sai/cql/AbstractQueryTester.java index 0772dc194c..eda19c06ff 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/AbstractQueryTester.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/AbstractQueryTester.java @@ -22,6 +22,7 @@ import java.util.LinkedList; import java.util.List; import com.google.common.collect.ImmutableList; + import org.junit.Before; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/test/unit/org/apache/cassandra/index/sai/cql/AbstractSimpleEqTestBase.java b/test/unit/org/apache/cassandra/index/sai/cql/AbstractSimpleEqTestBase.java index fae644f389..0d75ceab04 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/AbstractSimpleEqTestBase.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/AbstractSimpleEqTestBase.java @@ -22,16 +22,19 @@ import java.nio.ByteBuffer; import java.util.Comparator; import java.util.Map; import java.util.TreeMap; + import javax.annotation.Nullable; +import org.agrona.collections.IntArrayList; +import org.assertj.core.api.Assertions; + import accord.utils.Gen; import accord.utils.Property; -import org.agrona.collections.IntArrayList; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.index.sai.SAITester; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/index/sai/cql/AllTypesSimpleEqTest.java b/test/unit/org/apache/cassandra/index/sai/cql/AllTypesSimpleEqTest.java index 91bff0de97..6422ffe728 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/AllTypesSimpleEqTest.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/AllTypesSimpleEqTest.java @@ -27,16 +27,17 @@ import java.util.stream.Collectors; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.quicktheories.generators.SourceDSL; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.DecimalType; import org.apache.cassandra.index.sai.StorageAttachedIndex; import org.apache.cassandra.utils.AbstractTypeGenerators; import org.apache.cassandra.utils.Generators; -import org.quicktheories.generators.SourceDSL; @RunWith(Parameterized.class) public class AllTypesSimpleEqTest extends AbstractSimpleEqTestBase diff --git a/test/unit/org/apache/cassandra/index/sai/cql/AllowFilteringTest.java b/test/unit/org/apache/cassandra/index/sai/cql/AllowFilteringTest.java index 21bdfe9cf9..a6566a5263 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/AllowFilteringTest.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/AllowFilteringTest.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.restrictions.StatementRestrictions; +import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.index.IndexBuildInProgressException; import org.apache.cassandra.index.sai.SAITester; import org.apache.cassandra.index.sai.StorageAttachedIndex; @@ -33,7 +34,6 @@ import org.apache.cassandra.service.StorageService; import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertNotNull; -import org.apache.cassandra.exceptions.InvalidRequestException; /** * Tests that {@code ALLOW FILTERING} is required only if needed. */ diff --git a/test/unit/org/apache/cassandra/index/sai/cql/DecimalLargeValueTest.java b/test/unit/org/apache/cassandra/index/sai/cql/DecimalLargeValueTest.java index 107dae1c0a..d478c94189 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/DecimalLargeValueTest.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/DecimalLargeValueTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.index.sai.cql; import java.math.BigDecimal; import com.google.common.base.Preconditions; + import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/index/sai/cql/DescClusteringRangeQueryTest.java b/test/unit/org/apache/cassandra/index/sai/cql/DescClusteringRangeQueryTest.java index b85ca4aab9..0d52fdbf47 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/DescClusteringRangeQueryTest.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/DescClusteringRangeQueryTest.java @@ -22,9 +22,10 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; +import com.datastax.driver.core.ResultSet; + import org.junit.Test; -import com.datastax.driver.core.ResultSet; import org.apache.cassandra.index.sai.SAITester; public class DescClusteringRangeQueryTest extends SAITester diff --git a/test/unit/org/apache/cassandra/index/sai/cql/DuplicateRowIDTest.java b/test/unit/org/apache/cassandra/index/sai/cql/DuplicateRowIDTest.java index fd13e33473..1f1658f9c8 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/DuplicateRowIDTest.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/DuplicateRowIDTest.java @@ -19,10 +19,11 @@ package org.apache.cassandra.index.sai.cql; import java.util.List; +import com.datastax.driver.core.Row; + import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.Row; import org.apache.cassandra.index.sai.SAITester; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/index/sai/cql/IndexQuerySupport.java b/test/unit/org/apache/cassandra/index/sai/cql/IndexQuerySupport.java index e7ca55acec..5cb87c7db0 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/IndexQuerySupport.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/IndexQuerySupport.java @@ -25,13 +25,15 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import com.datastax.driver.core.exceptions.InvalidQueryException; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import org.assertj.core.api.Assertions; +import org.hamcrest.Matchers; import org.junit.Assert; -import com.datastax.driver.core.exceptions.InvalidQueryException; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.cql3.restrictions.StatementRestrictions; import org.apache.cassandra.db.marshal.InetAddressType; @@ -41,8 +43,6 @@ import org.apache.cassandra.db.marshal.TimestampType; import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.index.sai.plan.StorageAttachedIndexSearcher; import org.apache.cassandra.utils.Pair; -import org.assertj.core.api.Assertions; -import org.hamcrest.Matchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/index/sai/cql/IntraPartitionSkippingTest.java b/test/unit/org/apache/cassandra/index/sai/cql/IntraPartitionSkippingTest.java index a6537920a9..5c90eb185d 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/IntraPartitionSkippingTest.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/IntraPartitionSkippingTest.java @@ -18,10 +18,10 @@ package org.apache.cassandra.index.sai.cql; +import org.HdrHistogram.Histogram; import org.junit.Ignore; import org.junit.Test; -import org.HdrHistogram.Histogram; import org.apache.cassandra.index.sai.SAITester; /** diff --git a/test/unit/org/apache/cassandra/index/sai/cql/SingleNodeExecutor.java b/test/unit/org/apache/cassandra/index/sai/cql/SingleNodeExecutor.java index ea20311b03..0e5116a7dc 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/SingleNodeExecutor.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/SingleNodeExecutor.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.stream.Collectors; import com.datastax.driver.core.SimpleStatement; + import org.apache.cassandra.index.sai.SAITester; import org.apache.cassandra.inject.Injections; diff --git a/test/unit/org/apache/cassandra/index/sai/cql/StorageAttachedIndexDDLTest.java b/test/unit/org/apache/cassandra/index/sai/cql/StorageAttachedIndexDDLTest.java index 58c9a8d92b..e81869bf34 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/StorageAttachedIndexDDLTest.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/StorageAttachedIndexDDLTest.java @@ -31,15 +31,18 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.LongStream; -import com.google.common.collect.ImmutableMap; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.exceptions.InvalidConfigurationInQueryException; import com.datastax.driver.core.exceptions.InvalidQueryException; import com.datastax.driver.core.exceptions.ReadFailureException; +import com.google.common.collect.ImmutableMap; + +import org.assertj.core.api.Assertions; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mockito; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.ColumnIdentifier; @@ -77,8 +80,6 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.Throwables; -import org.assertj.core.api.Assertions; -import org.mockito.Mockito; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/test/unit/org/apache/cassandra/index/sai/cql/TokenRangeReadTest.java b/test/unit/org/apache/cassandra/index/sai/cql/TokenRangeReadTest.java index d63c2631e6..46afe22f81 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/TokenRangeReadTest.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/TokenRangeReadTest.java @@ -18,9 +18,9 @@ package org.apache.cassandra.index.sai.cql; -import org.apache.cassandra.cql3.restrictions.StatementRestrictions; import org.junit.Test; +import org.apache.cassandra.cql3.restrictions.StatementRestrictions; import org.apache.cassandra.index.sai.SAITester; import org.apache.cassandra.index.sai.StorageAttachedIndex; diff --git a/test/unit/org/apache/cassandra/index/sai/cql/VectorInvalidQueryTest.java b/test/unit/org/apache/cassandra/index/sai/cql/VectorInvalidQueryTest.java index 2ff33bbac4..c930997643 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/VectorInvalidQueryTest.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/VectorInvalidQueryTest.java @@ -21,6 +21,10 @@ package org.apache.cassandra.index.sai.cql; import java.util.Collections; import com.datastax.driver.core.exceptions.InvalidQueryException; + +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.QueryOptions; @@ -39,9 +43,6 @@ import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.transport.messages.ResultMessage; -import org.junit.BeforeClass; -import org.junit.Test; - import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/test/unit/org/apache/cassandra/index/sai/cql/VectorLocalTest.java b/test/unit/org/apache/cassandra/index/sai/cql/VectorLocalTest.java index 26b64c57c3..1f9705e11b 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/VectorLocalTest.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/VectorLocalTest.java @@ -28,16 +28,18 @@ import java.util.stream.IntStream; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; + +import org.assertj.core.data.Percentage; import org.junit.Test; -import io.github.jbellis.jvector.vector.VectorSimilarityFunction; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.marshal.FloatType; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.VectorType; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentBuilder; -import org.assertj.core.data.Percentage; + +import io.github.jbellis.jvector.vector.VectorSimilarityFunction; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/index/sai/cql/VectorTester.java b/test/unit/org/apache/cassandra/index/sai/cql/VectorTester.java index 564cd72a6e..ab72aabccf 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/VectorTester.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/VectorTester.java @@ -24,18 +24,20 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import io.github.jbellis.jvector.graph.GraphIndexBuilder; -import io.github.jbellis.jvector.graph.GraphSearcher; -import io.github.jbellis.jvector.vector.VectorEncoding; -import io.github.jbellis.jvector.vector.VectorSimilarityFunction; +import org.junit.Before; +import org.junit.BeforeClass; + import org.apache.cassandra.index.sai.SAITester; import org.apache.cassandra.index.sai.disk.v1.vector.ConcurrentVectorValues; import org.apache.cassandra.index.sai.utils.Glove; import org.apache.cassandra.inject.ActionBuilder; import org.apache.cassandra.inject.Injections; import org.apache.cassandra.inject.InvokePointBuilder; -import org.junit.Before; -import org.junit.BeforeClass; + +import io.github.jbellis.jvector.graph.GraphIndexBuilder; +import io.github.jbellis.jvector.graph.GraphSearcher; +import io.github.jbellis.jvector.vector.VectorEncoding; +import io.github.jbellis.jvector.vector.VectorSimilarityFunction; public class VectorTester extends SAITester { diff --git a/test/unit/org/apache/cassandra/index/sai/cql/VectorUpdateDeleteTest.java b/test/unit/org/apache/cassandra/index/sai/cql/VectorUpdateDeleteTest.java index 09571070c7..31bf3dfb7c 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/VectorUpdateDeleteTest.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/VectorUpdateDeleteTest.java @@ -18,10 +18,10 @@ package org.apache.cassandra.index.sai.cql; -import org.apache.cassandra.cql3.UntypedResultSet; - import org.junit.Test; +import org.apache.cassandra.cql3.UntypedResultSet; + import static org.apache.cassandra.config.CassandraRelevantProperties.SAI_VECTOR_SEARCH_ORDER_CHUNK_SIZE; import static org.apache.cassandra.index.sai.cql.VectorTypeTest.assertContainsInt; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/index/sai/cql/intersection/TwoRegularOneStaticIntersectionTest.java b/test/unit/org/apache/cassandra/index/sai/cql/intersection/TwoRegularOneStaticIntersectionTest.java index ddf4551e5e..2d9566f4f8 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/intersection/TwoRegularOneStaticIntersectionTest.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/intersection/TwoRegularOneStaticIntersectionTest.java @@ -18,13 +18,13 @@ package org.apache.cassandra.index.sai.cql.intersection; +import java.util.LinkedList; +import java.util.List; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import java.util.LinkedList; -import java.util.List; - import static org.apache.cassandra.index.sai.cql.intersection.RandomIntersectionTester.Mode.TWO_REGULAR_ONE_STATIC; @RunWith(Parameterized.class) diff --git a/test/unit/org/apache/cassandra/index/sai/cql/intersection/TwoRegularOneStaticPartitionIntersectionTest.java b/test/unit/org/apache/cassandra/index/sai/cql/intersection/TwoRegularOneStaticPartitionIntersectionTest.java index 2bfc7438a3..2357ab75bf 100644 --- a/test/unit/org/apache/cassandra/index/sai/cql/intersection/TwoRegularOneStaticPartitionIntersectionTest.java +++ b/test/unit/org/apache/cassandra/index/sai/cql/intersection/TwoRegularOneStaticPartitionIntersectionTest.java @@ -18,13 +18,13 @@ package org.apache.cassandra.index.sai.cql.intersection; +import java.util.LinkedList; +import java.util.List; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import java.util.LinkedList; -import java.util.List; - import static org.apache.cassandra.index.sai.cql.intersection.RandomIntersectionTester.Mode.TWO_REGULAR_ONE_STATIC; @RunWith(Parameterized.class) diff --git a/test/unit/org/apache/cassandra/index/sai/disk/NodeStartupTest.java b/test/unit/org/apache/cassandra/index/sai/disk/NodeStartupTest.java index 4f6dd4163f..9312ba299c 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/NodeStartupTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/NodeStartupTest.java @@ -26,7 +26,8 @@ import java.util.Objects; import java.util.stream.Stream; import com.google.common.collect.ObjectArrays; -import org.apache.cassandra.cql3.CQLTester; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -34,6 +35,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.index.SecondaryIndexManager; @@ -42,15 +44,14 @@ import org.apache.cassandra.index.sai.StorageAttachedIndex; import org.apache.cassandra.index.sai.StorageAttachedIndexBuilder; import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.format.Version; import org.apache.cassandra.index.sai.disk.v1.SSTableIndexWriter; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.IndexTermType; import org.apache.cassandra.inject.Injection; import org.apache.cassandra.inject.Injections; import org.apache.cassandra.inject.InvokePointBuilder; import org.apache.cassandra.schema.Schema; -import org.assertj.core.api.Assertions; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/SelectiveIntersectionTest.java b/test/unit/org/apache/cassandra/index/sai/disk/SelectiveIntersectionTest.java index 6806110d65..de4e055bbf 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/SelectiveIntersectionTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/SelectiveIntersectionTest.java @@ -17,12 +17,13 @@ */ package org.apache.cassandra.index.sai.disk; +import com.datastax.driver.core.Session; + import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.datastax.driver.core.Session; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.index.sai.SAITester; import org.apache.cassandra.index.sai.disk.v1.postings.PostingsReader; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/SingleNodeQueryFailureTest.java b/test/unit/org/apache/cassandra/index/sai/disk/SingleNodeQueryFailureTest.java index 8244a3ade8..2d6bc3b2ff 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/SingleNodeQueryFailureTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/SingleNodeQueryFailureTest.java @@ -17,12 +17,13 @@ */ package org.apache.cassandra.index.sai.disk; +import com.datastax.driver.core.exceptions.ReadFailureException; + import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.datastax.driver.core.exceptions.ReadFailureException; import org.apache.cassandra.index.sai.SAITester; import org.apache.cassandra.index.sai.disk.v1.postings.PostingListRangeIterator; import org.apache.cassandra.index.sai.disk.v1.segment.LiteralIndexSegmentTermsReader; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/format/IndexDescriptorTest.java b/test/unit/org/apache/cassandra/index/sai/disk/format/IndexDescriptorTest.java index bacca543d5..8d79de8d1e 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/format/IndexDescriptorTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/format/IndexDescriptorTest.java @@ -23,6 +23,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import com.google.common.io.Files; + import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/io/TrackingIndexFileUtils.java b/test/unit/org/apache/cassandra/index/sai/disk/io/TrackingIndexFileUtils.java index 6284a3b980..6979afa1e0 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/io/TrackingIndexFileUtils.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/io/TrackingIndexFileUtils.java @@ -25,9 +25,10 @@ import java.util.Map; import com.google.common.base.Throwables; +import org.apache.lucene.store.IndexInput; + import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.io.util.SequentialWriterOption; -import org.apache.lucene.store.IndexInput; import static org.junit.Assert.assertNotNull; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/BalancedTreeIndexSearcherTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/BalancedTreeIndexSearcherTest.java index 848dbf83a8..37416e3e71 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/BalancedTreeIndexSearcherTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/BalancedTreeIndexSearcherTest.java @@ -26,6 +26,7 @@ import java.util.stream.LongStream; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; + import org.junit.Test; import org.apache.cassandra.cql3.Operator; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/InvertedIndexBuilder.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/InvertedIndexBuilder.java index 50a2188010..76a98f6890 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/InvertedIndexBuilder.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/InvertedIndexBuilder.java @@ -25,6 +25,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; import com.carrotsearch.hppc.LongArrayList; + import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.bytecomparable.ByteComparable; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/InvertedIndexSearcherTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/InvertedIndexSearcherTest.java index 93ee3f99cd..06309e42a5 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/InvertedIndexSearcherTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/InvertedIndexSearcherTest.java @@ -21,9 +21,10 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; +import com.carrotsearch.hppc.LongArrayList; + import org.junit.Test; -import com.carrotsearch.hppc.LongArrayList; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.ClusteringComparator; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/MetadataTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/MetadataTest.java index db8eb28b7b..dd9842d360 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/MetadataTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/MetadataTest.java @@ -24,6 +24,9 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; +import org.apache.lucene.codecs.CodecUtil; +import org.apache.lucene.index.CorruptIndexException; +import org.apache.lucene.store.DataInput; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -31,13 +34,10 @@ import org.junit.rules.ExpectedException; import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.io.IndexOutputWriter; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.SAIRandomizedTester; import org.apache.cassandra.io.util.File; -import org.apache.lucene.codecs.CodecUtil; -import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.store.DataInput; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertFalse; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/SAICodecUtilsTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/SAICodecUtilsTest.java index 060eabb206..d2a58acf5f 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/SAICodecUtilsTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/SAICodecUtilsTest.java @@ -18,18 +18,18 @@ package org.apache.cassandra.index.sai.disk.v1; +import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.store.ChecksumIndexInput; +import org.apache.lucene.store.IndexInput; +import org.apache.lucene.store.IndexOutput; import org.junit.Before; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.index.sai.disk.io.IndexFileUtils; import org.apache.cassandra.index.sai.disk.io.IndexOutputWriter; import org.apache.cassandra.index.sai.utils.SAIRandomizedTester; import org.apache.cassandra.io.util.File; -import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.store.IndexInput; -import org.apache.lucene.store.IndexOutput; -import org.mockito.Mockito; import static org.apache.lucene.codecs.CodecUtil.CODEC_MAGIC; import static org.apache.lucene.codecs.CodecUtil.FOOTER_MAGIC; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/SegmentFlushTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/SegmentFlushTest.java index e580fffe01..e2837df331 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/SegmentFlushTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/SegmentFlushTest.java @@ -26,6 +26,7 @@ import java.util.Collections; import java.util.List; import com.google.common.base.Stopwatch; + import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; @@ -42,10 +43,10 @@ import org.apache.cassandra.index.sai.SAITester; import org.apache.cassandra.index.sai.StorageAttachedIndex; import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.utils.IndexEntry; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentBuilder; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; +import org.apache.cassandra.index.sai.utils.IndexEntry; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.index.sai.utils.TermsIterator; import org.apache.cassandra.io.sstable.Descriptor; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/SorterTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/SorterTest.java index d309ce6da1..4418279515 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/SorterTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/SorterTest.java @@ -19,11 +19,11 @@ package org.apache.cassandra.index.sai.disk.v1; import java.util.Arrays; +import org.apache.lucene.util.IntroSorter; +import org.apache.lucene.util.Sorter; import org.junit.Test; import org.apache.cassandra.index.sai.utils.SAIRandomizedTester; -import org.apache.lucene.util.IntroSorter; -import org.apache.lucene.util.Sorter; import static org.junit.Assert.assertArrayEquals; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsReaderTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsReaderTest.java index f73248a324..d6a03aa91b 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsReaderTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsReaderTest.java @@ -20,20 +20,21 @@ package org.apache.cassandra.index.sai.disk.v1; import java.io.IOException; import java.util.List; +import com.carrotsearch.hppc.LongArrayList; + import org.junit.Test; -import com.carrotsearch.hppc.LongArrayList; import org.apache.cassandra.index.sai.QueryContext; import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.utils.IndexEntry; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.v1.segment.LiteralIndexSegmentTermsReader; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; import org.apache.cassandra.index.sai.disk.v1.trie.LiteralIndexWriter; import org.apache.cassandra.index.sai.memory.MemtableTermsIterator; import org.apache.cassandra.index.sai.metrics.QueryEventListener; import org.apache.cassandra.index.sai.postings.PostingList; +import org.apache.cassandra.index.sai.utils.IndexEntry; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.SAIRandomizedTester; import org.apache.cassandra.index.sai.utils.TermsIterator; import org.apache.cassandra.io.util.FileHandle; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsScanner.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsScanner.java index 8a0d3443e7..dcb6f6754f 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsScanner.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsScanner.java @@ -21,6 +21,8 @@ package org.apache.cassandra.index.sai.disk.v1; import java.io.IOException; import java.nio.ByteBuffer; +import org.apache.lucene.store.IndexInput; + import org.apache.cassandra.index.sai.disk.io.IndexFileUtils; import org.apache.cassandra.index.sai.disk.v1.postings.PostingsReader; import org.apache.cassandra.index.sai.disk.v1.postings.ScanningPostingsReader; @@ -35,7 +37,6 @@ import org.apache.cassandra.utils.Throwables; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; import org.apache.cassandra.utils.bytecomparable.ByteSourceInverse; -import org.apache.lucene.store.IndexInput; public class TermsScanner implements TermsIterator { diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeIndexBuilder.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeIndexBuilder.java index 4764bce4a3..4f843df3fb 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeIndexBuilder.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeIndexBuilder.java @@ -28,9 +28,10 @@ import java.util.stream.IntStream; import java.util.stream.LongStream; import java.util.stream.Stream; +import com.carrotsearch.hppc.LongArrayList; + import org.junit.Assert; -import com.carrotsearch.hppc.LongArrayList; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.DecimalType; import org.apache.cassandra.db.marshal.Int32Type; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreePostingsWriterTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreePostingsWriterTest.java index ead3971967..78c8e2f18b 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreePostingsWriterTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreePostingsWriterTest.java @@ -22,23 +22,23 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.agrona.collections.IntArrayList; +import org.apache.lucene.store.IndexInput; +import org.apache.lucene.util.packed.PackedInts; +import org.apache.lucene.util.packed.PackedLongValues; import org.junit.Before; import org.junit.Test; -import org.agrona.collections.IntArrayList; import org.apache.cassandra.index.sai.SAITester; import org.apache.cassandra.index.sai.disk.ArrayPostingList; import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.io.IndexOutputWriter; import org.apache.cassandra.index.sai.disk.v1.postings.PostingsReader; import org.apache.cassandra.index.sai.metrics.QueryEventListener; import org.apache.cassandra.index.sai.postings.PostingList; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.SAIRandomizedTester; -import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.packed.PackedInts; -import org.apache.lucene.util.packed.PackedLongValues; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeReaderTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeReaderTest.java index 440fd91b9c..46cbba61e1 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeReaderTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeReaderTest.java @@ -24,6 +24,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import org.apache.lucene.index.PointValues.Relation; +import org.apache.lucene.util.NumericUtils; import org.junit.Before; import org.junit.Test; @@ -34,8 +36,8 @@ import org.apache.cassandra.index.sai.SAITester; import org.apache.cassandra.index.sai.StorageAttachedIndex; import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.disk.v1.segment.SegmentTrieBuffer; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; +import org.apache.cassandra.index.sai.disk.v1.segment.SegmentTrieBuffer; import org.apache.cassandra.index.sai.metrics.QueryEventListener; import org.apache.cassandra.index.sai.plan.Expression; import org.apache.cassandra.index.sai.postings.PostingList; @@ -43,8 +45,6 @@ import org.apache.cassandra.index.sai.utils.SAIRandomizedTester; import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Throwables; -import org.apache.lucene.index.PointValues.Relation; -import org.apache.lucene.util.NumericUtils; import static org.apache.lucene.index.PointValues.Relation.CELL_CROSSES_QUERY; import static org.apache.lucene.index.PointValues.Relation.CELL_INSIDE_QUERY; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeTest.java index 34e13a15da..064540d1d8 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeTest.java @@ -20,14 +20,14 @@ package org.apache.cassandra.index.sai.disk.v1.bbtree; import java.util.function.IntFunction; +import org.apache.lucene.store.ByteBuffersDataOutput; +import org.apache.lucene.store.ByteBuffersIndexOutput; +import org.apache.lucene.store.DataInput; import org.junit.Before; import org.junit.Test; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentTrieBuffer; import org.apache.cassandra.index.sai.utils.SAIRandomizedTester; -import org.apache.lucene.store.ByteBuffersDataOutput; -import org.apache.lucene.store.ByteBuffersIndexOutput; -import org.apache.lucene.store.DataInput; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/LeafOrderMapTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/LeafOrderMapTest.java index 86e860848a..6e7d3aca5a 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/LeafOrderMapTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/LeafOrderMapTest.java @@ -20,17 +20,18 @@ package org.apache.cassandra.index.sai.disk.v1.bbtree; import java.nio.ByteBuffer; import com.google.common.collect.Lists; -import org.junit.Test; -import org.apache.cassandra.index.sai.disk.ResettableByteBuffersIndexOutput; -import org.apache.cassandra.index.sai.disk.io.SeekingRandomAccessInput; -import org.apache.cassandra.index.sai.utils.SAIRandomizedTester; import org.apache.lucene.store.ByteBuffersDataInput; import org.apache.lucene.store.ByteBuffersIndexInput; import org.apache.lucene.store.IndexInput; import org.apache.lucene.util.LongValues; import org.apache.lucene.util.packed.DirectReader; import org.apache.lucene.util.packed.DirectWriter; +import org.junit.Test; + +import org.apache.cassandra.index.sai.disk.ResettableByteBuffersIndexOutput; +import org.apache.cassandra.index.sai.disk.io.SeekingRandomAccessInput; +import org.apache.cassandra.index.sai.utils.SAIRandomizedTester; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/NumericIndexWriterTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/NumericIndexWriterTest.java index a6bb3a35d2..773aeef111 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/NumericIndexWriterTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/bbtree/NumericIndexWriterTest.java @@ -19,21 +19,25 @@ package org.apache.cassandra.index.sai.disk.v1.bbtree; import java.nio.ByteBuffer; +import com.carrotsearch.hppc.LongArrayList; + +import org.apache.lucene.index.PointValues; +import org.apache.lucene.util.Counter; +import org.apache.lucene.util.NumericUtils; import org.junit.Before; import org.junit.Test; -import com.carrotsearch.hppc.LongArrayList; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.index.sai.QueryContext; import org.apache.cassandra.index.sai.SAITester; import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.disk.v1.segment.SegmentTrieBuffer; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentMetadata; +import org.apache.cassandra.index.sai.disk.v1.segment.SegmentTrieBuffer; import org.apache.cassandra.index.sai.memory.MemtableTermsIterator; import org.apache.cassandra.index.sai.metrics.QueryEventListener; import org.apache.cassandra.index.sai.postings.PostingList; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.IndexTermType; import org.apache.cassandra.index.sai.utils.SAIRandomizedTester; import org.apache.cassandra.index.sai.utils.TermsIterator; @@ -42,9 +46,6 @@ import org.apache.cassandra.utils.AbstractGuavaIterator; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; -import org.apache.lucene.index.PointValues; -import org.apache.lucene.util.Counter; -import org.apache.lucene.util.NumericUtils; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/keystore/KeyLookupTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/keystore/KeyLookupTest.java index 92a31f87f7..403fef7a82 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/keystore/KeyLookupTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/keystore/KeyLookupTest.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.lucene.store.IndexInput; import org.junit.Before; import org.junit.Test; @@ -48,7 +49,6 @@ import org.apache.cassandra.io.util.FileHandle; import org.apache.cassandra.utils.bytecomparable.ByteComparable; import org.apache.cassandra.utils.bytecomparable.ByteSource; import org.apache.cassandra.utils.bytecomparable.ByteSourceInverse; -import org.apache.lucene.store.IndexInput; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertArrayEquals; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/postings/MergePostingListTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/postings/MergePostingListTest.java index 989000eb0a..5cbfdfa8a2 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/postings/MergePostingListTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/postings/MergePostingListTest.java @@ -29,6 +29,7 @@ import java.util.stream.Collectors; import java.util.stream.LongStream; import com.google.common.primitives.Longs; + import org.junit.Test; import org.apache.cassandra.index.sai.disk.ArrayPostingList; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/postings/PostingsTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/postings/PostingsTest.java index c437ffbdeb..d5e9c3e8e1 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/postings/PostingsTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/postings/PostingsTest.java @@ -21,21 +21,21 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.LongStream; +import org.apache.lucene.store.IndexInput; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.apache.cassandra.index.sai.SAITester; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; -import org.apache.cassandra.index.sai.postings.PostingList; +import org.apache.cassandra.index.sai.disk.ArrayPostingList; import org.apache.cassandra.index.sai.disk.format.IndexComponent; import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; -import org.apache.cassandra.index.sai.metrics.QueryEventListener; -import org.apache.cassandra.index.sai.disk.ArrayPostingList; import org.apache.cassandra.index.sai.disk.v1.SAICodecUtils; +import org.apache.cassandra.index.sai.metrics.QueryEventListener; +import org.apache.cassandra.index.sai.postings.PostingList; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.SAIRandomizedTester; -import org.apache.lucene.store.IndexInput; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/postings/ScanningPostingsReader.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/postings/ScanningPostingsReader.java index 99b1f5f221..1af7b95e08 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/postings/ScanningPostingsReader.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/postings/ScanningPostingsReader.java @@ -20,10 +20,11 @@ package org.apache.cassandra.index.sai.disk.v1.postings; import java.io.IOException; -import org.apache.cassandra.index.sai.postings.PostingList; -import org.apache.cassandra.index.sai.metrics.QueryEventListener; import org.apache.lucene.store.IndexInput; +import org.apache.cassandra.index.sai.metrics.QueryEventListener; +import org.apache.cassandra.index.sai.postings.PostingList; + /** * A subclass of the {@link PostingsReader} that does not allow the {@link PostingList} to be * advanced and does not support mapping row ids to primary keys. diff --git a/test/unit/org/apache/cassandra/index/sai/functional/CompactionTest.java b/test/unit/org/apache/cassandra/index/sai/functional/CompactionTest.java index 4a0b265569..e9977380ec 100644 --- a/test/unit/org/apache/cassandra/index/sai/functional/CompactionTest.java +++ b/test/unit/org/apache/cassandra/index/sai/functional/CompactionTest.java @@ -27,11 +27,12 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import com.datastax.driver.core.exceptions.InvalidQueryException; import com.google.common.collect.Lists; + import org.junit.Assert; import org.junit.Test; -import com.datastax.driver.core.exceptions.InvalidQueryException; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.restrictions.StatementRestrictions; import org.apache.cassandra.db.ColumnFamilyStore; @@ -44,9 +45,9 @@ import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.index.sai.SAITester; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.v1.SSTableIndexWriter; import org.apache.cassandra.index.sai.disk.v1.segment.SegmentBuilder; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.IndexTermType; import org.apache.cassandra.inject.ActionBuilder; import org.apache.cassandra.inject.Expression; diff --git a/test/unit/org/apache/cassandra/index/sai/functional/DropTableTest.java b/test/unit/org/apache/cassandra/index/sai/functional/DropTableTest.java index b5322d3e08..4e207e808a 100644 --- a/test/unit/org/apache/cassandra/index/sai/functional/DropTableTest.java +++ b/test/unit/org/apache/cassandra/index/sai/functional/DropTableTest.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Objects; import com.google.common.collect.Iterables; + import org.junit.Test; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/test/unit/org/apache/cassandra/index/sai/functional/FlushingTest.java b/test/unit/org/apache/cassandra/index/sai/functional/FlushingTest.java index fa480b5c8d..d07c774cfe 100644 --- a/test/unit/org/apache/cassandra/index/sai/functional/FlushingTest.java +++ b/test/unit/org/apache/cassandra/index/sai/functional/FlushingTest.java @@ -20,13 +20,14 @@ */ package org.apache.cassandra.index.sai.functional; +import com.datastax.driver.core.ResultSet; + import org.junit.Test; -import com.datastax.driver.core.ResultSet; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.index.sai.SAITester; -import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.disk.v1.bbtree.NumericIndexWriter; +import org.apache.cassandra.index.sai.utils.IndexIdentifier; import org.apache.cassandra.index.sai.utils.IndexTermType; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/index/sai/functional/GroupComponentsTest.java b/test/unit/org/apache/cassandra/index/sai/functional/GroupComponentsTest.java index 0747f8eecf..d4ac27180e 100644 --- a/test/unit/org/apache/cassandra/index/sai/functional/GroupComponentsTest.java +++ b/test/unit/org/apache/cassandra/index/sai/functional/GroupComponentsTest.java @@ -23,6 +23,7 @@ import java.util.Set; import java.util.stream.Collectors; import com.google.common.collect.Iterables; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/index/sai/functional/NodeRestartTest.java b/test/unit/org/apache/cassandra/index/sai/functional/NodeRestartTest.java index 1dcacec8b9..b6b3b83d90 100644 --- a/test/unit/org/apache/cassandra/index/sai/functional/NodeRestartTest.java +++ b/test/unit/org/apache/cassandra/index/sai/functional/NodeRestartTest.java @@ -20,6 +20,7 @@ */ package org.apache.cassandra.index.sai.functional; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; @@ -32,7 +33,6 @@ import org.apache.cassandra.index.sai.utils.IndexTermType; import org.apache.cassandra.inject.Injection; import org.apache.cassandra.inject.Injections; import org.apache.cassandra.inject.InvokePointBuilder; -import org.assertj.core.api.Assertions; public class NodeRestartTest extends SAITester { diff --git a/test/unit/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIteratorTest.java b/test/unit/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIteratorTest.java index ee54fd6903..ddf24a900e 100644 --- a/test/unit/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIteratorTest.java +++ b/test/unit/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIteratorTest.java @@ -23,11 +23,12 @@ import java.util.List; import java.util.Set; import java.util.stream.IntStream; +import com.carrotsearch.hppc.LongHashSet; +import com.carrotsearch.hppc.LongSet; + import org.junit.Assert; import org.junit.Test; -import com.carrotsearch.hppc.LongHashSet; -import com.carrotsearch.hppc.LongSet; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.Pair; diff --git a/test/unit/org/apache/cassandra/index/sai/memory/InMemoryKeyRangeIteratorTest.java b/test/unit/org/apache/cassandra/index/sai/memory/InMemoryKeyRangeIteratorTest.java index 2da06f2447..991be82529 100644 --- a/test/unit/org/apache/cassandra/index/sai/memory/InMemoryKeyRangeIteratorTest.java +++ b/test/unit/org/apache/cassandra/index/sai/memory/InMemoryKeyRangeIteratorTest.java @@ -21,8 +21,8 @@ import java.util.Arrays; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.index.sai.iterators.KeyRangeIterator; +import org.apache.cassandra.index.sai.utils.PrimaryKey; public class InMemoryKeyRangeIteratorTest extends AbstractInMemoryKeyRangeIteratorTester { diff --git a/test/unit/org/apache/cassandra/index/sai/memory/PriorityInMemoryKeyRangeIteratorTest.java b/test/unit/org/apache/cassandra/index/sai/memory/PriorityInMemoryKeyRangeIteratorTest.java index 5864c79b55..ab297042fd 100644 --- a/test/unit/org/apache/cassandra/index/sai/memory/PriorityInMemoryKeyRangeIteratorTest.java +++ b/test/unit/org/apache/cassandra/index/sai/memory/PriorityInMemoryKeyRangeIteratorTest.java @@ -21,8 +21,8 @@ import java.util.Arrays; import java.util.PriorityQueue; import org.apache.cassandra.dht.Murmur3Partitioner; -import org.apache.cassandra.index.sai.utils.PrimaryKey; import org.apache.cassandra.index.sai.iterators.KeyRangeIterator; +import org.apache.cassandra.index.sai.utils.PrimaryKey; public class PriorityInMemoryKeyRangeIteratorTest extends AbstractInMemoryKeyRangeIteratorTester { diff --git a/test/unit/org/apache/cassandra/index/sai/memory/TrieMemoryIndexTest.java b/test/unit/org/apache/cassandra/index/sai/memory/TrieMemoryIndexTest.java index 963742c02c..3e512e9e23 100644 --- a/test/unit/org/apache/cassandra/index/sai/memory/TrieMemoryIndexTest.java +++ b/test/unit/org/apache/cassandra/index/sai/memory/TrieMemoryIndexTest.java @@ -29,10 +29,10 @@ import java.util.TreeMap; import java.util.function.IntFunction; import java.util.stream.Collectors; +import org.HdrHistogram.Histogram; import org.junit.Ignore; import org.junit.Test; -import org.HdrHistogram.Histogram; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.cql3.statements.schema.IndexTarget; import org.apache.cassandra.db.Clustering; diff --git a/test/unit/org/apache/cassandra/index/sai/memory/VectorMemoryIndexTest.java b/test/unit/org/apache/cassandra/index/sai/memory/VectorMemoryIndexTest.java index 9a0ba6177a..e1be7b276e 100644 --- a/test/unit/org/apache/cassandra/index/sai/memory/VectorMemoryIndexTest.java +++ b/test/unit/org/apache/cassandra/index/sai/memory/VectorMemoryIndexTest.java @@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.google.common.collect.Sets; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/index/sai/metrics/QueryMetricsTest.java b/test/unit/org/apache/cassandra/index/sai/metrics/QueryMetricsTest.java index f6b808e1e0..a361aeaac7 100644 --- a/test/unit/org/apache/cassandra/index/sai/metrics/QueryMetricsTest.java +++ b/test/unit/org/apache/cassandra/index/sai/metrics/QueryMetricsTest.java @@ -19,12 +19,12 @@ package org.apache.cassandra.index.sai.metrics; import javax.management.InstanceNotFoundException; +import com.datastax.driver.core.ResultSet; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import com.datastax.driver.core.ResultSet; - import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/index/sai/metrics/SegmentFlushingFailureTester.java b/test/unit/org/apache/cassandra/index/sai/metrics/SegmentFlushingFailureTester.java index 4b98a94671..c421a54fdb 100644 --- a/test/unit/org/apache/cassandra/index/sai/metrics/SegmentFlushingFailureTester.java +++ b/test/unit/org/apache/cassandra/index/sai/metrics/SegmentFlushingFailureTester.java @@ -24,13 +24,13 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.apache.cassandra.utils.FBUtilities; +import com.datastax.driver.core.ResultSet; + import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.datastax.driver.core.ResultSet; import org.apache.cassandra.config.StorageAttachedIndexOptions; import org.apache.cassandra.index.sai.SAITester; import org.apache.cassandra.index.sai.disk.v1.SSTableComponentsWriter; @@ -39,6 +39,7 @@ import org.apache.cassandra.index.sai.disk.v1.segment.SegmentBuilder; import org.apache.cassandra.index.sai.utils.NamedMemoryLimiter; import org.apache.cassandra.inject.Injection; import org.apache.cassandra.inject.Injections; +import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.inject.Injections.newCounter; import static org.apache.cassandra.inject.InvokePointBuilder.newInvokePoint; diff --git a/test/unit/org/apache/cassandra/index/sai/metrics/StateMetricsTest.java b/test/unit/org/apache/cassandra/index/sai/metrics/StateMetricsTest.java index 8e83293e61..a070d1c5bb 100644 --- a/test/unit/org/apache/cassandra/index/sai/metrics/StateMetricsTest.java +++ b/test/unit/org/apache/cassandra/index/sai/metrics/StateMetricsTest.java @@ -19,12 +19,12 @@ package org.apache.cassandra.index.sai.metrics; import javax.management.InstanceNotFoundException; +import com.datastax.driver.core.ResultSet; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import com.datastax.driver.core.ResultSet; - import static org.apache.cassandra.index.sai.metrics.TableStateMetrics.TABLE_STATE_METRIC_TYPE; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/index/sai/plan/FlushIndexWhileQueryingTest.java b/test/unit/org/apache/cassandra/index/sai/plan/FlushIndexWhileQueryingTest.java index 8fa871427c..4208ec58b6 100644 --- a/test/unit/org/apache/cassandra/index/sai/plan/FlushIndexWhileQueryingTest.java +++ b/test/unit/org/apache/cassandra/index/sai/plan/FlushIndexWhileQueryingTest.java @@ -22,13 +22,13 @@ import java.util.concurrent.ForkJoinPool; import org.junit.Test; -import static org.junit.Assert.assertEquals; - import org.apache.cassandra.index.sai.SAITester; import org.apache.cassandra.index.sai.disk.IndexSearchResultIterator; import org.apache.cassandra.inject.Injections; import org.apache.cassandra.inject.InvokePointBuilder; +import static org.junit.Assert.assertEquals; + /** * Test to cover edge cases related to memtable flush during query execution. */ diff --git a/test/unit/org/apache/cassandra/index/sai/plan/OperationTest.java b/test/unit/org/apache/cassandra/index/sai/plan/OperationTest.java index 218dca8734..1485d3e367 100644 --- a/test/unit/org/apache/cassandra/index/sai/plan/OperationTest.java +++ b/test/unit/org/apache/cassandra/index/sai/plan/OperationTest.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/index/sai/utils/IndexInputLeakDetector.java b/test/unit/org/apache/cassandra/index/sai/utils/IndexInputLeakDetector.java index 35e556f763..7d867b2981 100644 --- a/test/unit/org/apache/cassandra/index/sai/utils/IndexInputLeakDetector.java +++ b/test/unit/org/apache/cassandra/index/sai/utils/IndexInputLeakDetector.java @@ -24,12 +24,14 @@ import java.util.Map; import java.util.Set; import com.carrotsearch.randomizedtesting.rules.TestRuleAdapter; + +import org.apache.lucene.store.IndexInput; + import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; import org.apache.cassandra.index.sai.disk.io.TrackingIndexFileUtils; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.util.SequentialWriterOption; import org.apache.cassandra.schema.TableMetadata; -import org.apache.lucene.store.IndexInput; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/index/sai/utils/ResourceLeakDetector.java b/test/unit/org/apache/cassandra/index/sai/utils/ResourceLeakDetector.java index b44d544881..ba4c31d3ab 100644 --- a/test/unit/org/apache/cassandra/index/sai/utils/ResourceLeakDetector.java +++ b/test/unit/org/apache/cassandra/index/sai/utils/ResourceLeakDetector.java @@ -20,11 +20,12 @@ package org.apache.cassandra.index.sai.utils; import java.util.List; +import com.carrotsearch.randomizedtesting.rules.StatementAdapter; + import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import com.carrotsearch.randomizedtesting.rules.StatementAdapter; import org.apache.cassandra.inject.Injections; import org.apache.cassandra.inject.InvokePointBuilder; diff --git a/test/unit/org/apache/cassandra/index/sai/utils/SAIRandomizedTester.java b/test/unit/org/apache/cassandra/index/sai/utils/SAIRandomizedTester.java index f3129a44f8..7cff65acd8 100644 --- a/test/unit/org/apache/cassandra/index/sai/utils/SAIRandomizedTester.java +++ b/test/unit/org/apache/cassandra/index/sai/utils/SAIRandomizedTester.java @@ -20,6 +20,7 @@ package org.apache.cassandra.index.sai.utils; import java.io.IOException; import com.google.common.base.Preconditions; + import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.rules.RuleChain; @@ -30,9 +31,9 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.index.sai.SAITester; +import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; import org.apache.cassandra.index.sai.disk.io.IndexFileUtils; import org.apache.cassandra.index.sai.postings.PostingList; -import org.apache.cassandra.index.sai.disk.format.IndexDescriptor; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.SequenceBasedSSTableId; import org.apache.cassandra.io.util.File; diff --git a/test/unit/org/apache/cassandra/index/sai/virtual/IndexesSystemViewTest.java b/test/unit/org/apache/cassandra/index/sai/virtual/IndexesSystemViewTest.java index 59dd8a3850..ee2b185a11 100644 --- a/test/unit/org/apache/cassandra/index/sai/virtual/IndexesSystemViewTest.java +++ b/test/unit/org/apache/cassandra/index/sai/virtual/IndexesSystemViewTest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.index.sai.virtual; import com.google.common.collect.ImmutableList; + import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/index/sai/virtual/SSTablesSystemViewTest.java b/test/unit/org/apache/cassandra/index/sai/virtual/SSTablesSystemViewTest.java index 7de346611f..cb2cb36401 100644 --- a/test/unit/org/apache/cassandra/index/sai/virtual/SSTablesSystemViewTest.java +++ b/test/unit/org/apache/cassandra/index/sai/virtual/SSTablesSystemViewTest.java @@ -21,6 +21,7 @@ import java.util.Objects; import com.google.common.collect.ImmutableList; import com.googlecode.concurrenttrees.common.Iterables; + import org.junit.BeforeClass; import org.junit.Test; @@ -32,8 +33,8 @@ import org.apache.cassandra.db.virtual.VirtualKeyspaceRegistry; import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.dht.Token; import org.apache.cassandra.index.sai.SAITester; -import org.apache.cassandra.index.sai.disk.SSTableIndex; import org.apache.cassandra.index.sai.StorageAttachedIndex; +import org.apache.cassandra.index.sai.disk.SSTableIndex; import org.apache.cassandra.io.sstable.SSTableId; import org.apache.cassandra.io.sstable.SSTableIdFactory; import org.apache.cassandra.io.sstable.format.SSTableReader; diff --git a/test/unit/org/apache/cassandra/index/sai/virtual/SegmentsSystemViewTest.java b/test/unit/org/apache/cassandra/index/sai/virtual/SegmentsSystemViewTest.java index d6fcb132ca..0065773d0c 100644 --- a/test/unit/org/apache/cassandra/index/sai/virtual/SegmentsSystemViewTest.java +++ b/test/unit/org/apache/cassandra/index/sai/virtual/SegmentsSystemViewTest.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import com.google.common.collect.ImmutableList; + import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/index/sasi/SASICQLTest.java b/test/unit/org/apache/cassandra/index/sasi/SASICQLTest.java index e746fabdde..cf53f4ad89 100644 --- a/test/unit/org/apache/cassandra/index/sasi/SASICQLTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/SASICQLTest.java @@ -22,14 +22,14 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import com.google.common.collect.Sets; -import org.junit.Test; - import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.exceptions.InvalidQueryException; +import com.google.common.collect.Sets; + import org.junit.Assert; +import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; diff --git a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java index fd7757f845..1b4076692a 100644 --- a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java @@ -50,6 +50,8 @@ import java.util.stream.Stream; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -61,9 +63,9 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.cql3.QueryProcessor; -import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.cql3.statements.schema.IndexTarget; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Columns; @@ -132,7 +134,6 @@ import org.apache.cassandra.service.snapshot.TableSnapshot; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; -import org.assertj.core.api.Assertions; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_CONFIG; diff --git a/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java b/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java index bebf757ed7..b90b4068b4 100644 --- a/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java @@ -23,16 +23,16 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; +import org.apache.commons.io.IOUtils; +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.SetType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.commons.io.IOUtils; - -import org.junit.Assert; -import org.junit.Test; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/index/sasi/analyzer/NonTokenizingAnalyzerTest.java b/test/unit/org/apache/cassandra/index/sasi/analyzer/NonTokenizingAnalyzerTest.java index abe4978132..1b40e175db 100644 --- a/test/unit/org/apache/cassandra/index/sasi/analyzer/NonTokenizingAnalyzerTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/analyzer/NonTokenizingAnalyzerTest.java @@ -19,13 +19,13 @@ package org.apache.cassandra.index.sasi.analyzer; import java.nio.ByteBuffer; +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.utils.ByteBufferUtil; -import org.junit.Assert; -import org.junit.Test; - import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; /** diff --git a/test/unit/org/apache/cassandra/index/sasi/conf/IndexModeTest.java b/test/unit/org/apache/cassandra/index/sasi/conf/IndexModeTest.java index 848fc5cf1c..546e4cfff9 100644 --- a/test/unit/org/apache/cassandra/index/sasi/conf/IndexModeTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/conf/IndexModeTest.java @@ -21,6 +21,7 @@ import java.util.Collections; import java.util.Map; import com.google.common.collect.ImmutableMap; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java b/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java index 0abddd9193..6d34dedacb 100644 --- a/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java @@ -18,42 +18,52 @@ package org.apache.cassandra.index.sasi.disk; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.TreeSet; import java.util.concurrent.ThreadLocalRandom; import java.util.stream.Collectors; +import com.carrotsearch.hppc.LongSet; +import com.carrotsearch.hppc.cursors.LongCursor; +import com.google.common.base.Function; +import com.google.common.collect.Iterators; +import com.google.common.collect.Sets; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.index.sasi.plan.Expression; import org.apache.cassandra.index.sasi.utils.CombinedTerm; import org.apache.cassandra.index.sasi.utils.CombinedTermIterator; import org.apache.cassandra.index.sasi.utils.OnDiskIndexIterator; import org.apache.cassandra.index.sasi.utils.RangeIterator; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.Int32Type; -import org.apache.cassandra.db.marshal.LongType; -import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.MurmurHash; import org.apache.cassandra.utils.Pair; -import com.carrotsearch.hppc.LongSet; -import com.carrotsearch.hppc.cursors.LongCursor; - -import com.google.common.base.Function; -import com.google.common.collect.Iterators; -import com.google.common.collect.Sets; - -import org.junit.Assert; - -import org.junit.BeforeClass; -import org.junit.Test; - public class OnDiskIndexTest { @BeforeClass diff --git a/test/unit/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriterTest.java b/test/unit/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriterTest.java index e12befe0c1..bebca8b1d1 100644 --- a/test/unit/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriterTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriterTest.java @@ -31,6 +31,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ThreadLocalRandom; import com.google.common.util.concurrent.Futures; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java b/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java index 6d067a1d14..93946219ba 100644 --- a/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java @@ -19,38 +19,46 @@ package org.apache.cassandra.index.sasi.disk; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.TreeSet; +import com.carrotsearch.hppc.LongHashSet; +import com.carrotsearch.hppc.LongSet; +import com.carrotsearch.hppc.cursors.LongCursor; +import com.google.common.base.Function; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder.EntryType; import org.apache.cassandra.index.sasi.utils.CombinedTerm; import org.apache.cassandra.index.sasi.utils.CombinedValue; import org.apache.cassandra.index.sasi.utils.MappedBuffer; import org.apache.cassandra.index.sasi.utils.RangeIterator; -import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.index.sasi.utils.RangeUnionIterator; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.io.util.SequentialWriterOption; -import org.apache.cassandra.utils.MurmurHash; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.io.util.SequentialWriter; - -import org.junit.Assert; - -import org.junit.BeforeClass; -import org.junit.Test; -import org.apache.commons.lang3.builder.HashCodeBuilder; -import com.carrotsearch.hppc.LongHashSet; -import com.carrotsearch.hppc.LongSet; -import com.carrotsearch.hppc.cursors.LongCursor; -import com.google.common.base.Function; +import org.apache.cassandra.io.util.SequentialWriterOption; +import org.apache.cassandra.utils.MurmurHash; public class TokenTreeTest { diff --git a/test/unit/org/apache/cassandra/index/sasi/plan/ExpressionTest.java b/test/unit/org/apache/cassandra/index/sasi/plan/ExpressionTest.java index 5eeb5ef362..d2fa690802 100644 --- a/test/unit/org/apache/cassandra/index/sasi/plan/ExpressionTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/plan/ExpressionTest.java @@ -19,12 +19,13 @@ package org.apache.cassandra.index.sasi.plan; import java.nio.ByteBuffer; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import org.junit.Test; import org.apache.cassandra.db.marshal.UTF8Type; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class ExpressionTest { diff --git a/test/unit/org/apache/cassandra/index/sasi/plan/OperationTest.java b/test/unit/org/apache/cassandra/index/sasi/plan/OperationTest.java index d8bc539c71..5e1b06b667 100644 --- a/test/unit/org/apache/cassandra/index/sasi/plan/OperationTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/plan/OperationTest.java @@ -18,32 +18,51 @@ package org.apache.cassandra.index.sasi.plan; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; import com.google.common.collect.ListMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.ServerTestUtils; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.cql3.Operator; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.PartitionRangeReadCommand; import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.db.marshal.DoubleType; -import org.apache.cassandra.db.rows.*; -import org.apache.cassandra.index.sasi.plan.Operation.OperationType; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.rows.BTreeRow; +import org.apache.cassandra.db.rows.BufferCell; +import org.apache.cassandra.db.rows.Cell; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.Unfiltered; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.index.sasi.plan.Operation.OperationType; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import org.junit.*; - import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_CONFIG; public class OperationTest extends SchemaLoader diff --git a/test/unit/org/apache/cassandra/index/sasi/utils/LongIterator.java b/test/unit/org/apache/cassandra/index/sasi/utils/LongIterator.java index e7ff5b89fe..7fea9ac92b 100644 --- a/test/unit/org/apache/cassandra/index/sasi/utils/LongIterator.java +++ b/test/unit/org/apache/cassandra/index/sasi/utils/LongIterator.java @@ -25,6 +25,7 @@ import java.util.List; import com.carrotsearch.hppc.LongHashSet; import com.carrotsearch.hppc.LongSet; + import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.index.sasi.disk.Token; diff --git a/test/unit/org/apache/cassandra/index/sasi/utils/LongIteratorTest.java b/test/unit/org/apache/cassandra/index/sasi/utils/LongIteratorTest.java index f61252ac18..217caa7ef4 100644 --- a/test/unit/org/apache/cassandra/index/sasi/utils/LongIteratorTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/utils/LongIteratorTest.java @@ -17,11 +17,11 @@ */ package org.apache.cassandra.index.sasi.utils; +import java.io.IOException; + import org.junit.Assert; import org.junit.Test; -import java.io.IOException; - public class LongIteratorTest { @Test diff --git a/test/unit/org/apache/cassandra/index/sasi/utils/RangeIntersectionIteratorTest.java b/test/unit/org/apache/cassandra/index/sasi/utils/RangeIntersectionIteratorTest.java index e796240689..54c113bdd0 100644 --- a/test/unit/org/apache/cassandra/index/sasi/utils/RangeIntersectionIteratorTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/utils/RangeIntersectionIteratorTest.java @@ -18,21 +18,23 @@ package org.apache.cassandra.index.sasi.utils; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.concurrent.ThreadLocalRandom; -import org.apache.cassandra.index.sasi.disk.Token; -import org.apache.cassandra.index.sasi.utils.RangeIntersectionIterator.Strategy; -import org.apache.cassandra.index.sasi.utils.RangeIntersectionIterator.LookupIntersectionIterator; -import org.apache.cassandra.index.sasi.utils.RangeIntersectionIterator.BounceIntersectionIterator; -import org.apache.cassandra.io.util.FileUtils; - import com.carrotsearch.hppc.LongHashSet; import com.carrotsearch.hppc.LongSet; import org.junit.Assert; import org.junit.Test; +import org.apache.cassandra.index.sasi.disk.Token; +import org.apache.cassandra.index.sasi.utils.RangeIntersectionIterator.BounceIntersectionIterator; +import org.apache.cassandra.index.sasi.utils.RangeIntersectionIterator.LookupIntersectionIterator; +import org.apache.cassandra.index.sasi.utils.RangeIntersectionIterator.Strategy; +import org.apache.cassandra.io.util.FileUtils; + import static org.apache.cassandra.index.sasi.utils.LongIterator.convert; public class RangeIntersectionIteratorTest diff --git a/test/unit/org/apache/cassandra/index/sasi/utils/RangeUnionIteratorTest.java b/test/unit/org/apache/cassandra/index/sasi/utils/RangeUnionIteratorTest.java index 581f4e5bd4..509b4863f5 100644 --- a/test/unit/org/apache/cassandra/index/sasi/utils/RangeUnionIteratorTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/utils/RangeUnionIteratorTest.java @@ -17,15 +17,17 @@ */ package org.apache.cassandra.index.sasi.utils; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.concurrent.ThreadLocalRandom; -import org.apache.cassandra.index.sasi.disk.Token; -import org.apache.cassandra.io.util.FileUtils; - import org.junit.Assert; import org.junit.Test; +import org.apache.cassandra.index.sasi.disk.Token; +import org.apache.cassandra.io.util.FileUtils; + import static org.apache.cassandra.index.sasi.utils.LongIterator.convert; public class RangeUnionIteratorTest diff --git a/test/unit/org/apache/cassandra/inject/Injections.java b/test/unit/org/apache/cassandra/inject/Injections.java index 809d8940cb..5a0c083c5c 100644 --- a/test/unit/org/apache/cassandra/inject/Injections.java +++ b/test/unit/org/apache/cassandra/inject/Injections.java @@ -36,14 +36,15 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import com.google.common.collect.Lists; -import org.apache.commons.io.IOUtils; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.NativeLibrary; +import org.apache.commons.io.IOUtils; import org.jboss.byteman.agent.install.Install; import org.jboss.byteman.agent.submit.Submit; import org.jboss.byteman.rule.helper.Helper; +import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.NativeLibrary; + import static org.apache.cassandra.inject.ActionBuilder.newActionBuilder; import static org.apache.cassandra.inject.Expression.expr; import static org.apache.cassandra.inject.Expression.method; diff --git a/test/unit/org/apache/cassandra/io/DiskSpaceMetricsTest.java b/test/unit/org/apache/cassandra/io/DiskSpaceMetricsTest.java index 63b8e5b99c..dd42454978 100644 --- a/test/unit/org/apache/cassandra/io/DiskSpaceMetricsTest.java +++ b/test/unit/org/apache/cassandra/io/DiskSpaceMetricsTest.java @@ -27,6 +27,7 @@ import java.util.stream.Collectors; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; + import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/io/FileSystemListeners.java b/test/unit/org/apache/cassandra/io/FileSystemListeners.java index 2e3f784717..86d51ad3c3 100644 --- a/test/unit/org/apache/cassandra/io/FileSystemListeners.java +++ b/test/unit/org/apache/cassandra/io/FileSystemListeners.java @@ -28,6 +28,7 @@ import java.util.IdentityHashMap; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; + import javax.annotation.Nullable; import org.apache.cassandra.io.filesystem.ListenableFileSystem; diff --git a/test/unit/org/apache/cassandra/io/IVersionedSerializers.java b/test/unit/org/apache/cassandra/io/IVersionedSerializers.java index cbf62fb58c..e274f29fff 100644 --- a/test/unit/org/apache/cassandra/io/IVersionedSerializers.java +++ b/test/unit/org/apache/cassandra/io/IVersionedSerializers.java @@ -20,11 +20,13 @@ package org.apache.cassandra.io; import java.io.IOException; +import org.assertj.core.api.Assertions; + import accord.utils.LazyToString; import accord.utils.ReflectionUtils; + import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; -import org.assertj.core.api.Assertions; public class IVersionedSerializers { diff --git a/test/unit/org/apache/cassandra/io/Serializers.java b/test/unit/org/apache/cassandra/io/Serializers.java index 34da9e4b35..8a1f58a2dc 100644 --- a/test/unit/org/apache/cassandra/io/Serializers.java +++ b/test/unit/org/apache/cassandra/io/Serializers.java @@ -22,11 +22,13 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.function.BiConsumer; +import org.assertj.core.api.Assertions; + import accord.utils.LazyToString; import accord.utils.ReflectionUtils; + import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; -import org.assertj.core.api.Assertions; public class Serializers { diff --git a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java index 056761b560..591c2aa433 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java @@ -24,6 +24,7 @@ import java.io.RandomAccessFile; import java.util.Arrays; import java.util.Random; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; @@ -42,7 +43,6 @@ import org.apache.cassandra.io.util.SequentialWriter; import org.apache.cassandra.io.util.SequentialWriterOption; import org.apache.cassandra.schema.CompressionParams; import org.apache.cassandra.utils.SyncUtil; -import org.assertj.core.api.Assertions; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java index ada098e6d0..4dfc277719 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java @@ -28,6 +28,7 @@ import java.util.List; import java.util.Random; import com.google.common.io.Files; + import org.junit.After; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/io/compress/CompressorTest.java b/test/unit/org/apache/cassandra/io/compress/CompressorTest.java index dad3ae44ae..1de1e914a7 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressorTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressorTest.java @@ -17,7 +17,8 @@ */ package org.apache.cassandra.io.compress; -import java.io.*; +import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; @@ -27,15 +28,18 @@ import java.util.Collections; import java.util.Random; import com.google.common.io.Files; -import org.apache.cassandra.io.util.File; -import static org.junit.Assert.*; + import org.junit.Assert; import org.junit.Test; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.utils.ByteBufferUtil; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; + public class CompressorTest { ICompressor compressor; diff --git a/test/unit/org/apache/cassandra/io/compress/ZstdCompressorTest.java b/test/unit/org/apache/cassandra/io/compress/ZstdCompressorTest.java index b360280b9e..0c5c5d46e1 100644 --- a/test/unit/org/apache/cassandra/io/compress/ZstdCompressorTest.java +++ b/test/unit/org/apache/cassandra/io/compress/ZstdCompressorTest.java @@ -20,10 +20,10 @@ package org.apache.cassandra.io.compress; import java.util.Collections; -import com.google.common.collect.ImmutableMap; -import org.junit.Test; - import com.github.luben.zstd.Zstd; +import com.google.common.collect.ImmutableMap; + +import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/io/compress/ZstdDictionaryCompressorTest.java b/test/unit/org/apache/cassandra/io/compress/ZstdDictionaryCompressorTest.java index c56a03dd77..7439eaea8f 100644 --- a/test/unit/org/apache/cassandra/io/compress/ZstdDictionaryCompressorTest.java +++ b/test/unit/org/apache/cassandra/io/compress/ZstdDictionaryCompressorTest.java @@ -18,20 +18,22 @@ package org.apache.cassandra.io.compress; -import com.github.luben.zstd.Zstd; -import com.github.luben.zstd.ZstdDictTrainer; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.compression.ZstdCompressionDictionary; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - import java.io.IOException; import java.nio.ByteBuffer; import java.util.Collections; import java.util.Map; import java.util.Random; +import com.github.luben.zstd.Zstd; +import com.github.luben.zstd.ZstdDictTrainer; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.compression.ZstdCompressionDictionary; + import static org.apache.cassandra.db.compression.CompressionDictionary.DictId; import static org.apache.cassandra.db.compression.CompressionDictionary.Kind; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java index 9c4b4fb936..8bd2933af2 100644 --- a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.io.sstable; import com.google.common.io.Files; + import org.junit.After; import org.junit.Before; diff --git a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterConcurrencyTest.java b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterConcurrencyTest.java index 54d8cec32c..f1d883f657 100644 --- a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterConcurrencyTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterConcurrencyTest.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import org.assertj.core.description.Description; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -37,7 +38,6 @@ import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.io.util.File; import org.apache.cassandra.schema.Schema; -import org.assertj.core.description.Description; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java index 4710a0054b..a9a304787b 100644 --- a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java @@ -42,15 +42,16 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; +import com.datastax.driver.core.utils.UUIDs; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; + import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.datastax.driver.core.utils.UUIDs; import org.apache.cassandra.Util; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.cql3.QueryProcessor; @@ -80,7 +81,6 @@ import org.apache.cassandra.io.sstable.format.SSTableFormat; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.big.BigFormat; import org.apache.cassandra.io.sstable.format.bti.BtiFormat; -import org.apache.cassandra.utils.CompressionDictionaryHelper; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.PathUtils; import org.apache.cassandra.locator.RangesAtEndpoint; @@ -91,6 +91,7 @@ import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.CompressionDictionaryHelper; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.JavaDriverUtils; import org.apache.cassandra.utils.OutputHandler; diff --git a/test/unit/org/apache/cassandra/io/sstable/ComponentTest.java b/test/unit/org/apache/cassandra/io/sstable/ComponentTest.java index e58238c444..aa4cf649de 100644 --- a/test/unit/org/apache/cassandra/io/sstable/ComponentTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/ComponentTest.java @@ -22,7 +22,9 @@ import java.util.HashSet; import java.util.function.Function; import com.google.common.collect.Sets; + import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; @@ -31,7 +33,6 @@ import org.apache.cassandra.io.sstable.SSTableFormatTest.Format1; import org.apache.cassandra.io.sstable.SSTableFormatTest.Format2; import org.apache.cassandra.io.sstable.format.SSTableFormat.Components; import org.apache.cassandra.io.sstable.format.big.BigFormat; -import org.mockito.Mockito; import static org.apache.cassandra.io.sstable.SSTableFormatTest.factory; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java index eb7480e309..2c80779a29 100644 --- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java @@ -30,7 +30,6 @@ import java.util.Random; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import org.apache.cassandra.ServerTestUtils; import org.junit.After; import org.junit.Assert; import org.junit.BeforeClass; @@ -41,6 +40,7 @@ import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; @@ -60,8 +60,8 @@ import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.io.sstable.format.SSTableFormat; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.Version; -import org.apache.cassandra.io.sstable.keycache.KeyCacheSupport; import org.apache.cassandra.io.sstable.format.big.BigFormat; +import org.apache.cassandra.io.sstable.keycache.KeyCacheSupport; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileInputStreamPlus; import org.apache.cassandra.io.util.FileOutputStreamPlus; diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableFlushObserverTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableFlushObserverTest.java index f9f46a1b8c..8c07d3bec6 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableFlushObserverTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableFlushObserverTest.java @@ -29,6 +29,7 @@ import java.util.stream.Stream; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; + import org.apache.commons.lang3.tuple.ImmutableTriple; import org.apache.commons.lang3.tuple.Triple; import org.junit.Assert; @@ -36,7 +37,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; - import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.DecoratedKey; diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableFormatTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableFormatTest.java index 30a68dd212..18ec40b1e8 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableFormatTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableFormatTest.java @@ -25,9 +25,11 @@ import java.util.Map; import java.util.function.BiFunction; import com.google.common.collect.ImmutableMap; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.Config.SSTableConfig; @@ -41,7 +43,6 @@ import org.apache.cassandra.io.sstable.format.Version; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileOutputStreamPlus; import org.apache.cassandra.io.util.FileUtils; -import org.mockito.Mockito; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableIdTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableIdTest.java index 82fbf32537..c02fbba0c3 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableIdTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableIdTest.java @@ -35,11 +35,12 @@ import java.util.stream.Stream; import com.google.common.collect.Sets; import com.google.common.primitives.UnsignedBytes; + +import org.awaitility.Awaitility; import org.junit.Test; import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.utils.TimeUUID; -import org.awaitility.Awaitility; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java index 63f8075b5a..0ec6b5d73c 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java @@ -25,9 +25,10 @@ import java.util.concurrent.TimeUnit; import com.google.common.io.Files; -import org.apache.cassandra.db.rows.Row; -import org.apache.cassandra.ServerTestUtils; -import org.apache.cassandra.io.util.File; +import org.awaitility.Awaitility; +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.byteman.rule.Rule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -35,6 +36,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.Util; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.ColumnFamilyStore; @@ -42,7 +44,9 @@ import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.partitions.FilteredPartition; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.io.FSWriteError; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.locator.Replica; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.schema.KeyspaceParams; @@ -58,10 +62,6 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.OutputHandler; import org.apache.cassandra.utils.concurrent.AsyncFuture; -import org.awaitility.Awaitility; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; -import org.jboss.byteman.rule.Rule; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java index 54471c30bf..108fb5c15b 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java @@ -37,12 +37,14 @@ import java.util.stream.Stream; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; + import org.junit.After; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.mockito.Mockito; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.ServerTestUtils; @@ -93,7 +95,6 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Throwables; import org.apache.cassandra.utils.concurrent.Ref; import org.apache.cassandra.utils.concurrent.SelfRefCounted; -import org.mockito.Mockito; import static java.lang.String.format; import static org.apache.cassandra.cql3.QueryProcessor.executeInternal; diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java index 5cb5bc32c1..69414329cc 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java @@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + import org.junit.Test; import org.apache.cassandra.UpdateBuilder; diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java index 136b23ff86..588bd7ed89 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java @@ -27,6 +27,8 @@ import java.util.function.Consumer; import java.util.function.Function; import com.google.common.collect.Iterables; + +import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -53,7 +55,6 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.ByteBufferUtil; -import org.hamcrest.Matchers; import static org.apache.cassandra.dht.AbstractBounds.isEmpty; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java b/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java index d2f5f6104e..c3729901ef 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java @@ -19,9 +19,23 @@ package org.apache.cassandra.io.sstable; +import java.io.IOException; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.stream.Stream; + import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.RegularAndStaticColumns; +import org.apache.cassandra.db.RowUpdateBuilder; +import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.db.rows.EncodingStats; import org.apache.cassandra.db.rows.Unfiltered; @@ -33,10 +47,6 @@ import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableMetadata; -import java.io.IOException; -import java.util.*; -import java.util.stream.Stream; - import static org.apache.cassandra.service.ActiveRepairService.NO_PENDING_REPAIR; import static org.apache.cassandra.service.ActiveRepairService.UNREPAIRED_SSTABLE; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java b/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java index e4c47c68b1..49523811cb 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java @@ -26,12 +26,12 @@ import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.cassandra.ServerTestUtils; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableZeroCopyWriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableZeroCopyWriterTest.java index 4d64a73602..03449b7e6a 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableZeroCopyWriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableZeroCopyWriterTest.java @@ -29,8 +29,6 @@ import java.util.function.Function; import org.junit.BeforeClass; import org.junit.Test; -import io.netty.buffer.Unpooled; -import io.netty.channel.embedded.EmbeddedChannel; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.db.ColumnFamilyStore; @@ -56,6 +54,9 @@ import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; +import io.netty.buffer.Unpooled; +import io.netty.channel.embedded.EmbeddedChannel; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; diff --git a/test/unit/org/apache/cassandra/io/sstable/ScrubTest.java b/test/unit/org/apache/cassandra/io/sstable/ScrubTest.java index 7696d5d9d5..f641be4149 100644 --- a/test/unit/org/apache/cassandra/io/sstable/ScrubTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/ScrubTest.java @@ -39,7 +39,12 @@ import java.util.concurrent.atomic.AtomicInteger; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; + +import net.openhft.chronicle.core.util.ThrowingBiConsumer; + import org.apache.commons.lang3.ArrayUtils; +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.AfterClass; import org.junit.Assume; import org.junit.Before; @@ -49,7 +54,6 @@ import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.openhft.chronicle.core.util.ThrowingBiConsumer; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.UpdateBuilder; import org.apache.cassandra.Util; @@ -97,8 +101,6 @@ import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.OutputHandler; import org.apache.cassandra.utils.Throwables; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.apache.cassandra.SchemaLoader.counterCFMD; import static org.apache.cassandra.SchemaLoader.createKeyspace; diff --git a/test/unit/org/apache/cassandra/io/sstable/VerifyTest.java b/test/unit/org/apache/cassandra/io/sstable/VerifyTest.java index 1d79c1d29d..75a454570d 100644 --- a/test/unit/org/apache/cassandra/io/sstable/VerifyTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/VerifyTest.java @@ -30,6 +30,7 @@ import java.util.zip.CRC32; import java.util.zip.CheckedInputStream; import com.google.common.base.Charsets; + import org.apache.commons.lang3.StringUtils; import org.junit.Assume; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/io/sstable/format/AbstractTestVersionSupportedFeatures.java b/test/unit/org/apache/cassandra/io/sstable/format/AbstractTestVersionSupportedFeatures.java index a6c4c06c26..aba947c0eb 100644 --- a/test/unit/org/apache/cassandra/io/sstable/format/AbstractTestVersionSupportedFeatures.java +++ b/test/unit/org/apache/cassandra/io/sstable/format/AbstractTestVersionSupportedFeatures.java @@ -24,11 +24,11 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; -import org.assertj.core.api.Assertions; public abstract class AbstractTestVersionSupportedFeatures { diff --git a/test/unit/org/apache/cassandra/io/sstable/format/ColumnIndexTest.java b/test/unit/org/apache/cassandra/io/sstable/format/ColumnIndexTest.java index 442d4d35bf..99e3584fe9 100644 --- a/test/unit/org/apache/cassandra/io/sstable/format/ColumnIndexTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/format/ColumnIndexTest.java @@ -23,19 +23,20 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.IntFunction; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; + import org.apache.commons.lang3.StringUtils; +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMRules; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMRules; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/io/sstable/format/big/RowIndexEntryTest.java b/test/unit/org/apache/cassandra/io/sstable/format/big/RowIndexEntryTest.java index a4b56f1765..acd41cd111 100644 --- a/test/unit/org/apache/cassandra/io/sstable/format/big/RowIndexEntryTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/format/big/RowIndexEntryTest.java @@ -27,6 +27,7 @@ import java.util.Iterator; import java.util.List; import com.google.common.primitives.Ints; + import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/io/sstable/format/bti/LoadingBuilderTest.java b/test/unit/org/apache/cassandra/io/sstable/format/bti/LoadingBuilderTest.java index a56ca8e537..11f2a557e8 100644 --- a/test/unit/org/apache/cassandra/io/sstable/format/bti/LoadingBuilderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/format/bti/LoadingBuilderTest.java @@ -22,6 +22,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Assume; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,8 +33,6 @@ import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.File; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/test/unit/org/apache/cassandra/io/sstable/format/bti/PartitionIndexTest.java b/test/unit/org/apache/cassandra/io/sstable/format/bti/PartitionIndexTest.java index 36e9f8fb06..d6fadbf20b 100644 --- a/test/unit/org/apache/cassandra/io/sstable/format/bti/PartitionIndexTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/format/bti/PartitionIndexTest.java @@ -37,6 +37,7 @@ import java.util.function.Supplier; import com.google.common.collect.HashMultiset; import com.google.common.collect.Lists; import com.google.common.collect.Multiset; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/io/sstable/format/bti/RowIndexTest.java b/test/unit/org/apache/cassandra/io/sstable/format/bti/RowIndexTest.java index b477bec4db..1771b10cc4 100644 --- a/test/unit/org/apache/cassandra/io/sstable/format/bti/RowIndexTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/format/bti/RowIndexTest.java @@ -29,6 +29,7 @@ import java.util.stream.Collectors; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryManagerTest.java b/test/unit/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryManagerTest.java index 40d04a4840..b7596ae07b 100644 --- a/test/unit/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryManagerTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryManagerTest.java @@ -35,6 +35,7 @@ import java.util.function.Consumer; import com.google.common.base.Joiner; import com.google.common.collect.Sets; + import org.junit.After; import org.junit.Assume; import org.junit.Before; diff --git a/test/unit/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryTest.java b/test/unit/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryTest.java index 079437c6ff..451c25aaa7 100644 --- a/test/unit/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryTest.java @@ -27,6 +27,7 @@ import java.util.Random; import java.util.UUID; import com.google.common.collect.Lists; + import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/io/sstable/keycache/KeyCacheTest.java b/test/unit/org/apache/cassandra/io/sstable/keycache/KeyCacheTest.java index abe83b59d5..3c20152581 100644 --- a/test/unit/org/apache/cassandra/io/sstable/keycache/KeyCacheTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/keycache/KeyCacheTest.java @@ -30,9 +30,15 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import com.google.common.collect.ImmutableList; + +import org.assertj.core.api.Assertions; +import org.hamcrest.Matchers; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mockito; +import org.mockito.internal.stubbing.answers.AnswersWithDelay; +import org.mockito.invocation.InvocationOnMock; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; @@ -57,11 +63,6 @@ import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.CacheService; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.concurrent.Refs; -import org.assertj.core.api.Assertions; -import org.hamcrest.Matchers; -import org.mockito.Mockito; -import org.mockito.internal.stubbing.answers.AnswersWithDelay; -import org.mockito.invocation.InvocationOnMock; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; diff --git a/test/unit/org/apache/cassandra/io/tries/TrieNodeTest.java b/test/unit/org/apache/cassandra/io/tries/TrieNodeTest.java index 20ad1f4287..04acb82321 100644 --- a/test/unit/org/apache/cassandra/io/tries/TrieNodeTest.java +++ b/test/unit/org/apache/cassandra/io/tries/TrieNodeTest.java @@ -23,12 +23,12 @@ import java.util.Arrays; import org.junit.After; import org.junit.Test; - -import org.apache.cassandra.io.util.DataOutputBuffer; import org.mockito.Mockito; import org.quicktheories.api.Pair; import org.quicktheories.generators.Generate; +import org.apache.cassandra.io.util.DataOutputBuffer; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.mockito.Mockito.reset; diff --git a/test/unit/org/apache/cassandra/io/tries/WalkerTest.java b/test/unit/org/apache/cassandra/io/tries/WalkerTest.java index 033ab5a5af..c61b20c383 100644 --- a/test/unit/org/apache/cassandra/io/tries/WalkerTest.java +++ b/test/unit/org/apache/cassandra/io/tries/WalkerTest.java @@ -26,10 +26,10 @@ import java.util.function.LongSupplier; import java.util.function.LongToIntFunction; import java.util.stream.IntStream; +import org.agrona.collections.IntArrayList; import org.apache.commons.lang3.StringUtils; import org.junit.Test; -import org.agrona.collections.IntArrayList; import org.apache.cassandra.io.sstable.format.Version; import org.apache.cassandra.io.sstable.format.bti.BtiFormat; import org.apache.cassandra.io.util.DataOutputBuffer; diff --git a/test/unit/org/apache/cassandra/io/util/BufferedDataOutputStreamTest.java b/test/unit/org/apache/cassandra/io/util/BufferedDataOutputStreamTest.java index 466552469e..629b7adb5b 100644 --- a/test/unit/org/apache/cassandra/io/util/BufferedDataOutputStreamTest.java +++ b/test/unit/org/apache/cassandra/io/util/BufferedDataOutputStreamTest.java @@ -20,14 +20,15 @@ */ package org.apache.cassandra.io.util; -import com.google.common.primitives.UnsignedBytes; -import com.google.common.primitives.UnsignedLong; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.CassandraUInt; -import org.apache.cassandra.utils.vint.VIntCoding; -import org.junit.Test; - -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInput; +import java.io.DataInputStream; +import java.io.DataOutput; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.UTFDataFormatException; import java.lang.reflect.Field; import java.nio.BufferOverflowException; import java.nio.ByteBuffer; @@ -36,9 +37,20 @@ import java.nio.channels.WritableByteChannel; import java.util.Arrays; import java.util.Random; +import com.google.common.primitives.UnsignedBytes; +import com.google.common.primitives.UnsignedLong; + +import org.junit.Test; + +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.CassandraUInt; +import org.apache.cassandra.utils.vint.VIntCoding; + import static org.apache.cassandra.utils.Clock.Global.nanoTime; import static org.apache.cassandra.utils.FBUtilities.preventIllegalAccessWarnings; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; public class BufferedDataOutputStreamTest { diff --git a/test/unit/org/apache/cassandra/io/util/ChecksumedDataTest.java b/test/unit/org/apache/cassandra/io/util/ChecksumedDataTest.java index 5389c79bb7..204ef4ef44 100644 --- a/test/unit/org/apache/cassandra/io/util/ChecksumedDataTest.java +++ b/test/unit/org/apache/cassandra/io/util/ChecksumedDataTest.java @@ -26,6 +26,7 @@ import java.util.zip.Checksum; import javax.annotation.Nullable; +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.utils.Gen; @@ -33,8 +34,8 @@ import accord.utils.Gens; import accord.utils.Property.Command; import accord.utils.Property.Commands; import accord.utils.Property.UnitCommand; + import org.apache.cassandra.utils.FailingConsumer; -import org.assertj.core.api.Assertions; import static accord.utils.Property.stateful; diff --git a/test/unit/org/apache/cassandra/io/util/ChecksummedRandomAccessReaderTest.java b/test/unit/org/apache/cassandra/io/util/ChecksummedRandomAccessReaderTest.java index 196a0b25c8..6c616a60d8 100644 --- a/test/unit/org/apache/cassandra/io/util/ChecksummedRandomAccessReaderTest.java +++ b/test/unit/org/apache/cassandra/io/util/ChecksummedRandomAccessReaderTest.java @@ -27,10 +27,11 @@ import java.util.concurrent.ThreadLocalRandom; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import org.apache.cassandra.config.DatabaseDescriptor; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertTrue; + public class ChecksummedRandomAccessReaderTest { @BeforeClass diff --git a/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java b/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java index 5d92d4584f..9d988d0228 100644 --- a/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java +++ b/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java @@ -23,9 +23,9 @@ import java.util.ArrayList; import java.util.List; import org.junit.After; +import org.junit.Assert; import org.junit.BeforeClass; -import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; public class ChecksummedSequentialWriterTest extends SequentialWriterTest diff --git a/test/unit/org/apache/cassandra/io/util/CompressedChunkReaderTest.java b/test/unit/org/apache/cassandra/io/util/CompressedChunkReaderTest.java index 9a7473873e..17ce00e421 100644 --- a/test/unit/org/apache/cassandra/io/util/CompressedChunkReaderTest.java +++ b/test/unit/org/apache/cassandra/io/util/CompressedChunkReaderTest.java @@ -18,8 +18,17 @@ package org.apache.cassandra.io.util; +import java.nio.ByteBuffer; +import java.nio.file.Files; +import java.util.concurrent.atomic.AtomicInteger; + +import org.assertj.core.api.Assertions; +import org.junit.Assert; +import org.junit.Test; + import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.io.compress.CompressedSequentialWriter; @@ -28,14 +37,6 @@ import org.apache.cassandra.io.filesystem.ListenableFileSystem; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; import org.apache.cassandra.schema.CompressionParams; import org.apache.cassandra.utils.memory.MemoryUtil; -import org.assertj.core.api.Assertions; - -import org.junit.Assert; -import org.junit.Test; - -import java.nio.ByteBuffer; -import java.nio.file.Files; -import java.util.concurrent.atomic.AtomicInteger; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/io/util/DataOutputInputPlusTest.java b/test/unit/org/apache/cassandra/io/util/DataOutputInputPlusTest.java index 8be57b5faa..9cab927f11 100644 --- a/test/unit/org/apache/cassandra/io/util/DataOutputInputPlusTest.java +++ b/test/unit/org/apache/cassandra/io/util/DataOutputInputPlusTest.java @@ -18,10 +18,10 @@ package org.apache.cassandra.io.util; +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.utils.Gens; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/io/util/FileSegmentInputStreamTest.java b/test/unit/org/apache/cassandra/io/util/FileSegmentInputStreamTest.java index 0f72e33760..091883c07b 100644 --- a/test/unit/org/apache/cassandra/io/util/FileSegmentInputStreamTest.java +++ b/test/unit/org/apache/cassandra/io/util/FileSegmentInputStreamTest.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.Random; import com.google.common.primitives.Ints; + import org.junit.Test; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/test/unit/org/apache/cassandra/io/util/FileTest.java b/test/unit/org/apache/cassandra/io/util/FileTest.java index 718f321042..ad2d305caa 100644 --- a/test/unit/org/apache/cassandra/io/util/FileTest.java +++ b/test/unit/org/apache/cassandra/io/util/FileTest.java @@ -33,13 +33,14 @@ import java.util.function.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.RateLimiter; + import org.apache.commons.lang3.RandomUtils; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; +import org.psjava.util.Triple; import org.apache.cassandra.config.DatabaseDescriptor; -import org.assertj.core.api.Assertions; -import org.psjava.util.Triple; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java b/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java index 9d97bcf50e..1821b99213 100644 --- a/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java +++ b/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java @@ -25,12 +25,12 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; -import org.assertj.core.api.Assertions; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/io/util/MemoryTest.java b/test/unit/org/apache/cassandra/io/util/MemoryTest.java index 677992fa92..0278c6d51f 100644 --- a/test/unit/org/apache/cassandra/io/util/MemoryTest.java +++ b/test/unit/org/apache/cassandra/io/util/MemoryTest.java @@ -25,9 +25,9 @@ import java.nio.ByteOrder; import java.util.Arrays; import java.util.concurrent.ThreadLocalRandom; +import org.junit.Assert; import org.junit.Test; -import org.junit.Assert; import org.apache.cassandra.utils.memory.MemoryUtil; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java b/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java index af4c6f042d..5eaa0272d5 100644 --- a/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java +++ b/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.Random; import com.google.common.primitives.Ints; + import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/io/util/NIODataInputStreamTest.java b/test/unit/org/apache/cassandra/io/util/NIODataInputStreamTest.java index 73bf1adf10..634d3016ba 100644 --- a/test/unit/org/apache/cassandra/io/util/NIODataInputStreamTest.java +++ b/test/unit/org/apache/cassandra/io/util/NIODataInputStreamTest.java @@ -20,12 +20,12 @@ */ package org.apache.cassandra.io.util; -import com.google.common.base.Charsets; -import com.google.common.primitives.UnsignedBytes; -import com.google.common.primitives.UnsignedLong; -import org.junit.Test; - -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.EOFException; +import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; @@ -33,10 +33,19 @@ import java.util.ArrayDeque; import java.util.Queue; import java.util.Random; +import com.google.common.base.Charsets; +import com.google.common.primitives.UnsignedBytes; +import com.google.common.primitives.UnsignedLong; + +import org.junit.Test; + import org.apache.cassandra.utils.CassandraUInt; import static org.apache.cassandra.utils.Clock.Global.nanoTime; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class NIODataInputStreamTest { diff --git a/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java b/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java index 80543b0229..94167364d5 100644 --- a/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java +++ b/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java @@ -26,17 +26,17 @@ import java.util.List; import java.util.concurrent.ThreadLocalRandom; import com.google.common.io.Files; + import org.junit.After; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.Assert; - import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.utils.concurrent.AbstractTransactionalTest; -import static org.apache.commons.io.FileUtils.*; +import static org.apache.commons.io.FileUtils.readFileToByteArray; import static org.junit.Assert.assertEquals; public class SequentialWriterTest extends AbstractTransactionalTest diff --git a/test/unit/org/apache/cassandra/io/util/TailOverridingRebuffererTest.java b/test/unit/org/apache/cassandra/io/util/TailOverridingRebuffererTest.java index 85da3573c8..6cfcd8a3f9 100644 --- a/test/unit/org/apache/cassandra/io/util/TailOverridingRebuffererTest.java +++ b/test/unit/org/apache/cassandra/io/util/TailOverridingRebuffererTest.java @@ -21,7 +21,6 @@ package org.apache.cassandra.io.util; import java.nio.ByteBuffer; import org.junit.Test; - import org.mockito.Mockito; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/io/util/ThreadLocalReadAheadBufferTest.java b/test/unit/org/apache/cassandra/io/util/ThreadLocalReadAheadBufferTest.java index e374c6303f..80031ae5e5 100644 --- a/test/unit/org/apache/cassandra/io/util/ThreadLocalReadAheadBufferTest.java +++ b/test/unit/org/apache/cassandra/io/util/ThreadLocalReadAheadBufferTest.java @@ -30,7 +30,8 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; - +import org.quicktheories.WithQuickTheories; +import org.quicktheories.core.Gen; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,8 +39,6 @@ import org.apache.cassandra.config.DataStorageSpec; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.utils.Pair; -import org.quicktheories.WithQuickTheories; -import org.quicktheories.core.Gen; import static java.lang.Math.max; import static org.apache.cassandra.config.CassandraRelevantProperties.JAVA_IO_TMPDIR; diff --git a/test/unit/org/apache/cassandra/journal/DescriptorTest.java b/test/unit/org/apache/cassandra/journal/DescriptorTest.java index f0f2975be9..52abf62fca 100644 --- a/test/unit/org/apache/cassandra/journal/DescriptorTest.java +++ b/test/unit/org/apache/cassandra/journal/DescriptorTest.java @@ -24,15 +24,17 @@ import java.util.List; import java.util.Set; import com.google.common.collect.Sets; + +import org.assertj.core.api.Condition; import org.junit.Test; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.Files; import org.apache.cassandra.io.util.PathUtils; import org.apache.cassandra.utils.Pair; -import org.assertj.core.api.Condition; import static accord.utils.Property.qt; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/journal/IndexTest.java b/test/unit/org/apache/cassandra/journal/IndexTest.java index acde8cc69c..fe39ffc96a 100644 --- a/test/unit/org/apache/cassandra/journal/IndexTest.java +++ b/test/unit/org/apache/cassandra/journal/IndexTest.java @@ -29,17 +29,19 @@ import java.util.TreeMap; import java.util.stream.Collectors; import com.google.common.collect.Maps; + +import org.agrona.collections.IntHashSet; import org.junit.Assert; import org.junit.Test; +import org.quicktheories.core.Gen; +import org.quicktheories.impl.Constraint; import accord.utils.Invariants; -import org.agrona.collections.IntHashSet; + import org.apache.cassandra.io.util.File; import org.apache.cassandra.utils.Generators; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.TimeUUID; -import org.quicktheories.core.Gen; -import org.quicktheories.impl.Constraint; import static org.apache.cassandra.journal.Index.composeOffsetAndSize; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; diff --git a/test/unit/org/apache/cassandra/journal/SegmentTest.java b/test/unit/org/apache/cassandra/journal/SegmentTest.java index 6eb8d53ec2..240922a01e 100644 --- a/test/unit/org/apache/cassandra/journal/SegmentTest.java +++ b/test/unit/org/apache/cassandra/journal/SegmentTest.java @@ -17,22 +17,25 @@ */ package org.apache.cassandra.journal; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.file.Files; + +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.concurrent.ImmediateExecutor; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.util.File; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.concurrent.OpOrder; -import org.junit.Assert; -import org.junit.Test; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.file.Files; import static org.apache.cassandra.harry.checker.TestHelper.withRandom; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class SegmentTest { diff --git a/test/unit/org/apache/cassandra/locator/AssureSufficientLiveNodesTest.java b/test/unit/org/apache/cassandra/locator/AssureSufficientLiveNodesTest.java index 008c3854e2..a4d6fce559 100644 --- a/test/unit/org/apache/cassandra/locator/AssureSufficientLiveNodesTest.java +++ b/test/unit/org/apache/cassandra/locator/AssureSufficientLiveNodesTest.java @@ -32,7 +32,9 @@ import java.util.function.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.cassandra.schema.*; + +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,11 +48,14 @@ import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Token; import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; import org.apache.cassandra.exceptions.UnavailableException; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.SchemaTestUtil; +import org.apache.cassandra.schema.TableId; +import org.apache.cassandra.schema.Tables; import org.apache.cassandra.service.reads.NeverSpeculativeRetryPolicy; import org.apache.cassandra.service.reads.ReadCoordinator; import org.apache.cassandra.utils.FBUtilities; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.apache.cassandra.db.ConsistencyLevel.EACH_QUORUM; import static org.apache.cassandra.db.ConsistencyLevel.LOCAL_QUORUM; diff --git a/test/unit/org/apache/cassandra/locator/AzureConnectorMockingTest.java b/test/unit/org/apache/cassandra/locator/AzureConnectorMockingTest.java index 17aa357979..956ddab7bd 100644 --- a/test/unit/org/apache/cassandra/locator/AzureConnectorMockingTest.java +++ b/test/unit/org/apache/cassandra/locator/AzureConnectorMockingTest.java @@ -20,10 +20,11 @@ package org.apache.cassandra.locator; import java.util.Properties; +import com.github.tomakehurst.wiremock.junit.WireMockRule; + import org.junit.Rule; import org.junit.Test; -import com.github.tomakehurst.wiremock.junit.WireMockRule; import org.apache.cassandra.locator.AbstractCloudMetadataServiceConnector.DefaultCloudMetadataServiceConnector; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; diff --git a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java index e1cf4ab517..24e98b6d7f 100644 --- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java +++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java @@ -19,7 +19,8 @@ package org.apache.cassandra.locator; import java.io.IOException; -import java.util.*; +import java.util.Arrays; +import java.util.List; import org.junit.After; import org.junit.Before; diff --git a/test/unit/org/apache/cassandra/locator/Ec2SnitchTest.java b/test/unit/org/apache/cassandra/locator/Ec2SnitchTest.java index cb8476da04..23752275f0 100644 --- a/test/unit/org/apache/cassandra/locator/Ec2SnitchTest.java +++ b/test/unit/org/apache/cassandra/locator/Ec2SnitchTest.java @@ -24,9 +24,11 @@ import java.util.Map; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.stubbing.Answer; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Murmur3Partitioner; @@ -36,7 +38,6 @@ import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.StubClusterMetadataService; import org.apache.cassandra.tcm.membership.Directory; import org.apache.cassandra.utils.Pair; -import org.mockito.stubbing.Answer; import static org.apache.cassandra.locator.Ec2MultiRegionSnitch.PRIVATE_IP_QUERY; import static org.apache.cassandra.locator.Ec2MultiRegionSnitch.PUBLIC_IP_QUERY; diff --git a/test/unit/org/apache/cassandra/locator/Ec2V2ConnectorMockingTest.java b/test/unit/org/apache/cassandra/locator/Ec2V2ConnectorMockingTest.java index 8fdbdfa093..f185fbfd1f 100644 --- a/test/unit/org/apache/cassandra/locator/Ec2V2ConnectorMockingTest.java +++ b/test/unit/org/apache/cassandra/locator/Ec2V2ConnectorMockingTest.java @@ -20,11 +20,12 @@ package org.apache.cassandra.locator; import java.util.Properties; +import com.github.tomakehurst.wiremock.client.MappingBuilder; +import com.github.tomakehurst.wiremock.junit.WireMockRule; + import org.junit.Rule; import org.junit.Test; -import com.github.tomakehurst.wiremock.client.MappingBuilder; -import com.github.tomakehurst.wiremock.junit.WireMockRule; import org.apache.cassandra.locator.Ec2MetadataServiceConnector.V2Connector; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; diff --git a/test/unit/org/apache/cassandra/locator/GossipingPropertyFileSnitchTest.java b/test/unit/org/apache/cassandra/locator/GossipingPropertyFileSnitchTest.java index c8ff6ea45a..da3f5dd3fb 100644 --- a/test/unit/org/apache/cassandra/locator/GossipingPropertyFileSnitchTest.java +++ b/test/unit/org/apache/cassandra/locator/GossipingPropertyFileSnitchTest.java @@ -27,7 +27,7 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.StubClusterMetadataService; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * Unit tests for {@link GossipingPropertyFileSnitch}. diff --git a/test/unit/org/apache/cassandra/locator/MetaStrategyTest.java b/test/unit/org/apache/cassandra/locator/MetaStrategyTest.java index 35ab27d426..36cc9d1547 100644 --- a/test/unit/org/apache/cassandra/locator/MetaStrategyTest.java +++ b/test/unit/org/apache/cassandra/locator/MetaStrategyTest.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.Set; import com.google.common.collect.ImmutableMap; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java b/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java index e59c847f77..01bf8ff29a 100644 --- a/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java +++ b/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java @@ -36,6 +36,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; + import org.junit.After; import org.junit.Assert; import org.junit.Rule; diff --git a/test/unit/org/apache/cassandra/locator/PendingRangesTest.java b/test/unit/org/apache/cassandra/locator/PendingRangesTest.java index 45e00a236a..6f5ca447da 100644 --- a/test/unit/org/apache/cassandra/locator/PendingRangesTest.java +++ b/test/unit/org/apache/cassandra/locator/PendingRangesTest.java @@ -25,6 +25,7 @@ import java.util.Map; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; diff --git a/test/unit/org/apache/cassandra/locator/ReplicaCollectionTest.java b/test/unit/org/apache/cassandra/locator/ReplicaCollectionTest.java index cde69d262f..bba8b26021 100644 --- a/test/unit/org/apache/cassandra/locator/ReplicaCollectionTest.java +++ b/test/unit/org/apache/cassandra/locator/ReplicaCollectionTest.java @@ -18,6 +18,14 @@ package org.apache.cassandra.locator; +import java.util.AbstractMap; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Collectors; + import com.google.common.base.Predicates; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; @@ -26,25 +34,35 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.locator.ReplicaCollection.Builder.Conflict; -import org.junit.Assert; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.AbstractMap; -import java.util.Comparator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import static com.google.common.collect.Iterables.*; +import static com.google.common.collect.Iterables.elementsEqual; +import static com.google.common.collect.Iterables.filter; +import static com.google.common.collect.Iterables.limit; import static org.apache.cassandra.locator.Replica.fullReplica; import static org.apache.cassandra.locator.Replica.transientReplica; -import static org.apache.cassandra.locator.ReplicaUtils.*; +import static org.apache.cassandra.locator.ReplicaUtils.ALL_EP; +import static org.apache.cassandra.locator.ReplicaUtils.ALL_R; +import static org.apache.cassandra.locator.ReplicaUtils.BROADCAST_EP; +import static org.apache.cassandra.locator.ReplicaUtils.BROADCAST_RANGE; +import static org.apache.cassandra.locator.ReplicaUtils.EP1; +import static org.apache.cassandra.locator.ReplicaUtils.EP2; +import static org.apache.cassandra.locator.ReplicaUtils.EP3; +import static org.apache.cassandra.locator.ReplicaUtils.EP4; +import static org.apache.cassandra.locator.ReplicaUtils.EP5; +import static org.apache.cassandra.locator.ReplicaUtils.NULL_EP; +import static org.apache.cassandra.locator.ReplicaUtils.NULL_RANGE; +import static org.apache.cassandra.locator.ReplicaUtils.R1; +import static org.apache.cassandra.locator.ReplicaUtils.R2; +import static org.apache.cassandra.locator.ReplicaUtils.R3; +import static org.apache.cassandra.locator.ReplicaUtils.R4; +import static org.apache.cassandra.locator.ReplicaUtils.R5; +import static org.apache.cassandra.locator.ReplicaUtils.tk; public class ReplicaCollectionTest { diff --git a/test/unit/org/apache/cassandra/locator/ReplicaLayoutTest.java b/test/unit/org/apache/cassandra/locator/ReplicaLayoutTest.java index b5b60e3e46..697f735875 100644 --- a/test/unit/org/apache/cassandra/locator/ReplicaLayoutTest.java +++ b/test/unit/org/apache/cassandra/locator/ReplicaLayoutTest.java @@ -18,12 +18,17 @@ package org.apache.cassandra.locator; -import org.apache.cassandra.dht.Murmur3Partitioner; -import org.apache.cassandra.dht.Token; import org.junit.Assert; import org.junit.Test; -import static org.apache.cassandra.locator.ReplicaUtils.*; +import org.apache.cassandra.dht.Murmur3Partitioner; +import org.apache.cassandra.dht.Token; + +import static org.apache.cassandra.locator.ReplicaUtils.EP1; +import static org.apache.cassandra.locator.ReplicaUtils.EP2; +import static org.apache.cassandra.locator.ReplicaUtils.EP3; +import static org.apache.cassandra.locator.ReplicaUtils.EP4; +import static org.apache.cassandra.locator.ReplicaUtils.R1; public class ReplicaLayoutTest { diff --git a/test/unit/org/apache/cassandra/locator/ReplicaPlansTest.java b/test/unit/org/apache/cassandra/locator/ReplicaPlansTest.java index c8dbc806dc..857e56e039 100644 --- a/test/unit/org/apache/cassandra/locator/ReplicaPlansTest.java +++ b/test/unit/org/apache/cassandra/locator/ReplicaPlansTest.java @@ -24,6 +24,7 @@ import java.util.Set; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; + import org.junit.Before; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/locator/ReplicaUtils.java b/test/unit/org/apache/cassandra/locator/ReplicaUtils.java index 72c0a06861..e3fae6f230 100644 --- a/test/unit/org/apache/cassandra/locator/ReplicaUtils.java +++ b/test/unit/org/apache/cassandra/locator/ReplicaUtils.java @@ -18,17 +18,19 @@ package org.apache.cassandra.locator; +import java.net.UnknownHostException; +import java.util.List; + import com.google.common.collect.ImmutableList; + +import org.junit.Assert; + import org.apache.cassandra.db.PartitionPosition; import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.utils.FBUtilities; -import org.junit.Assert; - -import java.net.UnknownHostException; -import java.util.List; import static org.apache.cassandra.locator.Replica.fullReplica; import static org.apache.cassandra.locator.Replica.transientReplica; diff --git a/test/unit/org/apache/cassandra/locator/ReplicationFactorTest.java b/test/unit/org/apache/cassandra/locator/ReplicationFactorTest.java index f0e5e071d2..91409ad379 100644 --- a/test/unit/org/apache/cassandra/locator/ReplicationFactorTest.java +++ b/test/unit/org/apache/cassandra/locator/ReplicationFactorTest.java @@ -18,13 +18,13 @@ package org.apache.cassandra.locator; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; -import org.assertj.core.api.Assertions; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/locator/SimpleSeedProviderTest.java b/test/unit/org/apache/cassandra/locator/SimpleSeedProviderTest.java index eba216db1e..1886d29c56 100644 --- a/test/unit/org/apache/cassandra/locator/SimpleSeedProviderTest.java +++ b/test/unit/org/apache/cassandra/locator/SimpleSeedProviderTest.java @@ -24,12 +24,12 @@ import java.util.List; import java.util.Map; import org.junit.Test; +import org.mockito.MockedStatic; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.ParameterizedClass; import org.apache.cassandra.utils.FBUtilities; -import org.mockito.MockedStatic; import static java.lang.String.format; import static java.util.Arrays.asList; diff --git a/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java b/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java index 3527fd4bc8..d2a59bdc71 100644 --- a/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java +++ b/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java @@ -28,6 +28,7 @@ import java.util.concurrent.ExecutionException; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/metrics/BatchMetricsTest.java b/test/unit/org/apache/cassandra/metrics/BatchMetricsTest.java index 6cd0886a01..3d35d69b38 100644 --- a/test/unit/org/apache/cassandra/metrics/BatchMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/BatchMetricsTest.java @@ -21,14 +21,15 @@ package org.apache.cassandra.metrics; import java.io.IOException; import java.util.concurrent.TimeUnit; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - import com.datastax.driver.core.BatchStatement; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.ConfigurationException; diff --git a/test/unit/org/apache/cassandra/metrics/CQLMetricsTest.java b/test/unit/org/apache/cassandra/metrics/CQLMetricsTest.java index a1681f169e..ee0c88bb70 100644 --- a/test/unit/org/apache/cassandra/metrics/CQLMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/CQLMetricsTest.java @@ -20,15 +20,16 @@ package org.apache.cassandra.metrics; import java.io.IOException; +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.exceptions.InvalidQueryException; + import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.PreparedStatement; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.exceptions.InvalidQueryException; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.QueryHandler; diff --git a/test/unit/org/apache/cassandra/metrics/CassandraMetricsRegistryTest.java b/test/unit/org/apache/cassandra/metrics/CassandraMetricsRegistryTest.java index b069d0330f..0bd1d9f7ca 100644 --- a/test/unit/org/apache/cassandra/metrics/CassandraMetricsRegistryTest.java +++ b/test/unit/org/apache/cassandra/metrics/CassandraMetricsRegistryTest.java @@ -32,15 +32,16 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.junit.Before; -import org.junit.Test; - import com.codahale.metrics.Meter; import com.codahale.metrics.Metric; import com.codahale.metrics.Timer; import com.codahale.metrics.jvm.BufferPoolMetricSet; import com.codahale.metrics.jvm.GarbageCollectorMetricSet; import com.codahale.metrics.jvm.MemoryUsageGaugeSet; + +import org.junit.Before; +import org.junit.Test; + import org.apache.cassandra.metrics.CassandraMetricsRegistry.MetricName; import org.apache.cassandra.utils.EstimatedHistogram; diff --git a/test/unit/org/apache/cassandra/metrics/ClientMetricsTest.java b/test/unit/org/apache/cassandra/metrics/ClientMetricsTest.java index 0f1cd26f50..1ecae7f67c 100644 --- a/test/unit/org/apache/cassandra/metrics/ClientMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/ClientMetricsTest.java @@ -20,15 +20,16 @@ package org.apache.cassandra.metrics; import javax.net.ssl.SSLException; -import org.junit.BeforeClass; -import org.junit.Test; - import com.codahale.metrics.Gauge; import com.codahale.metrics.Meter; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.HostDistance; import com.datastax.driver.core.PoolingOptions; import com.datastax.driver.core.Session; + +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.auth.IAuthenticator.AuthenticationMode; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/test/unit/org/apache/cassandra/metrics/ClientRequestMetricsTest.java b/test/unit/org/apache/cassandra/metrics/ClientRequestMetricsTest.java index 88060ffd27..cb22ab6cef 100644 --- a/test/unit/org/apache/cassandra/metrics/ClientRequestMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/ClientRequestMetricsTest.java @@ -20,16 +20,17 @@ package org.apache.cassandra.metrics; import java.io.IOException; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - import com.codahale.metrics.Histogram; import com.datastax.driver.core.BatchStatement; import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.ConfigurationException; diff --git a/test/unit/org/apache/cassandra/metrics/ClientRequestRowAndColumnMetricsTest.java b/test/unit/org/apache/cassandra/metrics/ClientRequestRowAndColumnMetricsTest.java index 11ec07ba99..b75a7b1f6c 100644 --- a/test/unit/org/apache/cassandra/metrics/ClientRequestRowAndColumnMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/ClientRequestRowAndColumnMetricsTest.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.List; import com.google.common.collect.ImmutableList; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/metrics/ClientRequestSizeMetricsTest.java b/test/unit/org/apache/cassandra/metrics/ClientRequestSizeMetricsTest.java index f19fca526b..38d8cdac88 100644 --- a/test/unit/org/apache/cassandra/metrics/ClientRequestSizeMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/ClientRequestSizeMetricsTest.java @@ -21,15 +21,16 @@ package org.apache.cassandra.metrics; import java.util.Collection; import java.util.stream.Collectors; +import com.codahale.metrics.Counter; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.Snapshot; +import com.datastax.driver.core.QueryOptions; + import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import com.codahale.metrics.Counter; -import com.codahale.metrics.Histogram; -import com.codahale.metrics.Snapshot; -import com.datastax.driver.core.QueryOptions; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoir.EstimatedHistogramReservoirSnapshot; import org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoir.Range; diff --git a/test/unit/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoirTest.java b/test/unit/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoirTest.java index cd7077bf16..2a5a30dc7c 100644 --- a/test/unit/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoirTest.java +++ b/test/unit/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoirTest.java @@ -31,23 +31,24 @@ import java.util.concurrent.locks.LockSupport; import java.util.function.Function; import java.util.stream.Collectors; +import com.codahale.metrics.Snapshot; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.quicktheories.core.Gen; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Snapshot; import org.apache.cassandra.utils.EstimatedHistogram; import org.apache.cassandra.utils.MonotonicClock; import org.apache.cassandra.utils.MonotonicClockTranslation; import org.apache.cassandra.utils.Pair; -import org.quicktheories.core.Gen; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoir.LANDMARK_RESET_INTERVAL_IN_NS; diff --git a/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java b/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java index 744c5dfc8a..62a6cdff8f 100644 --- a/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java @@ -23,11 +23,11 @@ package org.apache.cassandra.metrics; import java.util.Map; import java.util.UUID; +import com.google.common.collect.Iterators; + import org.junit.BeforeClass; import org.junit.Test; -import com.google.common.collect.Iterators; - import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.SystemKeyspace; @@ -37,8 +37,8 @@ import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.hints.HintsService; import org.apache.cassandra.locator.InetAddressAndPort; -import static org.junit.Assert.assertEquals; import static org.apache.cassandra.cql3.QueryProcessor.executeInternal; +import static org.junit.Assert.assertEquals; public class HintedHandOffMetricsTest { diff --git a/test/unit/org/apache/cassandra/metrics/HitRateTest.java b/test/unit/org/apache/cassandra/metrics/HitRateTest.java index 519aaa4f5d..c28a43b679 100644 --- a/test/unit/org/apache/cassandra/metrics/HitRateTest.java +++ b/test/unit/org/apache/cassandra/metrics/HitRateTest.java @@ -18,11 +18,10 @@ package org.apache.cassandra.metrics; +import org.agrona.concurrent.NoOpLock; import org.junit.Assert; import org.junit.Test; -import org.agrona.concurrent.NoOpLock; - public class HitRateTest { static long M = 1024; diff --git a/test/unit/org/apache/cassandra/metrics/JmxVirtualTableMetricsTest.java b/test/unit/org/apache/cassandra/metrics/JmxVirtualTableMetricsTest.java index 45348f2775..74d0ad4e6d 100644 --- a/test/unit/org/apache/cassandra/metrics/JmxVirtualTableMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/JmxVirtualTableMetricsTest.java @@ -24,15 +24,17 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; + import javax.management.JMX; import javax.management.ObjectName; +import com.codahale.metrics.Metric; +import com.codahale.metrics.MetricRegistry; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.codahale.metrics.Metric; -import com.codahale.metrics.MetricRegistry; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.virtual.CollectionVirtualTableAdapter; diff --git a/test/unit/org/apache/cassandra/metrics/KeyspaceMetricsTest.java b/test/unit/org/apache/cassandra/metrics/KeyspaceMetricsTest.java index f30b9307c1..13ace09af8 100644 --- a/test/unit/org/apache/cassandra/metrics/KeyspaceMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/KeyspaceMetricsTest.java @@ -23,15 +23,16 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - import com.codahale.metrics.Metric; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.ConfigurationException; diff --git a/test/unit/org/apache/cassandra/metrics/LogLinearDecayingHistogramTest.java b/test/unit/org/apache/cassandra/metrics/LogLinearDecayingHistogramTest.java index 31ca6fbb54..495264b7df 100644 --- a/test/unit/org/apache/cassandra/metrics/LogLinearDecayingHistogramTest.java +++ b/test/unit/org/apache/cassandra/metrics/LogLinearDecayingHistogramTest.java @@ -20,11 +20,12 @@ package org.apache.cassandra.metrics; import java.util.concurrent.TimeUnit; +import com.codahale.metrics.Snapshot; + import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Snapshot; import org.apache.cassandra.metrics.LogLinearDecayingHistograms.LogLinearDecayingHistogram; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/metrics/LogLinearHistogramTest.java b/test/unit/org/apache/cassandra/metrics/LogLinearHistogramTest.java index c7954e2704..d0bdfaee36 100644 --- a/test/unit/org/apache/cassandra/metrics/LogLinearHistogramTest.java +++ b/test/unit/org/apache/cassandra/metrics/LogLinearHistogramTest.java @@ -22,12 +22,14 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import com.codahale.metrics.Snapshot; + import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.utils.RandomTestRunner; -import com.codahale.metrics.Snapshot; + import static org.junit.Assert.assertEquals; public class LogLinearHistogramTest diff --git a/test/unit/org/apache/cassandra/metrics/MaxSamplerTest.java b/test/unit/org/apache/cassandra/metrics/MaxSamplerTest.java index 69278b8719..c83b99e81d 100644 --- a/test/unit/org/apache/cassandra/metrics/MaxSamplerTest.java +++ b/test/unit/org/apache/cassandra/metrics/MaxSamplerTest.java @@ -20,11 +20,12 @@ package org.apache.cassandra.metrics; import java.util.List; import java.util.concurrent.TimeoutException; -import org.apache.cassandra.metrics.Sampler.Sample; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.apache.cassandra.metrics.Sampler.Sample; + public class MaxSamplerTest extends SamplerTest { @Before diff --git a/test/unit/org/apache/cassandra/metrics/SamplerTest.java b/test/unit/org/apache/cassandra/metrics/SamplerTest.java index 862abbb05b..014a18ce6f 100644 --- a/test/unit/org/apache/cassandra/metrics/SamplerTest.java +++ b/test/unit/org/apache/cassandra/metrics/SamplerTest.java @@ -25,18 +25,19 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import com.google.common.collect.Maps; +import com.google.common.util.concurrent.Uninterruptibles; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.metrics.Sampler.Sample; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.utils.FreeRunningClock; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import com.google.common.collect.Maps; -import com.google.common.util.concurrent.Uninterruptibles; public class SamplerTest diff --git a/test/unit/org/apache/cassandra/metrics/TableMetricsTest.java b/test/unit/org/apache/cassandra/metrics/TableMetricsTest.java index a0691d8ccd..5cb934af72 100644 --- a/test/unit/org/apache/cassandra/metrics/TableMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/TableMetricsTest.java @@ -24,15 +24,16 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - import com.datastax.driver.core.BatchStatement; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; +import com.google.common.util.concurrent.Uninterruptibles; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/test/unit/org/apache/cassandra/metrics/ThreadLocalCounterTest.java b/test/unit/org/apache/cassandra/metrics/ThreadLocalCounterTest.java index ddf275a148..2597504522 100644 --- a/test/unit/org/apache/cassandra/metrics/ThreadLocalCounterTest.java +++ b/test/unit/org/apache/cassandra/metrics/ThreadLocalCounterTest.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; import org.junit.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/unit/org/apache/cassandra/metrics/ThreadLocalMeterTest.java b/test/unit/org/apache/cassandra/metrics/ThreadLocalMeterTest.java index e81ee7daef..24f21ecdc4 100644 --- a/test/unit/org/apache/cassandra/metrics/ThreadLocalMeterTest.java +++ b/test/unit/org/apache/cassandra/metrics/ThreadLocalMeterTest.java @@ -23,11 +23,12 @@ import java.util.List; import java.util.Random; import java.util.concurrent.TimeUnit; +import com.codahale.metrics.Clock; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.codahale.metrics.Clock; import org.apache.cassandra.Util; import org.apache.cassandra.utils.MonotonicClock; import org.apache.cassandra.utils.MonotonicClockTranslation; diff --git a/test/unit/org/apache/cassandra/metrics/TopFrequencySamplerTest.java b/test/unit/org/apache/cassandra/metrics/TopFrequencySamplerTest.java index ae6e3f9a98..1af940340a 100644 --- a/test/unit/org/apache/cassandra/metrics/TopFrequencySamplerTest.java +++ b/test/unit/org/apache/cassandra/metrics/TopFrequencySamplerTest.java @@ -23,11 +23,12 @@ package org.apache.cassandra.metrics; import java.util.List; import java.util.concurrent.TimeoutException; -import org.apache.cassandra.metrics.Sampler.Sample; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.apache.cassandra.metrics.Sampler.Sample; + public class TopFrequencySamplerTest extends SamplerTest { @Before diff --git a/test/unit/org/apache/cassandra/metrics/TrieMemtableMetricsTest.java b/test/unit/org/apache/cassandra/metrics/TrieMemtableMetricsTest.java index f8f59d07b0..062ee814cd 100644 --- a/test/unit/org/apache/cassandra/metrics/TrieMemtableMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/TrieMemtableMetricsTest.java @@ -26,6 +26,12 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.Session; + +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMRules; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -33,8 +39,6 @@ import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; @@ -43,9 +47,6 @@ import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.service.EmbeddedCassandraService; import org.apache.cassandra.service.StorageService; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMRules; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.apache.cassandra.config.CassandraRelevantProperties.MEMTABLE_SHARD_COUNT; import static org.apache.cassandra.cql3.CQLTester.assertRowsContains; diff --git a/test/unit/org/apache/cassandra/net/AsyncChannelPromiseTest.java b/test/unit/org/apache/cassandra/net/AsyncChannelPromiseTest.java index 4c16f6fe1a..6bafdaeab5 100644 --- a/test/unit/org/apache/cassandra/net/AsyncChannelPromiseTest.java +++ b/test/unit/org/apache/cassandra/net/AsyncChannelPromiseTest.java @@ -23,14 +23,16 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; + import org.junit.After; import org.junit.Assert; import org.junit.Test; -import io.netty.channel.embedded.EmbeddedChannel; import org.apache.cassandra.utils.concurrent.AbstractTestAsyncPromise; import org.apache.cassandra.utils.concurrent.Promise; +import io.netty.channel.embedded.EmbeddedChannel; + public class AsyncChannelPromiseTest extends AbstractTestAsyncPromise { @After diff --git a/test/unit/org/apache/cassandra/net/AsyncMessageOutputPlusTest.java b/test/unit/org/apache/cassandra/net/AsyncMessageOutputPlusTest.java index 633207c5f8..263a725217 100644 --- a/test/unit/org/apache/cassandra/net/AsyncMessageOutputPlusTest.java +++ b/test/unit/org/apache/cassandra/net/AsyncMessageOutputPlusTest.java @@ -22,11 +22,12 @@ import java.io.IOException; import org.junit.Test; -import io.netty.buffer.ByteBuf; -import io.netty.channel.embedded.EmbeddedChannel; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.net.FrameEncoder.PayloadAllocator; +import io.netty.buffer.ByteBuf; +import io.netty.channel.embedded.EmbeddedChannel; + import static org.junit.Assert.assertEquals; public class AsyncMessageOutputPlusTest diff --git a/test/unit/org/apache/cassandra/net/AsyncStreamingInputPlusTest.java b/test/unit/org/apache/cassandra/net/AsyncStreamingInputPlusTest.java index 1d6dcf4acd..2da7636f2d 100644 --- a/test/unit/org/apache/cassandra/net/AsyncStreamingInputPlusTest.java +++ b/test/unit/org/apache/cassandra/net/AsyncStreamingInputPlusTest.java @@ -30,10 +30,11 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.apache.cassandra.io.util.BufferedDataOutputStreamPlus; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.embedded.EmbeddedChannel; -import org.apache.cassandra.io.util.BufferedDataOutputStreamPlus; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; diff --git a/test/unit/org/apache/cassandra/net/AsyncStreamingOutputPlusTest.java b/test/unit/org/apache/cassandra/net/AsyncStreamingOutputPlusTest.java index 0fd923f533..2b57d504ff 100644 --- a/test/unit/org/apache/cassandra/net/AsyncStreamingOutputPlusTest.java +++ b/test/unit/org/apache/cassandra/net/AsyncStreamingOutputPlusTest.java @@ -26,13 +26,14 @@ import java.util.Random; import org.junit.Test; -import io.netty.buffer.ByteBuf; -import io.netty.channel.embedded.EmbeddedChannel; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.util.File; import org.apache.cassandra.streaming.StreamManager; import org.apache.cassandra.utils.FBUtilities; +import io.netty.buffer.ByteBuf; +import io.netty.channel.embedded.EmbeddedChannel; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/net/BufferPoolAllocatorTest.java b/test/unit/org/apache/cassandra/net/BufferPoolAllocatorTest.java index 5bcf061e32..1c037a5d58 100644 --- a/test/unit/org/apache/cassandra/net/BufferPoolAllocatorTest.java +++ b/test/unit/org/apache/cassandra/net/BufferPoolAllocatorTest.java @@ -22,13 +22,14 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Random; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.config.DataStorageSpec; import org.apache.cassandra.config.DatabaseDescriptor; -import org.assertj.core.api.Assertions; + +import io.netty.buffer.ByteBuf; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/net/ChunkedInputPlusTest.java b/test/unit/org/apache/cassandra/net/ChunkedInputPlusTest.java index 36bc53d815..9fc64fcf61 100644 --- a/test/unit/org/apache/cassandra/net/ChunkedInputPlusTest.java +++ b/test/unit/org/apache/cassandra/net/ChunkedInputPlusTest.java @@ -25,12 +25,16 @@ import java.util.Collections; import java.util.List; import com.google.common.collect.Lists; + import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class ChunkedInputPlusTest { diff --git a/test/unit/org/apache/cassandra/net/ConnectionTest.java b/test/unit/org/apache/cassandra/net/ConnectionTest.java index 233d067d12..86b1e168c9 100644 --- a/test/unit/org/apache/cassandra/net/ConnectionTest.java +++ b/test/unit/org/apache/cassandra/net/ConnectionTest.java @@ -42,19 +42,15 @@ import java.util.function.ToLongFunction; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOutboundHandlerAdapter; -import io.netty.channel.ChannelPromise; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions.Builder; @@ -70,16 +66,21 @@ import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.transport.TlsTestUtils; import org.apache.cassandra.utils.FBUtilities; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelOutboundHandlerAdapter; +import io.netty.channel.ChannelPromise; + import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.NOT_REQUIRED; -import static org.apache.cassandra.net.MessagingService.VERSION_40; -import static org.apache.cassandra.net.NoPayload.noPayload; -import static org.apache.cassandra.net.MessagingService.current_version; import static org.apache.cassandra.net.ConnectionType.LARGE_MESSAGES; import static org.apache.cassandra.net.ConnectionType.SMALL_MESSAGES; import static org.apache.cassandra.net.ConnectionUtils.check; +import static org.apache.cassandra.net.MessagingService.VERSION_40; +import static org.apache.cassandra.net.MessagingService.current_version; +import static org.apache.cassandra.net.NoPayload.noPayload; import static org.apache.cassandra.net.OutboundConnectionSettings.Framing.LZ4; import static org.apache.cassandra.net.OutboundConnections.LARGE_MESSAGE_THRESHOLD; import static org.apache.cassandra.utils.Clock.Global.nanoTime; diff --git a/test/unit/org/apache/cassandra/net/ForwardingInfoTest.java b/test/unit/org/apache/cassandra/net/ForwardingInfoTest.java index 403bbcfd58..cfbb945026 100644 --- a/test/unit/org/apache/cassandra/net/ForwardingInfoTest.java +++ b/test/unit/org/apache/cassandra/net/ForwardingInfoTest.java @@ -24,6 +24,7 @@ import java.util.Iterator; import java.util.List; import com.google.common.collect.ImmutableList; + import org.junit.Test; import org.apache.cassandra.io.util.DataInputBuffer; diff --git a/test/unit/org/apache/cassandra/net/FramingTest.java b/test/unit/org/apache/cassandra/net/FramingTest.java index 97c70cac8a..48f1c2164a 100644 --- a/test/unit/org/apache/cassandra/net/FramingTest.java +++ b/test/unit/org/apache/cassandra/net/FramingTest.java @@ -32,11 +32,9 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; import org.apache.cassandra.io.IVersionedSerializer; @@ -48,7 +46,9 @@ import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.memory.BufferPools; import org.apache.cassandra.utils.vint.VIntCoding; -import static java.lang.Math.*; +import io.netty.buffer.ByteBuf; + +import static java.lang.Math.min; import static org.apache.cassandra.net.ShareableBytes.wrap; // TODO: test corruption diff --git a/test/unit/org/apache/cassandra/net/HandshakeTest.java b/test/unit/org/apache/cassandra/net/HandshakeTest.java index 2806bac86d..a21bb4b391 100644 --- a/test/unit/org/apache/cassandra/net/HandshakeTest.java +++ b/test/unit/org/apache/cassandra/net/HandshakeTest.java @@ -29,14 +29,13 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import com.google.common.net.InetAddresses; + import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import io.netty.channel.EventLoop; -import io.netty.util.concurrent.Future; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions; import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions.Builder; @@ -50,6 +49,9 @@ import org.apache.cassandra.security.DefaultSslContextFactory; import org.apache.cassandra.transport.TlsTestUtils; import org.apache.cassandra.utils.concurrent.AsyncPromise; +import io.netty.channel.EventLoop; +import io.netty.util.concurrent.Future; + import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.NOT_REQUIRED; import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.REQUIRED; import static org.apache.cassandra.net.ConnectionType.SMALL_MESSAGES; diff --git a/test/unit/org/apache/cassandra/net/MessageDeliveryTest.java b/test/unit/org/apache/cassandra/net/MessageDeliveryTest.java index 73b773e92d..8f3770de0b 100644 --- a/test/unit/org/apache/cassandra/net/MessageDeliveryTest.java +++ b/test/unit/org/apache/cassandra/net/MessageDeliveryTest.java @@ -29,10 +29,13 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.collect.Iterators; + import org.junit.Assert; import org.junit.Test; +import org.mockito.Mockito; import accord.utils.RandomSource; + import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.concurrent.SimulatedExecutorFactory; import org.apache.cassandra.config.DatabaseDescriptor; @@ -47,7 +50,6 @@ import org.apache.cassandra.service.RetryStrategy; import org.apache.cassandra.service.TimeoutStrategy.LatencySourceFactory; import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.StubClusterMetadataService; -import org.mockito.Mockito; import static accord.utils.Property.qt; import static org.apache.cassandra.net.MessageDelivery.RetryErrorMessage; diff --git a/test/unit/org/apache/cassandra/net/MessageSerializationPropertyTest.java b/test/unit/org/apache/cassandra/net/MessageSerializationPropertyTest.java index 34387242f1..f9304381bc 100644 --- a/test/unit/org/apache/cassandra/net/MessageSerializationPropertyTest.java +++ b/test/unit/org/apache/cassandra/net/MessageSerializationPropertyTest.java @@ -21,8 +21,10 @@ import java.io.Serializable; import java.util.function.Consumer; import java.util.function.Supplier; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ReadCommand; @@ -32,14 +34,12 @@ import org.apache.cassandra.io.IVersionedAsymmetricSerializer; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.util.DataOutputPlus; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.SchemaProvider; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.CassandraGenerators; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.FixedMonotonicClock; -import org.assertj.core.api.Assertions; -import org.mockito.Mockito; import static org.apache.cassandra.config.CassandraRelevantProperties.CLOCK_MONOTONIC_APPROX; import static org.apache.cassandra.config.CassandraRelevantProperties.CLOCK_MONOTONIC_PRECISE; diff --git a/test/unit/org/apache/cassandra/net/MessagingServiceTest.java b/test/unit/org/apache/cassandra/net/MessagingServiceTest.java index 45746d5e6e..a9c1ea4531 100644 --- a/test/unit/org/apache/cassandra/net/MessagingServiceTest.java +++ b/test/unit/org/apache/cassandra/net/MessagingServiceTest.java @@ -39,14 +39,17 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.codahale.metrics.Timer; import com.google.common.net.InetAddresses; + +import org.awaitility.Awaitility; +import org.caffinitas.ohc.histo.EstimatedHistogram; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.codahale.metrics.Timer; import org.apache.cassandra.auth.IInternodeAuthenticator; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions; @@ -58,8 +61,6 @@ import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.metrics.MessagingMetrics; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import org.awaitility.Awaitility; -import org.caffinitas.ohc.histo.EstimatedHistogram; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/net/MockMessagingServiceTest.java b/test/unit/org/apache/cassandra/net/MockMessagingServiceTest.java index ee2e0ad34c..0e6f3d2b16 100644 --- a/test/unit/org/apache/cassandra/net/MockMessagingServiceTest.java +++ b/test/unit/org/apache/cassandra/net/MockMessagingServiceTest.java @@ -29,10 +29,10 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; -import static org.apache.cassandra.net.Verb.ECHO_REQ; import static org.apache.cassandra.net.MockMessagingService.all; import static org.apache.cassandra.net.MockMessagingService.to; import static org.apache.cassandra.net.MockMessagingService.verb; +import static org.apache.cassandra.net.Verb.ECHO_REQ; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; diff --git a/test/unit/org/apache/cassandra/net/MockMessagingSpy.java b/test/unit/org/apache/cassandra/net/MockMessagingSpy.java index d3ea8f714b..bef7d19132 100644 --- a/test/unit/org/apache/cassandra/net/MockMessagingSpy.java +++ b/test/unit/org/apache/cassandra/net/MockMessagingSpy.java @@ -29,6 +29,7 @@ import com.google.common.util.concurrent.AbstractFuture; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/unit/org/apache/cassandra/net/OutboundConnectionsTest.java b/test/unit/org/apache/cassandra/net/OutboundConnectionsTest.java index 0f184ee8b7..a1fdc196e4 100644 --- a/test/unit/org/apache/cassandra/net/OutboundConnectionsTest.java +++ b/test/unit/org/apache/cassandra/net/OutboundConnectionsTest.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeoutException; import com.google.common.collect.ImmutableList; import com.google.common.net.InetAddresses; + import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/test/unit/org/apache/cassandra/net/ProxyHandlerConnectionsTest.java b/test/unit/org/apache/cassandra/net/ProxyHandlerConnectionsTest.java index 6b49fafe0e..216345236b 100644 --- a/test/unit/org/apache/cassandra/net/ProxyHandlerConnectionsTest.java +++ b/test/unit/org/apache/cassandra/net/ProxyHandlerConnectionsTest.java @@ -31,12 +31,12 @@ import java.util.function.Supplier; import java.util.function.ToLongFunction; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.After; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import io.netty.buffer.ByteBuf; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.commitlog.CommitLog; @@ -51,6 +51,8 @@ import org.apache.cassandra.net.proxy.InboundProxyHandler; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; +import io.netty.buffer.ByteBuf; + import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/test/unit/org/apache/cassandra/net/PrunableArrayQueueTest.java b/test/unit/org/apache/cassandra/net/PrunableArrayQueueTest.java index e9a60cd3f3..6adac53ffb 100644 --- a/test/unit/org/apache/cassandra/net/PrunableArrayQueueTest.java +++ b/test/unit/org/apache/cassandra/net/PrunableArrayQueueTest.java @@ -20,11 +20,14 @@ package org.apache.cassandra.net; import java.util.Random; import org.junit.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class PrunableArrayQueueTest { diff --git a/test/unit/org/apache/cassandra/net/ResourceLimitsTest.java b/test/unit/org/apache/cassandra/net/ResourceLimitsTest.java index 89b94385f3..a1ff21b38e 100644 --- a/test/unit/org/apache/cassandra/net/ResourceLimitsTest.java +++ b/test/unit/org/apache/cassandra/net/ResourceLimitsTest.java @@ -23,15 +23,19 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.function.LongFunction; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.utils.JVMStabilityInspector; -import org.apache.cassandra.utils.KillerForTests; import org.junit.Assert; import org.junit.Test; -import org.apache.cassandra.net.ResourceLimits.*; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.net.ResourceLimits.Basic; +import org.apache.cassandra.net.ResourceLimits.Concurrent; +import org.apache.cassandra.net.ResourceLimits.Limit; +import org.apache.cassandra.utils.JVMStabilityInspector; +import org.apache.cassandra.utils.KillerForTests; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class ResourceLimitsTest { diff --git a/test/unit/org/apache/cassandra/net/SimulatedMessageDelivery.java b/test/unit/org/apache/cassandra/net/SimulatedMessageDelivery.java index 2f5014abd8..939f310a93 100644 --- a/test/unit/org/apache/cassandra/net/SimulatedMessageDelivery.java +++ b/test/unit/org/apache/cassandra/net/SimulatedMessageDelivery.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.LongSupplier; + import javax.annotation.Nullable; import accord.utils.Gens; diff --git a/test/unit/org/apache/cassandra/net/TestChannel.java b/test/unit/org/apache/cassandra/net/TestChannel.java index d76e045025..18d5f3385c 100644 --- a/test/unit/org/apache/cassandra/net/TestChannel.java +++ b/test/unit/org/apache/cassandra/net/TestChannel.java @@ -25,12 +25,13 @@ import java.nio.channels.WritableByteChannel; import com.google.common.net.InetAddresses; +import org.apache.cassandra.locator.InetAddressAndPort; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelOutboundBuffer; import io.netty.channel.FileRegion; import io.netty.channel.embedded.EmbeddedChannel; -import org.apache.cassandra.locator.InetAddressAndPort; public class TestChannel extends EmbeddedChannel { diff --git a/test/unit/org/apache/cassandra/repair/ConcurrentIrWithPreviewFuzzTest.java b/test/unit/org/apache/cassandra/repair/ConcurrentIrWithPreviewFuzzTest.java index 4eba7f0e36..3cce18bab4 100644 --- a/test/unit/org/apache/cassandra/repair/ConcurrentIrWithPreviewFuzzTest.java +++ b/test/unit/org/apache/cassandra/repair/ConcurrentIrWithPreviewFuzzTest.java @@ -22,10 +22,12 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.RetrySpec; import org.apache.cassandra.db.ColumnFamilyStore; @@ -33,7 +35,6 @@ import org.apache.cassandra.repair.consistent.LocalSessions; import org.apache.cassandra.repair.state.Completable; import org.apache.cassandra.utils.Closeable; import org.apache.cassandra.utils.FailingBiConsumer; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/repair/FailedAckTest.java b/test/unit/org/apache/cassandra/repair/FailedAckTest.java index c77a812f92..04b4689c88 100644 --- a/test/unit/org/apache/cassandra/repair/FailedAckTest.java +++ b/test/unit/org/apache/cassandra/repair/FailedAckTest.java @@ -21,10 +21,13 @@ package org.apache.cassandra.repair; import java.util.ArrayList; import java.util.List; +import org.assertj.core.api.Assertions; import org.junit.Test; +import org.mockito.Mockito; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.RetrySpec; import org.apache.cassandra.db.compaction.ICompactionManager; @@ -36,8 +39,6 @@ import org.apache.cassandra.repair.consistent.LocalSession; import org.apache.cassandra.repair.messages.ValidationRequest; import org.apache.cassandra.repair.state.Completable; import org.apache.cassandra.utils.Closeable; -import org.assertj.core.api.Assertions; -import org.mockito.Mockito; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/repair/FailingRepairFuzzTest.java b/test/unit/org/apache/cassandra/repair/FailingRepairFuzzTest.java index ccce173d44..edc4d17b07 100644 --- a/test/unit/org/apache/cassandra/repair/FailingRepairFuzzTest.java +++ b/test/unit/org/apache/cassandra/repair/FailingRepairFuzzTest.java @@ -27,10 +27,14 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; + +import org.assertj.core.api.AbstractStringAssert; +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.RetrySpec; import org.apache.cassandra.locator.InetAddressAndPort; @@ -39,8 +43,6 @@ import org.apache.cassandra.repair.state.Completable; import org.apache.cassandra.streaming.StreamEventHandler; import org.apache.cassandra.streaming.StreamState; import org.apache.cassandra.utils.Closeable; -import org.assertj.core.api.AbstractStringAssert; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/repair/FuzzTestBase.java b/test/unit/org/apache/cassandra/repair/FuzzTestBase.java index 7e4254750c..e930aa5c0b 100644 --- a/test/unit/org/apache/cassandra/repair/FuzzTestBase.java +++ b/test/unit/org/apache/cassandra/repair/FuzzTestBase.java @@ -45,19 +45,25 @@ import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; + +import org.agrona.collections.LongHashSet; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; +import org.mockito.Mockito; +import org.quicktheories.impl.JavaRandom; import accord.utils.DefaultRandom; import accord.utils.Gen; import accord.utils.Gens; import accord.utils.RandomSource; -import org.agrona.collections.LongHashSet; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.concurrent.ExecutorBuilder; import org.apache.cassandra.concurrent.ExecutorBuilderFactory; @@ -153,9 +159,7 @@ import org.apache.cassandra.utils.NoSpamLogger; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.concurrent.ImmediateFuture; import org.apache.cassandra.utils.progress.ProgressEventType; -import org.assertj.core.api.Assertions; -import org.mockito.Mockito; -import org.quicktheories.impl.JavaRandom; + import picocli.CommandLine; import static org.apache.cassandra.config.CassandraRelevantProperties.ACCORD_REPAIR_RANGE_STEP_UPDATE_INTERVAL; diff --git a/test/unit/org/apache/cassandra/repair/HappyPathFuzzTest.java b/test/unit/org/apache/cassandra/repair/HappyPathFuzzTest.java index f8e570b5c1..382b16b537 100644 --- a/test/unit/org/apache/cassandra/repair/HappyPathFuzzTest.java +++ b/test/unit/org/apache/cassandra/repair/HappyPathFuzzTest.java @@ -26,11 +26,12 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.LongStream; +import org.agrona.collections.LongArrayList; import org.junit.Test; import accord.utils.Gen; import accord.utils.Gens; -import org.agrona.collections.LongArrayList; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.RetrySpec; import org.apache.cassandra.utils.Closeable; diff --git a/test/unit/org/apache/cassandra/repair/LocalSyncTaskTest.java b/test/unit/org/apache/cassandra/repair/LocalSyncTaskTest.java index c03fe2aac7..4792b7da33 100644 --- a/test/unit/org/apache/cassandra/repair/LocalSyncTaskTest.java +++ b/test/unit/org/apache/cassandra/repair/LocalSyncTaskTest.java @@ -23,8 +23,10 @@ import java.util.HashSet; import java.util.Set; import com.google.common.collect.Iterables; + import org.junit.BeforeClass; import org.junit.Test; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; @@ -38,18 +40,17 @@ import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.service.ActiveRepairService; -import org.apache.cassandra.streaming.StreamCoordinator; -import org.apache.cassandra.streaming.async.NettyStreamingConnectionFactory; -import org.apache.cassandra.streaming.StreamPlan; import org.apache.cassandra.streaming.PreviewKind; +import org.apache.cassandra.streaming.StreamCoordinator; +import org.apache.cassandra.streaming.StreamPlan; import org.apache.cassandra.streaming.StreamSession; +import org.apache.cassandra.streaming.async.NettyStreamingConnectionFactory; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.MerkleTree; import org.apache.cassandra.utils.MerkleTrees; import org.apache.cassandra.utils.TimeUUID; import static org.apache.cassandra.service.ActiveRepairService.NO_PENDING_REPAIR; - import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/unit/org/apache/cassandra/repair/NeighborsAndRangesTest.java b/test/unit/org/apache/cassandra/repair/NeighborsAndRangesTest.java index e39f0d2281..a1344d9cd5 100644 --- a/test/unit/org/apache/cassandra/repair/NeighborsAndRangesTest.java +++ b/test/unit/org/apache/cassandra/repair/NeighborsAndRangesTest.java @@ -24,6 +24,7 @@ import java.util.Set; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/repair/RepairJobTest.java b/test/unit/org/apache/cassandra/repair/RepairJobTest.java index 88a8de34c9..43df31f9af 100644 --- a/test/unit/org/apache/cassandra/repair/RepairJobTest.java +++ b/test/unit/org/apache/cassandra/repair/RepairJobTest.java @@ -37,6 +37,8 @@ import java.util.stream.Collectors; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListenableFuture; + +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -76,7 +78,6 @@ import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.Throwables; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.asserts.SyncTaskListAssert; -import org.assertj.core.api.Assertions; import static java.util.Collections.emptySet; import static org.apache.cassandra.net.Verb.PAXOS2_CLEANUP_REQ; diff --git a/test/unit/org/apache/cassandra/repair/RepairMessageVerbHandlerOutOfRangeTest.java b/test/unit/org/apache/cassandra/repair/RepairMessageVerbHandlerOutOfRangeTest.java index 4e7f9ba400..2c17751126 100644 --- a/test/unit/org/apache/cassandra/repair/RepairMessageVerbHandlerOutOfRangeTest.java +++ b/test/unit/org/apache/cassandra/repair/RepairMessageVerbHandlerOutOfRangeTest.java @@ -26,6 +26,7 @@ import java.util.stream.Collectors; import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -46,8 +47,8 @@ import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.Verb; import org.apache.cassandra.repair.messages.PrepareMessage; import org.apache.cassandra.repair.messages.RepairMessage; -import org.apache.cassandra.repair.messages.ValidationResponse; import org.apache.cassandra.repair.messages.ValidationRequest; +import org.apache.cassandra.repair.messages.ValidationResponse; import org.apache.cassandra.repair.state.ParticipateState; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableId; @@ -56,13 +57,20 @@ import org.apache.cassandra.service.StorageService; import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.utils.TimeUUID; -import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.*; -import static org.apache.cassandra.tcm.ownership.OwnershipUtils.*; -import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; import static org.apache.cassandra.config.CassandraRelevantProperties.ORG_APACHE_CASSANDRA_DISABLE_MBEAN_REGISTRATION; +import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.MessageDelivery; +import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.broadcastAddress; +import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.node1; +import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.randomInt; +import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.registerOutgoingMessageSink; +import static org.apache.cassandra.tcm.ownership.OwnershipUtils.generateRange; +import static org.apache.cassandra.tcm.ownership.OwnershipUtils.generateRanges; +import static org.apache.cassandra.tcm.ownership.OwnershipUtils.setLocalTokens; +import static org.apache.cassandra.tcm.ownership.OwnershipUtils.token; +import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class RepairMessageVerbHandlerOutOfRangeTest { diff --git a/test/unit/org/apache/cassandra/repair/RepairSessionTest.java b/test/unit/org/apache/cassandra/repair/RepairSessionTest.java index 371c41b64f..b9a3404da7 100644 --- a/test/unit/org/apache/cassandra/repair/RepairSessionTest.java +++ b/test/unit/org/apache/cassandra/repair/RepairSessionTest.java @@ -26,6 +26,7 @@ import java.util.UUID; import java.util.concurrent.ExecutionException; import com.google.common.collect.Sets; + import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/repair/SlowMessageFuzzTest.java b/test/unit/org/apache/cassandra/repair/SlowMessageFuzzTest.java index 03c151ec68..846fb1efdf 100644 --- a/test/unit/org/apache/cassandra/repair/SlowMessageFuzzTest.java +++ b/test/unit/org/apache/cassandra/repair/SlowMessageFuzzTest.java @@ -25,6 +25,7 @@ import org.junit.Test; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.RetrySpec; import org.apache.cassandra.utils.Closeable; diff --git a/test/unit/org/apache/cassandra/repair/SymmetricRemoteSyncTaskTest.java b/test/unit/org/apache/cassandra/repair/SymmetricRemoteSyncTaskTest.java index 37d4e09e78..614ad30d96 100644 --- a/test/unit/org/apache/cassandra/repair/SymmetricRemoteSyncTaskTest.java +++ b/test/unit/org/apache/cassandra/repair/SymmetricRemoteSyncTaskTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.repair; import java.util.List; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/repair/ValidationTaskTest.java b/test/unit/org/apache/cassandra/repair/ValidationTaskTest.java index 0bb93cad37..b0a54bc05c 100644 --- a/test/unit/org/apache/cassandra/repair/ValidationTaskTest.java +++ b/test/unit/org/apache/cassandra/repair/ValidationTaskTest.java @@ -18,6 +18,11 @@ package org.apache.cassandra.repair; +import java.net.UnknownHostException; +import java.util.UUID; + +import org.junit.Test; + import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Range; @@ -25,11 +30,6 @@ import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.utils.MerkleTrees; -import org.junit.Test; - -import java.net.UnknownHostException; -import java.util.UUID; - import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/unit/org/apache/cassandra/repair/ValidatorTest.java b/test/unit/org/apache/cassandra/repair/ValidatorTest.java index 9ea956b85c..eaa60a0b7b 100644 --- a/test/unit/org/apache/cassandra/repair/ValidatorTest.java +++ b/test/unit/org/apache/cassandra/repair/ValidatorTest.java @@ -26,31 +26,31 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.Util; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.compaction.CompactionsTest; -import org.apache.cassandra.io.sstable.format.SSTableReader; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.net.Verb; -import org.apache.cassandra.repair.state.ValidationState; -import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.Util; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.EmptyIterators; import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.compaction.CompactionsTest; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.net.Verb; import org.apache.cassandra.repair.messages.ValidationResponse; +import org.apache.cassandra.repair.state.ValidationState; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Schema; import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/test/unit/org/apache/cassandra/repair/asymmetric/DifferenceHolderTest.java b/test/unit/org/apache/cassandra/repair/asymmetric/DifferenceHolderTest.java index cab28e9d1c..5f0cda7176 100644 --- a/test/unit/org/apache/cassandra/repair/asymmetric/DifferenceHolderTest.java +++ b/test/unit/org/apache/cassandra/repair/asymmetric/DifferenceHolderTest.java @@ -23,6 +23,7 @@ import java.util.Iterator; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.junit.Test; import org.apache.cassandra.db.Digest; diff --git a/test/unit/org/apache/cassandra/repair/asymmetric/RangeDenormalizerTest.java b/test/unit/org/apache/cassandra/repair/asymmetric/RangeDenormalizerTest.java index 3d66d83a46..83dd94b555 100644 --- a/test/unit/org/apache/cassandra/repair/asymmetric/RangeDenormalizerTest.java +++ b/test/unit/org/apache/cassandra/repair/asymmetric/RangeDenormalizerTest.java @@ -21,14 +21,15 @@ package org.apache.cassandra.repair.asymmetric; import java.util.Set; import com.google.common.collect.Sets; + import org.junit.Test; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; +import static org.apache.cassandra.repair.asymmetric.ReduceHelperTest.range; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.apache.cassandra.repair.asymmetric.ReduceHelperTest.range; public class RangeDenormalizerTest { diff --git a/test/unit/org/apache/cassandra/repair/asymmetric/ReduceHelperTest.java b/test/unit/org/apache/cassandra/repair/asymmetric/ReduceHelperTest.java index f2ee14f11c..af7a6da35d 100644 --- a/test/unit/org/apache/cassandra/repair/asymmetric/ReduceHelperTest.java +++ b/test/unit/org/apache/cassandra/repair/asymmetric/ReduceHelperTest.java @@ -37,6 +37,7 @@ import java.util.TreeSet; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; + import org.junit.Test; import org.apache.cassandra.dht.Murmur3Partitioner; diff --git a/test/unit/org/apache/cassandra/repair/asymmetric/StreamFromOptionsTest.java b/test/unit/org/apache/cassandra/repair/asymmetric/StreamFromOptionsTest.java index d13937e611..ff0ed380a7 100644 --- a/test/unit/org/apache/cassandra/repair/asymmetric/StreamFromOptionsTest.java +++ b/test/unit/org/apache/cassandra/repair/asymmetric/StreamFromOptionsTest.java @@ -24,6 +24,7 @@ import java.util.HashSet; import java.util.Set; import com.google.common.collect.Iterables; + import org.junit.Test; import org.apache.cassandra.dht.Murmur3Partitioner; diff --git a/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairConfigTest.java b/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairConfigTest.java index 93ef906a28..188e0da30f 100644 --- a/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairConfigTest.java +++ b/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairConfigTest.java @@ -18,9 +18,9 @@ package org.apache.cassandra.repair.autorepair; +import java.util.Collections; import java.util.HashSet; import java.util.Map; -import java.util.Collections; import java.util.Set; import com.google.common.collect.ImmutableSet; diff --git a/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairKeyspaceTest.java b/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairKeyspaceTest.java index ac9dac8236..4ed4134d19 100644 --- a/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairKeyspaceTest.java +++ b/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairKeyspaceTest.java @@ -22,14 +22,14 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.apache.cassandra.schema.KeyspaceMetadata; -import org.apache.cassandra.schema.SystemDistributedKeyspace; -import org.apache.cassandra.schema.TableMetadata; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.SystemDistributedKeyspace; +import org.apache.cassandra.schema.TableMetadata; /** * Unit tests for {@link org.apache.cassandra.schema.SystemDistributedKeyspace} diff --git a/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairParameterizedTest.java b/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairParameterizedTest.java index 3d98e61fcf..485257c16e 100644 --- a/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairParameterizedTest.java +++ b/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairParameterizedTest.java @@ -32,14 +32,6 @@ import java.util.concurrent.atomic.AtomicReference; import com.google.common.collect.Sets; -import org.apache.cassandra.config.DurationSpec; -import org.apache.cassandra.cql3.statements.schema.TableAttributes; -import org.apache.cassandra.repair.RepairCoordinator; -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.locator.LocalStrategy; -import org.apache.cassandra.schema.SystemDistributedKeyspace; -import org.apache.cassandra.service.StorageService; - import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -47,28 +39,35 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; - -import org.apache.cassandra.concurrent.ScheduledExecutorPlus; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.cql3.QueryProcessor; -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.io.sstable.format.SSTableReader; -import org.apache.cassandra.metrics.AutoRepairMetricsManager; -import org.apache.cassandra.metrics.AutoRepairMetrics; -import org.apache.cassandra.schema.SchemaConstants; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.service.AutoRepairService; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.progress.ProgressEvent; -import org.apache.cassandra.utils.progress.ProgressEventType; -import org.apache.cassandra.utils.progress.ProgressListener; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; +import org.apache.cassandra.concurrent.ScheduledExecutorPlus; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.DurationSpec; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.cql3.QueryProcessor; +import org.apache.cassandra.cql3.statements.schema.TableAttributes; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.locator.LocalStrategy; +import org.apache.cassandra.metrics.AutoRepairMetrics; +import org.apache.cassandra.metrics.AutoRepairMetricsManager; +import org.apache.cassandra.repair.RepairCoordinator; +import org.apache.cassandra.schema.SchemaConstants; +import org.apache.cassandra.schema.SystemDistributedKeyspace; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.service.AutoRepairService; +import org.apache.cassandra.service.StorageService; +import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.progress.ProgressEvent; +import org.apache.cassandra.utils.progress.ProgressEventType; +import org.apache.cassandra.utils.progress.ProgressListener; + import static org.apache.cassandra.Util.setAutoRepairEnabled; import static org.apache.cassandra.config.CassandraRelevantProperties.SYSTEM_DISTRIBUTED_DEFAULT_RF; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; diff --git a/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairStateTest.java b/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairStateTest.java index 240a2db46f..1e5503415f 100644 --- a/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairStateTest.java +++ b/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairStateTest.java @@ -24,6 +24,7 @@ import java.util.UUID; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairTest.java b/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairTest.java index 1eceb386ee..e82a364de9 100644 --- a/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairTest.java +++ b/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairTest.java @@ -21,20 +21,20 @@ package org.apache.cassandra.repair.autorepair; import java.util.HashMap; import java.util.Map; +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.ReplicationParams; -import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType; import org.apache.cassandra.schema.SchemaTestUtil; import org.apache.cassandra.service.AutoRepairService; diff --git a/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairUtilsTest.java b/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairUtilsTest.java index 57974f6c8c..cc49f0249a 100644 --- a/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairUtilsTest.java +++ b/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairUtilsTest.java @@ -25,25 +25,24 @@ import java.util.UUID; import com.google.common.collect.ImmutableSet; -import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; -import org.apache.cassandra.schema.SystemDistributedKeyspace; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.DurationSpec; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.marshal.UUIDType; +import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType; import org.apache.cassandra.repair.autorepair.AutoRepairUtils.AutoRepairHistory; import org.apache.cassandra.repair.autorepair.AutoRepairUtils.CurrentRepairStatus; - -import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.schema.SchemaConstants; +import org.apache.cassandra.schema.SystemDistributedKeyspace; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tcm.membership.NodeAddresses; import org.apache.cassandra.tcm.membership.NodeVersion; diff --git a/test/unit/org/apache/cassandra/repair/autorepair/PrioritizedRepairPlanTest.java b/test/unit/org/apache/cassandra/repair/autorepair/PrioritizedRepairPlanTest.java index be9e93aeca..de56300094 100644 --- a/test/unit/org/apache/cassandra/repair/autorepair/PrioritizedRepairPlanTest.java +++ b/test/unit/org/apache/cassandra/repair/autorepair/PrioritizedRepairPlanTest.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import com.google.common.collect.Lists; + import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/repair/autorepair/RepairTokenRangeSplitterTest.java b/test/unit/org/apache/cassandra/repair/autorepair/RepairTokenRangeSplitterTest.java index 6351f4fd97..989573824e 100644 --- a/test/unit/org/apache/cassandra/repair/autorepair/RepairTokenRangeSplitterTest.java +++ b/test/unit/org/apache/cassandra/repair/autorepair/RepairTokenRangeSplitterTest.java @@ -47,16 +47,16 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.big.BigFormat; import org.apache.cassandra.io.sstable.format.bti.BtiFormat; import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType; -import org.apache.cassandra.repair.autorepair.RepairTokenRangeSplitter.FilteredRepairAssignments; import org.apache.cassandra.repair.autorepair.AutoRepairUtils.SizeEstimate; +import org.apache.cassandra.repair.autorepair.RepairTokenRangeSplitter.FilteredRepairAssignments; import org.apache.cassandra.repair.autorepair.RepairTokenRangeSplitter.SizedRepairAssignment; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.service.AutoRepairService; import org.apache.cassandra.utils.concurrent.Refs; import static org.apache.cassandra.repair.autorepair.AutoRepairUtils.getKeyspaceTableName; -import static org.apache.cassandra.repair.autorepair.RepairTokenRangeSplitter.MAX_BYTES_PER_SCHEDULE; import static org.apache.cassandra.repair.autorepair.RepairTokenRangeSplitter.BYTES_PER_ASSIGNMENT; +import static org.apache.cassandra.repair.autorepair.RepairTokenRangeSplitter.MAX_BYTES_PER_SCHEDULE; import static org.apache.cassandra.repair.autorepair.RepairTokenRangeSplitter.MAX_TABLES_PER_ASSIGNMENT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/unit/org/apache/cassandra/repair/consistent/AbstractConsistentSessionTest.java b/test/unit/org/apache/cassandra/repair/consistent/AbstractConsistentSessionTest.java index 9716cb0809..6318f4e8e6 100644 --- a/test/unit/org/apache/cassandra/repair/consistent/AbstractConsistentSessionTest.java +++ b/test/unit/org/apache/cassandra/repair/consistent/AbstractConsistentSessionTest.java @@ -32,8 +32,8 @@ import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.service.ActiveRepairService; +import org.apache.cassandra.streaming.PreviewKind; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.TimeUUID; diff --git a/test/unit/org/apache/cassandra/repair/consistent/BulkRepairStateTest.java b/test/unit/org/apache/cassandra/repair/consistent/BulkRepairStateTest.java index 91096f6019..c5a212c6fa 100644 --- a/test/unit/org/apache/cassandra/repair/consistent/BulkRepairStateTest.java +++ b/test/unit/org/apache/cassandra/repair/consistent/BulkRepairStateTest.java @@ -21,13 +21,13 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.cassandra.dht.Murmur3Partitioner; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; +import com.google.common.collect.Lists; import org.junit.Test; -import com.google.common.collect.Lists; +import org.apache.cassandra.dht.Murmur3Partitioner; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/repair/consistent/CoordinatorMessagingTest.java b/test/unit/org/apache/cassandra/repair/consistent/CoordinatorMessagingTest.java index a26aa17683..62041c5d4a 100644 --- a/test/unit/org/apache/cassandra/repair/consistent/CoordinatorMessagingTest.java +++ b/test/unit/org/apache/cassandra/repair/consistent/CoordinatorMessagingTest.java @@ -30,12 +30,6 @@ import java.util.function.Supplier; import com.google.common.collect.Lists; -import org.apache.cassandra.repair.CoordinatedRepairResult; -import org.apache.cassandra.utils.TimeUUID; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.utils.concurrent.AsyncPromise; -import org.apache.cassandra.utils.concurrent.Future; -import org.apache.cassandra.utils.concurrent.Promise; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -51,6 +45,7 @@ import org.apache.cassandra.net.MockMessagingService; import org.apache.cassandra.net.MockMessagingSpy; import org.apache.cassandra.net.Verb; import org.apache.cassandra.repair.AbstractRepairTest; +import org.apache.cassandra.repair.CoordinatedRepairResult; import org.apache.cassandra.repair.NoSuchRepairSessionException; import org.apache.cassandra.repair.RepairSessionResult; import org.apache.cassandra.repair.messages.FinalizePromise; @@ -58,8 +53,13 @@ import org.apache.cassandra.repair.messages.FinalizePropose; import org.apache.cassandra.repair.messages.PrepareConsistentRequest; import org.apache.cassandra.repair.messages.PrepareConsistentResponse; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ActiveRepairService; +import org.apache.cassandra.utils.TimeUUID; +import org.apache.cassandra.utils.concurrent.AsyncPromise; +import org.apache.cassandra.utils.concurrent.Future; +import org.apache.cassandra.utils.concurrent.Promise; import static org.apache.cassandra.net.MockMessagingService.all; import static org.apache.cassandra.net.MockMessagingService.to; diff --git a/test/unit/org/apache/cassandra/repair/consistent/CoordinatorSessionTest.java b/test/unit/org/apache/cassandra/repair/consistent/CoordinatorSessionTest.java index 4b634bcedd..7c4397e209 100644 --- a/test/unit/org/apache/cassandra/repair/consistent/CoordinatorSessionTest.java +++ b/test/unit/org/apache/cassandra/repair/consistent/CoordinatorSessionTest.java @@ -30,20 +30,21 @@ import java.util.function.Supplier; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.net.Verb; -import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.Message; +import org.apache.cassandra.net.Verb; import org.apache.cassandra.repair.AbstractRepairTest; import org.apache.cassandra.repair.CoordinatedRepairResult; import org.apache.cassandra.repair.RepairSessionResult; +import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.repair.messages.FailSession; import org.apache.cassandra.repair.messages.FinalizeCommit; import org.apache.cassandra.repair.messages.FinalizePromise; @@ -60,7 +61,6 @@ import static org.apache.cassandra.repair.consistent.ConsistentSession.State.FIN import static org.apache.cassandra.repair.consistent.ConsistentSession.State.PREPARED; import static org.apache.cassandra.repair.consistent.ConsistentSession.State.PREPARING; import static org.apache.cassandra.repair.consistent.ConsistentSession.State.REPAIRING; - import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; public class CoordinatorSessionTest extends AbstractRepairTest diff --git a/test/unit/org/apache/cassandra/repair/consistent/CoordinatorSessionsTest.java b/test/unit/org/apache/cassandra/repair/consistent/CoordinatorSessionsTest.java index a2acec4ac5..fa6c0f692c 100644 --- a/test/unit/org/apache/cassandra/repair/consistent/CoordinatorSessionsTest.java +++ b/test/unit/org/apache/cassandra/repair/consistent/CoordinatorSessionsTest.java @@ -21,25 +21,26 @@ package org.apache.cassandra.repair.consistent; import java.util.Set; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.net.Message; -import org.apache.cassandra.net.Verb; -import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; -import org.apache.cassandra.repair.AbstractRepairTest; -import org.apache.cassandra.repair.NoSuchRepairSessionException; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.net.Message; +import org.apache.cassandra.net.Verb; +import org.apache.cassandra.repair.AbstractRepairTest; +import org.apache.cassandra.repair.NoSuchRepairSessionException; +import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.repair.messages.FailSession; import org.apache.cassandra.repair.messages.FinalizePromise; import org.apache.cassandra.repair.messages.PrepareConsistentResponse; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.utils.TimeUUID; diff --git a/test/unit/org/apache/cassandra/repair/consistent/LocalSessionTest.java b/test/unit/org/apache/cassandra/repair/consistent/LocalSessionTest.java index e4965d2a87..38ffad7e95 100644 --- a/test/unit/org/apache/cassandra/repair/consistent/LocalSessionTest.java +++ b/test/unit/org/apache/cassandra/repair/consistent/LocalSessionTest.java @@ -40,25 +40,21 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.net.Verb; -import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; -import org.apache.cassandra.locator.RangesAtEndpoint; -import org.apache.cassandra.net.Message; -import org.apache.cassandra.repair.AbstractRepairTest; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.repair.KeyspaceRepairManager; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.schema.TableId; -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; +import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.locator.RangesAtEndpoint; +import org.apache.cassandra.net.Message; +import org.apache.cassandra.net.Verb; +import org.apache.cassandra.repair.AbstractRepairTest; +import org.apache.cassandra.repair.KeyspaceRepairManager; +import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.repair.messages.FailSession; import org.apache.cassandra.repair.messages.FinalizeCommit; import org.apache.cassandra.repair.messages.FinalizePromise; @@ -69,6 +65,10 @@ import org.apache.cassandra.repair.messages.RepairMessage; import org.apache.cassandra.repair.messages.StatusRequest; import org.apache.cassandra.repair.messages.StatusResponse; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.SchemaConstants; +import org.apache.cassandra.schema.TableId; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.TimeUUID; @@ -76,7 +76,12 @@ import org.apache.cassandra.utils.concurrent.AsyncPromise; import org.apache.cassandra.utils.concurrent.Future; import org.apache.cassandra.utils.concurrent.Promise; -import static org.apache.cassandra.repair.consistent.ConsistentSession.State.*; +import static org.apache.cassandra.repair.consistent.ConsistentSession.State.FAILED; +import static org.apache.cassandra.repair.consistent.ConsistentSession.State.FINALIZED; +import static org.apache.cassandra.repair.consistent.ConsistentSession.State.FINALIZE_PROMISED; +import static org.apache.cassandra.repair.consistent.ConsistentSession.State.PREPARED; +import static org.apache.cassandra.repair.consistent.ConsistentSession.State.PREPARING; +import static org.apache.cassandra.repair.consistent.ConsistentSession.State.REPAIRING; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; import static org.psjava.util.AssertStatus.assertTrue; diff --git a/test/unit/org/apache/cassandra/repair/consistent/PendingRepairStatTest.java b/test/unit/org/apache/cassandra/repair/consistent/PendingRepairStatTest.java index 814b9c318d..5f64376a29 100644 --- a/test/unit/org/apache/cassandra/repair/consistent/PendingRepairStatTest.java +++ b/test/unit/org/apache/cassandra/repair/consistent/PendingRepairStatTest.java @@ -24,6 +24,7 @@ import java.util.Set; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -32,7 +33,6 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.ColumnFamilyStore; @@ -42,6 +42,7 @@ import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.repair.AbstractRepairTest; +import org.apache.cassandra.repair.SharedContext; import org.apache.cassandra.repair.consistent.LocalSessionTest.InstrumentedLocalSessions; import org.apache.cassandra.repair.consistent.admin.PendingStats; import org.apache.cassandra.schema.KeyspaceParams; diff --git a/test/unit/org/apache/cassandra/repair/consistent/RepairStateTest.java b/test/unit/org/apache/cassandra/repair/consistent/RepairStateTest.java index db425de90f..3091644de1 100644 --- a/test/unit/org/apache/cassandra/repair/consistent/RepairStateTest.java +++ b/test/unit/org/apache/cassandra/repair/consistent/RepairStateTest.java @@ -23,6 +23,7 @@ import java.util.Collection; import java.util.List; import com.google.common.collect.Lists; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/repair/consistent/admin/SchemaArgsParserTest.java b/test/unit/org/apache/cassandra/repair/consistent/admin/SchemaArgsParserTest.java index 1a5605ecd9..c690e0202b 100644 --- a/test/unit/org/apache/cassandra/repair/consistent/admin/SchemaArgsParserTest.java +++ b/test/unit/org/apache/cassandra/repair/consistent/admin/SchemaArgsParserTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.repair.consistent.admin; import java.util.Set; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/repair/messages/RepairMessageSerializationsTest.java b/test/unit/org/apache/cassandra/repair/messages/RepairMessageSerializationsTest.java index 750c614455..91f737591a 100644 --- a/test/unit/org/apache/cassandra/repair/messages/RepairMessageSerializationsTest.java +++ b/test/unit/org/apache/cassandra/repair/messages/RepairMessageSerializationsTest.java @@ -25,8 +25,7 @@ import java.util.List; import java.util.UUID; import com.google.common.collect.Lists; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.dht.*; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -34,7 +33,12 @@ import org.junit.Test; import org.apache.cassandra.CassandraTestBase; import org.apache.cassandra.CassandraTestBase.DDDaemonInitialization; import org.apache.cassandra.CassandraTestBase.UseMurmur3Partitioner; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.dht.IPartitionerDependentSerializer; +import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Murmur3Partitioner.LongToken; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.DataInputBuffer; @@ -43,14 +47,14 @@ import org.apache.cassandra.io.util.DataOutputBufferFixed; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.repair.RepairJobDesc; import org.apache.cassandra.repair.SyncNodePair; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.SchemaTestUtil; +import org.apache.cassandra.schema.TableId; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.streaming.PreviewKind; -import org.apache.cassandra.repair.RepairJobDesc; -import org.apache.cassandra.schema.TableId; import org.apache.cassandra.streaming.SessionSummary; import org.apache.cassandra.streaming.StreamSummary; import org.apache.cassandra.utils.MerkleTrees; diff --git a/test/unit/org/apache/cassandra/repair/messages/RepairMessageTest.java b/test/unit/org/apache/cassandra/repair/messages/RepairMessageTest.java index b7fa71c959..4ce55ece38 100644 --- a/test/unit/org/apache/cassandra/repair/messages/RepairMessageTest.java +++ b/test/unit/org/apache/cassandra/repair/messages/RepairMessageTest.java @@ -18,8 +18,12 @@ package org.apache.cassandra.repair.messages; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.Mockito; +import org.mockito.stubbing.Answer; import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.config.DatabaseDescriptor; @@ -39,10 +43,6 @@ import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.StubClusterMetadataService; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.TimeUUID; -import org.assertj.core.api.Assertions; -import org.mockito.ArgumentCaptor; -import org.mockito.Mockito; -import org.mockito.stubbing.Answer; import static org.apache.cassandra.repair.messages.RepairMessage.always; import static org.apache.cassandra.repair.messages.RepairMessage.sendMessageWithRetries; diff --git a/test/unit/org/apache/cassandra/schema/CreateTableValidationTest.java b/test/unit/org/apache/cassandra/schema/CreateTableValidationTest.java index 0688b4a468..26ccbcee30 100644 --- a/test/unit/org/apache/cassandra/schema/CreateTableValidationTest.java +++ b/test/unit/org/apache/cassandra/schema/CreateTableValidationTest.java @@ -18,14 +18,14 @@ */ package org.apache.cassandra.schema; +import org.junit.Test; + import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.utils.BloomCalculations; -import org.junit.Test; - import static org.apache.cassandra.schema.SchemaConstants.FILENAME_LENGTH; import static org.apache.cassandra.schema.SchemaConstants.NAME_LENGTH; import static org.apache.cassandra.schema.SchemaConstants.TABLE_NAME_LENGTH; diff --git a/test/unit/org/apache/cassandra/schema/MemtableParamsTest.java b/test/unit/org/apache/cassandra/schema/MemtableParamsTest.java index e34d299a15..75094ef5d1 100644 --- a/test/unit/org/apache/cassandra/schema/MemtableParamsTest.java +++ b/test/unit/org/apache/cassandra/schema/MemtableParamsTest.java @@ -21,17 +21,18 @@ package org.apache.cassandra.schema; import java.util.LinkedHashMap; import java.util.Map; -import accord.utils.Gen; import com.google.common.collect.ImmutableMap; -import org.apache.cassandra.config.Config; -import org.apache.cassandra.utils.ConfigGenBuilder; import org.junit.Test; +import accord.utils.Gen; + +import org.apache.cassandra.config.Config; import org.apache.cassandra.config.InheritingClass; import org.apache.cassandra.config.ParameterizedClass; import org.apache.cassandra.db.memtable.SkipListMemtableFactory; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.utils.ConfigGenBuilder; import static accord.utils.Property.qt; import static org.apache.cassandra.config.YamlConfigurationLoader.fromMap; diff --git a/test/unit/org/apache/cassandra/schema/MockSchema.java b/test/unit/org/apache/cassandra/schema/MockSchema.java index a348a7dff3..860f3e6ee5 100644 --- a/test/unit/org/apache/cassandra/schema/MockSchema.java +++ b/test/unit/org/apache/cassandra/schema/MockSchema.java @@ -28,6 +28,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.base.Preconditions; diff --git a/test/unit/org/apache/cassandra/schema/SchemaChangesTest.java b/test/unit/org/apache/cassandra/schema/SchemaChangesTest.java index 9d3223aa73..2719b2e327 100644 --- a/test/unit/org/apache/cassandra/schema/SchemaChangesTest.java +++ b/test/unit/org/apache/cassandra/schema/SchemaChangesTest.java @@ -27,10 +27,6 @@ import java.util.function.Supplier; import com.google.common.collect.ImmutableMap; -import org.apache.cassandra.cql3.FieldIdentifier; -import org.apache.cassandra.db.marshal.Int32Type; -import org.apache.cassandra.db.marshal.UserType; -import org.apache.cassandra.exceptions.InvalidRequestException; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; @@ -39,6 +35,7 @@ import org.junit.rules.ExpectedException; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.cql3.FieldIdentifier; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.ColumnFamilyStore; @@ -47,9 +44,12 @@ import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.db.marshal.ByteType; import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.SSTableFormat.Components; import org.apache.cassandra.io.util.File; diff --git a/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java b/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java index 7ceceaad04..8f4c8ef361 100644 --- a/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java +++ b/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java @@ -24,6 +24,8 @@ import java.util.HashSet; import java.util.Set; import com.google.common.collect.ImmutableMap; + +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; @@ -45,7 +47,6 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.service.reads.repair.ReadRepairStrategy; import org.apache.cassandra.utils.FBUtilities; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.apache.cassandra.cql3.QueryProcessor.executeOnceInternal; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/schema/SchemaMutationsSerializerTest.java b/test/unit/org/apache/cassandra/schema/SchemaMutationsSerializerTest.java index 7680697199..90264002a9 100644 --- a/test/unit/org/apache/cassandra/schema/SchemaMutationsSerializerTest.java +++ b/test/unit/org/apache/cassandra/schema/SchemaMutationsSerializerTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.schema; import java.io.IOException; import java.util.Collection; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; @@ -30,7 +31,6 @@ import org.apache.cassandra.db.Mutation; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.MessagingService; -import org.assertj.core.api.Assertions; public class SchemaMutationsSerializerTest extends CQLTester { diff --git a/test/unit/org/apache/cassandra/schema/SchemaStatementWarningsTest.java b/test/unit/org/apache/cassandra/schema/SchemaStatementWarningsTest.java index 197854897e..c0a92caefe 100644 --- a/test/unit/org/apache/cassandra/schema/SchemaStatementWarningsTest.java +++ b/test/unit/org/apache/cassandra/schema/SchemaStatementWarningsTest.java @@ -24,16 +24,16 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentLinkedQueue; +import org.assertj.core.api.Assertions; +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMRules; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.service.ClientWarn; -import org.assertj.core.api.Assertions; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMRules; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @RunWith(BMUnitRunner.class) public class SchemaStatementWarningsTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/schema/TableIdTest.java b/test/unit/org/apache/cassandra/schema/TableIdTest.java index b203844178..ae83204ac8 100644 --- a/test/unit/org/apache/cassandra/schema/TableIdTest.java +++ b/test/unit/org/apache/cassandra/schema/TableIdTest.java @@ -18,16 +18,17 @@ package org.apache.cassandra.schema; * limitations under the License. */ +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.utils.LazyToString; import accord.utils.ReflectionUtils; + import org.apache.cassandra.io.Serializers; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.utils.CassandraGenerators; import org.apache.cassandra.utils.Generators; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/schema/TableParamsTest.java b/test/unit/org/apache/cassandra/schema/TableParamsTest.java index 9146264278..5b46804117 100644 --- a/test/unit/org/apache/cassandra/schema/TableParamsTest.java +++ b/test/unit/org/apache/cassandra/schema/TableParamsTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.schema; import org.junit.Test; import accord.utils.Gen; + import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.tcm.membership.NodeVersion; import org.apache.cassandra.tcm.serialization.AsymmetricMetadataSerializers; diff --git a/test/unit/org/apache/cassandra/schema/ValidationTest.java b/test/unit/org/apache/cassandra/schema/ValidationTest.java index 9e1e834d88..b8a719c046 100644 --- a/test/unit/org/apache/cassandra/schema/ValidationTest.java +++ b/test/unit/org/apache/cassandra/schema/ValidationTest.java @@ -24,16 +24,13 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.cassandra.config.DatabaseDescriptor; - import org.junit.BeforeClass; - import org.junit.Test; -import org.apache.cassandra.db.marshal.AbstractType; - import org.apache.cassandra.CassandraTestBase; import org.apache.cassandra.CassandraTestBase.DDDaemonInitialization; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.marshal.AbstractType; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/schema/createlike/CreateLikeTest.java b/test/unit/org/apache/cassandra/schema/createlike/CreateLikeTest.java index e7b786cd14..33cea25f61 100644 --- a/test/unit/org/apache/cassandra/schema/createlike/CreateLikeTest.java +++ b/test/unit/org/apache/cassandra/schema/createlike/CreateLikeTest.java @@ -30,13 +30,14 @@ import java.util.TreeSet; import java.util.UUID; import java.util.stream.Collectors; +import com.datastax.driver.core.ResultSet; import com.google.common.collect.Sets; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import com.datastax.driver.core.ResultSet; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.Duration; diff --git a/test/unit/org/apache/cassandra/security/CipherFactoryTest.java b/test/unit/org/apache/cassandra/security/CipherFactoryTest.java index 29302b7c2c..cb12d58558 100644 --- a/test/unit/org/apache/cassandra/security/CipherFactoryTest.java +++ b/test/unit/org/apache/cassandra/security/CipherFactoryTest.java @@ -29,6 +29,7 @@ import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import com.google.common.base.Charsets; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/security/CryptoProviderTest.java b/test/unit/org/apache/cassandra/security/CryptoProviderTest.java index 7bb4cbb893..2d9d8ae003 100644 --- a/test/unit/org/apache/cassandra/security/CryptoProviderTest.java +++ b/test/unit/org/apache/cassandra/security/CryptoProviderTest.java @@ -22,17 +22,18 @@ import java.security.Provider; import java.security.Security; import java.util.HashMap; +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.MockedStatic; -import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.ParameterizedClass; import org.apache.cassandra.distributed.shared.WithProperties; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.utils.FBUtilities; -import org.mockito.MockedStatic; import static com.google.common.collect.ImmutableMap.of; import static java.lang.String.format; diff --git a/test/unit/org/apache/cassandra/security/DefaultSslContextFactoryTest.java b/test/unit/org/apache/cassandra/security/DefaultSslContextFactoryTest.java index 5dc6d7e39b..ef18eb75c6 100644 --- a/test/unit/org/apache/cassandra/security/DefaultSslContextFactoryTest.java +++ b/test/unit/org/apache/cassandra/security/DefaultSslContextFactoryTest.java @@ -22,21 +22,23 @@ import java.io.IOException; import java.util.Arrays; import java.util.HashMap; import java.util.Map; + import javax.net.ssl.TrustManagerFactory; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import io.netty.handler.ssl.OpenSsl; -import io.netty.handler.ssl.OpenSslContext; -import io.netty.handler.ssl.SslContext; -import io.netty.handler.ssl.SslProvider; import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions.Builder; import org.apache.cassandra.distributed.shared.WithProperties; import org.apache.cassandra.transport.TlsTestUtils; +import io.netty.handler.ssl.OpenSsl; +import io.netty.handler.ssl.OpenSslContext; +import io.netty.handler.ssl.SslContext; +import io.netty.handler.ssl.SslProvider; + import static org.apache.cassandra.config.CassandraRelevantProperties.DISABLE_TCACTIVE_OPENSSL; import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.NOT_REQUIRED; import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.REQUIRED; diff --git a/test/unit/org/apache/cassandra/security/DummySslContextFactoryImpl.java b/test/unit/org/apache/cassandra/security/DummySslContextFactoryImpl.java index 12649cfb0c..d55e00b9b7 100644 --- a/test/unit/org/apache/cassandra/security/DummySslContextFactoryImpl.java +++ b/test/unit/org/apache/cassandra/security/DummySslContextFactoryImpl.java @@ -20,12 +20,14 @@ package org.apache.cassandra.security; import java.util.List; import java.util.Map; + import javax.net.ssl.SSLContext; import javax.net.ssl.SSLException; +import org.apache.cassandra.config.EncryptionOptions; + import io.netty.handler.ssl.CipherSuiteFilter; import io.netty.handler.ssl.SslContext; -import org.apache.cassandra.config.EncryptionOptions; /** * TEST ONLY Class. DON'T use it for anything else. diff --git a/test/unit/org/apache/cassandra/security/EncryptionUtilsTest.java b/test/unit/org/apache/cassandra/security/EncryptionUtilsTest.java index fdeda0545e..0b78b72923 100644 --- a/test/unit/org/apache/cassandra/security/EncryptionUtilsTest.java +++ b/test/unit/org/apache/cassandra/security/EncryptionUtilsTest.java @@ -22,12 +22,12 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.util.HashMap; import java.util.Random; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.ShortBufferException; -import org.apache.cassandra.io.util.File; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -37,6 +37,7 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.TransparentDataEncryptionOptions; import org.apache.cassandra.io.compress.ICompressor; import org.apache.cassandra.io.compress.LZ4Compressor; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.RandomAccessReader; diff --git a/test/unit/org/apache/cassandra/security/FileBasedSslContextFactoryTest.java b/test/unit/org/apache/cassandra/security/FileBasedSslContextFactoryTest.java index cc6c05af5d..74bc64ff96 100644 --- a/test/unit/org/apache/cassandra/security/FileBasedSslContextFactoryTest.java +++ b/test/unit/org/apache/cassandra/security/FileBasedSslContextFactoryTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.security; import java.util.HashMap; import java.util.Map; + import javax.net.ssl.SSLException; import org.junit.AfterClass; @@ -35,7 +36,6 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.transport.TlsTestUtils; import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_CONFIG; - import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.NOT_REQUIRED; public class FileBasedSslContextFactoryTest diff --git a/test/unit/org/apache/cassandra/security/PEMBasedSslContextFactoryTest.java b/test/unit/org/apache/cassandra/security/PEMBasedSslContextFactoryTest.java index 18d323286d..39eb9f4552 100644 --- a/test/unit/org/apache/cassandra/security/PEMBasedSslContextFactoryTest.java +++ b/test/unit/org/apache/cassandra/security/PEMBasedSslContextFactoryTest.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.HashMap; import java.util.Map; + import javax.net.ssl.TrustManagerFactory; import org.apache.commons.lang3.StringUtils; @@ -29,15 +30,16 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import io.netty.handler.ssl.OpenSsl; -import io.netty.handler.ssl.OpenSslContext; -import io.netty.handler.ssl.SslContext; -import io.netty.handler.ssl.SslProvider; import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.config.ParameterizedClass; import org.apache.cassandra.distributed.shared.WithProperties; import org.apache.cassandra.transport.TlsTestUtils; +import io.netty.handler.ssl.OpenSsl; +import io.netty.handler.ssl.OpenSslContext; +import io.netty.handler.ssl.SslContext; +import io.netty.handler.ssl.SslProvider; + import static org.apache.cassandra.config.CassandraRelevantProperties.DISABLE_TCACTIVE_OPENSSL; import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.NOT_REQUIRED; import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.REQUIRED; diff --git a/test/unit/org/apache/cassandra/security/SSLFactoryTest.java b/test/unit/org/apache/cassandra/security/SSLFactoryTest.java index 7ac9517337..050f3d78dc 100644 --- a/test/unit/org/apache/cassandra/security/SSLFactoryTest.java +++ b/test/unit/org/apache/cassandra/security/SSLFactoryTest.java @@ -31,6 +31,7 @@ import java.security.cert.Certificate; import java.security.cert.CertificateException; import java.util.HashMap; import java.util.Map; + import javax.net.ssl.X509KeyManager; import org.apache.commons.io.FileUtils; @@ -38,11 +39,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import io.netty.handler.ssl.OpenSslClientContext; -import io.netty.handler.ssl.OpenSslServerContext; -import io.netty.handler.ssl.OpenSslSessionContext; -import io.netty.handler.ssl.SslContext; -import io.netty.handler.ssl.util.SelfSignedCertificate; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions; @@ -51,6 +47,12 @@ import org.apache.cassandra.config.ParameterizedClass; import org.apache.cassandra.io.util.File; import org.apache.cassandra.transport.TlsTestUtils; +import io.netty.handler.ssl.OpenSslClientContext; +import io.netty.handler.ssl.OpenSslServerContext; +import io.netty.handler.ssl.OpenSslSessionContext; +import io.netty.handler.ssl.SslContext; +import io.netty.handler.ssl.util.SelfSignedCertificate; + import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.NOT_REQUIRED; import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.REQUIRED; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/serializers/DecimalSerializerTest.java b/test/unit/org/apache/cassandra/serializers/DecimalSerializerTest.java index 83d30cec19..eca6b13508 100644 --- a/test/unit/org/apache/cassandra/serializers/DecimalSerializerTest.java +++ b/test/unit/org/apache/cassandra/serializers/DecimalSerializerTest.java @@ -18,12 +18,12 @@ */ package org.apache.cassandra.serializers; +import java.math.BigDecimal; + import org.junit.Test; import static org.junit.Assert.assertEquals; -import java.math.BigDecimal; - public class DecimalSerializerTest { @Test diff --git a/test/unit/org/apache/cassandra/serializers/MapSerializerTest.java b/test/unit/org/apache/cassandra/serializers/MapSerializerTest.java index b012123615..465db7ad40 100644 --- a/test/unit/org/apache/cassandra/serializers/MapSerializerTest.java +++ b/test/unit/org/apache/cassandra/serializers/MapSerializerTest.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.Map; import com.google.common.collect.Range; + import org.junit.Test; import org.apache.cassandra.db.marshal.AbstractType; diff --git a/test/unit/org/apache/cassandra/serializers/SetSerializerTest.java b/test/unit/org/apache/cassandra/serializers/SetSerializerTest.java index 07522e286d..eb5c29423e 100644 --- a/test/unit/org/apache/cassandra/serializers/SetSerializerTest.java +++ b/test/unit/org/apache/cassandra/serializers/SetSerializerTest.java @@ -24,13 +24,15 @@ import java.util.HashSet; import java.util.Set; import com.google.common.collect.Range; + import org.junit.Test; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.SetType; -import static org.junit.Assert.assertEquals; + import static org.apache.cassandra.utils.ByteBufferUtil.UNSET_BYTE_BUFFER; +import static org.junit.Assert.assertEquals; public class SetSerializerTest { diff --git a/test/unit/org/apache/cassandra/serializers/SimpleDateSerializerTest.java b/test/unit/org/apache/cassandra/serializers/SimpleDateSerializerTest.java index 9c1ef886f9..b5f90f592a 100644 --- a/test/unit/org/apache/cassandra/serializers/SimpleDateSerializerTest.java +++ b/test/unit/org/apache/cassandra/serializers/SimpleDateSerializerTest.java @@ -18,14 +18,19 @@ */ package org.apache.cassandra.serializers; -import org.apache.cassandra.db.marshal.SimpleDateType; -import org.junit.Test; - import java.nio.ByteBuffer; import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.time.temporal.ChronoUnit; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.List; +import java.util.TimeZone; + +import org.junit.Test; + +import org.apache.cassandra.db.marshal.SimpleDateType; public class SimpleDateSerializerTest { diff --git a/test/unit/org/apache/cassandra/serializers/TimeSerializerTest.java b/test/unit/org/apache/cassandra/serializers/TimeSerializerTest.java index f8af48c7f1..c6f87ce950 100644 --- a/test/unit/org/apache/cassandra/serializers/TimeSerializerTest.java +++ b/test/unit/org/apache/cassandra/serializers/TimeSerializerTest.java @@ -18,11 +18,11 @@ */ package org.apache.cassandra.serializers; -import org.junit.Test; - import java.nio.ByteBuffer; import java.util.concurrent.TimeUnit; +import org.junit.Test; + public class TimeSerializerTest { @Test diff --git a/test/unit/org/apache/cassandra/serializers/TimestampSerializerTest.java b/test/unit/org/apache/cassandra/serializers/TimestampSerializerTest.java index e8abbae1a8..b3c88050b7 100644 --- a/test/unit/org/apache/cassandra/serializers/TimestampSerializerTest.java +++ b/test/unit/org/apache/cassandra/serializers/TimestampSerializerTest.java @@ -17,17 +17,18 @@ * under the License. */ package org.apache.cassandra.serializers; + +import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.ArrayList; import org.junit.Test; + +import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; - public class TimestampSerializerTest { public static final long ONE_SECOND = 1000L; diff --git a/test/unit/org/apache/cassandra/service/ActiveRepairServiceTest.java b/test/unit/org/apache/cassandra/service/ActiveRepairServiceTest.java index d1ecd33b1e..77a0df9d9a 100644 --- a/test/unit/org/apache/cassandra/service/ActiveRepairServiceTest.java +++ b/test/unit/org/apache/cassandra/service/ActiveRepairServiceTest.java @@ -36,10 +36,12 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mock; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.ServerTestUtils; @@ -74,7 +76,6 @@ import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.TimeUUID; import org.apache.cassandra.utils.concurrent.Condition; import org.apache.cassandra.utils.concurrent.Refs; -import org.mockito.Mock; import static org.apache.cassandra.ServerTestUtils.resetCMS; import static org.apache.cassandra.config.CassandraRelevantProperties.ORG_APACHE_CASSANDRA_DISABLE_MBEAN_REGISTRATION; diff --git a/test/unit/org/apache/cassandra/service/AutoRepairServiceRepairTypeTest.java b/test/unit/org/apache/cassandra/service/AutoRepairServiceRepairTypeTest.java index 9c2af3e1c7..25d86ba5a0 100644 --- a/test/unit/org/apache/cassandra/service/AutoRepairServiceRepairTypeTest.java +++ b/test/unit/org/apache/cassandra/service/AutoRepairServiceRepairTypeTest.java @@ -18,11 +18,12 @@ package org.apache.cassandra.service; -import com.google.common.collect.ImmutableSet; +import java.util.Arrays; +import java.util.Collection; +import java.util.Set; +import java.util.UUID; -import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.repair.autorepair.AutoRepairConfig; -import org.apache.cassandra.repair.autorepair.AutoRepairUtils; +import com.google.common.collect.ImmutableSet; import org.junit.Before; import org.junit.BeforeClass; @@ -30,10 +31,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import java.util.Arrays; -import java.util.Collection; -import java.util.Set; -import java.util.UUID; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.repair.autorepair.AutoRepairConfig; +import org.apache.cassandra.repair.autorepair.AutoRepairUtils; import static org.apache.cassandra.Util.setAutoRepairEnabled; import static org.apache.cassandra.config.CassandraRelevantProperties.SYSTEM_DISTRIBUTED_DEFAULT_RF; diff --git a/test/unit/org/apache/cassandra/service/AutoRepairServiceSetterTest.java b/test/unit/org/apache/cassandra/service/AutoRepairServiceSetterTest.java index db87e995f5..01f280f904 100644 --- a/test/unit/org/apache/cassandra/service/AutoRepairServiceSetterTest.java +++ b/test/unit/org/apache/cassandra/service/AutoRepairServiceSetterTest.java @@ -18,8 +18,23 @@ package org.apache.cassandra.service; +import java.util.Arrays; +import java.util.Collection; +import java.util.Set; +import java.util.UUID; +import java.util.function.BiConsumer; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import com.google.common.collect.ImmutableSet; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.QueryProcessor; @@ -30,21 +45,6 @@ import org.apache.cassandra.repair.autorepair.AutoRepairUtils; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.schema.SystemDistributedKeyspace; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Set; -import java.util.UUID; -import java.util.function.BiConsumer; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import static org.apache.cassandra.Util.setAutoRepairEnabled; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/service/BootstrapTransientTest.java b/test/unit/org/apache/cassandra/service/BootstrapTransientTest.java index b0207565c0..6a770a0ab1 100644 --- a/test/unit/org/apache/cassandra/service/BootstrapTransientTest.java +++ b/test/unit/org/apache/cassandra/service/BootstrapTransientTest.java @@ -25,6 +25,7 @@ import java.util.Collection; import java.util.List; import com.google.common.collect.ImmutableMap; + import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/service/GCInspectorTest.java b/test/unit/org/apache/cassandra/service/GCInspectorTest.java index 51d6a22a56..089e022d2e 100644 --- a/test/unit/org/apache/cassandra/service/GCInspectorTest.java +++ b/test/unit/org/apache/cassandra/service/GCInspectorTest.java @@ -17,12 +17,12 @@ */ package org.apache.cassandra.service; -import org.apache.cassandra.config.DatabaseDescriptor; - import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.config.DatabaseDescriptor; + import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/unit/org/apache/cassandra/service/LegacyAuthFailTest.java b/test/unit/org/apache/cassandra/service/LegacyAuthFailTest.java index b54da98f08..5ca2f18e2b 100644 --- a/test/unit/org/apache/cassandra/service/LegacyAuthFailTest.java +++ b/test/unit/org/apache/cassandra/service/LegacyAuthFailTest.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Optional; import com.google.common.base.Joiner; + import org.junit.Test; import org.apache.cassandra.cql3.CQLTester; diff --git a/test/unit/org/apache/cassandra/service/PaxosStateTest.java b/test/unit/org/apache/cassandra/service/PaxosStateTest.java index e73147d97e..23f12543c2 100644 --- a/test/unit/org/apache/cassandra/service/PaxosStateTest.java +++ b/test/unit/org/apache/cassandra/service/PaxosStateTest.java @@ -18,14 +18,6 @@ package org.apache.cassandra.service; import java.nio.ByteBuffer; - -import com.google.common.collect.Iterables; - -import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.service.paxos.Ballot; -import org.apache.cassandra.service.paxos.v1.PrepareVerbHandler; -import org.apache.cassandra.service.paxos.v1.ProposeVerbHandler; - import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -33,9 +25,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import org.apache.cassandra.dht.Murmur3Partitioner; -import org.apache.cassandra.exceptions.ReadTimeoutException; -import org.apache.cassandra.service.paxos.PaxosOperationLock; +import com.google.common.collect.Iterables; + import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -43,19 +34,33 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.BufferDecoratedKey; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.ConsistencyLevel; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.RowUpdateBuilder; +import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.dht.Murmur3Partitioner; +import org.apache.cassandra.exceptions.ReadTimeoutException; import org.apache.cassandra.gms.Gossiper; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.service.paxos.Ballot; import org.apache.cassandra.service.paxos.Commit; +import org.apache.cassandra.service.paxos.PaxosOperationLock; import org.apache.cassandra.service.paxos.PaxosState; +import org.apache.cassandra.service.paxos.v1.PrepareVerbHandler; +import org.apache.cassandra.service.paxos.v1.ProposeVerbHandler; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.service.paxos.Ballot.Flag.NONE; import static org.apache.cassandra.service.paxos.BallotGenerator.Global.atUnixMicros; import static org.apache.cassandra.utils.Clock.Global.nanoTime; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class PaxosStateTest { diff --git a/test/unit/org/apache/cassandra/service/ProtocolBetaVersionTest.java b/test/unit/org/apache/cassandra/service/ProtocolBetaVersionTest.java index 22324f178b..bffbdf005f 100644 --- a/test/unit/org/apache/cassandra/service/ProtocolBetaVersionTest.java +++ b/test/unit/org/apache/cassandra/service/ProtocolBetaVersionTest.java @@ -20,10 +20,14 @@ package org.apache.cassandra.service; import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.config.*; -import org.apache.cassandra.cql3.*; -import org.apache.cassandra.transport.*; -import org.apache.cassandra.transport.messages.*; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.EncryptionOptions; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.transport.ProtocolVersion; +import org.apache.cassandra.transport.SimpleClient; +import org.apache.cassandra.transport.messages.QueryMessage; +import org.apache.cassandra.transport.messages.ResultMessage; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/service/QueryPagerTest.java b/test/unit/org/apache/cassandra/service/QueryPagerTest.java index 0c87e569f8..79cfeb0ec7 100644 --- a/test/unit/org/apache/cassandra/service/QueryPagerTest.java +++ b/test/unit/org/apache/cassandra/service/QueryPagerTest.java @@ -20,34 +20,53 @@ package org.apache.cassandra.service; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.*; -import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.Util; import org.apache.cassandra.cql3.ColumnIdentifier; -import org.apache.cassandra.db.*; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; +import org.apache.cassandra.db.AbstractReadCommandBuilder; +import org.apache.cassandra.db.ClusteringComparator; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.ReadCommand; +import org.apache.cassandra.db.ReadExecutionController; +import org.apache.cassandra.db.ReadQuery; +import org.apache.cassandra.db.RowUpdateBuilder; +import org.apache.cassandra.db.SinglePartitionReadCommand; +import org.apache.cassandra.db.Slice; +import org.apache.cassandra.db.Slices; +import org.apache.cassandra.db.filter.ClusteringIndexFilter; +import org.apache.cassandra.db.filter.ClusteringIndexSliceFilter; +import org.apache.cassandra.db.filter.ColumnFilter; +import org.apache.cassandra.db.filter.DataLimits; +import org.apache.cassandra.db.filter.RowFilter; +import org.apache.cassandra.db.partitions.FilteredPartition; +import org.apache.cassandra.db.partitions.PartitionIterator; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.rows.RowIterator; -import org.apache.cassandra.db.filter.*; -import org.apache.cassandra.db.partitions.FilteredPartition; -import org.apache.cassandra.db.partitions.PartitionIterator; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.KeyspaceParams; -import org.apache.cassandra.service.pager.QueryPager; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.pager.PagingState; +import org.apache.cassandra.service.pager.QueryPager; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.cql3.QueryProcessor.executeInternal; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class QueryPagerTest { diff --git a/test/unit/org/apache/cassandra/service/SSTablesGlobalTrackerTest.java b/test/unit/org/apache/cassandra/service/SSTablesGlobalTrackerTest.java index 6bd5fd280c..c2df8b30cd 100644 --- a/test/unit/org/apache/cassandra/service/SSTablesGlobalTrackerTest.java +++ b/test/unit/org/apache/cassandra/service/SSTablesGlobalTrackerTest.java @@ -25,19 +25,20 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import com.googlecode.concurrenttrees.common.Iterables; + +import org.assertj.core.util.Files; import org.junit.BeforeClass; import org.junit.Test; +import org.quicktheories.core.Gen; +import org.quicktheories.generators.Generate; -import com.googlecode.concurrenttrees.common.Iterables; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.SequenceBasedSSTableId; import org.apache.cassandra.io.sstable.format.SSTableFormat; import org.apache.cassandra.io.sstable.format.Version; import org.apache.cassandra.io.util.File; -import org.assertj.core.util.Files; -import org.quicktheories.core.Gen; -import org.quicktheories.generators.Generate; import static org.junit.Assert.assertEquals; import static org.quicktheories.QuickTheory.qt; diff --git a/test/unit/org/apache/cassandra/service/SerializationsTest.java b/test/unit/org/apache/cassandra/service/SerializationsTest.java index 00864f5a34..484ccfc62b 100644 --- a/test/unit/org/apache/cassandra/service/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/service/SerializationsTest.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.List; import com.google.common.collect.Lists; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/service/StartupChecksTest.java b/test/unit/org/apache/cassandra/service/StartupChecksTest.java index 41c16b9065..8cb204f795 100644 --- a/test/unit/org/apache/cassandra/service/StartupChecksTest.java +++ b/test/unit/org/apache/cassandra/service/StartupChecksTest.java @@ -31,6 +31,8 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.stream.Collectors; +import com.vdurmont.semver4j.Semver; + import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -39,7 +41,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.vdurmont.semver4j.Semver; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.Config.DiskAccessMode; diff --git a/test/unit/org/apache/cassandra/service/StorageProxyTest.java b/test/unit/org/apache/cassandra/service/StorageProxyTest.java index f6a8a4a0ae..04df3b4c64 100644 --- a/test/unit/org/apache/cassandra/service/StorageProxyTest.java +++ b/test/unit/org/apache/cassandra/service/StorageProxyTest.java @@ -23,6 +23,9 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import com.google.common.util.concurrent.Uninterruptibles; + +import org.jboss.byteman.contrib.bmunit.BMRule; +import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -40,8 +43,6 @@ import org.apache.cassandra.locator.Replica; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.StubClusterMetadataService; -import org.jboss.byteman.contrib.bmunit.BMRule; -import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import static org.apache.cassandra.locator.ReplicaUtils.full; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/service/StorageServiceDrainTest.java b/test/unit/org/apache/cassandra/service/StorageServiceDrainTest.java index 8f10205487..7e241c7033 100644 --- a/test/unit/org/apache/cassandra/service/StorageServiceDrainTest.java +++ b/test/unit/org/apache/cassandra/service/StorageServiceDrainTest.java @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import org.awaitility.Awaitility; import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; @@ -40,7 +41,6 @@ import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.tools.ToolRunner; import org.apache.cassandra.utils.ByteBufferUtil; -import org.awaitility.Awaitility; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java index 7814b82ba0..45b98c27e9 100644 --- a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java +++ b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java @@ -31,6 +31,8 @@ import java.util.Map; import java.util.UUID; import com.google.common.collect.Sets; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -63,7 +65,6 @@ import org.apache.cassandra.tcm.membership.NodeAddresses; import org.apache.cassandra.tcm.membership.NodeId; import org.apache.cassandra.tcm.membership.NodeVersion; import org.apache.cassandra.tcm.transformations.Startup; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.config.CassandraRelevantProperties.GOSSIP_DISABLE_THREAD_VALIDATION; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/service/WriteResponseHandlerTest.java b/test/unit/org/apache/cassandra/service/WriteResponseHandlerTest.java index 63562b35eb..77cc452efc 100644 --- a/test/unit/org/apache/cassandra/service/WriteResponseHandlerTest.java +++ b/test/unit/org/apache/cassandra/service/WriteResponseHandlerTest.java @@ -24,6 +24,7 @@ import java.net.UnknownHostException; import java.util.concurrent.TimeUnit; import com.google.common.base.Predicates; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -37,6 +38,7 @@ import org.apache.cassandra.db.WriteType; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; import org.apache.cassandra.exceptions.RequestFailure; +import org.apache.cassandra.locator.BaseProximity; import org.apache.cassandra.locator.EndpointsForToken; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.NodeProximity; @@ -44,7 +46,6 @@ import org.apache.cassandra.locator.Replica; import org.apache.cassandra.locator.ReplicaCollection; import org.apache.cassandra.locator.ReplicaPlans; import org.apache.cassandra.locator.ReplicaUtils; -import org.apache.cassandra.locator.BaseProximity; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.Verb; import org.apache.cassandra.schema.KeyspaceParams; diff --git a/test/unit/org/apache/cassandra/service/WriteResponseHandlerTransientTest.java b/test/unit/org/apache/cassandra/service/WriteResponseHandlerTransientTest.java index ed844343a4..fb8823557a 100644 --- a/test/unit/org/apache/cassandra/service/WriteResponseHandlerTransientTest.java +++ b/test/unit/org/apache/cassandra/service/WriteResponseHandlerTransientTest.java @@ -24,6 +24,7 @@ import java.util.function.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordAgentTest.java b/test/unit/org/apache/cassandra/service/accord/AccordAgentTest.java index bc5f51cbcc..97f0b34f3f 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordAgentTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordAgentTest.java @@ -26,6 +26,7 @@ import org.junit.Test; import accord.local.Node; import accord.utils.RandomTestRunner; import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.service.accord.api.AccordAgent; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordAsyncConversionTest.java b/test/unit/org/apache/cassandra/service/accord/AccordAsyncConversionTest.java index 09cc6e89c8..201d716289 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordAsyncConversionTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordAsyncConversionTest.java @@ -30,6 +30,7 @@ import org.junit.Test; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; import accord.utils.async.AsyncResult; + import org.apache.cassandra.utils.concurrent.AsyncFuture; import org.apache.cassandra.utils.concurrent.Future; import org.apache.cassandra.utils.concurrent.ImmediateFuture; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordCacheEntryTest.java b/test/unit/org/apache/cassandra/service/accord/AccordCacheEntryTest.java index 0cd0d4e031..a91c082039 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordCacheEntryTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordCacheEntryTest.java @@ -20,8 +20,8 @@ package org.apache.cassandra.service.accord; import org.junit.Assert; import org.junit.Test; -import org.apache.cassandra.service.accord.AccordCacheEntry.Status; import org.apache.cassandra.service.accord.AccordCache.Type; +import org.apache.cassandra.service.accord.AccordCacheEntry.Status; public class AccordCacheEntryTest { diff --git a/test/unit/org/apache/cassandra/service/accord/AccordCacheTest.java b/test/unit/org/apache/cassandra/service/accord/AccordCacheTest.java index 02de1ad641..4c514ec5ba 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordCacheTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordCacheTest.java @@ -19,10 +19,10 @@ package org.apache.cassandra.service.accord; import java.util.function.Function; +import org.agrona.concurrent.NoOpLock; import org.junit.Assert; import org.junit.Test; -import org.agrona.concurrent.NoOpLock; import org.apache.cassandra.cache.CacheSize; import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.concurrent.ManualExecutor; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordCommandStoreTest.java b/test/unit/org/apache/cassandra/service/accord/AccordCommandStoreTest.java index 49684ac762..a6a8ea13ad 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordCommandStoreTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordCommandStoreTest.java @@ -50,6 +50,7 @@ import accord.primitives.TxnId; import accord.primitives.Writes; import accord.utils.ImmutableBitSet; import accord.utils.LargeBitSet; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordCommandTest.java b/test/unit/org/apache/cassandra/service/accord/AccordCommandTest.java index 931f3511c5..ef7ec2edfa 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordCommandTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordCommandTest.java @@ -26,28 +26,29 @@ import org.junit.Test; import accord.api.Key; import accord.api.RoutingKey; -import accord.local.StoreParticipants; -import accord.local.cfk.CommandsForKey; import accord.local.Command; import accord.local.LoadKeys; import accord.local.Node; import accord.local.PreLoadContext; import accord.local.SafeCommand; import accord.local.SafeCommandStore; -import accord.primitives.KeyDeps; -import accord.primitives.Status; +import accord.local.StoreParticipants; +import accord.local.cfk.CommandsForKey; import accord.messages.Accept; import accord.messages.Commit; import accord.messages.PreAccept; import accord.primitives.Ballot; import accord.primitives.FullRoute; +import accord.primitives.KeyDeps; import accord.primitives.Keys; import accord.primitives.PartialDeps; import accord.primitives.PartialTxn; import accord.primitives.Route; +import accord.primitives.Status; import accord.primitives.Timestamp; import accord.primitives.Txn; import accord.primitives.TxnId; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Schema; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordFastPathCoordinatorTest.java b/test/unit/org/apache/cassandra/service/accord/AccordFastPathCoordinatorTest.java index f9ba3b1cfc..0a299406a0 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordFastPathCoordinatorTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordFastPathCoordinatorTest.java @@ -23,6 +23,8 @@ import java.util.List; import java.util.Objects; import java.util.concurrent.TimeUnit; +import com.google.common.collect.Iterables; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -30,15 +32,18 @@ import org.junit.Test; import accord.local.Node; import accord.topology.Shard; import accord.topology.Topology; -import com.google.common.collect.Iterables; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; -import org.apache.cassandra.schema.*; +import org.apache.cassandra.schema.TableId; import org.apache.cassandra.service.accord.AccordFastPath.Status; import org.apache.cassandra.tcm.ClusterMetadata; -import static org.apache.cassandra.service.accord.AccordTestUtils.*; +import static org.apache.cassandra.service.accord.AccordTestUtils.id; +import static org.apache.cassandra.service.accord.AccordTestUtils.idList; +import static org.apache.cassandra.service.accord.AccordTestUtils.idSet; +import static org.apache.cassandra.service.accord.AccordTestUtils.token; public class AccordFastPathCoordinatorTest { diff --git a/test/unit/org/apache/cassandra/service/accord/AccordJournalOrderTest.java b/test/unit/org/apache/cassandra/service/accord/AccordJournalOrderTest.java index 03666a777b..a4b8c75955 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordJournalOrderTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordJournalOrderTest.java @@ -37,6 +37,7 @@ import accord.primitives.Status; import accord.primitives.TxnId; import accord.utils.AccordGens; import accord.utils.RandomSource; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.CassandraRelevantProperties; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordJournalTest.java b/test/unit/org/apache/cassandra/service/accord/AccordJournalTest.java index 58f4e1b1c8..a342c4af0f 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordJournalTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordJournalTest.java @@ -24,6 +24,7 @@ import java.nio.file.Files; import java.util.ArrayList; import java.util.List; +import org.checkerframework.checker.nullness.qual.Nullable; import org.junit.BeforeClass; import org.junit.Test; @@ -31,6 +32,7 @@ import accord.primitives.TxnId; import accord.utils.AccordGens; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; @@ -44,7 +46,6 @@ import org.apache.cassandra.utils.AsymmetricOrdering; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.FBUtilities.Order; import org.apache.cassandra.utils.StorageCompatibilityMode; -import org.checkerframework.checker.nullness.qual.Nullable; import static accord.utils.Property.qt; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordKeyspaceTest.java b/test/unit/org/apache/cassandra/service/accord/AccordKeyspaceTest.java index f609b2ad73..cb3c6147c5 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordKeyspaceTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordKeyspaceTest.java @@ -30,7 +30,11 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; import com.google.common.collect.Iterables; + +import org.assertj.core.api.Assertions; import org.junit.Test; +import org.mockito.Mockito; +import org.mockito.stubbing.Answer; import accord.api.RoutingKey; import accord.local.Command; @@ -50,6 +54,7 @@ import accord.primitives.Status; import accord.primitives.Timestamp; import accord.primitives.Txn; import accord.primitives.TxnId; + import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; @@ -66,9 +71,6 @@ import org.apache.cassandra.schema.TableId; import org.apache.cassandra.service.accord.AccordKeyspace.CommandsForKeyAccessor; import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.utils.CassandraGenerators; -import org.assertj.core.api.Assertions; -import org.mockito.Mockito; -import org.mockito.stubbing.Answer; import static accord.local.Command.Committed.committed; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordMessageSinkTest.java b/test/unit/org/apache/cassandra/service/accord/AccordMessageSinkTest.java index 26075bdf84..c9a774fa18 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordMessageSinkTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordMessageSinkTest.java @@ -20,22 +20,18 @@ package org.apache.cassandra.service.accord; import org.junit.BeforeClass; import org.junit.Test; - -import accord.api.TopologySorter; -import accord.api.TopologySorter.StaticSorter; -import accord.impl.RequestCallbacks; -import accord.messages.ReadData; -import accord.messages.ReadData.CommitOrReadNack; -import accord.topology.TopologyUtils; -import org.apache.cassandra.service.accord.AccordFetchCoordinator.AccordFetchRequest; -import org.apache.cassandra.service.accord.api.AccordTimeService; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import accord.Utils; +import accord.api.TopologySorter; +import accord.api.TopologySorter.StaticSorter; import accord.impl.AbstractFetchCoordinator; import accord.impl.IntKey; +import accord.impl.RequestCallbacks; import accord.local.Node; +import accord.messages.ReadData; +import accord.messages.ReadData.CommitOrReadNack; import accord.messages.ReadTxnData; import accord.messages.Reply; import accord.messages.Request; @@ -49,10 +45,14 @@ import accord.primitives.Txn; import accord.primitives.TxnId; import accord.topology.Topologies; import accord.topology.Topology; +import accord.topology.TopologyUtils; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessageDelivery; +import org.apache.cassandra.service.accord.AccordFetchCoordinator.AccordFetchRequest; +import org.apache.cassandra.service.accord.api.AccordTimeService; import org.apache.cassandra.tcm.ClusterMetadataService; public class AccordMessageSinkTest diff --git a/test/unit/org/apache/cassandra/service/accord/AccordReadRepairTest.java b/test/unit/org/apache/cassandra/service/accord/AccordReadRepairTest.java index 210f9c1e7e..6b1b0811a7 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordReadRepairTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordReadRepairTest.java @@ -22,6 +22,7 @@ import java.io.IOException; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; + import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordStaleReplicasTest.java b/test/unit/org/apache/cassandra/service/accord/AccordStaleReplicasTest.java index 6f4c6f2402..63f3f37660 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordStaleReplicasTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordStaleReplicasTest.java @@ -28,6 +28,7 @@ import accord.utils.AccordGens; import accord.utils.Gen; import accord.utils.Gens; import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.tcm.Epoch; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordSyncPropagatorTest.java b/test/unit/org/apache/cassandra/service/accord/AccordSyncPropagatorTest.java index fdb992947b..7c26913884 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordSyncPropagatorTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordSyncPropagatorTest.java @@ -38,6 +38,8 @@ import javax.annotation.Nullable; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; + +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; @@ -47,9 +49,9 @@ import accord.api.MessageSink; import accord.api.TopologyListener; import accord.api.TopologySorter; import accord.impl.TestAgent; +import accord.impl.basic.MonitoredPendingQueue; import accord.impl.basic.Pending; import accord.impl.basic.PendingQueue; -import accord.impl.basic.MonitoredPendingQueue; import accord.impl.basic.RandomDelayQueue; import accord.impl.basic.SimulatedDelayedExecutorService; import accord.impl.mock.MockCluster; @@ -64,6 +66,7 @@ import accord.utils.Gens; import accord.utils.RandomSource; import accord.utils.SortedArrays.SortedArrayList; import accord.utils.SortedListSet; + import org.apache.cassandra.concurrent.AdaptingScheduledExecutorPlus; import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.config.DatabaseDescriptor; @@ -81,7 +84,6 @@ import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.utils.AccordGenerators; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.concurrent.Future; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; import static org.apache.cassandra.simulator.RandomSource.Choices.choose; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordTaskTest.java b/test/unit/org/apache/cassandra/service/accord/AccordTaskTest.java index 8407f0e74b..c5fafc9103 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordTaskTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordTaskTest.java @@ -30,40 +30,43 @@ import java.util.concurrent.locks.LockSupport; import java.util.function.BiConsumer; import java.util.function.Consumer; -import accord.local.StoreParticipants; -import accord.primitives.Participants; -import accord.primitives.Route; - import com.google.common.collect.Iterables; import com.google.common.collect.Maps; +import org.assertj.core.api.Assertions; +import org.awaitility.Awaitility; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.api.RoutingKey; -import accord.local.cfk.SafeCommandsForKey; import accord.local.CheckedCommands; import accord.local.Command; import accord.local.PreLoadContext; import accord.local.SafeCommand; import accord.local.SafeCommandStore; -import accord.primitives.SaveStatus; +import accord.local.StoreParticipants; +import accord.local.cfk.SafeCommandsForKey; import accord.primitives.Ballot; import accord.primitives.FullRoute; import accord.primitives.Keys; import accord.primitives.PartialDeps; import accord.primitives.PartialTxn; +import accord.primitives.Participants; import accord.primitives.Ranges; +import accord.primitives.Route; +import accord.primitives.SaveStatus; import accord.primitives.Timestamp; import accord.primitives.Txn; import accord.primitives.TxnId; import accord.utils.Gen; import accord.utils.Gens; import accord.utils.RandomSource; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.db.ReadExecutionController; @@ -76,14 +79,11 @@ import org.apache.cassandra.service.StorageService; import org.apache.cassandra.service.accord.AccordCommandStore.ExclusiveCaches; import org.apache.cassandra.service.accord.AccordExecutor.ExclusiveGlobalCaches; import org.apache.cassandra.service.accord.AccordKeyspace.CommandsForKeyAccessor; -import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.service.accord.api.PartitionKey; +import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.utils.AssertionUtils; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.concurrent.Condition; -import org.assertj.core.api.Assertions; -import org.awaitility.Awaitility; -import org.mockito.Mockito; import static accord.local.LoadKeys.SYNC; import static accord.local.LoadKeysFor.READ_WRITE; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordTestUtils.java b/test/unit/org/apache/cassandra/service/accord/AccordTestUtils.java index 93f732099f..84c4a57d61 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordTestUtils.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordTestUtils.java @@ -32,6 +32,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import com.google.common.collect.Sets; + import org.junit.Assert; import accord.api.AsyncExecutor; @@ -79,6 +80,7 @@ import accord.utils.SortedArrays.SortedArrayList; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; import accord.utils.async.Cancellable; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.concurrent.ManualExecutor; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordTopologyTest.java b/test/unit/org/apache/cassandra/service/accord/AccordTopologyTest.java index 753848a219..596d99da27 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordTopologyTest.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordTopologyTest.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Set; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -31,6 +32,7 @@ import accord.local.Node; import accord.local.Node.Id; import accord.topology.Shard; import accord.topology.Topology; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; diff --git a/test/unit/org/apache/cassandra/service/accord/AccordTopologyUtils.java b/test/unit/org/apache/cassandra/service/accord/AccordTopologyUtils.java index 2660f07096..8b6b9ddb3c 100644 --- a/test/unit/org/apache/cassandra/service/accord/AccordTopologyUtils.java +++ b/test/unit/org/apache/cassandra/service/accord/AccordTopologyUtils.java @@ -28,6 +28,7 @@ import com.google.common.collect.ImmutableSet; import accord.local.Node; import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Range; diff --git a/test/unit/org/apache/cassandra/service/accord/CommandChangeTest.java b/test/unit/org/apache/cassandra/service/accord/CommandChangeTest.java index d10b0e5191..312a67f3c4 100644 --- a/test/unit/org/apache/cassandra/service/accord/CommandChangeTest.java +++ b/test/unit/org/apache/cassandra/service/accord/CommandChangeTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.service.accord; import java.util.EnumSet; import java.util.Set; +import org.assertj.core.api.SoftAssertions; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -33,6 +34,7 @@ import accord.primitives.TxnId; import accord.utils.Gen; import accord.utils.LazyToString; import accord.utils.ReflectionUtils; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; @@ -43,10 +45,10 @@ import org.apache.cassandra.service.StorageService; import org.apache.cassandra.service.accord.serializers.Version; import org.apache.cassandra.service.consensus.TransactionalMode; import org.apache.cassandra.utils.AccordGenerators; -import org.assertj.core.api.SoftAssertions; -import static accord.api.Journal.*; -import static accord.impl.CommandChange.*; +import static accord.api.Journal.Load; +import static accord.impl.CommandChange.Field; +import static accord.impl.CommandChange.getFlags; import static accord.utils.Property.qt; import static org.apache.cassandra.cql3.statements.schema.CreateTableStatement.parse; diff --git a/test/unit/org/apache/cassandra/service/accord/EndpointMappingTest.java b/test/unit/org/apache/cassandra/service/accord/EndpointMappingTest.java index 94a2556601..5a54dec827 100644 --- a/test/unit/org/apache/cassandra/service/accord/EndpointMappingTest.java +++ b/test/unit/org/apache/cassandra/service/accord/EndpointMappingTest.java @@ -18,14 +18,15 @@ package org.apache.cassandra.service.accord; +import org.assertj.core.api.Assertions; import org.junit.Test; +import org.quicktheories.generators.SourceDSL; import accord.local.Node; -import org.apache.cassandra.utils.CassandraGenerators; -import org.assertj.core.api.Assertions; -import static org.quicktheories.QuickTheory.qt; -import org.quicktheories.generators.SourceDSL; +import org.apache.cassandra.utils.CassandraGenerators; + +import static org.quicktheories.QuickTheory.qt; public class EndpointMappingTest diff --git a/test/unit/org/apache/cassandra/service/accord/EpochSyncTest.java b/test/unit/org/apache/cassandra/service/accord/EpochSyncTest.java index aee4fabb44..c2070a76f5 100644 --- a/test/unit/org/apache/cassandra/service/accord/EpochSyncTest.java +++ b/test/unit/org/apache/cassandra/service/accord/EpochSyncTest.java @@ -44,18 +44,21 @@ import java.util.function.Supplier; import javax.annotation.Nullable; import com.google.common.collect.Sets; + +import org.assertj.core.api.Assertions; +import org.assertj.core.description.Description; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import accord.Utils; import accord.api.MessageSink; -import accord.impl.TestAgent; -import accord.impl.mock.MockCluster; -import accord.local.ShardDistributor; import accord.impl.DefaultTimeouts; import accord.impl.SizeOfIntersectionSorter; +import accord.impl.TestAgent; +import accord.impl.mock.MockCluster; import accord.local.Node; +import accord.local.ShardDistributor; import accord.local.TimeService; import accord.primitives.Ranges; import accord.topology.EpochReady; @@ -70,6 +73,7 @@ import accord.utils.async.AsyncChains; import accord.utils.async.AsyncResult; import accord.utils.async.AsyncResults; import accord.utils.async.Cancellable; + import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.concurrent.SimulatedExecutorFactory; import org.apache.cassandra.concurrent.Stage; @@ -109,8 +113,6 @@ import org.apache.cassandra.tcm.transformations.PrepareJoin; import org.apache.cassandra.tcm.transformations.PrepareLeave; import org.apache.cassandra.utils.ByteArrayUtil; import org.apache.cassandra.utils.Pair; -import org.assertj.core.api.Assertions; -import org.assertj.core.description.Description; import static accord.utils.Property.commands; import static accord.utils.Property.stateful; diff --git a/test/unit/org/apache/cassandra/service/accord/RouteInMemoryIndexTest.java b/test/unit/org/apache/cassandra/service/accord/RouteInMemoryIndexTest.java index 1d95a6d304..7d9bc9aa60 100644 --- a/test/unit/org/apache/cassandra/service/accord/RouteInMemoryIndexTest.java +++ b/test/unit/org/apache/cassandra/service/accord/RouteInMemoryIndexTest.java @@ -25,6 +25,9 @@ import java.util.function.Predicate; import javax.annotation.Nullable; +import org.agrona.collections.Long2ObjectHashMap; +import org.agrona.collections.LongArrayList; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,8 +41,7 @@ import accord.primitives.Txn; import accord.primitives.TxnId; import accord.utils.Property; import accord.utils.RandomSource; -import org.agrona.collections.Long2ObjectHashMap; -import org.agrona.collections.LongArrayList; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Murmur3Partitioner.LongToken; @@ -48,7 +50,6 @@ import org.apache.cassandra.index.accord.TxnRange; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.utils.CloseableIterator; -import org.assertj.core.api.Assertions; import static accord.utils.Property.commands; import static accord.utils.Property.stateful; diff --git a/test/unit/org/apache/cassandra/service/accord/SimpleAccordEndpointMapper.java b/test/unit/org/apache/cassandra/service/accord/SimpleAccordEndpointMapper.java index 9fff97ad03..707017da12 100644 --- a/test/unit/org/apache/cassandra/service/accord/SimpleAccordEndpointMapper.java +++ b/test/unit/org/apache/cassandra/service/accord/SimpleAccordEndpointMapper.java @@ -24,6 +24,7 @@ import java.nio.ByteBuffer; import java.util.Map; import accord.local.Node; + import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/test/unit/org/apache/cassandra/service/accord/SimpleSimulatedAccordCommandStoreTest.java b/test/unit/org/apache/cassandra/service/accord/SimpleSimulatedAccordCommandStoreTest.java index b8016430c1..0d2b8ccb93 100644 --- a/test/unit/org/apache/cassandra/service/accord/SimpleSimulatedAccordCommandStoreTest.java +++ b/test/unit/org/apache/cassandra/service/accord/SimpleSimulatedAccordCommandStoreTest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.service.accord; +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.local.PreLoadContext; @@ -25,7 +26,6 @@ import accord.local.StoreParticipants; import accord.primitives.SaveStatus; import accord.primitives.TxnId; import accord.utils.AccordGens; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/service/accord/SimulatedAccordCommandStore.java b/test/unit/org/apache/cassandra/service/accord/SimulatedAccordCommandStore.java index 0cbf4ae650..1cd882967d 100644 --- a/test/unit/org/apache/cassandra/service/accord/SimulatedAccordCommandStore.java +++ b/test/unit/org/apache/cassandra/service/accord/SimulatedAccordCommandStore.java @@ -29,8 +29,11 @@ import java.util.function.BooleanSupplier; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.ToLongFunction; + import javax.annotation.Nullable; +import org.assertj.core.api.Assertions; + import accord.api.AsyncExecutor; import accord.api.Journal; import accord.api.LocalListeners; @@ -78,6 +81,7 @@ import accord.topology.TopologyManager; import accord.utils.Gens; import accord.utils.RandomSource; import accord.utils.async.AsyncResult; + import org.apache.cassandra.concurrent.ExecutorFactory; import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.concurrent.SimulatedExecutorFactory; @@ -94,7 +98,6 @@ import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Generators; import org.apache.cassandra.utils.Pair; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.config.DatabaseDescriptor.getPartitioner; import static org.apache.cassandra.db.ColumnFamilyStore.FlushReason.UNIT_TESTS; diff --git a/test/unit/org/apache/cassandra/service/accord/SimulatedAccordCommandStoreTestBase.java b/test/unit/org/apache/cassandra/service/accord/SimulatedAccordCommandStoreTestBase.java index 272f1e022e..726987898a 100644 --- a/test/unit/org/apache/cassandra/service/accord/SimulatedAccordCommandStoreTestBase.java +++ b/test/unit/org/apache/cassandra/service/accord/SimulatedAccordCommandStoreTestBase.java @@ -29,6 +29,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import com.google.common.collect.Maps; + +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.BeforeClass; @@ -58,6 +60,7 @@ import accord.utils.Gens; import accord.utils.Invariants; import accord.utils.async.AsyncChains; import accord.utils.async.AsyncResult; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; @@ -68,13 +71,12 @@ import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.service.accord.api.PartitionKey; +import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.RTree; import org.apache.cassandra.utils.RangeTree; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.schema.SchemaConstants.ACCORD_KEYSPACE_NAME; import static org.apache.cassandra.service.accord.AccordService.getBlocking; diff --git a/test/unit/org/apache/cassandra/service/accord/SimulatedAccordTaskTest.java b/test/unit/org/apache/cassandra/service/accord/SimulatedAccordTaskTest.java index f18065adc9..c824516b9b 100644 --- a/test/unit/org/apache/cassandra/service/accord/SimulatedAccordTaskTest.java +++ b/test/unit/org/apache/cassandra/service/accord/SimulatedAccordTaskTest.java @@ -26,6 +26,7 @@ import java.util.function.BooleanSupplier; import java.util.function.LongSupplier; import java.util.function.Supplier; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; @@ -44,6 +45,7 @@ import accord.primitives.Unseekables; import accord.utils.Gen; import accord.utils.Gens; import accord.utils.RandomSource; + import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Murmur3Partitioner.LongToken; import org.apache.cassandra.schema.TableId; @@ -51,7 +53,6 @@ import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.accord.SimulatedAccordCommandStore.FunctionWrapper; import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.utils.Pair; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/service/accord/SimulatedDepsTest.java b/test/unit/org/apache/cassandra/service/accord/SimulatedDepsTest.java index d19408b43e..28f3bc3ebe 100644 --- a/test/unit/org/apache/cassandra/service/accord/SimulatedDepsTest.java +++ b/test/unit/org/apache/cassandra/service/accord/SimulatedDepsTest.java @@ -18,6 +18,16 @@ package org.apache.cassandra.service.accord; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.junit.Test; + import accord.api.RoutingKey; import accord.primitives.FullKeyRoute; import accord.primitives.FullRangeRoute; @@ -28,22 +38,14 @@ import accord.primitives.Ranges; import accord.primitives.Txn; import accord.primitives.TxnId; import accord.utils.Gen; + import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Murmur3Partitioner.LongToken; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.service.accord.api.PartitionKey; +import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.utils.Generators; -import org.junit.Test; - -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import static accord.utils.Property.qt; import static org.apache.cassandra.service.accord.AccordTestUtils.createTxn; diff --git a/test/unit/org/apache/cassandra/service/accord/SimulatedMultiKeyAndRangeTest.java b/test/unit/org/apache/cassandra/service/accord/SimulatedMultiKeyAndRangeTest.java index 91fd2cb4d6..9ddf23ab29 100644 --- a/test/unit/org/apache/cassandra/service/accord/SimulatedMultiKeyAndRangeTest.java +++ b/test/unit/org/apache/cassandra/service/accord/SimulatedMultiKeyAndRangeTest.java @@ -39,6 +39,7 @@ import accord.primitives.Routable.Domain; import accord.primitives.Txn; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.service.accord.api.PartitionKey; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/service/accord/SimulatedRandomKeysWithRangeConflictTest.java b/test/unit/org/apache/cassandra/service/accord/SimulatedRandomKeysWithRangeConflictTest.java index 469732f674..40c055cd40 100644 --- a/test/unit/org/apache/cassandra/service/accord/SimulatedRandomKeysWithRangeConflictTest.java +++ b/test/unit/org/apache/cassandra/service/accord/SimulatedRandomKeysWithRangeConflictTest.java @@ -18,6 +18,10 @@ package org.apache.cassandra.service.accord; +import java.util.Arrays; + +import org.junit.Test; + import accord.api.RoutingKey; import accord.primitives.FullRangeRoute; import accord.primitives.FullRoute; @@ -27,11 +31,9 @@ import accord.primitives.RoutingKeys; import accord.primitives.Txn; import accord.utils.Property; import accord.utils.RandomSource; + import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.FailingConsumer; -import org.junit.Test; - -import java.util.Arrays; import static accord.utils.Property.commands; import static accord.utils.Property.stateful; diff --git a/test/unit/org/apache/cassandra/service/accord/WatermarkCollectorTest.java b/test/unit/org/apache/cassandra/service/accord/WatermarkCollectorTest.java index 78e96d2475..59210bbe96 100644 --- a/test/unit/org/apache/cassandra/service/accord/WatermarkCollectorTest.java +++ b/test/unit/org/apache/cassandra/service/accord/WatermarkCollectorTest.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import org.agrona.collections.Long2LongHashMap; import org.junit.Test; import accord.local.Node; @@ -30,7 +31,7 @@ import accord.utils.AccordGens; import accord.utils.Gen; import accord.utils.Gens; import accord.utils.Invariants; -import org.agrona.collections.Long2LongHashMap; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.io.Serializers; diff --git a/test/unit/org/apache/cassandra/service/accord/fastpath/FastPathParsingTest.java b/test/unit/org/apache/cassandra/service/accord/fastpath/FastPathParsingTest.java index 96b9e87435..83f1bb6166 100644 --- a/test/unit/org/apache/cassandra/service/accord/fastpath/FastPathParsingTest.java +++ b/test/unit/org/apache/cassandra/service/accord/fastpath/FastPathParsingTest.java @@ -24,6 +24,7 @@ import java.util.Map; import java.util.StringJoiner; import com.google.common.collect.ImmutableMap; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/service/accord/fastpath/ParameterizedFastPathStrategyTest.java b/test/unit/org/apache/cassandra/service/accord/fastpath/ParameterizedFastPathStrategyTest.java index cda86eff8b..5142dbaf0f 100644 --- a/test/unit/org/apache/cassandra/service/accord/fastpath/ParameterizedFastPathStrategyTest.java +++ b/test/unit/org/apache/cassandra/service/accord/fastpath/ParameterizedFastPathStrategyTest.java @@ -22,11 +22,13 @@ import java.util.HashMap; import java.util.Map; import com.google.common.collect.ImmutableMap; + import org.junit.Assert; import org.junit.Test; import accord.local.Node; import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.service.accord.fastpath.ParameterizedFastPathStrategy.WeightedDc; diff --git a/test/unit/org/apache/cassandra/service/accord/journal/AccordTopologyUpdateTest.java b/test/unit/org/apache/cassandra/service/accord/journal/AccordTopologyUpdateTest.java index 8443a09741..21b7e7bc3a 100644 --- a/test/unit/org/apache/cassandra/service/accord/journal/AccordTopologyUpdateTest.java +++ b/test/unit/org/apache/cassandra/service/accord/journal/AccordTopologyUpdateTest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.service.accord.journal; +import org.agrona.collections.Int2ObjectHashMap; import org.junit.Before; import org.junit.Test; @@ -29,7 +30,7 @@ import accord.topology.Topology; import accord.utils.AccordGens; import accord.utils.Gen; import accord.utils.Gens; -import org.agrona.collections.Int2ObjectHashMap; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; diff --git a/test/unit/org/apache/cassandra/service/accord/repair/RequiredResponseTrackerTest.java b/test/unit/org/apache/cassandra/service/accord/repair/RequiredResponseTrackerTest.java index f2900a3595..14a28939e0 100644 --- a/test/unit/org/apache/cassandra/service/accord/repair/RequiredResponseTrackerTest.java +++ b/test/unit/org/apache/cassandra/service/accord/repair/RequiredResponseTrackerTest.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Set; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -32,6 +33,7 @@ import accord.coordinate.tracking.RequestStatus; import accord.local.Node; import accord.topology.Topologies; import accord.topology.Topology; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; @@ -48,7 +50,12 @@ import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.membership.Location; import static org.apache.cassandra.cql3.statements.schema.CreateTableStatement.parse; -import static org.apache.cassandra.service.accord.AccordTopologyUtils.*; +import static org.apache.cassandra.service.accord.AccordTopologyUtils.ID1; +import static org.apache.cassandra.service.accord.AccordTopologyUtils.ID2; +import static org.apache.cassandra.service.accord.AccordTopologyUtils.ID3; +import static org.apache.cassandra.service.accord.AccordTopologyUtils.NODE_SET; +import static org.apache.cassandra.service.accord.AccordTopologyUtils.configureCluster; +import static org.apache.cassandra.service.accord.AccordTopologyUtils.range; public class RequiredResponseTrackerTest { diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/CheckStatusSerializersTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/CheckStatusSerializersTest.java index 5a8ac1505b..9aa2209039 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/CheckStatusSerializersTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/CheckStatusSerializersTest.java @@ -24,15 +24,16 @@ import java.util.List; import org.junit.Test; import accord.api.RoutingKey; -import accord.primitives.SaveStatus; -import accord.primitives.KnownMap; import accord.primitives.Ballot; import accord.primitives.FullKeyRoute; +import accord.primitives.KnownMap; import accord.primitives.Routable; +import accord.primitives.SaveStatus; import accord.primitives.Unseekables; import accord.utils.AccordGens; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.io.Serializers; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/CommandSerializersTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/CommandSerializersTest.java index c4635cdde6..9287a568df 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/CommandSerializersTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/CommandSerializersTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.service.accord.serializers; import java.io.IOException; import java.nio.ByteBuffer; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; @@ -31,6 +32,7 @@ import accord.primitives.Timestamp; import accord.primitives.Txn; import accord.primitives.TxnId; import accord.utils.AccordGens; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.io.Serializers; @@ -40,7 +42,6 @@ import org.apache.cassandra.service.accord.AccordTestUtils; import org.apache.cassandra.service.accord.TokenRange; import org.apache.cassandra.service.accord.api.PartitionKey; import org.apache.cassandra.utils.FastByteOperations; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; import static org.apache.cassandra.config.DatabaseDescriptor.getPartitioner; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/CommandStoreSerializersTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/CommandStoreSerializersTest.java index 6b1211c98f..4151ca5326 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/CommandStoreSerializersTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/CommandStoreSerializersTest.java @@ -22,6 +22,7 @@ import org.junit.Test; import accord.local.RedundantBefore; import accord.utils.Gens; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.io.Serializers; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/CommandsForKeySerializerTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/CommandsForKeySerializerTest.java index ce9e9cdb13..764ce24751 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/CommandsForKeySerializerTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/CommandsForKeySerializerTest.java @@ -38,6 +38,7 @@ import java.util.function.LongUnaryOperator; import java.util.function.Supplier; import java.util.stream.Stream; +import org.agrona.collections.Int2ObjectHashMap; import org.apache.commons.lang3.ArrayUtils; import org.junit.After; import org.junit.Assert; @@ -103,7 +104,7 @@ import accord.utils.SimpleBitSets; import accord.utils.SortedArrays; import accord.utils.UnhandledEnum; import accord.utils.async.AsyncChain; -import org.agrona.collections.Int2ObjectHashMap; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Token; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/DepsSerializersTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/DepsSerializersTest.java index d68558f2c6..34daada80f 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/DepsSerializersTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/DepsSerializersTest.java @@ -19,8 +19,10 @@ package org.apache.cassandra.service.accord.serializers; import org.junit.Test; +import org.mockito.Mockito; import accord.primitives.Deps; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; @@ -29,7 +31,6 @@ import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaProvider; import org.apache.cassandra.utils.AccordGenerators; -import org.mockito.Mockito; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/EncodeAsVInt32Test.java b/test/unit/org/apache/cassandra/service/accord/serializers/EncodeAsVInt32Test.java index c2f65f8474..74b27672ab 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/EncodeAsVInt32Test.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/EncodeAsVInt32Test.java @@ -22,6 +22,7 @@ import org.junit.Test; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.io.Serializers; import org.apache.cassandra.io.util.DataOutputBuffer; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/IVersionedWithKeysSerializerTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/IVersionedWithKeysSerializerTest.java index f06f3c15f1..c83788cc88 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/IVersionedWithKeysSerializerTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/IVersionedWithKeysSerializerTest.java @@ -34,6 +34,7 @@ import accord.primitives.RoutingKeys; import accord.utils.Gen; import accord.utils.Gens; import accord.utils.RandomSource; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/JournalKeySerializerTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/JournalKeySerializerTest.java index b36a5c74d5..89d48af077 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/JournalKeySerializerTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/JournalKeySerializerTest.java @@ -27,6 +27,7 @@ import accord.primitives.Routable; import accord.primitives.Timestamp; import accord.primitives.Txn; import accord.primitives.TxnId; + import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.DecoratedKey; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/KeySerializersTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/KeySerializersTest.java index 4335085433..1099f8a7ec 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/KeySerializersTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/KeySerializersTest.java @@ -43,6 +43,7 @@ import accord.utils.Gen; import accord.utils.RandomSource; import accord.utils.RandomTestRunner; import accord.utils.UnhandledEnum; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/LatestDepsSerializerTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/LatestDepsSerializerTest.java index 0efc44023d..e3de6ad75c 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/LatestDepsSerializerTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/LatestDepsSerializerTest.java @@ -34,6 +34,7 @@ import accord.utils.Gen; import accord.utils.Gens; import accord.utils.RandomSource; import accord.utils.RandomTestRunner; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Token; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/SerializePackedTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/SerializePackedTest.java index 2c355139e6..c1a2a90a07 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/SerializePackedTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/SerializePackedTest.java @@ -21,17 +21,18 @@ package org.apache.cassandra.service.accord.serializers; import java.io.IOException; import java.util.Arrays; -import accord.utils.Gens; +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.utils.Gen; +import accord.utils.Gens; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.Serializers; import org.apache.cassandra.io.UnversionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.util.DataOutputPlus; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/TableMetadatasAndKeysTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/TableMetadatasAndKeysTest.java index 14a41cb4bb..715355ae13 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/TableMetadatasAndKeysTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/TableMetadatasAndKeysTest.java @@ -31,6 +31,7 @@ import accord.primitives.Seekable; import accord.primitives.Seekables; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/TableMetadatasTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/TableMetadatasTest.java index e89f49bffa..682fa4067b 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/TableMetadatasTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/TableMetadatasTest.java @@ -23,9 +23,13 @@ import java.util.LinkedHashMap; import java.util.Map; import org.junit.Test; +import org.mockito.Mockito; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.exceptions.UnknownTableException; import org.apache.cassandra.io.Serializers; import org.apache.cassandra.io.UnversionedSerializer; @@ -38,9 +42,6 @@ import org.apache.cassandra.schema.TableId; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.CassandraGenerators; import org.apache.cassandra.utils.Generators; -import org.mockito.Mockito; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/TokenKeyTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/TokenKeyTest.java index 5d9a7f30b1..e04259869a 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/TokenKeyTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/TokenKeyTest.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; @@ -33,6 +34,7 @@ import accord.utils.Gens; import accord.utils.Invariants; import accord.utils.LazyToString; import accord.utils.ReflectionUtils; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.dht.ByteOrderedPartitioner; @@ -50,7 +52,6 @@ import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.utils.AccordGenerators; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.CassandraGenerators; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; import static org.apache.cassandra.service.accord.api.TokenKey.serializer; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/TopologySerializersTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/TopologySerializersTest.java index 4b0d53c54a..93470b2144 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/TopologySerializersTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/TopologySerializersTest.java @@ -20,8 +20,8 @@ package org.apache.cassandra.service.accord.serializers; import java.io.IOException; +import org.assertj.core.api.Assertions; import org.junit.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,6 +31,7 @@ import accord.topology.Topology; import accord.utils.AccordGens; import accord.utils.Gen; import accord.utils.Gens; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.io.Serializers; @@ -40,7 +41,6 @@ import org.apache.cassandra.service.accord.TokenRange; import org.apache.cassandra.utils.AccordGenerators; import org.apache.cassandra.utils.CassandraGenerators; import org.apache.cassandra.utils.Generators; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/service/accord/serializers/WaitingOnSerializerTest.java b/test/unit/org/apache/cassandra/service/accord/serializers/WaitingOnSerializerTest.java index 0e209ce3e8..333ffea285 100644 --- a/test/unit/org/apache/cassandra/service/accord/serializers/WaitingOnSerializerTest.java +++ b/test/unit/org/apache/cassandra/service/accord/serializers/WaitingOnSerializerTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.service.accord.serializers; import java.nio.ByteBuffer; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; @@ -35,13 +36,13 @@ import accord.utils.Gen; import accord.utils.Gens; import accord.utils.LargeBitSet; import accord.utils.Utils; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.utils.AccordGenerators; import org.apache.cassandra.utils.CassandraGenerators; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/service/accord/txn/AbstractKeySortedTest.java b/test/unit/org/apache/cassandra/service/accord/txn/AbstractKeySortedTest.java index 2c2b89193a..17c47ca9a5 100644 --- a/test/unit/org/apache/cassandra/service/accord/txn/AbstractKeySortedTest.java +++ b/test/unit/org/apache/cassandra/service/accord/txn/AbstractKeySortedTest.java @@ -23,12 +23,14 @@ import java.util.List; import java.util.Objects; import com.google.common.collect.Lists; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import accord.primitives.Routable.Domain; import accord.primitives.Seekable; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.dht.ByteOrderedPartitioner; diff --git a/test/unit/org/apache/cassandra/service/accord/txn/AccordUpdateTest.java b/test/unit/org/apache/cassandra/service/accord/txn/AccordUpdateTest.java index 15df8a781b..37457b0e56 100644 --- a/test/unit/org/apache/cassandra/service/accord/txn/AccordUpdateTest.java +++ b/test/unit/org/apache/cassandra/service/accord/txn/AccordUpdateTest.java @@ -24,6 +24,7 @@ import org.junit.BeforeClass; import org.junit.Test; import accord.primitives.Txn; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.io.Serializers; import org.apache.cassandra.schema.KeyspaceParams; diff --git a/test/unit/org/apache/cassandra/service/accord/txn/TxnConditionTest.java b/test/unit/org/apache/cassandra/service/accord/txn/TxnConditionTest.java index 2677e55272..287e921a02 100644 --- a/test/unit/org/apache/cassandra/service/accord/txn/TxnConditionTest.java +++ b/test/unit/org/apache/cassandra/service/accord/txn/TxnConditionTest.java @@ -26,32 +26,33 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; + import javax.annotation.Nullable; +import org.assertj.core.api.Assertions; +import org.junit.Test; + import accord.utils.DefaultRandom; +import accord.utils.Gen; +import accord.utils.Gens; + import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.FieldIdentifier; +import org.apache.cassandra.cql3.conditions.ColumnCondition; +import org.apache.cassandra.cql3.conditions.ColumnConditionTest; import org.apache.cassandra.db.BufferClustering; +import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.EmptyIterators; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.CollectionType; import org.apache.cassandra.db.marshal.CounterColumnType; +import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.SetType; import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.db.partitions.SimplePartition; -import org.apache.cassandra.dht.Murmur3Partitioner; -import org.apache.cassandra.utils.AbstractTypeGenerators; -import org.assertj.core.api.Assertions; -import org.junit.Test; - -import accord.utils.Gen; -import accord.utils.Gens; -import org.apache.cassandra.cql3.conditions.ColumnCondition; -import org.apache.cassandra.cql3.conditions.ColumnConditionTest; -import org.apache.cassandra.db.Clustering; -import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.rows.CellPath; +import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.io.Serializers; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.schema.ColumnMetadata; @@ -61,6 +62,7 @@ import org.apache.cassandra.schema.TableId; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.accord.serializers.TableMetadatas; import org.apache.cassandra.transport.ProtocolVersion; +import org.apache.cassandra.utils.AbstractTypeGenerators; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.CassandraGenerators; import org.apache.cassandra.utils.Generators; diff --git a/test/unit/org/apache/cassandra/service/accord/txn/TxnReferenceOperationTest.java b/test/unit/org/apache/cassandra/service/accord/txn/TxnReferenceOperationTest.java index 5515221815..0b271e2b71 100644 --- a/test/unit/org/apache/cassandra/service/accord/txn/TxnReferenceOperationTest.java +++ b/test/unit/org/apache/cassandra/service/accord/txn/TxnReferenceOperationTest.java @@ -26,9 +26,14 @@ import javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; + import org.junit.Test; +import org.reflections.Reflections; +import org.reflections.scanners.Scanners; +import org.reflections.util.ConfigurationBuilder; import accord.utils.Gen; + import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.FieldIdentifier; import org.apache.cassandra.cql3.Operation; @@ -51,9 +56,6 @@ import org.apache.cassandra.service.accord.serializers.TableMetadatas; import org.apache.cassandra.utils.AbstractTypeGenerators; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Generators; -import org.reflections.Reflections; -import org.reflections.scanners.Scanners; -import org.reflections.util.ConfigurationBuilder; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/service/accord/txn/TxnUpdateTest.java b/test/unit/org/apache/cassandra/service/accord/txn/TxnUpdateTest.java index 4c6827710d..6daad3627f 100644 --- a/test/unit/org/apache/cassandra/service/accord/txn/TxnUpdateTest.java +++ b/test/unit/org/apache/cassandra/service/accord/txn/TxnUpdateTest.java @@ -33,6 +33,7 @@ import accord.primitives.Ranges; import accord.utils.Gen; import accord.utils.Gens; import accord.utils.SortedArrays; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.BytesType; diff --git a/test/unit/org/apache/cassandra/service/paxos/AbstractPaxosRepairTest.java b/test/unit/org/apache/cassandra/service/paxos/AbstractPaxosRepairTest.java index b91604792d..f91d3e7d1c 100644 --- a/test/unit/org/apache/cassandra/service/paxos/AbstractPaxosRepairTest.java +++ b/test/unit/org/apache/cassandra/service/paxos/AbstractPaxosRepairTest.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Objects; import com.google.common.collect.Iterables; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/service/paxos/PaxosProposeTest.java b/test/unit/org/apache/cassandra/service/paxos/PaxosProposeTest.java index 78724900aa..713af93ae1 100644 --- a/test/unit/org/apache/cassandra/service/paxos/PaxosProposeTest.java +++ b/test/unit/org/apache/cassandra/service/paxos/PaxosProposeTest.java @@ -23,7 +23,10 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater; import org.junit.Test; -import static org.apache.cassandra.service.paxos.PaxosPropose.*; +import static org.apache.cassandra.service.paxos.PaxosPropose.ACCEPT_INCREMENT; +import static org.apache.cassandra.service.paxos.PaxosPropose.FAILURE_INCREMENT; +import static org.apache.cassandra.service.paxos.PaxosPropose.REFUSAL_INCREMENT; +import static org.apache.cassandra.service.paxos.PaxosPropose.shouldSignal; public class PaxosProposeTest { diff --git a/test/unit/org/apache/cassandra/service/paxos/PaxosRepairHistoryTest.java b/test/unit/org/apache/cassandra/service/paxos/PaxosRepairHistoryTest.java index 65b9f332bb..3bd91ba4d3 100644 --- a/test/unit/org/apache/cassandra/service/paxos/PaxosRepairHistoryTest.java +++ b/test/unit/org/apache/cassandra/service/paxos/PaxosRepairHistoryTest.java @@ -18,7 +18,15 @@ package org.apache.cassandra.service.paxos; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.NavigableMap; +import java.util.Random; +import java.util.TreeMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -31,24 +39,23 @@ import java.util.stream.Stream; import com.google.common.collect.Lists; -import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.db.SystemKeyspace; -import org.apache.cassandra.dht.IPartitioner; -import org.apache.cassandra.dht.Murmur3Partitioner.LongToken; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.Pair; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; - -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.dht.Murmur3Partitioner; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.dht.Murmur3Partitioner; +import org.apache.cassandra.dht.Murmur3Partitioner.LongToken; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; +import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.Pair; + import static org.apache.cassandra.config.CassandraRelevantProperties.PARTITIONER; import static org.apache.cassandra.dht.Range.deoverlap; import static org.apache.cassandra.service.paxos.Ballot.Flag.NONE; diff --git a/test/unit/org/apache/cassandra/service/paxos/PaxosRepairTest.java b/test/unit/org/apache/cassandra/service/paxos/PaxosRepairTest.java index e226cf32b3..f691c86709 100644 --- a/test/unit/org/apache/cassandra/service/paxos/PaxosRepairTest.java +++ b/test/unit/org/apache/cassandra/service/paxos/PaxosRepairTest.java @@ -27,13 +27,15 @@ import java.util.Set; import org.junit.Test; import org.apache.cassandra.locator.InetAddressAndPort; - import org.apache.cassandra.utils.CassandraVersion; import static org.apache.cassandra.service.paxos.PaxosRepair.validateVersionCompatibility; -import static org.junit.Assert.*; - -import static org.apache.cassandra.service.paxos.PaxosRepairTest.Requirements.*; +import static org.apache.cassandra.service.paxos.PaxosRepairTest.Requirements.NORMAL; +import static org.apache.cassandra.service.paxos.PaxosRepairTest.Requirements.NO_DC_CHECKS; +import static org.apache.cassandra.service.paxos.PaxosRepairTest.Requirements.STRICT_QUORUM; +import static org.apache.cassandra.service.paxos.PaxosRepairTest.Requirements.STRICT_QUORUM_AND_NO_DC_CHECKS; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class PaxosRepairTest { diff --git a/test/unit/org/apache/cassandra/service/paxos/PaxosStateTest.java b/test/unit/org/apache/cassandra/service/paxos/PaxosStateTest.java index 3778044233..b06263850f 100644 --- a/test/unit/org/apache/cassandra/service/paxos/PaxosStateTest.java +++ b/test/unit/org/apache/cassandra/service/paxos/PaxosStateTest.java @@ -22,9 +22,6 @@ import java.util.function.Function; import com.google.common.collect.Iterables; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.schema.TableMetadata; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -32,10 +29,16 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.RowUpdateBuilder; +import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.gms.Gossiper; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.paxos.PaxosState.Snapshot; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; @@ -46,8 +49,12 @@ import static org.apache.cassandra.config.Config.PaxosStatePurging.legacy; import static org.apache.cassandra.config.Config.PaxosStatePurging.repaired; import static org.apache.cassandra.service.paxos.Ballot.Flag.NONE; import static org.apache.cassandra.service.paxos.BallotGenerator.Global.atUnixMicros; -import static org.apache.cassandra.service.paxos.Commit.*; -import static org.junit.Assert.*; +import static org.apache.cassandra.service.paxos.Commit.Accepted; +import static org.apache.cassandra.service.paxos.Commit.AcceptedWithTTL; +import static org.apache.cassandra.service.paxos.Commit.Committed; +import static org.apache.cassandra.service.paxos.Commit.CommittedWithTTL; +import static org.apache.cassandra.service.paxos.Commit.Proposal; +import static org.junit.Assert.assertEquals; public class PaxosStateTest { diff --git a/test/unit/org/apache/cassandra/service/paxos/PaxosVerbHandlerOutOfRangeTest.java b/test/unit/org/apache/cassandra/service/paxos/PaxosVerbHandlerOutOfRangeTest.java index a788c0ff9d..9c6e75c510 100644 --- a/test/unit/org/apache/cassandra/service/paxos/PaxosVerbHandlerOutOfRangeTest.java +++ b/test/unit/org/apache/cassandra/service/paxos/PaxosVerbHandlerOutOfRangeTest.java @@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import com.google.common.util.concurrent.ListenableFuture; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -48,14 +49,13 @@ import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.membership.NodeState; import org.apache.cassandra.utils.ByteBufferUtil; -import static org.junit.Assert.assertEquals; - import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.MessageDelivery; import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.broadcastAddress; import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.bytesToken; import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.node1; import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.randomInt; import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.registerOutgoingMessageSink; +import static org.junit.Assert.assertEquals; public class PaxosVerbHandlerOutOfRangeTest // PaxosV1 out of range tests - V2 implements OOTR checks at the protocol level { diff --git a/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosMockUpdateSupplier.java b/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosMockUpdateSupplier.java index d1733b4b63..16aa7593c6 100644 --- a/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosMockUpdateSupplier.java +++ b/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosMockUpdateSupplier.java @@ -18,7 +18,13 @@ package org.apache.cassandra.service.paxos.uncommitted; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.NavigableMap; +import java.util.TreeMap; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; diff --git a/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosRowsTest.java b/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosRowsTest.java index 529a2cf0a8..f410424499 100644 --- a/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosRowsTest.java +++ b/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosRowsTest.java @@ -24,12 +24,23 @@ import java.util.UUID; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import org.junit.*; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.BufferClustering; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.LivenessInfo; +import org.apache.cassandra.db.PartitionRangeReadCommand; +import org.apache.cassandra.db.ReadExecutionController; +import org.apache.cassandra.db.SinglePartitionReadCommand; +import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; diff --git a/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosStateTrackerTest.java b/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosStateTrackerTest.java index 3ef0d4e3f8..9836f40594 100644 --- a/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosStateTrackerTest.java +++ b/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosStateTrackerTest.java @@ -23,6 +23,7 @@ import java.util.Collections; import com.google.common.collect.Sets; import com.google.common.io.Files; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -56,7 +57,12 @@ import org.apache.cassandra.utils.ByteBufferUtil; import static org.apache.cassandra.config.CassandraRelevantProperties.FORCE_PAXOS_STATE_REBUILD; import static org.apache.cassandra.service.paxos.uncommitted.PaxosStateTracker.stateDirectory; -import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.*; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.ALL_RANGES; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.PAXOS_CFS; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.PAXOS_REPAIR_CFS; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.createBallots; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.dk; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.kl; import static org.apache.cassandra.service.paxos.uncommitted.UncommittedTableDataTest.assertIteratorContents; import static org.apache.cassandra.service.paxos.uncommitted.UncommittedTableDataTest.uncommitted; diff --git a/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTrackerIntegrationTest.java b/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTrackerIntegrationTest.java index 135607d7e5..7c1edaebe0 100644 --- a/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTrackerIntegrationTest.java +++ b/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTrackerIntegrationTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.service.paxos.uncommitted; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; diff --git a/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTrackerTest.java b/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTrackerTest.java index fa9f0e5a1b..49028adbbe 100644 --- a/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTrackerTest.java +++ b/test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTrackerTest.java @@ -18,11 +18,15 @@ package org.apache.cassandra.service.paxos.uncommitted; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.io.Files; + import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -41,7 +45,12 @@ import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.paxos.Ballot; import org.apache.cassandra.utils.CloseableIterator; -import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.*; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.FULL_RANGE; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.createBallots; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.dk; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.kl; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.r; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.tk; public class PaxosUncommittedTrackerTest { diff --git a/test/unit/org/apache/cassandra/service/paxos/uncommitted/UncommittedTableDataTest.java b/test/unit/org/apache/cassandra/service/paxos/uncommitted/UncommittedTableDataTest.java index e275bcdd89..b557619070 100644 --- a/test/unit/org/apache/cassandra/service/paxos/uncommitted/UncommittedTableDataTest.java +++ b/test/unit/org/apache/cassandra/service/paxos/uncommitted/UncommittedTableDataTest.java @@ -29,6 +29,7 @@ import java.util.stream.Collectors; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.io.Files; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -47,7 +48,13 @@ import org.apache.cassandra.service.paxos.uncommitted.UncommittedTableData.Flush import org.apache.cassandra.service.paxos.uncommitted.UncommittedTableData.Merge; import org.apache.cassandra.utils.CloseableIterator; -import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.*; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.ALL_RANGES; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.PARTITIONER; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.createBallots; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.dk; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.kl; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.r; +import static org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedTests.tk; public class UncommittedTableDataTest { diff --git a/test/unit/org/apache/cassandra/service/reads/DataResolverTest.java b/test/unit/org/apache/cassandra/service/reads/DataResolverTest.java index 062cda0b96..40f5afeec8 100644 --- a/test/unit/org/apache/cassandra/service/reads/DataResolverTest.java +++ b/test/unit/org/apache/cassandra/service/reads/DataResolverTest.java @@ -25,6 +25,7 @@ import java.util.function.BiFunction; import com.google.common.collect.Iterators; import com.google.common.collect.Sets; + import org.junit.Assert; import org.junit.Test; @@ -63,13 +64,13 @@ import org.apache.cassandra.locator.Replica; import org.apache.cassandra.locator.ReplicaPlan; import org.apache.cassandra.locator.ReplicaPlans; import org.apache.cassandra.locator.ReplicaUtils; -import org.apache.cassandra.tcm.ClusterMetadata; -import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.service.reads.repair.ReadRepair; import org.apache.cassandra.service.reads.repair.RepairedDataTracker; import org.apache.cassandra.service.reads.repair.RepairedDataVerifier; import org.apache.cassandra.service.reads.repair.TestableReadRepair; +import org.apache.cassandra.tcm.ClusterMetadata; +import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.membership.NodeAddresses; import org.apache.cassandra.tcm.membership.NodeId; import org.apache.cassandra.tcm.transformations.Register; diff --git a/test/unit/org/apache/cassandra/service/reads/DigestResolverTest.java b/test/unit/org/apache/cassandra/service/reads/DigestResolverTest.java index bde9763baf..0286066638 100644 --- a/test/unit/org/apache/cassandra/service/reads/DigestResolverTest.java +++ b/test/unit/org/apache/cassandra/service/reads/DigestResolverTest.java @@ -23,7 +23,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.locator.ReplicaPlan; import org.junit.Assert; import org.junit.Test; @@ -33,8 +32,9 @@ import org.apache.cassandra.db.SinglePartitionReadCommand; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.locator.EndpointsForToken; -import org.apache.cassandra.tcm.Epoch; +import org.apache.cassandra.locator.ReplicaPlan; import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.transport.Dispatcher; import static org.apache.cassandra.locator.ReplicaUtils.full; diff --git a/test/unit/org/apache/cassandra/service/reads/ReadExecutorTest.java b/test/unit/org/apache/cassandra/service/reads/ReadExecutorTest.java index dcb0952461..4844ca0e03 100644 --- a/test/unit/org/apache/cassandra/service/reads/ReadExecutorTest.java +++ b/test/unit/org/apache/cassandra/service/reads/ReadExecutorTest.java @@ -21,7 +21,6 @@ package org.apache.cassandra.service.reads; import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.exception.ExceptionUtils; - import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/service/reads/SpeculativeRetryParseTest.java b/test/unit/org/apache/cassandra/service/reads/SpeculativeRetryParseTest.java index dca62f6549..4b4846d956 100644 --- a/test/unit/org/apache/cassandra/service/reads/SpeculativeRetryParseTest.java +++ b/test/unit/org/apache/cassandra/service/reads/SpeculativeRetryParseTest.java @@ -29,11 +29,10 @@ import org.junit.runners.Parameterized; import org.apache.cassandra.exceptions.ConfigurationException; +import static org.apache.cassandra.service.reads.HybridSpeculativeRetryPolicy.Function; import static org.junit.Assert.assertEquals; import static org.junit.runners.Parameterized.Parameters; -import static org.apache.cassandra.service.reads.HybridSpeculativeRetryPolicy.Function; - @RunWith(Enclosed.class) public class SpeculativeRetryParseTest { diff --git a/test/unit/org/apache/cassandra/service/reads/range/RangeCommandIteratorTest.java b/test/unit/org/apache/cassandra/service/reads/range/RangeCommandIteratorTest.java index 7cec4c405e..78095cb9d1 100644 --- a/test/unit/org/apache/cassandra/service/reads/range/RangeCommandIteratorTest.java +++ b/test/unit/org/apache/cassandra/service/reads/range/RangeCommandIteratorTest.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.List; import com.google.common.collect.Iterators; + import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/service/reads/range/ReplicaPlanIteratorTest.java b/test/unit/org/apache/cassandra/service/reads/range/ReplicaPlanIteratorTest.java index 829211f8e8..6a687d57e0 100644 --- a/test/unit/org/apache/cassandra/service/reads/range/ReplicaPlanIteratorTest.java +++ b/test/unit/org/apache/cassandra/service/reads/range/ReplicaPlanIteratorTest.java @@ -21,7 +21,6 @@ package org.apache.cassandra.service.reads.range; import java.util.ArrayList; import java.util.List; -import org.apache.cassandra.schema.TableId; import org.junit.BeforeClass; import org.junit.Test; @@ -37,6 +36,7 @@ import org.apache.cassandra.dht.Range; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.SchemaConstants; +import org.apache.cassandra.schema.TableId; import static org.apache.cassandra.Util.rp; import static org.apache.cassandra.Util.token; diff --git a/test/unit/org/apache/cassandra/service/reads/repair/AbstractReadRepairTest.java b/test/unit/org/apache/cassandra/service/reads/repair/AbstractReadRepairTest.java index 4e206fe5b5..6707602fec 100644 --- a/test/unit/org/apache/cassandra/service/reads/repair/AbstractReadRepairTest.java +++ b/test/unit/org/apache/cassandra/service/reads/repair/AbstractReadRepairTest.java @@ -28,6 +28,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.common.primitives.Ints; + import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; @@ -66,15 +67,15 @@ import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.Replica; import org.apache.cassandra.locator.ReplicaPlan; import org.apache.cassandra.locator.ReplicaUtils; -import org.apache.cassandra.service.reads.ReadCoordinator; -import org.apache.cassandra.tcm.ClusterMetadata; -import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.net.Message; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.SchemaTestUtil; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.Tables; +import org.apache.cassandra.service.reads.ReadCoordinator; +import org.apache.cassandra.tcm.ClusterMetadata; +import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/test/unit/org/apache/cassandra/service/reads/repair/BlockingReadRepairTest.java b/test/unit/org/apache/cassandra/service/reads/repair/BlockingReadRepairTest.java index a0320c92c7..01644e0122 100644 --- a/test/unit/org/apache/cassandra/service/reads/repair/BlockingReadRepairTest.java +++ b/test/unit/org/apache/cassandra/service/reads/repair/BlockingReadRepairTest.java @@ -25,6 +25,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import com.google.common.collect.Lists; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -41,8 +42,8 @@ import org.apache.cassandra.locator.Replica; import org.apache.cassandra.locator.ReplicaPlan; import org.apache.cassandra.net.Message; import org.apache.cassandra.service.reads.ReadCallback; -import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.service.reads.ReadCoordinator; +import org.apache.cassandra.transport.Dispatcher; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static org.apache.cassandra.utils.Clock.Global.nanoTime; diff --git a/test/unit/org/apache/cassandra/service/reads/repair/DiagEventsBlockingReadRepairTest.java b/test/unit/org/apache/cassandra/service/reads/repair/DiagEventsBlockingReadRepairTest.java index 1a330402d8..5391fdb3ad 100644 --- a/test/unit/org/apache/cassandra/service/reads/repair/DiagEventsBlockingReadRepairTest.java +++ b/test/unit/org/apache/cassandra/service/reads/repair/DiagEventsBlockingReadRepairTest.java @@ -29,7 +29,6 @@ import java.util.function.Predicate; import com.google.common.collect.Lists; -import org.apache.cassandra.locator.ReplicaPlan; import org.junit.After; import org.junit.Assert; import org.junit.BeforeClass; @@ -45,6 +44,7 @@ import org.apache.cassandra.locator.Endpoints; import org.apache.cassandra.locator.EndpointsForRange; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.Replica; +import org.apache.cassandra.locator.ReplicaPlan; import org.apache.cassandra.net.Message; import org.apache.cassandra.service.reads.ReadCallback; import org.apache.cassandra.service.reads.ReadCoordinator; diff --git a/test/unit/org/apache/cassandra/service/reads/repair/ReadOnlyReadRepairTest.java b/test/unit/org/apache/cassandra/service/reads/repair/ReadOnlyReadRepairTest.java index 1d4b9b745a..311b8265c4 100644 --- a/test/unit/org/apache/cassandra/service/reads/repair/ReadOnlyReadRepairTest.java +++ b/test/unit/org/apache/cassandra/service/reads/repair/ReadOnlyReadRepairTest.java @@ -33,9 +33,9 @@ import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.Replica; import org.apache.cassandra.locator.ReplicaPlan; import org.apache.cassandra.service.reads.ReadCallback; -import org.apache.cassandra.transport.Dispatcher; import org.apache.cassandra.service.reads.ReadCoordinator; import org.apache.cassandra.service.reads.repair.ReadRepair.ReadRepairSource; +import org.apache.cassandra.transport.Dispatcher; public class ReadOnlyReadRepairTest extends AbstractReadRepairTest { diff --git a/test/unit/org/apache/cassandra/service/reads/repair/ReadRepairTest.java b/test/unit/org/apache/cassandra/service/reads/repair/ReadRepairTest.java index d0f0682fbf..d63a928c98 100644 --- a/test/unit/org/apache/cassandra/service/reads/repair/ReadRepairTest.java +++ b/test/unit/org/apache/cassandra/service/reads/repair/ReadRepairTest.java @@ -24,17 +24,12 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.Iterables; -import org.apache.cassandra.Util; -import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; -import org.apache.cassandra.locator.AbstractReplicationStrategy; -import org.apache.cassandra.locator.Endpoints; -import org.apache.cassandra.locator.EndpointsForRange; -import org.apache.cassandra.locator.ReplicaPlan; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; @@ -49,8 +44,13 @@ import org.apache.cassandra.db.rows.BTreeRow; import org.apache.cassandra.db.rows.BufferCell; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; +import org.apache.cassandra.locator.AbstractReplicationStrategy; +import org.apache.cassandra.locator.Endpoints; +import org.apache.cassandra.locator.EndpointsForRange; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.Replica; +import org.apache.cassandra.locator.ReplicaPlan; import org.apache.cassandra.net.Message; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; diff --git a/test/unit/org/apache/cassandra/service/reads/thresholds/WarningsSnapshotTest.java b/test/unit/org/apache/cassandra/service/reads/thresholds/WarningsSnapshotTest.java index 2102b0ba1c..3b98143938 100644 --- a/test/unit/org/apache/cassandra/service/reads/thresholds/WarningsSnapshotTest.java +++ b/test/unit/org/apache/cassandra/service/reads/thresholds/WarningsSnapshotTest.java @@ -21,14 +21,19 @@ import java.net.InetAddress; import java.net.UnknownHostException; import com.google.common.collect.ImmutableSet; -import org.junit.Test; -import org.apache.cassandra.locator.InetAddressAndPort; +import org.junit.Test; import org.quicktheories.core.Gen; import org.quicktheories.generators.SourceDSL; import org.quicktheories.impl.Constraint; -import static org.apache.cassandra.service.reads.thresholds.WarningsSnapshot.*; +import org.apache.cassandra.locator.InetAddressAndPort; + +import static org.apache.cassandra.service.reads.thresholds.WarningsSnapshot.Builder; +import static org.apache.cassandra.service.reads.thresholds.WarningsSnapshot.Counter; +import static org.apache.cassandra.service.reads.thresholds.WarningsSnapshot.builder; +import static org.apache.cassandra.service.reads.thresholds.WarningsSnapshot.empty; +import static org.apache.cassandra.service.reads.thresholds.WarningsSnapshot.merge; import static org.assertj.core.api.Assertions.assertThat; import static org.quicktheories.QuickTheory.qt; diff --git a/test/unit/org/apache/cassandra/service/snapshot/SnapshotLoaderTest.java b/test/unit/org/apache/cassandra/service/snapshot/SnapshotLoaderTest.java index ee76cedd63..c56f6d2e3e 100644 --- a/test/unit/org/apache/cassandra/service/snapshot/SnapshotLoaderTest.java +++ b/test/unit/org/apache/cassandra/service/snapshot/SnapshotLoaderTest.java @@ -28,6 +28,7 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; +import org.assertj.core.util.Lists; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.ClassRule; @@ -39,7 +40,6 @@ import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.db.Directories; import org.apache.cassandra.io.util.File; import org.apache.cassandra.utils.Clock; -import org.assertj.core.util.Lists; import static org.apache.cassandra.service.snapshot.SnapshotLoader.SNAPSHOT_DIR_PATTERN; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/service/snapshot/SnapshotManagerTest.java b/test/unit/org/apache/cassandra/service/snapshot/SnapshotManagerTest.java index 703e7996ad..dec143deef 100644 --- a/test/unit/org/apache/cassandra/service/snapshot/SnapshotManagerTest.java +++ b/test/unit/org/apache/cassandra/service/snapshot/SnapshotManagerTest.java @@ -34,14 +34,14 @@ import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.mockito.MockedStatic; +import org.mockito.Mockito; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.PathUtils; -import org.mockito.MockedStatic; -import org.mockito.Mockito; import static java.lang.String.format; import static org.apache.cassandra.config.CassandraRelevantProperties.SNAPSHOT_CLEANUP_INITIAL_DELAY_SECONDS; diff --git a/test/unit/org/apache/cassandra/service/snapshot/SnapshotManifestTest.java b/test/unit/org/apache/cassandra/service/snapshot/SnapshotManifestTest.java index 5c12359213..4e98811b16 100644 --- a/test/unit/org/apache/cassandra/service/snapshot/SnapshotManifestTest.java +++ b/test/unit/org/apache/cassandra/service/snapshot/SnapshotManifestTest.java @@ -21,24 +21,25 @@ package org.apache.cassandra.service.snapshot; import java.io.IOException; import java.io.OutputStream; import java.time.Instant; +import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import java.util.Arrays; + +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; -import static org.assertj.core.api.Assertions.assertThatIOException; -import static org.assertj.core.api.Assertions.assertThat; - -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileOutputStreamPlus; import org.apache.cassandra.utils.JsonUtils; +import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIOException; + public class SnapshotManifestTest { @Rule diff --git a/test/unit/org/apache/cassandra/service/snapshot/SnapshotOptionsTest.java b/test/unit/org/apache/cassandra/service/snapshot/SnapshotOptionsTest.java index e61d283962..30b94d32b1 100644 --- a/test/unit/org/apache/cassandra/service/snapshot/SnapshotOptionsTest.java +++ b/test/unit/org/apache/cassandra/service/snapshot/SnapshotOptionsTest.java @@ -23,6 +23,7 @@ import java.util.EnumSet; import java.util.List; import com.google.common.util.concurrent.RateLimiter; + import org.junit.Test; import static java.lang.String.format; diff --git a/test/unit/org/apache/cassandra/service/snapshot/TableSnapshotTest.java b/test/unit/org/apache/cassandra/service/snapshot/TableSnapshotTest.java index 3ec0064c73..90d76bcf4e 100644 --- a/test/unit/org/apache/cassandra/service/snapshot/TableSnapshotTest.java +++ b/test/unit/org/apache/cassandra/service/snapshot/TableSnapshotTest.java @@ -32,13 +32,13 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.mockito.MockedStatic; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileOutputStreamPlus; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.Pair; -import org.mockito.MockedStatic; import static org.apache.cassandra.utils.FBUtilities.now; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/streaming/EntireSSTableStreamingCorrectFilesCountTest.java b/test/unit/org/apache/cassandra/streaming/EntireSSTableStreamingCorrectFilesCountTest.java index 80dd71f273..4cfc469da8 100644 --- a/test/unit/org/apache/cassandra/streaming/EntireSSTableStreamingCorrectFilesCountTest.java +++ b/test/unit/org/apache/cassandra/streaming/EntireSSTableStreamingCorrectFilesCountTest.java @@ -30,12 +30,6 @@ import javax.annotation.Nullable; import org.junit.BeforeClass; import org.junit.Test; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOutboundHandlerAdapter; -import io.netty.channel.ChannelPromise; -import io.netty.channel.embedded.EmbeddedChannel; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.db.ColumnFamilyStore; @@ -60,6 +54,13 @@ import org.apache.cassandra.streaming.async.NettyStreamingConnectionFactory; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelOutboundHandlerAdapter; +import io.netty.channel.ChannelPromise; +import io.netty.channel.embedded.EmbeddedChannel; + import static org.apache.cassandra.service.ActiveRepairService.NO_PENDING_REPAIR; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/streaming/StreamReaderTest.java b/test/unit/org/apache/cassandra/streaming/StreamReaderTest.java index c156048276..81645d90ea 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamReaderTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamReaderTest.java @@ -27,11 +27,12 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; +import net.jpountz.lz4.LZ4Factory; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import net.jpountz.lz4.LZ4Factory; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; @@ -72,7 +73,9 @@ import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.TimeUUID; import static java.util.Collections.emptyList; -import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.*; +import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.broadcastAddress; +import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.node1; +import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.randomInt; import static org.apache.cassandra.tcm.ownership.OwnershipUtils.beginJoin; import static org.apache.cassandra.tcm.ownership.OwnershipUtils.beginMove; import static org.apache.cassandra.tcm.ownership.OwnershipUtils.setLocalTokens; diff --git a/test/unit/org/apache/cassandra/streaming/StreamSessionOwnedRangesTest.java b/test/unit/org/apache/cassandra/streaming/StreamSessionOwnedRangesTest.java index 83f0b33dc7..c9de3fa6b4 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamSessionOwnedRangesTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamSessionOwnedRangesTest.java @@ -24,11 +24,11 @@ import java.util.Collections; import java.util.List; import com.google.common.collect.Lists; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import io.netty.util.concurrent.Future; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; @@ -43,11 +43,15 @@ import org.apache.cassandra.streaming.messages.StreamMessage; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.concurrent.ImmediateFuture; +import io.netty.util.concurrent.Future; + import static org.apache.cassandra.config.CassandraRelevantProperties.ORG_APACHE_CASSANDRA_DISABLE_MBEAN_REGISTRATION; -import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.*; +import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.broadcastAddress; +import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.node1; import static org.apache.cassandra.net.MessagingService.current_version; import static org.apache.cassandra.streaming.StreamingChannel.Factory.Global.streamingFactory; -import static org.apache.cassandra.streaming.messages.StreamMessage.Type.*; +import static org.apache.cassandra.streaming.messages.StreamMessage.Type.COMPLETE; +import static org.apache.cassandra.streaming.messages.StreamMessage.Type.PREPARE_SYNACK; import static org.apache.cassandra.tcm.ownership.OwnershipUtils.generateRangesAtEndpoint; import static org.apache.cassandra.tcm.ownership.OwnershipUtils.setLocalTokens; import static org.apache.cassandra.tcm.ownership.OwnershipUtils.token; diff --git a/test/unit/org/apache/cassandra/streaming/StreamSessionTest.java b/test/unit/org/apache/cassandra/streaming/StreamSessionTest.java index 71e669d459..a265d0306e 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamSessionTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamSessionTest.java @@ -31,22 +31,24 @@ import java.util.function.Function; import java.util.stream.Collectors; import com.google.common.collect.Lists; -import org.apache.cassandra.io.util.File; -import org.junit.BeforeClass; -import org.junit.Test; import net.bytebuddy.ByteBuddy; import net.bytebuddy.agent.ByteBuddyAgent; import net.bytebuddy.dynamic.loading.ClassReloadingStrategy; import net.bytebuddy.implementation.MethodDelegation; + +import org.junit.BeforeClass; +import org.junit.Test; + +import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.compaction.CompactionManager; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.schema.TableId; -import org.apache.cassandra.Util; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; diff --git a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java index debb03e705..c6d3729411 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java @@ -27,11 +27,11 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.junit.BeforeClass; import org.junit.After; +import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; -import org.junit.Assert; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.concurrent.ScheduledExecutors; diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java index 813c447be3..46f0980bb3 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -18,7 +18,11 @@ package org.apache.cassandra.streaming; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; import java.util.concurrent.TimeUnit; import com.google.common.collect.Iterables; @@ -26,33 +30,37 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; -import org.apache.cassandra.io.sstable.format.big.BigFormatPartitionWriter; -import org.apache.cassandra.locator.RangesAtEndpoint; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.junit.Assert; - import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.db.streaming.CassandraOutgoingFile; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.*; -import org.apache.cassandra.db.marshal.*; -import org.apache.cassandra.db.partitions.*; +import org.apache.cassandra.db.ClusteringComparator; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.db.RowUpdateBuilder; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.partitions.ImmutableBTreePartition; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.streaming.CassandraOutgoingFile; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.sstable.format.big.BigFormatPartitionWriter; +import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.locator.RangesAtEndpoint; +import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/unit/org/apache/cassandra/streaming/async/StreamCompressionSerializerTest.java b/test/unit/org/apache/cassandra/streaming/async/StreamCompressionSerializerTest.java index 7a5e82c917..89559de8d2 100644 --- a/test/unit/org/apache/cassandra/streaming/async/StreamCompressionSerializerTest.java +++ b/test/unit/org/apache/cassandra/streaming/async/StreamCompressionSerializerTest.java @@ -23,23 +23,25 @@ import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; import java.util.Random; +import net.jpountz.lz4.LZ4Compressor; +import net.jpountz.lz4.LZ4Factory; +import net.jpountz.lz4.LZ4SafeDecompressor; + import org.junit.After; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufAllocator; -import io.netty.buffer.PooledByteBufAllocator; -import io.netty.buffer.Unpooled; -import net.jpountz.lz4.LZ4Compressor; -import net.jpountz.lz4.LZ4Factory; -import net.jpountz.lz4.LZ4SafeDecompressor; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.utils.memory.MemoryUtil; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; +import io.netty.buffer.PooledByteBufAllocator; +import io.netty.buffer.Unpooled; + public class StreamCompressionSerializerTest { private static final int VERSION = MessagingService.current_version; diff --git a/test/unit/org/apache/cassandra/streaming/async/StreamingInboundHandlerTest.java b/test/unit/org/apache/cassandra/streaming/async/StreamingInboundHandlerTest.java index 904272f7b8..635970024c 100644 --- a/test/unit/org/apache/cassandra/streaming/async/StreamingInboundHandlerTest.java +++ b/test/unit/org/apache/cassandra/streaming/async/StreamingInboundHandlerTest.java @@ -27,8 +27,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import io.netty.buffer.ByteBuf; -import io.netty.channel.embedded.EmbeddedChannel; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataInputPlus; @@ -50,6 +48,9 @@ import org.apache.cassandra.streaming.messages.StreamInitMessage; import org.apache.cassandra.streaming.messages.StreamMessageHeader; import org.apache.cassandra.utils.TimeUUID; +import io.netty.buffer.ByteBuf; +import io.netty.channel.embedded.EmbeddedChannel; + import static org.apache.cassandra.net.TestChannel.REMOTE_ADDR; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; diff --git a/test/unit/org/apache/cassandra/streaming/async/StreamingMultiplexedChannelTest.java b/test/unit/org/apache/cassandra/streaming/async/StreamingMultiplexedChannelTest.java index 48a95ea602..a8170baf74 100644 --- a/test/unit/org/apache/cassandra/streaming/async/StreamingMultiplexedChannelTest.java +++ b/test/unit/org/apache/cassandra/streaming/async/StreamingMultiplexedChannelTest.java @@ -29,7 +29,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import io.netty.channel.ChannelPromise; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.net.TestChannel; import org.apache.cassandra.streaming.PreviewKind; @@ -40,6 +39,8 @@ import org.apache.cassandra.streaming.StreamingChannel; import org.apache.cassandra.streaming.messages.CompleteMessage; import org.apache.cassandra.utils.TimeUUID; +import io.netty.channel.ChannelPromise; + import static org.apache.cassandra.net.MessagingService.current_version; import static org.apache.cassandra.net.TestChannel.REMOTE_ADDR; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; diff --git a/test/unit/org/apache/cassandra/streaming/messages/KeepAliveMessageTest.java b/test/unit/org/apache/cassandra/streaming/messages/KeepAliveMessageTest.java index 7ba637be21..ceac93328b 100644 --- a/test/unit/org/apache/cassandra/streaming/messages/KeepAliveMessageTest.java +++ b/test/unit/org/apache/cassandra/streaming/messages/KeepAliveMessageTest.java @@ -22,8 +22,8 @@ import java.io.IOException; import org.junit.Test; -import static org.junit.Assert.assertThat; import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; public class KeepAliveMessageTest { diff --git a/test/unit/org/apache/cassandra/streaming/messages/StreamMessageTest.java b/test/unit/org/apache/cassandra/streaming/messages/StreamMessageTest.java index f50965ea40..718d73214b 100644 --- a/test/unit/org/apache/cassandra/streaming/messages/StreamMessageTest.java +++ b/test/unit/org/apache/cassandra/streaming/messages/StreamMessageTest.java @@ -25,8 +25,8 @@ import java.util.stream.Collectors; import org.junit.Test; -import static org.junit.Assert.assertThat; import static org.hamcrest.CoreMatchers.instanceOf; +import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; public class StreamMessageTest diff --git a/test/unit/org/apache/cassandra/tcm/ClusterMetadataMetadataKeyTest.java b/test/unit/org/apache/cassandra/tcm/ClusterMetadataMetadataKeyTest.java index 291be79bf4..27a6f82010 100644 --- a/test/unit/org/apache/cassandra/tcm/ClusterMetadataMetadataKeyTest.java +++ b/test/unit/org/apache/cassandra/tcm/ClusterMetadataMetadataKeyTest.java @@ -26,12 +26,13 @@ import java.util.Set; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; + +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.utils.FBUtilities; -import org.assertj.core.api.Assertions; /** * This test is to make sure that the fields of {@link ClusterMetadata} have a matching {@link MetadataKey} and the diff --git a/test/unit/org/apache/cassandra/tcm/ClusterMetadataSerializerTest.java b/test/unit/org/apache/cassandra/tcm/ClusterMetadataSerializerTest.java index e4ca474d07..2f2b986e57 100644 --- a/test/unit/org/apache/cassandra/tcm/ClusterMetadataSerializerTest.java +++ b/test/unit/org/apache/cassandra/tcm/ClusterMetadataSerializerTest.java @@ -18,9 +18,11 @@ package org.apache.cassandra.tcm; +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.utils.Gen; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; @@ -32,7 +34,6 @@ import org.apache.cassandra.tcm.serialization.AsymmetricMetadataSerializers; import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.utils.CassandraGenerators.ClusterMetadataBuilder; import org.apache.cassandra.utils.Generators; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/tcm/ClusterMetadataTest.java b/test/unit/org/apache/cassandra/tcm/ClusterMetadataTest.java index 50e085fc6d..ac3a278cf2 100644 --- a/test/unit/org/apache/cassandra/tcm/ClusterMetadataTest.java +++ b/test/unit/org/apache/cassandra/tcm/ClusterMetadataTest.java @@ -21,25 +21,26 @@ package org.apache.cassandra.tcm; import java.util.concurrent.ExecutionException; import com.google.common.collect.ImmutableSet; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.ServerTestUtils; -import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; import org.apache.cassandra.distributed.test.log.CMSTestBase; +import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper; import org.apache.cassandra.harry.model.TokenPlacementModel; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.schema.SchemaTransformation; import org.apache.cassandra.tcm.membership.NodeId; import org.apache.cassandra.tcm.membership.NodeVersion; +import org.apache.cassandra.tcm.ownership.DataPlacement; import org.apache.cassandra.tcm.ownership.UniformRangePlacement; import org.apache.cassandra.tcm.sequences.BootstrapAndJoin; import org.apache.cassandra.tcm.sequences.LockedRanges; import org.apache.cassandra.tcm.sequences.UnbootstrapAndLeave; -import org.apache.cassandra.schema.KeyspaceMetadata; -import org.apache.cassandra.schema.KeyspaceParams; -import org.apache.cassandra.tcm.ownership.DataPlacement; import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.tcm.transformations.AlterSchema; import org.apache.cassandra.tcm.transformations.Assassinate; diff --git a/test/unit/org/apache/cassandra/tcm/ClusterMetadataTransformationTest.java b/test/unit/org/apache/cassandra/tcm/ClusterMetadataTransformationTest.java index d3bb189c90..528dbae477 100644 --- a/test/unit/org/apache/cassandra/tcm/ClusterMetadataTransformationTest.java +++ b/test/unit/org/apache/cassandra/tcm/ClusterMetadataTransformationTest.java @@ -24,8 +24,10 @@ import java.util.Random; import java.util.concurrent.ThreadLocalRandom; import com.google.common.collect.Iterables; + import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Murmur3Partitioner; @@ -50,9 +52,16 @@ import org.apache.cassandra.tcm.ownership.DataPlacement; import org.apache.cassandra.tcm.ownership.DataPlacements; import org.apache.cassandra.tcm.sequences.InProgressSequences; import org.apache.cassandra.tcm.sequences.LockedRanges; -import org.mockito.Mockito; -import static org.apache.cassandra.tcm.MetadataKeys.*; +import static org.apache.cassandra.tcm.MetadataKeys.ACCORD_FAST_PATH; +import static org.apache.cassandra.tcm.MetadataKeys.ACCORD_STALE_REPLICAS; +import static org.apache.cassandra.tcm.MetadataKeys.CONSENSUS_MIGRATION_STATE; +import static org.apache.cassandra.tcm.MetadataKeys.DATA_PLACEMENTS; +import static org.apache.cassandra.tcm.MetadataKeys.IN_PROGRESS_SEQUENCES; +import static org.apache.cassandra.tcm.MetadataKeys.LOCKED_RANGES; +import static org.apache.cassandra.tcm.MetadataKeys.NODE_DIRECTORY; +import static org.apache.cassandra.tcm.MetadataKeys.SCHEMA; +import static org.apache.cassandra.tcm.MetadataKeys.TOKEN_MAP; import static org.apache.cassandra.tcm.ownership.OwnershipUtils.randomPlacements; import static org.apache.cassandra.tcm.ownership.OwnershipUtils.token; import static org.apache.cassandra.tcm.sequences.SequencesUtils.affectedRanges; diff --git a/test/unit/org/apache/cassandra/tcm/RetryTest.java b/test/unit/org/apache/cassandra/tcm/RetryTest.java index 0c2f52c830..e6a90903e9 100644 --- a/test/unit/org/apache/cassandra/tcm/RetryTest.java +++ b/test/unit/org/apache/cassandra/tcm/RetryTest.java @@ -21,14 +21,14 @@ package org.apache.cassandra.tcm; import java.util.Random; import java.util.concurrent.TimeUnit; +import com.codahale.metrics.Meter; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Meter; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.service.WaitStrategy; import org.apache.cassandra.tcm.log.Entry; diff --git a/test/unit/org/apache/cassandra/tcm/UnregisterTest.java b/test/unit/org/apache/cassandra/tcm/UnregisterTest.java index 59403e4080..62a6b160a2 100644 --- a/test/unit/org/apache/cassandra/tcm/UnregisterTest.java +++ b/test/unit/org/apache/cassandra/tcm/UnregisterTest.java @@ -24,6 +24,7 @@ import java.util.function.BiFunction; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.collect.Streams; + import org.junit.Test; import org.apache.cassandra.dht.Murmur3Partitioner; diff --git a/test/unit/org/apache/cassandra/tcm/ValidatingClusterMetadataService.java b/test/unit/org/apache/cassandra/tcm/ValidatingClusterMetadataService.java index 75f3588d60..35e61ebe1c 100644 --- a/test/unit/org/apache/cassandra/tcm/ValidatingClusterMetadataService.java +++ b/test/unit/org/apache/cassandra/tcm/ValidatingClusterMetadataService.java @@ -23,6 +23,9 @@ import java.util.List; import java.util.TreeMap; import com.google.common.collect.ImmutableSet; + +import org.assertj.core.api.Assertions; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; @@ -32,7 +35,6 @@ import org.apache.cassandra.tcm.sequences.LockedRanges; import org.apache.cassandra.tcm.serialization.AsymmetricMetadataSerializer; import org.apache.cassandra.tcm.serialization.AsymmetricMetadataSerializers; import org.apache.cassandra.tcm.serialization.Version; -import org.assertj.core.api.Assertions; public class ValidatingClusterMetadataService extends StubClusterMetadataService { diff --git a/test/unit/org/apache/cassandra/tcm/compatibility/GossipHelperTest.java b/test/unit/org/apache/cassandra/tcm/compatibility/GossipHelperTest.java index a7ec4ad780..cac53d553f 100644 --- a/test/unit/org/apache/cassandra/tcm/compatibility/GossipHelperTest.java +++ b/test/unit/org/apache/cassandra/tcm/compatibility/GossipHelperTest.java @@ -38,19 +38,30 @@ import org.apache.cassandra.gms.HeartBeatState; import org.apache.cassandra.gms.VersionedValue; import org.apache.cassandra.locator.EndpointsForToken; import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.schema.DistributedSchema; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Keyspaces; import org.apache.cassandra.tcm.ClusterMetadata; -import org.apache.cassandra.tcm.ownership.DataPlacements; import org.apache.cassandra.tcm.membership.NodeId; +import org.apache.cassandra.tcm.ownership.DataPlacements; import org.apache.cassandra.tcm.ownership.ReplicaGroups; +import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.utils.CassandraVersion; -import static org.apache.cassandra.gms.ApplicationState.*; -import static org.apache.cassandra.gms.VersionedValue.*; +import static org.apache.cassandra.gms.ApplicationState.DC; +import static org.apache.cassandra.gms.ApplicationState.HOST_ID; +import static org.apache.cassandra.gms.ApplicationState.INTERNAL_ADDRESS_AND_PORT; +import static org.apache.cassandra.gms.ApplicationState.NATIVE_ADDRESS_AND_PORT; +import static org.apache.cassandra.gms.ApplicationState.RACK; +import static org.apache.cassandra.gms.ApplicationState.RELEASE_VERSION; +import static org.apache.cassandra.gms.ApplicationState.STATUS_WITH_PORT; +import static org.apache.cassandra.gms.ApplicationState.TOKENS; +import static org.apache.cassandra.gms.VersionedValue.REMOVING_TOKEN; +import static org.apache.cassandra.gms.VersionedValue.STATUS_BOOTSTRAPPING; +import static org.apache.cassandra.gms.VersionedValue.STATUS_BOOTSTRAPPING_REPLACE; +import static org.apache.cassandra.gms.VersionedValue.STATUS_LEAVING; +import static org.apache.cassandra.gms.VersionedValue.STATUS_MOVING; import static org.apache.cassandra.locator.InetAddressAndPort.getByName; import static org.apache.cassandra.tcm.compatibility.GossipHelper.fromEndpointStates; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/tcm/listeners/ClientNotificationListenerTest.java b/test/unit/org/apache/cassandra/tcm/listeners/ClientNotificationListenerTest.java index fde53deca9..f93265877d 100644 --- a/test/unit/org/apache/cassandra/tcm/listeners/ClientNotificationListenerTest.java +++ b/test/unit/org/apache/cassandra/tcm/listeners/ClientNotificationListenerTest.java @@ -22,9 +22,16 @@ import org.junit.Test; import org.apache.cassandra.tcm.membership.NodeState; -import static org.apache.cassandra.tcm.listeners.ClientNotificationListener.ChangeType.*; +import static org.apache.cassandra.tcm.listeners.ClientNotificationListener.ChangeType.JOIN; +import static org.apache.cassandra.tcm.listeners.ClientNotificationListener.ChangeType.LEAVE; +import static org.apache.cassandra.tcm.listeners.ClientNotificationListener.ChangeType.MOVE; import static org.apache.cassandra.tcm.listeners.ClientNotificationListener.fromNodeStateTransition; -import static org.apache.cassandra.tcm.membership.NodeState.*; +import static org.apache.cassandra.tcm.membership.NodeState.BOOTSTRAPPING; +import static org.apache.cassandra.tcm.membership.NodeState.JOINED; +import static org.apache.cassandra.tcm.membership.NodeState.LEAVING; +import static org.apache.cassandra.tcm.membership.NodeState.LEFT; +import static org.apache.cassandra.tcm.membership.NodeState.MOVING; +import static org.apache.cassandra.tcm.membership.NodeState.REGISTERED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/test/unit/org/apache/cassandra/tcm/listeners/MetadataSnapshotListenerTest.java b/test/unit/org/apache/cassandra/tcm/listeners/MetadataSnapshotListenerTest.java index 4c57a76c8b..46adc7c67a 100644 --- a/test/unit/org/apache/cassandra/tcm/listeners/MetadataSnapshotListenerTest.java +++ b/test/unit/org/apache/cassandra/tcm/listeners/MetadataSnapshotListenerTest.java @@ -20,15 +20,14 @@ package org.apache.cassandra.tcm.listeners; import java.util.Random; -import org.apache.cassandra.config.DatabaseDescriptor; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.config.CassandraRelevantProperties; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.tcm.AtomicLongBackedProcessor; diff --git a/test/unit/org/apache/cassandra/tcm/log/LocalLogTest.java b/test/unit/org/apache/cassandra/tcm/log/LocalLogTest.java index 20bb5c79b0..a2e2dd7fb2 100644 --- a/test/unit/org/apache/cassandra/tcm/log/LocalLogTest.java +++ b/test/unit/org/apache/cassandra/tcm/log/LocalLogTest.java @@ -32,6 +32,7 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/tcm/log/LogListenerNotificationTest.java b/test/unit/org/apache/cassandra/tcm/log/LogListenerNotificationTest.java index 55df4e868e..f37313ac4a 100644 --- a/test/unit/org/apache/cassandra/tcm/log/LogListenerNotificationTest.java +++ b/test/unit/org/apache/cassandra/tcm/log/LogListenerNotificationTest.java @@ -25,6 +25,7 @@ import java.util.Random; import java.util.Set; import com.google.common.collect.ImmutableSet; + import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/tcm/membership/NodeVersionTest.java b/test/unit/org/apache/cassandra/tcm/membership/NodeVersionTest.java index 3530570a1b..3a24baece8 100644 --- a/test/unit/org/apache/cassandra/tcm/membership/NodeVersionTest.java +++ b/test/unit/org/apache/cassandra/tcm/membership/NodeVersionTest.java @@ -18,13 +18,14 @@ package org.apache.cassandra.tcm.membership; +import java.io.IOException; +import java.nio.ByteBuffer; + +import org.junit.Test; + import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.tcm.serialization.Version; -import org.junit.Test; - -import java.io.IOException; -import java.nio.ByteBuffer; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/tcm/ownership/DeltaMapTest.java b/test/unit/org/apache/cassandra/tcm/ownership/DeltaMapTest.java index 3b2e014365..aa62b1aa14 100644 --- a/test/unit/org/apache/cassandra/tcm/ownership/DeltaMapTest.java +++ b/test/unit/org/apache/cassandra/tcm/ownership/DeltaMapTest.java @@ -30,9 +30,9 @@ import org.apache.cassandra.schema.ReplicationParams; import static org.apache.cassandra.tcm.membership.MembershipUtils.endpoint; import static org.apache.cassandra.tcm.ownership.OwnershipUtils.emptyReplicas; +import static org.apache.cassandra.tcm.ownership.OwnershipUtils.fullReplicas; import static org.apache.cassandra.tcm.ownership.OwnershipUtils.token; import static org.apache.cassandra.tcm.ownership.OwnershipUtils.transientReplicas; -import static org.apache.cassandra.tcm.ownership.OwnershipUtils.fullReplicas; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/tcm/ownership/OwnershipUtils.java b/test/unit/org/apache/cassandra/tcm/ownership/OwnershipUtils.java index 3c4ea14a08..0f29c46099 100644 --- a/test/unit/org/apache/cassandra/tcm/ownership/OwnershipUtils.java +++ b/test/unit/org/apache/cassandra/tcm/ownership/OwnershipUtils.java @@ -41,8 +41,8 @@ import org.apache.cassandra.locator.Replica; import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.ReplicationParams; -import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.tcm.Epoch; +import org.apache.cassandra.utils.ByteBufferUtil; import static org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper.broadcastAddress; import static org.apache.cassandra.tcm.membership.MembershipUtils.randomEndpoint; diff --git a/test/unit/org/apache/cassandra/tcm/ownership/PlacementTransitionPlanTest.java b/test/unit/org/apache/cassandra/tcm/ownership/PlacementTransitionPlanTest.java index 74d8778afd..e56c061fc1 100644 --- a/test/unit/org/apache/cassandra/tcm/ownership/PlacementTransitionPlanTest.java +++ b/test/unit/org/apache/cassandra/tcm/ownership/PlacementTransitionPlanTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tcm.ownership; import com.google.common.collect.ImmutableMap; + import org.junit.Test; import org.apache.cassandra.dht.Murmur3Partitioner; diff --git a/test/unit/org/apache/cassandra/tcm/ownership/UniformRangePlacementTest.java b/test/unit/org/apache/cassandra/tcm/ownership/UniformRangePlacementTest.java index c987eff2e8..dd8e3354ed 100644 --- a/test/unit/org/apache/cassandra/tcm/ownership/UniformRangePlacementTest.java +++ b/test/unit/org/apache/cassandra/tcm/ownership/UniformRangePlacementTest.java @@ -25,6 +25,7 @@ import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; + import org.junit.Test; import org.apache.cassandra.dht.Range; diff --git a/test/unit/org/apache/cassandra/tcm/sequences/DropAccordTableTest.java b/test/unit/org/apache/cassandra/tcm/sequences/DropAccordTableTest.java index cba63dc1c1..470198cd5b 100644 --- a/test/unit/org/apache/cassandra/tcm/sequences/DropAccordTableTest.java +++ b/test/unit/org/apache/cassandra/tcm/sequences/DropAccordTableTest.java @@ -21,12 +21,15 @@ package org.apache.cassandra.tcm.sequences; import java.util.TreeSet; import java.util.stream.Stream; +import org.assertj.core.api.Assertions; import org.junit.Test; +import org.quicktheories.generators.SourceDSL; import accord.utils.Gen; import accord.utils.Property; import accord.utils.Property.Command; import accord.utils.RandomSource; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.locator.MetaStrategy; @@ -45,15 +48,13 @@ import org.apache.cassandra.tcm.ClusterMetadataService; import org.apache.cassandra.tcm.MultiStepOperation; import org.apache.cassandra.tcm.StubClusterMetadataService; import org.apache.cassandra.tcm.ValidatingClusterMetadataService; +import org.apache.cassandra.tcm.sequences.DropAccordTable.TableReference; import org.apache.cassandra.tcm.serialization.Version; import org.apache.cassandra.tcm.transformations.PrepareDropAccordTable; -import org.apache.cassandra.tcm.sequences.DropAccordTable.TableReference; import org.apache.cassandra.utils.AbstractTypeGenerators; import org.apache.cassandra.utils.CassandraGenerators; import org.apache.cassandra.utils.CassandraGenerators.TableMetadataBuilder; import org.apache.cassandra.utils.Generators; -import org.assertj.core.api.Assertions; -import org.quicktheories.generators.SourceDSL; import static accord.utils.Property.commands; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/tcm/sequences/InProgressSequenceCancellationTest.java b/test/unit/org/apache/cassandra/tcm/sequences/InProgressSequenceCancellationTest.java index 100979104f..d4e1b4df29 100644 --- a/test/unit/org/apache/cassandra/tcm/sequences/InProgressSequenceCancellationTest.java +++ b/test/unit/org/apache/cassandra/tcm/sequences/InProgressSequenceCancellationTest.java @@ -23,9 +23,9 @@ import java.util.Random; import java.util.Set; import com.google.common.collect.ImmutableSet; + import org.junit.BeforeClass; import org.junit.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,9 +34,11 @@ import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Token; +import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.ReplicationParams; +import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.Epoch; import org.apache.cassandra.tcm.Transformation; -import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.membership.Directory; import org.apache.cassandra.tcm.membership.Location; import org.apache.cassandra.tcm.membership.NodeAddresses; @@ -48,8 +50,6 @@ import org.apache.cassandra.tcm.ownership.PlacementDeltas; import org.apache.cassandra.tcm.transformations.PrepareJoin; import org.apache.cassandra.tcm.transformations.PrepareLeave; import org.apache.cassandra.tcm.transformations.PrepareReplace; -import org.apache.cassandra.schema.KeyspaceParams; -import org.apache.cassandra.schema.ReplicationParams; import static org.apache.cassandra.tcm.membership.MembershipUtils.nodeAddresses; import static org.apache.cassandra.tcm.ownership.OwnershipUtils.deltas; diff --git a/test/unit/org/apache/cassandra/tcm/serialization/AsymmetricMetadataSerializers.java b/test/unit/org/apache/cassandra/tcm/serialization/AsymmetricMetadataSerializers.java index bd3cd4547e..7c5c19858d 100644 --- a/test/unit/org/apache/cassandra/tcm/serialization/AsymmetricMetadataSerializers.java +++ b/test/unit/org/apache/cassandra/tcm/serialization/AsymmetricMetadataSerializers.java @@ -24,6 +24,7 @@ import org.assertj.core.api.Assertions; import accord.utils.LazyToString; import accord.utils.ReflectionUtils; + import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; diff --git a/test/unit/org/apache/cassandra/tcm/transformations/AccordMarkRejoiningTest.java b/test/unit/org/apache/cassandra/tcm/transformations/AccordMarkRejoiningTest.java index 32999a8aae..b56f225332 100644 --- a/test/unit/org/apache/cassandra/tcm/transformations/AccordMarkRejoiningTest.java +++ b/test/unit/org/apache/cassandra/tcm/transformations/AccordMarkRejoiningTest.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.Collections; import com.google.common.collect.ImmutableSet; + import org.junit.Test; import org.apache.cassandra.io.util.DataOutputBuffer; diff --git a/test/unit/org/apache/cassandra/tcm/transformations/AccordMarkStaleTest.java b/test/unit/org/apache/cassandra/tcm/transformations/AccordMarkStaleTest.java index baa4936a07..872f55caac 100644 --- a/test/unit/org/apache/cassandra/tcm/transformations/AccordMarkStaleTest.java +++ b/test/unit/org/apache/cassandra/tcm/transformations/AccordMarkStaleTest.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.Collections; import com.google.common.collect.ImmutableSet; + import org.junit.Test; import org.apache.cassandra.io.util.DataOutputBuffer; diff --git a/test/unit/org/apache/cassandra/tcm/transformations/PrepareJoinTest.java b/test/unit/org/apache/cassandra/tcm/transformations/PrepareJoinTest.java index 9cd8ee7746..e6ea689de9 100644 --- a/test/unit/org/apache/cassandra/tcm/transformations/PrepareJoinTest.java +++ b/test/unit/org/apache/cassandra/tcm/transformations/PrepareJoinTest.java @@ -26,9 +26,9 @@ import java.util.Random; import java.util.Set; import com.google.common.collect.Sets; + import org.junit.Before; import org.junit.Test; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/unit/org/apache/cassandra/tcm/transformations/PrepareLeaveTest.java b/test/unit/org/apache/cassandra/tcm/transformations/PrepareLeaveTest.java index a1b53119fd..f5044a00fd 100644 --- a/test/unit/org/apache/cassandra/tcm/transformations/PrepareLeaveTest.java +++ b/test/unit/org/apache/cassandra/tcm/transformations/PrepareLeaveTest.java @@ -30,6 +30,7 @@ import java.util.Random; import java.util.Set; import com.google.common.collect.Sets; + import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/test/asserts/ExtendedAssertions.java b/test/unit/org/apache/cassandra/test/asserts/ExtendedAssertions.java index f5bdd7ff72..5e16f1daf2 100644 --- a/test/unit/org/apache/cassandra/test/asserts/ExtendedAssertions.java +++ b/test/unit/org/apache/cassandra/test/asserts/ExtendedAssertions.java @@ -22,6 +22,7 @@ import com.codahale.metrics.Counter; import com.codahale.metrics.Counting; import com.codahale.metrics.Histogram; import com.codahale.metrics.Snapshot; + import org.assertj.core.api.AbstractObjectAssert; public class ExtendedAssertions diff --git a/test/unit/org/apache/cassandra/tools/AuditLogViewerTest.java b/test/unit/org/apache/cassandra/tools/AuditLogViewerTest.java index 76ed9ba04b..1c9868b7f5 100644 --- a/test/unit/org/apache/cassandra/tools/AuditLogViewerTest.java +++ b/test/unit/org/apache/cassandra/tools/AuditLogViewerTest.java @@ -28,25 +28,25 @@ import java.util.List; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import org.apache.cassandra.io.util.File; -import org.apache.commons.io.FileUtils; +import net.openhft.chronicle.core.io.IORuntimeException; +import net.openhft.chronicle.queue.ChronicleQueue; +import net.openhft.chronicle.queue.ExcerptAppender; +import net.openhft.chronicle.queue.RollCycles; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; +import net.openhft.chronicle.wire.WireOut; +import org.apache.commons.io.FileUtils; +import org.assertj.core.api.Assertions; +import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import net.openhft.chronicle.core.io.IORuntimeException; -import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; -import net.openhft.chronicle.queue.ExcerptAppender; -import net.openhft.chronicle.queue.RollCycles; -import net.openhft.chronicle.wire.WireOut; import org.apache.cassandra.audit.BinAuditLogger; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.tools.ToolRunner.ObservableTool; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; -import org.hamcrest.CoreMatchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/BulkLoaderTest.java b/test/unit/org/apache/cassandra/tools/BulkLoaderTest.java index c1a7797b62..84a4b8a097 100644 --- a/test/unit/org/apache/cassandra/tools/BulkLoaderTest.java +++ b/test/unit/org/apache/cassandra/tools/BulkLoaderTest.java @@ -18,12 +18,13 @@ package org.apache.cassandra.tools; +import com.datastax.driver.core.exceptions.NoHostAvailableException; + +import org.hamcrest.CoreMatchers; import org.junit.Test; -import com.datastax.driver.core.exceptions.NoHostAvailableException; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.hamcrest.CoreMatchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/GenerateTokensTest.java b/test/unit/org/apache/cassandra/tools/GenerateTokensTest.java index 0e90c85440..f2693a278a 100644 --- a/test/unit/org/apache/cassandra/tools/GenerateTokensTest.java +++ b/test/unit/org/apache/cassandra/tools/GenerateTokensTest.java @@ -20,7 +20,6 @@ package org.apache.cassandra.tools; import org.junit.Assert; import org.junit.Test; - import org.slf4j.LoggerFactory; import org.apache.cassandra.dht.tokenallocator.TokenAllocation; diff --git a/test/unit/org/apache/cassandra/tools/HashPasswordTest.java b/test/unit/org/apache/cassandra/tools/HashPasswordTest.java index 3c2b78b71d..9c09438c59 100644 --- a/test/unit/org/apache/cassandra/tools/HashPasswordTest.java +++ b/test/unit/org/apache/cassandra/tools/HashPasswordTest.java @@ -27,10 +27,10 @@ import java.util.Collections; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.mindrot.jbcrypt.BCrypt; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.mindrot.jbcrypt.BCrypt; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/tools/JMXCompatibilityTest.java b/test/unit/org/apache/cassandra/tools/JMXCompatibilityTest.java index 3590977ddd..fd6ba2c419 100644 --- a/test/unit/org/apache/cassandra/tools/JMXCompatibilityTest.java +++ b/test/unit/org/apache/cassandra/tools/JMXCompatibilityTest.java @@ -21,13 +21,15 @@ package org.apache.cassandra.tools; import java.util.List; import java.util.Map; +import com.datastax.driver.core.SimpleStatement; import com.google.common.collect.ImmutableMap; + +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.datastax.driver.core.SimpleStatement; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; @@ -37,7 +39,6 @@ import org.apache.cassandra.service.CassandraDaemon; import org.apache.cassandra.service.GCInspector; import org.apache.cassandra.tools.ToolRunner.ToolResult; import org.apache.cassandra.transport.ProtocolVersion; -import org.assertj.core.api.Assertions; import static com.google.common.collect.Lists.newArrayList; diff --git a/test/unit/org/apache/cassandra/tools/JMXStandardsTest.java b/test/unit/org/apache/cassandra/tools/JMXStandardsTest.java index df0a2c1be2..78085f36ed 100644 --- a/test/unit/org/apache/cassandra/tools/JMXStandardsTest.java +++ b/test/unit/org/apache/cassandra/tools/JMXStandardsTest.java @@ -44,9 +44,13 @@ import javax.management.openmbean.OpenDataException; import javax.management.openmbean.TabularData; import com.google.common.collect.ImmutableSet; + +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; - +import org.reflections.Reflections; +import org.reflections.scanners.Scanners; +import org.reflections.util.ConfigurationBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,10 +58,6 @@ import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.repair.autorepair.AutoRepairConfig; import org.apache.cassandra.utils.BreaksJMX; -import org.assertj.core.api.Assertions; -import org.reflections.Reflections; -import org.reflections.scanners.Scanners; -import org.reflections.util.ConfigurationBuilder; public class JMXStandardsTest { diff --git a/test/unit/org/apache/cassandra/tools/JMXToolTest.java b/test/unit/org/apache/cassandra/tools/JMXToolTest.java index 5af7942438..dcfe48dd7e 100644 --- a/test/unit/org/apache/cassandra/tools/JMXToolTest.java +++ b/test/unit/org/apache/cassandra/tools/JMXToolTest.java @@ -24,15 +24,15 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import org.assertj.core.api.Assertions; import org.junit.Test; +import org.quicktheories.core.Gen; +import org.quicktheories.generators.SourceDSL; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.tools.ToolRunner.ToolResult; import org.apache.cassandra.utils.Generators; -import org.assertj.core.api.Assertions; -import org.quicktheories.core.Gen; -import org.quicktheories.generators.SourceDSL; import static org.apache.cassandra.utils.FailingConsumer.orFail; import static org.quicktheories.QuickTheory.qt; diff --git a/test/unit/org/apache/cassandra/tools/NodeProbeTest.java b/test/unit/org/apache/cassandra/tools/NodeProbeTest.java index 2947a26d25..1d41095ab8 100644 --- a/test/unit/org/apache/cassandra/tools/NodeProbeTest.java +++ b/test/unit/org/apache/cassandra/tools/NodeProbeTest.java @@ -27,8 +27,8 @@ import org.junit.Test; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import static org.assertj.core.api.Assertions.assertThat; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class NodeProbeTest extends CQLTester { diff --git a/test/unit/org/apache/cassandra/tools/NodeToolCommandTest.java b/test/unit/org/apache/cassandra/tools/NodeToolCommandTest.java index 6dab7136d1..99be6a22eb 100644 --- a/test/unit/org/apache/cassandra/tools/NodeToolCommandTest.java +++ b/test/unit/org/apache/cassandra/tools/NodeToolCommandTest.java @@ -26,11 +26,11 @@ import org.apache.commons.lang3.ArrayUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; - -import org.apache.cassandra.repair.messages.RepairOption; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; +import org.apache.cassandra.repair.messages.RepairOption; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/OfflineToolUtils.java b/test/unit/org/apache/cassandra/tools/OfflineToolUtils.java index 1285186767..a8244f050c 100644 --- a/test/unit/org/apache/cassandra/tools/OfflineToolUtils.java +++ b/test/unit/org/apache/cassandra/tools/OfflineToolUtils.java @@ -34,13 +34,14 @@ import java.util.stream.StreamSupport; import com.google.common.collect.Iterables; -import org.apache.cassandra.config.CassandraRelevantProperties; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.io.util.File; import org.apache.commons.io.FileUtils; import org.junit.BeforeClass; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.CassandraRelevantProperties; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.io.util.File; + import static org.apache.cassandra.utils.FBUtilities.preventIllegalAccessWarnings; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/tools/SSTableExpiredBlockersTest.java b/test/unit/org/apache/cassandra/tools/SSTableExpiredBlockersTest.java index 10b3f5dabc..95c76224ea 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableExpiredBlockersTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableExpiredBlockersTest.java @@ -18,11 +18,11 @@ package org.apache.cassandra.tools; +import org.assertj.core.api.Assertions; +import org.hamcrest.CoreMatchers; import org.junit.Test; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; -import org.hamcrest.CoreMatchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/SSTableExportSchemaLoadingTest.java b/test/unit/org/apache/cassandra/tools/SSTableExportSchemaLoadingTest.java index b713144c13..456756338a 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableExportSchemaLoadingTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableExportSchemaLoadingTest.java @@ -22,14 +22,15 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import org.junit.BeforeClass; -import org.junit.Test; - import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import org.apache.cassandra.utils.JsonUtils; + import org.assertj.core.api.Assertions; +import org.junit.BeforeClass; +import org.junit.Test; + +import org.apache.cassandra.utils.JsonUtils; import static org.hamcrest.CoreMatchers.startsWith; import static org.junit.Assert.assertArrayEquals; diff --git a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java index 77144f14c4..0ec13abb65 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java @@ -20,11 +20,11 @@ package org.apache.cassandra.tools; import java.io.IOException; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; import static org.hamcrest.CoreMatchers.containsStringIgnoringCase; import static org.hamcrest.CoreMatchers.not; diff --git a/test/unit/org/apache/cassandra/tools/SSTableLevelResetterTest.java b/test/unit/org/apache/cassandra/tools/SSTableLevelResetterTest.java index 0d609d3605..cddfd6b7e1 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableLevelResetterTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableLevelResetterTest.java @@ -18,11 +18,11 @@ package org.apache.cassandra.tools; +import org.assertj.core.api.Assertions; +import org.hamcrest.CoreMatchers; import org.junit.Test; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; -import org.hamcrest.CoreMatchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/SSTableMetadataViewerTest.java b/test/unit/org/apache/cassandra/tools/SSTableMetadataViewerTest.java index 1dd4e78d8f..ba53c0953b 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableMetadataViewerTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableMetadataViewerTest.java @@ -24,13 +24,12 @@ import java.util.Arrays; import com.google.common.base.CharMatcher; import org.apache.commons.lang3.tuple.Pair; - +import org.assertj.core.api.Assertions; +import org.hamcrest.CoreMatchers; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; -import org.hamcrest.CoreMatchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/SSTableOfflineRelevelTest.java b/test/unit/org/apache/cassandra/tools/SSTableOfflineRelevelTest.java index 15f62978bb..dbe4d8a467 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableOfflineRelevelTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableOfflineRelevelTest.java @@ -18,11 +18,11 @@ package org.apache.cassandra.tools; +import org.assertj.core.api.Assertions; +import org.hamcrest.CoreMatchers; import org.junit.Test; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; -import org.hamcrest.CoreMatchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/SSTablePartitionsTest.java b/test/unit/org/apache/cassandra/tools/SSTablePartitionsTest.java index bd38139001..fa1fda373c 100644 --- a/test/unit/org/apache/cassandra/tools/SSTablePartitionsTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTablePartitionsTest.java @@ -20,6 +20,8 @@ package org.apache.cassandra.tools; import java.io.IOException; +import org.assertj.core.api.AbstractStringAssert; +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; @@ -29,8 +31,6 @@ import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.tools.ToolRunner.ToolResult; import org.apache.cassandra.utils.FBUtilities; -import org.assertj.core.api.AbstractStringAssert; -import org.assertj.core.api.Assertions; import static java.lang.String.format; diff --git a/test/unit/org/apache/cassandra/tools/SSTableRepairedAtSetterTest.java b/test/unit/org/apache/cassandra/tools/SSTableRepairedAtSetterTest.java index 9d3a609d13..f895983c8f 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableRepairedAtSetterTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableRepairedAtSetterTest.java @@ -21,13 +21,13 @@ package org.apache.cassandra.tools; import java.io.IOException; import java.nio.file.Files; -import org.apache.cassandra.io.util.File; -import org.junit.Test; - -import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.tools.ToolRunner.ToolResult; import org.assertj.core.api.Assertions; import org.hamcrest.CoreMatchers; +import org.junit.Test; + +import org.apache.cassandra.io.util.File; +import org.apache.cassandra.io.util.FileUtils; +import org.apache.cassandra.tools.ToolRunner.ToolResult; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/StandaloneSSTableUtilTest.java b/test/unit/org/apache/cassandra/tools/StandaloneSSTableUtilTest.java index 633ffce01c..e003f136b9 100644 --- a/test/unit/org/apache/cassandra/tools/StandaloneSSTableUtilTest.java +++ b/test/unit/org/apache/cassandra/tools/StandaloneSSTableUtilTest.java @@ -21,12 +21,11 @@ package org.apache.cassandra.tools; import java.util.Arrays; import org.apache.commons.lang3.tuple.Pair; - +import org.assertj.core.api.Assertions; +import org.hamcrest.CoreMatchers; import org.junit.Test; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; -import org.hamcrest.CoreMatchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/StandaloneScrubberTest.java b/test/unit/org/apache/cassandra/tools/StandaloneScrubberTest.java index bf8e876a5f..ab439fb970 100644 --- a/test/unit/org/apache/cassandra/tools/StandaloneScrubberTest.java +++ b/test/unit/org/apache/cassandra/tools/StandaloneScrubberTest.java @@ -20,11 +20,11 @@ package org.apache.cassandra.tools; import java.util.Arrays; +import org.assertj.core.api.Assertions; +import org.hamcrest.CoreMatchers; import org.junit.Test; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; -import org.hamcrest.CoreMatchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/StandaloneSplitterTest.java b/test/unit/org/apache/cassandra/tools/StandaloneSplitterTest.java index 05e7b34c97..b800f33eee 100644 --- a/test/unit/org/apache/cassandra/tools/StandaloneSplitterTest.java +++ b/test/unit/org/apache/cassandra/tools/StandaloneSplitterTest.java @@ -21,14 +21,13 @@ package org.apache.cassandra.tools; import java.util.Arrays; import org.apache.commons.lang3.tuple.Pair; - +import org.assertj.core.api.Assertions; +import org.hamcrest.CoreMatchers; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.config.CassandraRelevantProperties; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; -import org.hamcrest.CoreMatchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/StandaloneSplitterWithCQLTesterTest.java b/test/unit/org/apache/cassandra/tools/StandaloneSplitterWithCQLTesterTest.java index 56b00089db..7fdfa4b924 100644 --- a/test/unit/org/apache/cassandra/tools/StandaloneSplitterWithCQLTesterTest.java +++ b/test/unit/org/apache/cassandra/tools/StandaloneSplitterWithCQLTesterTest.java @@ -25,19 +25,17 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Before; - -import org.apache.cassandra.db.lifecycle.Tracker; -import org.apache.cassandra.io.util.File; - import org.junit.Test; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.lifecycle.Tracker; import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_UTIL_ALLOW_TOOL_REINIT_FOR_TEST; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/tools/StandaloneUpgraderOnSStablesTest.java b/test/unit/org/apache/cassandra/tools/StandaloneUpgraderOnSStablesTest.java index 99655ed32e..47c29f8a2b 100644 --- a/test/unit/org/apache/cassandra/tools/StandaloneUpgraderOnSStablesTest.java +++ b/test/unit/org/apache/cassandra/tools/StandaloneUpgraderOnSStablesTest.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -35,7 +36,6 @@ import org.apache.cassandra.exceptions.StartupException; import org.apache.cassandra.io.sstable.LegacySSTableTest; import org.apache.cassandra.service.snapshot.SnapshotManager; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_UTIL_ALLOW_TOOL_REINIT_FOR_TEST; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/tools/StandaloneUpgraderTest.java b/test/unit/org/apache/cassandra/tools/StandaloneUpgraderTest.java index 6b83d4460e..4d970eb22b 100644 --- a/test/unit/org/apache/cassandra/tools/StandaloneUpgraderTest.java +++ b/test/unit/org/apache/cassandra/tools/StandaloneUpgraderTest.java @@ -20,11 +20,11 @@ package org.apache.cassandra.tools; import java.util.Arrays; +import org.assertj.core.api.Assertions; +import org.hamcrest.CoreMatchers; import org.junit.Test; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; -import org.hamcrest.CoreMatchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/StandaloneVerifierOnSSTablesTest.java b/test/unit/org/apache/cassandra/tools/StandaloneVerifierOnSSTablesTest.java index 8c88d41eb8..f036b10706 100644 --- a/test/unit/org/apache/cassandra/tools/StandaloneVerifierOnSSTablesTest.java +++ b/test/unit/org/apache/cassandra/tools/StandaloneVerifierOnSSTablesTest.java @@ -23,6 +23,7 @@ import java.io.RandomAccessFile; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; +import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -44,7 +45,6 @@ import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tools.ToolRunner.ToolResult; import org.apache.cassandra.utils.ByteBufferUtil; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.SchemaLoader.standardCFMD; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_UTIL_ALLOW_TOOL_REINIT_FOR_TEST; diff --git a/test/unit/org/apache/cassandra/tools/StandaloneVerifierTest.java b/test/unit/org/apache/cassandra/tools/StandaloneVerifierTest.java index 44b294b2ad..8affa57a29 100644 --- a/test/unit/org/apache/cassandra/tools/StandaloneVerifierTest.java +++ b/test/unit/org/apache/cassandra/tools/StandaloneVerifierTest.java @@ -20,12 +20,12 @@ package org.apache.cassandra.tools; import java.util.Arrays; +import org.assertj.core.api.Assertions; +import org.hamcrest.CoreMatchers; import org.junit.Test; import org.apache.cassandra.io.sstable.VerifyTest; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.assertj.core.api.Assertions; -import org.hamcrest.CoreMatchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/ToolRunner.java b/test/unit/org/apache/cassandra/tools/ToolRunner.java index 143b7cfbd6..0495a5afdc 100644 --- a/test/unit/org/apache/cassandra/tools/ToolRunner.java +++ b/test/unit/org/apache/cassandra/tools/ToolRunner.java @@ -41,18 +41,20 @@ import java.util.stream.Stream; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; + +import org.assertj.core.util.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.core.OutputStreamAppender; -import ch.qos.logback.classic.encoder.PatternLayoutEncoder; -import ch.qos.logback.classic.spi.ILoggingEvent; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.distributed.api.IInstance; import org.apache.cassandra.distributed.api.NodeToolResult; import org.apache.cassandra.utils.Pair; -import org.assertj.core.util.Lists; + +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.encoder.PatternLayoutEncoder; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.OutputStreamAppender; import static com.github.jknack.handlebars.internal.lang3.ArrayUtils.isEmpty; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/ToolsEnvsConfigsTest.java b/test/unit/org/apache/cassandra/tools/ToolsEnvsConfigsTest.java index 1ee7192478..b388d892c6 100644 --- a/test/unit/org/apache/cassandra/tools/ToolsEnvsConfigsTest.java +++ b/test/unit/org/apache/cassandra/tools/ToolsEnvsConfigsTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.tools; import java.util.Collections; import com.google.common.collect.ImmutableMap; + import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; diff --git a/test/unit/org/apache/cassandra/tools/ToolsSchemaLoadingTest.java b/test/unit/org/apache/cassandra/tools/ToolsSchemaLoadingTest.java index d23832797a..103fa508f7 100644 --- a/test/unit/org/apache/cassandra/tools/ToolsSchemaLoadingTest.java +++ b/test/unit/org/apache/cassandra/tools/ToolsSchemaLoadingTest.java @@ -18,9 +18,8 @@ package org.apache.cassandra.tools; -import org.junit.Test; - import org.hamcrest.CoreMatchers; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/TopPartitionsTest.java b/test/unit/org/apache/cassandra/tools/TopPartitionsTest.java index 9a218727b9..c86e78611d 100644 --- a/test/unit/org/apache/cassandra/tools/TopPartitionsTest.java +++ b/test/unit/org/apache/cassandra/tools/TopPartitionsTest.java @@ -36,12 +36,12 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.ServerTestUtils; +import org.apache.cassandra.Util; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.metrics.Sampler; import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.Util; import static java.lang.String.format; import static org.apache.cassandra.cql3.QueryProcessor.executeInternal; diff --git a/test/unit/org/apache/cassandra/tools/cassandrastress/CassandrastressTest.java b/test/unit/org/apache/cassandra/tools/cassandrastress/CassandrastressTest.java index 9569fbdb07..ba53177642 100644 --- a/test/unit/org/apache/cassandra/tools/cassandrastress/CassandrastressTest.java +++ b/test/unit/org/apache/cassandra/tools/cassandrastress/CassandrastressTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.tools.cassandrastress; import java.util.Arrays; +import org.hamcrest.CoreMatchers; import org.junit.BeforeClass; import org.junit.Test; @@ -27,7 +28,6 @@ import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.service.GCInspector; import org.apache.cassandra.tools.ToolRunner; import org.apache.cassandra.tools.ToolRunner.ToolResult; -import org.hamcrest.CoreMatchers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/AutoRepairStatusTest.java b/test/unit/org/apache/cassandra/tools/nodetool/AutoRepairStatusTest.java index 82293581d8..d086511ca0 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/AutoRepairStatusTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/AutoRepairStatusTest.java @@ -24,17 +24,18 @@ import java.util.Arrays; import java.util.Collection; import com.google.common.collect.ImmutableSet; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.repair.autorepair.AutoRepairConfig; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.Output; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import static org.apache.cassandra.Util.setAutoRepairEnabled; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/ClearSnapshotTest.java b/test/unit/org/apache/cassandra/tools/nodetool/ClearSnapshotTest.java index b0de9d32cd..eb5e543109 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/ClearSnapshotTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/ClearSnapshotTest.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; + import javax.management.openmbean.TabularData; import org.junit.AfterClass; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java b/test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java index 1f599763ea..2edb6b8093 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java @@ -20,6 +20,10 @@ package org.apache.cassandra.tools.nodetool; import java.net.InetAddress; +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.Session; + +import org.assertj.core.groups.Tuple; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -27,12 +31,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.read.ListAppender; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.OverrideConfigurationLoader; @@ -41,7 +39,11 @@ import org.apache.cassandra.service.EmbeddedCassandraService; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tools.ToolRunner; import org.apache.cassandra.transport.TlsTestUtils; -import org.assertj.core.groups.Tuple; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.read.ListAppender; import static org.apache.cassandra.auth.AuthTestUtils.waitForExistingRoles; import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_JMX_LOCAL_PORT; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/CompactionHistoryTest.java b/test/unit/org/apache/cassandra/tools/nodetool/CompactionHistoryTest.java index c2ee30f9bc..283f409e7a 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/CompactionHistoryTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/CompactionHistoryTest.java @@ -27,6 +27,7 @@ import java.util.Map; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; + import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/DataPathsTest.java b/test/unit/org/apache/cassandra/tools/nodetool/DataPathsTest.java index cdab8772c5..2ee114368f 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/DataPathsTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/DataPathsTest.java @@ -18,12 +18,12 @@ package org.apache.cassandra.tools.nodetool; import org.apache.commons.lang3.StringUtils; - import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.tools.ToolRunner; + import static org.assertj.core.api.Assertions.assertThat; public class DataPathsTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/tools/nodetool/ExportImportListCompressionDictionaryTest.java b/test/unit/org/apache/cassandra/tools/nodetool/ExportImportListCompressionDictionaryTest.java index fbb6f2a3aa..ea4e72801b 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/ExportImportListCompressionDictionaryTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/ExportImportListCompressionDictionaryTest.java @@ -20,12 +20,13 @@ package org.apache.cassandra.tools.nodetool; import java.nio.file.Files; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.compression.CompressionDictionaryDetailsTabularData.CompressionDictionaryDataObject; import org.apache.cassandra.io.util.File; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/GcStatsTest.java b/test/unit/org/apache/cassandra/tools/nodetool/GcStatsTest.java index 43906ba471..0daadada42 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/GcStatsTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/GcStatsTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.commons.lang3.StringUtils; import org.junit.BeforeClass; import org.junit.Test; +import org.yaml.snakeyaml.Yaml; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.service.GCInspector; @@ -28,13 +29,12 @@ import org.apache.cassandra.tools.ToolRunner; import org.apache.cassandra.tools.ToolRunner.ToolResult; import org.apache.cassandra.tools.nodetool.stats.GcStatsHolder; import org.apache.cassandra.utils.JsonUtils; -import org.yaml.snakeyaml.Yaml; import static java.lang.Double.parseDouble; import static java.util.Arrays.asList; +import static org.apache.cassandra.tools.nodetool.stats.GcStatsHolder.ALLOCATED_DIRECT_MEMORY; import static org.apache.cassandra.tools.nodetool.stats.GcStatsHolder.MAX_DIRECT_MEMORY; import static org.apache.cassandra.tools.nodetool.stats.GcStatsHolder.RESERVED_DIRECT_MEMORY; -import static org.apache.cassandra.tools.nodetool.stats.GcStatsHolder.ALLOCATED_DIRECT_MEMORY; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/GossipInfoTest.java b/test/unit/org/apache/cassandra/tools/nodetool/GossipInfoTest.java index f50e2552c5..5d703e7f26 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/GossipInfoTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/GossipInfoTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.commons.lang3.StringUtils; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; @@ -29,7 +30,6 @@ import org.apache.cassandra.net.NoPayload; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tools.ToolRunner; import org.apache.cassandra.utils.FBUtilities; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.net.Verb.ECHO_REQ; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/InvalidateCIDRPermissionsCacheTest.java b/test/unit/org/apache/cassandra/tools/nodetool/InvalidateCIDRPermissionsCacheTest.java index 081a27b474..8b4eb0d153 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/InvalidateCIDRPermissionsCacheTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/InvalidateCIDRPermissionsCacheTest.java @@ -26,7 +26,6 @@ import org.junit.Test; import org.apache.cassandra.auth.AuthTestUtils; import org.apache.cassandra.auth.AuthenticatedUser; import org.apache.cassandra.auth.IRoleManager; - import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.tools.ToolRunner; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/InvalidateCredentialsCacheTest.java b/test/unit/org/apache/cassandra/tools/nodetool/InvalidateCredentialsCacheTest.java index 6b4e6bea8b..964d1213a5 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/InvalidateCredentialsCacheTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/InvalidateCredentialsCacheTest.java @@ -18,11 +18,12 @@ package org.apache.cassandra.tools.nodetool; +import com.datastax.driver.core.EndPoint; +import com.datastax.driver.core.PlainTextAuthProvider; + import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.EndPoint; -import com.datastax.driver.core.PlainTextAuthProvider; import org.apache.cassandra.auth.AuthTestUtils; import org.apache.cassandra.auth.AuthenticatedUser; import org.apache.cassandra.auth.IAuthenticator; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/InvalidateJmxPermissionsCacheTest.java b/test/unit/org/apache/cassandra/tools/nodetool/InvalidateJmxPermissionsCacheTest.java index 085970aeea..aba50a051c 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/InvalidateJmxPermissionsCacheTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/InvalidateJmxPermissionsCacheTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import java.util.Set; + import javax.security.auth.Subject; import org.junit.Before; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/NodetoolClassHierarchyTest.java b/test/unit/org/apache/cassandra/tools/nodetool/NodetoolClassHierarchyTest.java index 77faf006f0..64df57c021 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/NodetoolClassHierarchyTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/NodetoolClassHierarchyTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import java.lang.reflect.Field; + import javax.inject.Inject; import org.junit.Test; @@ -27,6 +28,7 @@ import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.tools.INodeProbeFactory; import org.apache.cassandra.tools.NodeTool; import org.apache.cassandra.tools.Output; + import picocli.CommandLine; public class NodetoolClassHierarchyTest extends CQLTester diff --git a/test/unit/org/apache/cassandra/tools/nodetool/NodetoolHelpGenerator.java b/test/unit/org/apache/cassandra/tools/nodetool/NodetoolHelpGenerator.java index 01b11fe333..e899cda01d 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/NodetoolHelpGenerator.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/NodetoolHelpGenerator.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; -import java.io.File; //checkstyle: permit this import -import java.io.FileWriter; //checkstyle: permit this import +import java.io.File; +import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -31,6 +31,7 @@ import java.util.regex.Pattern; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/SSTableRepairedSetTest.java b/test/unit/org/apache/cassandra/tools/nodetool/SSTableRepairedSetTest.java index e76b82985a..dd0729fc60 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/SSTableRepairedSetTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/SSTableRepairedSetTest.java @@ -25,11 +25,11 @@ import java.util.Arrays; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.Output; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyList; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/ScrubToolTest.java b/test/unit/org/apache/cassandra/tools/nodetool/ScrubToolTest.java index ddc59b81a1..8d0d955eab 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/ScrubToolTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/ScrubToolTest.java @@ -23,6 +23,8 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.collect.ImmutableList; + +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -43,7 +45,6 @@ import org.apache.cassandra.tools.StandaloneScrubber; import org.apache.cassandra.tools.ToolRunner; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Throwables; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.SchemaLoader.counterCFMD; import static org.apache.cassandra.SchemaLoader.createKeyspace; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/SetAutoRepairConfigTest.java b/test/unit/org/apache/cassandra/tools/nodetool/SetAutoRepairConfigTest.java index 640d952655..a5b49ac7c7 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/SetAutoRepairConfigTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/SetAutoRepairConfigTest.java @@ -28,22 +28,23 @@ import java.util.stream.Stream; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Suite; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.repair.autorepair.AutoRepairConfig; import org.apache.cassandra.tools.NodeProbe; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import static org.junit.Assert.fail; -import static org.mockito.Mockito.when; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * Unit tests for {@link org.apache.cassandra.tools.nodetool.SetAutoRepairConfig} diff --git a/test/unit/org/apache/cassandra/tools/nodetool/SetGetStreamThroughputTest.java b/test/unit/org/apache/cassandra/tools/nodetool/SetGetStreamThroughputTest.java index 1f1995bf0f..3844f03c13 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/SetGetStreamThroughputTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/SetGetStreamThroughputTest.java @@ -24,12 +24,11 @@ import org.junit.Test; import org.apache.cassandra.config.DataRateSpec; import org.apache.cassandra.cql3.CQLTester; -import static org.assertj.core.api.Assertions.withPrecision; - import static org.apache.cassandra.streaming.StreamManager.StreamRateLimiter; import static org.apache.cassandra.tools.ToolRunner.ToolResult; import static org.apache.cassandra.tools.ToolRunner.invokeNodetool; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.withPrecision; /** * Tests for {@code nodetool setstreamthroughput} and {@code nodetool getstreamthroughput}. diff --git a/test/unit/org/apache/cassandra/tools/nodetool/TableStatsTest.java b/test/unit/org/apache/cassandra/tools/nodetool/TableStatsTest.java index 6561cea4c0..7fe5e41a36 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/TableStatsTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/TableStatsTest.java @@ -27,11 +27,11 @@ import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; import org.junit.BeforeClass; import org.junit.Test; +import org.yaml.snakeyaml.Yaml; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.tools.ToolRunner; import org.apache.cassandra.utils.JsonUtils; -import org.yaml.snakeyaml.Yaml; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/TpStatsTest.java b/test/unit/org/apache/cassandra/tools/nodetool/TpStatsTest.java index d9d1517c46..ad0c1188c9 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/TpStatsTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/TpStatsTest.java @@ -28,6 +28,7 @@ import java.util.regex.Pattern; import org.apache.commons.lang3.tuple.Pair; import org.junit.BeforeClass; import org.junit.Test; +import org.yaml.snakeyaml.Yaml; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.net.Message; @@ -36,7 +37,6 @@ import org.apache.cassandra.net.NoPayload; import org.apache.cassandra.tools.ToolRunner; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.JsonUtils; -import org.yaml.snakeyaml.Yaml; import static org.apache.cassandra.net.Verb.ECHO_REQ; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/VerifyTest.java b/test/unit/org/apache/cassandra/tools/nodetool/VerifyTest.java index 5ba47b3aed..6b40c0cdb5 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/VerifyTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/VerifyTest.java @@ -24,6 +24,7 @@ import java.util.Set; import java.util.stream.Collectors; import com.google.common.collect.Iterables; + import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/AbortBootstrapMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/AbortBootstrapMockTest.java index 054bb9a33a..f971efb791 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/AbortBootstrapMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/AbortBootstrapMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class AbortBootstrapMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/AbstractNodetoolMock.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/AbstractNodetoolMock.java index b7566dac91..2102f5ce06 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/AbstractNodetoolMock.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/AbstractNodetoolMock.java @@ -20,15 +20,16 @@ package org.apache.cassandra.tools.nodetool.mock; import java.util.HashMap; import java.util.Map; + import javax.management.NotificationBroadcasterSupport; import javax.management.NotificationEmitter; import javax.management.StandardEmitterMBean; import javax.management.StandardMBean; -import org.apache.cassandra.service.accord.AccordOperationsMBean; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; +import org.mockito.Mockito; import org.apache.cassandra.batchlog.BatchlogManagerMBean; import org.apache.cassandra.cql3.CQLTester; @@ -43,11 +44,11 @@ import org.apache.cassandra.net.MessagingServiceMBean; import org.apache.cassandra.service.CacheServiceMBean; import org.apache.cassandra.service.StorageProxyMBean; import org.apache.cassandra.service.StorageServiceMBean; +import org.apache.cassandra.service.accord.AccordOperationsMBean; import org.apache.cassandra.service.snapshot.SnapshotManagerMBean; import org.apache.cassandra.tools.NodeTool; import org.apache.cassandra.tools.ToolRunner; import org.apache.cassandra.utils.MBeanWrapper; -import org.mockito.Mockito; import static org.apache.cassandra.db.ColumnFamilyStore.getColumnFamilieMBeanName; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/AccordAdminMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/AccordAdminMockTest.java index 1d53afd5d7..865ddb256a 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/AccordAdminMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/AccordAdminMockTest.java @@ -18,11 +18,12 @@ package org.apache.cassandra.tools.nodetool.mock; -import org.apache.cassandra.service.accord.AccordOperationsMBean; +import java.util.List; + import org.junit.Test; import org.mockito.Mockito; -import java.util.List; +import org.apache.cassandra.service.accord.AccordOperationsMBean; /** Test for the nodetool 'accord admin' command. */ public class AccordAdminMockTest extends AbstractNodetoolMock diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/AssassinateMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/AssassinateMockTest.java index 832399d9d9..d5b592f529 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/AssassinateMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/AssassinateMockTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.tools.nodetool.mock; import java.util.List; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/BootstrapResumeMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/BootstrapResumeMockTest.java index e531418fe5..755ca1011b 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/BootstrapResumeMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/BootstrapResumeMockTest.java @@ -21,10 +21,10 @@ package org.apache.cassandra.tools.nodetool.mock; import java.util.List; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; import org.apache.cassandra.tools.ToolRunner; -import org.mockito.Mockito; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/CleanupMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/CleanupMockTest.java index f0b2c74992..610f09b693 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/CleanupMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/CleanupMockTest.java @@ -20,9 +20,9 @@ package org.apache.cassandra.tools.nodetool.mock; import java.util.List; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/DecommissionMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/DecommissionMockTest.java index a19d4157de..a60d3673de 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/DecommissionMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/DecommissionMockTest.java @@ -18,10 +18,10 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; import org.apache.cassandra.tools.ToolRunner; -import org.mockito.Mockito; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyBoolean; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/DescribeClusterMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/DescribeClusterMockTest.java index 32d7cd2439..f4be1d7c2d 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/DescribeClusterMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/DescribeClusterMockTest.java @@ -21,13 +21,13 @@ import java.util.List; import java.util.Map; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.apache.cassandra.locator.EndpointSnitchInfoMBean; import org.apache.cassandra.locator.LocationInfoMBean; import org.apache.cassandra.service.StorageProxyMBean; import org.apache.cassandra.service.StorageServiceMBean; import org.apache.cassandra.tools.ToolRunner; -import org.mockito.ArgumentMatchers; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/DescribeRingMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/DescribeRingMockTest.java index aca12d075d..b293222b8f 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/DescribeRingMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/DescribeRingMockTest.java @@ -22,9 +22,9 @@ import java.io.IOException; import java.util.List; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableAuditLogMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableAuditLogMockTest.java index aeaaeb426d..5a0c362fe6 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableAuditLogMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableAuditLogMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class DisableAuditLogMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableAutoCompactionMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableAutoCompactionMockTest.java index 22b57e750e..ff222c46be 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableAutoCompactionMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableAutoCompactionMockTest.java @@ -18,12 +18,13 @@ package org.apache.cassandra.tools.nodetool.mock; -import org.apache.cassandra.service.StorageServiceMBean; +import java.io.IOException; +import java.util.List; + import org.junit.Test; import org.mockito.Mockito; -import java.io.IOException; -import java.util.List; +import org.apache.cassandra.service.StorageServiceMBean; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableBackupMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableBackupMockTest.java index 13ee1195ca..025a907a9b 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableBackupMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableBackupMockTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.tools.nodetool.mock; import java.io.IOException; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class DisableBackupMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableFullQueryLogMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableFullQueryLogMockTest.java index 07a044aa3f..d07e5b0e7e 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableFullQueryLogMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableFullQueryLogMockTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.tools.nodetool.mock; import java.io.IOException; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class DisableFullQueryLogMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableOldProtocolVersionsMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableOldProtocolVersionsMockTest.java index 5da5c96be9..bf1969aa61 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableOldProtocolVersionsMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/DisableOldProtocolVersionsMockTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.tools.nodetool.mock; import java.io.IOException; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class DisableOldProtocolVersionsMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/DrainMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/DrainMockTest.java index 764e67578b..fe5fb71820 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/DrainMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/DrainMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class DrainMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/EnableAutoCompactionMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/EnableAutoCompactionMockTest.java index c69cac50df..c5d4e0595c 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/EnableAutoCompactionMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/EnableAutoCompactionMockTest.java @@ -22,9 +22,9 @@ import java.io.IOException; import java.util.List; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/EnableBackupMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/EnableBackupMockTest.java index 21fc82a15c..dd1c1c3f9c 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/EnableBackupMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/EnableBackupMockTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.tools.nodetool.mock; import java.io.IOException; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class EnableBackupMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/EnableOldProtocolVersionsMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/EnableOldProtocolVersionsMockTest.java index ed48588faf..c911a4888a 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/EnableOldProtocolVersionsMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/EnableOldProtocolVersionsMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class EnableOldProtocolVersionsMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/FailureDetectorInfoMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/FailureDetectorInfoMockTest.java index b43c3feb9b..31829f95ce 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/FailureDetectorInfoMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/FailureDetectorInfoMockTest.java @@ -26,9 +26,9 @@ import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.gms.FailureDetectorMBean; -import org.mockito.Mockito; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/GarbageCollectMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/GarbageCollectMockTest.java index 49c10730ff..0ec01de37b 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/GarbageCollectMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/GarbageCollectMockTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.tools.nodetool.mock; import java.util.List; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetBatchlogReplayTrottleMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetBatchlogReplayTrottleMockTest.java index a6ca9a2d27..9b6ec42f77 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetBatchlogReplayTrottleMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetBatchlogReplayTrottleMockTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.tools.nodetool.mock; import java.io.IOException; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class GetBatchlogReplayTrottleMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetConcurrencyMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetConcurrencyMockTest.java index 8bd05bdefb..16463d68b3 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetConcurrencyMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetConcurrencyMockTest.java @@ -21,11 +21,11 @@ package org.apache.cassandra.tools.nodetool.mock; import java.util.List; import java.util.Map; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.service.StorageServiceMBean; import org.apache.cassandra.tools.ToolRunner; -import org.assertj.core.api.Assertions; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetConcurrentCompactorsMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetConcurrentCompactorsMockTest.java index da55ff38ee..852449d714 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetConcurrentCompactorsMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetConcurrentCompactorsMockTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.tools.nodetool.mock; import java.io.IOException; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class GetConcurrentCompactorsMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetConcurrentViewBuildersMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetConcurrentViewBuildersMockTest.java index 43b15b3d69..0f6b854899 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetConcurrentViewBuildersMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetConcurrentViewBuildersMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class GetConcurrentViewBuildersMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetLoggingLevelsMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetLoggingLevelsMockTest.java index f983228ad9..a1849b3dc3 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetLoggingLevelsMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetLoggingLevelsMockTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.tools.nodetool.mock; import java.util.Collections; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetSSTablesMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetSSTablesMockTest.java index 9e7799c59b..0c1762a95d 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetSSTablesMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetSSTablesMockTest.java @@ -23,10 +23,10 @@ import java.util.HashSet; import java.util.List; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.db.ColumnFamilyStoreMBean; import org.apache.cassandra.tools.ToolRunner; -import org.mockito.Mockito; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetSeedsTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetSeedsTest.java index 1b63a4bae0..367f180eba 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetSeedsTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetSeedsTest.java @@ -21,10 +21,10 @@ package org.apache.cassandra.tools.nodetool.mock; import java.util.List; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.gms.GossiperMBean; import org.apache.cassandra.tools.ToolRunner; -import org.mockito.Mockito; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetTraceProbabilityMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetTraceProbabilityMockTest.java index 0903279b88..ab7f25749d 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/GetTraceProbabilityMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/GetTraceProbabilityMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class GetTraceProbabilityMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/InvalidateKeyCacheMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/InvalidateKeyCacheMockTest.java index 15bc2fd0e6..4195b78fb1 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/InvalidateKeyCacheMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/InvalidateKeyCacheMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.CacheServiceMBean; -import org.mockito.Mockito; public class InvalidateKeyCacheMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/InvalidateRowCacheMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/InvalidateRowCacheMockTest.java index 649153a60c..689978a293 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/InvalidateRowCacheMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/InvalidateRowCacheMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.CacheServiceMBean; -import org.mockito.Mockito; public class InvalidateRowCacheMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/RangeKeySampleMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/RangeKeySampleMockTest.java index 3f3cd0f6bc..52c15eadd4 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/RangeKeySampleMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/RangeKeySampleMockTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.tools.nodetool.mock; import java.util.List; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/RebuildIndexMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/RebuildIndexMockTest.java index 9cffbcf0a6..01470b0a47 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/RebuildIndexMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/RebuildIndexMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class RebuildIndexMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/ReloadLocalSchemaMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/ReloadLocalSchemaMockTest.java index a999f377f9..ee19d2a282 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/ReloadLocalSchemaMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/ReloadLocalSchemaMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class ReloadLocalSchemaMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/ReloadSslCertificatesMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/ReloadSslCertificatesMockTest.java index b6c412bf17..4ba3321add 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/ReloadSslCertificatesMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/ReloadSslCertificatesMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.net.MessagingServiceMBean; -import org.mockito.Mockito; public class ReloadSslCertificatesMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/ReloadTriggersMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/ReloadTriggersMockTest.java index ee4f0c4da9..6c42ae3b5a 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/ReloadTriggersMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/ReloadTriggersMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageProxyMBean; -import org.mockito.Mockito; public class ReloadTriggersMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/ReplayBatchlogMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/ReplayBatchlogMockTest.java index 79fe639a66..68f06e1892 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/ReplayBatchlogMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/ReplayBatchlogMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.batchlog.BatchlogManagerMBean; -import org.mockito.Mockito; public class ReplayBatchlogMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/ResetLocalSchemaMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/ResetLocalSchemaMockTest.java index aeabadb4f5..1a6035ed97 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/ResetLocalSchemaMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/ResetLocalSchemaMockTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.tools.nodetool.mock; import java.io.IOException; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class ResetLocalSchemaMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetBatchlogReplayThrottleMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetBatchlogReplayThrottleMockTest.java index 3210fa23c5..4edccc297e 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetBatchlogReplayThrottleMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetBatchlogReplayThrottleMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class SetBatchlogReplayThrottleMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetCacheKeysToSaveMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetCacheKeysToSaveMockTest.java index ccb80ade74..468caa6fe0 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetCacheKeysToSaveMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetCacheKeysToSaveMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.CacheServiceMBean; -import org.mockito.Mockito; public class SetCacheKeysToSaveMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetCompactionThresholdMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetCompactionThresholdMockTest.java index 709c9bc24e..001863a547 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetCompactionThresholdMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetCompactionThresholdMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.db.ColumnFamilyStoreMBean; -import org.mockito.Mockito; public class SetCompactionThresholdMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetConcurrentViewBuildersMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetConcurrentViewBuildersMockTest.java index 097a562a21..1ba99ebf14 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetConcurrentViewBuildersMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetConcurrentViewBuildersMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class SetConcurrentViewBuildersMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetLoggingLevelMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetLoggingLevelMockTest.java index e8540c2167..017e596128 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetLoggingLevelMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetLoggingLevelMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class SetLoggingLevelMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetSnapshotThrottleMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetSnapshotThrottleMockTest.java index bbdb5088f0..cd5dc18bfb 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetSnapshotThrottleMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetSnapshotThrottleMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.snapshot.SnapshotManagerMBean; -import org.mockito.Mockito; public class SetSnapshotThrottleMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetTraceProbabilityMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetTraceProbabilityMockTest.java index 70981f598c..e2e8a9baa2 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/SetTraceProbabilityMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/SetTraceProbabilityMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class SetTraceProbabilityMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/StopDaemonMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/StopDaemonMockTest.java index f5a8885955..5280eeb4cd 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/StopDaemonMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/StopDaemonMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; public class StopDaemonMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/TruncateHintsMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/TruncateHintsMockTest.java index 7facd6e9ec..2c3a9de642 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/TruncateHintsMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/TruncateHintsMockTest.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool.mock; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.hints.HintsServiceMBean; -import org.mockito.Mockito; public class TruncateHintsMockTest extends AbstractNodetoolMock { diff --git a/test/unit/org/apache/cassandra/tools/nodetool/mock/VersionMockTest.java b/test/unit/org/apache/cassandra/tools/nodetool/mock/VersionMockTest.java index e1ee3047e2..8ff5195d92 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/mock/VersionMockTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/mock/VersionMockTest.java @@ -21,9 +21,9 @@ package org.apache.cassandra.tools.nodetool.mock; import java.io.IOException; import org.junit.Test; +import org.mockito.Mockito; import org.apache.cassandra.service.StorageServiceMBean; -import org.mockito.Mockito; import static org.mockito.Mockito.when; diff --git a/test/unit/org/apache/cassandra/tools/nodetool/stats/TableStatsPrinterTest.java b/test/unit/org/apache/cassandra/tools/nodetool/stats/TableStatsPrinterTest.java index 07a56d11ac..b6f0e9c8aa 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/stats/TableStatsPrinterTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/stats/TableStatsPrinterTest.java @@ -25,10 +25,10 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.utils.JsonUtils; -import org.assertj.core.api.Assertions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/test/unit/org/apache/cassandra/transport/AuthMessageSizeLimitTest.java b/test/unit/org/apache/cassandra/transport/AuthMessageSizeLimitTest.java index 5eaee511d5..e4b8b5958f 100644 --- a/test/unit/org/apache/cassandra/transport/AuthMessageSizeLimitTest.java +++ b/test/unit/org/apache/cassandra/transport/AuthMessageSizeLimitTest.java @@ -18,19 +18,20 @@ package org.apache.cassandra.transport; +import com.datastax.driver.core.Authenticator; +import com.datastax.driver.core.EndPoint; +import com.datastax.driver.core.PlainTextAuthProvider; + +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.Authenticator; -import com.datastax.driver.core.EndPoint; -import com.datastax.driver.core.PlainTextAuthProvider; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.net.FrameEncoder; import org.apache.cassandra.transport.messages.AuthResponse; import org.apache.cassandra.transport.messages.QueryMessage; -import org.assertj.core.api.Assertions; public class AuthMessageSizeLimitTest extends NativeProtocolLimitsTestBase { diff --git a/test/unit/org/apache/cassandra/transport/AuthenticationTest.java b/test/unit/org/apache/cassandra/transport/AuthenticationTest.java index b770b8e37a..7006bd5ab1 100644 --- a/test/unit/org/apache/cassandra/transport/AuthenticationTest.java +++ b/test/unit/org/apache/cassandra/transport/AuthenticationTest.java @@ -23,6 +23,10 @@ import java.util.function.Consumer; import com.google.common.collect.ImmutableMap; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.exceptions.AuthenticationException; @@ -33,10 +37,6 @@ import org.apache.cassandra.transport.messages.AuthenticateMessage; import org.apache.cassandra.transport.messages.ErrorMessage; import org.apache.cassandra.transport.messages.StartupMessage; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - import static org.apache.cassandra.auth.AuthTestUtils.getToken; import static org.apache.cassandra.transport.messages.StartupMessage.CQL_VERSION; import static org.junit.Assert.fail; diff --git a/test/unit/org/apache/cassandra/transport/CBUtilTest.java b/test/unit/org/apache/cassandra/transport/CBUtilTest.java index 4409655d33..b342352ead 100644 --- a/test/unit/org/apache/cassandra/transport/CBUtilTest.java +++ b/test/unit/org/apache/cassandra/transport/CBUtilTest.java @@ -18,15 +18,16 @@ package org.apache.cassandra.transport; +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Assert; import org.junit.Test; import accord.utils.Gens; + import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.PooledByteBufAllocator; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/transport/CQLConnectionTest.java b/test/unit/org/apache/cassandra/transport/CQLConnectionTest.java index a3c9bfe407..6780e4206e 100644 --- a/test/unit/org/apache/cassandra/transport/CQLConnectionTest.java +++ b/test/unit/org/apache/cassandra/transport/CQLConnectionTest.java @@ -23,27 +23,30 @@ import java.net.InetAddress; import java.net.ServerSocket; import java.nio.ByteBuffer; import java.security.SecureRandom; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Queue; +import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import java.util.function.*; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.IntFunction; +import java.util.function.IntPredicate; +import java.util.function.LongConsumer; +import java.util.function.Predicate; import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.cassandra.transport.ClientResourceLimits.Overload; +import org.awaitility.Awaitility; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.bootstrap.Bootstrap; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.*; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.handler.codec.MessageToMessageDecoder; import org.apache.cassandra.auth.AllowAllAuthenticator; import org.apache.cassandra.auth.AllowAllAuthorizer; import org.apache.cassandra.auth.AllowAllNetworkAuthorizer; @@ -51,15 +54,40 @@ import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.metrics.ClientMetrics; -import org.apache.cassandra.net.*; +import org.apache.cassandra.net.AbstractMessageHandler; +import org.apache.cassandra.net.BufferPoolAllocator; +import org.apache.cassandra.net.FrameDecoder; +import org.apache.cassandra.net.FrameDecoderCrc; +import org.apache.cassandra.net.FrameDecoderLZ4; +import org.apache.cassandra.net.FrameEncoder; +import org.apache.cassandra.net.FrameEncoderCrc; +import org.apache.cassandra.net.FrameEncoderLZ4; +import org.apache.cassandra.net.GlobalBufferPoolAllocator; +import org.apache.cassandra.net.ResourceLimits; import org.apache.cassandra.net.proxy.InboundProxyHandler; import org.apache.cassandra.service.NativeTransportService; import org.apache.cassandra.transport.CQLMessageHandler.MessageConsumer; -import org.apache.cassandra.transport.messages.*; +import org.apache.cassandra.transport.ClientResourceLimits.Overload; +import org.apache.cassandra.transport.messages.ErrorMessage; +import org.apache.cassandra.transport.messages.OptionsMessage; +import org.apache.cassandra.transport.messages.ResultMessage; +import org.apache.cassandra.transport.messages.StartupMessage; import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.concurrent.NonBlockingRateLimiter; import org.apache.cassandra.utils.concurrent.Condition; -import org.awaitility.Awaitility; +import org.apache.cassandra.utils.concurrent.NonBlockingRateLimiter; + +import io.netty.bootstrap.Bootstrap; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; +import io.netty.channel.ChannelPipeline; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.handler.codec.MessageToMessageDecoder; import static org.apache.cassandra.config.EncryptionOptions.TlsEncryptionPolicy.UNENCRYPTED; import static org.apache.cassandra.io.util.FileUtils.ONE_MIB; diff --git a/test/unit/org/apache/cassandra/transport/CQLUserAuditTest.java b/test/unit/org/apache/cassandra/transport/CQLUserAuditTest.java index e31aa73c59..e0b3b24d8d 100644 --- a/test/unit/org/apache/cassandra/transport/CQLUserAuditTest.java +++ b/test/unit/org/apache/cassandra/transport/CQLUserAuditTest.java @@ -29,23 +29,23 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.apache.cassandra.audit.DiagnosticEventAuditLogger; -import org.apache.cassandra.auth.CassandraRoleManager; -import org.apache.cassandra.auth.PasswordAuthenticator; +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.exceptions.AuthenticationException; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.PreparedStatement; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.exceptions.AuthenticationException; import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.audit.AuditEvent; import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.audit.AuditLogManager; +import org.apache.cassandra.audit.DiagnosticEventAuditLogger; +import org.apache.cassandra.auth.CassandraRoleManager; +import org.apache.cassandra.auth.PasswordAuthenticator; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.OverrideConfigurationLoader; import org.apache.cassandra.config.ParameterizedClass; diff --git a/test/unit/org/apache/cassandra/transport/ClientResourceLimitsTest.java b/test/unit/org/apache/cassandra/transport/ClientResourceLimitsTest.java index 1407ab05ac..a7e25d36f4 100644 --- a/test/unit/org/apache/cassandra/transport/ClientResourceLimitsTest.java +++ b/test/unit/org/apache/cassandra/transport/ClientResourceLimitsTest.java @@ -27,18 +27,27 @@ import java.util.function.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; -import org.apache.cassandra.service.StorageService; -import org.junit.*; + +import org.awaitility.Awaitility; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.UTF8Type; -import org.apache.cassandra.db.virtual.*; +import org.apache.cassandra.db.virtual.AbstractVirtualTable; +import org.apache.cassandra.db.virtual.SimpleDataSet; +import org.apache.cassandra.db.virtual.VirtualKeyspace; +import org.apache.cassandra.db.virtual.VirtualKeyspaceRegistry; +import org.apache.cassandra.db.virtual.VirtualTable; import org.apache.cassandra.exceptions.OverloadedException; import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.service.StorageService; import org.apache.cassandra.transport.messages.QueryMessage; import org.apache.cassandra.utils.FBUtilities; -import org.awaitility.Awaitility; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/unit/org/apache/cassandra/transport/ConnectionTrackerTest.java b/test/unit/org/apache/cassandra/transport/ConnectionTrackerTest.java index 1c26316589..0664f6d694 100644 --- a/test/unit/org/apache/cassandra/transport/ConnectionTrackerTest.java +++ b/test/unit/org/apache/cassandra/transport/ConnectionTrackerTest.java @@ -26,17 +26,19 @@ import java.util.function.Function; import java.util.function.Predicate; import com.google.common.collect.ImmutableMap; + import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mockito; -import io.netty.channel.Channel; -import io.netty.channel.ChannelId; -import io.netty.channel.embedded.EmbeddedChannel; import org.apache.cassandra.auth.AuthenticatedUser; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.Server.ConnectionTracker; -import org.mockito.Mockito; + +import io.netty.channel.Channel; +import io.netty.channel.ChannelId; +import io.netty.channel.embedded.EmbeddedChannel; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/transport/DataTypeTest.java b/test/unit/org/apache/cassandra/transport/DataTypeTest.java index a8b535a422..efe1baca55 100644 --- a/test/unit/org/apache/cassandra/transport/DataTypeTest.java +++ b/test/unit/org/apache/cassandra/transport/DataTypeTest.java @@ -23,15 +23,15 @@ import java.util.List; import org.junit.Test; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; - import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.utils.Pair; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; + import static org.junit.Assert.assertEquals; public class DataTypeTest diff --git a/test/unit/org/apache/cassandra/transport/EarlyAuthenticationTest.java b/test/unit/org/apache/cassandra/transport/EarlyAuthenticationTest.java index a581086c76..d19cf20ac4 100644 --- a/test/unit/org/apache/cassandra/transport/EarlyAuthenticationTest.java +++ b/test/unit/org/apache/cassandra/transport/EarlyAuthenticationTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeoutException; import java.util.function.Consumer; import com.google.common.collect.ImmutableMap; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/transport/MessageDispatcherTest.java b/test/unit/org/apache/cassandra/transport/MessageDispatcherTest.java index 3cc0bc6aca..601a1b1cdb 100644 --- a/test/unit/org/apache/cassandra/transport/MessageDispatcherTest.java +++ b/test/unit/org/apache/cassandra/transport/MessageDispatcherTest.java @@ -22,17 +22,19 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mockito; -import io.netty.channel.Channel; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.metrics.ClientMetrics; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.messages.AuthResponse; -import org.mockito.Mockito; + +import io.netty.channel.Channel; public class MessageDispatcherTest { diff --git a/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java b/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java index e7889fca0d..395b5b85ff 100644 --- a/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java +++ b/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java @@ -32,11 +32,11 @@ import org.junit.Test; import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.cql3.BatchQueryOptions; import org.apache.cassandra.cql3.CQLStatement; +import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.QueryHandler; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.statements.BatchStatement; -import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.service.ClientState; diff --git a/test/unit/org/apache/cassandra/transport/MessageSizeLimitTest.java b/test/unit/org/apache/cassandra/transport/MessageSizeLimitTest.java index 8b7b2999f4..af9cc46436 100644 --- a/test/unit/org/apache/cassandra/transport/MessageSizeLimitTest.java +++ b/test/unit/org/apache/cassandra/transport/MessageSizeLimitTest.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -31,7 +32,6 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.net.FrameEncoder; import org.apache.cassandra.transport.messages.QueryMessage; -import org.assertj.core.api.Assertions; public class MessageSizeLimitTest extends NativeProtocolLimitsTestBase { diff --git a/test/unit/org/apache/cassandra/transport/NativeProtocolLimitsTestBase.java b/test/unit/org/apache/cassandra/transport/NativeProtocolLimitsTestBase.java index 221bf97b23..77dd759b78 100644 --- a/test/unit/org/apache/cassandra/transport/NativeProtocolLimitsTestBase.java +++ b/test/unit/org/apache/cassandra/transport/NativeProtocolLimitsTestBase.java @@ -21,6 +21,7 @@ package org.apache.cassandra.transport; import java.io.IOException; import org.junit.After; + import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.QueryProcessor; diff --git a/test/unit/org/apache/cassandra/transport/ProtocolErrorTest.java b/test/unit/org/apache/cassandra/transport/ProtocolErrorTest.java index 7147dfadc6..a0c6694b6e 100644 --- a/test/unit/org/apache/cassandra/transport/ProtocolErrorTest.java +++ b/test/unit/org/apache/cassandra/transport/ProtocolErrorTest.java @@ -17,19 +17,21 @@ */ package org.apache.cassandra.transport; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.transport.messages.ErrorMessage; +import java.util.ArrayList; +import java.util.List; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import java.util.ArrayList; -import java.util.List; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.transport.messages.ErrorMessage; -import static org.apache.cassandra.transport.Message.Direction.*; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; + +import static org.apache.cassandra.transport.Message.Direction.REQUEST; +import static org.apache.cassandra.transport.Message.Direction.RESPONSE; public class ProtocolErrorTest { diff --git a/test/unit/org/apache/cassandra/transport/ProtocolNegotiationTest.java b/test/unit/org/apache/cassandra/transport/ProtocolNegotiationTest.java index 1104a02067..7611b51379 100644 --- a/test/unit/org/apache/cassandra/transport/ProtocolNegotiationTest.java +++ b/test/unit/org/apache/cassandra/transport/ProtocolNegotiationTest.java @@ -21,13 +21,14 @@ package org.apache.cassandra.transport; import java.io.IOException; import java.util.Random; +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.Session; import com.google.common.collect.ImmutableMap; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.QueryProcessor; diff --git a/test/unit/org/apache/cassandra/transport/RateLimitingTest.java b/test/unit/org/apache/cassandra/transport/RateLimitingTest.java index 1e8e16a662..cf2a434a8a 100644 --- a/test/unit/org/apache/cassandra/transport/RateLimitingTest.java +++ b/test/unit/org/apache/cassandra/transport/RateLimitingTest.java @@ -30,7 +30,6 @@ import com.codahale.metrics.Meter; import com.google.common.base.Ticker; import org.awaitility.Awaitility; - import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -43,14 +42,13 @@ import org.apache.cassandra.metrics.CassandraMetricsRegistry; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.Throwables; +import static org.apache.cassandra.Util.spinAssertEquals; +import static org.apache.cassandra.transport.ProtocolVersion.V4; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.apache.cassandra.Util.spinAssertEquals; -import static org.apache.cassandra.transport.ProtocolVersion.V4; - @SuppressWarnings("UnstableApiUsage") @RunWith(Parameterized.class) public class RateLimitingTest extends NativeProtocolLimitsTestBase diff --git a/test/unit/org/apache/cassandra/transport/SerDeserTest.java b/test/unit/org/apache/cassandra/transport/SerDeserTest.java index 605119f65b..908f8e9aec 100644 --- a/test/unit/org/apache/cassandra/transport/SerDeserTest.java +++ b/test/unit/org/apache/cassandra/transport/SerDeserTest.java @@ -28,9 +28,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import io.netty.buffer.Unpooled; -import io.netty.buffer.ByteBuf; - import org.apache.commons.lang3.RandomStringUtils; import org.junit.BeforeClass; import org.junit.Test; @@ -39,12 +36,12 @@ import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.ColumnSpecification; -import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.FieldIdentifier; -import org.apache.cassandra.cql3.terms.Lists; -import org.apache.cassandra.cql3.terms.Maps; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.ResultSet; +import org.apache.cassandra.cql3.terms.Constants; +import org.apache.cassandra.cql3.terms.Lists; +import org.apache.cassandra.cql3.terms.Maps; import org.apache.cassandra.cql3.terms.Sets; import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.terms.UserTypes; @@ -61,16 +58,19 @@ import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; -import org.apache.cassandra.transport.Event.TopologyChange; import org.apache.cassandra.transport.Event.SchemaChange; import org.apache.cassandra.transport.Event.StatusChange; +import org.apache.cassandra.transport.Event.TopologyChange; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; + +import static org.apache.cassandra.utils.ByteBufferUtil.bytes; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; -import static org.apache.cassandra.utils.ByteBufferUtil.bytes; /** * Serialization/deserialization tests for protocol objects and messages. diff --git a/test/unit/org/apache/cassandra/transport/SimpleClientSslContextFactory.java b/test/unit/org/apache/cassandra/transport/SimpleClientSslContextFactory.java index 468c9cbc17..78fe6e8528 100644 --- a/test/unit/org/apache/cassandra/transport/SimpleClientSslContextFactory.java +++ b/test/unit/org/apache/cassandra/transport/SimpleClientSslContextFactory.java @@ -19,16 +19,18 @@ package org.apache.cassandra.transport; import java.util.Map; + import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLException; import javax.net.ssl.TrustManager; +import org.apache.cassandra.config.EncryptionOptions; +import org.apache.cassandra.security.FileBasedSslContextFactory; + import io.netty.handler.ssl.CipherSuiteFilter; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; -import org.apache.cassandra.config.EncryptionOptions; -import org.apache.cassandra.security.FileBasedSslContextFactory; import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.NOT_REQUIRED; diff --git a/test/unit/org/apache/cassandra/transport/TlsTestUtils.java b/test/unit/org/apache/cassandra/transport/TlsTestUtils.java index 76faec85b1..1ff868ecf4 100644 --- a/test/unit/org/apache/cassandra/transport/TlsTestUtils.java +++ b/test/unit/org/apache/cassandra/transport/TlsTestUtils.java @@ -28,15 +28,16 @@ import java.util.Collections; import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; -import javax.net.ssl.SSLException; -import com.google.common.collect.ImmutableMap; +import javax.net.ssl.SSLException; import com.datastax.driver.core.PlainTextAuthProvider; import com.datastax.driver.core.RemoteEndpointAwareJdkSSLOptions; import com.datastax.driver.core.SSLOptions; import com.datastax.driver.core.Session; import com.datastax.driver.core.policies.LoadBalancingPolicy; +import com.google.common.collect.ImmutableMap; + import org.apache.cassandra.config.Config; import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.config.ParameterizedClass; diff --git a/test/unit/org/apache/cassandra/transport/WriteBytesTest.java b/test/unit/org/apache/cassandra/transport/WriteBytesTest.java index f28ff4854f..19a70e999f 100644 --- a/test/unit/org/apache/cassandra/transport/WriteBytesTest.java +++ b/test/unit/org/apache/cassandra/transport/WriteBytesTest.java @@ -18,13 +18,14 @@ package org.apache.cassandra.transport; +import org.assertj.core.api.Assertions; import org.junit.Test; +import org.apache.cassandra.utils.Generators; +import org.apache.cassandra.utils.memory.MemoryUtil; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import org.apache.cassandra.utils.Generators; -import org.apache.cassandra.utils.memory.MemoryUtil; -import org.assertj.core.api.Assertions; import static org.quicktheories.QuickTheory.qt; diff --git a/test/unit/org/apache/cassandra/transport/messages/EncodeAndDecodeTestBase.java b/test/unit/org/apache/cassandra/transport/messages/EncodeAndDecodeTestBase.java index beffccba4d..0cdf30ed0e 100644 --- a/test/unit/org/apache/cassandra/transport/messages/EncodeAndDecodeTestBase.java +++ b/test/unit/org/apache/cassandra/transport/messages/EncodeAndDecodeTestBase.java @@ -18,11 +18,12 @@ package org.apache.cassandra.transport.messages; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; import org.apache.cassandra.transport.Message; import org.apache.cassandra.transport.ProtocolVersion; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; + public abstract class EncodeAndDecodeTestBase { protected abstract Message.Codec getCodec(); diff --git a/test/unit/org/apache/cassandra/triggers/TriggerExecutorTest.java b/test/unit/org/apache/cassandra/triggers/TriggerExecutorTest.java index 57b65e6a69..be1c617a7b 100644 --- a/test/unit/org/apache/cassandra/triggers/TriggerExecutorTest.java +++ b/test/unit/org/apache/cassandra/triggers/TriggerExecutorTest.java @@ -17,21 +17,34 @@ */ package org.apache.cassandra.triggers; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.Util; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.Clustering; +import org.apache.cassandra.db.IMutation; +import org.apache.cassandra.db.Mutation; +import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.partitions.Partition; import org.apache.cassandra.db.partitions.PartitionUpdate; +import org.apache.cassandra.db.rows.BTreeRow; +import org.apache.cassandra.db.rows.BufferCell; +import org.apache.cassandra.db.rows.Cell; +import org.apache.cassandra.db.rows.Row; +import org.apache.cassandra.db.rows.RowIterator; +import org.apache.cassandra.db.rows.UnfilteredRowIterators; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.TriggerMetadata; import org.apache.cassandra.schema.Triggers; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/unit/org/apache/cassandra/triggers/TriggersTest.java b/test/unit/org/apache/cassandra/triggers/TriggersTest.java index ae1e1541df..d18d4c6edb 100644 --- a/test/unit/org/apache/cassandra/triggers/TriggersTest.java +++ b/test/unit/org/apache/cassandra/triggers/TriggersTest.java @@ -21,8 +21,7 @@ import java.util.Collection; import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.cassandra.exceptions.InvalidRequestException; - +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -41,11 +40,11 @@ import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.db.partitions.Partition; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; -import org.assertj.core.api.Assertions; import static org.apache.cassandra.utils.ByteBufferUtil.toInt; import static org.apache.cassandra.utils.Clock.Global.nanoTime; diff --git a/test/unit/org/apache/cassandra/utils/ASTGenerators.java b/test/unit/org/apache/cassandra/utils/ASTGenerators.java index d433cc73fa..aba227b169 100644 --- a/test/unit/org/apache/cassandra/utils/ASTGenerators.java +++ b/test/unit/org/apache/cassandra/utils/ASTGenerators.java @@ -40,12 +40,19 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.IntStream; + import javax.annotation.Nullable; import com.google.common.collect.Iterables; +import org.quicktheories.core.Gen; +import org.quicktheories.core.RandomnessSource; +import org.quicktheories.generators.SourceDSL; +import org.quicktheories.impl.Constraint; + import accord.utils.Gens; import accord.utils.RandomSource; + import org.apache.cassandra.cql3.KnownIssue; import org.apache.cassandra.cql3.ast.AssignmentOperator; import org.apache.cassandra.cql3.ast.Bind; @@ -73,14 +80,9 @@ import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.db.marshal.MapType; import org.apache.cassandra.db.marshal.SetType; import org.apache.cassandra.db.marshal.ShortType; - import org.apache.cassandra.harry.model.ASTSingleTableModel; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.TableMetadata; -import org.quicktheories.core.Gen; -import org.quicktheories.core.RandomnessSource; -import org.quicktheories.generators.SourceDSL; -import org.quicktheories.impl.Constraint; import static org.apache.cassandra.utils.AbstractTypeGenerators.getTypeSupport; import static org.apache.cassandra.utils.Generators.SYMBOL_GEN; diff --git a/test/unit/org/apache/cassandra/utils/AbstractIteratorTest.java b/test/unit/org/apache/cassandra/utils/AbstractIteratorTest.java index c6b49d96c7..ce33a7f9e6 100644 --- a/test/unit/org/apache/cassandra/utils/AbstractIteratorTest.java +++ b/test/unit/org/apache/cassandra/utils/AbstractIteratorTest.java @@ -16,13 +16,13 @@ package org.apache.cassandra.utils; -import org.junit.Assert; -import org.junit.Test; - import java.lang.ref.WeakReference; import java.util.Iterator; import java.util.NoSuchElementException; +import org.junit.Assert; +import org.junit.Test; + /** * Unit test for {@code AbstractIterator}. * diff --git a/test/unit/org/apache/cassandra/utils/AbstractTypeGenerators.java b/test/unit/org/apache/cassandra/utils/AbstractTypeGenerators.java index e6c904dd88..d99c80ac7d 100644 --- a/test/unit/org/apache/cassandra/utils/AbstractTypeGenerators.java +++ b/test/unit/org/apache/cassandra/utils/AbstractTypeGenerators.java @@ -38,6 +38,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; + import javax.annotation.Nullable; import com.google.common.base.Preconditions; @@ -46,7 +47,12 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Sets; + import org.apache.commons.lang3.ArrayUtils; +import org.quicktheories.core.Gen; +import org.quicktheories.core.RandomnessSource; +import org.quicktheories.generators.SourceDSL; +import org.quicktheories.impl.JavaRandom; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -97,10 +103,6 @@ import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.db.marshal.VectorType; import org.apache.cassandra.serializers.MarshalException; -import org.quicktheories.core.Gen; -import org.quicktheories.core.RandomnessSource; -import org.quicktheories.generators.SourceDSL; -import org.quicktheories.impl.JavaRandom; import static org.apache.cassandra.utils.AbstractTypeGenerators.TypeKind.COUNTER; import static org.apache.cassandra.utils.Generators.IDENTIFIER_GEN; diff --git a/test/unit/org/apache/cassandra/utils/AbstractTypeGeneratorsTest.java b/test/unit/org/apache/cassandra/utils/AbstractTypeGeneratorsTest.java index 2cd5470a6b..418eccf8fe 100644 --- a/test/unit/org/apache/cassandra/utils/AbstractTypeGeneratorsTest.java +++ b/test/unit/org/apache/cassandra/utils/AbstractTypeGeneratorsTest.java @@ -20,14 +20,15 @@ package org.apache.cassandra.utils; import java.util.ArrayList; -import org.junit.Test; - -import accord.utils.LazyToString; -import org.apache.cassandra.db.marshal.AbstractType; import org.assertj.core.api.Assertions; +import org.junit.Test; import org.quicktheories.core.Gen; import org.quicktheories.generators.SourceDSL; +import accord.utils.LazyToString; + +import org.apache.cassandra.db.marshal.AbstractType; + import static org.quicktheories.QuickTheory.qt; public class AbstractTypeGeneratorsTest diff --git a/test/unit/org/apache/cassandra/utils/AccordGenerators.java b/test/unit/org/apache/cassandra/utils/AccordGenerators.java index 61696303d1..30925f00a3 100644 --- a/test/unit/org/apache/cassandra/utils/AccordGenerators.java +++ b/test/unit/org/apache/cassandra/utils/AccordGenerators.java @@ -36,10 +36,12 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Sets; +import org.quicktheories.impl.JavaRandom; + import accord.local.Command; import accord.local.Command.Truncated; -import accord.local.ICommand; import accord.local.DurableBefore; +import accord.local.ICommand; import accord.local.Node; import accord.local.RedundantBefore; import accord.local.RedundantBefore.Bounds; @@ -73,6 +75,7 @@ import accord.utils.SimpleBitSets; import accord.utils.SortedArrays.SortedArrayList; import accord.utils.TinyEnumSet; import accord.utils.TriFunction; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.dht.AccordSplitter; @@ -82,12 +85,11 @@ import org.apache.cassandra.schema.TableId; import org.apache.cassandra.service.accord.AccordTestUtils; import org.apache.cassandra.service.accord.FetchTopologies; import org.apache.cassandra.service.accord.TokenRange; -import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.service.accord.api.PartitionKey; +import org.apache.cassandra.service.accord.api.TokenKey; import org.apache.cassandra.service.accord.serializers.TableMetadatas; import org.apache.cassandra.service.accord.txn.TxnData; import org.apache.cassandra.service.accord.txn.TxnWrite; -import org.quicktheories.impl.JavaRandom; import static accord.local.CommandStores.RangesForEpoch; import static accord.local.RedundantStatus.Property.GC_BEFORE; diff --git a/test/unit/org/apache/cassandra/utils/AssertionUtilsTest.java b/test/unit/org/apache/cassandra/utils/AssertionUtilsTest.java index e3ec93ab48..11451181a2 100644 --- a/test/unit/org/apache/cassandra/utils/AssertionUtilsTest.java +++ b/test/unit/org/apache/cassandra/utils/AssertionUtilsTest.java @@ -18,9 +18,8 @@ package org.apache.cassandra.utils; -import org.junit.Test; - import org.assertj.core.api.Assertions; +import org.junit.Test; public class AssertionUtilsTest { diff --git a/test/unit/org/apache/cassandra/utils/ByteArrayUtilTest.java b/test/unit/org/apache/cassandra/utils/ByteArrayUtilTest.java index f03275eda8..bce6b4b5d0 100644 --- a/test/unit/org/apache/cassandra/utils/ByteArrayUtilTest.java +++ b/test/unit/org/apache/cassandra/utils/ByteArrayUtilTest.java @@ -23,7 +23,6 @@ import java.nio.ByteOrder; import java.util.Arrays; import org.junit.Test; - import org.quicktheories.core.Gen; import org.quicktheories.generators.SourceDSL; diff --git a/test/unit/org/apache/cassandra/utils/CassandraGenerators.java b/test/unit/org/apache/cassandra/utils/CassandraGenerators.java index e179eb2f52..36ce78e21a 100644 --- a/test/unit/org/apache/cassandra/utils/CassandraGenerators.java +++ b/test/unit/org/apache/cassandra/utils/CassandraGenerators.java @@ -44,6 +44,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.annotation.Nullable; import com.google.common.collect.ImmutableList; @@ -51,20 +52,17 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import accord.utils.SortedArrays.SortedArrayList; -import org.apache.cassandra.schema.*; -import org.apache.cassandra.service.consensus.migration.ConsensusMigrationState; -import org.apache.cassandra.tcm.extensions.ExtensionKey; -import org.apache.cassandra.tcm.extensions.ExtensionValue; -import org.apache.cassandra.tcm.membership.Directory; -import org.apache.cassandra.tcm.ownership.DataPlacements; -import org.apache.cassandra.tcm.ownership.TokenMap; -import org.apache.cassandra.tcm.sequences.InProgressSequences; -import org.apache.cassandra.tcm.sequences.LockedRanges; import org.apache.commons.lang3.builder.MultilineRecursiveToStringStyle; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.quicktheories.core.Gen; +import org.quicktheories.core.RandomnessSource; +import org.quicktheories.generators.Generate; +import org.quicktheories.generators.SourceDSL; +import org.quicktheories.impl.Constraint; import accord.local.Node; +import accord.utils.SortedArrays.SortedArrayList; + import org.apache.cassandra.config.DataStorageSpec; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnIdentifier; @@ -87,8 +85,8 @@ import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.db.marshal.CounterColumnType; import org.apache.cassandra.db.marshal.EmptyType; -import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.marshal.UserType; +import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.dht.ByteOrderedPartitioner; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.LocalPartitioner; @@ -117,22 +115,41 @@ import org.apache.cassandra.net.Message; import org.apache.cassandra.net.NoPayload; import org.apache.cassandra.net.PingRequest; import org.apache.cassandra.net.Verb; -import org.apache.cassandra.service.accord.fastpath.FastPathStrategy; +import org.apache.cassandra.schema.CachingParams; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.CompactionParams; +import org.apache.cassandra.schema.CompressionParams; +import org.apache.cassandra.schema.DistributedSchema; +import org.apache.cassandra.schema.KeyspaceMetadata; +import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.MemtableParams; +import org.apache.cassandra.schema.ReplicationParams; +import org.apache.cassandra.schema.TableId; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.TableParams; +import org.apache.cassandra.schema.Tables; +import org.apache.cassandra.schema.Types; +import org.apache.cassandra.schema.UserFunctions; +import org.apache.cassandra.schema.Views; import org.apache.cassandra.service.accord.AccordFastPath; import org.apache.cassandra.service.accord.AccordStaleReplicas; +import org.apache.cassandra.service.accord.fastpath.FastPathStrategy; import org.apache.cassandra.service.accord.fastpath.InheritKeyspaceFastPathStrategy; import org.apache.cassandra.service.accord.fastpath.ParameterizedFastPathStrategy; import org.apache.cassandra.service.accord.fastpath.SimpleFastPathStrategy; import org.apache.cassandra.service.consensus.TransactionalMode; +import org.apache.cassandra.service.consensus.migration.ConsensusMigrationState; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.Epoch; +import org.apache.cassandra.tcm.extensions.ExtensionKey; +import org.apache.cassandra.tcm.extensions.ExtensionValue; +import org.apache.cassandra.tcm.membership.Directory; +import org.apache.cassandra.tcm.ownership.DataPlacements; +import org.apache.cassandra.tcm.ownership.TokenMap; +import org.apache.cassandra.tcm.sequences.InProgressSequences; +import org.apache.cassandra.tcm.sequences.LockedRanges; import org.apache.cassandra.utils.AbstractTypeGenerators.TypeGenBuilder; import org.apache.cassandra.utils.AbstractTypeGenerators.ValueDomain; -import org.quicktheories.core.Gen; -import org.quicktheories.core.RandomnessSource; -import org.quicktheories.generators.Generate; -import org.quicktheories.generators.SourceDSL; -import org.quicktheories.impl.Constraint; import static org.apache.cassandra.utils.AbstractTypeGenerators.allowReversed; import static org.apache.cassandra.utils.AbstractTypeGenerators.getTypeSupport; diff --git a/test/unit/org/apache/cassandra/utils/CassandraGeneratorsTest.java b/test/unit/org/apache/cassandra/utils/CassandraGeneratorsTest.java index 77043d6338..4d322a6133 100644 --- a/test/unit/org/apache/cassandra/utils/CassandraGeneratorsTest.java +++ b/test/unit/org/apache/cassandra/utils/CassandraGeneratorsTest.java @@ -26,6 +26,7 @@ import org.junit.Test; import accord.utils.Gens; import accord.utils.LazyToString; + import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.CounterColumnType; import org.apache.cassandra.db.marshal.DecimalType; diff --git a/test/unit/org/apache/cassandra/utils/CassandraVersionTest.java b/test/unit/org/apache/cassandra/utils/CassandraVersionTest.java index 6f344997f1..d3ad45e7f7 100644 --- a/test/unit/org/apache/cassandra/utils/CassandraVersionTest.java +++ b/test/unit/org/apache/cassandra/utils/CassandraVersionTest.java @@ -24,14 +24,13 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import com.datastax.driver.core.VersionNumber; import com.google.common.base.Splitter; -import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; - -import com.datastax.driver.core.VersionNumber; -import org.assertj.core.api.Assertions; import org.quicktheories.core.Gen; import org.quicktheories.generators.Generate; import org.quicktheories.generators.SourceDSL; diff --git a/test/unit/org/apache/cassandra/utils/CollectionSerializersTest.java b/test/unit/org/apache/cassandra/utils/CollectionSerializersTest.java index c0c42c5c9e..8d0b3ecd5b 100644 --- a/test/unit/org/apache/cassandra/utils/CollectionSerializersTest.java +++ b/test/unit/org/apache/cassandra/utils/CollectionSerializersTest.java @@ -23,6 +23,7 @@ import java.io.IOException; import org.junit.Test; import accord.utils.Gens; + import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.UnversionedSerializer; diff --git a/test/unit/org/apache/cassandra/utils/ConfigGenBuilder.java b/test/unit/org/apache/cassandra/utils/ConfigGenBuilder.java index c103a8dc6d..ae8c3200b1 100644 --- a/test/unit/org/apache/cassandra/utils/ConfigGenBuilder.java +++ b/test/unit/org/apache/cassandra/utils/ConfigGenBuilder.java @@ -18,7 +18,12 @@ package org.apache.cassandra.utils; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; @@ -28,6 +33,7 @@ import com.google.common.collect.ImmutableMap; import accord.utils.Gen; import accord.utils.Gens; import accord.utils.RandomSource; + import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DurationSpec; import org.apache.cassandra.dht.IPartitioner; diff --git a/test/unit/org/apache/cassandra/utils/ConfigGenBuilderTest.java b/test/unit/org/apache/cassandra/utils/ConfigGenBuilderTest.java index 7bf1d12fd8..b758b29d6a 100644 --- a/test/unit/org/apache/cassandra/utils/ConfigGenBuilderTest.java +++ b/test/unit/org/apache/cassandra/utils/ConfigGenBuilderTest.java @@ -21,9 +21,11 @@ package org.apache.cassandra.utils; import java.util.Map; import com.google.common.jimfs.Jimfs; + import org.junit.Test; import accord.utils.Gen; + import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.ParameterizedClass; diff --git a/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java b/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java index 371e6614c0..c9451730f3 100644 --- a/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java +++ b/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java @@ -39,6 +39,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.primitives.Ints; import com.vdurmont.semver4j.Semver; + import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/utils/Generators.java b/test/unit/org/apache/cassandra/utils/Generators.java index b8013ffee7..0f92b9ea90 100644 --- a/test/unit/org/apache/cassandra/utils/Generators.java +++ b/test/unit/org/apache/cassandra/utils/Generators.java @@ -39,18 +39,20 @@ import java.util.function.Predicate; import com.google.common.collect.Range; import com.google.common.collect.Sets; -import org.apache.commons.lang3.ArrayUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import accord.utils.DefaultRandom; -import accord.utils.RandomSource; -import org.apache.cassandra.cql3.ReservedKeywords; +import org.apache.commons.lang3.ArrayUtils; import org.quicktheories.core.Gen; import org.quicktheories.core.RandomnessSource; import org.quicktheories.generators.SourceDSL; import org.quicktheories.impl.Constraint; import org.quicktheories.impl.JavaRandom; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import accord.utils.DefaultRandom; +import accord.utils.RandomSource; + +import org.apache.cassandra.cql3.ReservedKeywords; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_BLOB_SHARED_SEED; diff --git a/test/unit/org/apache/cassandra/utils/GeneratorsTest.java b/test/unit/org/apache/cassandra/utils/GeneratorsTest.java index c065a1663f..95907cea36 100644 --- a/test/unit/org/apache/cassandra/utils/GeneratorsTest.java +++ b/test/unit/org/apache/cassandra/utils/GeneratorsTest.java @@ -23,15 +23,17 @@ import java.util.Objects; import java.util.Random; import com.google.common.net.InternetDomainName; -import org.junit.Test; -import accord.utils.Property; -import org.apache.cassandra.db.marshal.AsciiType; import org.assertj.core.api.Assertions; +import org.junit.Test; import org.quicktheories.core.Gen; import org.quicktheories.generators.SourceDSL; import org.quicktheories.impl.JavaRandom; +import accord.utils.Property; + +import org.apache.cassandra.db.marshal.AsciiType; + import static org.apache.cassandra.utils.AbstractTypeGenerators.stringComparator; import static org.quicktheories.QuickTheory.qt; diff --git a/test/unit/org/apache/cassandra/utils/IntegerIntervalsTest.java b/test/unit/org/apache/cassandra/utils/IntegerIntervalsTest.java index f93484eec3..a6adb6b9e1 100644 --- a/test/unit/org/apache/cassandra/utils/IntegerIntervalsTest.java +++ b/test/unit/org/apache/cassandra/utils/IntegerIntervalsTest.java @@ -18,8 +18,6 @@ package org.apache.cassandra.utils; -import static org.junit.Assert.*; - import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -34,6 +32,10 @@ import org.junit.Test; import org.apache.cassandra.utils.IntegerInterval.Set; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + public class IntegerIntervalsTest { int[] values = new int[] { Integer.MIN_VALUE, -2, -1, 0, 5, 9, 13, Integer.MAX_VALUE }; diff --git a/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java b/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java index 2a8cd2f76f..4bb91a5a14 100644 --- a/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java +++ b/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java @@ -28,15 +28,16 @@ import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; - -import org.apache.cassandra.config.DatabaseDescriptor; import org.quicktheories.WithQuickTheories; import org.quicktheories.core.Gen; import org.quicktheories.generators.SourceDSL; +import org.apache.cassandra.config.DatabaseDescriptor; + import static com.google.common.base.Predicates.not; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_INTERVAL_TREE_EXPENSIVE_CHECKS; diff --git a/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java b/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java index 14ffcdc631..1ee7a42b13 100644 --- a/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java +++ b/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.net.SocketException; import java.util.Arrays; +import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; @@ -30,10 +31,9 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.sstable.CorruptSSTableException; +import org.apache.cassandra.service.CassandraDaemon; import org.apache.cassandra.service.DiskErrorsHandler; import org.apache.cassandra.service.DiskErrorsHandlerService; -import org.assertj.core.api.Assertions; -import org.apache.cassandra.service.CassandraDaemon; import org.apache.cassandra.service.StorageService; import static java.util.Arrays.asList; diff --git a/test/unit/org/apache/cassandra/utils/JavaUtilsTest.java b/test/unit/org/apache/cassandra/utils/JavaUtilsTest.java index d7047815d3..3260b5ec6b 100644 --- a/test/unit/org/apache/cassandra/utils/JavaUtilsTest.java +++ b/test/unit/org/apache/cassandra/utils/JavaUtilsTest.java @@ -19,7 +19,8 @@ package org.apache.cassandra.utils; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class JavaUtilsTest { diff --git a/test/unit/org/apache/cassandra/utils/KeyGenerator.java b/test/unit/org/apache/cassandra/utils/KeyGenerator.java index f1ff7e3ce8..e808847932 100644 --- a/test/unit/org/apache/cassandra/utils/KeyGenerator.java +++ b/test/unit/org/apache/cassandra/utils/KeyGenerator.java @@ -18,8 +18,6 @@ */ package org.apache.cassandra.utils; -import org.apache.cassandra.io.util.FileInputStreamPlus; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -27,6 +25,8 @@ import java.nio.ByteBuffer; import java.nio.file.NoSuchFileException; import java.util.Random; +import org.apache.cassandra.io.util.FileInputStreamPlus; + public class KeyGenerator { private static ByteBuffer randomKey(Random r) diff --git a/test/unit/org/apache/cassandra/utils/MergeIteratorComparisonTest.java b/test/unit/org/apache/cassandra/utils/MergeIteratorComparisonTest.java index 1b52fb509b..d76a6db3bd 100644 --- a/test/unit/org/apache/cassandra/utils/MergeIteratorComparisonTest.java +++ b/test/unit/org/apache/cassandra/utils/MergeIteratorComparisonTest.java @@ -19,11 +19,19 @@ package org.apache.cassandra.utils; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayDeque; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.PriorityQueue; +import java.util.Random; +import java.util.Set; +import java.util.UUID; import com.google.common.base.Function; import com.google.common.base.Objects; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; diff --git a/test/unit/org/apache/cassandra/utils/MergeIteratorTest.java b/test/unit/org/apache/cassandra/utils/MergeIteratorTest.java index 056a4a762e..8512d05797 100644 --- a/test/unit/org/apache/cassandra/utils/MergeIteratorTest.java +++ b/test/unit/org/apache/cassandra/utils/MergeIteratorTest.java @@ -23,6 +23,7 @@ import java.util.Iterator; import com.google.common.collect.Iterators; import com.google.common.collect.Ordering; + import org.junit.Before; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java b/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java index ae70fd4c96..658ca2d6b6 100644 --- a/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java +++ b/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java @@ -20,11 +20,19 @@ package org.apache.cassandra.utils; import java.io.IOException; import java.math.BigInteger; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Random; import org.junit.Assert; import org.junit.Before; import org.junit.Test; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Digest; import org.apache.cassandra.dht.ByteOrderedPartitioner; @@ -43,7 +51,10 @@ import org.apache.cassandra.utils.MerkleTree.TreeRangeIterator; import static com.google.common.collect.Lists.newArrayList; import static org.apache.cassandra.utils.MerkleTree.RECOMMENDED_DEPTH; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class MerkleTreeTest { diff --git a/test/unit/org/apache/cassandra/utils/MerkleTreesTest.java b/test/unit/org/apache/cassandra/utils/MerkleTreesTest.java index 5b589fb2a4..654baf00c8 100644 --- a/test/unit/org/apache/cassandra/utils/MerkleTreesTest.java +++ b/test/unit/org/apache/cassandra/utils/MerkleTreesTest.java @@ -19,7 +19,13 @@ package org.apache.cassandra.utils; import java.math.BigInteger; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Random; import com.google.common.collect.AbstractIterator; @@ -28,8 +34,11 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.dht.*; +import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.dht.RandomPartitioner; import org.apache.cassandra.dht.RandomPartitioner.BigIntegerToken; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.MessagingService; @@ -39,7 +48,11 @@ import org.apache.cassandra.utils.MerkleTree.TreeRange; import org.apache.cassandra.utils.MerkleTrees.TreeRangeIterator; import static org.apache.cassandra.utils.MerkleTreeTest.digest; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class MerkleTreesTest { diff --git a/test/unit/org/apache/cassandra/utils/MonotonicClockTest.java b/test/unit/org/apache/cassandra/utils/MonotonicClockTest.java index 3839be004b..a63337f801 100644 --- a/test/unit/org/apache/cassandra/utils/MonotonicClockTest.java +++ b/test/unit/org/apache/cassandra/utils/MonotonicClockTest.java @@ -17,11 +17,11 @@ */ package org.apache.cassandra.utils; +import org.junit.Test; + import static org.apache.cassandra.utils.Clock.Global.nanoTime; import static org.apache.cassandra.utils.MonotonicClock.Global.approxTime; -import static org.junit.Assert.*; - -import org.junit.Test; +import static org.junit.Assert.assertTrue; public class MonotonicClockTest { diff --git a/test/unit/org/apache/cassandra/utils/NativeLibraryTest.java b/test/unit/org/apache/cassandra/utils/NativeLibraryTest.java index 52a7f84f8a..1856af1a64 100644 --- a/test/unit/org/apache/cassandra/utils/NativeLibraryTest.java +++ b/test/unit/org/apache/cassandra/utils/NativeLibraryTest.java @@ -19,10 +19,10 @@ package org.apache.cassandra.utils; -import org.apache.cassandra.io.util.File; import org.junit.Assert; import org.junit.Test; +import org.apache.cassandra.io.util.File; import org.apache.cassandra.io.util.FileUtils; public class NativeLibraryTest diff --git a/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java b/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java index 039d72257f..93b0360283 100644 --- a/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java +++ b/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java @@ -26,15 +26,20 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -import org.apache.cassandra.utils.NoSpamLogger.Level; -import org.apache.cassandra.utils.NoSpamLogger.NoSpamLogStatement; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.helpers.SubstituteLogger; -import static org.junit.Assert.*; +import org.apache.cassandra.utils.NoSpamLogger.Level; +import org.apache.cassandra.utils.NoSpamLogger.NoSpamLogStatement; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class NoSpamLoggerTest { diff --git a/test/unit/org/apache/cassandra/utils/ObjectSizesTest.java b/test/unit/org/apache/cassandra/utils/ObjectSizesTest.java index 28d93eeb16..7039c00145 100644 --- a/test/unit/org/apache/cassandra/utils/ObjectSizesTest.java +++ b/test/unit/org/apache/cassandra/utils/ObjectSizesTest.java @@ -20,10 +20,9 @@ package org.apache.cassandra.utils; import java.nio.ByteBuffer; -import org.junit.Test; - import org.github.jamm.MemoryMeter; import org.github.jamm.MemoryMeter.Guess; +import org.junit.Test; import static org.github.jamm.MemoryMeter.ByteBufferMode.SLAB_ALLOCATION_NO_SLICE; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/utils/OrderedKeysTest.java b/test/unit/org/apache/cassandra/utils/OrderedKeysTest.java index 57dac2c393..41636bba26 100644 --- a/test/unit/org/apache/cassandra/utils/OrderedKeysTest.java +++ b/test/unit/org/apache/cassandra/utils/OrderedKeysTest.java @@ -28,14 +28,15 @@ import java.util.TreeSet; import org.junit.Assert; import org.junit.Test; - -import accord.utils.Invariants; -import org.apache.cassandra.service.accord.OrderedKeys; import org.quicktheories.WithQuickTheories; import org.quicktheories.core.Gen; import org.quicktheories.generators.SourceDSL; import org.quicktheories.impl.Constraint; +import accord.utils.Invariants; + +import org.apache.cassandra.service.accord.OrderedKeys; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/utils/OverlapsTest.java b/test/unit/org/apache/cassandra/utils/OverlapsTest.java index 3312578b62..9829dde087 100644 --- a/test/unit/org/apache/cassandra/utils/OverlapsTest.java +++ b/test/unit/org/apache/cassandra/utils/OverlapsTest.java @@ -30,6 +30,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import com.google.common.collect.Ordering; + import org.junit.Assert; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/utils/RangeTreeTest.java b/test/unit/org/apache/cassandra/utils/RangeTreeTest.java index 48cd22d429..aec19f53f6 100644 --- a/test/unit/org/apache/cassandra/utils/RangeTreeTest.java +++ b/test/unit/org/apache/cassandra/utils/RangeTreeTest.java @@ -31,6 +31,9 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.agrona.collections.IntArrayList; +import org.agrona.collections.LongArrayList; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -48,10 +51,8 @@ import accord.utils.RandomSource; import accord.utils.SearchableRangeList; import accord.utils.SymmetricComparator; import accord.utils.btree.BTree; -import org.agrona.collections.IntArrayList; -import org.agrona.collections.LongArrayList; + import org.apache.cassandra.utils.btree.IntervalBTree; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; import static org.apache.cassandra.utils.btree.IntervalBTree.InclusiveEndHelper.endWithStart; diff --git a/test/unit/org/apache/cassandra/utils/SimpleBitSetSerializersTest.java b/test/unit/org/apache/cassandra/utils/SimpleBitSetSerializersTest.java index 0ca2ff5e81..fee72a0115 100644 --- a/test/unit/org/apache/cassandra/utils/SimpleBitSetSerializersTest.java +++ b/test/unit/org/apache/cassandra/utils/SimpleBitSetSerializersTest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.utils; +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.utils.Gen; @@ -25,9 +26,9 @@ import accord.utils.Gens; import accord.utils.LargeBitSet; import accord.utils.SimpleBitSet; import accord.utils.SmallBitSet; + import org.apache.cassandra.io.Serializers; import org.apache.cassandra.io.util.DataOutputBuffer; -import org.assertj.core.api.Assertions; import static accord.utils.Property.qt; diff --git a/test/unit/org/apache/cassandra/utils/SimpleGraphTest.java b/test/unit/org/apache/cassandra/utils/SimpleGraphTest.java index 6adee36889..6e17bb5384 100644 --- a/test/unit/org/apache/cassandra/utils/SimpleGraphTest.java +++ b/test/unit/org/apache/cassandra/utils/SimpleGraphTest.java @@ -23,9 +23,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; - import org.assertj.core.api.Assertions; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/utils/SimulatedMiniCluster.java b/test/unit/org/apache/cassandra/utils/SimulatedMiniCluster.java index aabbfbfb6d..b6965b286a 100644 --- a/test/unit/org/apache/cassandra/utils/SimulatedMiniCluster.java +++ b/test/unit/org/apache/cassandra/utils/SimulatedMiniCluster.java @@ -36,14 +36,18 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.function.Supplier; + import javax.annotation.Nullable; import com.google.common.collect.Iterables; +import org.mockito.Mockito; + import accord.utils.Gen; import accord.utils.Gens; import accord.utils.Invariants; import accord.utils.RandomSource; + import org.apache.cassandra.concurrent.ExecutorFactory; import org.apache.cassandra.concurrent.ScheduledExecutorPlus; import org.apache.cassandra.concurrent.SequentialExecutorPlus; @@ -89,7 +93,6 @@ import org.apache.cassandra.tcm.membership.NodeId; import org.apache.cassandra.tcm.membership.NodeVersion; import org.apache.cassandra.tcm.ownership.UniformRangePlacement; import org.apache.cassandra.tcm.transformations.PrepareJoin; -import org.mockito.Mockito; import static org.apache.cassandra.utils.AccordGenerators.fromQT; diff --git a/test/unit/org/apache/cassandra/utils/StatefulRangeTreeTest.java b/test/unit/org/apache/cassandra/utils/StatefulRangeTreeTest.java index 139f172dfb..c97d1bded9 100644 --- a/test/unit/org/apache/cassandra/utils/StatefulRangeTreeTest.java +++ b/test/unit/org/apache/cassandra/utils/StatefulRangeTreeTest.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.TreeSet; import java.util.stream.Collectors; +import org.assertj.core.api.Assertions; import org.junit.Test; import accord.api.RoutingKey; @@ -36,8 +37,8 @@ import accord.utils.Gens; import accord.utils.Property.Command; import accord.utils.Property.UnitCommand; import accord.utils.RandomSource; + import org.apache.cassandra.service.accord.RangeTreeRangeAccessor; -import org.assertj.core.api.Assertions; import static accord.utils.Property.commands; import static accord.utils.Property.stateful; diff --git a/test/unit/org/apache/cassandra/utils/StatusLoggerTest.java b/test/unit/org/apache/cassandra/utils/StatusLoggerTest.java index 683d2ed0f7..741f13fb41 100644 --- a/test/unit/org/apache/cassandra/utils/StatusLoggerTest.java +++ b/test/unit/org/apache/cassandra/utils/StatusLoggerTest.java @@ -27,15 +27,17 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.google.common.collect.Range; + import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.cql3.CQLTester; + import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.AppenderBase; -import org.apache.cassandra.cql3.CQLTester; import static com.google.common.collect.Lists.newArrayList; import static java.util.stream.Collectors.groupingBy; diff --git a/test/unit/org/apache/cassandra/utils/StorageCompatibilityModeTest.java b/test/unit/org/apache/cassandra/utils/StorageCompatibilityModeTest.java index 0bc7186891..9be41f25d1 100644 --- a/test/unit/org/apache/cassandra/utils/StorageCompatibilityModeTest.java +++ b/test/unit/org/apache/cassandra/utils/StorageCompatibilityModeTest.java @@ -18,13 +18,13 @@ */ package org.apache.cassandra.utils; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableFormat; import org.apache.cassandra.io.sstable.format.big.BigFormat; import org.apache.cassandra.io.sstable.format.bti.BtiFormat; -import org.assertj.core.api.Assertions; public class StorageCompatibilityModeTest { diff --git a/test/unit/org/apache/cassandra/utils/SystemInfoTest.java b/test/unit/org/apache/cassandra/utils/SystemInfoTest.java index 61fec64818..a6c3ebf597 100644 --- a/test/unit/org/apache/cassandra/utils/SystemInfoTest.java +++ b/test/unit/org/apache/cassandra/utils/SystemInfoTest.java @@ -20,10 +20,11 @@ package org.apache.cassandra.utils; import java.util.Optional; +import com.vdurmont.semver4j.Semver; + import org.junit.Assume; import org.junit.Test; -import com.vdurmont.semver4j.Semver; import oshi.PlatformEnum; import static org.apache.cassandra.utils.SystemInfo.ADDRESS_SPACE_VIOLATION_MESSAGE; diff --git a/test/unit/org/apache/cassandra/utils/UUIDTest.java b/test/unit/org/apache/cassandra/utils/UUIDTest.java index 62946b63d9..8d3c5625da 100644 --- a/test/unit/org/apache/cassandra/utils/UUIDTest.java +++ b/test/unit/org/apache/cassandra/utils/UUIDTest.java @@ -29,13 +29,13 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import com.google.common.collect.Sets; + +import org.cliffc.high_scale_lib.NonBlockingHashMap; import org.junit.Assert; import org.junit.Test; -import com.google.common.collect.Sets; - import org.apache.cassandra.db.marshal.TimeUUIDType; -import org.cliffc.high_scale_lib.NonBlockingHashMap; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; diff --git a/test/unit/org/apache/cassandra/utils/asserts/SyncTaskAssert.java b/test/unit/org/apache/cassandra/utils/asserts/SyncTaskAssert.java index c48078367a..de1b16f6dd 100644 --- a/test/unit/org/apache/cassandra/utils/asserts/SyncTaskAssert.java +++ b/test/unit/org/apache/cassandra/utils/asserts/SyncTaskAssert.java @@ -20,11 +20,12 @@ package org.apache.cassandra.utils.asserts; import com.google.common.base.Preconditions; +import org.assertj.core.api.AbstractObjectAssert; +import org.assertj.core.api.Assertions; + import org.apache.cassandra.dht.Range; import org.apache.cassandra.repair.LocalSyncTask; import org.apache.cassandra.repair.SyncTask; -import org.assertj.core.api.AbstractObjectAssert; -import org.assertj.core.api.Assertions; public class SyncTaskAssert extends AbstractObjectAssert implements SizeableObjectAssert { diff --git a/test/unit/org/apache/cassandra/utils/asserts/SyncTaskListAssert.java b/test/unit/org/apache/cassandra/utils/asserts/SyncTaskListAssert.java index 668719b567..51d8dfdb42 100644 --- a/test/unit/org/apache/cassandra/utils/asserts/SyncTaskListAssert.java +++ b/test/unit/org/apache/cassandra/utils/asserts/SyncTaskListAssert.java @@ -22,9 +22,10 @@ import java.util.List; import com.google.common.collect.ImmutableList; -import org.apache.cassandra.repair.SyncTask; import org.assertj.core.api.AbstractListAssert; +import org.apache.cassandra.repair.SyncTask; + public class SyncTaskListAssert extends AbstractListAssert, SyncTask, SyncTaskAssert> implements SizeableObjectAssert { diff --git a/test/unit/org/apache/cassandra/utils/binlog/BinLogTest.java b/test/unit/org/apache/cassandra/utils/binlog/BinLogTest.java index 5227e51b51..806ad38d69 100644 --- a/test/unit/org/apache/cassandra/utils/binlog/BinLogTest.java +++ b/test/unit/org/apache/cassandra/utils/binlog/BinLogTest.java @@ -18,8 +18,8 @@ package org.apache.cassandra.utils.binlog; -import java.nio.file.Path; import java.nio.file.Files; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -28,19 +28,20 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.io.util.File; +import net.openhft.chronicle.queue.ChronicleQueue; +import net.openhft.chronicle.queue.ExcerptTailer; +import net.openhft.chronicle.queue.RollCycles; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; +import net.openhft.chronicle.wire.WireOut; + import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; -import net.openhft.chronicle.queue.ExcerptTailer; -import net.openhft.chronicle.queue.RollCycles; -import net.openhft.chronicle.wire.WireOut; import org.apache.cassandra.Util; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.io.util.File; import static org.apache.cassandra.utils.Clock.Global.nanoTime; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/utils/binlog/DeletingArchiverTest.java b/test/unit/org/apache/cassandra/utils/binlog/DeletingArchiverTest.java index 940d121a75..837d9fb63a 100644 --- a/test/unit/org/apache/cassandra/utils/binlog/DeletingArchiverTest.java +++ b/test/unit/org/apache/cassandra/utils/binlog/DeletingArchiverTest.java @@ -25,9 +25,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import org.apache.cassandra.io.util.File; import org.junit.Test; +import org.apache.cassandra.io.util.File; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/utils/binlog/ExternalArchiverTest.java b/test/unit/org/apache/cassandra/utils/binlog/ExternalArchiverTest.java index 8e3c2db2f7..fafb538b27 100644 --- a/test/unit/org/apache/cassandra/utils/binlog/ExternalArchiverTest.java +++ b/test/unit/org/apache/cassandra/utils/binlog/ExternalArchiverTest.java @@ -29,10 +29,12 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.collect.Sets; -import org.apache.cassandra.io.util.File; -import org.junit.Test; import net.openhft.chronicle.queue.impl.single.SingleChronicleQueue; + +import org.junit.Test; + +import org.apache.cassandra.io.util.File; import org.apache.cassandra.utils.Pair; import static org.junit.Assert.assertEquals; diff --git a/test/unit/org/apache/cassandra/utils/btree/BTreeBiMapTest.java b/test/unit/org/apache/cassandra/utils/btree/BTreeBiMapTest.java index fc7cef394b..cb8e2f1f4d 100644 --- a/test/unit/org/apache/cassandra/utils/btree/BTreeBiMapTest.java +++ b/test/unit/org/apache/cassandra/utils/btree/BTreeBiMapTest.java @@ -29,6 +29,7 @@ import java.util.Set; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; + import org.junit.Test; import org.apache.cassandra.utils.Pair; diff --git a/test/unit/org/apache/cassandra/utils/btree/BTreeMapGuavaTest.java b/test/unit/org/apache/cassandra/utils/btree/BTreeMapGuavaTest.java index 41416a3d8a..81c6b6d425 100644 --- a/test/unit/org/apache/cassandra/utils/btree/BTreeMapGuavaTest.java +++ b/test/unit/org/apache/cassandra/utils/btree/BTreeMapGuavaTest.java @@ -24,7 +24,8 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import com.google.common.collect.testing.*; +import com.google.common.collect.testing.MapTestSuiteBuilder; +import com.google.common.collect.testing.TestStringMapGenerator; import com.google.common.collect.testing.features.CollectionSize; import com.google.common.collect.testing.testers.MapEntrySetTester; diff --git a/test/unit/org/apache/cassandra/utils/btree/BTreeMultimapTest.java b/test/unit/org/apache/cassandra/utils/btree/BTreeMultimapTest.java index 519f0d9dd4..338d834d88 100644 --- a/test/unit/org/apache/cassandra/utils/btree/BTreeMultimapTest.java +++ b/test/unit/org/apache/cassandra/utils/btree/BTreeMultimapTest.java @@ -27,6 +27,7 @@ import java.util.Random; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.Sets; + import org.apache.commons.lang3.RandomStringUtils; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/utils/btree/BTreeRemovalTest.java b/test/unit/org/apache/cassandra/utils/btree/BTreeRemovalTest.java index a28b16193a..56edf1a608 100644 --- a/test/unit/org/apache/cassandra/utils/btree/BTreeRemovalTest.java +++ b/test/unit/org/apache/cassandra/utils/btree/BTreeRemovalTest.java @@ -17,6 +17,15 @@ */ package org.apache.cassandra.utils.btree; +import java.util.Comparator; +import java.util.Random; +import java.util.SortedSet; +import java.util.TreeSet; + +import com.google.common.collect.Iterables; + +import org.junit.Test; + import static org.apache.cassandra.config.CassandraRelevantProperties.BTREE_BRANCH_SHIFT; import static org.apache.cassandra.utils.btree.BTreeRemoval.remove; import static org.junit.Assert.assertArrayEquals; @@ -25,15 +34,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import java.util.Comparator; -import java.util.Random; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.junit.Test; - -import com.google.common.collect.Iterables; - public class BTreeRemovalTest { static diff --git a/test/unit/org/apache/cassandra/utils/btree/BTreeSearchIteratorTest.java b/test/unit/org/apache/cassandra/utils/btree/BTreeSearchIteratorTest.java index 19dfd066a8..3b627b2779 100644 --- a/test/unit/org/apache/cassandra/utils/btree/BTreeSearchIteratorTest.java +++ b/test/unit/org/apache/cassandra/utils/btree/BTreeSearchIteratorTest.java @@ -18,19 +18,20 @@ package org.apache.cassandra.utils.btree; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.cassandra.utils.btree.BTree.Dir; import org.junit.Test; +import org.apache.cassandra.utils.btree.BTree.Dir; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class BTreeSearchIteratorTest { diff --git a/test/unit/org/apache/cassandra/utils/btree/BTreeTest.java b/test/unit/org/apache/cassandra/utils/btree/BTreeTest.java index 004dfe073d..ef34677621 100644 --- a/test/unit/org/apache/cassandra/utils/btree/BTreeTest.java +++ b/test/unit/org/apache/cassandra/utils/btree/BTreeTest.java @@ -17,16 +17,23 @@ */ package org.apache.cassandra.utils.btree; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.TreeSet; import java.util.concurrent.ThreadLocalRandom; import com.google.common.collect.Iterables; -import org.junit.Test; import org.junit.Assert; +import org.junit.Test; import static org.apache.cassandra.config.CassandraRelevantProperties.BTREE_BRANCH_SHIFT; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class BTreeTest { diff --git a/test/unit/org/apache/cassandra/utils/btree/IntervalBTreeTest.java b/test/unit/org/apache/cassandra/utils/btree/IntervalBTreeTest.java index 2ea33e5e7f..c5517b697f 100644 --- a/test/unit/org/apache/cassandra/utils/btree/IntervalBTreeTest.java +++ b/test/unit/org/apache/cassandra/utils/btree/IntervalBTreeTest.java @@ -36,6 +36,7 @@ import accord.utils.Invariants; import accord.utils.QuadFunction; import accord.utils.RandomSource; import accord.utils.SymmetricComparator; + import org.apache.cassandra.config.CassandraRelevantProperties; import static org.apache.cassandra.utils.btree.BTree.getChildCount; diff --git a/test/unit/org/apache/cassandra/utils/bytecomparable/AbstractTypeByteSourceTest.java b/test/unit/org/apache/cassandra/utils/bytecomparable/AbstractTypeByteSourceTest.java index 2f9ec74ff1..ca02f6a26a 100644 --- a/test/unit/org/apache/cassandra/utils/bytecomparable/AbstractTypeByteSourceTest.java +++ b/test/unit/org/apache/cassandra/utils/bytecomparable/AbstractTypeByteSourceTest.java @@ -41,14 +41,45 @@ import java.util.stream.Stream; import com.google.common.collect.ImmutableList; -import org.apache.cassandra.cql3.terms.Term; -import org.apache.cassandra.db.marshal.*; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.apache.cassandra.cql3.Duration; +import org.apache.cassandra.cql3.terms.Term; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.BooleanType; +import org.apache.cassandra.db.marshal.ByteBufferAccessor; +import org.apache.cassandra.db.marshal.ByteType; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.CompositeType; +import org.apache.cassandra.db.marshal.DateType; +import org.apache.cassandra.db.marshal.DecimalType; +import org.apache.cassandra.db.marshal.DoubleType; +import org.apache.cassandra.db.marshal.DurationType; +import org.apache.cassandra.db.marshal.DynamicCompositeType; +import org.apache.cassandra.db.marshal.FloatType; +import org.apache.cassandra.db.marshal.InetAddressType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.LexicalUUIDType; +import org.apache.cassandra.db.marshal.ListType; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.MapType; +import org.apache.cassandra.db.marshal.PartitionerDefinedOrder; +import org.apache.cassandra.db.marshal.ReversedType; +import org.apache.cassandra.db.marshal.SetType; +import org.apache.cassandra.db.marshal.ShortType; +import org.apache.cassandra.db.marshal.SimpleDateType; +import org.apache.cassandra.db.marshal.TimeType; +import org.apache.cassandra.db.marshal.TimeUUIDType; +import org.apache.cassandra.db.marshal.TimestampType; +import org.apache.cassandra.db.marshal.TupleType; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.marshal.UUIDType; +import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.LengthPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; diff --git a/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceComparisonTest.java b/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceComparisonTest.java index df4b661915..77d22cc2c7 100644 --- a/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceComparisonTest.java +++ b/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceComparisonTest.java @@ -21,7 +21,17 @@ import java.math.BigDecimal; import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.TreeMap; +import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; import java.util.function.BiFunction; import java.util.function.Function; @@ -31,6 +41,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; + import org.junit.Assert; import org.junit.Rule; import org.junit.Test; @@ -43,7 +54,40 @@ import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.db.ClusteringPrefix; import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.BooleanType; +import org.apache.cassandra.db.marshal.ByteBufferAccessor; +import org.apache.cassandra.db.marshal.ByteType; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.CollectionType; +import org.apache.cassandra.db.marshal.CompositeType; +import org.apache.cassandra.db.marshal.DateType; +import org.apache.cassandra.db.marshal.DecimalType; +import org.apache.cassandra.db.marshal.DoubleType; +import org.apache.cassandra.db.marshal.DynamicCompositeType; +import org.apache.cassandra.db.marshal.DynamicCompositeTypeTest; +import org.apache.cassandra.db.marshal.EmptyType; +import org.apache.cassandra.db.marshal.FloatType; +import org.apache.cassandra.db.marshal.InetAddressType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.LexicalUUIDType; +import org.apache.cassandra.db.marshal.ListType; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.MapType; +import org.apache.cassandra.db.marshal.PartitionerDefinedOrder; +import org.apache.cassandra.db.marshal.ReversedType; +import org.apache.cassandra.db.marshal.SetType; +import org.apache.cassandra.db.marshal.ShortType; +import org.apache.cassandra.db.marshal.SimpleDateType; +import org.apache.cassandra.db.marshal.TimeType; +import org.apache.cassandra.db.marshal.TimeUUIDType; +import org.apache.cassandra.db.marshal.TimestampType; +import org.apache.cassandra.db.marshal.TupleType; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.marshal.UUIDType; +import org.apache.cassandra.db.marshal.ValueAccessor; import org.apache.cassandra.dht.ByteOrderedPartitioner; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.LocalPartitioner; diff --git a/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceConversionTest.java b/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceConversionTest.java index 740234d100..cbb0b0f6eb 100644 --- a/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceConversionTest.java +++ b/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceConversionTest.java @@ -20,7 +20,17 @@ package org.apache.cassandra.utils.bytecomparable; import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.TreeMap; +import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; import java.util.function.BiFunction; import java.util.function.Function; @@ -29,6 +39,7 @@ import java.util.function.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -39,7 +50,41 @@ import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.db.ClusteringPrefix; import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.BooleanType; +import org.apache.cassandra.db.marshal.ByteBufferAccessor; +import org.apache.cassandra.db.marshal.ByteType; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.CollectionType; +import org.apache.cassandra.db.marshal.CompositeType; +import org.apache.cassandra.db.marshal.DateType; +import org.apache.cassandra.db.marshal.DecimalType; +import org.apache.cassandra.db.marshal.DoubleType; +import org.apache.cassandra.db.marshal.DynamicCompositeType; +import org.apache.cassandra.db.marshal.DynamicCompositeTypeTest; +import org.apache.cassandra.db.marshal.EmptyType; +import org.apache.cassandra.db.marshal.FloatType; +import org.apache.cassandra.db.marshal.InetAddressType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.LexicalUUIDType; +import org.apache.cassandra.db.marshal.ListType; +import org.apache.cassandra.db.marshal.LongType; +import org.apache.cassandra.db.marshal.MapType; +import org.apache.cassandra.db.marshal.PartitionerDefinedOrder; +import org.apache.cassandra.db.marshal.ReversedType; +import org.apache.cassandra.db.marshal.SetType; +import org.apache.cassandra.db.marshal.ShortType; +import org.apache.cassandra.db.marshal.SimpleDateType; +import org.apache.cassandra.db.marshal.TimeType; +import org.apache.cassandra.db.marshal.TimeUUIDType; +import org.apache.cassandra.db.marshal.TimestampType; +import org.apache.cassandra.db.marshal.TupleType; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.marshal.UUIDType; +import org.apache.cassandra.db.marshal.ValueAccessor; +import org.apache.cassandra.db.marshal.ValueAccessors; import org.apache.cassandra.dht.ByteOrderedPartitioner; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.LocalPartitioner; diff --git a/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceInverseTest.java b/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceInverseTest.java index 1fd6cc202b..1fd6859187 100644 --- a/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceInverseTest.java +++ b/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceInverseTest.java @@ -17,27 +17,37 @@ */ package org.apache.cassandra.utils.bytecomparable; -import org.apache.cassandra.db.marshal.*; -import org.apache.cassandra.utils.*; -import org.apache.cassandra.utils.memory.MemoryUtil; +import java.lang.reflect.Method; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.UUID; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.IntConsumer; +import java.util.function.LongConsumer; +import java.util.stream.IntStream; +import java.util.stream.LongStream; +import java.util.stream.Stream; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import java.lang.reflect.Method; -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.IntConsumer; -import java.util.function.LongConsumer; -import java.util.stream.*; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; +import org.apache.cassandra.db.marshal.ByteType; +import org.apache.cassandra.db.marshal.ShortType; +import org.apache.cassandra.db.marshal.UUIDType; +import org.apache.cassandra.utils.Throwables; +import org.apache.cassandra.utils.memory.MemoryUtil; @RunWith(Parameterized.class) public class ByteSourceInverseTest diff --git a/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceSequenceTest.java b/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceSequenceTest.java index 532bd1b1a7..3344424d96 100644 --- a/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceSequenceTest.java +++ b/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceSequenceTest.java @@ -28,6 +28,7 @@ import java.util.TreeMap; import java.util.function.Function; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,7 +39,20 @@ import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.CachedHashDecoratedKey; import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.db.ClusteringPrefix; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.BooleanType; +import org.apache.cassandra.db.marshal.ByteType; +import org.apache.cassandra.db.marshal.CompositeType; +import org.apache.cassandra.db.marshal.DecimalType; +import org.apache.cassandra.db.marshal.DynamicCompositeType; +import org.apache.cassandra.db.marshal.DynamicCompositeTypeTest; +import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.db.marshal.MapType; +import org.apache.cassandra.db.marshal.ReversedType; +import org.apache.cassandra.db.marshal.ShortType; +import org.apache.cassandra.db.marshal.SimpleDateType; +import org.apache.cassandra.db.marshal.TimeType; +import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.LocalPartitioner; import org.apache.cassandra.utils.TimeUUID; diff --git a/test/unit/org/apache/cassandra/utils/bytecomparable/DecoratedKeyByteSourceTest.java b/test/unit/org/apache/cassandra/utils/bytecomparable/DecoratedKeyByteSourceTest.java index aab6316e2c..52e66e7820 100644 --- a/test/unit/org/apache/cassandra/utils/bytecomparable/DecoratedKeyByteSourceTest.java +++ b/test/unit/org/apache/cassandra/utils/bytecomparable/DecoratedKeyByteSourceTest.java @@ -21,6 +21,7 @@ import java.nio.ByteBuffer; import java.util.Random; import com.google.common.collect.ImmutableList; + import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/test/unit/org/apache/cassandra/utils/concurrent/AbstractTestAsyncPromise.java b/test/unit/org/apache/cassandra/utils/concurrent/AbstractTestAsyncPromise.java index 8420ba5aba..b9b417e6d7 100644 --- a/test/unit/org/apache/cassandra/utils/concurrent/AbstractTestAsyncPromise.java +++ b/test/unit/org/apache/cassandra/utils/concurrent/AbstractTestAsyncPromise.java @@ -31,11 +31,13 @@ import javax.annotation.Nullable; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Assert; -import io.netty.util.concurrent.GenericFutureListener; import org.apache.cassandra.config.DatabaseDescriptor; +import io.netty.util.concurrent.GenericFutureListener; + import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.cassandra.utils.Clock.Global.nanoTime; diff --git a/test/unit/org/apache/cassandra/utils/concurrent/AbstractTestAwaitable.java b/test/unit/org/apache/cassandra/utils/concurrent/AbstractTestAwaitable.java index 8b95eaf52e..66985246d6 100644 --- a/test/unit/org/apache/cassandra/utils/concurrent/AbstractTestAwaitable.java +++ b/test/unit/org/apache/cassandra/utils/concurrent/AbstractTestAwaitable.java @@ -24,16 +24,17 @@ import java.util.Objects; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import java.util.function.Predicate; import java.util.function.Consumer; +import java.util.function.Predicate; import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.Assert; import net.openhft.chronicle.core.util.ThrowingBiConsumer; import net.openhft.chronicle.core.util.ThrowingConsumer; import net.openhft.chronicle.core.util.ThrowingFunction; +import org.junit.Assert; + import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.cassandra.utils.Clock.Global.nanoTime; diff --git a/test/unit/org/apache/cassandra/utils/concurrent/AbstractTestPromise.java b/test/unit/org/apache/cassandra/utils/concurrent/AbstractTestPromise.java index 35a43ca2ac..5b68ce7ceb 100644 --- a/test/unit/org/apache/cassandra/utils/concurrent/AbstractTestPromise.java +++ b/test/unit/org/apache/cassandra/utils/concurrent/AbstractTestPromise.java @@ -26,13 +26,14 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; -import org.junit.Assert; - -import io.netty.util.concurrent.Promise; import net.openhft.chronicle.core.util.ThrowingBiConsumer; import net.openhft.chronicle.core.util.ThrowingConsumer; import net.openhft.chronicle.core.util.ThrowingFunction; +import org.junit.Assert; + +import io.netty.util.concurrent.Promise; + public abstract class AbstractTestPromise { protected final ExecutorService exec = Executors.newCachedThreadPool(); diff --git a/test/unit/org/apache/cassandra/utils/concurrent/AbstractTransactionalTest.java b/test/unit/org/apache/cassandra/utils/concurrent/AbstractTransactionalTest.java index 7255564608..815ce4f658 100644 --- a/test/unit/org/apache/cassandra/utils/concurrent/AbstractTransactionalTest.java +++ b/test/unit/org/apache/cassandra/utils/concurrent/AbstractTransactionalTest.java @@ -18,12 +18,11 @@ */ package org.apache.cassandra.utils.concurrent; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import org.junit.Assert; - import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.db.commitlog.CommitLog; diff --git a/test/unit/org/apache/cassandra/utils/concurrent/AccumulatorTest.java b/test/unit/org/apache/cassandra/utils/concurrent/AccumulatorTest.java index da5bd32151..10ec1fe8f1 100644 --- a/test/unit/org/apache/cassandra/utils/concurrent/AccumulatorTest.java +++ b/test/unit/org/apache/cassandra/utils/concurrent/AccumulatorTest.java @@ -22,7 +22,11 @@ import java.util.Iterator; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class AccumulatorTest { diff --git a/test/unit/org/apache/cassandra/utils/concurrent/AsyncPromiseTest.java b/test/unit/org/apache/cassandra/utils/concurrent/AsyncPromiseTest.java index cb1da098cd..c83ff6de4e 100644 --- a/test/unit/org/apache/cassandra/utils/concurrent/AsyncPromiseTest.java +++ b/test/unit/org/apache/cassandra/utils/concurrent/AsyncPromiseTest.java @@ -17,10 +17,6 @@ */ package org.apache.cassandra.utils.concurrent; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; - import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; @@ -31,11 +27,16 @@ import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.MoreExecutors; -import io.netty.util.concurrent.Future; -import io.netty.util.concurrent.GenericFutureListener; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; + import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.utils.WithResources; +import io.netty.util.concurrent.Future; +import io.netty.util.concurrent.GenericFutureListener; + public class AsyncPromiseTest extends AbstractTestAsyncPromise { @After diff --git a/test/unit/org/apache/cassandra/utils/concurrent/LoadingMapTest.java b/test/unit/org/apache/cassandra/utils/concurrent/LoadingMapTest.java index 822e9eb7f0..9e8bc45b9c 100644 --- a/test/unit/org/apache/cassandra/utils/concurrent/LoadingMapTest.java +++ b/test/unit/org/apache/cassandra/utils/concurrent/LoadingMapTest.java @@ -28,14 +28,15 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.util.concurrent.Uninterruptibles; + +import org.awaitility.Awaitility; +import org.awaitility.core.ConditionFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.utils.Throwables; -import org.awaitility.Awaitility; -import org.awaitility.core.ConditionFactory; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; import static org.apache.cassandra.utils.FBUtilities.now; diff --git a/test/unit/org/apache/cassandra/utils/concurrent/NonBlockingRateLimiterTest.java b/test/unit/org/apache/cassandra/utils/concurrent/NonBlockingRateLimiterTest.java index d63cef3c4d..cc852bdf04 100644 --- a/test/unit/org/apache/cassandra/utils/concurrent/NonBlockingRateLimiterTest.java +++ b/test/unit/org/apache/cassandra/utils/concurrent/NonBlockingRateLimiterTest.java @@ -18,13 +18,14 @@ package org.apache.cassandra.utils.concurrent; -import com.google.common.base.Ticker; -import org.junit.Before; -import org.junit.Test; - import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; +import com.google.common.base.Ticker; + +import org.junit.Before; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/unit/org/apache/cassandra/utils/concurrent/RefCountedTest.java b/test/unit/org/apache/cassandra/utils/concurrent/RefCountedTest.java index c34d4a12cc..b8224bc900 100644 --- a/test/unit/org/apache/cassandra/utils/concurrent/RefCountedTest.java +++ b/test/unit/org/apache/cassandra/utils/concurrent/RefCountedTest.java @@ -35,6 +35,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; +import org.awaitility.Awaitility; import org.junit.Assert; import org.junit.Test; @@ -50,7 +51,6 @@ import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.concurrent.Ref.Visitor; -import org.awaitility.Awaitility; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/unit/org/apache/cassandra/utils/jmx/JMXSslConfigTest.java b/test/unit/org/apache/cassandra/utils/jmx/JMXSslConfigTest.java index fb6a248dab..3ef400ea13 100644 --- a/test/unit/org/apache/cassandra/utils/jmx/JMXSslConfigTest.java +++ b/test/unit/org/apache/cassandra/utils/jmx/JMXSslConfigTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.utils.jmx; import java.net.InetAddress; import java.util.Map; + import javax.management.remote.rmi.RMIConnectorServer; import javax.net.ssl.SSLException; import javax.rmi.ssl.SslRMIServerSocketFactory; diff --git a/test/unit/org/apache/cassandra/utils/jmx/JMXSslConfiguredWithYamlFileOptionsAndPasswordFileTest.java b/test/unit/org/apache/cassandra/utils/jmx/JMXSslConfiguredWithYamlFileOptionsAndPasswordFileTest.java index ae2b7e6128..191d5af0f4 100644 --- a/test/unit/org/apache/cassandra/utils/jmx/JMXSslConfiguredWithYamlFileOptionsAndPasswordFileTest.java +++ b/test/unit/org/apache/cassandra/utils/jmx/JMXSslConfiguredWithYamlFileOptionsAndPasswordFileTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.utils.jmx; import java.net.InetAddress; import java.util.Map; + import javax.management.remote.rmi.RMIConnectorServer; import javax.net.ssl.SSLException; import javax.rmi.ssl.SslRMIServerSocketFactory; diff --git a/test/unit/org/apache/cassandra/utils/jmx/JMXSslConfiguredWithYamlFileOptionsTest.java b/test/unit/org/apache/cassandra/utils/jmx/JMXSslConfiguredWithYamlFileOptionsTest.java index c9d2d9f091..b944ac1d82 100644 --- a/test/unit/org/apache/cassandra/utils/jmx/JMXSslConfiguredWithYamlFileOptionsTest.java +++ b/test/unit/org/apache/cassandra/utils/jmx/JMXSslConfiguredWithYamlFileOptionsTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.utils.jmx; import java.net.InetAddress; import java.util.Map; + import javax.management.remote.rmi.RMIConnectorServer; import javax.net.ssl.SSLException; import javax.rmi.ssl.SslRMIServerSocketFactory; diff --git a/test/unit/org/apache/cassandra/utils/jmx/JMXSslDisabledEncryptionOptionsTest.java b/test/unit/org/apache/cassandra/utils/jmx/JMXSslDisabledEncryptionOptionsTest.java index 841a93357f..37aaa94130 100644 --- a/test/unit/org/apache/cassandra/utils/jmx/JMXSslDisabledEncryptionOptionsTest.java +++ b/test/unit/org/apache/cassandra/utils/jmx/JMXSslDisabledEncryptionOptionsTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.utils.jmx; import java.net.InetAddress; import java.util.Map; + import javax.management.remote.rmi.RMIConnectorServer; import javax.net.ssl.SSLException; diff --git a/test/unit/org/apache/cassandra/utils/jmx/JMXSslPEMConfigTest.java b/test/unit/org/apache/cassandra/utils/jmx/JMXSslPEMConfigTest.java index 01459954e6..db7a5ab87b 100644 --- a/test/unit/org/apache/cassandra/utils/jmx/JMXSslPEMConfigTest.java +++ b/test/unit/org/apache/cassandra/utils/jmx/JMXSslPEMConfigTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.utils.jmx; import java.net.InetAddress; import java.util.Map; + import javax.management.remote.rmi.RMIConnectorServer; import javax.net.ssl.SSLException; import javax.rmi.ssl.SslRMIServerSocketFactory; diff --git a/test/unit/org/apache/cassandra/utils/memory/BufferPoolTest.java b/test/unit/org/apache/cassandra/utils/memory/BufferPoolTest.java index ab68e405ca..573dfc2331 100644 --- a/test/unit/org/apache/cassandra/utils/memory/BufferPoolTest.java +++ b/test/unit/org/apache/cassandra/utils/memory/BufferPoolTest.java @@ -20,10 +20,18 @@ package org.apache.cassandra.utils.memory; import java.nio.ByteBuffer; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Random; +import java.util.Set; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import com.google.common.collect.Iterables; + import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -31,7 +39,15 @@ import org.junit.Test; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.io.util.RandomAccessReader; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class BufferPoolTest { diff --git a/test/unit/org/apache/cassandra/utils/memory/MemoryUtilTest.java b/test/unit/org/apache/cassandra/utils/memory/MemoryUtilTest.java index 392d3d5e06..842823a2d5 100644 --- a/test/unit/org/apache/cassandra/utils/memory/MemoryUtilTest.java +++ b/test/unit/org/apache/cassandra/utils/memory/MemoryUtilTest.java @@ -23,11 +23,10 @@ import java.lang.management.ManagementFactory; import java.nio.ByteBuffer; import java.util.List; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; -import org.assertj.core.api.Assertions; - public class MemoryUtilTest { diff --git a/test/unit/org/apache/cassandra/utils/memory/MemtableCleanerThreadTest.java b/test/unit/org/apache/cassandra/utils/memory/MemtableCleanerThreadTest.java index 2ce9a8ed78..e8c6d71411 100644 --- a/test/unit/org/apache/cassandra/utils/memory/MemtableCleanerThreadTest.java +++ b/test/unit/org/apache/cassandra/utils/memory/MemtableCleanerThreadTest.java @@ -26,11 +26,11 @@ import java.util.concurrent.atomic.AtomicReference; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.concurrent.AsyncPromise; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/unit/org/apache/cassandra/utils/memory/NativeAllocatorTest.java b/test/unit/org/apache/cassandra/utils/memory/NativeAllocatorTest.java index 79a54cd84e..9655e9c250 100644 --- a/test/unit/org/apache/cassandra/utils/memory/NativeAllocatorTest.java +++ b/test/unit/org/apache/cassandra/utils/memory/NativeAllocatorTest.java @@ -18,10 +18,15 @@ */ package org.apache.cassandra.utils.memory; -import java.util.concurrent.*; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import com.google.common.util.concurrent.Uninterruptibles; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/utils/obs/OffHeapBitSetTest.java b/test/unit/org/apache/cassandra/utils/obs/OffHeapBitSetTest.java index 49b4c94dd3..f76d6d681f 100644 --- a/test/unit/org/apache/cassandra/utils/obs/OffHeapBitSetTest.java +++ b/test/unit/org/apache/cassandra/utils/obs/OffHeapBitSetTest.java @@ -25,10 +25,12 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Lists; -import org.apache.cassandra.io.util.DataOutputBuffer; + import org.junit.Assert; import org.junit.Test; +import org.apache.cassandra.io.util.DataOutputBuffer; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/test/unit/org/apache/cassandra/utils/streamhist/StreamingTombstoneHistogramBuilderTest.java b/test/unit/org/apache/cassandra/utils/streamhist/StreamingTombstoneHistogramBuilderTest.java index eb40b427c4..da9062efd4 100644 --- a/test/unit/org/apache/cassandra/utils/streamhist/StreamingTombstoneHistogramBuilderTest.java +++ b/test/unit/org/apache/cassandra/utils/streamhist/StreamingTombstoneHistogramBuilderTest.java @@ -25,12 +25,12 @@ import java.util.Map; import java.util.stream.IntStream; import org.junit.Test; +import org.psjava.util.AssertStatus; +import org.quicktheories.core.Gen; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; -import org.psjava.util.AssertStatus; -import org.quicktheories.core.Gen; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertEquals; @@ -39,8 +39,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.quicktheories.QuickTheory.qt; import static org.quicktheories.generators.SourceDSL.integers; -import static org.quicktheories.generators.SourceDSL.longs; import static org.quicktheories.generators.SourceDSL.lists; +import static org.quicktheories.generators.SourceDSL.longs; public class StreamingTombstoneHistogramBuilderTest { diff --git a/test/unit/org/apache/cassandra/utils/tls/CertificateBuilder.java b/test/unit/org/apache/cassandra/utils/tls/CertificateBuilder.java index 0f43efa3bb..9f2ad6bd42 100644 --- a/test/unit/org/apache/cassandra/utils/tls/CertificateBuilder.java +++ b/test/unit/org/apache/cassandra/utils/tls/CertificateBuilder.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; + import javax.security.auth.x500.X500Principal; import org.bouncycastle.asn1.x500.X500Name; diff --git a/test/unit/org/apache/cassandra/utils/vint/VIntCodingTest.java b/test/unit/org/apache/cassandra/utils/vint/VIntCodingTest.java index 2212a1cfba..79b06cefe9 100644 --- a/test/unit/org/apache/cassandra/utils/vint/VIntCodingTest.java +++ b/test/unit/org/apache/cassandra/utils/vint/VIntCodingTest.java @@ -25,7 +25,9 @@ import java.nio.BufferOverflowException; import java.nio.ByteBuffer; import java.util.Arrays; +import org.assertj.core.api.Assertions; import org.junit.Test; +import org.quicktheories.generators.SourceDSL; import org.apache.cassandra.db.marshal.ByteArrayAccessor; import org.apache.cassandra.db.marshal.ByteBufferAccessor; @@ -34,8 +36,6 @@ import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.util.WrappedDataOutputStreamPlus; import org.apache.cassandra.utils.CassandraUInt; -import org.assertj.core.api.Assertions; -import org.quicktheories.generators.SourceDSL; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/DriverResultSet.java b/tools/fqltool/src/org/apache/cassandra/fqltool/DriverResultSet.java index e85b23b10e..0dfe57fb96 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/DriverResultSet.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/DriverResultSet.java @@ -25,11 +25,11 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import com.google.common.collect.AbstractIterator; - import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; +import com.google.common.collect.AbstractIterator; + import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/FQLQuery.java b/tools/fqltool/src/org/apache/cassandra/fqltool/FQLQuery.java index 8a8ca317a0..55a95e8acb 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/FQLQuery.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/FQLQuery.java @@ -24,15 +24,15 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import com.google.common.collect.Sets; -import com.google.common.primitives.Longs; - import com.datastax.driver.core.BatchStatement; import com.datastax.driver.core.ConsistencyLevel; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; -import org.apache.cassandra.fql.FullQueryLogger; +import com.google.common.collect.Sets; +import com.google.common.primitives.Longs; + import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.fql.FullQueryLogger; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.utils.binlog.BinLog; diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/FQLQueryIterator.java b/tools/fqltool/src/org/apache/cassandra/fqltool/FQLQueryIterator.java index ccbb200be5..ce1949a63f 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/FQLQueryIterator.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/FQLQueryIterator.java @@ -21,6 +21,7 @@ package org.apache.cassandra.fqltool; import java.util.PriorityQueue; import net.openhft.chronicle.queue.ExcerptTailer; + import org.apache.cassandra.utils.AbstractIterator; public class FQLQueryIterator extends AbstractIterator diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/FQLQueryReader.java b/tools/fqltool/src/org/apache/cassandra/fqltool/FQLQueryReader.java index 5655dbe87b..c785c6554b 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/FQLQueryReader.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/FQLQueryReader.java @@ -24,29 +24,32 @@ import java.util.ArrayList; import java.util.List; import com.datastax.driver.core.BatchStatement; -import io.netty.buffer.Unpooled; + import net.openhft.chronicle.core.io.IORuntimeException; import net.openhft.chronicle.wire.ReadMarshallable; import net.openhft.chronicle.wire.ValueIn; import net.openhft.chronicle.wire.WireIn; + import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.transport.ProtocolVersion; +import io.netty.buffer.Unpooled; + +import static org.apache.cassandra.fql.FullQueryLogger.BATCH; +import static org.apache.cassandra.fql.FullQueryLogger.BATCH_TYPE; import static org.apache.cassandra.fql.FullQueryLogger.CURRENT_VERSION; import static org.apache.cassandra.fql.FullQueryLogger.GENERATED_NOW_IN_SECONDS; import static org.apache.cassandra.fql.FullQueryLogger.GENERATED_TIMESTAMP; import static org.apache.cassandra.fql.FullQueryLogger.KEYSPACE; import static org.apache.cassandra.fql.FullQueryLogger.PROTOCOL_VERSION; -import static org.apache.cassandra.fql.FullQueryLogger.QUERY_OPTIONS; -import static org.apache.cassandra.fql.FullQueryLogger.QUERY_START_TIME; -import static org.apache.cassandra.fql.FullQueryLogger.TYPE; -import static org.apache.cassandra.fql.FullQueryLogger.VERSION; -import static org.apache.cassandra.fql.FullQueryLogger.BATCH; -import static org.apache.cassandra.fql.FullQueryLogger.BATCH_TYPE; import static org.apache.cassandra.fql.FullQueryLogger.QUERIES; import static org.apache.cassandra.fql.FullQueryLogger.QUERY; +import static org.apache.cassandra.fql.FullQueryLogger.QUERY_OPTIONS; +import static org.apache.cassandra.fql.FullQueryLogger.QUERY_START_TIME; import static org.apache.cassandra.fql.FullQueryLogger.SINGLE_QUERY; +import static org.apache.cassandra.fql.FullQueryLogger.TYPE; import static org.apache.cassandra.fql.FullQueryLogger.VALUES; +import static org.apache.cassandra.fql.FullQueryLogger.VERSION; public class FQLQueryReader implements ReadMarshallable { diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/FullQueryLogTool.java b/tools/fqltool/src/org/apache/cassandra/fqltool/FullQueryLogTool.java index 16db4818a7..f66830b487 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/FullQueryLogTool.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/FullQueryLogTool.java @@ -24,6 +24,7 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.fqltool.commands.Compare; import org.apache.cassandra.fqltool.commands.Dump; import org.apache.cassandra.fqltool.commands.Replay; + import picocli.CommandLine; import picocli.CommandLine.Command; diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/QueryReplayer.java b/tools/fqltool/src/org/apache/cassandra/fqltool/QueryReplayer.java index 1cff804ebd..a0f0303229 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/QueryReplayer.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/QueryReplayer.java @@ -30,6 +30,12 @@ import java.util.concurrent.ExecutorService; import java.util.function.Predicate; import java.util.stream.Collectors; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Timer; +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.Statement; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -38,12 +44,6 @@ import com.google.common.util.concurrent.MoreExecutors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.Timer; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.Statement; import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/ResultHandler.java b/tools/fqltool/src/org/apache/cassandra/fqltool/ResultHandler.java index d88c6f7300..ebc94f8740 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/ResultHandler.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/ResultHandler.java @@ -29,6 +29,7 @@ import java.util.Objects; import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/ResultStore.java b/tools/fqltool/src/org/apache/cassandra/fqltool/ResultStore.java index 1a53332b14..39d5eae5cc 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/ResultStore.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/ResultStore.java @@ -31,14 +31,15 @@ import net.openhft.chronicle.bytes.BytesStore; import net.openhft.chronicle.core.io.Closeable; import net.openhft.chronicle.core.io.IORuntimeException; import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.queue.ExcerptAppender; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.wire.ReadMarshallable; import net.openhft.chronicle.wire.ValueIn; import net.openhft.chronicle.wire.ValueOut; import net.openhft.chronicle.wire.WireIn; import net.openhft.chronicle.wire.WireOut; import net.openhft.chronicle.wire.WriteMarshallable; + import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.binlog.BinLog; diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/StoredResultSet.java b/tools/fqltool/src/org/apache/cassandra/fqltool/StoredResultSet.java index 39c4734c58..1dcf104208 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/StoredResultSet.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/StoredResultSet.java @@ -30,6 +30,7 @@ import java.util.stream.Collectors; import com.google.common.collect.AbstractIterator; import net.openhft.chronicle.queue.ExcerptTailer; + import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Compare.java b/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Compare.java index a7330f5419..c62cda7d21 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Compare.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Compare.java @@ -31,9 +31,11 @@ import net.openhft.chronicle.core.io.Closeable; import net.openhft.chronicle.queue.ChronicleQueue; import net.openhft.chronicle.queue.ExcerptTailer; import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; + import org.apache.cassandra.fqltool.FQLQueryIterator; import org.apache.cassandra.fqltool.ResultHandler; import org.apache.cassandra.fqltool.StoredResultSet; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Dump.java b/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Dump.java index f260af4055..cae00062af 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Dump.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Dump.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; -import io.netty.buffer.Unpooled; import net.openhft.chronicle.bytes.Bytes; import net.openhft.chronicle.core.io.IORuntimeException; import net.openhft.chronicle.queue.ChronicleQueue; @@ -39,10 +38,13 @@ import net.openhft.chronicle.threads.Pauser; import net.openhft.chronicle.wire.ReadMarshallable; import net.openhft.chronicle.wire.ValueIn; import net.openhft.chronicle.wire.WireIn; + import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.fql.FullQueryLogger; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.binlog.BinLog; + +import io.netty.buffer.Unpooled; import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Replay.java b/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Replay.java index 66c88c69f8..39b72e3e4b 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Replay.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Replay.java @@ -26,17 +26,20 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.openhft.chronicle.core.io.Closeable; import net.openhft.chronicle.queue.ChronicleQueue; import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.fqltool.FQLQuery; import org.apache.cassandra.fqltool.FQLQueryIterator; import org.apache.cassandra.fqltool.QueryReplayer; import org.apache.cassandra.utils.AbstractIterator; import org.apache.cassandra.utils.MergeIterator; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/tools/fqltool/test/unit/org/apache/cassandra/fqltool/FQLCompareTest.java b/tools/fqltool/test/unit/org/apache/cassandra/fqltool/FQLCompareTest.java index ef296e23fd..d0a64a49ca 100644 --- a/tools/fqltool/test/unit/org/apache/cassandra/fqltool/FQLCompareTest.java +++ b/tools/fqltool/test/unit/org/apache/cassandra/fqltool/FQLCompareTest.java @@ -29,16 +29,17 @@ import java.util.Objects; import java.util.stream.Collectors; import com.google.common.collect.Lists; -import org.junit.Test; import net.openhft.chronicle.core.io.Closeable; import net.openhft.chronicle.queue.ChronicleQueue; import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; + +import org.junit.Test; + import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.fqltool.commands.Compare; import org.apache.cassandra.tools.Util; - import static org.psjava.util.AssertStatus.assertTrue; public class FQLCompareTest diff --git a/tools/fqltool/test/unit/org/apache/cassandra/fqltool/FQLReplayTest.java b/tools/fqltool/test/unit/org/apache/cassandra/fqltool/FQLReplayTest.java index ef8863a683..734029330a 100644 --- a/tools/fqltool/test/unit/org/apache/cassandra/fqltool/FQLReplayTest.java +++ b/tools/fqltool/test/unit/org/apache/cassandra/fqltool/FQLReplayTest.java @@ -30,21 +30,23 @@ import java.util.Objects; import java.util.Random; import java.util.stream.Collectors; -import com.google.common.collect.Lists; -import org.junit.Test; - import com.datastax.driver.core.CodecRegistry; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; +import com.google.common.collect.Lists; + import net.openhft.chronicle.core.io.IORuntimeException; import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.queue.ExcerptAppender; import net.openhft.chronicle.queue.ExcerptTailer; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.wire.WireOut; -import org.apache.cassandra.fql.FullQueryLogger; + +import org.junit.Test; + import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.statements.BatchStatement; +import org.apache.cassandra.fql.FullQueryLogger; import org.apache.cassandra.fqltool.commands.Compare; import org.apache.cassandra.fqltool.commands.Replay; import org.apache.cassandra.service.ClientState; diff --git a/tools/fqltool/test/unit/org/apache/cassandra/fqltool/commands/DumpTest.java b/tools/fqltool/test/unit/org/apache/cassandra/fqltool/commands/DumpTest.java index c7e332a0c7..537bb58032 100644 --- a/tools/fqltool/test/unit/org/apache/cassandra/fqltool/commands/DumpTest.java +++ b/tools/fqltool/test/unit/org/apache/cassandra/fqltool/commands/DumpTest.java @@ -23,16 +23,17 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import org.junit.Assert; -import org.junit.Test; - import net.openhft.chronicle.wire.ValueIn; import net.openhft.chronicle.wire.WireIn; + +import org.junit.Assert; +import org.junit.Test; +import org.mockito.Mockito; + import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.fql.FullQueryLogger; import org.apache.cassandra.transport.ProtocolVersion; -import org.mockito.Mockito; public class DumpTest { diff --git a/tools/sstableloader/src/org/apache/cassandra/tools/BulkLoadConnectionFactory.java b/tools/sstableloader/src/org/apache/cassandra/tools/BulkLoadConnectionFactory.java index b282932a93..e9a0fc6fd3 100644 --- a/tools/sstableloader/src/org/apache/cassandra/tools/BulkLoadConnectionFactory.java +++ b/tools/sstableloader/src/org/apache/cassandra/tools/BulkLoadConnectionFactory.java @@ -24,8 +24,8 @@ import java.net.InetSocketAddress; import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.net.OutboundConnectionSettings; import org.apache.cassandra.streaming.StreamingChannel; -import org.apache.cassandra.streaming.async.NettyStreamingConnectionFactory; import org.apache.cassandra.streaming.async.NettyStreamingChannel; +import org.apache.cassandra.streaming.async.NettyStreamingConnectionFactory; import static org.apache.cassandra.locator.InetAddressAndPort.getByAddress; diff --git a/tools/sstableloader/src/org/apache/cassandra/tools/BulkLoader.java b/tools/sstableloader/src/org/apache/cassandra/tools/BulkLoader.java index a3a4dda350..3b48b18ca5 100644 --- a/tools/sstableloader/src/org/apache/cassandra/tools/BulkLoader.java +++ b/tools/sstableloader/src/org/apache/cassandra/tools/BulkLoader.java @@ -20,16 +20,17 @@ package org.apache.cassandra.tools; import java.io.IOException; import java.net.InetSocketAddress; import java.util.Set; + import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - import com.datastax.driver.core.AuthProvider; import com.datastax.driver.core.RemoteEndpointAwareJdkSSLOptions; import com.datastax.driver.core.SSLOptions; import com.datastax.shaded.netty.channel.socket.SocketChannel; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.io.sstable.SSTableLoader; diff --git a/tools/sstableloader/src/org/apache/cassandra/tools/LoaderOptions.java b/tools/sstableloader/src/org/apache/cassandra/tools/LoaderOptions.java index 74940e0df6..42da2d5af1 100644 --- a/tools/sstableloader/src/org/apache/cassandra/tools/LoaderOptions.java +++ b/tools/sstableloader/src/org/apache/cassandra/tools/LoaderOptions.java @@ -29,7 +29,10 @@ import java.net.UnknownHostException; import java.util.HashSet; import java.util.Set; +import com.datastax.driver.core.AuthProvider; +import com.datastax.driver.core.PlainTextAuthProvider; import com.google.common.net.HostAndPort; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.GnuParser; @@ -40,8 +43,6 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.datastax.driver.core.AuthProvider; -import com.datastax.driver.core.PlainTextAuthProvider; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DataRateSpec; import org.apache.cassandra.config.EncryptionOptions; diff --git a/tools/sstableloader/src/org/apache/cassandra/utils/NativeSSTableLoaderClient.java b/tools/sstableloader/src/org/apache/cassandra/utils/NativeSSTableLoaderClient.java index 03292d9d8c..67cec12c54 100644 --- a/tools/sstableloader/src/org/apache/cassandra/utils/NativeSSTableLoaderClient.java +++ b/tools/sstableloader/src/org/apache/cassandra/utils/NativeSSTableLoaderClient.java @@ -17,23 +17,43 @@ */ package org.apache.cassandra.utils; -import java.nio.ByteBuffer; import java.net.InetSocketAddress; -import java.util.*; +import java.nio.ByteBuffer; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; -import com.datastax.driver.core.*; +import com.datastax.driver.core.AuthProvider; +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.Host; +import com.datastax.driver.core.Metadata; +import com.datastax.driver.core.PlainTextAuthProvider; +import com.datastax.driver.core.Row; +import com.datastax.driver.core.SSLOptions; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.TokenRange; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.schema.*; -import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.ColumnMetadata.ClusteringOrder; import org.apache.cassandra.cql3.ColumnIdentifier; -import org.apache.cassandra.db.marshal.*; -import org.apache.cassandra.dht.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.ReversedType; +import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.dht.Token.TokenFactory; import org.apache.cassandra.io.sstable.SSTableLoader; +import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.schema.CQLTypeParser; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.ColumnMetadata.ClusteringOrder; +import org.apache.cassandra.schema.DroppedColumn; +import org.apache.cassandra.schema.SchemaConstants; +import org.apache.cassandra.schema.SchemaKeyspaceTables; +import org.apache.cassandra.schema.TableId; import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.TableMetadataRef; +import org.apache.cassandra.schema.Types; import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized; diff --git a/tools/sstableloader/test/unit/org/apache/cassandra/tools/LoaderOptionsTest.java b/tools/sstableloader/test/unit/org/apache/cassandra/tools/LoaderOptionsTest.java index 04e1380164..3e2c68c6e2 100644 --- a/tools/sstableloader/test/unit/org/apache/cassandra/tools/LoaderOptionsTest.java +++ b/tools/sstableloader/test/unit/org/apache/cassandra/tools/LoaderOptionsTest.java @@ -25,6 +25,7 @@ import java.nio.file.Paths; import java.security.Permission; import com.google.common.net.HostAndPort; + import org.apache.commons.io.FileUtils; import org.junit.Test; diff --git a/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java b/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java index 55470d5991..fc76b34548 100644 --- a/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java +++ b/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java @@ -31,14 +31,14 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import org.antlr.runtime.RecognitionException; import org.apache.commons.lang3.ArrayUtils; -import org.antlr.runtime.RecognitionException; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLFragmentParser; +import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.CqlParser; -import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.UpdateParameters; import org.apache.cassandra.cql3.functions.types.TypeCodec; diff --git a/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java b/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java index 87d18816b9..59dec05afb 100644 --- a/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java +++ b/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java @@ -63,6 +63,7 @@ import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.concurrent.Future; + import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/tools/stress/src/org/apache/cassandra/stress/Stress.java b/tools/stress/src/org/apache/cassandra/stress/Stress.java index c104e5c7cf..bfd4e04013 100644 --- a/tools/stress/src/org/apache/cassandra/stress/Stress.java +++ b/tools/stress/src/org/apache/cassandra/stress/Stress.java @@ -17,12 +17,14 @@ */ package org.apache.cassandra.stress; -import java.io.*; +import java.io.FileNotFoundException; +import java.io.PrintStream; + +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.stress.settings.StressSettings; import org.apache.cassandra.stress.util.MultiResultLogger; -import org.apache.commons.lang3.exception.ExceptionUtils; public final class Stress { diff --git a/tools/stress/src/org/apache/cassandra/stress/StressAction.java b/tools/stress/src/org/apache/cassandra/stress/StressAction.java index 729090709f..147cd19711 100644 --- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java @@ -25,6 +25,11 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.LockSupport; +import com.google.common.util.concurrent.Uninterruptibles; + +import org.jctools.queues.SpscArrayQueue; +import org.jctools.queues.SpscUnboundedArrayQueue; + import org.apache.cassandra.stress.operations.OpDistribution; import org.apache.cassandra.stress.operations.OpDistributionFactory; import org.apache.cassandra.stress.report.StressMetrics; @@ -34,10 +39,6 @@ import org.apache.cassandra.stress.settings.StressSettings; import org.apache.cassandra.stress.util.JavaDriverClient; import org.apache.cassandra.stress.util.ResultLogger; import org.apache.cassandra.transport.SimpleClient; -import org.jctools.queues.SpscArrayQueue; -import org.jctools.queues.SpscUnboundedArrayQueue; - -import com.google.common.util.concurrent.Uninterruptibles; import static org.apache.cassandra.utils.Clock.Global.nanoTime; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; diff --git a/tools/stress/src/org/apache/cassandra/stress/StressGraph.java b/tools/stress/src/org/apache/cassandra/stress/StressGraph.java index 7694052599..6e0d1864f7 100644 --- a/tools/stress/src/org/apache/cassandra/stress/StressGraph.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressGraph.java @@ -31,11 +31,12 @@ import java.nio.file.Paths; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.google.common.io.ByteStreams; -import org.apache.commons.lang3.StringUtils; - import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import com.google.common.io.ByteStreams; + +import org.apache.commons.lang3.StringUtils; + import org.apache.cassandra.stress.report.StressMetrics; import org.apache.cassandra.stress.settings.StressSettings; import org.apache.cassandra.utils.JsonUtils; diff --git a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java index eb95560a35..6d38f052ae 100644 --- a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java @@ -26,17 +26,33 @@ import java.io.IOException; import java.io.InputStream; import java.io.Serializable; import java.net.URI; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; import java.util.stream.Collectors; +import com.datastax.driver.core.BatchStatement; +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.Metadata; +import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.TableMetadata; +import com.datastax.driver.core.TokenRange; +import com.datastax.driver.core.exceptions.AlreadyExistsException; import com.google.common.base.Function; import com.google.common.util.concurrent.Uninterruptibles; -import com.datastax.driver.core.*; -import com.datastax.driver.core.exceptions.AlreadyExistsException; import org.antlr.runtime.RecognitionException; +import org.yaml.snakeyaml.Yaml; +import org.yaml.snakeyaml.constructor.Constructor; +import org.yaml.snakeyaml.error.YAMLException; + import org.apache.cassandra.config.YamlConfigurationLoader; import org.apache.cassandra.cql3.CQLFragmentParser; import org.apache.cassandra.cql3.CqlParser; @@ -46,8 +62,33 @@ import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.stress.generate.*; -import org.apache.cassandra.stress.generate.values.*; +import org.apache.cassandra.stress.generate.Distribution; +import org.apache.cassandra.stress.generate.DistributionFactory; +import org.apache.cassandra.stress.generate.PartitionGenerator; +import org.apache.cassandra.stress.generate.RatioDistributionFactory; +import org.apache.cassandra.stress.generate.SeedManager; +import org.apache.cassandra.stress.generate.TokenRangeIterator; +import org.apache.cassandra.stress.generate.values.BigDecimals; +import org.apache.cassandra.stress.generate.values.BigIntegers; +import org.apache.cassandra.stress.generate.values.Booleans; +import org.apache.cassandra.stress.generate.values.Bytes; +import org.apache.cassandra.stress.generate.values.Dates; +import org.apache.cassandra.stress.generate.values.Doubles; +import org.apache.cassandra.stress.generate.values.Floats; +import org.apache.cassandra.stress.generate.values.Generator; +import org.apache.cassandra.stress.generate.values.GeneratorConfig; +import org.apache.cassandra.stress.generate.values.Inets; +import org.apache.cassandra.stress.generate.values.Integers; +import org.apache.cassandra.stress.generate.values.Lists; +import org.apache.cassandra.stress.generate.values.LocalDates; +import org.apache.cassandra.stress.generate.values.Longs; +import org.apache.cassandra.stress.generate.values.Sets; +import org.apache.cassandra.stress.generate.values.SmallInts; +import org.apache.cassandra.stress.generate.values.Strings; +import org.apache.cassandra.stress.generate.values.TimeUUIDs; +import org.apache.cassandra.stress.generate.values.Times; +import org.apache.cassandra.stress.generate.values.TinyInts; +import org.apache.cassandra.stress.generate.values.UUIDs; import org.apache.cassandra.stress.operations.userdefined.CASQuery; import org.apache.cassandra.stress.operations.userdefined.SchemaInsert; import org.apache.cassandra.stress.operations.userdefined.SchemaQuery; @@ -55,12 +96,12 @@ import org.apache.cassandra.stress.operations.userdefined.SchemaStatement; import org.apache.cassandra.stress.operations.userdefined.TokenRangeQuery; import org.apache.cassandra.stress.operations.userdefined.ValidatingSchemaQuery; import org.apache.cassandra.stress.report.Timer; -import org.apache.cassandra.stress.settings.*; +import org.apache.cassandra.stress.settings.OptionDistribution; +import org.apache.cassandra.stress.settings.OptionRatioDistribution; +import org.apache.cassandra.stress.settings.SettingsCommand; +import org.apache.cassandra.stress.settings.StressSettings; import org.apache.cassandra.stress.util.JavaDriverClient; import org.apache.cassandra.stress.util.ResultLogger; -import org.yaml.snakeyaml.Yaml; -import org.yaml.snakeyaml.constructor.Constructor; -import org.yaml.snakeyaml.error.YAMLException; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized; diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/PartitionGenerator.java b/tools/stress/src/org/apache/cassandra/stress/generate/PartitionGenerator.java index 2196fe0e98..f3ebaf1c2f 100644 --- a/tools/stress/src/org/apache/cassandra/stress/generate/PartitionGenerator.java +++ b/tools/stress/src/org/apache/cassandra/stress/generate/PartitionGenerator.java @@ -22,7 +22,11 @@ package org.apache.cassandra.stress.generate; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; import java.util.stream.Collectors; import com.google.common.collect.Iterables; diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/TokenRangeIterator.java b/tools/stress/src/org/apache/cassandra/stress/generate/TokenRangeIterator.java index 5ddac614f7..a4736690a0 100644 --- a/tools/stress/src/org/apache/cassandra/stress/generate/TokenRangeIterator.java +++ b/tools/stress/src/org/apache/cassandra/stress/generate/TokenRangeIterator.java @@ -23,6 +23,7 @@ import java.util.TreeSet; import java.util.concurrent.ConcurrentLinkedQueue; import com.datastax.driver.core.TokenRange; + import org.apache.cassandra.stress.settings.StressSettings; public class TokenRangeIterator diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java index 42758edc8d..a829daf260 100644 --- a/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java +++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigDecimals.java @@ -20,10 +20,10 @@ */ package org.apache.cassandra.stress.generate.values; -import org.apache.cassandra.db.marshal.DecimalType; - import java.math.BigDecimal; +import org.apache.cassandra.db.marshal.DecimalType; + public class BigDecimals extends Generator { public BigDecimals(String name, GeneratorConfig config) diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/BigIntegers.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigIntegers.java index 84a4c8f7a8..a0c2658d0f 100644 --- a/tools/stress/src/org/apache/cassandra/stress/generate/values/BigIntegers.java +++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigIntegers.java @@ -20,10 +20,10 @@ */ package org.apache.cassandra.stress.generate.values; -import org.apache.cassandra.db.marshal.IntegerType; - import java.math.BigInteger; +import org.apache.cassandra.db.marshal.IntegerType; + public class BigIntegers extends Generator { public BigIntegers(String name, GeneratorConfig config) diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java b/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java index 575764013b..3aaac93cd2 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java @@ -26,13 +26,14 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import org.apache.commons.math3.distribution.EnumeratedDistribution; +import org.apache.commons.math3.util.Pair; + import org.apache.cassandra.stress.Operation; import org.apache.cassandra.stress.StressAction.MeasurementSink; import org.apache.cassandra.stress.generate.DistributionFactory; import org.apache.cassandra.stress.generate.DistributionFixed; import org.apache.cassandra.stress.report.Timer; -import org.apache.commons.math3.distribution.EnumeratedDistribution; -import org.apache.commons.math3.util.Pair; public abstract class SampledOpDistributionFactory implements OpDistributionFactory { diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java b/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java index 5d662b9eb8..1fe49bdf9c 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java @@ -24,11 +24,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.google.common.base.Function; - import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; +import com.google.common.base.Function; + import org.apache.cassandra.stress.generate.PartitionGenerator; import org.apache.cassandra.stress.generate.SeedManager; import org.apache.cassandra.stress.report.Timer; diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/predefined/PredefinedOperation.java b/tools/stress/src/org/apache/cassandra/stress/operations/predefined/PredefinedOperation.java index 630ee3aca5..acb7460bb7 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/predefined/PredefinedOperation.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/predefined/PredefinedOperation.java @@ -24,7 +24,13 @@ import java.util.List; import java.util.concurrent.ThreadLocalRandom; import org.apache.cassandra.stress.Operation; -import org.apache.cassandra.stress.generate.*; +import org.apache.cassandra.stress.generate.Distribution; +import org.apache.cassandra.stress.generate.DistributionFactory; +import org.apache.cassandra.stress.generate.DistributionFixed; +import org.apache.cassandra.stress.generate.PartitionGenerator; +import org.apache.cassandra.stress.generate.RatioDistribution; +import org.apache.cassandra.stress.generate.Row; +import org.apache.cassandra.stress.generate.SeedManager; import org.apache.cassandra.stress.operations.PartitionOperation; import org.apache.cassandra.stress.report.Timer; import org.apache.cassandra.stress.settings.Command; diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/CASQuery.java b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/CASQuery.java index 1dc44cfc45..98f4945efa 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/CASQuery.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/CASQuery.java @@ -20,13 +20,25 @@ package org.apache.cassandra.stress.operations.userdefined; * */ +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.DataType; import com.datastax.driver.core.LocalDate; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; + import org.antlr.runtime.RecognitionException; + import org.apache.cassandra.cql3.CQLFragmentParser; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.CqlParser; @@ -42,17 +54,6 @@ import org.apache.cassandra.stress.report.Timer; import org.apache.cassandra.stress.settings.StressSettings; import org.apache.cassandra.stress.util.JavaDriverClient; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; - public class CASQuery extends SchemaStatement { private final ImmutableList keysIndex; diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaInsert.java b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaInsert.java index 258e688319..181cc867ec 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaInsert.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaInsert.java @@ -30,11 +30,18 @@ import com.datastax.driver.core.BatchStatement; import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Statement; + import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.io.sstable.StressCQLSSTableWriter; import org.apache.cassandra.stress.WorkManager; -import org.apache.cassandra.stress.generate.*; +import org.apache.cassandra.stress.generate.Distribution; +import org.apache.cassandra.stress.generate.DistributionFixed; +import org.apache.cassandra.stress.generate.PartitionGenerator; +import org.apache.cassandra.stress.generate.PartitionIterator; +import org.apache.cassandra.stress.generate.RatioDistribution; +import org.apache.cassandra.stress.generate.Row; +import org.apache.cassandra.stress.generate.SeedManager; import org.apache.cassandra.stress.report.Timer; import org.apache.cassandra.stress.settings.StressSettings; import org.apache.cassandra.stress.util.JavaDriverClient; diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaQuery.java b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaQuery.java index cba9ce427b..14696e6430 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaQuery.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaQuery.java @@ -28,8 +28,13 @@ import java.util.stream.Collectors; import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; + import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.stress.generate.*; +import org.apache.cassandra.stress.generate.DistributionFixed; +import org.apache.cassandra.stress.generate.PartitionGenerator; +import org.apache.cassandra.stress.generate.PartitionIterator; +import org.apache.cassandra.stress.generate.Row; +import org.apache.cassandra.stress.generate.SeedManager; import org.apache.cassandra.stress.report.Timer; import org.apache.cassandra.stress.settings.StressSettings; import org.apache.cassandra.stress.util.JavaDriverClient; diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java index 334e6c5784..c695e0a0d9 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java @@ -29,6 +29,7 @@ import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.DataType; import com.datastax.driver.core.LocalDate; import com.datastax.driver.core.PreparedStatement; + import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.stress.generate.Row; import org.apache.cassandra.stress.operations.PartitionOperation; diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/TokenRangeQuery.java b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/TokenRangeQuery.java index ac06793c4f..2bd643cb88 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/TokenRangeQuery.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/TokenRangeQuery.java @@ -33,7 +33,7 @@ import com.datastax.driver.core.Statement; import com.datastax.driver.core.TableMetadata; import com.datastax.driver.core.Token; import com.datastax.driver.core.TokenRange; -import io.netty.util.concurrent.FastThreadLocal; + import org.apache.cassandra.stress.Operation; import org.apache.cassandra.stress.StressYaml; import org.apache.cassandra.stress.WorkManager; @@ -42,6 +42,8 @@ import org.apache.cassandra.stress.report.Timer; import org.apache.cassandra.stress.settings.StressSettings; import org.apache.cassandra.stress.util.JavaDriverClient; +import io.netty.util.concurrent.FastThreadLocal; + public class TokenRangeQuery extends Operation { private final FastThreadLocal currentState = new FastThreadLocal<>(); diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java index e8a640fbc0..3448d2f824 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java @@ -27,10 +27,20 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.ThreadLocalRandom; -import com.datastax.driver.core.*; +import com.datastax.driver.core.BoundStatement; +import com.datastax.driver.core.ColumnDefinitions; +import com.datastax.driver.core.ColumnMetadata; +import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.TableMetadata; + import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.stress.generate.*; +import org.apache.cassandra.stress.generate.DistributionFixed; +import org.apache.cassandra.stress.generate.PartitionGenerator; +import org.apache.cassandra.stress.generate.PartitionIterator; import org.apache.cassandra.stress.generate.Row; +import org.apache.cassandra.stress.generate.Seed; +import org.apache.cassandra.stress.generate.SeedManager; import org.apache.cassandra.stress.operations.PartitionOperation; import org.apache.cassandra.stress.report.Timer; import org.apache.cassandra.stress.settings.StressSettings; diff --git a/tools/stress/src/org/apache/cassandra/stress/report/StressMetrics.java b/tools/stress/src/org/apache/cassandra/stress/report/StressMetrics.java index 2c54368b21..282683b056 100644 --- a/tools/stress/src/org/apache/cassandra/stress/report/StressMetrics.java +++ b/tools/stress/src/org/apache/cassandra/stress/report/StressMetrics.java @@ -39,10 +39,10 @@ import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; -import org.apache.commons.lang3.time.DurationFormatUtils; - import org.HdrHistogram.Histogram; import org.HdrHistogram.HistogramLogWriter; +import org.apache.commons.lang3.time.DurationFormatUtils; + import org.apache.cassandra.stress.StressAction.Consumer; import org.apache.cassandra.stress.StressAction.MeasurementSink; import org.apache.cassandra.stress.StressAction.OpMeasurement; diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/OptionAnyProbabilities.java b/tools/stress/src/org/apache/cassandra/stress/settings/OptionAnyProbabilities.java index 0d045c0008..9b14cc8884 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/OptionAnyProbabilities.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/OptionAnyProbabilities.java @@ -21,7 +21,11 @@ package org.apache.cassandra.stress.settings; */ -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; public final class OptionAnyProbabilities extends OptionMulti diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java b/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java index 040e9f2a1d..d1952c91e7 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java @@ -21,18 +21,30 @@ package org.apache.cassandra.stress.settings; */ -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import com.google.common.base.Function; + import org.apache.commons.math3.distribution.ExponentialDistribution; import org.apache.commons.math3.distribution.NormalDistribution; import org.apache.commons.math3.distribution.UniformRealDistribution; import org.apache.commons.math3.distribution.WeibullDistribution; import org.apache.commons.math3.random.JDKRandomGenerator; -import org.apache.cassandra.stress.generate.*; +import org.apache.cassandra.stress.generate.Distribution; +import org.apache.cassandra.stress.generate.DistributionBoundApache; +import org.apache.cassandra.stress.generate.DistributionFactory; +import org.apache.cassandra.stress.generate.DistributionFixed; +import org.apache.cassandra.stress.generate.DistributionInverted; +import org.apache.cassandra.stress.generate.DistributionOffsetApache; +import org.apache.cassandra.stress.generate.DistributionQuantized; +import org.apache.cassandra.stress.generate.DistributionSequence; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/OptionMulti.java b/tools/stress/src/org/apache/cassandra/stress/settings/OptionMulti.java index 1d7ae7224a..986f22610d 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/OptionMulti.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/OptionMulti.java @@ -21,7 +21,12 @@ package org.apache.cassandra.stress.settings; */ -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsColumn.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsColumn.java index 0ba2212f1b..aca7fa367a 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsColumn.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsColumn.java @@ -27,9 +27,18 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; -import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.TimeUUIDType; +import org.apache.cassandra.db.marshal.TypeParser; +import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.stress.generate.Distribution; import org.apache.cassandra.stress.generate.DistributionFactory; import org.apache.cassandra.stress.generate.DistributionFixed; diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java index 234cb415e1..818bfd9ab6 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java @@ -29,10 +29,10 @@ import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.Uninterruptibles; +import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.stress.operations.OpDistributionFactory; import org.apache.cassandra.stress.util.JavaDriverClient; import org.apache.cassandra.stress.util.ResultLogger; -import org.apache.cassandra.db.ConsistencyLevel; import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized; import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized; diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java index c2728291a5..e4fea917f1 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java @@ -21,7 +21,11 @@ package org.apache.cassandra.stress.settings; */ -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; import org.apache.cassandra.stress.Operation; import org.apache.cassandra.stress.generate.DistributionFactory; diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java index c96060c98e..1552e95b02 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java @@ -25,13 +25,12 @@ import java.io.File; import java.net.URI; import java.util.Arrays; import java.util.Collections; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; - import org.apache.cassandra.stress.Operation; import org.apache.cassandra.stress.StressProfile; import org.apache.cassandra.stress.generate.DistributionFactory; diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsInsert.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsInsert.java index 59edf77f29..369bf3b2e5 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsInsert.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsInsert.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map; import com.datastax.driver.core.BatchStatement; + import org.apache.cassandra.stress.generate.DistributionFactory; import org.apache.cassandra.stress.generate.RatioDistributionFactory; import org.apache.cassandra.stress.util.ResultLogger; diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsLog.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsLog.java index 338d2572e2..5d54f06c89 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsLog.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsLog.java @@ -21,7 +21,10 @@ package org.apache.cassandra.stress.settings; */ -import java.io.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.PrintStream; +import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsMode.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsMode.java index a8303ed64f..89c26a874e 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsMode.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsMode.java @@ -31,6 +31,7 @@ import com.datastax.driver.core.AuthProvider; import com.datastax.driver.core.PlainTextAuthProvider; import com.datastax.driver.core.ProtocolOptions; import com.datastax.driver.core.ProtocolVersion; + import org.apache.cassandra.stress.util.ResultLogger; import static java.lang.String.format; diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsNode.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsNode.java index 8a484c72a9..f3af490a6b 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsNode.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsNode.java @@ -21,17 +21,25 @@ package org.apache.cassandra.stress.settings; */ -import java.nio.file.Files; -import java.nio.file.Paths; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Serializable; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.UnknownHostException; -import java.util.*; - -import com.google.common.net.HostAndPort; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import com.datastax.driver.core.Host; +import com.google.common.net.HostAndPort; + import org.apache.cassandra.stress.util.ResultLogger; public class SettingsNode implements Serializable diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java index 0eaa41e8bc..a115c38c49 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java @@ -23,9 +23,12 @@ package org.apache.cassandra.stress.settings; import java.io.Serializable; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import com.datastax.driver.core.exceptions.AlreadyExistsException; + import org.apache.cassandra.stress.util.JavaDriverClient; import org.apache.cassandra.stress.util.ResultLogger; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/StressSettings.java b/tools/stress/src/org/apache/cassandra/stress/settings/StressSettings.java index f81c4a9787..36723a8a30 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/StressSettings.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/StressSettings.java @@ -22,7 +22,10 @@ package org.apache.cassandra.stress.settings; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.stress.util.JavaDriverClient; diff --git a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java index f2a92fe5aa..fefeb4aed8 100644 --- a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java +++ b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java @@ -24,23 +24,39 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; + import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; -import com.google.common.net.HostAndPort; - -import com.datastax.driver.core.*; +import com.datastax.driver.core.AuthProvider; +import com.datastax.driver.core.BoundStatement; +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.ConsistencyLevel; +import com.datastax.driver.core.Host; +import com.datastax.driver.core.HostDistance; +import com.datastax.driver.core.Metadata; +import com.datastax.driver.core.PoolingOptions; +import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.ProtocolOptions; +import com.datastax.driver.core.ProtocolVersion; +import com.datastax.driver.core.RemoteEndpointAwareJdkSSLOptions; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.policies.DCAwareRoundRobinPolicy; import com.datastax.driver.core.policies.LoadBalancingPolicy; import com.datastax.driver.core.policies.TokenAwarePolicy; import com.datastax.driver.core.policies.WhiteListPolicy; import com.datastax.shaded.netty.channel.socket.SocketChannel; -import io.netty.util.internal.logging.InternalLoggerFactory; -import io.netty.util.internal.logging.Slf4JLoggerFactory; +import com.google.common.net.HostAndPort; + import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.security.SSLFactory; import org.apache.cassandra.stress.settings.StressSettings; +import io.netty.util.internal.logging.InternalLoggerFactory; +import io.netty.util.internal.logging.Slf4JLoggerFactory; + import static org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions.ClientAuth.REQUIRED; public class JavaDriverClient diff --git a/tools/stress/test/unit/org/apache/cassandra/stress/generate/DistributionGaussianTest.java b/tools/stress/test/unit/org/apache/cassandra/stress/generate/DistributionGaussianTest.java index 7f262e9629..7f91110ad4 100644 --- a/tools/stress/test/unit/org/apache/cassandra/stress/generate/DistributionGaussianTest.java +++ b/tools/stress/test/unit/org/apache/cassandra/stress/generate/DistributionGaussianTest.java @@ -23,7 +23,8 @@ import org.junit.Test; import org.apache.cassandra.stress.settings.OptionDistribution; import static java.lang.Math.toIntExact; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class DistributionGaussianTest { diff --git a/tools/stress/test/unit/org/apache/cassandra/stress/generate/DistributionSequenceTest.java b/tools/stress/test/unit/org/apache/cassandra/stress/generate/DistributionSequenceTest.java index 591833c9d0..4c64c4e4f4 100644 --- a/tools/stress/test/unit/org/apache/cassandra/stress/generate/DistributionSequenceTest.java +++ b/tools/stress/test/unit/org/apache/cassandra/stress/generate/DistributionSequenceTest.java @@ -22,7 +22,8 @@ import org.junit.Test; import org.apache.cassandra.stress.settings.OptionDistribution; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class DistributionSequenceTest { diff --git a/tools/stress/test/unit/org/apache/cassandra/stress/settings/OptionReplicationTest.java b/tools/stress/test/unit/org/apache/cassandra/stress/settings/OptionReplicationTest.java index 803ee18706..4ab957cfa9 100644 --- a/tools/stress/test/unit/org/apache/cassandra/stress/settings/OptionReplicationTest.java +++ b/tools/stress/test/unit/org/apache/cassandra/stress/settings/OptionReplicationTest.java @@ -19,9 +19,10 @@ package org.apache.cassandra.stress.settings; import com.google.common.collect.ImmutableMap; + import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class OptionReplicationTest { diff --git a/tools/stress/test/unit/org/apache/cassandra/stress/settings/SettingsMiscTest.java b/tools/stress/test/unit/org/apache/cassandra/stress/settings/SettingsMiscTest.java index 78d98178fb..6dce9ffc6d 100644 --- a/tools/stress/test/unit/org/apache/cassandra/stress/settings/SettingsMiscTest.java +++ b/tools/stress/test/unit/org/apache/cassandra/stress/settings/SettingsMiscTest.java @@ -21,9 +21,12 @@ package org.apache.cassandra.stress.settings; import java.util.Collections; import com.google.common.collect.ImmutableMap; + import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class SettingsMiscTest { diff --git a/tools/stress/test/unit/org/apache/cassandra/stress/settings/SettingsNodeTest.java b/tools/stress/test/unit/org/apache/cassandra/stress/settings/SettingsNodeTest.java index ce56d27599..db3ea9391f 100644 --- a/tools/stress/test/unit/org/apache/cassandra/stress/settings/SettingsNodeTest.java +++ b/tools/stress/test/unit/org/apache/cassandra/stress/settings/SettingsNodeTest.java @@ -20,7 +20,7 @@ package org.apache.cassandra.stress.settings; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SettingsNodeTest { diff --git a/tools/stress/test/unit/org/apache/cassandra/stress/util/MultiResultLoggerTest.java b/tools/stress/test/unit/org/apache/cassandra/stress/util/MultiResultLoggerTest.java index 417251f9b4..25910d6037 100644 --- a/tools/stress/test/unit/org/apache/cassandra/stress/util/MultiResultLoggerTest.java +++ b/tools/stress/test/unit/org/apache/cassandra/stress/util/MultiResultLoggerTest.java @@ -26,7 +26,8 @@ import java.io.PrintStream; import org.apache.commons.io.output.ByteArrayOutputStream; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class MultiResultLoggerTest {