move ByteBufferCleaner to actor package

simerplaha · Aug 13, 2020 · cc497ea · cc497ea
1 parent 8e3fccb
commit cc497ea
Show file tree

Hide file tree

Showing 38 changed files with 73 additions and 71 deletions.
diff --git a/core-performance/src/test/scala/swaydb/core/io/file/DBFileWriteReadPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/io/file/DBFileWriteReadPerformanceSpec.scala
@@ -32,7 +32,7 @@ import swaydb.IOValues._
 import swaydb.core.CommonAssertions.randomIOStrategy
 import swaydb.core.TestData._
 import swaydb.core.actor.FileSweeper
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.segment.format.a.block.reader.BlockRefReader
 import swaydb.core.util.{Benchmark, BlockCacheFileIDGenerator, Bytes}
 import swaydb.core.{TestBase, TestSweeper}

diff --git a/...rmance/src/test/scala/swaydb/core/segment/format/a/block/BlockReaderPerformanceSpec.scala b/...rmance/src/test/scala/swaydb/core/segment/format/a/block/BlockReaderPerformanceSpec.scala
@@ -27,7 +27,7 @@ package swaydb.core.segment.format.a.block
 import swaydb.IOValues._
 import swaydb.core.TestData._
 import swaydb.core.actor.FileSweeper
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.{BlockCache, DBFile}
 import swaydb.core.io.reader.FileReader
 import swaydb.core.segment.format.a.block.reader.{BlockReader, BlockRefReader}

diff --git a/core-stress/src/test/scala/swaydb/core/io/file/DBFileStressWriteSpec.scala b/core-stress/src/test/scala/swaydb/core/io/file/DBFileStressWriteSpec.scala
@@ -29,7 +29,7 @@ import swaydb.core.RunThis._
 import swaydb.core.TestData._
 import swaydb.core.TestSweeper.fileSweeper
 import swaydb.core.actor.FileSweeper
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.util.{Benchmark, BlockCacheFileIDGenerator}
 import swaydb.core.{TestBase, TestSweeper}
 import swaydb.data.util.OperatingSystem

diff --git a/core/src/main/scala/swaydb/core/CoreInitializer.scala b/core/src/main/scala/swaydb/core/CoreInitializer.scala
@@ -29,11 +29,11 @@ import java.nio.file.Paths
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.Error.Level.ExceptionHandler
 import swaydb.core.CoreShutdown.shutdown
-import swaydb.core.actor.{FileSweeper, MemorySweeper}
+import swaydb.core.actor.{ByteBufferSweeper, FileSweeper, MemorySweeper}
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.Effect._
-import swaydb.core.io.file.{BlockCache, ByteBufferSweeper}
+import swaydb.core.io.file.BlockCache
 import swaydb.core.level.compaction._
 import swaydb.core.level.compaction.throttle.{ThrottleCompactor, ThrottleState}
 import swaydb.core.level.zero.LevelZero

diff --git a/core/src/main/scala/swaydb/core/CoreShutdown.scala b/core/src/main/scala/swaydb/core/CoreShutdown.scala
@@ -25,9 +25,9 @@
 package swaydb.core
 
 import com.typesafe.scalalogging.LazyLogging
-import swaydb.core.actor.{FileSweeper, MemorySweeper}
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
-import swaydb.core.io.file.{BlockCache, ByteBufferSweeper}
+import swaydb.core.actor.{ByteBufferSweeper, FileSweeper, MemorySweeper}
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.io.file.BlockCache
 import swaydb.core.level.compaction.Compactor
 import swaydb.core.level.compaction.throttle.ThrottleState
 import swaydb.core.level.zero.LevelZero

diff --git a/...aydb/core/io/file/ByteBufferCleaner.scala → ...swaydb/core/actor/ByteBufferCleaner.scala b/...aydb/core/io/file/ByteBufferCleaner.scala → ...swaydb/core/actor/ByteBufferCleaner.scala
@@ -22,7 +22,7 @@
  * to any of the requirements of the GNU Affero GPL version 3.
  */
 
-package swaydb.core.io.file
+package swaydb.core.actor
 
 import java.lang.invoke.{MethodHandle, MethodHandles, MethodType}
 import java.nio.file.Path

diff --git a/...aydb/core/io/file/ByteBufferSweeper.scala → ...swaydb/core/actor/ByteBufferSweeper.scala b/...aydb/core/io/file/ByteBufferSweeper.scala → ...swaydb/core/actor/ByteBufferSweeper.scala
@@ -22,16 +22,17 @@
  * to any of the requirements of the GNU Affero GPL version 3.
  */
 
-package swaydb.core.io.file
+package swaydb.core.actor
 
 import java.nio.file.{AccessDeniedException, Path}
 import java.nio.{ByteBuffer, MappedByteBuffer}
 
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.Error.IO.ExceptionHandler
 import swaydb._
+import swaydb.core.actor.ByteBufferCleaner.Cleaner
 import swaydb.core.cache.{Cache, CacheNoIO}
-import swaydb.core.io.file.ByteBufferCleaner.Cleaner
+import swaydb.core.io.file.Effect
 import swaydb.core.util.Counter
 import swaydb.core.util.FiniteDurations._
 import swaydb.data.config.ActorConfig.QueueOrder
@@ -127,7 +128,7 @@ private[core] object ByteBufferSweeper extends LazyLogging {
   /**
    * Maintains the count of all delete request for each memory-mapped file.
    */
-  private[file] def recordCleanRequest(command: Command.Clean, pendingClean: mutable.HashMap[Path, Counter.Request[Command.Clean]]): Int =
+  def recordCleanRequest(command: Command.Clean, pendingClean: mutable.HashMap[Path, Counter.Request[Command.Clean]]): Int =
     pendingClean.get(command.filePath) match {
       case Some(request) =>
         request.counter.incrementAndGet()
@@ -141,7 +142,7 @@ private[core] object ByteBufferSweeper extends LazyLogging {
   /**
    * Updates current clean count for the file.
    */
-  private[file] def recordCleanSuccessful(path: Path, pendingClean: mutable.HashMap[Path, Counter.Request[Command.Clean]]): Int =
+  def recordCleanSuccessful(path: Path, pendingClean: mutable.HashMap[Path, Counter.Request[Command.Clean]]): Int =
     pendingClean.get(path) match {
       case Some(request) =>
         if (request.counter.get() <= 1) {
@@ -167,9 +168,9 @@ private[core] object ByteBufferSweeper extends LazyLogging {
    * Sets the cleaner in state after it's successfully applied the clean
    * to the input buffer.
    */
-  private[file] def initCleanerAndPerformClean(state: State,
-                                               buffer: MappedByteBuffer,
-                                               path: Path): IO[swaydb.Error.IO, State] =
+  def initCleanerAndPerformClean(state: State,
+                                 buffer: MappedByteBuffer,
+                                 path: Path): IO[swaydb.Error.IO, State] =
     state.cleaner match {
       case Some(cleaner) =>
         IO {

diff --git a/core/src/main/scala/swaydb/core/io/file/DBFile.scala b/core/src/main/scala/swaydb/core/io/file/DBFile.scala
@@ -28,9 +28,9 @@ import java.nio.file.Path
 
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.Error.IO.ExceptionHandler
-import swaydb.core.actor.{FileSweeper, FileSweeperItem}
+import swaydb.core.actor.{ByteBufferSweeper, FileSweeper, FileSweeperItem}
 import swaydb.core.cache.Cache
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.data.Reserve
 import swaydb.data.config.IOStrategy
 import swaydb.data.slice.Slice

diff --git a/core/src/main/scala/swaydb/core/io/file/MMAPFile.scala b/core/src/main/scala/swaydb/core/io/file/MMAPFile.scala
@@ -32,7 +32,8 @@ import java.util.concurrent.atomic.AtomicBoolean
 
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.IO
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.data.Reserve
 import swaydb.data.slice.Slice
 

diff --git a/core/src/main/scala/swaydb/core/level/Level.scala b/core/src/main/scala/swaydb/core/level/Level.scala
@@ -33,7 +33,7 @@ import swaydb.IO._
 import swaydb.core.actor.{FileSweeper, MemorySweeper}
 import swaydb.core.data.{KeyValue, _}
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.Effect._
 import swaydb.core.io.file.{BlockCache, Effect}
 import swaydb.core.level.seek._

diff --git a/core/src/main/scala/swaydb/core/level/tool/AppendixRepairer.scala b/core/src/main/scala/swaydb/core/level/tool/AppendixRepairer.scala
@@ -32,7 +32,7 @@ import swaydb.IO
 import swaydb.IO._
 import swaydb.core.actor.{FileSweeper, MemorySweeper}
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.Effect
 import swaydb.core.level.AppendixSkipListMerger
 import swaydb.core.map.serializer.MapEntryWriter

diff --git a/core/src/main/scala/swaydb/core/level/zero/LevelZero.scala b/core/src/main/scala/swaydb/core/level/zero/LevelZero.scala
@@ -34,7 +34,7 @@ import swaydb.core.data.KeyValue.{Put, PutOption}
 import swaydb.core.data.Value.FromValue
 import swaydb.core.data._
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.Effect
 import swaydb.core.level.seek._
 import swaydb.core.level.{LevelRef, LevelSeek, NextLevel}

diff --git a/core/src/main/scala/swaydb/core/map/Map.scala b/core/src/main/scala/swaydb/core/map/Map.scala
@@ -31,8 +31,8 @@ import com.typesafe.scalalogging.LazyLogging
 import swaydb.IO
 import swaydb.core.actor.FileSweeper
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.map.serializer.{MapEntryReader, MapEntryWriter}
 import swaydb.core.util.IDGenerator
 import swaydb.core.util.skiplist.{SkipList, SkipListBase}

diff --git a/core/src/main/scala/swaydb/core/map/Maps.scala b/core/src/main/scala/swaydb/core/map/Maps.scala
@@ -35,7 +35,7 @@ import swaydb.IO._
 import swaydb.core.actor.FileSweeper
 import swaydb.core.brake.BrakePedal
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.Effect
 import swaydb.core.io.file.Effect._
 import swaydb.core.map.serializer.{MapEntryReader, MapEntryWriter}

diff --git a/core/src/main/scala/swaydb/core/map/PersistentMap.scala b/core/src/main/scala/swaydb/core/map/PersistentMap.scala
@@ -31,11 +31,11 @@ import com.typesafe.scalalogging.LazyLogging
 import swaydb.Error.Map.ExceptionHandler
 import swaydb.IO
 import swaydb.IO._
-import swaydb.core.actor.FileSweeper
+import swaydb.core.actor.{ByteBufferSweeper, FileSweeper}
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.Effect._
-import swaydb.core.io.file.{ByteBufferSweeper, DBFile, Effect}
+import swaydb.core.io.file.{DBFile, Effect}
 import swaydb.core.map.serializer.{MapCodec, MapEntryReader, MapEntryWriter}
 import swaydb.core.util.Extension
 import swaydb.core.util.skiplist.{SkipList, SkipListConcurrent}

diff --git a/core/src/main/scala/swaydb/core/map/serializer/AppendixMapEntryReader.scala b/core/src/main/scala/swaydb/core/map/serializer/AppendixMapEntryReader.scala
@@ -26,8 +26,8 @@ package swaydb.core.map.serializer
 
 import swaydb.core.actor.{FileSweeper, MemorySweeper}
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
-import swaydb.core.io.file.{BlockCache, ByteBufferSweeper}
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.io.file.BlockCache
 import swaydb.core.map.MapEntry
 import swaydb.core.segment.{Segment, SegmentIO, SegmentSerialiser}
 import swaydb.data.config.MMAP

diff --git a/core/src/main/scala/swaydb/core/map/timer/PersistentTimer.scala b/core/src/main/scala/swaydb/core/map/timer/PersistentTimer.scala
@@ -32,8 +32,8 @@ import swaydb.IO
 import swaydb.core.actor.FileSweeper
 import swaydb.core.data.Time
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.map.serializer.{MapEntryReader, MapEntryWriter}
 import swaydb.core.map.{Map, MapEntry, PersistentMap, SkipListMerger}
 import swaydb.core.util.skiplist.SkipListConcurrent

diff --git a/core/src/main/scala/swaydb/core/map/timer/Timer.scala b/core/src/main/scala/swaydb/core/map/timer/Timer.scala
@@ -29,8 +29,8 @@ import java.nio.file.Path
 import swaydb.IO
 import swaydb.core.data.Time
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.map.MapEntry
 import swaydb.core.map.serializer.{MapEntryReader, MapEntryWriter}
 import swaydb.data.config.MMAP

diff --git a/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala b/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala
@@ -32,7 +32,7 @@ import swaydb.core.actor.{FileSweeper, MemorySweeper}
 import swaydb.core.cache.{Cache, CacheNoIO}
 import swaydb.core.data._
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.{BlockCache, DBFile, Effect}
 import swaydb.core.level.PathsDistributor
 import swaydb.core.segment.format.a.block.binarysearch.BinarySearchIndexBlock

diff --git a/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala b/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala
@@ -32,7 +32,7 @@ import swaydb.IO
 import swaydb.core.actor.{FileSweeper, MemorySweeper}
 import swaydb.core.data.{KeyValue, Persistent, PersistentOption}
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.{BlockCache, DBFile}
 import swaydb.core.level.PathsDistributor
 import swaydb.core.segment.format.a.block.binarysearch.BinarySearchIndexBlock

diff --git a/core/src/main/scala/swaydb/core/segment/Segment.scala b/core/src/main/scala/swaydb/core/segment/Segment.scala
@@ -33,7 +33,7 @@ import swaydb.IO._
 import swaydb.core.actor.{FileSweeper, FileSweeperItem, MemorySweeper}
 import swaydb.core.data._
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.{BlockCache, DBFile, Effect}
 import swaydb.core.level.PathsDistributor
 import swaydb.core.map.Map

diff --git a/core/src/main/scala/swaydb/core/segment/SegmentSerialiser.scala b/core/src/main/scala/swaydb/core/segment/SegmentSerialiser.scala
@@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit
 
 import swaydb.core.actor.{FileSweeper, MemorySweeper}
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.{BlockCache, Effect}
 import swaydb.core.util.Options._
 import swaydb.core.util.{BlockCacheFileIDGenerator, Bytes, Extension, MinMax}

diff --git a/core/src/test/scala/swaydb/core/CommonAssertions.scala b/core/src/test/scala/swaydb/core/CommonAssertions.scala
@@ -34,12 +34,12 @@ import swaydb.Error.Segment.ExceptionHandler
 import swaydb.IOValues._
 import swaydb.core.RunThis._
 import swaydb.core.TestData._
-import swaydb.core.actor.MemorySweeper
+import swaydb.core.actor.{ByteBufferSweeper, MemorySweeper}
 import swaydb.core.data.Memory.PendingApply
 import swaydb.core.data.Value.FromValue
 import swaydb.core.data.{KeyValue, Memory, Value, _}
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
-import swaydb.core.io.file.{ByteBufferSweeper, Effect}
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.io.file.Effect
 import swaydb.core.io.reader.Reader
 import swaydb.core.level.zero.{LevelZero, LevelZeroSkipListMerger}
 import swaydb.core.level.{Level, LevelRef, NextLevel}

diff --git a/core/src/test/scala/swaydb/core/TestBase.scala b/core/src/test/scala/swaydb/core/TestBase.scala
@@ -40,7 +40,7 @@ import swaydb.core.TestData._
 import swaydb.core.TestSweeper.{fileSweeper, _}
 import swaydb.core.actor.{FileSweeper, MemorySweeper}
 import swaydb.core.data.{Memory, MemoryOption, Time}
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.{BlockCache, DBFile, Effect}
 import swaydb.core.io.reader.FileReader
 import swaydb.core.level.compaction._

diff --git a/core/src/test/scala/swaydb/core/TestData.scala b/core/src/test/scala/swaydb/core/TestData.scala
@@ -39,8 +39,8 @@ import swaydb.core.cache.Cache
 import swaydb.core.data.Value.{FromValue, FromValueOption, RangeValue}
 import swaydb.core.data.{KeyValue, _}
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
-import swaydb.core.io.file.{BlockCache, ByteBufferSweeper}
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.io.file.BlockCache
 import swaydb.core.level.seek._
 import swaydb.core.level.zero.LevelZero
 import swaydb.core.level.{Level, NextLevel}

diff --git a/core/src/test/scala/swaydb/core/TestSweeper.scala b/core/src/test/scala/swaydb/core/TestSweeper.scala
@@ -25,9 +25,9 @@
 package swaydb.core
 
 import swaydb.core.CommonAssertions._
-import swaydb.core.actor.{FileSweeper, MemorySweeper}
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
-import swaydb.core.io.file.{BlockCache, ByteBufferSweeper}
+import swaydb.core.actor.{ByteBufferSweeper, FileSweeper, MemorySweeper}
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.io.file.BlockCache
 import swaydb.data.config.{ActorConfig, MemoryCache}
 import swaydb.data.util.StorageUnits._
 

diff --git a/core/src/test/scala/swaydb/core/io/file/ByteBufferSweeperSpec.scala b/core/src/test/scala/swaydb/core/io/file/ByteBufferSweeperSpec.scala
@@ -33,8 +33,8 @@ import swaydb.IOValues._
 import swaydb.core.CommonAssertions.randomIOStrategy
 import swaydb.core.RunThis._
 import swaydb.core.TestData._
-import swaydb.core.actor.FileSweeper
-import swaydb.core.io.file.ByteBufferSweeper.{ByteBufferSweeperActor, Command}
+import swaydb.core.actor.{ByteBufferSweeper, FileSweeper}
+import swaydb.core.actor.ByteBufferSweeper.{ByteBufferSweeperActor, Command}
 import swaydb.core.util.{BlockCacheFileIDGenerator, Counter}
 import swaydb.core.{TestBase, TestExecutionContext, TestSweeper}
 import swaydb.data.config.ActorConfig

diff --git a/core/src/test/scala/swaydb/core/io/file/DBFileSpec.scala b/core/src/test/scala/swaydb/core/io/file/DBFileSpec.scala
@@ -34,7 +34,7 @@ import swaydb.IOValues._
 import swaydb.core.CommonAssertions.randomIOStrategy
 import swaydb.core.TestData._
 import swaydb.core.actor.FileSweeper
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.util.PipeOps._
 import swaydb.core.{TestBase, TestSweeper}
 import swaydb.data.slice.Slice

diff --git a/core/src/test/scala/swaydb/core/level/LevelMapSpec.scala b/core/src/test/scala/swaydb/core/level/LevelMapSpec.scala
@@ -33,8 +33,8 @@ import swaydb.core.RunThis._
 import swaydb.core.TestData._
 import swaydb.core.actor.{FileSweeper, MemorySweeper}
 import swaydb.core.data._
-import swaydb.core.io.file.ByteBufferSweeper
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.level.zero.LevelZeroSkipListMerger
 import swaydb.core.map.{Map, MapEntry, SkipListMerger}
 import swaydb.core.segment.ThreadReadState

diff --git a/core/src/test/scala/swaydb/core/map/MapEntrySpec.scala b/core/src/test/scala/swaydb/core/map/MapEntrySpec.scala
@@ -31,8 +31,8 @@ import swaydb.core.TestData._
 import swaydb.core.actor.{FileSweeper, MemorySweeper}
 import swaydb.core.cache.CacheNoIO
 import swaydb.core.data.{Memory, MemoryOption, Value}
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
-import swaydb.core.io.file.{BlockCache, ByteBufferSweeper}
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.io.file.BlockCache
 import swaydb.core.io.reader.Reader
 import swaydb.core.map.serializer._
 import swaydb.core.segment.{Segment, SegmentIO, SegmentOption}

diff --git a/core/src/test/scala/swaydb/core/map/MapSpec.scala b/core/src/test/scala/swaydb/core/map/MapSpec.scala
@@ -33,7 +33,7 @@ import swaydb.core.RunThis._
 import swaydb.core.TestData._
 import swaydb.core.actor.{FileSweeper, MemorySweeper}
 import swaydb.core.data.{Memory, MemoryOption, Value}
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.Effect._
 import swaydb.core.io.file.{BlockCache, DBFile}
 import swaydb.core.level.AppendixSkipListMerger

diff --git a/core/src/test/scala/swaydb/core/map/MapsSpec.scala b/core/src/test/scala/swaydb/core/map/MapsSpec.scala
@@ -33,8 +33,8 @@ import swaydb.IOValues._
 import swaydb.core.TestData._
 import swaydb.core.actor.FileSweeper
 import swaydb.core.data.{Memory, MemoryOption, Value}
-import swaydb.core.io.file.ByteBufferSweeper
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.io.file.Effect._
 import swaydb.core.level.zero.LevelZeroSkipListMerger
 import swaydb.core.util.Extension

diff --git a/core/src/test/scala/swaydb/core/map/package.scala b/core/src/test/scala/swaydb/core/map/package.scala
@@ -29,8 +29,8 @@ import swaydb.core.RunThis._
 import swaydb.core.actor.FileSweeper
 import swaydb.core.data.{Memory, MemoryOption}
 import swaydb.core.function.FunctionStore
-import swaydb.core.io.file.ByteBufferSweeper
-import swaydb.core.io.file.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.actor.ByteBufferSweeper
+import swaydb.core.actor.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.map.serializer.{MapEntryReader, MapEntryWriter}
 import swaydb.data.config.MMAP
 import swaydb.data.order.{KeyOrder, TimeOrder}