diff --git a/build.gradle b/build.gradle index 964c898ec76..7ea7aaae4b2 100644 --- a/build.gradle +++ b/build.gradle @@ -1043,7 +1043,7 @@ project(':core') { task genTopicConfigDocs(type: JavaExec) { classpath = sourceSets.main.runtimeClasspath - mainClass = 'org.apache.kafka.server.log.internals.LogConfig' + mainClass = 'org.apache.kafka.storage.internals.log.LogConfig' if( !generatedDocsDir.exists() ) { generatedDocsDir.mkdirs() } standardOutput = new File(generatedDocsDir, "topic_config.html").newOutputStream() } diff --git a/checkstyle/import-control-jmh-benchmarks.xml b/checkstyle/import-control-jmh-benchmarks.xml index 1f58dbd8ee7..d6e966498d8 100644 --- a/checkstyle/import-control-jmh-benchmarks.xml +++ b/checkstyle/import-control-jmh-benchmarks.xml @@ -48,6 +48,7 @@ + diff --git a/core/src/main/java/kafka/server/builders/LogManagerBuilder.java b/core/src/main/java/kafka/server/builders/LogManagerBuilder.java index c5c3cdb53e2..cc7c254ce08 100644 --- a/core/src/main/java/kafka/server/builders/LogManagerBuilder.java +++ b/core/src/main/java/kafka/server/builders/LogManagerBuilder.java @@ -23,9 +23,9 @@ import kafka.server.BrokerTopicStats; import kafka.server.metadata.ConfigRepository; import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.server.log.internals.CleanerConfig; -import org.apache.kafka.server.log.internals.LogConfig; -import org.apache.kafka.server.log.internals.LogDirFailureChannel; +import org.apache.kafka.storage.internals.log.CleanerConfig; +import org.apache.kafka.storage.internals.log.LogConfig; +import org.apache.kafka.storage.internals.log.LogDirFailureChannel; import org.apache.kafka.server.util.Scheduler; import scala.collection.JavaConverters; diff --git a/core/src/main/java/kafka/server/builders/ReplicaManagerBuilder.java b/core/src/main/java/kafka/server/builders/ReplicaManagerBuilder.java index 785a44c2f56..2921818e59d 100644 --- a/core/src/main/java/kafka/server/builders/ReplicaManagerBuilder.java +++ b/core/src/main/java/kafka/server/builders/ReplicaManagerBuilder.java @@ -33,7 +33,7 @@ import kafka.server.ReplicaManager; import kafka.zk.KafkaZkClient; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.server.log.internals.LogDirFailureChannel; +import org.apache.kafka.storage.internals.log.LogDirFailureChannel; import org.apache.kafka.server.util.Scheduler; import scala.compat.java8.OptionConverters; diff --git a/core/src/main/scala/kafka/admin/ConfigCommand.scala b/core/src/main/scala/kafka/admin/ConfigCommand.scala index 5d915f5e97f..0bd4e308223 100644 --- a/core/src/main/scala/kafka/admin/ConfigCommand.scala +++ b/core/src/main/scala/kafka/admin/ConfigCommand.scala @@ -36,8 +36,8 @@ import org.apache.kafka.common.quota.{ClientQuotaAlteration, ClientQuotaEntity, import org.apache.kafka.common.security.JaasUtils import org.apache.kafka.common.security.scram.internals.{ScramCredentialUtils, ScramFormatter, ScramMechanism} import org.apache.kafka.common.utils.{Sanitizer, Time, Utils} -import org.apache.kafka.server.log.internals.LogConfig import org.apache.kafka.server.util.{CommandDefaultOptions, CommandLineUtils} +import org.apache.kafka.storage.internals.log.LogConfig import org.apache.zookeeper.client.ZKClientConfig import scala.annotation.nowarn diff --git a/core/src/main/scala/kafka/admin/ReassignPartitionsCommand.scala b/core/src/main/scala/kafka/admin/ReassignPartitionsCommand.scala index 24c2fafb813..d1b75c483eb 100755 --- a/core/src/main/scala/kafka/admin/ReassignPartitionsCommand.scala +++ b/core/src/main/scala/kafka/admin/ReassignPartitionsCommand.scala @@ -30,8 +30,8 @@ import org.apache.kafka.common.config.ConfigResource import org.apache.kafka.common.errors.{ReplicaNotAvailableException, UnknownTopicOrPartitionException} import org.apache.kafka.common.utils.{Time, Utils} import org.apache.kafka.common.{KafkaException, KafkaFuture, TopicPartition, TopicPartitionReplica} -import org.apache.kafka.server.log.internals.LogConfig import org.apache.kafka.server.util.{CommandDefaultOptions, CommandLineUtils} +import org.apache.kafka.storage.internals.log.LogConfig import scala.jdk.CollectionConverters._ import scala.collection.{Map, Seq, mutable} diff --git a/core/src/main/scala/kafka/admin/TopicCommand.scala b/core/src/main/scala/kafka/admin/TopicCommand.scala index 3d91b6256b4..28b1f63de52 100755 --- a/core/src/main/scala/kafka/admin/TopicCommand.scala +++ b/core/src/main/scala/kafka/admin/TopicCommand.scala @@ -33,8 +33,8 @@ import org.apache.kafka.common.config.{ConfigResource, TopicConfig} import org.apache.kafka.common.errors.{ClusterAuthorizationException, TopicExistsException, UnsupportedVersionException} import org.apache.kafka.common.internals.Topic import org.apache.kafka.common.utils.Utils -import org.apache.kafka.server.log.internals.LogConfig import org.apache.kafka.server.util.{CommandDefaultOptions, CommandLineUtils} +import org.apache.kafka.storage.internals.log.LogConfig import scala.annotation.nowarn import scala.jdk.CollectionConverters._ diff --git a/core/src/main/scala/kafka/cluster/Partition.scala b/core/src/main/scala/kafka/cluster/Partition.scala index 271c86ad758..f27c0f9dc23 100755 --- a/core/src/main/scala/kafka/cluster/Partition.scala +++ b/core/src/main/scala/kafka/cluster/Partition.scala @@ -44,7 +44,7 @@ import org.apache.kafka.common.utils.Time import org.apache.kafka.common.{IsolationLevel, TopicPartition, Uuid} import org.apache.kafka.metadata.LeaderRecoveryState import org.apache.kafka.server.common.MetadataVersion -import org.apache.kafka.server.log.internals.{AppendOrigin, FetchDataInfo, FetchIsolation, FetchParams, LogOffsetMetadata} +import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchDataInfo, FetchIsolation, FetchParams, LogOffsetMetadata} import scala.collection.{Map, Seq} import scala.jdk.CollectionConverters._ diff --git a/core/src/main/scala/kafka/cluster/Replica.scala b/core/src/main/scala/kafka/cluster/Replica.scala index 7a60632a54b..fcc7ce683fe 100644 --- a/core/src/main/scala/kafka/cluster/Replica.scala +++ b/core/src/main/scala/kafka/cluster/Replica.scala @@ -20,7 +20,7 @@ package kafka.cluster import kafka.log.UnifiedLog import kafka.utils.Logging import org.apache.kafka.common.TopicPartition -import org.apache.kafka.server.log.internals.LogOffsetMetadata +import org.apache.kafka.storage.internals.log.LogOffsetMetadata import java.util.concurrent.atomic.AtomicReference diff --git a/core/src/main/scala/kafka/coordinator/group/GroupMetadataManager.scala b/core/src/main/scala/kafka/coordinator/group/GroupMetadataManager.scala index 4cee61b990a..3e0317fbd9f 100644 --- a/core/src/main/scala/kafka/coordinator/group/GroupMetadataManager.scala +++ b/core/src/main/scala/kafka/coordinator/group/GroupMetadataManager.scala @@ -46,8 +46,8 @@ import org.apache.kafka.common.{KafkaException, MessageFormatter, TopicPartition import org.apache.kafka.coordinator.group.generated.{GroupMetadataValue, OffsetCommitKey, OffsetCommitValue, GroupMetadataKey => GroupMetadataKeyData} import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.server.common.MetadataVersion.{IBP_0_10_1_IV0, IBP_2_1_IV0, IBP_2_1_IV1, IBP_2_3_IV0} -import org.apache.kafka.server.log.internals.{AppendOrigin, FetchIsolation} import org.apache.kafka.server.util.KafkaScheduler +import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchIsolation} import scala.collection._ import scala.collection.mutable.ArrayBuffer diff --git a/core/src/main/scala/kafka/coordinator/transaction/TransactionStateManager.scala b/core/src/main/scala/kafka/coordinator/transaction/TransactionStateManager.scala index e2388e9c885..f561559fa63 100644 --- a/core/src/main/scala/kafka/coordinator/transaction/TransactionStateManager.scala +++ b/core/src/main/scala/kafka/coordinator/transaction/TransactionStateManager.scala @@ -36,9 +36,9 @@ import org.apache.kafka.common.requests.ProduceResponse.PartitionResponse import org.apache.kafka.common.requests.TransactionResult import org.apache.kafka.common.utils.{Time, Utils} import org.apache.kafka.common.{KafkaException, TopicPartition} -import org.apache.kafka.server.log.internals.{AppendOrigin, FetchIsolation} import org.apache.kafka.server.record.BrokerCompressionType import org.apache.kafka.server.util.Scheduler +import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchIsolation} import scala.jdk.CollectionConverters._ import scala.collection.mutable diff --git a/core/src/main/scala/kafka/log/LocalLog.scala b/core/src/main/scala/kafka/log/LocalLog.scala index 1214d64afc1..5b5f309295a 100644 --- a/core/src/main/scala/kafka/log/LocalLog.scala +++ b/core/src/main/scala/kafka/log/LocalLog.scala @@ -29,9 +29,9 @@ import org.apache.kafka.common.errors.{KafkaStorageException, OffsetOutOfRangeEx import org.apache.kafka.common.message.FetchResponseData import org.apache.kafka.common.record.MemoryRecords import org.apache.kafka.common.utils.{Time, Utils} -import org.apache.kafka.server.log.internals.LogFileUtils.offsetFromFileName -import org.apache.kafka.server.log.internals.{AbortedTxn, FetchDataInfo, LogConfig, LogDirFailureChannel, LogOffsetMetadata, OffsetPosition} +import org.apache.kafka.storage.internals.log.LogFileUtils.offsetFromFileName import org.apache.kafka.server.util.Scheduler +import org.apache.kafka.storage.internals.log.{AbortedTxn, FetchDataInfo, LogConfig, LogDirFailureChannel, LogOffsetMetadata, OffsetPosition} import java.util.{Collections, Optional} import scala.jdk.CollectionConverters._ diff --git a/core/src/main/scala/kafka/log/LogCleaner.scala b/core/src/main/scala/kafka/log/LogCleaner.scala index 5a098790a31..187b03fec64 100644 --- a/core/src/main/scala/kafka/log/LogCleaner.scala +++ b/core/src/main/scala/kafka/log/LogCleaner.scala @@ -32,7 +32,7 @@ import org.apache.kafka.common.record.MemoryRecords.RecordFilter import org.apache.kafka.common.record.MemoryRecords.RecordFilter.BatchRetention import org.apache.kafka.common.record._ import org.apache.kafka.common.utils.{BufferSupplier, Time} -import org.apache.kafka.server.log.internals.{AbortedTxn, CleanerConfig, LastRecord, LogDirFailureChannel, OffsetMap, SkimpyOffsetMap, TransactionIndex} +import org.apache.kafka.storage.internals.log.{AbortedTxn, CleanerConfig, LastRecord, LogDirFailureChannel, OffsetMap, SkimpyOffsetMap, TransactionIndex} import scala.jdk.CollectionConverters._ import scala.collection.mutable.ListBuffer diff --git a/core/src/main/scala/kafka/log/LogCleanerManager.scala b/core/src/main/scala/kafka/log/LogCleanerManager.scala index 14f55cc0518..db2738ba6d6 100755 --- a/core/src/main/scala/kafka/log/LogCleanerManager.scala +++ b/core/src/main/scala/kafka/log/LogCleanerManager.scala @@ -29,7 +29,7 @@ import kafka.utils.{Logging, Pool} import org.apache.kafka.common.{KafkaException, TopicPartition} import org.apache.kafka.common.errors.KafkaStorageException import org.apache.kafka.common.utils.Time -import org.apache.kafka.server.log.internals.LogDirFailureChannel +import org.apache.kafka.storage.internals.log.LogDirFailureChannel import scala.collection.{Iterable, Seq, mutable} diff --git a/core/src/main/scala/kafka/log/LogLoader.scala b/core/src/main/scala/kafka/log/LogLoader.scala index 81dfdc44547..a16ad04d133 100644 --- a/core/src/main/scala/kafka/log/LogLoader.scala +++ b/core/src/main/scala/kafka/log/LogLoader.scala @@ -26,9 +26,9 @@ import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.errors.InvalidOffsetException import org.apache.kafka.common.utils.{Time, Utils} import org.apache.kafka.snapshot.Snapshots -import org.apache.kafka.server.log.internals.{CorruptIndexException, LoadedLogOffsets, LogConfig, LogDirFailureChannel, LogOffsetMetadata} import org.apache.kafka.server.util.Scheduler import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache +import org.apache.kafka.storage.internals.log.{CorruptIndexException, LoadedLogOffsets, LogConfig, LogDirFailureChannel, LogOffsetMetadata} import java.util.concurrent.{ConcurrentHashMap, ConcurrentMap} import scala.collection.{Set, mutable} diff --git a/core/src/main/scala/kafka/log/LogManager.scala b/core/src/main/scala/kafka/log/LogManager.scala index a9e9ec0254a..f3aaeabee89 100755 --- a/core/src/main/scala/kafka/log/LogManager.scala +++ b/core/src/main/scala/kafka/log/LogManager.scala @@ -41,9 +41,9 @@ import org.apache.kafka.common.config.TopicConfig import java.util.Properties import org.apache.kafka.server.common.MetadataVersion -import org.apache.kafka.server.log.internals.{CleanerConfig, LogConfig, LogDirFailureChannel} -import org.apache.kafka.server.log.internals.LogConfig.MessageFormatVersion +import org.apache.kafka.storage.internals.log.LogConfig.MessageFormatVersion import org.apache.kafka.server.util.Scheduler +import org.apache.kafka.storage.internals.log.{CleanerConfig, LogConfig, LogDirFailureChannel} import scala.annotation.nowarn diff --git a/core/src/main/scala/kafka/log/LogSegment.scala b/core/src/main/scala/kafka/log/LogSegment.scala index f38a3ac353a..a9abc5466c1 100644 --- a/core/src/main/scala/kafka/log/LogSegment.scala +++ b/core/src/main/scala/kafka/log/LogSegment.scala @@ -26,8 +26,8 @@ import org.apache.kafka.common.errors.CorruptRecordException import org.apache.kafka.common.record.FileRecords.{LogOffsetPosition, TimestampAndOffset} import org.apache.kafka.common.record._ import org.apache.kafka.common.utils.{BufferSupplier, Time, Utils} -import org.apache.kafka.server.log.internals.{AbortedTxn, AppendOrigin, CompletedTxn, LazyIndex, LogConfig, LogOffsetMetadata, OffsetIndex, OffsetPosition, TimeIndex, TimestampOffset, TransactionIndex, TxnIndexSearchResult, FetchDataInfo} import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache +import org.apache.kafka.storage.internals.log.{AbortedTxn, AppendOrigin, CompletedTxn, FetchDataInfo, LazyIndex, LogConfig, LogOffsetMetadata, OffsetIndex, OffsetPosition, TimeIndex, TimestampOffset, TransactionIndex, TxnIndexSearchResult} import java.io.{File, IOException} import java.nio.file.attribute.FileTime diff --git a/core/src/main/scala/kafka/log/ProducerStateManager.scala b/core/src/main/scala/kafka/log/ProducerStateManager.scala index 2dc7748152d..6a79f0e7166 100644 --- a/core/src/main/scala/kafka/log/ProducerStateManager.scala +++ b/core/src/main/scala/kafka/log/ProducerStateManager.scala @@ -23,7 +23,7 @@ import org.apache.kafka.common.config.ConfigException import org.apache.kafka.common.protocol.types._ import org.apache.kafka.common.record.RecordBatch import org.apache.kafka.common.utils.{ByteUtils, Crc32C, Time} -import org.apache.kafka.server.log.internals._ +import org.apache.kafka.storage.internals.log.{AppendOrigin, BatchMetadata, CompletedTxn, CorruptSnapshotException, LogOffsetMetadata, ProducerAppendInfo, ProducerStateEntry, SnapshotFile, TxnMetadata} import java.io.File import java.nio.ByteBuffer diff --git a/core/src/main/scala/kafka/log/UnifiedLog.scala b/core/src/main/scala/kafka/log/UnifiedLog.scala index fcd59fa2c9d..95329cd0795 100644 --- a/core/src/main/scala/kafka/log/UnifiedLog.scala +++ b/core/src/main/scala/kafka/log/UnifiedLog.scala @@ -40,12 +40,12 @@ import org.apache.kafka.common.utils.{PrimitiveRef, Time, Utils} import org.apache.kafka.common.{InvalidRecordException, KafkaException, TopicPartition, Uuid} import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.server.common.MetadataVersion.IBP_0_10_0_IV0 -import org.apache.kafka.server.log.internals.{AbortedTxn, AppendOrigin, BatchMetadata, CompletedTxn, EpochEntry, FetchDataInfo, FetchIsolation, LastRecord, LogConfig, LogDirFailureChannel, LogOffsetMetadata, LogValidator, ProducerAppendInfo} import org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig import org.apache.kafka.server.record.BrokerCompressionType import org.apache.kafka.server.util.Scheduler import org.apache.kafka.storage.internals.checkpoint.LeaderEpochCheckpointFile import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache +import org.apache.kafka.storage.internals.log.{AbortedTxn, AppendOrigin, BatchMetadata, CompletedTxn, EpochEntry, FetchDataInfo, FetchIsolation, LastRecord, LogConfig, LogDirFailureChannel, LogOffsetMetadata, LogValidator, ProducerAppendInfo} import scala.annotation.nowarn import scala.collection.mutable.ListBuffer diff --git a/core/src/main/scala/kafka/log/remote/RemoteIndexCache.scala b/core/src/main/scala/kafka/log/remote/RemoteIndexCache.scala index 320fd1d2c4c..9e8bddec9a1 100644 --- a/core/src/main/scala/kafka/log/remote/RemoteIndexCache.scala +++ b/core/src/main/scala/kafka/log/remote/RemoteIndexCache.scala @@ -22,9 +22,9 @@ import kafka.utils.{CoreUtils, Logging, ShutdownableThread} import org.apache.kafka.common.Uuid import org.apache.kafka.common.errors.CorruptRecordException import org.apache.kafka.common.utils.Utils -import org.apache.kafka.server.log.internals.{LazyIndex, OffsetIndex, OffsetPosition, TimeIndex, TransactionIndex} import org.apache.kafka.server.log.remote.storage.RemoteStorageManager.IndexType import org.apache.kafka.server.log.remote.storage.{RemoteLogSegmentMetadata, RemoteStorageManager} +import org.apache.kafka.storage.internals.log.{LazyIndex, OffsetIndex, OffsetPosition, TimeIndex, TransactionIndex} import java.io.{Closeable, File, InputStream} import java.nio.file.{Files, Path} diff --git a/core/src/main/scala/kafka/raft/KafkaMetadataLog.scala b/core/src/main/scala/kafka/raft/KafkaMetadataLog.scala index 6c58755bba4..81ace2489a9 100644 --- a/core/src/main/scala/kafka/raft/KafkaMetadataLog.scala +++ b/core/src/main/scala/kafka/raft/KafkaMetadataLog.scala @@ -26,9 +26,10 @@ import org.apache.kafka.common.record.{ControlRecordUtils, MemoryRecords, Record import org.apache.kafka.common.utils.{BufferSupplier, Time} import org.apache.kafka.common.{KafkaException, TopicPartition, Uuid} import org.apache.kafka.raft.{Isolation, KafkaRaftClient, LogAppendInfo, LogFetchInfo, LogOffsetMetadata, OffsetAndEpoch, OffsetMetadata, ReplicatedLog, ValidOffsetAndEpoch} -import org.apache.kafka.server.log.internals.{AppendOrigin, FetchIsolation, LogConfig, LogDirFailureChannel} import org.apache.kafka.server.util.Scheduler import org.apache.kafka.snapshot.{FileRawSnapshotReader, FileRawSnapshotWriter, RawSnapshotReader, RawSnapshotWriter, SnapshotPath, Snapshots} +import org.apache.kafka.storage.internals +import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchIsolation, LogConfig, LogDirFailureChannel} import java.io.File import java.nio.file.{Files, NoSuchFileException, Path} @@ -191,7 +192,7 @@ final class KafkaMetadataLog private ( override def updateHighWatermark(offsetMetadata: LogOffsetMetadata): Unit = { offsetMetadata.metadata.asScala match { case Some(segmentPosition: SegmentPosition) => log.updateHighWatermark( - new org.apache.kafka.server.log.internals.LogOffsetMetadata( + new internals.log.LogOffsetMetadata( offsetMetadata.offset, segmentPosition.baseOffset, segmentPosition.relativePosition) diff --git a/core/src/main/scala/kafka/server/BrokerServer.scala b/core/src/main/scala/kafka/server/BrokerServer.scala index 37649bf93c4..76023d51538 100644 --- a/core/src/main/scala/kafka/server/BrokerServer.scala +++ b/core/src/main/scala/kafka/server/BrokerServer.scala @@ -44,11 +44,11 @@ import org.apache.kafka.raft import org.apache.kafka.raft.{RaftClient, RaftConfig} import org.apache.kafka.server.authorizer.Authorizer import org.apache.kafka.server.common.ApiMessageAndVersion -import org.apache.kafka.server.log.internals.LogDirFailureChannel import org.apache.kafka.server.log.remote.storage.RemoteLogManagerConfig import org.apache.kafka.server.metrics.KafkaYammerMetrics import org.apache.kafka.server.util.{Deadline, FutureUtils, KafkaScheduler} import org.apache.kafka.snapshot.SnapshotWriter +import org.apache.kafka.storage.internals.log.LogDirFailureChannel import java.net.InetAddress import java.util diff --git a/core/src/main/scala/kafka/server/ConfigHandler.scala b/core/src/main/scala/kafka/server/ConfigHandler.scala index f43a6c17853..60de2c5d04f 100644 --- a/core/src/main/scala/kafka/server/ConfigHandler.scala +++ b/core/src/main/scala/kafka/server/ConfigHandler.scala @@ -33,8 +33,8 @@ import org.apache.kafka.common.config.internals.QuotaConfigs import org.apache.kafka.common.metrics.Quota import org.apache.kafka.common.metrics.Quota._ import org.apache.kafka.common.utils.Sanitizer -import org.apache.kafka.server.log.internals.{LogConfig, ThrottledReplicaListValidator} -import org.apache.kafka.server.log.internals.LogConfig.MessageFormatVersion +import org.apache.kafka.storage.internals.log.{LogConfig, ThrottledReplicaListValidator} +import org.apache.kafka.storage.internals.log.LogConfig.MessageFormatVersion import scala.annotation.nowarn import scala.jdk.CollectionConverters._ diff --git a/core/src/main/scala/kafka/server/ConfigHelper.scala b/core/src/main/scala/kafka/server/ConfigHelper.scala index 721b82b375e..5a9616f75f2 100644 --- a/core/src/main/scala/kafka/server/ConfigHelper.scala +++ b/core/src/main/scala/kafka/server/ConfigHelper.scala @@ -29,7 +29,7 @@ import org.apache.kafka.common.protocol.Errors import org.apache.kafka.common.requests.{ApiError, DescribeConfigsResponse} import org.apache.kafka.common.requests.DescribeConfigsResponse.ConfigSource import org.apache.kafka.server.config.ServerTopicConfigSynonyms -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import scala.collection.{Map, mutable} import scala.compat.java8.OptionConverters._ diff --git a/core/src/main/scala/kafka/server/ControllerConfigurationValidator.scala b/core/src/main/scala/kafka/server/ControllerConfigurationValidator.scala index dec95ca359d..d567596b81f 100644 --- a/core/src/main/scala/kafka/server/ControllerConfigurationValidator.scala +++ b/core/src/main/scala/kafka/server/ControllerConfigurationValidator.scala @@ -24,7 +24,7 @@ import org.apache.kafka.common.config.ConfigResource.Type.{BROKER, TOPIC} import org.apache.kafka.controller.ConfigurationValidator import org.apache.kafka.common.errors.{InvalidConfigurationException, InvalidRequestException} import org.apache.kafka.common.internals.Topic -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import scala.collection.mutable diff --git a/core/src/main/scala/kafka/server/DelayedFetch.scala b/core/src/main/scala/kafka/server/DelayedFetch.scala index 2a89881ef6e..9106cff910c 100644 --- a/core/src/main/scala/kafka/server/DelayedFetch.scala +++ b/core/src/main/scala/kafka/server/DelayedFetch.scala @@ -24,7 +24,7 @@ import org.apache.kafka.common.errors._ import org.apache.kafka.common.protocol.Errors import org.apache.kafka.common.requests.FetchRequest.PartitionData import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse.{UNDEFINED_EPOCH, UNDEFINED_EPOCH_OFFSET} -import org.apache.kafka.server.log.internals.{FetchIsolation, FetchParams, FetchPartitionData, LogOffsetMetadata} +import org.apache.kafka.storage.internals.log.{FetchIsolation, FetchParams, FetchPartitionData, LogOffsetMetadata} import scala.collection._ diff --git a/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala b/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala index a0efb0649ba..e43754e72fc 100755 --- a/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala +++ b/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala @@ -36,7 +36,7 @@ import org.apache.kafka.common.network.{ListenerName, ListenerReconfigurable} import org.apache.kafka.common.security.authenticator.LoginManager import org.apache.kafka.common.utils.{ConfigUtils, Utils} import org.apache.kafka.server.config.ServerTopicConfigSynonyms -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import scala.annotation.nowarn import scala.collection._ diff --git a/core/src/main/scala/kafka/server/DynamicConfig.scala b/core/src/main/scala/kafka/server/DynamicConfig.scala index 08e25dd9ada..e1ab5ffb586 100644 --- a/core/src/main/scala/kafka/server/DynamicConfig.scala +++ b/core/src/main/scala/kafka/server/DynamicConfig.scala @@ -23,7 +23,7 @@ import org.apache.kafka.common.config.ConfigDef import org.apache.kafka.common.config.ConfigDef.Importance._ import org.apache.kafka.common.config.ConfigDef.Range._ import org.apache.kafka.common.config.ConfigDef.Type._ -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import scala.jdk.CollectionConverters._ diff --git a/core/src/main/scala/kafka/server/KafkaApis.scala b/core/src/main/scala/kafka/server/KafkaApis.scala index 8666b28513b..f2e86da4aa9 100644 --- a/core/src/main/scala/kafka/server/KafkaApis.scala +++ b/core/src/main/scala/kafka/server/KafkaApis.scala @@ -68,8 +68,8 @@ import org.apache.kafka.coordinator.group.GroupCoordinator import org.apache.kafka.server.authorizer._ import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.server.common.MetadataVersion.{IBP_0_11_0_IV0, IBP_2_3_IV0} -import org.apache.kafka.server.log.internals.{AppendOrigin, FetchIsolation, FetchParams, FetchPartitionData} import org.apache.kafka.server.record.BrokerCompressionType +import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchIsolation, FetchParams, FetchPartitionData} import java.lang.{Long => JLong} import java.nio.ByteBuffer diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala index fd776e54327..7725af31d20 100755 --- a/core/src/main/scala/kafka/server/KafkaConfig.scala +++ b/core/src/main/scala/kafka/server/KafkaConfig.scala @@ -47,10 +47,10 @@ import org.apache.kafka.server.authorizer.Authorizer import org.apache.kafka.server.common.{MetadataVersion, MetadataVersionValidator} import org.apache.kafka.server.common.MetadataVersion._ import org.apache.kafka.server.config.ServerTopicConfigSynonyms -import org.apache.kafka.server.log.internals.LogConfig -import org.apache.kafka.server.log.internals.LogConfig.MessageFormatVersion +import org.apache.kafka.storage.internals.log.LogConfig.MessageFormatVersion import org.apache.kafka.server.log.remote.storage.RemoteLogManagerConfig import org.apache.kafka.server.record.BrokerCompressionType +import org.apache.kafka.storage.internals.log.LogConfig import org.apache.zookeeper.client.ZKClientConfig import scala.annotation.nowarn diff --git a/core/src/main/scala/kafka/server/KafkaRaftServer.scala b/core/src/main/scala/kafka/server/KafkaRaftServer.scala index b10f48ba774..d11fbe99aa6 100644 --- a/core/src/main/scala/kafka/server/KafkaRaftServer.scala +++ b/core/src/main/scala/kafka/server/KafkaRaftServer.scala @@ -31,8 +31,8 @@ import org.apache.kafka.metadata.KafkaConfigSchema import org.apache.kafka.metadata.bootstrap.{BootstrapDirectory, BootstrapMetadata} import org.apache.kafka.raft.RaftConfig import org.apache.kafka.server.config.ServerTopicConfigSynonyms -import org.apache.kafka.server.log.internals.LogConfig import org.apache.kafka.server.metrics.KafkaYammerMetrics +import org.apache.kafka.storage.internals.log.LogConfig import java.util.Optional import scala.collection.Seq diff --git a/core/src/main/scala/kafka/server/KafkaServer.scala b/core/src/main/scala/kafka/server/KafkaServer.scala index 099add604cb..d2512c7a108 100755 --- a/core/src/main/scala/kafka/server/KafkaServer.scala +++ b/core/src/main/scala/kafka/server/KafkaServer.scala @@ -57,9 +57,9 @@ import org.apache.kafka.server.common.{ApiMessageAndVersion, MetadataVersion} import org.apache.kafka.server.common.MetadataVersion._ import org.apache.kafka.server.fault.ProcessExitingFaultHandler import org.apache.kafka.server.metrics.KafkaYammerMetrics -import org.apache.kafka.server.log.internals.LogDirFailureChannel import org.apache.kafka.server.log.remote.storage.RemoteLogManagerConfig import org.apache.kafka.server.util.KafkaScheduler +import org.apache.kafka.storage.internals.log.LogDirFailureChannel import org.apache.zookeeper.client.ZKClientConfig import scala.collection.{Map, Seq} diff --git a/core/src/main/scala/kafka/server/LocalLeaderEndPoint.scala b/core/src/main/scala/kafka/server/LocalLeaderEndPoint.scala index dd6fffd2a81..011a9c41e3f 100644 --- a/core/src/main/scala/kafka/server/LocalLeaderEndPoint.scala +++ b/core/src/main/scala/kafka/server/LocalLeaderEndPoint.scala @@ -28,7 +28,7 @@ import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse.UNDEFINED_EPOCH import org.apache.kafka.common.requests.{FetchRequest, FetchResponse, RequestUtils} import org.apache.kafka.common.{TopicIdPartition, TopicPartition, Uuid} -import org.apache.kafka.server.log.internals.{FetchIsolation, FetchParams, FetchPartitionData} +import org.apache.kafka.storage.internals.log.{FetchIsolation, FetchParams, FetchPartitionData} import java.util import java.util.Optional diff --git a/core/src/main/scala/kafka/server/PartitionMetadataFile.scala b/core/src/main/scala/kafka/server/PartitionMetadataFile.scala index d0d4552ade5..154edf2bf88 100644 --- a/core/src/main/scala/kafka/server/PartitionMetadataFile.scala +++ b/core/src/main/scala/kafka/server/PartitionMetadataFile.scala @@ -26,7 +26,7 @@ import kafka.utils.Logging import org.apache.kafka.common.Uuid import org.apache.kafka.common.errors.{InconsistentTopicIdException, KafkaStorageException} import org.apache.kafka.common.utils.Utils -import org.apache.kafka.server.log.internals.LogDirFailureChannel +import org.apache.kafka.storage.internals.log.LogDirFailureChannel object PartitionMetadataFile { diff --git a/core/src/main/scala/kafka/server/ReplicaFetcherThread.scala b/core/src/main/scala/kafka/server/ReplicaFetcherThread.scala index 852ab6bce8b..f68be09f8f8 100644 --- a/core/src/main/scala/kafka/server/ReplicaFetcherThread.scala +++ b/core/src/main/scala/kafka/server/ReplicaFetcherThread.scala @@ -27,9 +27,9 @@ import org.apache.kafka.common.utils.Utils import org.apache.kafka.common.{KafkaException, TopicPartition} import org.apache.kafka.server.common.CheckpointFile.CheckpointReadBuffer import org.apache.kafka.server.common.MetadataVersion -import org.apache.kafka.server.log.internals.EpochEntry import org.apache.kafka.server.log.remote.storage.{RemoteLogSegmentMetadata, RemoteStorageException, RemoteStorageManager} import org.apache.kafka.storage.internals.checkpoint.LeaderEpochCheckpointFile +import org.apache.kafka.storage.internals.log.EpochEntry import java.io.{BufferedReader, File, InputStreamReader} import java.nio.charset.StandardCharsets diff --git a/core/src/main/scala/kafka/server/ReplicaManager.scala b/core/src/main/scala/kafka/server/ReplicaManager.scala index 12f55a47a1d..d85410abb65 100644 --- a/core/src/main/scala/kafka/server/ReplicaManager.scala +++ b/core/src/main/scala/kafka/server/ReplicaManager.scala @@ -61,8 +61,8 @@ import org.apache.kafka.common.utils.Time import org.apache.kafka.image.{LocalReplicaChanges, MetadataImage, TopicsDelta} import org.apache.kafka.metadata.LeaderConstants.NO_LEADER import org.apache.kafka.server.common.MetadataVersion._ -import org.apache.kafka.server.log.internals.{AppendOrigin, FetchDataInfo, FetchParams, FetchPartitionData, LogConfig, LogDirFailureChannel, LogOffsetMetadata, RecordValidationException} import org.apache.kafka.server.util.Scheduler +import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchDataInfo, FetchParams, FetchPartitionData, LogConfig, LogDirFailureChannel, LogOffsetMetadata, RecordValidationException} import java.nio.file.{Files, Paths} import java.util diff --git a/core/src/main/scala/kafka/server/ZkAdminManager.scala b/core/src/main/scala/kafka/server/ZkAdminManager.scala index b669fd556f1..77e42b21dd6 100644 --- a/core/src/main/scala/kafka/server/ZkAdminManager.scala +++ b/core/src/main/scala/kafka/server/ZkAdminManager.scala @@ -48,7 +48,7 @@ import org.apache.kafka.common.requests.CreateTopicsRequest._ import org.apache.kafka.common.requests.{AlterConfigsRequest, ApiError} import org.apache.kafka.common.security.scram.internals.{ScramCredentialUtils, ScramFormatter} import org.apache.kafka.common.utils.Sanitizer -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import scala.collection.{Map, mutable, _} import scala.jdk.CollectionConverters._ diff --git a/core/src/main/scala/kafka/server/checkpoints/OffsetCheckpointFile.scala b/core/src/main/scala/kafka/server/checkpoints/OffsetCheckpointFile.scala index c2a784b3a8a..084e46c5ef2 100644 --- a/core/src/main/scala/kafka/server/checkpoints/OffsetCheckpointFile.scala +++ b/core/src/main/scala/kafka/server/checkpoints/OffsetCheckpointFile.scala @@ -18,8 +18,8 @@ package kafka.server.checkpoints import org.apache.kafka.common.TopicPartition import org.apache.kafka.server.common.CheckpointFile.EntryFormatter -import org.apache.kafka.server.log.internals.{EpochEntry, LogDirFailureChannel} import org.apache.kafka.storage.internals.checkpoint.CheckpointFileWithFailureHandler +import org.apache.kafka.storage.internals.log.{EpochEntry, LogDirFailureChannel} import java.io._ import java.util.Optional diff --git a/core/src/main/scala/kafka/tools/DumpLogSegments.scala b/core/src/main/scala/kafka/tools/DumpLogSegments.scala index 09d66cb2197..9319b72dc9e 100755 --- a/core/src/main/scala/kafka/tools/DumpLogSegments.scala +++ b/core/src/main/scala/kafka/tools/DumpLogSegments.scala @@ -32,9 +32,9 @@ import org.apache.kafka.common.record._ import org.apache.kafka.common.utils.Utils import org.apache.kafka.metadata.MetadataRecordSerde import org.apache.kafka.metadata.bootstrap.BootstrapDirectory -import org.apache.kafka.server.log.internals.{CorruptSnapshotException, OffsetIndex, TimeIndex, TransactionIndex} import org.apache.kafka.snapshot.Snapshots import org.apache.kafka.server.util.{CommandDefaultOptions, CommandLineUtils} +import org.apache.kafka.storage.internals.log.{CorruptSnapshotException, OffsetIndex, TimeIndex, TransactionIndex} import scala.jdk.CollectionConverters._ import scala.collection.mutable diff --git a/core/src/main/scala/kafka/zk/AdminZkClient.scala b/core/src/main/scala/kafka/zk/AdminZkClient.scala index 0f60e3030ec..c735d53eba9 100644 --- a/core/src/main/scala/kafka/zk/AdminZkClient.scala +++ b/core/src/main/scala/kafka/zk/AdminZkClient.scala @@ -26,7 +26,7 @@ import kafka.utils.Implicits._ import org.apache.kafka.common.{TopicPartition, Uuid} import org.apache.kafka.common.errors._ import org.apache.kafka.common.internals.Topic -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import org.apache.zookeeper.KeeperException.NodeExistsException import scala.collection.{Map, Seq} diff --git a/core/src/main/scala/kafka/zk/KafkaZkClient.scala b/core/src/main/scala/kafka/zk/KafkaZkClient.scala index c4d075211a1..f4fbaa116c8 100644 --- a/core/src/main/scala/kafka/zk/KafkaZkClient.scala +++ b/core/src/main/scala/kafka/zk/KafkaZkClient.scala @@ -35,7 +35,7 @@ import org.apache.kafka.common.security.token.delegation.{DelegationToken, Token import org.apache.kafka.common.utils.{Time, Utils} import org.apache.kafka.common.{KafkaException, TopicPartition, Uuid} import org.apache.kafka.metadata.migration.ZkMigrationLeadershipState -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import org.apache.zookeeper.KeeperException.{Code, NodeExistsException} import org.apache.zookeeper.OpResult.{CheckResult, CreateResult, ErrorResult, SetDataResult} import org.apache.zookeeper.client.ZKClientConfig diff --git a/core/src/test/scala/integration/kafka/api/AdminClientWithPoliciesIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/AdminClientWithPoliciesIntegrationTest.scala index d3da511da68..b3236abd989 100644 --- a/core/src/test/scala/integration/kafka/api/AdminClientWithPoliciesIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/AdminClientWithPoliciesIntegrationTest.scala @@ -24,8 +24,8 @@ import org.apache.kafka.clients.admin.{Admin, AdminClientConfig, AlterConfigOp, import org.apache.kafka.common.config.{ConfigResource, TopicConfig} import org.apache.kafka.common.errors.{InvalidConfigurationException, InvalidRequestException, PolicyViolationException} import org.apache.kafka.common.utils.Utils -import org.apache.kafka.server.log.internals.LogConfig import org.apache.kafka.server.policy.AlterConfigPolicy +import org.apache.kafka.storage.internals.log.LogConfig import org.junit.jupiter.api.Assertions.{assertEquals, assertNull, assertTrue} import org.junit.jupiter.api.{AfterEach, BeforeEach, TestInfo, Timeout} import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala index 5ec51421055..f95ca473d4f 100644 --- a/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala @@ -44,7 +44,7 @@ import org.apache.kafka.common.resource.{PatternType, ResourcePattern, ResourceT import org.apache.kafka.common.utils.{Time, Utils} import org.apache.kafka.common.{ConsumerGroupState, ElectionType, TopicCollection, TopicPartition, TopicPartitionInfo, TopicPartitionReplica, Uuid} import org.apache.kafka.controller.ControllerRequestContextUtil.ANONYMOUS_CONTEXT -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Disabled, TestInfo} import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/integration/kafka/api/PlaintextProducerSendTest.scala b/core/src/test/scala/integration/kafka/api/PlaintextProducerSendTest.scala index c6caf48c366..6ebb51faeeb 100644 --- a/core/src/test/scala/integration/kafka/api/PlaintextProducerSendTest.scala +++ b/core/src/test/scala/integration/kafka/api/PlaintextProducerSendTest.scala @@ -25,7 +25,7 @@ import org.apache.kafka.common.config.TopicConfig import org.apache.kafka.common.errors.{InvalidTimestampException, RecordTooLargeException, SerializationException, TimeoutException} import org.apache.kafka.common.record.{DefaultRecord, DefaultRecordBatch, Records, TimestampType} import org.apache.kafka.common.serialization.ByteArraySerializer -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.Timeout import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala index e4b61f3afc5..80a35849d78 100644 --- a/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala @@ -30,7 +30,7 @@ import org.apache.kafka.common.resource.ResourceType.{GROUP, TOPIC} import org.apache.kafka.common.resource.{PatternType, Resource, ResourcePattern, ResourcePatternFilter, ResourceType} import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol} import org.apache.kafka.server.authorizer.Authorizer -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test, TestInfo} diff --git a/core/src/test/scala/integration/kafka/server/DelayedFetchTest.scala b/core/src/test/scala/integration/kafka/server/DelayedFetchTest.scala index 1e5e1e5b284..d5256b4f8a9 100644 --- a/core/src/test/scala/integration/kafka/server/DelayedFetchTest.scala +++ b/core/src/test/scala/integration/kafka/server/DelayedFetchTest.scala @@ -26,7 +26,7 @@ import org.apache.kafka.common.message.OffsetForLeaderEpochResponseData.EpochEnd import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.common.record.MemoryRecords import org.apache.kafka.common.requests.FetchRequest -import org.apache.kafka.server.log.internals.{FetchDataInfo, FetchIsolation, FetchParams, FetchPartitionData, LogOffsetMetadata} +import org.apache.kafka.storage.internals.log.{FetchDataInfo, FetchIsolation, FetchParams, FetchPartitionData, LogOffsetMetadata} import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions._ import org.mockito.ArgumentMatchers.{any, anyInt} diff --git a/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala b/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala index ba35694f782..32abee4a466 100644 --- a/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala +++ b/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala @@ -59,9 +59,9 @@ import org.apache.kafka.common.requests.MetadataRequest import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.security.scram.ScramCredential import org.apache.kafka.common.serialization.{StringDeserializer, StringSerializer} -import org.apache.kafka.server.log.internals.{CleanerConfig, LogConfig} import org.apache.kafka.server.metrics.KafkaYammerMetrics import org.apache.kafka.server.record.BrokerCompressionType +import org.apache.kafka.storage.internals.log.{CleanerConfig, LogConfig} import org.apache.kafka.test.{TestSslUtils, TestUtils => JTestUtils} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Disabled, Test, TestInfo} diff --git a/core/src/test/scala/kafka/raft/KafkaMetadataLogTest.scala b/core/src/test/scala/kafka/raft/KafkaMetadataLogTest.scala index 7b7a173373c..bc84277b7da 100644 --- a/core/src/test/scala/kafka/raft/KafkaMetadataLogTest.scala +++ b/core/src/test/scala/kafka/raft/KafkaMetadataLogTest.scala @@ -28,8 +28,8 @@ import org.apache.kafka.common.utils.Utils import org.apache.kafka.raft.internals.BatchBuilder import org.apache.kafka.raft._ import org.apache.kafka.server.common.serialization.RecordSerde -import org.apache.kafka.server.log.internals.LogConfig import org.apache.kafka.snapshot.{FileRawSnapshotWriter, RawSnapshotReader, RawSnapshotWriter, SnapshotPath, Snapshots} +import org.apache.kafka.storage.internals.log.LogConfig import org.apache.kafka.test.TestUtils.assertOptional import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} diff --git a/core/src/test/scala/kafka/server/LocalLeaderEndPointTest.scala b/core/src/test/scala/kafka/server/LocalLeaderEndPointTest.scala index b40d50ca352..c1f01911a71 100644 --- a/core/src/test/scala/kafka/server/LocalLeaderEndPointTest.scala +++ b/core/src/test/scala/kafka/server/LocalLeaderEndPointTest.scala @@ -27,8 +27,8 @@ import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.common.record.{CompressionType, MemoryRecords, SimpleRecord} import org.apache.kafka.common.requests.LeaderAndIsrRequest import org.apache.kafka.common.requests.ProduceResponse.PartitionResponse -import org.apache.kafka.server.log.internals.{AppendOrigin, LogDirFailureChannel} import org.apache.kafka.server.util.MockScheduler +import org.apache.kafka.storage.internals.log.{AppendOrigin, LogDirFailureChannel} import org.junit.jupiter.api.{BeforeEach, Test} import org.junit.jupiter.api.Assertions._ import org.mockito.Mockito.mock diff --git a/core/src/test/scala/other/kafka/StressTestLog.scala b/core/src/test/scala/other/kafka/StressTestLog.scala index c0ca8f26777..139276f8c86 100755 --- a/core/src/test/scala/other/kafka/StressTestLog.scala +++ b/core/src/test/scala/other/kafka/StressTestLog.scala @@ -26,7 +26,7 @@ import org.apache.kafka.clients.consumer.OffsetOutOfRangeException import org.apache.kafka.common.config.TopicConfig import org.apache.kafka.common.record.FileRecords import org.apache.kafka.common.utils.Utils -import org.apache.kafka.server.log.internals.{FetchIsolation, LogConfig, LogDirFailureChannel} +import org.apache.kafka.storage.internals.log.{FetchIsolation, LogConfig, LogDirFailureChannel} /** * A stress test that instantiates a log and then runs continual appends against it from one thread and continual reads against it diff --git a/core/src/test/scala/other/kafka/TestLinearWriteSpeed.scala b/core/src/test/scala/other/kafka/TestLinearWriteSpeed.scala index 7cc7d5254e4..b7b2375af23 100755 --- a/core/src/test/scala/other/kafka/TestLinearWriteSpeed.scala +++ b/core/src/test/scala/other/kafka/TestLinearWriteSpeed.scala @@ -29,9 +29,9 @@ import kafka.utils._ import org.apache.kafka.common.config.TopicConfig import org.apache.kafka.common.record._ import org.apache.kafka.common.utils.{Time, Utils} -import org.apache.kafka.server.log.internals.{LogConfig, LogDirFailureChannel} import org.apache.kafka.server.util.{KafkaScheduler, Scheduler} import org.apache.kafka.server.util.CommandLineUtils +import org.apache.kafka.storage.internals.log.{LogConfig, LogDirFailureChannel} import scala.math._ diff --git a/core/src/test/scala/unit/kafka/admin/ReplicationQuotaUtils.scala b/core/src/test/scala/unit/kafka/admin/ReplicationQuotaUtils.scala index a0f28f90718..20c71d7e640 100644 --- a/core/src/test/scala/unit/kafka/admin/ReplicationQuotaUtils.scala +++ b/core/src/test/scala/unit/kafka/admin/ReplicationQuotaUtils.scala @@ -15,7 +15,7 @@ package kafka.admin import kafka.server.{ConfigType, DynamicConfig, KafkaServer} import kafka.utils.TestUtils import kafka.zk.AdminZkClient -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import scala.collection.Seq diff --git a/core/src/test/scala/unit/kafka/cluster/AbstractPartitionTest.scala b/core/src/test/scala/unit/kafka/cluster/AbstractPartitionTest.scala index d72dafadb3a..6d12cb3cf4e 100644 --- a/core/src/test/scala/unit/kafka/cluster/AbstractPartitionTest.scala +++ b/core/src/test/scala/unit/kafka/cluster/AbstractPartitionTest.scala @@ -34,7 +34,7 @@ import org.mockito.Mockito.{mock, when} import java.io.File import java.util.Properties import org.apache.kafka.server.common.MetadataVersion -import org.apache.kafka.server.log.internals.{CleanerConfig, LogConfig} +import org.apache.kafka.storage.internals.log.{CleanerConfig, LogConfig} import scala.jdk.CollectionConverters._ diff --git a/core/src/test/scala/unit/kafka/cluster/PartitionLockTest.scala b/core/src/test/scala/unit/kafka/cluster/PartitionLockTest.scala index 6c6bc3c713a..895a3d3a0c3 100644 --- a/core/src/test/scala/unit/kafka/cluster/PartitionLockTest.scala +++ b/core/src/test/scala/unit/kafka/cluster/PartitionLockTest.scala @@ -35,8 +35,8 @@ import org.apache.kafka.common.requests.FetchRequest import org.apache.kafka.common.utils.Utils import org.apache.kafka.common.{TopicPartition, Uuid} import org.apache.kafka.server.common.MetadataVersion -import org.apache.kafka.server.log.internals.{AppendOrigin, CleanerConfig, FetchIsolation, FetchParams, LogConfig, LogDirFailureChannel} import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache +import org.apache.kafka.storage.internals.log.{AppendOrigin, CleanerConfig, FetchIsolation, FetchParams, LogConfig, LogDirFailureChannel} import org.junit.jupiter.api.Assertions.{assertEquals, assertFalse, assertTrue} import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} import org.mockito.ArgumentMatchers diff --git a/core/src/test/scala/unit/kafka/cluster/PartitionTest.scala b/core/src/test/scala/unit/kafka/cluster/PartitionTest.scala index 078bc8f943d..18d9022db48 100644 --- a/core/src/test/scala/unit/kafka/cluster/PartitionTest.scala +++ b/core/src/test/scala/unit/kafka/cluster/PartitionTest.scala @@ -52,10 +52,10 @@ import org.apache.kafka.common.replica.ClientMetadata.DefaultClientMetadata import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol} import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.server.common.MetadataVersion.IBP_2_6_IV0 -import org.apache.kafka.server.log.internals.{AppendOrigin, CleanerConfig, EpochEntry, FetchIsolation, FetchParams, LogDirFailureChannel} import org.apache.kafka.server.metrics.KafkaYammerMetrics import org.apache.kafka.server.util.KafkaScheduler import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache +import org.apache.kafka.storage.internals.log.{AppendOrigin, CleanerConfig, EpochEntry, FetchIsolation, FetchParams, LogDirFailureChannel} import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.ValueSource diff --git a/core/src/test/scala/unit/kafka/cluster/ReplicaTest.scala b/core/src/test/scala/unit/kafka/cluster/ReplicaTest.scala index 7a24c77c59f..1e89504c877 100644 --- a/core/src/test/scala/unit/kafka/cluster/ReplicaTest.scala +++ b/core/src/test/scala/unit/kafka/cluster/ReplicaTest.scala @@ -19,7 +19,7 @@ package kafka.cluster import kafka.log.UnifiedLog import kafka.utils.MockTime import org.apache.kafka.common.TopicPartition -import org.apache.kafka.server.log.internals.LogOffsetMetadata +import org.apache.kafka.storage.internals.log.LogOffsetMetadata import org.junit.jupiter.api.Assertions.{assertEquals, assertFalse, assertTrue} import org.junit.jupiter.api.{BeforeEach, Test} diff --git a/core/src/test/scala/unit/kafka/controller/PartitionStateMachineTest.scala b/core/src/test/scala/unit/kafka/controller/PartitionStateMachineTest.scala index d94511b65b4..10cbe589045 100644 --- a/core/src/test/scala/unit/kafka/controller/PartitionStateMachineTest.scala +++ b/core/src/test/scala/unit/kafka/controller/PartitionStateMachineTest.scala @@ -24,7 +24,7 @@ import kafka.zk.{KafkaZkClient, TopicPartitionStateZNode} import kafka.zookeeper._ import org.apache.kafka.common.TopicPartition import org.apache.kafka.server.common.MetadataVersion.{IBP_3_1_IV0, IBP_3_2_IV0} -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import org.apache.zookeeper.KeeperException.Code import org.apache.zookeeper.data.Stat import org.junit.jupiter.api.Assertions._ diff --git a/core/src/test/scala/unit/kafka/coordinator/AbstractCoordinatorConcurrencyTest.scala b/core/src/test/scala/unit/kafka/coordinator/AbstractCoordinatorConcurrencyTest.scala index 63c531fc9c1..6d159f18a5a 100644 --- a/core/src/test/scala/unit/kafka/coordinator/AbstractCoordinatorConcurrencyTest.scala +++ b/core/src/test/scala/unit/kafka/coordinator/AbstractCoordinatorConcurrencyTest.scala @@ -31,8 +31,8 @@ import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.protocol.Errors import org.apache.kafka.common.record.{MemoryRecords, RecordBatch, RecordConversionStats} import org.apache.kafka.common.requests.ProduceResponse.PartitionResponse -import org.apache.kafka.server.log.internals.{AppendOrigin, LogConfig} import org.apache.kafka.server.util.MockScheduler +import org.apache.kafka.storage.internals.log.{AppendOrigin, LogConfig} import org.junit.jupiter.api.{AfterEach, BeforeEach} import org.mockito.Mockito.{CALLS_REAL_METHODS, mock, withSettings} diff --git a/core/src/test/scala/unit/kafka/coordinator/group/GroupCoordinatorTest.scala b/core/src/test/scala/unit/kafka/coordinator/group/GroupCoordinatorTest.scala index 6dd77d256a9..5a9ff6ae6ea 100644 --- a/core/src/test/scala/unit/kafka/coordinator/group/GroupCoordinatorTest.scala +++ b/core/src/test/scala/unit/kafka/coordinator/group/GroupCoordinatorTest.scala @@ -37,8 +37,8 @@ import org.apache.kafka.clients.consumer.internals.ConsumerProtocol import org.apache.kafka.common.internals.Topic import org.apache.kafka.common.metrics.Metrics import org.apache.kafka.common.message.LeaveGroupRequestData.MemberIdentity -import org.apache.kafka.server.log.internals.AppendOrigin import org.apache.kafka.server.util.KafkaScheduler +import org.apache.kafka.storage.internals.log.AppendOrigin import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/unit/kafka/coordinator/group/GroupMetadataManagerTest.scala b/core/src/test/scala/unit/kafka/coordinator/group/GroupMetadataManagerTest.scala index b4e2e519679..61a2d14f62a 100644 --- a/core/src/test/scala/unit/kafka/coordinator/group/GroupMetadataManagerTest.scala +++ b/core/src/test/scala/unit/kafka/coordinator/group/GroupMetadataManagerTest.scala @@ -42,9 +42,9 @@ import org.apache.kafka.common.requests.ProduceResponse.PartitionResponse import org.apache.kafka.common.utils.Utils import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.server.common.MetadataVersion._ -import org.apache.kafka.server.log.internals.{AppendOrigin, FetchDataInfo, FetchIsolation, LogOffsetMetadata} import org.apache.kafka.server.metrics.KafkaYammerMetrics import org.apache.kafka.server.util.KafkaScheduler +import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchDataInfo, FetchIsolation, LogOffsetMetadata} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} import org.mockito.{ArgumentCaptor, ArgumentMatchers} diff --git a/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorConcurrencyTest.scala b/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorConcurrencyTest.scala index 02852d6b943..501355d862b 100644 --- a/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorConcurrencyTest.scala +++ b/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorConcurrencyTest.scala @@ -34,7 +34,7 @@ import org.apache.kafka.common.record.{CompressionType, FileRecords, MemoryRecor import org.apache.kafka.common.requests._ import org.apache.kafka.common.utils.{LogContext, MockTime, ProducerIdAndEpoch} import org.apache.kafka.common.{Node, TopicPartition} -import org.apache.kafka.server.log.internals.{FetchDataInfo, FetchIsolation, LogConfig, LogOffsetMetadata} +import org.apache.kafka.storage.internals.log.{FetchDataInfo, FetchIsolation, LogConfig, LogOffsetMetadata} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} import org.mockito.{ArgumentCaptor, ArgumentMatchers} diff --git a/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionStateManagerTest.scala b/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionStateManagerTest.scala index a15d51e555a..21f27feb2a1 100644 --- a/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionStateManagerTest.scala +++ b/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionStateManagerTest.scala @@ -33,8 +33,8 @@ import org.apache.kafka.common.record._ import org.apache.kafka.common.requests.ProduceResponse.PartitionResponse import org.apache.kafka.common.requests.TransactionResult import org.apache.kafka.common.utils.MockTime -import org.apache.kafka.server.log.internals.{AppendOrigin, FetchDataInfo, FetchIsolation, LogConfig, LogOffsetMetadata} import org.apache.kafka.server.util.MockScheduler +import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchDataInfo, FetchIsolation, LogConfig, LogOffsetMetadata} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} import org.mockito.{ArgumentCaptor, ArgumentMatchers} diff --git a/core/src/test/scala/unit/kafka/log/AbstractLogCleanerIntegrationTest.scala b/core/src/test/scala/unit/kafka/log/AbstractLogCleanerIntegrationTest.scala index 8290c0fa0db..187388d308c 100644 --- a/core/src/test/scala/unit/kafka/log/AbstractLogCleanerIntegrationTest.scala +++ b/core/src/test/scala/unit/kafka/log/AbstractLogCleanerIntegrationTest.scala @@ -26,7 +26,7 @@ import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.config.TopicConfig import org.apache.kafka.common.record.{CompressionType, MemoryRecords, RecordBatch} import org.apache.kafka.common.utils.Utils -import org.apache.kafka.server.log.internals.{CleanerConfig, LogConfig, LogDirFailureChannel} +import org.apache.kafka.storage.internals.log.{CleanerConfig, LogConfig, LogDirFailureChannel} import org.junit.jupiter.api.{AfterEach, Tag} import scala.collection.Seq diff --git a/core/src/test/scala/unit/kafka/log/BrokerCompressionTest.scala b/core/src/test/scala/unit/kafka/log/BrokerCompressionTest.scala index 148d2b3560b..84a5d1260dc 100755 --- a/core/src/test/scala/unit/kafka/log/BrokerCompressionTest.scala +++ b/core/src/test/scala/unit/kafka/log/BrokerCompressionTest.scala @@ -22,8 +22,8 @@ import kafka.utils._ import org.apache.kafka.common.config.TopicConfig import org.apache.kafka.common.record.{CompressionType, MemoryRecords, RecordBatch, SimpleRecord} import org.apache.kafka.common.utils.Utils -import org.apache.kafka.server.log.internals.{FetchIsolation, LogConfig, LogDirFailureChannel} import org.apache.kafka.server.record.BrokerCompressionType +import org.apache.kafka.storage.internals.log.{FetchIsolation, LogConfig, LogDirFailureChannel} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api._ import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/unit/kafka/log/LocalLogTest.scala b/core/src/test/scala/unit/kafka/log/LocalLogTest.scala index d9e0bafea27..b3d13e423c1 100644 --- a/core/src/test/scala/unit/kafka/log/LocalLogTest.scala +++ b/core/src/test/scala/unit/kafka/log/LocalLogTest.scala @@ -28,9 +28,9 @@ import org.apache.kafka.common.{KafkaException, TopicPartition} import org.apache.kafka.common.errors.KafkaStorageException import org.apache.kafka.common.record.{CompressionType, MemoryRecords, Record, SimpleRecord} import org.apache.kafka.common.utils.{Time, Utils} -import org.apache.kafka.server.log.internals.{FetchDataInfo, LogConfig, LogDirFailureChannel, LogOffsetMetadata} import org.apache.kafka.server.util.Scheduler -import org.junit.jupiter.api.Assertions.{assertFalse, _} +import org.apache.kafka.storage.internals.log.{FetchDataInfo, LogConfig, LogDirFailureChannel, LogOffsetMetadata} +import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} import scala.jdk.CollectionConverters._ diff --git a/core/src/test/scala/unit/kafka/log/LogCleanerManagerTest.scala b/core/src/test/scala/unit/kafka/log/LogCleanerManagerTest.scala index fabf40aa87f..df2c0af7c9c 100644 --- a/core/src/test/scala/unit/kafka/log/LogCleanerManagerTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogCleanerManagerTest.scala @@ -26,7 +26,7 @@ import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.config.TopicConfig import org.apache.kafka.common.record._ import org.apache.kafka.common.utils.Utils -import org.apache.kafka.server.log.internals.{AppendOrigin, LogConfig, LogDirFailureChannel} +import org.apache.kafka.storage.internals.log.{AppendOrigin, LogConfig, LogDirFailureChannel} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, Test} diff --git a/core/src/test/scala/unit/kafka/log/LogCleanerParameterizedIntegrationTest.scala b/core/src/test/scala/unit/kafka/log/LogCleanerParameterizedIntegrationTest.scala index f4ae0ad4bee..eb67cd1758b 100755 --- a/core/src/test/scala/unit/kafka/log/LogCleanerParameterizedIntegrationTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogCleanerParameterizedIntegrationTest.scala @@ -26,7 +26,7 @@ import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.config.TopicConfig import org.apache.kafka.common.record._ import org.apache.kafka.server.common.MetadataVersion.{IBP_0_10_0_IV1, IBP_0_11_0_IV0, IBP_0_9_0} -import org.apache.kafka.server.log.internals.{CleanerConfig, LogConfig} +import org.apache.kafka.storage.internals.log.{CleanerConfig, LogConfig} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/unit/kafka/log/LogCleanerTest.scala b/core/src/test/scala/unit/kafka/log/LogCleanerTest.scala index 54b0f131ffc..d31d82d1775 100644 --- a/core/src/test/scala/unit/kafka/log/LogCleanerTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogCleanerTest.scala @@ -31,7 +31,7 @@ import org.apache.kafka.common.config.TopicConfig import org.apache.kafka.common.errors.CorruptRecordException import org.apache.kafka.common.record._ import org.apache.kafka.common.utils.Utils -import org.apache.kafka.server.log.internals.{AbortedTxn, AppendOrigin, CleanerConfig, LogConfig, LogDirFailureChannel, OffsetMap} +import org.apache.kafka.storage.internals.log.{AbortedTxn, AppendOrigin, CleanerConfig, LogConfig, LogDirFailureChannel, OffsetMap} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, Test} diff --git a/core/src/test/scala/unit/kafka/log/LogConcurrencyTest.scala b/core/src/test/scala/unit/kafka/log/LogConcurrencyTest.scala index a6961324f45..326bd4fe6ea 100644 --- a/core/src/test/scala/unit/kafka/log/LogConcurrencyTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogConcurrencyTest.scala @@ -24,8 +24,8 @@ import kafka.utils.TestUtils import org.apache.kafka.common.config.TopicConfig import org.apache.kafka.common.record.SimpleRecord import org.apache.kafka.common.utils.{Time, Utils} -import org.apache.kafka.server.log.internals.{FetchIsolation, LogConfig, LogDirFailureChannel} import org.apache.kafka.server.util.KafkaScheduler +import org.apache.kafka.storage.internals.log.{FetchIsolation, LogConfig, LogDirFailureChannel} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} diff --git a/core/src/test/scala/unit/kafka/log/LogConfigTest.scala b/core/src/test/scala/unit/kafka/log/LogConfigTest.scala index 5389b7cf26f..a6c1ac88d8d 100644 --- a/core/src/test/scala/unit/kafka/log/LogConfigTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogConfigTest.scala @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test import java.util.{Collections, Properties} import org.apache.kafka.server.common.MetadataVersion.IBP_3_0_IV1 -import org.apache.kafka.server.log.internals.{LogConfig, ThrottledReplicaListValidator} +import org.apache.kafka.storage.internals.log.{LogConfig, ThrottledReplicaListValidator} import scala.annotation.nowarn import scala.jdk.CollectionConverters._ diff --git a/core/src/test/scala/unit/kafka/log/LogLoaderTest.scala b/core/src/test/scala/unit/kafka/log/LogLoaderTest.scala index 3c49edfde16..76b3eebcae3 100644 --- a/core/src/test/scala/unit/kafka/log/LogLoaderTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogLoaderTest.scala @@ -31,9 +31,9 @@ import org.apache.kafka.common.record.{CompressionType, ControlRecordType, Defau import org.apache.kafka.common.utils.{Time, Utils} import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.server.common.MetadataVersion.IBP_0_11_0_IV0 -import org.apache.kafka.server.log.internals.{AbortedTxn, CleanerConfig, EpochEntry, FetchDataInfo, LogConfig, LogDirFailureChannel, OffsetIndex, SnapshotFile} import org.apache.kafka.server.util.Scheduler import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache +import org.apache.kafka.storage.internals.log.{AbortedTxn, CleanerConfig, EpochEntry, FetchDataInfo, LogConfig, LogDirFailureChannel, OffsetIndex, SnapshotFile} import org.junit.jupiter.api.Assertions.{assertDoesNotThrow, assertEquals, assertFalse, assertNotEquals, assertThrows, assertTrue} import org.junit.jupiter.api.function.Executable import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} diff --git a/core/src/test/scala/unit/kafka/log/LogManagerTest.scala b/core/src/test/scala/unit/kafka/log/LogManagerTest.scala index 22ebbfc81dd..592228fd25f 100755 --- a/core/src/test/scala/unit/kafka/log/LogManagerTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogManagerTest.scala @@ -38,8 +38,8 @@ import java.io._ import java.nio.file.Files import java.util.concurrent.{ConcurrentHashMap, ConcurrentMap, Future} import java.util.{Collections, Properties} -import org.apache.kafka.server.log.internals.{FetchDataInfo, FetchIsolation, LogConfig, LogDirFailureChannel} import org.apache.kafka.server.metrics.KafkaYammerMetrics +import org.apache.kafka.storage.internals.log.{FetchDataInfo, FetchIsolation, LogConfig, LogDirFailureChannel} import scala.collection.{Map, mutable} import scala.collection.mutable.ArrayBuffer diff --git a/core/src/test/scala/unit/kafka/log/LogSegmentTest.scala b/core/src/test/scala/unit/kafka/log/LogSegmentTest.scala index bad5e280b8e..585df56c744 100644 --- a/core/src/test/scala/unit/kafka/log/LogSegmentTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogSegmentTest.scala @@ -24,9 +24,9 @@ import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.config.TopicConfig import org.apache.kafka.common.record._ import org.apache.kafka.common.utils.{MockTime, Time, Utils} -import org.apache.kafka.server.log.internals.{BatchMetadata, EpochEntry, LogConfig, ProducerStateEntry} import org.apache.kafka.storage.internals.checkpoint.LeaderEpochCheckpoint import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache +import org.apache.kafka.storage.internals.log.{BatchMetadata, EpochEntry, LogConfig, ProducerStateEntry} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} diff --git a/core/src/test/scala/unit/kafka/log/LogTestUtils.scala b/core/src/test/scala/unit/kafka/log/LogTestUtils.scala index bd9c8d7ca53..7f2867d28df 100644 --- a/core/src/test/scala/unit/kafka/log/LogTestUtils.scala +++ b/core/src/test/scala/unit/kafka/log/LogTestUtils.scala @@ -26,7 +26,6 @@ import kafka.utils.TestUtils import org.apache.kafka.common.Uuid import org.apache.kafka.common.record.{CompressionType, ControlRecordType, EndTransactionMarker, FileRecords, MemoryRecords, RecordBatch, SimpleRecord} import org.apache.kafka.common.utils.{Time, Utils} -import org.apache.kafka.server.log.internals.{AbortedTxn, AppendOrigin, FetchDataInfo, FetchIsolation, LazyIndex, LogConfig, LogDirFailureChannel, TransactionIndex} import org.junit.jupiter.api.Assertions.{assertEquals, assertFalse} import java.nio.file.Files @@ -35,6 +34,7 @@ import kafka.log import org.apache.kafka.common.config.TopicConfig import org.apache.kafka.server.util.Scheduler import org.apache.kafka.storage.internals.checkpoint.LeaderEpochCheckpointFile +import org.apache.kafka.storage.internals.log.{AbortedTxn, AppendOrigin, FetchDataInfo, FetchIsolation, LazyIndex, LogConfig, LogDirFailureChannel, TransactionIndex} import scala.jdk.CollectionConverters._ diff --git a/core/src/test/scala/unit/kafka/log/LogValidatorTest.scala b/core/src/test/scala/unit/kafka/log/LogValidatorTest.scala index aa5843b7c03..daea156c3a7 100644 --- a/core/src/test/scala/unit/kafka/log/LogValidatorTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogValidatorTest.scala @@ -26,9 +26,9 @@ import org.apache.kafka.common.record._ import org.apache.kafka.common.utils.{PrimitiveRef, Time} import org.apache.kafka.common.{InvalidRecordException, TopicPartition} import org.apache.kafka.server.common.MetadataVersion -import org.apache.kafka.server.log.internals.LogValidator.ValidationResult -import org.apache.kafka.server.log.internals.{AppendOrigin, LogValidator, RecordValidationException} +import org.apache.kafka.storage.internals.log.LogValidator.ValidationResult import org.apache.kafka.server.metrics.KafkaYammerMetrics +import org.apache.kafka.storage.internals.log.{AppendOrigin, LogValidator, RecordValidationException} import org.apache.kafka.test.TestUtils import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.Test diff --git a/core/src/test/scala/unit/kafka/log/OffsetIndexTest.scala b/core/src/test/scala/unit/kafka/log/OffsetIndexTest.scala index 238894f890d..40b6195cc46 100644 --- a/core/src/test/scala/unit/kafka/log/OffsetIndexTest.scala +++ b/core/src/test/scala/unit/kafka/log/OffsetIndexTest.scala @@ -28,7 +28,7 @@ import scala.collection._ import scala.util.Random import kafka.utils.TestUtils import org.apache.kafka.common.errors.InvalidOffsetException -import org.apache.kafka.server.log.internals.{OffsetIndex, OffsetPosition} +import org.apache.kafka.storage.internals.log.{OffsetIndex, OffsetPosition} import scala.annotation.nowarn diff --git a/core/src/test/scala/unit/kafka/log/OffsetMapTest.scala b/core/src/test/scala/unit/kafka/log/OffsetMapTest.scala index 8f3885920da..f9275a3e785 100644 --- a/core/src/test/scala/unit/kafka/log/OffsetMapTest.scala +++ b/core/src/test/scala/unit/kafka/log/OffsetMapTest.scala @@ -19,7 +19,7 @@ package kafka.log import java.nio._ import kafka.utils.Exit -import org.apache.kafka.server.log.internals.SkimpyOffsetMap +import org.apache.kafka.storage.internals.log.SkimpyOffsetMap import org.junit.jupiter.api._ import org.junit.jupiter.api.Assertions._ diff --git a/core/src/test/scala/unit/kafka/log/ProducerStateManagerTest.scala b/core/src/test/scala/unit/kafka/log/ProducerStateManagerTest.scala index 903d51f94f2..458303ae925 100644 --- a/core/src/test/scala/unit/kafka/log/ProducerStateManagerTest.scala +++ b/core/src/test/scala/unit/kafka/log/ProducerStateManagerTest.scala @@ -29,7 +29,7 @@ import org.apache.kafka.common.errors._ import org.apache.kafka.common.internals.Topic import org.apache.kafka.common.record._ import org.apache.kafka.common.utils.{MockTime, Utils} -import org.apache.kafka.server.log.internals.{AppendOrigin, CompletedTxn, LogOffsetMetadata, ProducerAppendInfo, ProducerStateEntry, TxnMetadata} +import org.apache.kafka.storage.internals.log.{AppendOrigin, CompletedTxn, LogOffsetMetadata, ProducerAppendInfo, ProducerStateEntry, TxnMetadata} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} import org.mockito.Mockito.{mock, when} diff --git a/core/src/test/scala/unit/kafka/log/TimeIndexTest.scala b/core/src/test/scala/unit/kafka/log/TimeIndexTest.scala index 8502eb06535..1281103d02e 100644 --- a/core/src/test/scala/unit/kafka/log/TimeIndexTest.scala +++ b/core/src/test/scala/unit/kafka/log/TimeIndexTest.scala @@ -20,7 +20,7 @@ package kafka.log import java.io.File import kafka.utils.TestUtils import org.apache.kafka.common.errors.InvalidOffsetException -import org.apache.kafka.server.log.internals.{CorruptIndexException, TimeIndex, TimestampOffset} +import org.apache.kafka.storage.internals.log.{CorruptIndexException, TimeIndex, TimestampOffset} import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} import org.junit.jupiter.api.Assertions.{assertEquals, assertThrows} diff --git a/core/src/test/scala/unit/kafka/log/TransactionIndexTest.scala b/core/src/test/scala/unit/kafka/log/TransactionIndexTest.scala index 6784e76a8e5..cce59bdaa8c 100644 --- a/core/src/test/scala/unit/kafka/log/TransactionIndexTest.scala +++ b/core/src/test/scala/unit/kafka/log/TransactionIndexTest.scala @@ -18,7 +18,7 @@ package kafka.log import kafka.utils.TestUtils import org.apache.kafka.common.message.FetchResponseData -import org.apache.kafka.server.log.internals.{AbortedTxn, CorruptIndexException, TransactionIndex} +import org.apache.kafka.storage.internals.log.{AbortedTxn, CorruptIndexException, TransactionIndex} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} diff --git a/core/src/test/scala/unit/kafka/log/UnifiedLogTest.scala b/core/src/test/scala/unit/kafka/log/UnifiedLogTest.scala index a3f8404e2f4..857a1218328 100755 --- a/core/src/test/scala/unit/kafka/log/UnifiedLogTest.scala +++ b/core/src/test/scala/unit/kafka/log/UnifiedLogTest.scala @@ -31,12 +31,12 @@ import org.apache.kafka.common.record.MemoryRecords.RecordFilter import org.apache.kafka.common.record._ import org.apache.kafka.common.requests.{ListOffsetsRequest, ListOffsetsResponse} import org.apache.kafka.common.utils.{BufferSupplier, Time, Utils} -import org.apache.kafka.server.log.internals.{AbortedTxn, AppendOrigin, EpochEntry, FetchIsolation, LogConfig, LogOffsetMetadata, RecordValidationException} import org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig import org.apache.kafka.server.metrics.KafkaYammerMetrics import org.apache.kafka.server.util.{KafkaScheduler, Scheduler} import org.apache.kafka.storage.internals.checkpoint.LeaderEpochCheckpointFile import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache +import org.apache.kafka.storage.internals.log.{AbortedTxn, AppendOrigin, EpochEntry, FetchIsolation, LogConfig, LogOffsetMetadata, RecordValidationException} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} import org.mockito.ArgumentMatchers diff --git a/core/src/test/scala/unit/kafka/log/remote/RemoteIndexCacheTest.scala b/core/src/test/scala/unit/kafka/log/remote/RemoteIndexCacheTest.scala index 3c45f0916c4..0129d67b944 100644 --- a/core/src/test/scala/unit/kafka/log/remote/RemoteIndexCacheTest.scala +++ b/core/src/test/scala/unit/kafka/log/remote/RemoteIndexCacheTest.scala @@ -19,9 +19,9 @@ package kafka.log.remote import kafka.log.UnifiedLog import kafka.utils.MockTime import org.apache.kafka.common.{TopicIdPartition, TopicPartition, Uuid} -import org.apache.kafka.server.log.internals.{OffsetIndex, OffsetPosition, TimeIndex} import org.apache.kafka.server.log.remote.storage.RemoteStorageManager.IndexType import org.apache.kafka.server.log.remote.storage.{RemoteLogSegmentId, RemoteLogSegmentMetadata, RemoteStorageManager} +import org.apache.kafka.storage.internals.log.{OffsetIndex, OffsetPosition, TimeIndex} import org.apache.kafka.test.TestUtils import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} diff --git a/core/src/test/scala/unit/kafka/log/remote/RemoteLogManagerTest.scala b/core/src/test/scala/unit/kafka/log/remote/RemoteLogManagerTest.scala index 9c565fe364f..237ff4682f7 100644 --- a/core/src/test/scala/unit/kafka/log/remote/RemoteLogManagerTest.scala +++ b/core/src/test/scala/unit/kafka/log/remote/RemoteLogManagerTest.scala @@ -24,11 +24,11 @@ import org.apache.kafka.common.config.AbstractConfig import org.apache.kafka.common.record.FileRecords.TimestampAndOffset import org.apache.kafka.common.record.{CompressionType, MemoryRecords, SimpleRecord} import org.apache.kafka.common.{KafkaException, TopicIdPartition, TopicPartition, Uuid} -import org.apache.kafka.server.log.internals._ import org.apache.kafka.server.log.remote.storage.RemoteStorageManager.IndexType import org.apache.kafka.server.log.remote.storage._ import org.apache.kafka.storage.internals.checkpoint.LeaderEpochCheckpoint import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache +import org.apache.kafka.storage.internals.log.{EpochEntry, OffsetIndex, TimeIndex} import org.apache.kafka.test.TestUtils import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{BeforeEach, Test} diff --git a/core/src/test/scala/unit/kafka/server/AbstractFetcherThreadTest.scala b/core/src/test/scala/unit/kafka/server/AbstractFetcherThreadTest.scala index 01f707b2ea0..f816064d029 100644 --- a/core/src/test/scala/unit/kafka/server/AbstractFetcherThreadTest.scala +++ b/core/src/test/scala/unit/kafka/server/AbstractFetcherThreadTest.scala @@ -33,7 +33,7 @@ import org.apache.kafka.common.requests.{FetchRequest, FetchResponse} import org.apache.kafka.common.utils.Time import org.apache.kafka.server.metrics.KafkaYammerMetrics import org.apache.kafka.common.{KafkaException, TopicPartition, Uuid} -import org.apache.kafka.server.log.internals.LogOffsetMetadata +import org.apache.kafka.storage.internals.log.LogOffsetMetadata import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.Assumptions.assumeTrue import org.junit.jupiter.api.{BeforeEach, Test} diff --git a/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala b/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala index 08f0d58d08f..861ab321818 100755 --- a/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala +++ b/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala @@ -33,8 +33,8 @@ import org.apache.kafka.common.config.{ConfigException, SslConfigs} import org.apache.kafka.common.metrics.{JmxReporter, Metrics} import org.apache.kafka.common.network.ListenerName import org.apache.kafka.server.authorizer._ -import org.apache.kafka.server.log.internals.LogConfig import org.apache.kafka.server.util.KafkaScheduler +import org.apache.kafka.storage.internals.log.LogConfig import org.apache.kafka.test.MockMetricsReporter import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.Test diff --git a/core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala b/core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala index 80b4327c44e..1a699a2a165 100644 --- a/core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala +++ b/core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala @@ -40,7 +40,7 @@ import org.apache.kafka.common.quota.{ClientQuotaAlteration, ClientQuotaEntity} import org.apache.kafka.common.record.{CompressionType, RecordVersion} import org.apache.kafka.common.security.auth.KafkaPrincipal import org.apache.kafka.server.common.MetadataVersion.IBP_3_0_IV1 -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{Test, Timeout} import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/unit/kafka/server/HighwatermarkPersistenceTest.scala b/core/src/test/scala/unit/kafka/server/HighwatermarkPersistenceTest.scala index 784f373dc42..48954c79a31 100755 --- a/core/src/test/scala/unit/kafka/server/HighwatermarkPersistenceTest.scala +++ b/core/src/test/scala/unit/kafka/server/HighwatermarkPersistenceTest.scala @@ -27,8 +27,8 @@ import kafka.cluster.Partition import kafka.server.metadata.MockConfigRepository import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.record.SimpleRecord -import org.apache.kafka.server.log.internals.{CleanerConfig, LogDirFailureChannel} import org.apache.kafka.server.util.KafkaScheduler +import org.apache.kafka.storage.internals.log.{CleanerConfig, LogDirFailureChannel} class HighwatermarkPersistenceTest { diff --git a/core/src/test/scala/unit/kafka/server/IsrExpirationTest.scala b/core/src/test/scala/unit/kafka/server/IsrExpirationTest.scala index cf072486e54..c2677b85b78 100644 --- a/core/src/test/scala/unit/kafka/server/IsrExpirationTest.scala +++ b/core/src/test/scala/unit/kafka/server/IsrExpirationTest.scala @@ -28,7 +28,7 @@ import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.metrics.Metrics import org.apache.kafka.common.utils.Time import org.apache.kafka.metadata.LeaderRecoveryState -import org.apache.kafka.server.log.internals.{LogDirFailureChannel, LogOffsetMetadata} +import org.apache.kafka.storage.internals.log.{LogDirFailureChannel, LogOffsetMetadata} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} import org.mockito.Mockito.{atLeastOnce, mock, verify, when} diff --git a/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala b/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala index 58c99567926..1df91216166 100644 --- a/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala +++ b/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala @@ -93,7 +93,7 @@ import org.apache.kafka.common.message.OffsetDeleteResponseData.{OffsetDeleteRes import org.apache.kafka.coordinator.group.GroupCoordinator import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.server.common.MetadataVersion.{IBP_0_10_2_IV0, IBP_2_2_IV1} -import org.apache.kafka.server.log.internals.{AppendOrigin, FetchParams, FetchPartitionData} +import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchParams, FetchPartitionData} class KafkaApisTest { private val requestChannel: RequestChannel = mock(classOf[RequestChannel]) diff --git a/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala b/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala index 0c20c2cb5b3..b23ddef8adc 100755 --- a/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala +++ b/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala @@ -38,8 +38,8 @@ import org.apache.kafka.common.Node import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.server.common.MetadataVersion.{IBP_0_8_2, IBP_3_0_IV1} import org.apache.kafka.server.config.ServerTopicConfigSynonyms -import org.apache.kafka.server.log.internals.LogConfig import org.apache.kafka.server.log.remote.storage.RemoteLogManagerConfig +import org.apache.kafka.storage.internals.log.LogConfig import org.junit.jupiter.api.function.Executable import scala.annotation.nowarn diff --git a/core/src/test/scala/unit/kafka/server/ReplicaAlterLogDirsThreadTest.scala b/core/src/test/scala/unit/kafka/server/ReplicaAlterLogDirsThreadTest.scala index 55470fba7f9..5aea1328ce6 100644 --- a/core/src/test/scala/unit/kafka/server/ReplicaAlterLogDirsThreadTest.scala +++ b/core/src/test/scala/unit/kafka/server/ReplicaAlterLogDirsThreadTest.scala @@ -31,7 +31,7 @@ import org.apache.kafka.common.record.MemoryRecords import org.apache.kafka.common.requests.{FetchRequest, UpdateMetadataRequest} import org.apache.kafka.common.{TopicIdPartition, TopicPartition, Uuid} import org.apache.kafka.server.common.MetadataVersion -import org.apache.kafka.server.log.internals.{FetchIsolation, FetchParams, FetchPartitionData} +import org.apache.kafka.storage.internals.log.{FetchIsolation, FetchParams, FetchPartitionData} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.Test import org.mockito.ArgumentMatchers.{any, anyBoolean} diff --git a/core/src/test/scala/unit/kafka/server/ReplicaManagerConcurrencyTest.scala b/core/src/test/scala/unit/kafka/server/ReplicaManagerConcurrencyTest.scala index 9b9c8bad89e..c00dc65e9de 100644 --- a/core/src/test/scala/unit/kafka/server/ReplicaManagerConcurrencyTest.scala +++ b/core/src/test/scala/unit/kafka/server/ReplicaManagerConcurrencyTest.scala @@ -38,7 +38,7 @@ import org.apache.kafka.common.{IsolationLevel, TopicIdPartition, TopicPartition import org.apache.kafka.image.{MetadataDelta, MetadataImage} import org.apache.kafka.metadata.LeaderRecoveryState import org.apache.kafka.metadata.PartitionRegistration -import org.apache.kafka.server.log.internals.{AppendOrigin, FetchIsolation, FetchParams, FetchPartitionData, LogConfig, LogDirFailureChannel} +import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchIsolation, FetchParams, FetchPartitionData, LogConfig, LogDirFailureChannel} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, Test} import org.mockito.Mockito diff --git a/core/src/test/scala/unit/kafka/server/ReplicaManagerQuotasTest.scala b/core/src/test/scala/unit/kafka/server/ReplicaManagerQuotasTest.scala index 58d7c7652d7..8c6c6ce97c1 100644 --- a/core/src/test/scala/unit/kafka/server/ReplicaManagerQuotasTest.scala +++ b/core/src/test/scala/unit/kafka/server/ReplicaManagerQuotasTest.scala @@ -29,8 +29,8 @@ import org.apache.kafka.common.requests.FetchRequest import org.apache.kafka.common.requests.FetchRequest.PartitionData import org.apache.kafka.common.{TopicIdPartition, TopicPartition, Uuid} import org.apache.kafka.metadata.LeaderRecoveryState -import org.apache.kafka.server.log.internals.{FetchDataInfo, FetchIsolation, FetchParams, LogDirFailureChannel, LogOffsetMetadata} import org.apache.kafka.server.util.KafkaScheduler +import org.apache.kafka.storage.internals.log.{FetchDataInfo, FetchIsolation, FetchParams, LogDirFailureChannel, LogOffsetMetadata} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, Test} import org.mockito.ArgumentMatchers.{any, anyBoolean, anyInt, anyLong} diff --git a/core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala b/core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala index ca5e542965e..b145ad592a5 100644 --- a/core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala +++ b/core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala @@ -57,8 +57,8 @@ import org.apache.kafka.image.{AclsImage, ClientQuotasImage, ClusterImageTest, C import org.apache.kafka.metadata.LeaderConstants.NO_LEADER import org.apache.kafka.metadata.LeaderRecoveryState import org.apache.kafka.server.common.MetadataVersion.IBP_2_6_IV0 -import org.apache.kafka.server.log.internals.{AppendOrigin, FetchIsolation, FetchParams, FetchPartitionData, LogConfig, LogDirFailureChannel, LogOffsetMetadata} import org.apache.kafka.server.util.MockScheduler +import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchIsolation, FetchParams, FetchPartitionData, LogConfig, LogDirFailureChannel, LogOffsetMetadata} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/unit/kafka/server/ReplicationQuotasTest.scala b/core/src/test/scala/unit/kafka/server/ReplicationQuotasTest.scala index e8f92ce3e34..7bf2b784f90 100644 --- a/core/src/test/scala/unit/kafka/server/ReplicationQuotasTest.scala +++ b/core/src/test/scala/unit/kafka/server/ReplicationQuotasTest.scala @@ -25,7 +25,7 @@ import kafka.utils.CoreUtils._ import kafka.utils.TestUtils import org.apache.kafka.clients.producer.{KafkaProducer, ProducerRecord} import org.apache.kafka.common.TopicPartition -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, Test} diff --git a/core/src/test/scala/unit/kafka/server/checkpoints/LeaderEpochCheckpointFileWithFailureHandlerTest.scala b/core/src/test/scala/unit/kafka/server/checkpoints/LeaderEpochCheckpointFileWithFailureHandlerTest.scala index a338de16f04..a32228a7eea 100644 --- a/core/src/test/scala/unit/kafka/server/checkpoints/LeaderEpochCheckpointFileWithFailureHandlerTest.scala +++ b/core/src/test/scala/unit/kafka/server/checkpoints/LeaderEpochCheckpointFileWithFailureHandlerTest.scala @@ -17,8 +17,8 @@ package kafka.server.checkpoints import kafka.utils.{Logging, TestUtils} -import org.apache.kafka.server.log.internals.{EpochEntry, LogDirFailureChannel} import org.apache.kafka.storage.internals.checkpoint.LeaderEpochCheckpointFile +import org.apache.kafka.storage.internals.log.{EpochEntry, LogDirFailureChannel} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.Test diff --git a/core/src/test/scala/unit/kafka/server/checkpoints/OffsetCheckpointFileWithFailureHandlerTest.scala b/core/src/test/scala/unit/kafka/server/checkpoints/OffsetCheckpointFileWithFailureHandlerTest.scala index c1ddb89831c..ddbf58d884e 100644 --- a/core/src/test/scala/unit/kafka/server/checkpoints/OffsetCheckpointFileWithFailureHandlerTest.scala +++ b/core/src/test/scala/unit/kafka/server/checkpoints/OffsetCheckpointFileWithFailureHandlerTest.scala @@ -19,8 +19,8 @@ package kafka.server.checkpoints import kafka.utils.{Logging, TestUtils} import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.errors.KafkaStorageException -import org.apache.kafka.server.log.internals.LogDirFailureChannel import org.apache.kafka.storage.internals.checkpoint.CheckpointFileWithFailureHandler +import org.apache.kafka.storage.internals.log.LogDirFailureChannel import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.Test import org.mockito.Mockito diff --git a/core/src/test/scala/unit/kafka/server/epoch/EpochDrivenReplicationProtocolAcceptanceTest.scala b/core/src/test/scala/unit/kafka/server/epoch/EpochDrivenReplicationProtocolAcceptanceTest.scala index 3ecd5814fa2..2c850faabf4 100644 --- a/core/src/test/scala/unit/kafka/server/epoch/EpochDrivenReplicationProtocolAcceptanceTest.scala +++ b/core/src/test/scala/unit/kafka/server/epoch/EpochDrivenReplicationProtocolAcceptanceTest.scala @@ -29,8 +29,8 @@ import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.record.RecordBatch import org.apache.kafka.common.serialization.ByteArrayDeserializer import org.apache.kafka.server.common.MetadataVersion -import org.apache.kafka.server.log.internals.EpochEntry import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache +import org.apache.kafka.storage.internals.log.EpochEntry import org.junit.jupiter.api.Assertions.{assertEquals, assertTrue} import org.junit.jupiter.api.{AfterEach, BeforeEach, Test, TestInfo} diff --git a/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochFileCacheTest.scala b/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochFileCacheTest.scala index b66a0b18d11..710077a1e43 100644 --- a/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochFileCacheTest.scala +++ b/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochFileCacheTest.scala @@ -20,9 +20,9 @@ package kafka.server.epoch import kafka.utils.TestUtils import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse.{UNDEFINED_EPOCH, UNDEFINED_EPOCH_OFFSET} -import org.apache.kafka.server.log.internals.{EpochEntry, LogDirFailureChannel} import org.apache.kafka.storage.internals.checkpoint.{LeaderEpochCheckpoint, LeaderEpochCheckpointFile} import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache +import org.apache.kafka.storage.internals.log.{EpochEntry, LogDirFailureChannel} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.Test diff --git a/core/src/test/scala/unit/kafka/server/epoch/OffsetsForLeaderEpochTest.scala b/core/src/test/scala/unit/kafka/server/epoch/OffsetsForLeaderEpochTest.scala index 8983ad4497c..e5460d09d9c 100644 --- a/core/src/test/scala/unit/kafka/server/epoch/OffsetsForLeaderEpochTest.scala +++ b/core/src/test/scala/unit/kafka/server/epoch/OffsetsForLeaderEpochTest.scala @@ -29,7 +29,7 @@ import org.apache.kafka.common.metrics.Metrics import org.apache.kafka.common.protocol.Errors import org.apache.kafka.common.record.RecordBatch import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse.{UNDEFINED_EPOCH, UNDEFINED_EPOCH_OFFSET} -import org.apache.kafka.server.log.internals.LogDirFailureChannel +import org.apache.kafka.storage.internals.log.LogDirFailureChannel import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} import org.mockito.Mockito.{mock, when} diff --git a/core/src/test/scala/unit/kafka/tools/DumpLogSegmentsTest.scala b/core/src/test/scala/unit/kafka/tools/DumpLogSegmentsTest.scala index 980c8159c21..94b4aad8899 100644 --- a/core/src/test/scala/unit/kafka/tools/DumpLogSegmentsTest.scala +++ b/core/src/test/scala/unit/kafka/tools/DumpLogSegmentsTest.scala @@ -36,8 +36,8 @@ import org.apache.kafka.common.utils.Utils import org.apache.kafka.metadata.MetadataRecordSerde import org.apache.kafka.raft.{KafkaRaftClient, OffsetAndEpoch} import org.apache.kafka.server.common.ApiMessageAndVersion -import org.apache.kafka.server.log.internals.{AppendOrigin, FetchIsolation, LogConfig, LogDirFailureChannel} import org.apache.kafka.snapshot.RecordsSnapshotWriter +import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchIsolation, LogConfig, LogDirFailureChannel} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} diff --git a/core/src/test/scala/unit/kafka/utils/SchedulerTest.scala b/core/src/test/scala/unit/kafka/utils/SchedulerTest.scala index 5e5ae182277..2d152a2df85 100644 --- a/core/src/test/scala/unit/kafka/utils/SchedulerTest.scala +++ b/core/src/test/scala/unit/kafka/utils/SchedulerTest.scala @@ -22,8 +22,8 @@ import java.util.concurrent.{CountDownLatch, Executors, TimeUnit} import kafka.log.{LocalLog, LogLoader, LogSegments, ProducerStateManager, ProducerStateManagerConfig, UnifiedLog} import kafka.server.BrokerTopicStats import kafka.utils.TestUtils.retry -import org.apache.kafka.server.log.internals.{LogConfig, LogDirFailureChannel} import org.apache.kafka.server.util.KafkaScheduler +import org.apache.kafka.storage.internals.log.{LogConfig, LogDirFailureChannel} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test, Timeout} diff --git a/core/src/test/scala/unit/kafka/utils/TestUtils.scala b/core/src/test/scala/unit/kafka/utils/TestUtils.scala index fe275e92694..78371b78226 100755 --- a/core/src/test/scala/unit/kafka/utils/TestUtils.scala +++ b/core/src/test/scala/unit/kafka/utils/TestUtils.scala @@ -70,8 +70,8 @@ import org.apache.kafka.common.utils.{Time, Utils} import org.apache.kafka.controller.QuorumController import org.apache.kafka.server.authorizer.{AuthorizableRequestContext, Authorizer => JAuthorizer} import org.apache.kafka.server.common.MetadataVersion -import org.apache.kafka.server.log.internals.{CleanerConfig, LogConfig, LogDirFailureChannel} import org.apache.kafka.server.metrics.KafkaYammerMetrics +import org.apache.kafka.storage.internals.log.{CleanerConfig, LogConfig, LogDirFailureChannel} import org.apache.kafka.test.{TestSslUtils, TestUtils => JTestUtils} import org.apache.zookeeper.KeeperException.SessionExpiredException import org.apache.zookeeper.ZooDefs._ diff --git a/core/src/test/scala/unit/kafka/zk/AdminZkClientTest.scala b/core/src/test/scala/unit/kafka/zk/AdminZkClientTest.scala index 1e19fe1bcc6..833fd930414 100644 --- a/core/src/test/scala/unit/kafka/zk/AdminZkClientTest.scala +++ b/core/src/test/scala/unit/kafka/zk/AdminZkClientTest.scala @@ -31,7 +31,7 @@ import org.apache.kafka.common.config.TopicConfig import org.apache.kafka.common.config.internals.QuotaConfigs import org.apache.kafka.common.errors.{InvalidReplicaAssignmentException, InvalidTopicException, TopicExistsException} import org.apache.kafka.common.metrics.Quota -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import org.apache.kafka.test.{TestUtils => JTestUtils} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, Test} diff --git a/core/src/test/scala/unit/kafka/zk/KafkaZkClientTest.scala b/core/src/test/scala/unit/kafka/zk/KafkaZkClientTest.scala index 0e6cf513b36..370710f8bf9 100644 --- a/core/src/test/scala/unit/kafka/zk/KafkaZkClientTest.scala +++ b/core/src/test/scala/unit/kafka/zk/KafkaZkClientTest.scala @@ -44,7 +44,7 @@ import org.apache.kafka.common.{TopicPartition, Uuid} import org.apache.kafka.metadata.LeaderRecoveryState import org.apache.kafka.metadata.migration.ZkMigrationLeadershipState import org.apache.kafka.server.common.MetadataVersion -import org.apache.kafka.server.log.internals.LogConfig +import org.apache.kafka.storage.internals.log.LogConfig import org.apache.zookeeper.KeeperException.{Code, NoAuthException, NoNodeException, NodeExistsException} import org.apache.zookeeper.{CreateMode, ZooDefs} import org.apache.zookeeper.client.ZKClientConfig diff --git a/gradle/spotbugs-exclude.xml b/gradle/spotbugs-exclude.xml index be6d6187ced..efc1f03b950 100644 --- a/gradle/spotbugs-exclude.xml +++ b/gradle/spotbugs-exclude.xml @@ -317,7 +317,7 @@ For a detailed description of spotbugs bug categories, see https://spotbugs.read - + diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/fetcher/ReplicaFetcherThreadBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/fetcher/ReplicaFetcherThreadBenchmark.java index 7b0d13fff23..c9575f1e786 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/fetcher/ReplicaFetcherThreadBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/fetcher/ReplicaFetcherThreadBenchmark.java @@ -68,9 +68,9 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.server.log.internals.CleanerConfig; -import org.apache.kafka.server.log.internals.LogConfig; -import org.apache.kafka.server.log.internals.LogDirFailureChannel; +import org.apache.kafka.storage.internals.log.CleanerConfig; +import org.apache.kafka.storage.internals.log.LogConfig; +import org.apache.kafka.storage.internals.log.LogDirFailureChannel; import org.apache.kafka.server.util.KafkaScheduler; import org.mockito.Mockito; import org.openjdk.jmh.annotations.Benchmark; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/PartitionMakeFollowerBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/PartitionMakeFollowerBenchmark.java index 30dd416bf41..113d97aba08 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/PartitionMakeFollowerBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/PartitionMakeFollowerBenchmark.java @@ -36,9 +36,9 @@ import org.apache.kafka.common.record.SimpleRecord; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.server.log.internals.CleanerConfig; -import org.apache.kafka.server.log.internals.LogConfig; -import org.apache.kafka.server.log.internals.LogDirFailureChannel; +import org.apache.kafka.storage.internals.log.CleanerConfig; +import org.apache.kafka.storage.internals.log.LogConfig; +import org.apache.kafka.storage.internals.log.LogDirFailureChannel; import org.apache.kafka.server.util.KafkaScheduler; import org.mockito.Mockito; import org.openjdk.jmh.annotations.Benchmark; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/UpdateFollowerFetchStateBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/UpdateFollowerFetchStateBenchmark.java index 910e00884fc..2592ea67188 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/UpdateFollowerFetchStateBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/UpdateFollowerFetchStateBenchmark.java @@ -33,10 +33,10 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.LeaderAndIsrRequestData.LeaderAndIsrPartitionState; import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.server.log.internals.CleanerConfig; -import org.apache.kafka.server.log.internals.LogConfig; -import org.apache.kafka.server.log.internals.LogDirFailureChannel; -import org.apache.kafka.server.log.internals.LogOffsetMetadata; +import org.apache.kafka.storage.internals.log.CleanerConfig; +import org.apache.kafka.storage.internals.log.LogConfig; +import org.apache.kafka.storage.internals.log.LogDirFailureChannel; +import org.apache.kafka.storage.internals.log.LogOffsetMetadata; import org.apache.kafka.server.util.KafkaScheduler; import org.mockito.Mockito; import org.openjdk.jmh.annotations.Benchmark; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/record/BaseRecordBatchBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/record/BaseRecordBatchBenchmark.java index 0b241f61e32..58704979d8d 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/record/BaseRecordBatchBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/record/BaseRecordBatchBenchmark.java @@ -27,7 +27,7 @@ import org.apache.kafka.common.record.MemoryRecordsBuilder; import org.apache.kafka.common.record.Record; import org.apache.kafka.common.record.RecordBatch; import org.apache.kafka.common.record.TimestampType; -import org.apache.kafka.server.log.internals.LogValidator; +import org.apache.kafka.storage.internals.log.LogValidator; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.Setup; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/record/CompressedRecordBatchValidationBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/record/CompressedRecordBatchValidationBenchmark.java index 7abbfd886f0..878ab946877 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/record/CompressedRecordBatchValidationBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/record/CompressedRecordBatchValidationBenchmark.java @@ -23,8 +23,8 @@ import org.apache.kafka.common.record.TimestampType; import org.apache.kafka.common.utils.PrimitiveRef; import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.server.log.internals.AppendOrigin; -import org.apache.kafka.server.log.internals.LogValidator; +import org.apache.kafka.storage.internals.log.AppendOrigin; +import org.apache.kafka.storage.internals.log.LogValidator; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Measurement; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/record/UncompressedRecordBatchValidationBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/record/UncompressedRecordBatchValidationBenchmark.java index f100a63ec4d..d08b408e315 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/record/UncompressedRecordBatchValidationBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/record/UncompressedRecordBatchValidationBenchmark.java @@ -23,8 +23,8 @@ import org.apache.kafka.common.record.TimestampType; import org.apache.kafka.common.utils.PrimitiveRef; import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.server.log.internals.AppendOrigin; -import org.apache.kafka.server.log.internals.LogValidator; +import org.apache.kafka.storage.internals.log.AppendOrigin; +import org.apache.kafka.storage.internals.log.LogValidator; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Measurement; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/CheckpointBench.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/CheckpointBench.java index f82695a993d..ff3e04aefcd 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/CheckpointBench.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/CheckpointBench.java @@ -22,9 +22,9 @@ import kafka.server.AlterPartitionManager; import kafka.server.BrokerFeatures; import kafka.server.BrokerTopicStats; import kafka.server.KafkaConfig; -import org.apache.kafka.server.log.internals.CleanerConfig; -import org.apache.kafka.server.log.internals.LogConfig; -import org.apache.kafka.server.log.internals.LogDirFailureChannel; +import org.apache.kafka.storage.internals.log.CleanerConfig; +import org.apache.kafka.storage.internals.log.LogConfig; +import org.apache.kafka.storage.internals.log.LogDirFailureChannel; import kafka.server.MetadataCache; import kafka.server.QuotaFactory; import kafka.server.ReplicaManager; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/PartitionCreationBench.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/PartitionCreationBench.java index ad0f65794ec..8c0500ba6e2 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/PartitionCreationBench.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/PartitionCreationBench.java @@ -39,9 +39,9 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.server.log.internals.CleanerConfig; -import org.apache.kafka.server.log.internals.LogConfig; -import org.apache.kafka.server.log.internals.LogDirFailureChannel; +import org.apache.kafka.storage.internals.log.CleanerConfig; +import org.apache.kafka.storage.internals.log.LogConfig; +import org.apache.kafka.storage.internals.log.LogDirFailureChannel; import org.apache.kafka.server.util.KafkaScheduler; import org.apache.kafka.server.util.Scheduler; import org.openjdk.jmh.annotations.Benchmark; diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ClassLoaderAwareRemoteLogMetadataManager.java b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ClassLoaderAwareRemoteLogMetadataManager.java index 01716823a2c..6b465851589 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ClassLoaderAwareRemoteLogMetadataManager.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ClassLoaderAwareRemoteLogMetadataManager.java @@ -17,7 +17,7 @@ package org.apache.kafka.server.log.remote.metadata.storage; import org.apache.kafka.common.TopicIdPartition; -import org.apache.kafka.server.log.internals.StorageAction; +import org.apache.kafka.storage.internals.log.StorageAction; import org.apache.kafka.server.log.remote.storage.RemoteLogMetadataManager; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadataUpdate; diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/storage/ClassLoaderAwareRemoteStorageManager.java b/storage/src/main/java/org/apache/kafka/server/log/remote/storage/ClassLoaderAwareRemoteStorageManager.java index 988755d3bed..6284e4cb78e 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/storage/ClassLoaderAwareRemoteStorageManager.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/storage/ClassLoaderAwareRemoteStorageManager.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.log.remote.storage; -import org.apache.kafka.server.log.internals.StorageAction; +import org.apache.kafka.storage.internals.log.StorageAction; import java.io.IOException; import java.io.InputStream; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CheckpointFileWithFailureHandler.java b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CheckpointFileWithFailureHandler.java index 04c2e1dd459..f780ced9b04 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CheckpointFileWithFailureHandler.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CheckpointFileWithFailureHandler.java @@ -18,7 +18,7 @@ package org.apache.kafka.storage.internals.checkpoint; import org.apache.kafka.common.errors.KafkaStorageException; import org.apache.kafka.server.common.CheckpointFile; -import org.apache.kafka.server.log.internals.LogDirFailureChannel; +import org.apache.kafka.storage.internals.log.LogDirFailureChannel; import java.io.File; import java.io.IOException; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpoint.java b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpoint.java index 1032c560f75..8cf55195126 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpoint.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpoint.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.storage.internals.checkpoint; -import org.apache.kafka.server.log.internals.EpochEntry; +import org.apache.kafka.storage.internals.log.EpochEntry; import java.util.Collection; import java.util.List; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFile.java b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFile.java index 1ff08287205..81527c6377a 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFile.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFile.java @@ -17,8 +17,8 @@ package org.apache.kafka.storage.internals.checkpoint; import org.apache.kafka.server.common.CheckpointFile.EntryFormatter; -import org.apache.kafka.server.log.internals.EpochEntry; -import org.apache.kafka.server.log.internals.LogDirFailureChannel; +import org.apache.kafka.storage.internals.log.EpochEntry; +import org.apache.kafka.storage.internals.log.LogDirFailureChannel; import java.io.File; import java.io.IOException; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java b/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java index 7c6e82bf161..95c6973fa95 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java @@ -18,7 +18,7 @@ package org.apache.kafka.storage.internals.epoch; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.LogContext; -import org.apache.kafka.server.log.internals.EpochEntry; +import org.apache.kafka.storage.internals.log.EpochEntry; import org.apache.kafka.storage.internals.checkpoint.LeaderEpochCheckpoint; import org.slf4j.Logger; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/AbortedTxn.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/AbortedTxn.java similarity index 98% rename from storage/src/main/java/org/apache/kafka/server/log/internals/AbortedTxn.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/AbortedTxn.java index 2ad08ce77ba..cce6867c317 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/AbortedTxn.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/AbortedTxn.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.message.FetchResponseData; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/AbstractIndex.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/AbstractIndex.java similarity index 99% rename from storage/src/main/java/org/apache/kafka/server/log/internals/AbstractIndex.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/AbstractIndex.java index d5a510c94ca..b70d1186a90 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/AbstractIndex.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/AbstractIndex.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.utils.ByteBufferUnmapper; import org.apache.kafka.common.utils.OperatingSystem; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/AppendOrigin.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/AppendOrigin.java similarity index 97% rename from storage/src/main/java/org/apache/kafka/server/log/internals/AppendOrigin.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/AppendOrigin.java index e03a74ee994..deb5cf422b0 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/AppendOrigin.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/AppendOrigin.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; /** * The source of an append to the log. This is used when determining required validations. diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/BatchMetadata.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/BatchMetadata.java similarity index 98% rename from storage/src/main/java/org/apache/kafka/server/log/internals/BatchMetadata.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/BatchMetadata.java index 668456c3518..e6b9cb6fef4 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/BatchMetadata.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/BatchMetadata.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.record.DefaultRecordBatch; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/CleanerConfig.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/CleanerConfig.java similarity index 98% rename from storage/src/main/java/org/apache/kafka/server/log/internals/CleanerConfig.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/CleanerConfig.java index 3029d4c0991..9e38d0c02e9 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/CleanerConfig.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/CleanerConfig.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; /** * Configuration parameters for the log cleaner. diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/CompletedTxn.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/CompletedTxn.java similarity index 98% rename from storage/src/main/java/org/apache/kafka/server/log/internals/CompletedTxn.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/CompletedTxn.java index 1ad6f8854b4..e8f70ccf5b4 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/CompletedTxn.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/CompletedTxn.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; /** * A class used to hold useful metadata about a completed transaction. This is used to build diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/CorruptIndexException.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/CorruptIndexException.java similarity index 95% rename from storage/src/main/java/org/apache/kafka/server/log/internals/CorruptIndexException.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/CorruptIndexException.java index cf3880598a2..fe1cc084c13 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/CorruptIndexException.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/CorruptIndexException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; public class CorruptIndexException extends RuntimeException { public CorruptIndexException(String message) { diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/CorruptSnapshotException.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/CorruptSnapshotException.java similarity index 95% rename from storage/src/main/java/org/apache/kafka/server/log/internals/CorruptSnapshotException.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/CorruptSnapshotException.java index 7581444c767..e69c1054bee 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/CorruptSnapshotException.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/CorruptSnapshotException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.KafkaException; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/EpochEntry.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/EpochEntry.java similarity index 97% rename from storage/src/main/java/org/apache/kafka/server/log/internals/EpochEntry.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/EpochEntry.java index 330444b9617..3b4666ed0b2 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/EpochEntry.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/EpochEntry.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; // Mapping of epoch to the first offset of the subsequent epoch public class EpochEntry { diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/FetchDataInfo.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/FetchDataInfo.java similarity index 97% rename from storage/src/main/java/org/apache/kafka/server/log/internals/FetchDataInfo.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/FetchDataInfo.java index a07bc771090..48c16b9d57e 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/FetchDataInfo.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/FetchDataInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.message.FetchResponseData; import org.apache.kafka.common.record.MemoryRecords; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/FetchIsolation.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/FetchIsolation.java similarity index 96% rename from storage/src/main/java/org/apache/kafka/server/log/internals/FetchIsolation.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/FetchIsolation.java index 47457af686d..20bacb256b6 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/FetchIsolation.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/FetchIsolation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.IsolationLevel; import org.apache.kafka.common.requests.FetchRequest; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/FetchParams.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/FetchParams.java similarity index 98% rename from storage/src/main/java/org/apache/kafka/server/log/internals/FetchParams.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/FetchParams.java index 3175b6e85fb..ff2308a83c4 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/FetchParams.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/FetchParams.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.replica.ClientMetadata; import org.apache.kafka.common.requests.FetchRequest; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/FetchPartitionData.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/FetchPartitionData.java similarity index 98% rename from storage/src/main/java/org/apache/kafka/server/log/internals/FetchPartitionData.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/FetchPartitionData.java index c101f909762..3bbd5157b9c 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/FetchPartitionData.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/FetchPartitionData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import java.util.OptionalInt; import java.util.OptionalLong; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/IndexEntry.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/IndexEntry.java similarity index 94% rename from storage/src/main/java/org/apache/kafka/server/log/internals/IndexEntry.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/IndexEntry.java index 30b42ed4389..d91568a0dfe 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/IndexEntry.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/IndexEntry.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; public interface IndexEntry { long indexKey(); diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/IndexOffsetOverflowException.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/IndexOffsetOverflowException.java similarity index 96% rename from storage/src/main/java/org/apache/kafka/server/log/internals/IndexOffsetOverflowException.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/IndexOffsetOverflowException.java index aa2c0a590f8..39e32818535 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/IndexOffsetOverflowException.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/IndexOffsetOverflowException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.KafkaException; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/IndexSearchType.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/IndexSearchType.java similarity index 94% rename from storage/src/main/java/org/apache/kafka/server/log/internals/IndexSearchType.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/IndexSearchType.java index 67c20c8f15a..d0df60e4e75 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/IndexSearchType.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/IndexSearchType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; public enum IndexSearchType { KEY, VALUE diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/LastRecord.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LastRecord.java similarity index 97% rename from storage/src/main/java/org/apache/kafka/server/log/internals/LastRecord.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/LastRecord.java index 78568da7897..6886079cbf9 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/LastRecord.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LastRecord.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import java.util.Objects; import java.util.OptionalLong; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/LazyIndex.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LazyIndex.java similarity index 99% rename from storage/src/main/java/org/apache/kafka/server/log/internals/LazyIndex.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/LazyIndex.java index 9b3db1d863d..b1e16a8f67b 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/LazyIndex.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LazyIndex.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import java.io.Closeable; import java.io.File; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/LoadedLogOffsets.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LoadedLogOffsets.java similarity index 98% rename from storage/src/main/java/org/apache/kafka/server/log/internals/LoadedLogOffsets.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/LoadedLogOffsets.java index 38319adc6f1..a025ea86d95 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/LoadedLogOffsets.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LoadedLogOffsets.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import java.util.Objects; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/LogConfig.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogConfig.java similarity index 99% rename from storage/src/main/java/org/apache/kafka/server/log/internals/LogConfig.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/LogConfig.java index 25c29dc822b..2ad084d1854 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/LogConfig.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogConfig.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import static java.util.Arrays.asList; import static org.apache.kafka.common.config.ConfigDef.Range.between; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/LogDirFailureChannel.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogDirFailureChannel.java similarity index 98% rename from storage/src/main/java/org/apache/kafka/server/log/internals/LogDirFailureChannel.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/LogDirFailureChannel.java index 2d0e8d1e6eb..a2ae2f3676e 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/LogDirFailureChannel.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogDirFailureChannel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import java.io.IOException; import java.util.concurrent.ArrayBlockingQueue; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/LogFileUtils.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogFileUtils.java similarity index 96% rename from storage/src/main/java/org/apache/kafka/server/log/internals/LogFileUtils.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/LogFileUtils.java index ffb0ca3458f..3b8b41f91fd 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/LogFileUtils.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogFileUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; public final class LogFileUtils { diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/LogOffsetMetadata.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogOffsetMetadata.java similarity index 98% rename from storage/src/main/java/org/apache/kafka/server/log/internals/LogOffsetMetadata.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/LogOffsetMetadata.java index dd6124025d8..91ca5d44edb 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/LogOffsetMetadata.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogOffsetMetadata.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.KafkaException; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/LogValidator.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogValidator.java similarity index 99% rename from storage/src/main/java/org/apache/kafka/server/log/internals/LogValidator.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/LogValidator.java index ef693b59a26..640fe472a14 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/LogValidator.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import static org.apache.kafka.server.common.MetadataVersion.IBP_2_1_IV0; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/OffsetIndex.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/OffsetIndex.java similarity index 99% rename from storage/src/main/java/org/apache/kafka/server/log/internals/OffsetIndex.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/OffsetIndex.java index d3aa706ffc2..82f57bb0c23 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/OffsetIndex.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/OffsetIndex.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.errors.InvalidOffsetException; import org.slf4j.Logger; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/OffsetMap.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/OffsetMap.java similarity index 96% rename from storage/src/main/java/org/apache/kafka/server/log/internals/OffsetMap.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/OffsetMap.java index d8df1dcffb3..de7deaeb8ac 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/OffsetMap.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/OffsetMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import java.nio.ByteBuffer; import java.security.DigestException; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/OffsetPosition.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/OffsetPosition.java similarity index 97% rename from storage/src/main/java/org/apache/kafka/server/log/internals/OffsetPosition.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/OffsetPosition.java index 7fa017c612a..b32b069aa1f 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/OffsetPosition.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/OffsetPosition.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; /** * The mapping between a logical log offset and the physical position diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/ProducerAppendInfo.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerAppendInfo.java similarity index 99% rename from storage/src/main/java/org/apache/kafka/server/log/internals/ProducerAppendInfo.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerAppendInfo.java index 9c5c8c017f1..c800899641b 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/ProducerAppendInfo.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerAppendInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.InvalidProducerEpochException; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/ProducerStateEntry.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateEntry.java similarity index 99% rename from storage/src/main/java/org/apache/kafka/server/log/internals/ProducerStateEntry.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateEntry.java index 933a171d76c..a3248998af2 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/ProducerStateEntry.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateEntry.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.record.RecordBatch; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/RecordValidationException.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/RecordValidationException.java similarity index 97% rename from storage/src/main/java/org/apache/kafka/server/log/internals/RecordValidationException.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/RecordValidationException.java index 164e1e209c6..53665670c05 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/RecordValidationException.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/RecordValidationException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import java.util.Collections; import java.util.List; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/SkimpyOffsetMap.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/SkimpyOffsetMap.java similarity index 99% rename from storage/src/main/java/org/apache/kafka/server/log/internals/SkimpyOffsetMap.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/SkimpyOffsetMap.java index b5b47d94512..8f15a4f7f9d 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/SkimpyOffsetMap.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/SkimpyOffsetMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.utils.ByteUtils; import org.apache.kafka.common.utils.Utils; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/SnapshotFile.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/SnapshotFile.java similarity index 94% rename from storage/src/main/java/org/apache/kafka/server/log/internals/SnapshotFile.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/SnapshotFile.java index a6e7695c956..82c8803a643 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/SnapshotFile.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/SnapshotFile.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.utils.Utils; import org.slf4j.Logger; @@ -24,7 +24,7 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; -import static org.apache.kafka.server.log.internals.LogFileUtils.offsetFromFileName; +import static org.apache.kafka.storage.internals.log.LogFileUtils.offsetFromFileName; public class SnapshotFile { private static final Logger log = LoggerFactory.getLogger(SnapshotFile.class); diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/StorageAction.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/StorageAction.java similarity index 95% rename from storage/src/main/java/org/apache/kafka/server/log/internals/StorageAction.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/StorageAction.java index 434acd5eb88..f56f138fa3d 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/StorageAction.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/StorageAction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; /** * This interface is used to execute any storage related operations. diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/ThrottledReplicaListValidator.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/ThrottledReplicaListValidator.java similarity index 97% rename from storage/src/main/java/org/apache/kafka/server/log/internals/ThrottledReplicaListValidator.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/ThrottledReplicaListValidator.java index a98e7f747c1..d28b435a7d2 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/ThrottledReplicaListValidator.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/ThrottledReplicaListValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import static java.util.Arrays.asList; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/TimeIndex.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/TimeIndex.java similarity index 99% rename from storage/src/main/java/org/apache/kafka/server/log/internals/TimeIndex.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/TimeIndex.java index 8c7c6d8d58c..f221cf4b0e0 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/TimeIndex.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/TimeIndex.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.errors.InvalidOffsetException; import org.apache.kafka.common.record.RecordBatch; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/TimestampOffset.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/TimestampOffset.java similarity index 97% rename from storage/src/main/java/org/apache/kafka/server/log/internals/TimestampOffset.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/TimestampOffset.java index 77b1bbe69a0..9b48352c213 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/TimestampOffset.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/TimestampOffset.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; /** * The mapping between a timestamp to a message offset. The entry means that any message whose timestamp is greater diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/TransactionIndex.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/TransactionIndex.java similarity index 99% rename from storage/src/main/java/org/apache/kafka/server/log/internals/TransactionIndex.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/TransactionIndex.java index 646541ae9c1..10d1449cdb7 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/TransactionIndex.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/TransactionIndex.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.utils.PrimitiveRef; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/TxnIndexSearchResult.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/TxnIndexSearchResult.java similarity index 96% rename from storage/src/main/java/org/apache/kafka/server/log/internals/TxnIndexSearchResult.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/TxnIndexSearchResult.java index c1d40501af7..b6c704610bc 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/TxnIndexSearchResult.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/TxnIndexSearchResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import java.util.Collections; import java.util.List; diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/TxnMetadata.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/TxnMetadata.java similarity index 97% rename from storage/src/main/java/org/apache/kafka/server/log/internals/TxnMetadata.java rename to storage/src/main/java/org/apache/kafka/storage/internals/log/TxnMetadata.java index 76fcb4c528f..0a5fddb3020 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/internals/TxnMetadata.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/TxnMetadata.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.log.internals; +package org.apache.kafka.storage.internals.log; import java.util.Objects; import java.util.OptionalLong;