diff --git a/core-performance/src/test/scala/swaydb/core/file/DBFileWriteReadPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/file/DBFileWriteReadPerformanceSpec.scala index e60564fbd..88e43bc9d 100644 --- a/core-performance/src/test/scala/swaydb/core/file/DBFileWriteReadPerformanceSpec.scala +++ b/core-performance/src/test/scala/swaydb/core/file/DBFileWriteReadPerformanceSpec.scala @@ -18,7 +18,7 @@ package swaydb.core.file import swaydb.Benchmark import swaydb.core.TestData._ -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.segment.block.reader.BlockRefReader import swaydb.core.segment.block.{BlockCache, BlockCacheState} diff --git a/core-performance/src/test/scala/swaydb/core/file/ForceSavePerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/file/ForceSavePerformanceSpec.scala index a23ae01b6..003f3a5f4 100644 --- a/core-performance/src/test/scala/swaydb/core/file/ForceSavePerformanceSpec.scala +++ b/core-performance/src/test/scala/swaydb/core/file/ForceSavePerformanceSpec.scala @@ -19,7 +19,7 @@ package swaydb.core.file import swaydb.Benchmark import swaydb.config.ForceSave import swaydb.core.TestData.randomBytesSlice -import swaydb.core.file.sweeper.ByteBufferCleaner +import swaydb.core.file.sweeper.bytebuffer.ByteBufferCleaner import swaydb.core.{TestBase, TestCaseSweeper} import swaydb.effect.Effect import swaydb.testkit.RunThis._ diff --git a/core-performance/src/test/scala/swaydb/core/segment/block/BlockReaderPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/segment/block/BlockReaderPerformanceSpec.scala index ad0b3531f..b13e06f56 100644 --- a/core-performance/src/test/scala/swaydb/core/segment/block/BlockReaderPerformanceSpec.scala +++ b/core-performance/src/test/scala/swaydb/core/segment/block/BlockReaderPerformanceSpec.scala @@ -18,7 +18,7 @@ // //import swaydb.IOValues._ //import swaydb.core.TestData._ -//import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +//import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor //import swaydb.core.file.sweeper.FileSweeper //import swaydb.core.file.{BlockCache, DBFile} //import swaydb.core.file.reader.FileReader 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 index 177637b29..507788a92 100644 --- a/core-stress/src/test/scala/swaydb/core/io/file/DBFileStressWriteSpec.scala +++ b/core-stress/src/test/scala/swaydb/core/io/file/DBFileStressWriteSpec.scala @@ -20,7 +20,7 @@ //import swaydb.testkit.RunThis._ //import swaydb.core.TestData._ //import swaydb.core.file.sweeper.FileSweeper -//import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +//import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor //import swaydb.core.file.sweeper.FileSweeper //import swaydb.core.util.{Benchmark, BlockCacheFileIDGenerator} //import swaydb.core.{TestBase, TestSweeper} diff --git a/core-tools/src/main/scala/swaydb/core/tool/AppendixRepairer.scala b/core-tools/src/main/scala/swaydb/core/tool/AppendixRepairer.scala index 285ef9b08..359feb4d0 100644 --- a/core-tools/src/main/scala/swaydb/core/tool/AppendixRepairer.scala +++ b/core-tools/src/main/scala/swaydb/core/tool/AppendixRepairer.scala @@ -23,7 +23,7 @@ import swaydb.config.repairAppendix.AppendixRepairStrategy._ import swaydb.config.repairAppendix.{AppendixRepairStrategy, OverlappingSegmentsException, SegmentInfoUnTyped} import swaydb.config.{ForceSave, MMAP} import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.level.AppendixLogCache import swaydb.core.log.serialiser.LogEntryWriter diff --git a/core/src/main/scala/swaydb/core/Core.scala b/core/src/main/scala/swaydb/core/Core.scala index 9d2848d32..fbae2628a 100644 --- a/core/src/main/scala/swaydb/core/Core.scala +++ b/core/src/main/scala/swaydb/core/Core.scala @@ -25,7 +25,7 @@ import swaydb.config.compaction.{CompactionConfig, LevelMeter} import swaydb.config.sequencer.Sequencer import swaydb.core.build.BuildValidator import swaydb.core.compaction.Compactor -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.level.zero.LevelZero import swaydb.core.log.LogEntry import swaydb.core.log.serialiser.LevelZeroLogEntryWriter diff --git a/core/src/main/scala/swaydb/core/CoreInitializer.scala b/core/src/main/scala/swaydb/core/CoreInitializer.scala index 37ce69ed8..be772fcb0 100644 --- a/core/src/main/scala/swaydb/core/CoreInitializer.scala +++ b/core/src/main/scala/swaydb/core/CoreInitializer.scala @@ -26,8 +26,9 @@ import swaydb.core.build.{Build, BuildValidator} import swaydb.core.compaction._ import swaydb.core.compaction.throttle.ThrottleCompactorCreator import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor -import swaydb.core.file.sweeper.{ByteBufferSweeper, FileSweeper} +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.FileSweeper +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper import swaydb.core.level.zero.LevelZero import swaydb.core.level.{Level, LevelCloser, NextLevel} import swaydb.core.segment.{FunctionStore, block} diff --git a/core/src/main/scala/swaydb/core/compaction/io/CompactionIO.scala b/core/src/main/scala/swaydb/core/compaction/io/CompactionIO.scala index 374d9cfed..ee2bd6773 100644 --- a/core/src/main/scala/swaydb/core/compaction/io/CompactionIO.scala +++ b/core/src/main/scala/swaydb/core/compaction/io/CompactionIO.scala @@ -18,7 +18,7 @@ package swaydb.core.compaction.io import swaydb.config.{MMAP, SegmentRefCacheLife} import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.level.PathsDistributor import swaydb.core.segment.{FunctionStore, Segment} diff --git a/core/src/main/scala/swaydb/core/file/DBFile.scala b/core/src/main/scala/swaydb/core/file/DBFile.scala index 8782e23cd..3eefa7c72 100644 --- a/core/src/main/scala/swaydb/core/file/DBFile.scala +++ b/core/src/main/scala/swaydb/core/file/DBFile.scala @@ -20,8 +20,9 @@ import com.typesafe.scalalogging.LazyLogging import swaydb.Error.IO.ExceptionHandler import swaydb.config.ForceSave import swaydb.core.cache.Cache -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor -import swaydb.core.file.sweeper.{ByteBufferCommand, FileSweeper, FileSweeperCommand, FileSweeperItem} +import swaydb.core.file.sweeper.bytebuffer.ByteBufferCommand +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.{FileSweeper, FileSweeperCommand, FileSweeperItem} import swaydb.effect.{Effect, IOStrategy, Reserve} import swaydb.slice.{Slice, SliceRO} import swaydb.{Error, IO} diff --git a/core/src/main/scala/swaydb/core/file/MMAPFile.scala b/core/src/main/scala/swaydb/core/file/MMAPFile.scala index 7271980f9..08af1f576 100644 --- a/core/src/main/scala/swaydb/core/file/MMAPFile.scala +++ b/core/src/main/scala/swaydb/core/file/MMAPFile.scala @@ -18,8 +18,8 @@ package swaydb.core.file import com.typesafe.scalalogging.LazyLogging import swaydb.config.ForceSave -import swaydb.core.file.sweeper.ByteBufferCommand -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferCommand +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.effect.{Effect, Reserve} import swaydb.slice.{Slice, SliceRO, Slices} diff --git a/core/src/main/scala/swaydb/core/file/sweeper/ByteBufferCleaner.scala b/core/src/main/scala/swaydb/core/file/sweeper/bytebuffer/ByteBufferCleaner.scala similarity index 98% rename from core/src/main/scala/swaydb/core/file/sweeper/ByteBufferCleaner.scala rename to core/src/main/scala/swaydb/core/file/sweeper/bytebuffer/ByteBufferCleaner.scala index 9b661a5da..fca1ccb5e 100644 --- a/core/src/main/scala/swaydb/core/file/sweeper/ByteBufferCleaner.scala +++ b/core/src/main/scala/swaydb/core/file/sweeper/bytebuffer/ByteBufferCleaner.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package swaydb.core.file.sweeper +package swaydb.core.file.sweeper.bytebuffer import com.typesafe.scalalogging.LazyLogging import swaydb.IO diff --git a/core/src/main/scala/swaydb/core/file/sweeper/ByteBufferCommand.scala b/core/src/main/scala/swaydb/core/file/sweeper/bytebuffer/ByteBufferCommand.scala similarity index 96% rename from core/src/main/scala/swaydb/core/file/sweeper/ByteBufferCommand.scala rename to core/src/main/scala/swaydb/core/file/sweeper/bytebuffer/ByteBufferCommand.scala index 2aba63433..e91d2a385 100644 --- a/core/src/main/scala/swaydb/core/file/sweeper/ByteBufferCommand.scala +++ b/core/src/main/scala/swaydb/core/file/sweeper/bytebuffer/ByteBufferCommand.scala @@ -1,8 +1,8 @@ -package swaydb.core.file.sweeper +package swaydb.core.file.sweeper.bytebuffer import swaydb.config.ForceSave import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.{ByteBufferSweeperActor, State} +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.{ByteBufferSweeperActor, State} import swaydb.{Actor, ActorRef} import java.nio.MappedByteBuffer diff --git a/core/src/main/scala/swaydb/core/file/sweeper/ByteBufferSweeper.scala b/core/src/main/scala/swaydb/core/file/sweeper/bytebuffer/ByteBufferSweeper.scala similarity index 99% rename from core/src/main/scala/swaydb/core/file/sweeper/ByteBufferSweeper.scala rename to core/src/main/scala/swaydb/core/file/sweeper/bytebuffer/ByteBufferSweeper.scala index 28c583992..4c68962b7 100644 --- a/core/src/main/scala/swaydb/core/file/sweeper/ByteBufferSweeper.scala +++ b/core/src/main/scala/swaydb/core/file/sweeper/bytebuffer/ByteBufferSweeper.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package swaydb.core.file.sweeper +package swaydb.core.file.sweeper.bytebuffer import com.typesafe.scalalogging.LazyLogging import swaydb.ActorConfig.QueueOrder @@ -22,7 +22,7 @@ import swaydb.Bag.Implicits._ import swaydb.Error.IO.ExceptionHandler import swaydb._ import swaydb.core.cache.{Cache, CacheNoIO} -import swaydb.core.file.sweeper.ByteBufferCleaner.Cleaner +import swaydb.core.file.sweeper.bytebuffer.ByteBufferCleaner.Cleaner import swaydb.effect.Effect import swaydb.utils.English import swaydb.utils.FiniteDurations.FiniteDurationImplicits diff --git a/core/src/main/scala/swaydb/core/level/Level.scala b/core/src/main/scala/swaydb/core/level/Level.scala index 94039f6e4..0dde132e4 100644 --- a/core/src/main/scala/swaydb/core/level/Level.scala +++ b/core/src/main/scala/swaydb/core/level/Level.scala @@ -24,7 +24,7 @@ import swaydb.config.compaction.{LevelMeter, LevelThrottle} import swaydb.config.storage.LevelStorage import swaydb.core.compaction.io.CompactionIO import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.level.seek._ import swaydb.core.level.zero.LevelZero.LevelZeroLog diff --git a/core/src/main/scala/swaydb/core/level/LevelCloser.scala b/core/src/main/scala/swaydb/core/level/LevelCloser.scala index 42f2c7e52..f9ae8cb95 100644 --- a/core/src/main/scala/swaydb/core/level/LevelCloser.scala +++ b/core/src/main/scala/swaydb/core/level/LevelCloser.scala @@ -19,8 +19,9 @@ package swaydb.core.level import com.typesafe.scalalogging.LazyLogging import swaydb.Bag import swaydb.Bag.Implicits._ -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor -import swaydb.core.file.sweeper.{ByteBufferSweeper, FileSweeper} +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.FileSweeper +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper import swaydb.core.segment.cache.sweeper.MemorySweeper object LevelCloser extends LazyLogging { diff --git a/core/src/main/scala/swaydb/core/level/zero/LevelZero.scala b/core/src/main/scala/swaydb/core/level/zero/LevelZero.scala index 04119b82e..9a1c73b67 100644 --- a/core/src/main/scala/swaydb/core/level/zero/LevelZero.scala +++ b/core/src/main/scala/swaydb/core/level/zero/LevelZero.scala @@ -25,7 +25,7 @@ import swaydb.config.compaction.{LevelMeter, LevelZeroThrottle} import swaydb.config.storage.Level0Storage import swaydb.config.{Atomic, MMAP, OptimiseWrites} import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.level.seek._ import swaydb.core.level.zero.LevelZero.LevelZeroLog diff --git a/core/src/main/scala/swaydb/core/log/Log.scala b/core/src/main/scala/swaydb/core/log/Log.scala index 1ca8d4d52..7368ce360 100644 --- a/core/src/main/scala/swaydb/core/log/Log.scala +++ b/core/src/main/scala/swaydb/core/log/Log.scala @@ -20,7 +20,7 @@ import com.typesafe.scalalogging.LazyLogging import swaydb.IO import swaydb.config.MMAP import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.log.serialiser.{LogEntryReader, LogEntryWriter} import swaydb.core.util.IDGenerator diff --git a/core/src/main/scala/swaydb/core/log/Logs.scala b/core/src/main/scala/swaydb/core/log/Logs.scala index 50cb3eab0..57ac81a3f 100644 --- a/core/src/main/scala/swaydb/core/log/Logs.scala +++ b/core/src/main/scala/swaydb/core/log/Logs.scala @@ -21,7 +21,7 @@ import swaydb.Error.Log.ExceptionHandler import swaydb.config.accelerate.{Accelerator, LevelZeroMeter} import swaydb.config.{MMAP, RecoveryMode} import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.log.serialiser.{LogEntryReader, LogEntryWriter} import swaydb.core.log.timer.Timer diff --git a/core/src/main/scala/swaydb/core/log/PersistentLog.scala b/core/src/main/scala/swaydb/core/log/PersistentLog.scala index 1dfd63090..1a2a4e20b 100644 --- a/core/src/main/scala/swaydb/core/log/PersistentLog.scala +++ b/core/src/main/scala/swaydb/core/log/PersistentLog.scala @@ -20,8 +20,9 @@ import com.typesafe.scalalogging.LazyLogging import swaydb.Error.Log.ExceptionHandler import swaydb.IO import swaydb.config.MMAP -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor -import swaydb.core.file.sweeper.{ByteBufferCommand, ByteBufferSweeper, FileSweeper} +import swaydb.core.file.sweeper.FileSweeper +import swaydb.core.file.sweeper.bytebuffer.ByteBufferCommand +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.{DBFile, ForceSaveApplier} import swaydb.core.log.serialiser.{LogEntryReader, LogEntrySerialiser, LogEntryWriter} import swaydb.effect.Effect._ diff --git a/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLog.scala b/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLog.scala index 8ae240350..1b3cb7b95 100644 --- a/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLog.scala +++ b/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLog.scala @@ -19,7 +19,7 @@ package swaydb.core.log.applied import com.typesafe.scalalogging.LazyLogging import swaydb.config.MMAP import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.log import swaydb.core.log.serialiser.{AppliedFunctionsLogEntryReader, AppliedFunctionsLogEntryWriter} diff --git a/core/src/main/scala/swaydb/core/log/counter/CounterLog.scala b/core/src/main/scala/swaydb/core/log/counter/CounterLog.scala index 45f6eaa27..0643592de 100644 --- a/core/src/main/scala/swaydb/core/log/counter/CounterLog.scala +++ b/core/src/main/scala/swaydb/core/log/counter/CounterLog.scala @@ -19,7 +19,7 @@ package swaydb.core.log.counter import swaydb.IO import swaydb.config.MMAP import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.log.LogEntry import swaydb.core.log.serialiser.{LogEntryReader, LogEntryWriter} import swaydb.slice.Slice diff --git a/core/src/main/scala/swaydb/core/log/counter/PersistentCounterLog.scala b/core/src/main/scala/swaydb/core/log/counter/PersistentCounterLog.scala index bb5bb782c..abd996650 100644 --- a/core/src/main/scala/swaydb/core/log/counter/PersistentCounterLog.scala +++ b/core/src/main/scala/swaydb/core/log/counter/PersistentCounterLog.scala @@ -21,7 +21,7 @@ import swaydb.Error.Log.ExceptionHandler import swaydb.IO import swaydb.config.MMAP import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.log.serialiser.{LogEntryReader, LogEntryWriter} import swaydb.core.log.{Log, LogEntry, PersistentLog} diff --git a/core/src/main/scala/swaydb/core/log/serialiser/AppendixLogEntryReader.scala b/core/src/main/scala/swaydb/core/log/serialiser/AppendixLogEntryReader.scala index 92b16b83b..8a18811fe 100644 --- a/core/src/main/scala/swaydb/core/log/serialiser/AppendixLogEntryReader.scala +++ b/core/src/main/scala/swaydb/core/log/serialiser/AppendixLogEntryReader.scala @@ -18,7 +18,7 @@ package swaydb.core.log.serialiser import swaydb.config.{MMAP, SegmentRefCacheLife} import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.log.LogEntry import swaydb.core.segment.cache.sweeper.MemorySweeper diff --git a/core/src/main/scala/swaydb/core/log/timer/Timer.scala b/core/src/main/scala/swaydb/core/log/timer/Timer.scala index 9133e849a..293ecad34 100644 --- a/core/src/main/scala/swaydb/core/log/timer/Timer.scala +++ b/core/src/main/scala/swaydb/core/log/timer/Timer.scala @@ -19,7 +19,7 @@ package swaydb.core.log.timer import swaydb.IO import swaydb.config.MMAP import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.log.LogEntry import swaydb.core.log.counter.{CounterLog, PersistentCounterLog} import swaydb.core.log.serialiser.{CounterLogEntryReader, CounterLogEntryWriter, LogEntryReader, LogEntryWriter} diff --git a/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala b/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala index 1b307a60f..225abaded 100644 --- a/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala +++ b/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala @@ -24,7 +24,7 @@ import swaydb.config.{MMAP, SegmentRefCacheLife} import swaydb.core.cache.{Cache, CacheNoIO} import swaydb.core.compaction.io.CompactionIO import swaydb.core.file.reader.Reader -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.{FileSweeper, FileSweeperCommand} import swaydb.core.file.{DBFile, ForceSaveApplier} import swaydb.core.level.PathsDistributor diff --git a/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala b/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala index 7582ee5c2..8d5fa8811 100644 --- a/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala +++ b/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala @@ -22,7 +22,7 @@ import swaydb.IO import swaydb.config.compaction.CompactionConfig.CompactionParallelism import swaydb.config.{MMAP, SegmentRefCacheLife} import swaydb.core.compaction.io.CompactionIO -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.{FileSweeper, FileSweeperCommand} import swaydb.core.file.{DBFile, ForceSaveApplier} import swaydb.core.level.PathsDistributor diff --git a/core/src/main/scala/swaydb/core/segment/Segment.scala b/core/src/main/scala/swaydb/core/segment/Segment.scala index b989a0192..f2c5141e8 100644 --- a/core/src/main/scala/swaydb/core/segment/Segment.scala +++ b/core/src/main/scala/swaydb/core/segment/Segment.scala @@ -20,7 +20,7 @@ import com.typesafe.scalalogging.LazyLogging import swaydb.Error.Segment.ExceptionHandler import swaydb.config.compaction.CompactionConfig.CompactionParallelism import swaydb.config.{MMAP, SegmentRefCacheLife} -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.{FileSweeper, FileSweeperItem} import swaydb.core.file.{DBFile, ForceSaveApplier} import swaydb.core.level.PathsDistributor diff --git a/core/src/main/scala/swaydb/core/segment/SegmentSerialiser.scala b/core/src/main/scala/swaydb/core/segment/SegmentSerialiser.scala index 7b94bcbed..36b801345 100644 --- a/core/src/main/scala/swaydb/core/segment/SegmentSerialiser.scala +++ b/core/src/main/scala/swaydb/core/segment/SegmentSerialiser.scala @@ -18,7 +18,7 @@ package swaydb.core.segment import swaydb.config.{MMAP, SegmentRefCacheLife} import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.log.serialiser.ValueSerialiser.MinMaxSerialiser import swaydb.core.segment.cache.sweeper.MemorySweeper diff --git a/core/src/main/scala/swaydb/core/segment/defrag/DefragPersistentSegment.scala b/core/src/main/scala/swaydb/core/segment/defrag/DefragPersistentSegment.scala index 6d314496d..6557092fe 100644 --- a/core/src/main/scala/swaydb/core/segment/defrag/DefragPersistentSegment.scala +++ b/core/src/main/scala/swaydb/core/segment/defrag/DefragPersistentSegment.scala @@ -20,7 +20,7 @@ import swaydb.config.compaction.CompactionConfig.CompactionParallelism import swaydb.config.{MMAP, SegmentRefCacheLife} import swaydb.core.compaction.io.CompactionIO import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.level.PathsDistributor import swaydb.core.segment._ diff --git a/core/src/main/scala/swaydb/core/segment/io/SegmentWriteIO.scala b/core/src/main/scala/swaydb/core/segment/io/SegmentWriteIO.scala index e08f2719f..7013ff0df 100644 --- a/core/src/main/scala/swaydb/core/segment/io/SegmentWriteIO.scala +++ b/core/src/main/scala/swaydb/core/segment/io/SegmentWriteIO.scala @@ -18,7 +18,7 @@ package swaydb.core.segment.io import swaydb.config.{MMAP, SegmentRefCacheLife} import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.level.PathsDistributor import swaydb.core.segment._ diff --git a/core/src/main/scala/swaydb/core/segment/io/SegmentWriteMemoryIO.scala b/core/src/main/scala/swaydb/core/segment/io/SegmentWriteMemoryIO.scala index c421a9086..c8c1e24ec 100644 --- a/core/src/main/scala/swaydb/core/segment/io/SegmentWriteMemoryIO.scala +++ b/core/src/main/scala/swaydb/core/segment/io/SegmentWriteMemoryIO.scala @@ -19,7 +19,7 @@ package swaydb.core.segment.io import swaydb.Error.Segment.ExceptionHandler import swaydb.config.{MMAP, SegmentRefCacheLife} import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.level.PathsDistributor import swaydb.core.segment._ diff --git a/core/src/main/scala/swaydb/core/segment/io/SegmentWritePersistentIO.scala b/core/src/main/scala/swaydb/core/segment/io/SegmentWritePersistentIO.scala index 6b6ed29db..2172b8937 100644 --- a/core/src/main/scala/swaydb/core/segment/io/SegmentWritePersistentIO.scala +++ b/core/src/main/scala/swaydb/core/segment/io/SegmentWritePersistentIO.scala @@ -19,7 +19,7 @@ package swaydb.core.segment.io import com.typesafe.scalalogging.LazyLogging import swaydb.Error.Segment.ExceptionHandler import swaydb.config.{ForceSave, MMAP, SegmentRefCacheLife} -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.sweeper.FileSweeper import swaydb.core.file.{DBFile, ForceSaveApplier} import swaydb.core.level.PathsDistributor diff --git a/core/src/test/scala/swaydb/core/CommonAssertions.scala b/core/src/test/scala/swaydb/core/CommonAssertions.scala index 6ce73073d..06cf5c07c 100644 --- a/core/src/test/scala/swaydb/core/CommonAssertions.scala +++ b/core/src/test/scala/swaydb/core/CommonAssertions.scala @@ -27,7 +27,7 @@ import swaydb.config.compaction.PushStrategy import swaydb.config.{Atomic, OptimiseWrites} import swaydb.core.TestData._ import swaydb.core.file.reader.{FileReader, Reader} -import swaydb.core.file.sweeper.{ByteBufferCommand, ByteBufferSweeper} +import swaydb.core.file.sweeper.bytebuffer.ByteBufferCommand import swaydb.core.level.zero.{LevelZero, LevelZeroLogCache} import swaydb.core.level.{Level, LevelRef, NextLevel} import swaydb.core.log.serialiser.{LogEntryWriter, RangeValueSerialiser, ValueSerialiser} diff --git a/core/src/test/scala/swaydb/core/TestCaseSweeper.scala b/core/src/test/scala/swaydb/core/TestCaseSweeper.scala index 4cf3bfe19..1e29b931f 100644 --- a/core/src/test/scala/swaydb/core/TestCaseSweeper.scala +++ b/core/src/test/scala/swaydb/core/TestCaseSweeper.scala @@ -21,8 +21,9 @@ import swaydb.configs.level.DefaultExecutionContext import swaydb.core.TestSweeper._ import swaydb.core.cache.{Cache, CacheNoIO} import swaydb.core.compaction.io.CompactionIO -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor -import swaydb.core.file.sweeper.{ByteBufferSweeper, FileSweeper} +import swaydb.core.file.sweeper.FileSweeper +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.file.{DBFile, ForceSaveApplier} import swaydb.core.level.LevelRef import swaydb.core.log.counter.CounterLog diff --git a/core/src/test/scala/swaydb/core/TestSweeper.scala b/core/src/test/scala/swaydb/core/TestSweeper.scala index c38830ffa..73b5ff85a 100644 --- a/core/src/test/scala/swaydb/core/TestSweeper.scala +++ b/core/src/test/scala/swaydb/core/TestSweeper.scala @@ -20,8 +20,9 @@ import swaydb.ActorConfig import swaydb.config.MemoryCache import swaydb.configs.level.DefaultExecutionContext import swaydb.core.CommonAssertions._ -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor -import swaydb.core.file.sweeper.{ByteBufferSweeper, FileSweeper} +import swaydb.core.file.sweeper.FileSweeper +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.segment.block.{BlockCache, BlockCacheState} import swaydb.core.segment.cache.sweeper.MemorySweeper import swaydb.utils.StorageUnits._ diff --git a/core/src/test/scala/swaydb/core/file/MMAPFileSpec.scala b/core/src/test/scala/swaydb/core/file/MMAPFileSpec.scala index 8129f21a8..bff8bed88 100644 --- a/core/src/test/scala/swaydb/core/file/MMAPFileSpec.scala +++ b/core/src/test/scala/swaydb/core/file/MMAPFileSpec.scala @@ -20,7 +20,7 @@ import org.scalamock.scalatest.MockFactory import swaydb.IOValues._ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ -import swaydb.core.file.sweeper.ByteBufferCleaner +import swaydb.core.file.sweeper.bytebuffer.ByteBufferCleaner import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave} import swaydb.effect.Effect import swaydb.slice.Slice diff --git a/core/src/test/scala/swaydb/core/file/ByteBufferSweeperSpec.scala b/core/src/test/scala/swaydb/core/file/sweeper/bytebuffer/ByteBufferSweeperSpec.scala similarity index 98% rename from core/src/test/scala/swaydb/core/file/ByteBufferSweeperSpec.scala rename to core/src/test/scala/swaydb/core/file/sweeper/bytebuffer/ByteBufferSweeperSpec.scala index 57f7d2be9..387c89cb3 100644 --- a/core/src/test/scala/swaydb/core/file/ByteBufferSweeperSpec.scala +++ b/core/src/test/scala/swaydb/core/file/sweeper/bytebuffer/ByteBufferSweeperSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package swaydb.core.file +package swaydb.core.file.sweeper.bytebuffer import org.scalamock.scalatest.MockFactory import org.scalatest.OptionValues._ @@ -22,8 +22,9 @@ import swaydb.IOValues._ import swaydb.core.CommonAssertions.randomThreadSafeIOStrategy import swaydb.core.TestCaseSweeper._ import swaydb.core.TestData._ -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor -import swaydb.core.file.sweeper.{ByteBufferCommand, ByteBufferSweeper, FileSweeper} +import swaydb.core.file.sweeper.FileSweeper +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.{DBFile, ForceSaveApplier, MMAPFile} import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestForceSave} import swaydb.effect.Effect import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/log/MapTestUtil.scala b/core/src/test/scala/swaydb/core/log/MapTestUtil.scala index e145eb21a..9b565bf49 100644 --- a/core/src/test/scala/swaydb/core/log/MapTestUtil.scala +++ b/core/src/test/scala/swaydb/core/log/MapTestUtil.scala @@ -22,8 +22,8 @@ import swaydb.config.MMAP import swaydb.core.TestCaseSweeper._ import swaydb.core.TestData._ import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferCommand -import swaydb.core.file.sweeper.ByteBufferSweeper.{ByteBufferSweeperActor, State} +import swaydb.core.file.sweeper.bytebuffer.ByteBufferCommand +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.{ByteBufferSweeperActor, State} import swaydb.core.log.counter.{CounterLog, PersistentCounterLog} import swaydb.core.log.serialiser.{LogEntryReader, LogEntryWriter} import swaydb.core.log.timer.Timer diff --git a/core/src/test/scala/swaydb/core/log/timer/TimerSpec.scala b/core/src/test/scala/swaydb/core/log/timer/TimerSpec.scala index 63613fed1..4e029d2da 100644 --- a/core/src/test/scala/swaydb/core/log/timer/TimerSpec.scala +++ b/core/src/test/scala/swaydb/core/log/timer/TimerSpec.scala @@ -18,7 +18,7 @@ package swaydb.core.log.timer import swaydb.config.MMAP import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.log.LogEntry import swaydb.core.log.MapTestUtil._ import swaydb.core.log.counter.CounterLog diff --git a/core/src/test/scala/swaydb/core/segment/SegmentWriteSpec.scala b/core/src/test/scala/swaydb/core/segment/SegmentWriteSpec.scala index 219814245..7f617812d 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentWriteSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentWriteSpec.scala @@ -26,7 +26,8 @@ import swaydb.core.PrivateMethodInvokers._ import swaydb.core.TestCaseSweeper._ import swaydb.core.TestData._ import swaydb.core._ -import swaydb.core.file.sweeper.{ByteBufferSweeper, FileSweeper} +import swaydb.core.file.sweeper.FileSweeper +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper import swaydb.core.level.PathsDistributor import swaydb.core.segment.block.BlockCacheState import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig @@ -47,8 +48,8 @@ import swaydb.effect.Effect._ import swaydb.effect.{Dir, Effect, Extension} import swaydb.serializers.Default._ import swaydb.serializers._ -import swaydb.slice.{MaxKey, Slice} import swaydb.slice.order.{KeyOrder, TimeOrder} +import swaydb.slice.{MaxKey, Slice} import swaydb.testkit.RunThis._ import swaydb.utils.StorageUnits._ import swaydb.utils.{ByteSizeOf, OperatingSystem} diff --git a/swaydb/src/main/scala/swaydb/MultiMap.scala b/swaydb/src/main/scala/swaydb/MultiMap.scala index a0700eabe..0a53aeee6 100644 --- a/swaydb/src/main/scala/swaydb/MultiMap.scala +++ b/swaydb/src/main/scala/swaydb/MultiMap.scala @@ -19,7 +19,7 @@ package swaydb import swaydb.config.accelerate.LevelZeroMeter import swaydb.config.compaction.LevelMeter import swaydb.core.file.ForceSaveApplier -import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor +import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.log.counter.CounterLog import swaydb.core.util.Times._ import swaydb.multimap.{MultiKey, MultiPrepare, MultiValue, Schema}