diff --git a/build.sbt b/build.sbt index e7bfbc90b..0dc526662 100644 --- a/build.sbt +++ b/build.sbt @@ -195,6 +195,7 @@ lazy val core = data, effect, utils, + slice, cache, actor, compression, @@ -217,6 +218,7 @@ lazy val data = effect, actor, utils, + slice, testkit % Test ) @@ -243,6 +245,16 @@ lazy val series = serializers % Test ) +lazy val slice = + project + .settings(commonSettings) + .settings(publishSettings) + .settings(libraryDependencies ++= commonDependencies(scalaVersion.value)) + .dependsOn( + effect, + testkit % Test, + ) + lazy val `data-java` = project .settings(commonSettings) diff --git a/compression/src/main/scala/swaydb/compression/CompressorInternal.scala b/compression/src/main/scala/swaydb/compression/CompressorInternal.scala index 4b0545677..ba3b0f0f6 100644 --- a/compression/src/main/scala/swaydb/compression/CompressorInternal.scala +++ b/compression/src/main/scala/swaydb/compression/CompressorInternal.scala @@ -22,7 +22,7 @@ import org.xerial.snappy import swaydb.data.compression.LZ4Compressor.{Fast, High} import swaydb.data.compression.LZ4Instance import swaydb.data.compression.LZ4Instance._ -import swaydb.data.slice.Slice +import swaydb.slice.Slice import java.nio.ByteBuffer diff --git a/compression/src/main/scala/swaydb/compression/DecompressorInternal.scala b/compression/src/main/scala/swaydb/compression/DecompressorInternal.scala index 2ed0537a4..c7ede9b0a 100644 --- a/compression/src/main/scala/swaydb/compression/DecompressorInternal.scala +++ b/compression/src/main/scala/swaydb/compression/DecompressorInternal.scala @@ -19,7 +19,7 @@ package swaydb.compression import net.jpountz.lz4.{LZ4Factory, LZ4FastDecompressor, LZ4SafeDecompressor} import org.xerial.snappy import swaydb.data.compression.{DecompressorId, LZ4Decompressor, LZ4Instance} -import swaydb.data.slice.Slice +import swaydb.slice.Slice /** * Internal types that have 1 to 1 mapping with the more configurable swaydb.Decompressor types. diff --git a/compression/src/test/scala/swaydb/compression/CompressionSpec.scala b/compression/src/test/scala/swaydb/compression/CompressionSpec.scala index 3047b32f5..cb02c6e74 100644 --- a/compression/src/test/scala/swaydb/compression/CompressionSpec.scala +++ b/compression/src/test/scala/swaydb/compression/CompressionSpec.scala @@ -19,7 +19,7 @@ package swaydb.compression import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import swaydb.compression.CompressionTestGen._ -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.utils.ByteSizeOf diff --git a/core-performance/src/test/scala/swaydb/core/level/LevelPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/level/LevelPerformanceSpec.scala index fd08158da..dfb6eed23 100644 --- a/core-performance/src/test/scala/swaydb/core/level/LevelPerformanceSpec.scala +++ b/core-performance/src/test/scala/swaydb/core/level/LevelPerformanceSpec.scala @@ -28,7 +28,7 @@ //import swaydb.core.util.Benchmark //import swaydb.data.config.{IOAction, IOStrategy} //import swaydb.data.order.KeyOrder -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.data.util.StorageUnits._ //import swaydb.core.CommonAssertions._ //import scala.util.Random diff --git a/core-performance/src/test/scala/swaydb/core/level/zero/LevelPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/level/zero/LevelPerformanceSpec.scala index b691528dd..600324d77 100644 --- a/core-performance/src/test/scala/swaydb/core/level/zero/LevelPerformanceSpec.scala +++ b/core-performance/src/test/scala/swaydb/core/level/zero/LevelPerformanceSpec.scala @@ -23,7 +23,7 @@ //import swaydb.core.util.{Benchmark, SkipList} //import swaydb.core.{TestBase, TestSweeper} //import swaydb.data.order.KeyOrder -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.data.util.StorageUnits._ // //import scala.util.Random diff --git a/core-performance/src/test/scala/swaydb/core/map/MapsPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/map/MapsPerformanceSpec.scala index f92aa7217..46d2d9a06 100644 --- a/core-performance/src/test/scala/swaydb/core/map/MapsPerformanceSpec.scala +++ b/core-performance/src/test/scala/swaydb/core/map/MapsPerformanceSpec.scala @@ -28,7 +28,7 @@ //import swaydb.data.accelerate.Accelerator //import swaydb.data.config.RecoveryMode //import swaydb.data.order.{KeyOrder, TimeOrder} -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.data.util.StorageUnits._ diff --git a/core-performance/src/test/scala/swaydb/core/merge/SegmentMerge_Performance_Spec.scala b/core-performance/src/test/scala/swaydb/core/merge/SegmentMerge_Performance_Spec.scala index ff175499e..f7a99fe8f 100644 --- a/core-performance/src/test/scala/swaydb/core/merge/SegmentMerge_Performance_Spec.scala +++ b/core-performance/src/test/scala/swaydb/core/merge/SegmentMerge_Performance_Spec.scala @@ -20,7 +20,7 @@ import swaydb.core.data.{Memory, Time} import swaydb.core.util.Benchmark import swaydb.core.{TestBase, TestTimer} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ class SegmentMerge_Performance_Spec extends TestBase { diff --git a/core-performance/src/test/scala/swaydb/core/segment/SegmentReadPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/segment/SegmentReadPerformanceSpec.scala index 31bc3f863..f11b562ea 100644 --- a/core-performance/src/test/scala/swaydb/core/segment/SegmentReadPerformanceSpec.scala +++ b/core-performance/src/test/scala/swaydb/core/segment/SegmentReadPerformanceSpec.scala @@ -37,7 +37,7 @@ import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestSweeper import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.SegmentRefCacheLife import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.{Dir, IOAction, IOStrategy} import swaydb.testkit.RunThis.FutureImplicits import swaydb.utils.StorageUnits._ diff --git a/core-performance/src/test/scala/swaydb/core/segment/block/SegmentSearcherPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/segment/block/SegmentSearcherPerformanceSpec.scala index 0d565dd49..195a1a54b 100644 --- a/core-performance/src/test/scala/swaydb/core/segment/block/SegmentSearcherPerformanceSpec.scala +++ b/core-performance/src/test/scala/swaydb/core/segment/block/SegmentSearcherPerformanceSpec.scala @@ -23,7 +23,7 @@ //import swaydb.core.util.Benchmark //import swaydb.data.config.IOStrategy //import swaydb.data.order.KeyOrder -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.serializers.Default._ //import swaydb.serializers._ // diff --git a/core-stress/src/test/scala/swaydb/core/level/zero/LevelZeroStressSpec.scala b/core-stress/src/test/scala/swaydb/core/level/zero/LevelZeroStressSpec.scala index f74807192..845f5705f 100644 --- a/core-stress/src/test/scala/swaydb/core/level/zero/LevelZeroStressSpec.scala +++ b/core-stress/src/test/scala/swaydb/core/level/zero/LevelZeroStressSpec.scala @@ -18,7 +18,7 @@ // //import swaydb.core.TestBase //import swaydb.core.util.{Benchmark, Delay} -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.data.order.KeyOrder //import swaydb.serializers.Default._ //import swaydb.core.IOAssert._ diff --git a/core-stress/src/test/scala/swaydb/core/map/MapStressSpec.scala b/core-stress/src/test/scala/swaydb/core/map/MapStressSpec.scala index 04c7c9bd6..940e561b7 100644 --- a/core-stress/src/test/scala/swaydb/core/map/MapStressSpec.scala +++ b/core-stress/src/test/scala/swaydb/core/map/MapStressSpec.scala @@ -26,7 +26,7 @@ //import swaydb.core.log.serializer.LevelZeroLogEntryWriter.Level0PutWriter //import swaydb.core.{TestBase, TestSweeper, TestTimer} //import swaydb.data.order.{KeyOrder, TimeOrder} -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.data.util.StorageUnits._ // //class MapStressSpec extends TestBase { diff --git a/core-stress/src/test/scala/swaydb/core/map/MapsStressSpec.scala b/core-stress/src/test/scala/swaydb/core/map/MapsStressSpec.scala index 5f5a88baf..62d81bd62 100644 --- a/core-stress/src/test/scala/swaydb/core/map/MapsStressSpec.scala +++ b/core-stress/src/test/scala/swaydb/core/map/MapsStressSpec.scala @@ -29,7 +29,7 @@ //import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} //import swaydb.data.config.RecoveryMode //import swaydb.data.order.{KeyOrder, TimeOrder} -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.data.util.StorageUnits._ // //class MapsStressSpec extends TestBase { diff --git a/core-stress/src/test/scala/swaydb/core/segment/merge/MergeListStressSpec.scala b/core-stress/src/test/scala/swaydb/core/segment/merge/MergeListStressSpec.scala index 122255126..6e926449b 100644 --- a/core-stress/src/test/scala/swaydb/core/segment/merge/MergeListStressSpec.scala +++ b/core-stress/src/test/scala/swaydb/core/segment/merge/MergeListStressSpec.scala @@ -22,7 +22,7 @@ //import swaydb.core.TestData._ //import swaydb.core.TestTimer //import swaydb.core.data.{KeyValue, Memory, Value} -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.serializers.Default._ //import swaydb.serializers._ // diff --git a/core-stress/src/test/scala/swaydb/core/segment/merge/SegmentMergeStressSpec.scala b/core-stress/src/test/scala/swaydb/core/segment/merge/SegmentMergeStressSpec.scala index aa14fcbd2..0ca741e8f 100644 --- a/core-stress/src/test/scala/swaydb/core/segment/merge/SegmentMergeStressSpec.scala +++ b/core-stress/src/test/scala/swaydb/core/segment/merge/SegmentMergeStressSpec.scala @@ -24,7 +24,7 @@ //import swaydb.core.segment.block.hashindex.HashIndexBlock //import swaydb.core.util.Benchmark //import swaydb.data.order.{KeyOrder, TimeOrder} -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.data.util.StorageUnits._ // //class SegmentMergeStressSpec extends TestBase { diff --git a/core/src/main/scala/swaydb/core/Core.scala b/core/src/main/scala/swaydb/core/Core.scala index 7f4c4867f..79ff14073 100644 --- a/core/src/main/scala/swaydb/core/Core.scala +++ b/core/src/main/scala/swaydb/core/Core.scala @@ -34,7 +34,7 @@ import swaydb.data.compaction.{CompactionConfig, LevelMeter} import swaydb.data.config._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.utils.TupleOrNone import java.nio.file.Path diff --git a/core/src/main/scala/swaydb/core/CoreInitializer.scala b/core/src/main/scala/swaydb/core/CoreInitializer.scala index 512ce4a4b..c4db404ce 100644 --- a/core/src/main/scala/swaydb/core/CoreInitializer.scala +++ b/core/src/main/scala/swaydb/core/CoreInitializer.scala @@ -38,7 +38,7 @@ import swaydb.data.compaction.CompactionConfig import swaydb.data.config._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.storage.{Level0Storage, LevelStorage} import swaydb.data.{Atomic, OptimiseWrites} import swaydb.effect.Effect._ diff --git a/core/src/main/scala/swaydb/core/build/Build.scala b/core/src/main/scala/swaydb/core/build/Build.scala index 01d1ff8a6..6e88f3cab 100644 --- a/core/src/main/scala/swaydb/core/build/Build.scala +++ b/core/src/main/scala/swaydb/core/build/Build.scala @@ -19,7 +19,7 @@ package swaydb.core.build import com.typesafe.scalalogging.LazyLogging import swaydb.IO import swaydb.data.DataType -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.Effect import swaydb.macros.VersionReader diff --git a/core/src/main/scala/swaydb/core/build/BuildSerialiser.scala b/core/src/main/scala/swaydb/core/build/BuildSerialiser.scala index b0b4a4cf4..5ecc9d58f 100644 --- a/core/src/main/scala/swaydb/core/build/BuildSerialiser.scala +++ b/core/src/main/scala/swaydb/core/build/BuildSerialiser.scala @@ -18,7 +18,7 @@ package swaydb.core.build import swaydb.core.util.CRC32 import swaydb.data.DataType -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.ByteSizeOf import java.nio.file.Path diff --git a/core/src/main/scala/swaydb/core/data/KeyValue.scala b/core/src/main/scala/swaydb/core/data/KeyValue.scala index 5f6957370..d810190f5 100644 --- a/core/src/main/scala/swaydb/core/data/KeyValue.scala +++ b/core/src/main/scala/swaydb/core/data/KeyValue.scala @@ -26,7 +26,7 @@ import swaydb.core.segment.ref.search.KeyMatcher import swaydb.core.util.Bytes import swaydb.data.MaxKey import swaydb.data.order.KeyOrder -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.utils.{SomeOrNone, SomeOrNoneCovariant, TupleOrNone} import scala.concurrent.duration.{Deadline, FiniteDuration} diff --git a/core/src/main/scala/swaydb/core/data/SwayFunction.scala b/core/src/main/scala/swaydb/core/data/SwayFunction.scala index 44cb41e2c..60beda8b6 100644 --- a/core/src/main/scala/swaydb/core/data/SwayFunction.scala +++ b/core/src/main/scala/swaydb/core/data/SwayFunction.scala @@ -16,7 +16,7 @@ package swaydb.core.data -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import scala.concurrent.duration.Deadline diff --git a/core/src/main/scala/swaydb/core/data/Time.scala b/core/src/main/scala/swaydb/core/data/Time.scala index b41f29206..5c96729c1 100644 --- a/core/src/main/scala/swaydb/core/data/Time.scala +++ b/core/src/main/scala/swaydb/core/data/Time.scala @@ -18,8 +18,8 @@ package swaydb.core.data import swaydb.IO import swaydb.data.order.TimeOrder -import swaydb.data.slice.Slice -import swaydb.data.utils.ScalaByteOps +import swaydb.slice.Slice +import swaydb.slice.utils.ScalaByteOps import swaydb.utils.ByteSizeOf private[core] object Time { diff --git a/core/src/main/scala/swaydb/core/data/Value.scala b/core/src/main/scala/swaydb/core/data/Value.scala index aa5314705..5cd577c2b 100644 --- a/core/src/main/scala/swaydb/core/data/Value.scala +++ b/core/src/main/scala/swaydb/core/data/Value.scala @@ -16,7 +16,7 @@ package swaydb.core.data -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.utils.SomeOrNone import scala.concurrent.duration.Deadline diff --git a/core/src/main/scala/swaydb/core/function/FunctionStore.scala b/core/src/main/scala/swaydb/core/function/FunctionStore.scala index deda58142..abf5e4da9 100644 --- a/core/src/main/scala/swaydb/core/function/FunctionStore.scala +++ b/core/src/main/scala/swaydb/core/function/FunctionStore.scala @@ -19,7 +19,7 @@ package swaydb.core.function import swaydb.OK import swaydb.core.data.{SwayFunction, Value} import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import java.util.concurrent.ConcurrentHashMap import scala.annotation.tailrec diff --git a/core/src/main/scala/swaydb/core/io/file/DBFile.scala b/core/src/main/scala/swaydb/core/io/file/DBFile.scala index 94aeafd0f..0849e5b95 100644 --- a/core/src/main/scala/swaydb/core/io/file/DBFile.scala +++ b/core/src/main/scala/swaydb/core/io/file/DBFile.scala @@ -22,7 +22,7 @@ import swaydb.cache.Cache import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.sweeper.{ByteBufferSweeper, FileSweeper, FileSweeperItem} import swaydb.data.config.ForceSave -import swaydb.data.slice.{Slice, SliceRO} +import swaydb.slice.{Slice, SliceRO} import swaydb.effect.{Effect, IOStrategy, Reserve} import swaydb.{Error, IO} diff --git a/core/src/main/scala/swaydb/core/io/file/DBFileType.scala b/core/src/main/scala/swaydb/core/io/file/DBFileType.scala index 374b871a5..fac94a193 100644 --- a/core/src/main/scala/swaydb/core/io/file/DBFileType.scala +++ b/core/src/main/scala/swaydb/core/io/file/DBFileType.scala @@ -17,7 +17,7 @@ package swaydb.core.io.file import swaydb.core.sweeper.FileSweeperItem -import swaydb.data.slice.{Slice, SliceRO} +import swaydb.slice.{Slice, SliceRO} import java.nio.channels.WritableByteChannel import java.nio.file.Path diff --git a/core/src/main/scala/swaydb/core/io/file/MMAPFile.scala b/core/src/main/scala/swaydb/core/io/file/MMAPFile.scala index d7c30adc9..adfc1ec77 100644 --- a/core/src/main/scala/swaydb/core/io/file/MMAPFile.scala +++ b/core/src/main/scala/swaydb/core/io/file/MMAPFile.scala @@ -20,7 +20,7 @@ import com.typesafe.scalalogging.LazyLogging import swaydb.core.sweeper.ByteBufferSweeper import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.data.config.ForceSave -import swaydb.data.slice.{Slice, SliceRO, Slices} +import swaydb.slice.{Slice, SliceRO, Slices} import swaydb.effect.{Effect, Reserve} import java.nio.channels.FileChannel.MapMode diff --git a/core/src/main/scala/swaydb/core/io/file/StandardFile.scala b/core/src/main/scala/swaydb/core/io/file/StandardFile.scala index 7ba91bef1..c10b9877a 100644 --- a/core/src/main/scala/swaydb/core/io/file/StandardFile.scala +++ b/core/src/main/scala/swaydb/core/io/file/StandardFile.scala @@ -19,7 +19,7 @@ package swaydb.core.io.file import com.typesafe.scalalogging.LazyLogging import swaydb.core.util.Collections import swaydb.data.config.ForceSave -import swaydb.data.slice.{Slice, SliceRO, Slices} +import swaydb.slice.{Slice, SliceRO, Slices} import swaydb.effect.Effect import java.nio.ByteBuffer diff --git a/core/src/main/scala/swaydb/core/io/reader/FileReader.scala b/core/src/main/scala/swaydb/core/io/reader/FileReader.scala index b826f0c1a..bb3e4b931 100644 --- a/core/src/main/scala/swaydb/core/io/reader/FileReader.scala +++ b/core/src/main/scala/swaydb/core/io/reader/FileReader.scala @@ -18,8 +18,8 @@ package swaydb.core.io.reader import com.typesafe.scalalogging.LazyLogging import swaydb.core.io.file.DBFile -import swaydb.data.slice.{Reader, Slice, SliceRO} -import swaydb.data.utils.ByteOps +import swaydb.slice.{Reader, Slice, SliceRO} +import swaydb.slice.utils.ByteOps import java.nio.file.Path diff --git a/core/src/main/scala/swaydb/core/io/reader/Reader.scala b/core/src/main/scala/swaydb/core/io/reader/Reader.scala index 108d32b2c..71736e124 100644 --- a/core/src/main/scala/swaydb/core/io/reader/Reader.scala +++ b/core/src/main/scala/swaydb/core/io/reader/Reader.scala @@ -17,7 +17,7 @@ package swaydb.core.io.reader import swaydb.core.io.file.DBFile -import swaydb.data.slice.{Slice, SliceReader} +import swaydb.slice.{Slice, SliceReader} private[swaydb] object Reader { diff --git a/core/src/main/scala/swaydb/core/level/AppendixLogCache.scala b/core/src/main/scala/swaydb/core/level/AppendixLogCache.scala index 6b6abf3ae..4ec19d76e 100644 --- a/core/src/main/scala/swaydb/core/level/AppendixLogCache.scala +++ b/core/src/main/scala/swaydb/core/level/AppendixLogCache.scala @@ -21,7 +21,7 @@ import swaydb.core.log.{LogCache, LogCacheBuilder, LogEntry} import swaydb.core.segment.{Segment, SegmentOption} import swaydb.skiplist.SkipListConcurrent import swaydb.data.order.KeyOrder -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import scala.reflect.ClassTag diff --git a/core/src/main/scala/swaydb/core/level/Level.scala b/core/src/main/scala/swaydb/core/level/Level.scala index 8bad6f859..dabc803bb 100644 --- a/core/src/main/scala/swaydb/core/level/Level.scala +++ b/core/src/main/scala/swaydb/core/level/Level.scala @@ -48,13 +48,13 @@ import swaydb.core.util._ import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.compaction.{LevelMeter, LevelThrottle} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.SliceIOImplicits._ -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.SliceIOImplicits._ +import swaydb.slice.{Slice, SliceOption} import swaydb.data.storage.LevelStorage import swaydb.effect.Effect._ import swaydb.effect.{Dir, Effect, Extension, FileLocker} -import swaydb.utils.Futures -import swaydb.{Aggregator, Bag, Error, IO} +import swaydb.utils.{Aggregator, Futures} +import swaydb.{Bag, Error, IO} import java.nio.channels.FileChannel import java.nio.file.{Path, StandardOpenOption} diff --git a/core/src/main/scala/swaydb/core/level/LevelRef.scala b/core/src/main/scala/swaydb/core/level/LevelRef.scala index 3bb5166a3..d42ec0837 100644 --- a/core/src/main/scala/swaydb/core/level/LevelRef.scala +++ b/core/src/main/scala/swaydb/core/level/LevelRef.scala @@ -22,7 +22,7 @@ import swaydb.core.segment.ref.search.ThreadReadState import swaydb.core.segment.{Segment, SegmentOption} import swaydb.data.compaction.LevelMeter import swaydb.data.config.{ForceSave, MMAP} -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.{Bag, IO} import java.nio.file.Path diff --git a/core/src/main/scala/swaydb/core/level/NextLevel.scala b/core/src/main/scala/swaydb/core/level/NextLevel.scala index c9dcc35a5..3d49af96f 100644 --- a/core/src/main/scala/swaydb/core/level/NextLevel.scala +++ b/core/src/main/scala/swaydb/core/level/NextLevel.scala @@ -25,7 +25,7 @@ import swaydb.core.segment.block.segment.transient.TransientSegment import swaydb.core.segment.{Segment, SegmentOption} import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.compaction.{LevelMeter, LevelThrottle} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.Dir import swaydb.{Error, IO} diff --git a/core/src/main/scala/swaydb/core/level/compaction/io/CompactionIO.scala b/core/src/main/scala/swaydb/core/level/compaction/io/CompactionIO.scala index 6204e71a2..eb6db33d6 100644 --- a/core/src/main/scala/swaydb/core/level/compaction/io/CompactionIO.scala +++ b/core/src/main/scala/swaydb/core/level/compaction/io/CompactionIO.scala @@ -28,7 +28,7 @@ import swaydb.core.sweeper.{FileSweeper, MemorySweeper} import swaydb.core.util.IDGenerator import swaydb.data.config.{MMAP, SegmentRefCacheLife} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.{Actor, DefActor} import java.util.concurrent.ConcurrentHashMap diff --git a/core/src/main/scala/swaydb/core/level/compaction/task/assigner/LevelTaskAssigner.scala b/core/src/main/scala/swaydb/core/level/compaction/task/assigner/LevelTaskAssigner.scala index e7ccfe20e..6072da1c1 100644 --- a/core/src/main/scala/swaydb/core/level/compaction/task/assigner/LevelTaskAssigner.scala +++ b/core/src/main/scala/swaydb/core/level/compaction/task/assigner/LevelTaskAssigner.scala @@ -23,7 +23,7 @@ import swaydb.core.segment.Segment import swaydb.data.NonEmptyList import swaydb.data.compaction.PushStrategy import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice case object LevelTaskAssigner { diff --git a/core/src/main/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner.scala b/core/src/main/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner.scala index d96676d28..bbb838ece 100644 --- a/core/src/main/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner.scala +++ b/core/src/main/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner.scala @@ -16,7 +16,7 @@ package swaydb.core.level.compaction.task.assigner -import swaydb.Aggregator +import swaydb.utils.Aggregator import swaydb.core.data.{KeyValue, Memory} import swaydb.core.function.FunctionStore import swaydb.core.level.Level @@ -30,7 +30,7 @@ import swaydb.core.segment.assigner.Assignable import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.compaction.PushStrategy import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{MaxKey, NonEmptyList} import swaydb.utils.Futures diff --git a/core/src/main/scala/swaydb/core/level/compaction/task/assigner/TaskAssigner.scala b/core/src/main/scala/swaydb/core/level/compaction/task/assigner/TaskAssigner.scala index c090eb4e9..931c2e6c4 100644 --- a/core/src/main/scala/swaydb/core/level/compaction/task/assigner/TaskAssigner.scala +++ b/core/src/main/scala/swaydb/core/level/compaction/task/assigner/TaskAssigner.scala @@ -16,7 +16,7 @@ package swaydb.core.level.compaction.task.assigner -import swaydb.Aggregator +import swaydb.utils.Aggregator import swaydb.core.data.Value.FromValue import swaydb.core.data.{Memory, Time, Value} import swaydb.core.level.Level @@ -26,7 +26,7 @@ import swaydb.core.segment.Segment import swaydb.core.segment.assigner.{Assignable, Assigner, Assignment, AssignmentResult} import swaydb.data.compaction.PushStrategy import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{MaxKey, NonEmptyList} import scala.annotation.tailrec diff --git a/core/src/main/scala/swaydb/core/level/compaction/throttle/ThrottleCompactorContext.scala b/core/src/main/scala/swaydb/core/level/compaction/throttle/ThrottleCompactorContext.scala index a57b2900d..e3b9d12bd 100644 --- a/core/src/main/scala/swaydb/core/level/compaction/throttle/ThrottleCompactorContext.scala +++ b/core/src/main/scala/swaydb/core/level/compaction/throttle/ThrottleCompactorContext.scala @@ -19,7 +19,7 @@ package swaydb.core.level.compaction.throttle import com.typesafe.scalalogging.LazyLogging import swaydb.core.level.LevelRef import swaydb.data.compaction.CompactionConfig -import swaydb.data.slice.Slice +import swaydb.slice.Slice import java.util.TimerTask import scala.concurrent.duration.Deadline diff --git a/core/src/main/scala/swaydb/core/level/compaction/throttle/ThrottleCompactorCreator.scala b/core/src/main/scala/swaydb/core/level/compaction/throttle/ThrottleCompactorCreator.scala index 890b257b1..1dd5b1b94 100644 --- a/core/src/main/scala/swaydb/core/level/compaction/throttle/ThrottleCompactorCreator.scala +++ b/core/src/main/scala/swaydb/core/level/compaction/throttle/ThrottleCompactorCreator.scala @@ -24,7 +24,7 @@ import swaydb.core.level.compaction.{Compactor, CompactorCreator} import swaydb.core.level.zero.LevelZero import swaydb.core.sweeper.FileSweeper import swaydb.data.compaction.CompactionConfig -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.{Actor, DefActor, Error, IO} import scala.concurrent.ExecutionContext diff --git a/core/src/main/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviorWakeUp.scala b/core/src/main/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviorWakeUp.scala index 55c9e2ca6..298ecadcb 100644 --- a/core/src/main/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviorWakeUp.scala +++ b/core/src/main/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviorWakeUp.scala @@ -27,7 +27,7 @@ import swaydb.core.sweeper.FileSweeper import swaydb.data.NonEmptyList import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.compaction.PushStrategy -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.FiniteDurations import swaydb.utils.FiniteDurations.FiniteDurationImplicits import swaydb.utils.Futures.{FutureUnitImplicits, _} diff --git a/core/src/main/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCommit.scala b/core/src/main/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCommit.scala index f2d8a4708..f1537b6ab 100644 --- a/core/src/main/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCommit.scala +++ b/core/src/main/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCommit.scala @@ -24,8 +24,8 @@ import swaydb.core.level.zero.LevelZero import swaydb.core.level.zero.LevelZero.LevelZeroLog import swaydb.core.segment.block.segment.transient.TransientSegment import swaydb.core.segment.{Segment, SegmentOption} -import swaydb.data.slice.Slice -import swaydb.data.slice.SliceIOImplicits._ +import swaydb.slice.Slice +import swaydb.slice.SliceIOImplicits._ import swaydb.{Error, IO} protected case object BehaviourCommit extends LazyLogging { diff --git a/core/src/main/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask.scala b/core/src/main/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask.scala index 4e5736770..81543d865 100644 --- a/core/src/main/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask.scala +++ b/core/src/main/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask.scala @@ -25,7 +25,7 @@ import swaydb.core.segment.assigner.Assignable import swaydb.core.segment.{Segment, SegmentOption} import swaydb.core.sweeper.FileSweeper import swaydb.data.compaction.CompactionConfig.CompactionParallelism -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.Futures import swaydb.utils.Futures.FutureImplicits diff --git a/core/src/main/scala/swaydb/core/level/seek/CurrentGetter.scala b/core/src/main/scala/swaydb/core/level/seek/CurrentGetter.scala index f6c4ffe0b..6b11ff43e 100644 --- a/core/src/main/scala/swaydb/core/level/seek/CurrentGetter.scala +++ b/core/src/main/scala/swaydb/core/level/seek/CurrentGetter.scala @@ -18,7 +18,7 @@ package swaydb.core.level.seek import swaydb.core.data.KeyValueOption import swaydb.core.segment.ref.search.ThreadReadState -import swaydb.data.slice.Slice +import swaydb.slice.Slice trait CurrentGetter { diff --git a/core/src/main/scala/swaydb/core/level/seek/CurrentWalker.scala b/core/src/main/scala/swaydb/core/level/seek/CurrentWalker.scala index e90660baf..664f53b00 100644 --- a/core/src/main/scala/swaydb/core/level/seek/CurrentWalker.scala +++ b/core/src/main/scala/swaydb/core/level/seek/CurrentWalker.scala @@ -19,7 +19,7 @@ package swaydb.core.level.seek import swaydb.core.data.KeyValue import swaydb.core.level.LevelSeek import swaydb.core.segment.ref.search.ThreadReadState -import swaydb.data.slice.Slice +import swaydb.slice.Slice trait CurrentWalker { diff --git a/core/src/main/scala/swaydb/core/level/seek/Get.scala b/core/src/main/scala/swaydb/core/level/seek/Get.scala index 0e8361ad7..62b3748e8 100644 --- a/core/src/main/scala/swaydb/core/level/seek/Get.scala +++ b/core/src/main/scala/swaydb/core/level/seek/Get.scala @@ -21,7 +21,7 @@ import swaydb.core.function.FunctionStore import swaydb.core.merge.{FunctionMerger, PendingApplyMerger, RemoveMerger, UpdateMerger} import swaydb.core.segment.ref.search.ThreadReadState import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.annotation.tailrec diff --git a/core/src/main/scala/swaydb/core/level/seek/Higher.scala b/core/src/main/scala/swaydb/core/level/seek/Higher.scala index 44ced87f3..1be46c36e 100644 --- a/core/src/main/scala/swaydb/core/level/seek/Higher.scala +++ b/core/src/main/scala/swaydb/core/level/seek/Higher.scala @@ -23,7 +23,7 @@ import swaydb.core.level.LevelSeek import swaydb.core.merge._ import swaydb.core.segment.ref.search.ThreadReadState import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.annotation.tailrec diff --git a/core/src/main/scala/swaydb/core/level/seek/Lower.scala b/core/src/main/scala/swaydb/core/level/seek/Lower.scala index 414b94c08..1041c7ab2 100644 --- a/core/src/main/scala/swaydb/core/level/seek/Lower.scala +++ b/core/src/main/scala/swaydb/core/level/seek/Lower.scala @@ -23,7 +23,7 @@ import swaydb.core.level.LevelSeek import swaydb.core.merge._ import swaydb.core.segment.ref.search.ThreadReadState import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.annotation.tailrec diff --git a/core/src/main/scala/swaydb/core/level/seek/NextGetter.scala b/core/src/main/scala/swaydb/core/level/seek/NextGetter.scala index 027d07997..66ce0a51a 100644 --- a/core/src/main/scala/swaydb/core/level/seek/NextGetter.scala +++ b/core/src/main/scala/swaydb/core/level/seek/NextGetter.scala @@ -18,7 +18,7 @@ package swaydb.core.level.seek import swaydb.core.data.KeyValue import swaydb.core.segment.ref.search.ThreadReadState -import swaydb.data.slice.Slice +import swaydb.slice.Slice trait NextGetter { diff --git a/core/src/main/scala/swaydb/core/level/seek/NextWalker.scala b/core/src/main/scala/swaydb/core/level/seek/NextWalker.scala index 8094eb274..aec7b1447 100644 --- a/core/src/main/scala/swaydb/core/level/seek/NextWalker.scala +++ b/core/src/main/scala/swaydb/core/level/seek/NextWalker.scala @@ -18,7 +18,7 @@ package swaydb.core.level.seek import swaydb.core.data.KeyValue import swaydb.core.segment.ref.search.ThreadReadState -import swaydb.data.slice.Slice +import swaydb.slice.Slice trait NextWalker extends NextGetter { diff --git a/core/src/main/scala/swaydb/core/level/tool/AppendixRepairer.scala b/core/src/main/scala/swaydb/core/level/tool/AppendixRepairer.scala index 97ef9c84b..a4fc2baee 100644 --- a/core/src/main/scala/swaydb/core/level/tool/AppendixRepairer.scala +++ b/core/src/main/scala/swaydb/core/level/tool/AppendixRepairer.scala @@ -30,8 +30,8 @@ import swaydb.data.config.{ForceSave, MMAP} import swaydb.data.order.KeyOrder import swaydb.data.repairAppendix.AppendixRepairStrategy._ import swaydb.data.repairAppendix.{AppendixRepairStrategy, OverlappingSegmentsException, SegmentInfoUnTyped} -import swaydb.data.slice.Slice -import swaydb.data.slice.SliceIOImplicits._ +import swaydb.slice.Slice +import swaydb.slice.SliceIOImplicits._ import swaydb.effect.{Effect, Extension} import swaydb.utils.StorageUnits._ 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 4008891a8..4c192dabd 100644 --- a/core/src/main/scala/swaydb/core/level/zero/LevelZero.scala +++ b/core/src/main/scala/swaydb/core/level/zero/LevelZero.scala @@ -44,7 +44,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.{LevelMeter, LevelZeroThrottle} import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.data.storage.Level0Storage import swaydb.data.{Atomic, OptimiseWrites} import swaydb.effect.{Effect, FileLocker} diff --git a/core/src/main/scala/swaydb/core/level/zero/LevelZeroLogCache.scala b/core/src/main/scala/swaydb/core/level/zero/LevelZeroLogCache.scala index 7e4c65a8b..9ad1c1f36 100644 --- a/core/src/main/scala/swaydb/core/level/zero/LevelZeroLogCache.scala +++ b/core/src/main/scala/swaydb/core/level/zero/LevelZeroLogCache.scala @@ -22,7 +22,7 @@ import swaydb.core.function.FunctionStore import swaydb.core.log.{LogCache, LogCacheBuilder, LogEntry} import swaydb.skiplist.{SkipList, SkipListConcurrent, SkipListSeries} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.data.{Atomic, MaxKey, MaxKeyOption, OptimiseWrites} import scala.collection.mutable.ListBuffer diff --git a/core/src/main/scala/swaydb/core/level/zero/LevelZeroMerger.scala b/core/src/main/scala/swaydb/core/level/zero/LevelZeroMerger.scala index 527c9d804..aaf91edda 100644 --- a/core/src/main/scala/swaydb/core/level/zero/LevelZeroMerger.scala +++ b/core/src/main/scala/swaydb/core/level/zero/LevelZeroMerger.scala @@ -16,14 +16,14 @@ package swaydb.core.level.zero -import swaydb.Aggregator +import swaydb.utils.Aggregator import swaydb.core.data.Memory import swaydb.core.function.FunctionStore import swaydb.core.level.zero.LevelZeroLogCache.State import swaydb.core.merge.stats.MergeStats import swaydb.core.merge.{FixedMerger, KeyValueMerger} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.collection.mutable.ListBuffer diff --git a/core/src/main/scala/swaydb/core/log/LogEntry.scala b/core/src/main/scala/swaydb/core/log/LogEntry.scala index 88f316ea2..53fd06aa2 100644 --- a/core/src/main/scala/swaydb/core/log/LogEntry.scala +++ b/core/src/main/scala/swaydb/core/log/LogEntry.scala @@ -22,7 +22,7 @@ import swaydb.core.log.serializer.{LogEntrySerialiser, LogEntryWriter} import swaydb.core.segment.Segment import swaydb.skiplist.{SkipList, SkipListBatchable, SkipListConcurrent} import swaydb.data.order.KeyOrder -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} import scala.collection.mutable.ListBuffer diff --git a/core/src/main/scala/swaydb/core/log/Logs.scala b/core/src/main/scala/swaydb/core/log/Logs.scala index 06af9e4c9..9e5edbbe7 100644 --- a/core/src/main/scala/swaydb/core/log/Logs.scala +++ b/core/src/main/scala/swaydb/core/log/Logs.scala @@ -29,7 +29,7 @@ import swaydb.core.util.queue.VolatileQueue import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.config.{MMAP, RecoveryMode} import swaydb.data.order.KeyOrder -import swaydb.data.slice.SliceIOImplicits._ +import swaydb.slice.SliceIOImplicits._ import swaydb.effect.Effect import swaydb.effect.Effect._ import swaydb.{Error, IO} diff --git a/core/src/main/scala/swaydb/core/log/PersistentLog.scala b/core/src/main/scala/swaydb/core/log/PersistentLog.scala index 7ac64133e..1385c9b14 100644 --- a/core/src/main/scala/swaydb/core/log/PersistentLog.scala +++ b/core/src/main/scala/swaydb/core/log/PersistentLog.scala @@ -25,8 +25,8 @@ import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.sweeper.{ByteBufferSweeper, FileSweeper} import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice -import swaydb.data.slice.SliceIOImplicits._ +import swaydb.slice.Slice +import swaydb.slice.SliceIOImplicits._ import swaydb.effect.Effect._ import swaydb.effect.{Effect, Extension, IOStrategy} 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 f1833f5fb..47f42f589 100644 --- a/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLog.scala +++ b/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLog.scala @@ -26,7 +26,7 @@ import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.sweeper.FileSweeper import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.Effect import swaydb.{Error, IO} diff --git a/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLogCache.scala b/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLogCache.scala index 1b1166e53..b47e0df49 100644 --- a/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLogCache.scala +++ b/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLogCache.scala @@ -19,7 +19,7 @@ package swaydb.core.log.applied import swaydb.core.log.{LogCache, LogCacheBuilder, LogEntry} import swaydb.skiplist.SkipListConcurrent import swaydb.data.order.KeyOrder -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} object AppliedFunctionsLogCache { 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 44de3c5f5..ed2ea86fb 100644 --- a/core/src/main/scala/swaydb/core/log/counter/CounterLog.scala +++ b/core/src/main/scala/swaydb/core/log/counter/CounterLog.scala @@ -22,7 +22,7 @@ import swaydb.core.log.LogEntry import swaydb.core.log.serializer.{LogEntryReader, LogEntryWriter} import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.data.config.MMAP -import swaydb.data.slice.Slice +import swaydb.slice.Slice import java.nio.file.Path 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 782991637..9936d4967 100644 --- a/core/src/main/scala/swaydb/core/log/counter/PersistentCounterLog.scala +++ b/core/src/main/scala/swaydb/core/log/counter/PersistentCounterLog.scala @@ -26,7 +26,7 @@ import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.sweeper.FileSweeper import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import java.nio.file.Path diff --git a/core/src/main/scala/swaydb/core/log/counter/PersistentCounterLogCache.scala b/core/src/main/scala/swaydb/core/log/counter/PersistentCounterLogCache.scala index c31ff7bd5..883145a11 100644 --- a/core/src/main/scala/swaydb/core/log/counter/PersistentCounterLogCache.scala +++ b/core/src/main/scala/swaydb/core/log/counter/PersistentCounterLogCache.scala @@ -17,7 +17,7 @@ package swaydb.core.log.counter import swaydb.core.log.{LogCache, LogCacheBuilder, LogEntry} -import swaydb.data.slice.Slice +import swaydb.slice.Slice object PersistentCounterLogCache { implicit def builder = diff --git a/core/src/main/scala/swaydb/core/log/serializer/AppendixLogEntryReader.scala b/core/src/main/scala/swaydb/core/log/serializer/AppendixLogEntryReader.scala index 3cf2f494a..43d5b22a6 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/AppendixLogEntryReader.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/AppendixLogEntryReader.scala @@ -25,7 +25,7 @@ import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.sweeper.{FileSweeper, MemorySweeper} import swaydb.data.config.{MMAP, SegmentRefCacheLife} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.{ReaderBase, Slice} +import swaydb.slice.{ReaderBase, Slice} private[core] object AppendixLogEntryReader { def apply(mmapSegment: MMAP.Segment, diff --git a/core/src/main/scala/swaydb/core/log/serializer/AppendixLogEntryWriter.scala b/core/src/main/scala/swaydb/core/log/serializer/AppendixLogEntryWriter.scala index d17dd118f..def1b9b46 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/AppendixLogEntryWriter.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/AppendixLogEntryWriter.scala @@ -19,7 +19,7 @@ package swaydb.core.log.serializer import swaydb.core.log.LogEntry import swaydb.core.segment.{Segment, SegmentSerialiser} import swaydb.core.util.Bytes -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} private[core] object AppendixLogEntryWriter { diff --git a/core/src/main/scala/swaydb/core/log/serializer/AppliedFunctionsLogEntryReader.scala b/core/src/main/scala/swaydb/core/log/serializer/AppliedFunctionsLogEntryReader.scala index 9e0375a7a..ddcc6f842 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/AppliedFunctionsLogEntryReader.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/AppliedFunctionsLogEntryReader.scala @@ -17,7 +17,7 @@ package swaydb.core.log.serializer import swaydb.core.log.LogEntry -import swaydb.data.slice.{ReaderBase, Slice} +import swaydb.slice.{ReaderBase, Slice} private[swaydb] object AppliedFunctionsLogEntryReader { diff --git a/core/src/main/scala/swaydb/core/log/serializer/AppliedFunctionsLogEntryWriter.scala b/core/src/main/scala/swaydb/core/log/serializer/AppliedFunctionsLogEntryWriter.scala index fdca66991..70f042ac5 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/AppliedFunctionsLogEntryWriter.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/AppliedFunctionsLogEntryWriter.scala @@ -18,7 +18,7 @@ package swaydb.core.log.serializer import swaydb.core.log.LogEntry import swaydb.core.util.Bytes -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} import swaydb.utils.ByteSizeOf private[swaydb] object AppliedFunctionsLogEntryWriter { diff --git a/core/src/main/scala/swaydb/core/log/serializer/CounterLogEntryReader.scala b/core/src/main/scala/swaydb/core/log/serializer/CounterLogEntryReader.scala index b53f9c267..43dfc3432 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/CounterLogEntryReader.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/CounterLogEntryReader.scala @@ -17,7 +17,7 @@ package swaydb.core.log.serializer import swaydb.core.log.LogEntry -import swaydb.data.slice.{ReaderBase, Slice} +import swaydb.slice.{ReaderBase, Slice} private[swaydb] object CounterLogEntryReader { diff --git a/core/src/main/scala/swaydb/core/log/serializer/CounterLogEntryWriter.scala b/core/src/main/scala/swaydb/core/log/serializer/CounterLogEntryWriter.scala index 620d2f1a6..c4d02f3f5 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/CounterLogEntryWriter.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/CounterLogEntryWriter.scala @@ -18,7 +18,7 @@ package swaydb.core.log.serializer import swaydb.core.log.LogEntry import swaydb.core.util.Bytes -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} import swaydb.utils.ByteSizeOf private[swaydb] object CounterLogEntryWriter { diff --git a/core/src/main/scala/swaydb/core/log/serializer/LevelZeroLogEntryReader.scala b/core/src/main/scala/swaydb/core/log/serializer/LevelZeroLogEntryReader.scala index 3ff144966..0a4241119 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/LevelZeroLogEntryReader.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/LevelZeroLogEntryReader.scala @@ -18,7 +18,7 @@ package swaydb.core.log.serializer import swaydb.core.data.{Memory, Time, Value} import swaydb.core.log.LogEntry -import swaydb.data.slice.{ReaderBase, Slice} +import swaydb.slice.{ReaderBase, Slice} import java.util.concurrent.TimeUnit import scala.concurrent.duration.Deadline diff --git a/core/src/main/scala/swaydb/core/log/serializer/LevelZeroLogEntryWriter.scala b/core/src/main/scala/swaydb/core/log/serializer/LevelZeroLogEntryWriter.scala index 56e31c954..1073b5780 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/LevelZeroLogEntryWriter.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/LevelZeroLogEntryWriter.scala @@ -19,7 +19,7 @@ package swaydb.core.log.serializer import swaydb.core.data.Memory import swaydb.core.log.LogEntry import swaydb.core.util.Bytes -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} import swaydb.utils.ByteSizeOf /** diff --git a/core/src/main/scala/swaydb/core/log/serializer/LogEntryReader.scala b/core/src/main/scala/swaydb/core/log/serializer/LogEntryReader.scala index cdaff7755..b6e11bda2 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/LogEntryReader.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/LogEntryReader.scala @@ -18,7 +18,7 @@ package swaydb.core.log.serializer import swaydb.core.io.reader.Reader import swaydb.core.log.LogEntry -import swaydb.data.slice.{ReaderBase, Slice} +import swaydb.slice.{ReaderBase, Slice} import scala.annotation.implicitNotFound diff --git a/core/src/main/scala/swaydb/core/log/serializer/LogEntrySerialiser.scala b/core/src/main/scala/swaydb/core/log/serializer/LogEntrySerialiser.scala index 9856b3060..c867b4d71 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/LogEntrySerialiser.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/LogEntrySerialiser.scala @@ -22,7 +22,7 @@ import swaydb.IO import swaydb.core.io.reader.Reader import swaydb.core.log.{LogEntry, RecoveryResult} import swaydb.core.util.CRC32 -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.ByteSizeOf private[core] object LogEntrySerialiser extends LazyLogging { diff --git a/core/src/main/scala/swaydb/core/log/serializer/LogEntryWriter.scala b/core/src/main/scala/swaydb/core/log/serializer/LogEntryWriter.scala index 712321bdb..1937aee4a 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/LogEntryWriter.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/LogEntryWriter.scala @@ -17,7 +17,7 @@ package swaydb.core.log.serializer import swaydb.core.log.LogEntry -import swaydb.data.slice.SliceMut +import swaydb.slice.SliceMut import scala.annotation.implicitNotFound diff --git a/core/src/main/scala/swaydb/core/log/serializer/RangeValueSerializer.scala b/core/src/main/scala/swaydb/core/log/serializer/RangeValueSerializer.scala index 144c5565b..9bb14d4fb 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/RangeValueSerializer.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/RangeValueSerializer.scala @@ -20,7 +20,7 @@ import swaydb.core.data.Value import swaydb.core.data.Value.{Put, Remove, Update} import swaydb.core.io.reader.Reader import swaydb.core.util.Bytes -import swaydb.data.slice.{ReaderBase, Slice, SliceMut} +import swaydb.slice.{ReaderBase, Slice, SliceMut} import scala.annotation.implicitNotFound diff --git a/core/src/main/scala/swaydb/core/log/serializer/ValueSerializer.scala b/core/src/main/scala/swaydb/core/log/serializer/ValueSerializer.scala index 40afe1e5c..6f1f8fca4 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/ValueSerializer.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/ValueSerializer.scala @@ -20,7 +20,7 @@ import swaydb.core.data.{Time, Value} import swaydb.core.io.reader.Reader import swaydb.core.util.Times._ import swaydb.core.util.{Bytes, MinMax} -import swaydb.data.slice.{ReaderBase, Slice, SliceMut, SliceOption} +import swaydb.slice.{ReaderBase, Slice, SliceMut, SliceOption} import swaydb.utils.ByteSizeOf import swaydb.utils.Options.OptionsImplicits 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 127b93b52..92011e7e8 100644 --- a/core/src/main/scala/swaydb/core/log/timer/Timer.scala +++ b/core/src/main/scala/swaydb/core/log/timer/Timer.scala @@ -24,7 +24,7 @@ import swaydb.core.log.counter.{CounterLog, PersistentCounterLog} import swaydb.core.log.serializer.{CounterLogEntryReader, CounterLogEntryWriter, LogEntryReader, LogEntryWriter} import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.data.config.MMAP -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.Effect import swaydb.utils.StorageUnits._ diff --git a/core/src/main/scala/swaydb/core/merge/ApplyMerger.scala b/core/src/main/scala/swaydb/core/merge/ApplyMerger.scala index d6aa4a591..621c05cb6 100644 --- a/core/src/main/scala/swaydb/core/merge/ApplyMerger.scala +++ b/core/src/main/scala/swaydb/core/merge/ApplyMerger.scala @@ -19,7 +19,7 @@ package swaydb.core.merge import swaydb.core.data.{KeyValue, Memory, Value} import swaydb.core.function.FunctionStore import swaydb.data.order.TimeOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice private[core] object ApplyMerger { diff --git a/core/src/main/scala/swaydb/core/merge/FixedMerger.scala b/core/src/main/scala/swaydb/core/merge/FixedMerger.scala index 91cf67063..4e6e50c97 100644 --- a/core/src/main/scala/swaydb/core/merge/FixedMerger.scala +++ b/core/src/main/scala/swaydb/core/merge/FixedMerger.scala @@ -19,7 +19,7 @@ package swaydb.core.merge import swaydb.core.data.{KeyValue, Memory, Value} import swaydb.core.function.FunctionStore import swaydb.data.order.TimeOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice private[core] object FixedMerger { diff --git a/core/src/main/scala/swaydb/core/merge/FunctionMerger.scala b/core/src/main/scala/swaydb/core/merge/FunctionMerger.scala index 9b7b50b93..2c304239b 100644 --- a/core/src/main/scala/swaydb/core/merge/FunctionMerger.scala +++ b/core/src/main/scala/swaydb/core/merge/FunctionMerger.scala @@ -19,7 +19,7 @@ package swaydb.core.merge import swaydb.core.data._ import swaydb.core.function.FunctionStore import swaydb.data.order.TimeOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice private[core] object FunctionMerger { diff --git a/core/src/main/scala/swaydb/core/merge/KeyValueMerger.scala b/core/src/main/scala/swaydb/core/merge/KeyValueMerger.scala index 512a5f477..3def1ce8c 100644 --- a/core/src/main/scala/swaydb/core/merge/KeyValueMerger.scala +++ b/core/src/main/scala/swaydb/core/merge/KeyValueMerger.scala @@ -23,7 +23,7 @@ import swaydb.core.merge.stats.MergeStats import swaydb.core.segment.assigner.Assignable import swaydb.utils.DropIterator import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.annotation.tailrec import scala.collection.mutable.ListBuffer diff --git a/core/src/main/scala/swaydb/core/merge/PendingApplyMerger.scala b/core/src/main/scala/swaydb/core/merge/PendingApplyMerger.scala index e2dff58f6..a416fa922 100644 --- a/core/src/main/scala/swaydb/core/merge/PendingApplyMerger.scala +++ b/core/src/main/scala/swaydb/core/merge/PendingApplyMerger.scala @@ -19,7 +19,7 @@ package swaydb.core.merge import swaydb.core.data.{KeyValue, Value} import swaydb.core.function.FunctionStore import swaydb.data.order.TimeOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice private[core] object PendingApplyMerger { diff --git a/core/src/main/scala/swaydb/core/merge/PutMerger.scala b/core/src/main/scala/swaydb/core/merge/PutMerger.scala index 04396273f..610a3dfda 100644 --- a/core/src/main/scala/swaydb/core/merge/PutMerger.scala +++ b/core/src/main/scala/swaydb/core/merge/PutMerger.scala @@ -18,7 +18,7 @@ package swaydb.core.merge import swaydb.core.data.{KeyValue, Value} import swaydb.data.order.TimeOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice private[core] object PutMerger { diff --git a/core/src/main/scala/swaydb/core/merge/RemoveMerger.scala b/core/src/main/scala/swaydb/core/merge/RemoveMerger.scala index 8abd5315a..930f2c11b 100644 --- a/core/src/main/scala/swaydb/core/merge/RemoveMerger.scala +++ b/core/src/main/scala/swaydb/core/merge/RemoveMerger.scala @@ -19,7 +19,7 @@ package swaydb.core.merge import swaydb.core.data.{KeyValue, Memory, Value} import swaydb.core.function.FunctionStore import swaydb.data.order.TimeOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice private[core] object RemoveMerger { diff --git a/core/src/main/scala/swaydb/core/merge/UpdateMerger.scala b/core/src/main/scala/swaydb/core/merge/UpdateMerger.scala index 96fa6e5c0..3f2bc7152 100644 --- a/core/src/main/scala/swaydb/core/merge/UpdateMerger.scala +++ b/core/src/main/scala/swaydb/core/merge/UpdateMerger.scala @@ -19,7 +19,7 @@ package swaydb.core.merge import swaydb.core.data.{KeyValue, Memory, Value} import swaydb.core.function.FunctionStore import swaydb.data.order.TimeOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice private[core] object UpdateMerger { diff --git a/core/src/main/scala/swaydb/core/merge/ValueMerger.scala b/core/src/main/scala/swaydb/core/merge/ValueMerger.scala index 46c660c25..13e8f77b8 100644 --- a/core/src/main/scala/swaydb/core/merge/ValueMerger.scala +++ b/core/src/main/scala/swaydb/core/merge/ValueMerger.scala @@ -19,7 +19,7 @@ package swaydb.core.merge import swaydb.core.data.Value import swaydb.core.function.FunctionStore import swaydb.data.order.TimeOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice private[core] object ValueMerger { diff --git a/core/src/main/scala/swaydb/core/merge/stats/MergeStats.scala b/core/src/main/scala/swaydb/core/merge/stats/MergeStats.scala index 1755daf34..791f0f84c 100644 --- a/core/src/main/scala/swaydb/core/merge/stats/MergeStats.scala +++ b/core/src/main/scala/swaydb/core/merge/stats/MergeStats.scala @@ -16,7 +16,7 @@ package swaydb.core.merge.stats -import swaydb.Aggregator +import swaydb.utils.Aggregator import swaydb.core.data import swaydb.core.segment.entry.id.KeyValueId import swaydb.core.util.Bytes diff --git a/core/src/main/scala/swaydb/core/merge/stats/MergeStatsCreator.scala b/core/src/main/scala/swaydb/core/merge/stats/MergeStatsCreator.scala index 2674482c3..ca1be17d9 100644 --- a/core/src/main/scala/swaydb/core/merge/stats/MergeStatsCreator.scala +++ b/core/src/main/scala/swaydb/core/merge/stats/MergeStatsCreator.scala @@ -16,7 +16,7 @@ package swaydb.core.merge.stats -import swaydb.Aggregator +import swaydb.utils.Aggregator import swaydb.core.data.Memory import swaydb.core.merge.KeyValueGrouper diff --git a/core/src/main/scala/swaydb/core/segment/DeadlineAndFunctionId.scala b/core/src/main/scala/swaydb/core/segment/DeadlineAndFunctionId.scala index 22ae537d5..79ee90935 100644 --- a/core/src/main/scala/swaydb/core/segment/DeadlineAndFunctionId.scala +++ b/core/src/main/scala/swaydb/core/segment/DeadlineAndFunctionId.scala @@ -19,7 +19,7 @@ package swaydb.core.segment import swaydb.core.data.{KeyValue, Value} import swaydb.core.segment.Segment.getNearestPutDeadline import swaydb.core.util.MinMax -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.FiniteDurations import scala.concurrent.duration.Deadline diff --git a/core/src/main/scala/swaydb/core/segment/MemorySegment.scala b/core/src/main/scala/swaydb/core/segment/MemorySegment.scala index 229a9a474..341e1132f 100644 --- a/core/src/main/scala/swaydb/core/segment/MemorySegment.scala +++ b/core/src/main/scala/swaydb/core/segment/MemorySegment.scala @@ -31,7 +31,7 @@ import swaydb.skiplist.SkipListTreeMap import swaydb.data.MaxKey import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import java.nio.file.Path import scala.collection.mutable.ListBuffer diff --git a/core/src/main/scala/swaydb/core/segment/PersistentSegment.scala b/core/src/main/scala/swaydb/core/segment/PersistentSegment.scala index d30b83547..cba1fa200 100644 --- a/core/src/main/scala/swaydb/core/segment/PersistentSegment.scala +++ b/core/src/main/scala/swaydb/core/segment/PersistentSegment.scala @@ -32,7 +32,7 @@ import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.util.IDGenerator import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.{MMAP, SegmentRefCacheLife} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import java.nio.file.Path import scala.collection.mutable.ListBuffer diff --git a/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala b/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala index 1e2751c94..a51780706 100644 --- a/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala +++ b/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala @@ -49,7 +49,7 @@ import swaydb.data.MaxKey import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.{MMAP, SegmentRefCacheLife} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.effect.{Effect, Extension} import java.nio.file.Path diff --git a/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala b/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala index a26f4b88a..2a30c6b1d 100644 --- a/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala +++ b/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala @@ -47,7 +47,7 @@ import swaydb.data.MaxKey import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.{MMAP, SegmentRefCacheLife} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import java.nio.file.{Path, Paths} import scala.collection.mutable.ListBuffer diff --git a/core/src/main/scala/swaydb/core/segment/Segment.scala b/core/src/main/scala/swaydb/core/segment/Segment.scala index 3b7c35e3d..b7905242a 100644 --- a/core/src/main/scala/swaydb/core/segment/Segment.scala +++ b/core/src/main/scala/swaydb/core/segment/Segment.scala @@ -17,7 +17,7 @@ package swaydb.core.segment import com.typesafe.scalalogging.LazyLogging -import swaydb.Aggregator +import swaydb.utils.Aggregator import swaydb.Error.Segment.ExceptionHandler import swaydb.core.data._ import swaydb.core.function.FunctionStore @@ -46,8 +46,8 @@ import swaydb.data.MaxKey import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.{MMAP, SegmentRefCacheLife} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.SliceIOImplicits._ -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.SliceIOImplicits._ +import swaydb.slice.{Slice, SliceOption} import swaydb.effect.Effect import swaydb.utils.Futures.FutureUnitImplicits import swaydb.utils.{FiniteDurations, SomeOrNone} diff --git a/core/src/main/scala/swaydb/core/segment/SegmentSerialiser.scala b/core/src/main/scala/swaydb/core/segment/SegmentSerialiser.scala index e9e1ff5ed..df10816e5 100644 --- a/core/src/main/scala/swaydb/core/segment/SegmentSerialiser.scala +++ b/core/src/main/scala/swaydb/core/segment/SegmentSerialiser.scala @@ -26,7 +26,7 @@ import swaydb.core.util.Bytes import swaydb.data.MaxKey import swaydb.data.config.{MMAP, SegmentRefCacheLife} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.{ReaderBase, Slice, SliceMut} +import swaydb.slice.{ReaderBase, Slice, SliceMut} import swaydb.effect.{Effect, Extension} import swaydb.utils.ByteSizeOf import swaydb.utils.Options.OptionsImplicits diff --git a/core/src/main/scala/swaydb/core/segment/assigner/Assignable.scala b/core/src/main/scala/swaydb/core/segment/assigner/Assignable.scala index 574a025f4..a4e7b54f2 100644 --- a/core/src/main/scala/swaydb/core/segment/assigner/Assignable.scala +++ b/core/src/main/scala/swaydb/core/segment/assigner/Assignable.scala @@ -16,13 +16,13 @@ package swaydb.core.segment.assigner -import swaydb.Aggregator +import swaydb.utils.Aggregator import swaydb.core.data.{KeyValue, Memory} import swaydb.core.level.zero.LevelZero.LevelZeroLog import swaydb.core.log.Log import swaydb.core.merge.stats.MergeStats import swaydb.data.MaxKey -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.collection.mutable.ListBuffer diff --git a/core/src/main/scala/swaydb/core/segment/assigner/Assigner.scala b/core/src/main/scala/swaydb/core/segment/assigner/Assigner.scala index bcb864d80..f61fc63f9 100644 --- a/core/src/main/scala/swaydb/core/segment/assigner/Assigner.scala +++ b/core/src/main/scala/swaydb/core/segment/assigner/Assigner.scala @@ -16,7 +16,7 @@ package swaydb.core.segment.assigner -import swaydb.Aggregator +import swaydb.utils.Aggregator import swaydb.core.data.{KeyValue, Memory, MemoryOption, Value} import swaydb.core.segment.assigner.AssignmentTarget._ import swaydb.core.segment.ref.SegmentRef @@ -25,7 +25,7 @@ import swaydb.utils.DropIterator import swaydb.skiplist.SkipList import swaydb.data.MaxKey import swaydb.data.order.KeyOrder -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import scala.annotation.tailrec import scala.collection.compat._ diff --git a/core/src/main/scala/swaydb/core/segment/assigner/Assignment.scala b/core/src/main/scala/swaydb/core/segment/assigner/Assignment.scala index 44bd0b2e6..dd828f512 100644 --- a/core/src/main/scala/swaydb/core/segment/assigner/Assignment.scala +++ b/core/src/main/scala/swaydb/core/segment/assigner/Assignment.scala @@ -16,7 +16,7 @@ package swaydb.core.segment.assigner -import swaydb.Aggregator +import swaydb.utils.Aggregator object Assignment { diff --git a/core/src/main/scala/swaydb/core/segment/assigner/AssignmentTarget.scala b/core/src/main/scala/swaydb/core/segment/assigner/AssignmentTarget.scala index 7f7e91fc4..3780cc87f 100644 --- a/core/src/main/scala/swaydb/core/segment/assigner/AssignmentTarget.scala +++ b/core/src/main/scala/swaydb/core/segment/assigner/AssignmentTarget.scala @@ -19,7 +19,7 @@ package swaydb.core.segment.assigner import swaydb.core.segment.Segment import swaydb.core.segment.ref.SegmentRef import swaydb.data.MaxKey -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.annotation.implicitNotFound diff --git a/core/src/main/scala/swaydb/core/segment/assigner/GapAggregator.scala b/core/src/main/scala/swaydb/core/segment/assigner/GapAggregator.scala index 0f5ee9056..184165a9c 100644 --- a/core/src/main/scala/swaydb/core/segment/assigner/GapAggregator.scala +++ b/core/src/main/scala/swaydb/core/segment/assigner/GapAggregator.scala @@ -16,7 +16,7 @@ package swaydb.core.segment.assigner -import swaydb.Aggregator +import swaydb.utils.Aggregator import swaydb.core.data.Memory import swaydb.core.merge.stats.{MergeStats, MergeStatsCreator} diff --git a/core/src/main/scala/swaydb/core/segment/block/Block.scala b/core/src/main/scala/swaydb/core/segment/block/Block.scala index e9adcdf3c..3b8f705fa 100644 --- a/core/src/main/scala/swaydb/core/segment/block/Block.scala +++ b/core/src/main/scala/swaydb/core/segment/block/Block.scala @@ -23,7 +23,7 @@ import swaydb.core.segment.block.reader.{BlockRefReader, BlockedReader, Unblocke import swaydb.core.segment.block.segment.transient.{TransientSegment, TransientSegmentRef} import swaydb.core.util.Bytes import swaydb.core.util.Collections._ -import swaydb.data.slice.{ReaderBase, Slice, SliceMut} +import swaydb.slice.{ReaderBase, Slice, SliceMut} import swaydb.effect.IOAction import swaydb.utils.ByteSizeOf diff --git a/core/src/main/scala/swaydb/core/segment/block/BlockCache.scala b/core/src/main/scala/swaydb/core/segment/block/BlockCache.scala index ff9131bea..0a5db9b7f 100644 --- a/core/src/main/scala/swaydb/core/segment/block/BlockCache.scala +++ b/core/src/main/scala/swaydb/core/segment/block/BlockCache.scala @@ -20,7 +20,7 @@ import com.typesafe.scalalogging.LazyLogging import swaydb.cache.Cache import swaydb.core.sweeper.MemorySweeper import swaydb.core.util.HashedMap -import swaydb.data.slice.{Slice, SliceOption, SliceRO, Slices} +import swaydb.slice.{Slice, SliceOption, SliceRO, Slices} import swaydb.utils.Options import java.util.concurrent.ConcurrentHashMap diff --git a/core/src/main/scala/swaydb/core/segment/block/BlockCacheIO.scala b/core/src/main/scala/swaydb/core/segment/block/BlockCacheIO.scala index 462144c6b..3a3e43dec 100644 --- a/core/src/main/scala/swaydb/core/segment/block/BlockCacheIO.scala +++ b/core/src/main/scala/swaydb/core/segment/block/BlockCacheIO.scala @@ -1,7 +1,7 @@ package swaydb.core.segment.block import swaydb.core.segment.block.BlockCache.seekSize -import swaydb.data.slice.{Slice, SliceRO, Slices} +import swaydb.slice.{Slice, SliceRO, Slices} sealed trait BlockCacheIO { diff --git a/core/src/main/scala/swaydb/core/segment/block/BlockCacheSource.scala b/core/src/main/scala/swaydb/core/segment/block/BlockCacheSource.scala index 1bd5e0594..2115017cd 100644 --- a/core/src/main/scala/swaydb/core/segment/block/BlockCacheSource.scala +++ b/core/src/main/scala/swaydb/core/segment/block/BlockCacheSource.scala @@ -16,7 +16,7 @@ package swaydb.core.segment.block -import swaydb.data.slice.{Slice, SliceRO} +import swaydb.slice.{Slice, SliceRO} trait BlockCacheSource { def blockCacheMaxBytes: Int diff --git a/core/src/main/scala/swaydb/core/segment/block/BlockCacheState.scala b/core/src/main/scala/swaydb/core/segment/block/BlockCacheState.scala index d138df0df..38ecc808d 100644 --- a/core/src/main/scala/swaydb/core/segment/block/BlockCacheState.scala +++ b/core/src/main/scala/swaydb/core/segment/block/BlockCacheState.scala @@ -3,7 +3,7 @@ package swaydb.core.segment.block import swaydb.cache.CacheNoIO import swaydb.core.sweeper.MemorySweeper import swaydb.core.util.HashedMap -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} class BlockCacheState(val blockSize: Int, val skipBlockCacheSeekSize: Int, diff --git a/core/src/main/scala/swaydb/core/segment/block/BlockCompressionResult.scala b/core/src/main/scala/swaydb/core/segment/block/BlockCompressionResult.scala index 987aec542..df3edf0da 100644 --- a/core/src/main/scala/swaydb/core/segment/block/BlockCompressionResult.scala +++ b/core/src/main/scala/swaydb/core/segment/block/BlockCompressionResult.scala @@ -1,6 +1,6 @@ package swaydb.core.segment.block -import swaydb.data.slice.{SliceMut, SliceOption} +import swaydb.slice.{SliceMut, SliceOption} class BlockCompressionResult(val compressedBytes: SliceOption[Byte], val headerBytes: SliceMut[Byte]) diff --git a/core/src/main/scala/swaydb/core/segment/block/BlockHeader.scala b/core/src/main/scala/swaydb/core/segment/block/BlockHeader.scala index 75316b3ac..11284d14f 100644 --- a/core/src/main/scala/swaydb/core/segment/block/BlockHeader.scala +++ b/core/src/main/scala/swaydb/core/segment/block/BlockHeader.scala @@ -1,6 +1,6 @@ package swaydb.core.segment.block -import swaydb.data.slice.ReaderBase +import swaydb.slice.ReaderBase object BlockHeader { val uncompressedBlockId: Byte = 0.toByte diff --git a/core/src/main/scala/swaydb/core/segment/block/binarysearch/BinarySearchEntryFormat.scala b/core/src/main/scala/swaydb/core/segment/block/binarysearch/BinarySearchEntryFormat.scala index 7b8bd0630..cb3197dc3 100644 --- a/core/src/main/scala/swaydb/core/segment/block/binarysearch/BinarySearchEntryFormat.scala +++ b/core/src/main/scala/swaydb/core/segment/block/binarysearch/BinarySearchEntryFormat.scala @@ -24,7 +24,7 @@ import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlock import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} import swaydb.core.util.Bytes import swaydb.data.config.IndexFormat -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} import swaydb.macros.Sealed import swaydb.utils.ByteSizeOf diff --git a/core/src/main/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlock.scala b/core/src/main/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlock.scala index fd9812908..38ade2c73 100644 --- a/core/src/main/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlock.scala +++ b/core/src/main/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlock.scala @@ -24,7 +24,7 @@ import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} import swaydb.core.util.{Bytes, MinMax} import swaydb.data.config.UncompressedBlockInfo import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.ByteSizeOf import swaydb.utils.Maybe.{Maybe, _} diff --git a/core/src/main/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlockState.scala b/core/src/main/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlockState.scala index 13bcc9864..e29ff2867 100644 --- a/core/src/main/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlockState.scala +++ b/core/src/main/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlockState.scala @@ -3,7 +3,7 @@ package swaydb.core.segment.block.binarysearch import swaydb.compression.CompressionInternal import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlock.optimalBytesRequired import swaydb.data.config.UncompressedBlockInfo -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} import swaydb.utils.Maybe private[block] object BinarySearchIndexBlockState { diff --git a/core/src/main/scala/swaydb/core/segment/block/bloomfilter/BloomFilterBlock.scala b/core/src/main/scala/swaydb/core/segment/block/bloomfilter/BloomFilterBlock.scala index c1b127c85..fca9329b2 100644 --- a/core/src/main/scala/swaydb/core/segment/block/bloomfilter/BloomFilterBlock.scala +++ b/core/src/main/scala/swaydb/core/segment/block/bloomfilter/BloomFilterBlock.scala @@ -22,7 +22,7 @@ import swaydb.core.segment.block._ import swaydb.core.segment.block.reader.UnblockedReader import swaydb.core.util.{Bytes, MurmurHash3Generic} import swaydb.data.config.UncompressedBlockInfo -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.ByteSizeOf private[core] case object BloomFilterBlock extends LazyLogging { diff --git a/core/src/main/scala/swaydb/core/segment/block/bloomfilter/BloomFilterBlockState.scala b/core/src/main/scala/swaydb/core/segment/block/bloomfilter/BloomFilterBlockState.scala index a678c6cc9..27de91a16 100644 --- a/core/src/main/scala/swaydb/core/segment/block/bloomfilter/BloomFilterBlockState.scala +++ b/core/src/main/scala/swaydb/core/segment/block/bloomfilter/BloomFilterBlockState.scala @@ -2,7 +2,7 @@ package swaydb.core.segment.block.bloomfilter import swaydb.compression.CompressionInternal import swaydb.data.config.UncompressedBlockInfo -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} private[core] class BloomFilterBlockState(val numberOfBits: Int, val maxProbe: Int, diff --git a/core/src/main/scala/swaydb/core/segment/block/hashindex/HashIndexBlock.scala b/core/src/main/scala/swaydb/core/segment/block/hashindex/HashIndexBlock.scala index 683177e23..9ef91776f 100644 --- a/core/src/main/scala/swaydb/core/segment/block/hashindex/HashIndexBlock.scala +++ b/core/src/main/scala/swaydb/core/segment/block/hashindex/HashIndexBlock.scala @@ -25,7 +25,7 @@ import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} import swaydb.core.util.{Bytes, CRC32} import swaydb.data.config.{HashIndex, UncompressedBlockInfo} import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.ByteSizeOf import scala.annotation.tailrec diff --git a/core/src/main/scala/swaydb/core/segment/block/hashindex/HashIndexBlockState.scala b/core/src/main/scala/swaydb/core/segment/block/hashindex/HashIndexBlockState.scala index 16cc5dfed..8e0ea1dba 100644 --- a/core/src/main/scala/swaydb/core/segment/block/hashindex/HashIndexBlockState.scala +++ b/core/src/main/scala/swaydb/core/segment/block/hashindex/HashIndexBlockState.scala @@ -3,7 +3,7 @@ package swaydb.core.segment.block.hashindex import swaydb.compression.CompressionInternal import swaydb.core.util.CRC32 import swaydb.data.config.UncompressedBlockInfo -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} import scala.beans.BeanProperty diff --git a/core/src/main/scala/swaydb/core/segment/block/hashindex/HashIndexEntryFormat.scala b/core/src/main/scala/swaydb/core/segment/block/hashindex/HashIndexEntryFormat.scala index 9505e6b6d..bf617c36b 100644 --- a/core/src/main/scala/swaydb/core/segment/block/hashindex/HashIndexEntryFormat.scala +++ b/core/src/main/scala/swaydb/core/segment/block/hashindex/HashIndexEntryFormat.scala @@ -24,7 +24,7 @@ import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlock import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} import swaydb.core.util.{Bytes, CRC32} import swaydb.data.config.IndexFormat -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} import swaydb.macros.Sealed import swaydb.utils.ByteSizeOf diff --git a/core/src/main/scala/swaydb/core/segment/block/reader/BlockReaderBase.scala b/core/src/main/scala/swaydb/core/segment/block/reader/BlockReaderBase.scala index 3ca8f4685..95d1ee2d5 100644 --- a/core/src/main/scala/swaydb/core/segment/block/reader/BlockReaderBase.scala +++ b/core/src/main/scala/swaydb/core/segment/block/reader/BlockReaderBase.scala @@ -18,7 +18,7 @@ package swaydb.core.segment.block.reader import com.typesafe.scalalogging.LazyLogging import swaydb.core.segment.block.{BlockCache, BlockCacheSource, BlockCacheState, BlockOffset} -import swaydb.data.slice.{Reader, ReaderBase, Slice, SliceOption, SliceRO} +import swaydb.slice.{Reader, ReaderBase, Slice, SliceOption, SliceRO} /** * Defers [[ReaderBase]] related operations to [[BlockReader]]. diff --git a/core/src/main/scala/swaydb/core/segment/block/reader/BlockReaderCache.scala b/core/src/main/scala/swaydb/core/segment/block/reader/BlockReaderCache.scala index 9894db5f6..c00a929de 100644 --- a/core/src/main/scala/swaydb/core/segment/block/reader/BlockReaderCache.scala +++ b/core/src/main/scala/swaydb/core/segment/block/reader/BlockReaderCache.scala @@ -16,7 +16,7 @@ package swaydb.core.segment.block.reader -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.beans.BeanProperty diff --git a/core/src/main/scala/swaydb/core/segment/block/reader/BlockRefReader.scala b/core/src/main/scala/swaydb/core/segment/block/reader/BlockRefReader.scala index ef0233dde..76a84e0eb 100644 --- a/core/src/main/scala/swaydb/core/segment/block/reader/BlockRefReader.scala +++ b/core/src/main/scala/swaydb/core/segment/block/reader/BlockRefReader.scala @@ -20,8 +20,8 @@ import swaydb.core.io.file.DBFile import swaydb.core.io.reader.{FileReader, Reader} import swaydb.core.segment.block._ import swaydb.core.segment.block.segment.SegmentBlockOffset -import swaydb.data.slice.{Reader, Slice, SliceReader} -import swaydb.data.utils.ByteOps +import swaydb.slice.{Reader, Slice, SliceReader} +import swaydb.slice.utils.ByteOps private[core] object BlockRefReader { diff --git a/core/src/main/scala/swaydb/core/segment/block/reader/BlockedReader.scala b/core/src/main/scala/swaydb/core/segment/block/reader/BlockedReader.scala index f4f5db6bd..b29b42f29 100644 --- a/core/src/main/scala/swaydb/core/segment/block/reader/BlockedReader.scala +++ b/core/src/main/scala/swaydb/core/segment/block/reader/BlockedReader.scala @@ -19,8 +19,8 @@ package swaydb.core.segment.block.reader import swaydb.core.io.reader.Reader import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockOffset} import swaydb.core.segment.block.{Block, BlockCache, BlockCacheState, BlockOffset, BlockOps} -import swaydb.data.slice.{Reader, Slice} -import swaydb.data.utils.ByteOps +import swaydb.slice.{Reader, Slice} +import swaydb.slice.utils.ByteOps private[core] object BlockedReader { diff --git a/core/src/main/scala/swaydb/core/segment/block/reader/UnblockedReader.scala b/core/src/main/scala/swaydb/core/segment/block/reader/UnblockedReader.scala index 510f16552..37a7a6d29 100644 --- a/core/src/main/scala/swaydb/core/segment/block/reader/UnblockedReader.scala +++ b/core/src/main/scala/swaydb/core/segment/block/reader/UnblockedReader.scala @@ -18,8 +18,8 @@ package swaydb.core.segment.block.reader import swaydb.core.io.reader.{FileReader, Reader} import swaydb.core.segment.block.{Block, BlockCache, BlockCacheState, BlockOffset, BlockOps} -import swaydb.data.slice.{Reader, Slice, SliceReader} -import swaydb.data.utils.ByteOps +import swaydb.slice.{Reader, Slice, SliceReader} +import swaydb.slice.utils.ByteOps /** * A typed object that indicates that block is already decompressed and now is reading data bytes. diff --git a/core/src/main/scala/swaydb/core/segment/block/segment/SegmentBlock.scala b/core/src/main/scala/swaydb/core/segment/block/segment/SegmentBlock.scala index 85e6574ad..4a87ad92d 100644 --- a/core/src/main/scala/swaydb/core/segment/block/segment/SegmentBlock.scala +++ b/core/src/main/scala/swaydb/core/segment/block/segment/SegmentBlock.scala @@ -32,7 +32,7 @@ import swaydb.core.util.{Bytes, Collections, MinMax} import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.Futures._ import swaydb.utils.{ByteSizeOf, Futures} diff --git a/core/src/main/scala/swaydb/core/segment/block/segment/SegmentBlockCache.scala b/core/src/main/scala/swaydb/core/segment/block/segment/SegmentBlockCache.scala index d3f62cdf5..5e218fd9f 100644 --- a/core/src/main/scala/swaydb/core/segment/block/segment/SegmentBlockCache.scala +++ b/core/src/main/scala/swaydb/core/segment/block/segment/SegmentBlockCache.scala @@ -30,7 +30,7 @@ import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} import swaydb.core.segment.block.{Block, BlockCache, BlockCacheState, BlockOffset, BlockOps} import swaydb.core.segment.io.SegmentReadIO import swaydb.core.sweeper.MemorySweeper -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.{IOAction, IOStrategy, Reserve} import swaydb.{Error, IO} diff --git a/core/src/main/scala/swaydb/core/segment/block/segment/footer/SegmentFooterBlock.scala b/core/src/main/scala/swaydb/core/segment/block/segment/footer/SegmentFooterBlock.scala index 05f4a7bca..341013941 100644 --- a/core/src/main/scala/swaydb/core/segment/block/segment/footer/SegmentFooterBlock.scala +++ b/core/src/main/scala/swaydb/core/segment/block/segment/footer/SegmentFooterBlock.scala @@ -27,7 +27,7 @@ import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockOffset} import swaydb.core.segment.block.sortedindex.SortedIndexBlockOffset import swaydb.core.segment.block.values.ValuesBlockOffset import swaydb.core.util.{Bytes, CRC32} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.ByteSizeOf private[core] case object SegmentFooterBlock { diff --git a/core/src/main/scala/swaydb/core/segment/block/segment/footer/SegmentFooterBlockState.scala b/core/src/main/scala/swaydb/core/segment/block/segment/footer/SegmentFooterBlockState.scala index 7d8c2abfe..dba745d2b 100644 --- a/core/src/main/scala/swaydb/core/segment/block/segment/footer/SegmentFooterBlockState.scala +++ b/core/src/main/scala/swaydb/core/segment/block/segment/footer/SegmentFooterBlockState.scala @@ -1,6 +1,6 @@ package swaydb.core.segment.block.segment.footer -import swaydb.data.slice.SliceMut +import swaydb.slice.SliceMut private[block] case class SegmentFooterBlockState(footerSize: Int, createdInLevel: Int, diff --git a/core/src/main/scala/swaydb/core/segment/block/segment/transient/ClosedBlocks.scala b/core/src/main/scala/swaydb/core/segment/block/segment/transient/ClosedBlocks.scala index e90c1d3d0..3b4e251c2 100644 --- a/core/src/main/scala/swaydb/core/segment/block/segment/transient/ClosedBlocks.scala +++ b/core/src/main/scala/swaydb/core/segment/block/segment/transient/ClosedBlocks.scala @@ -23,7 +23,7 @@ import swaydb.core.segment.block.reader.UnblockedReader import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockOffset, SortedIndexBlockState} import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset, ValuesBlockState} import swaydb.core.util.MinMax -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.concurrent.duration.Deadline diff --git a/core/src/main/scala/swaydb/core/segment/block/segment/transient/TransientSegment.scala b/core/src/main/scala/swaydb/core/segment/block/segment/transient/TransientSegment.scala index 6c784bc09..328be2aaa 100644 --- a/core/src/main/scala/swaydb/core/segment/block/segment/transient/TransientSegment.scala +++ b/core/src/main/scala/swaydb/core/segment/block/segment/transient/TransientSegment.scala @@ -28,7 +28,7 @@ import swaydb.core.segment.ref.SegmentRef import swaydb.core.segment.{MemorySegment, PersistentSegment, Segment} import swaydb.core.util.MinMax import swaydb.data.MaxKey -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.concurrent.Future import scala.concurrent.duration.Deadline diff --git a/core/src/main/scala/swaydb/core/segment/block/segment/transient/TransientSegmentRef.scala b/core/src/main/scala/swaydb/core/segment/block/segment/transient/TransientSegmentRef.scala index f8894651f..2aae70aa7 100644 --- a/core/src/main/scala/swaydb/core/segment/block/segment/transient/TransientSegmentRef.scala +++ b/core/src/main/scala/swaydb/core/segment/block/segment/transient/TransientSegmentRef.scala @@ -25,7 +25,7 @@ import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlock import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} import swaydb.core.util.MinMax import swaydb.data.MaxKey -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.concurrent.duration.Deadline diff --git a/core/src/main/scala/swaydb/core/segment/block/segment/transient/TransientSegmentSerialiser.scala b/core/src/main/scala/swaydb/core/segment/block/segment/transient/TransientSegmentSerialiser.scala index 6f8bdac6c..2f1c21557 100644 --- a/core/src/main/scala/swaydb/core/segment/block/segment/transient/TransientSegmentSerialiser.scala +++ b/core/src/main/scala/swaydb/core/segment/block/segment/transient/TransientSegmentSerialiser.scala @@ -34,7 +34,7 @@ import swaydb.core.sweeper.MemorySweeper import swaydb.core.util.Bytes import swaydb.data.MaxKey import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.ByteSizeOf object TransientSegmentSerialiser { diff --git a/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlock.scala b/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlock.scala index b456b8ce1..f8cc63e6e 100644 --- a/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlock.scala +++ b/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlock.scala @@ -29,7 +29,7 @@ import swaydb.core.util.{Bytes, MinMax} import swaydb.data.MaxKey import swaydb.data.config.UncompressedBlockInfo import swaydb.data.order.KeyOrder -import swaydb.data.slice.{Slice, SliceMut, SliceRO} +import swaydb.slice.{Slice, SliceMut, SliceRO} import swaydb.utils.{ByteSizeOf, FiniteDurations} import scala.annotation.tailrec diff --git a/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlockSecondaryIndexEntry.scala b/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlockSecondaryIndexEntry.scala index 105e43a5a..91919012e 100644 --- a/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlockSecondaryIndexEntry.scala +++ b/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlockSecondaryIndexEntry.scala @@ -1,6 +1,6 @@ package swaydb.core.segment.block.sortedindex -import swaydb.data.slice.Slice +import swaydb.slice.Slice /** * IndexEntries that are used to create secondary indexes - binarySearchIndex & hashIndex diff --git a/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlockState.scala b/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlockState.scala index 289c226d5..6950a64c0 100644 --- a/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlockState.scala +++ b/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlockState.scala @@ -6,7 +6,7 @@ import swaydb.core.segment.entry.writer.EntryWriter import swaydb.core.util.MinMax import swaydb.data.MaxKey import swaydb.data.config.UncompressedBlockInfo -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} import scala.collection.mutable.ListBuffer import scala.concurrent.duration.Deadline diff --git a/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexEntryParser.scala b/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexEntryParser.scala index 548839297..1a5701eb8 100644 --- a/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexEntryParser.scala +++ b/core/src/main/scala/swaydb/core/segment/block/sortedindex/SortedIndexEntryParser.scala @@ -20,7 +20,7 @@ import swaydb.core.data.{Persistent, PersistentOption} import swaydb.core.segment.block.reader.UnblockedReader import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} import swaydb.core.segment.entry.reader.PersistentParser -import swaydb.data.slice.Slice +import swaydb.slice.Slice sealed trait SortedIndexEntryParser[T] { diff --git a/core/src/main/scala/swaydb/core/segment/block/values/ValuesBlock.scala b/core/src/main/scala/swaydb/core/segment/block/values/ValuesBlock.scala index a27bae818..804cdc8dc 100644 --- a/core/src/main/scala/swaydb/core/segment/block/values/ValuesBlock.scala +++ b/core/src/main/scala/swaydb/core/segment/block/values/ValuesBlock.scala @@ -23,7 +23,7 @@ import swaydb.core.segment.block._ import swaydb.core.segment.block.reader.UnblockedReader import swaydb.core.segment.entry.writer.EntryWriter import swaydb.data.config.UncompressedBlockInfo -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} private[core] case object ValuesBlock { diff --git a/core/src/main/scala/swaydb/core/segment/block/values/ValuesBlockState.scala b/core/src/main/scala/swaydb/core/segment/block/values/ValuesBlockState.scala index e7a686a34..99df19410 100644 --- a/core/src/main/scala/swaydb/core/segment/block/values/ValuesBlockState.scala +++ b/core/src/main/scala/swaydb/core/segment/block/values/ValuesBlockState.scala @@ -3,7 +3,7 @@ package swaydb.core.segment.block.values import swaydb.compression.CompressionInternal import swaydb.core.segment.entry.writer.EntryWriter import swaydb.data.config.UncompressedBlockInfo -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} private[block] class ValuesBlockState(var compressibleBytes: SliceMut[Byte], val cacheableBytes: Slice[Byte], diff --git a/core/src/main/scala/swaydb/core/segment/defrag/Defrag.scala b/core/src/main/scala/swaydb/core/segment/defrag/Defrag.scala index f8ac8b8a7..3df5cbd2b 100644 --- a/core/src/main/scala/swaydb/core/segment/defrag/Defrag.scala +++ b/core/src/main/scala/swaydb/core/segment/defrag/Defrag.scala @@ -24,7 +24,7 @@ import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.block.segment.transient.TransientSegment import swaydb.core.segment.defrag.DefragSource._ import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.collection.mutable.ListBuffer import scala.concurrent.{ExecutionContext, Future} diff --git a/core/src/main/scala/swaydb/core/segment/defrag/DefragMemorySegment.scala b/core/src/main/scala/swaydb/core/segment/defrag/DefragMemorySegment.scala index 6e8bdffe9..1c2bc82fb 100644 --- a/core/src/main/scala/swaydb/core/segment/defrag/DefragMemorySegment.scala +++ b/core/src/main/scala/swaydb/core/segment/defrag/DefragMemorySegment.scala @@ -28,7 +28,7 @@ import swaydb.core.sweeper.FileSweeper import swaydb.core.util.IDGenerator import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.Futures import scala.collection.mutable.ListBuffer diff --git a/core/src/main/scala/swaydb/core/segment/defrag/DefragMerge.scala b/core/src/main/scala/swaydb/core/segment/defrag/DefragMerge.scala index 13db3ce14..852a557d4 100644 --- a/core/src/main/scala/swaydb/core/segment/defrag/DefragMerge.scala +++ b/core/src/main/scala/swaydb/core/segment/defrag/DefragMerge.scala @@ -24,7 +24,7 @@ import swaydb.core.segment.assigner.Assignable import swaydb.core.segment.block.segment.transient.TransientSegment import swaydb.core.segment.defrag.DefragSource._ import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.collection.mutable.ListBuffer 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 3bd8a3dca..40ff1b012 100644 --- a/core/src/main/scala/swaydb/core/segment/defrag/DefragPersistentSegment.scala +++ b/core/src/main/scala/swaydb/core/segment/defrag/DefragPersistentSegment.scala @@ -16,7 +16,7 @@ package swaydb.core.segment.defrag -import swaydb.Aggregator +import swaydb.utils.Aggregator import swaydb.core.data.{DefIO, Memory} import swaydb.core.function.FunctionStore import swaydb.core.io.file.ForceSaveApplier @@ -41,7 +41,7 @@ import swaydb.core.util.IDGenerator import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.{MMAP, SegmentRefCacheLife} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.Futures import swaydb.utils.Futures.FutureUnitImplicits diff --git a/core/src/main/scala/swaydb/core/segment/defrag/DefragSource.scala b/core/src/main/scala/swaydb/core/segment/defrag/DefragSource.scala index f7662b4bb..c01e5e6ac 100644 --- a/core/src/main/scala/swaydb/core/segment/defrag/DefragSource.scala +++ b/core/src/main/scala/swaydb/core/segment/defrag/DefragSource.scala @@ -20,7 +20,7 @@ import swaydb.core.data.KeyValue import swaydb.core.segment.Segment import swaydb.core.segment.ref.SegmentRef import swaydb.data.MaxKey -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.annotation.implicitNotFound diff --git a/core/src/main/scala/swaydb/core/segment/entry/generators/IdsGenerator.scala b/core/src/main/scala/swaydb/core/segment/entry/generators/IdsGenerator.scala index 3f3052bd6..9d868232e 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/generators/IdsGenerator.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/generators/IdsGenerator.scala @@ -17,7 +17,7 @@ package swaydb.core.segment.entry.generators import swaydb.core.segment.entry.id._ -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.Effect import java.nio.file.Paths diff --git a/core/src/main/scala/swaydb/core/segment/entry/reader/DeadlineReader.scala b/core/src/main/scala/swaydb/core/segment/entry/reader/DeadlineReader.scala index 970649c99..af07e808b 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/reader/DeadlineReader.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/reader/DeadlineReader.scala @@ -20,7 +20,7 @@ import swaydb.core.data.{Persistent, PersistentOption} import swaydb.core.segment.entry.id.BaseEntryId import swaydb.core.util.Bytes import swaydb.core.util.Times._ -import swaydb.data.slice.ReaderBase +import swaydb.slice.ReaderBase import swaydb.utils.ByteSizeOf import scala.annotation.implicitNotFound diff --git a/core/src/main/scala/swaydb/core/segment/entry/reader/KeyReader.scala b/core/src/main/scala/swaydb/core/segment/entry/reader/KeyReader.scala index 08eef1798..ab29f598b 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/reader/KeyReader.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/reader/KeyReader.scala @@ -19,7 +19,7 @@ package swaydb.core.segment.entry.reader import swaydb.core.io.reader.Reader import swaydb.core.segment.entry.id.KeyValueId import swaydb.core.util.Bytes -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} object KeyReader { diff --git a/core/src/main/scala/swaydb/core/segment/entry/reader/PersistentParser.scala b/core/src/main/scala/swaydb/core/segment/entry/reader/PersistentParser.scala index 9c717c0a0..37983e934 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/reader/PersistentParser.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/reader/PersistentParser.scala @@ -24,7 +24,7 @@ import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlock import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} import swaydb.core.segment.entry.id.{KeyValueId, PersistentToKeyValueIdBinder} import swaydb.core.util.Bytes -import swaydb.data.slice.Slice +import swaydb.slice.Slice object PersistentParser { diff --git a/core/src/main/scala/swaydb/core/segment/entry/reader/PersistentReader.scala b/core/src/main/scala/swaydb/core/segment/entry/reader/PersistentReader.scala index 58b2e3cd8..9c863edcf 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/reader/PersistentReader.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/reader/PersistentReader.scala @@ -24,7 +24,7 @@ import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} import swaydb.core.segment.entry.id.PersistentToKeyValueIdBinder import swaydb.core.segment.entry.reader.base.BaseEntryReader import swaydb.core.util.Bytes -import swaydb.data.slice.{ReaderBase, Slice, SliceOption} +import swaydb.slice.{ReaderBase, Slice, SliceOption} import swaydb.utils.TupleOrNone object PersistentReader extends LazyLogging { diff --git a/core/src/main/scala/swaydb/core/segment/entry/reader/TimeReader.scala b/core/src/main/scala/swaydb/core/segment/entry/reader/TimeReader.scala index ed09ed97b..01d5ca364 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/reader/TimeReader.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/reader/TimeReader.scala @@ -19,7 +19,7 @@ package swaydb.core.segment.entry.reader import swaydb.core.data.{Persistent, PersistentOption, Time} import swaydb.core.segment.entry.id.BaseEntryId import swaydb.core.util.Bytes -import swaydb.data.slice.ReaderBase +import swaydb.slice.ReaderBase import scala.annotation.implicitNotFound diff --git a/core/src/main/scala/swaydb/core/segment/entry/reader/ValueLengthReader.scala b/core/src/main/scala/swaydb/core/segment/entry/reader/ValueLengthReader.scala index 523089d94..fdbafb051 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/reader/ValueLengthReader.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/reader/ValueLengthReader.scala @@ -19,7 +19,7 @@ package swaydb.core.segment.entry.reader import swaydb.core.data.{Persistent, PersistentOption} import swaydb.core.segment.entry.id.BaseEntryId import swaydb.core.util.Bytes -import swaydb.data.slice.{ReaderBase, Slice} +import swaydb.slice.{ReaderBase, Slice} import swaydb.utils.ByteSizeOf import scala.annotation.implicitNotFound diff --git a/core/src/main/scala/swaydb/core/segment/entry/reader/ValueOffsetReader.scala b/core/src/main/scala/swaydb/core/segment/entry/reader/ValueOffsetReader.scala index d6fdde03b..d23f09cac 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/reader/ValueOffsetReader.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/reader/ValueOffsetReader.scala @@ -19,7 +19,7 @@ package swaydb.core.segment.entry.reader import swaydb.core.data.{Persistent, PersistentOption} import swaydb.core.segment.entry.id.BaseEntryId import swaydb.core.util.Bytes -import swaydb.data.slice.{ReaderBase, Slice} +import swaydb.slice.{ReaderBase, Slice} import swaydb.utils.ByteSizeOf import scala.annotation.implicitNotFound diff --git a/core/src/main/scala/swaydb/core/segment/entry/reader/ValueReader.scala b/core/src/main/scala/swaydb/core/segment/entry/reader/ValueReader.scala index 8763fd8d8..0b316afb4 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/reader/ValueReader.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/reader/ValueReader.scala @@ -18,7 +18,7 @@ package swaydb.core.segment.entry.reader import swaydb.core.data.PersistentOption import swaydb.core.segment.entry.id.BaseEntryId -import swaydb.data.slice.ReaderBase +import swaydb.slice.ReaderBase import swaydb.utils.TupleOrNone import scala.annotation.implicitNotFound diff --git a/core/src/main/scala/swaydb/core/segment/entry/writer/EntryWriter.scala b/core/src/main/scala/swaydb/core/segment/entry/writer/EntryWriter.scala index 5d61750fc..aecb1abcb 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/writer/EntryWriter.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/writer/EntryWriter.scala @@ -19,7 +19,7 @@ package swaydb.core.segment.entry.writer import swaydb.core.data.{Memory, MemoryOption} import swaydb.core.segment.entry.id.{BaseEntryIdFormatA, KeyValueId, MemoryToKeyValueIdBinder} import swaydb.core.util.Bytes -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} import swaydb.utils.ByteSizeOf private[core] object EntryWriter { diff --git a/core/src/main/scala/swaydb/core/segment/entry/writer/KeyWriter.scala b/core/src/main/scala/swaydb/core/segment/entry/writer/KeyWriter.scala index 40eb84221..d6f9ef7f5 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/writer/KeyWriter.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/writer/KeyWriter.scala @@ -19,7 +19,7 @@ package swaydb.core.segment.entry.writer import swaydb.core.data.Memory import swaydb.core.segment.entry.id.{BaseEntryId, MemoryToKeyValueIdBinder} import swaydb.core.util.Bytes -import swaydb.data.slice.Slice +import swaydb.slice.Slice trait KeyWriter { def write[T <: Memory](current: T, diff --git a/core/src/main/scala/swaydb/core/segment/entry/writer/ValueWriter.scala b/core/src/main/scala/swaydb/core/segment/entry/writer/ValueWriter.scala index ad5ec2803..6703b458b 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/writer/ValueWriter.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/writer/ValueWriter.scala @@ -19,7 +19,7 @@ package swaydb.core.segment.entry.writer import swaydb.core.data.Memory import swaydb.core.segment.entry.id.{BaseEntryId, MemoryToKeyValueIdBinder} import swaydb.core.util.Bytes -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.utils.Options private[segment] trait ValueWriter { 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 ae2469896..3120ac659 100644 --- a/core/src/main/scala/swaydb/core/segment/io/SegmentWriteIO.scala +++ b/core/src/main/scala/swaydb/core/segment/io/SegmentWriteIO.scala @@ -27,7 +27,7 @@ import swaydb.core.sweeper.{FileSweeper, MemorySweeper} import swaydb.core.util.IDGenerator import swaydb.data.config.{MMAP, SegmentRefCacheLife} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.{Error, IO} /** 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 c515968e0..37474e367 100644 --- a/core/src/main/scala/swaydb/core/segment/io/SegmentWriteMemoryIO.scala +++ b/core/src/main/scala/swaydb/core/segment/io/SegmentWriteMemoryIO.scala @@ -28,7 +28,7 @@ import swaydb.core.sweeper.{FileSweeper, MemorySweeper} import swaydb.core.util.IDGenerator import swaydb.data.config.{MMAP, SegmentRefCacheLife} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.{Error, IO} 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 dd15f2439..88cba98f9 100644 --- a/core/src/main/scala/swaydb/core/segment/io/SegmentWritePersistentIO.scala +++ b/core/src/main/scala/swaydb/core/segment/io/SegmentWritePersistentIO.scala @@ -29,8 +29,8 @@ import swaydb.core.sweeper.{FileSweeper, MemorySweeper} import swaydb.core.util.IDGenerator import swaydb.data.config.{ForceSave, MMAP, SegmentRefCacheLife} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice -import swaydb.data.slice.SliceIOImplicits._ +import swaydb.slice.Slice +import swaydb.slice.SliceIOImplicits._ import swaydb.{Error, IO} import java.nio.file.Path diff --git a/core/src/main/scala/swaydb/core/segment/ref/SegmentRef.scala b/core/src/main/scala/swaydb/core/segment/ref/SegmentRef.scala index 1067ac6dc..2f75ae767 100644 --- a/core/src/main/scala/swaydb/core/segment/ref/SegmentRef.scala +++ b/core/src/main/scala/swaydb/core/segment/ref/SegmentRef.scala @@ -35,7 +35,7 @@ import swaydb.core.util.MinMax import swaydb.skiplist.{SkipList, SkipListConcurrent, SkipListConcurrentLimit} import swaydb.data.MaxKey import swaydb.data.order.KeyOrder -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.utils.SomeOrNoneCovariant import java.nio.file.Path diff --git a/core/src/main/scala/swaydb/core/segment/ref/SegmentRefReader.scala b/core/src/main/scala/swaydb/core/segment/ref/SegmentRefReader.scala index fb91af845..9dbe72a85 100644 --- a/core/src/main/scala/swaydb/core/segment/ref/SegmentRefReader.scala +++ b/core/src/main/scala/swaydb/core/segment/ref/SegmentRefReader.scala @@ -21,7 +21,7 @@ import swaydb.core.segment.ref.search.{SegmentReadState, SegmentReadStateOption, import swaydb.core.util.MinMax import swaydb.data.MaxKey import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.TupleOrNone import java.nio.file.Path diff --git a/core/src/main/scala/swaydb/core/segment/ref/search/KeyMatcher.scala b/core/src/main/scala/swaydb/core/segment/ref/search/KeyMatcher.scala index 442c80ca0..096fa8b53 100644 --- a/core/src/main/scala/swaydb/core/segment/ref/search/KeyMatcher.scala +++ b/core/src/main/scala/swaydb/core/segment/ref/search/KeyMatcher.scala @@ -19,7 +19,7 @@ package swaydb.core.segment.ref.search import swaydb.core.data.Persistent import swaydb.core.segment.ref.search.KeyMatcher.Result._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice private[core] sealed trait KeyMatcher { def key: Slice[Byte] diff --git a/core/src/main/scala/swaydb/core/segment/ref/search/SegmentReadState.scala b/core/src/main/scala/swaydb/core/segment/ref/search/SegmentReadState.scala index 2439d8c08..a4753a263 100644 --- a/core/src/main/scala/swaydb/core/segment/ref/search/SegmentReadState.scala +++ b/core/src/main/scala/swaydb/core/segment/ref/search/SegmentReadState.scala @@ -17,7 +17,7 @@ package swaydb.core.segment.ref.search import swaydb.core.data.{Persistent, PersistentOption} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.{SomeOrNone, TupleOrNone} import java.nio.file.Path diff --git a/core/src/main/scala/swaydb/core/segment/ref/search/SegmentSearcher.scala b/core/src/main/scala/swaydb/core/segment/ref/search/SegmentSearcher.scala index 726f35cbc..f9d4b3786 100644 --- a/core/src/main/scala/swaydb/core/segment/ref/search/SegmentSearcher.scala +++ b/core/src/main/scala/swaydb/core/segment/ref/search/SegmentSearcher.scala @@ -23,7 +23,7 @@ import swaydb.core.segment.block.reader.UnblockedReader import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockOffset} import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice private[core] trait SegmentSearcher { diff --git a/core/src/main/scala/swaydb/core/sweeper/MemorySweeper.scala b/core/src/main/scala/swaydb/core/sweeper/MemorySweeper.scala index 408f7414f..f2c43797d 100644 --- a/core/src/main/scala/swaydb/core/sweeper/MemorySweeper.scala +++ b/core/src/main/scala/swaydb/core/sweeper/MemorySweeper.scala @@ -23,7 +23,7 @@ import swaydb.core.data.Persistent import swaydb.core.util.HashedMap import swaydb.skiplist.SkipList import swaydb.data.config.MemoryCache -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.utils.ByteSizeOf import swaydb.{Actor, ActorConfig, ActorRef, Glass} diff --git a/core/src/main/scala/swaydb/core/util/Bytes.scala b/core/src/main/scala/swaydb/core/util/Bytes.scala index a67673779..296e4ca19 100644 --- a/core/src/main/scala/swaydb/core/util/Bytes.scala +++ b/core/src/main/scala/swaydb/core/util/Bytes.scala @@ -19,8 +19,8 @@ package swaydb.core.util import swaydb.OK import swaydb.core.data.KeyValue import swaydb.core.io.reader.Reader -import swaydb.data.slice.Slice -import swaydb.data.utils.ScalaByteOps +import swaydb.slice.Slice +import swaydb.slice.utils.ScalaByteOps private[swaydb] object Bytes extends ScalaByteOps { diff --git a/core/src/main/scala/swaydb/core/util/CRC32.scala b/core/src/main/scala/swaydb/core/util/CRC32.scala index 46091ec6b..84d30755c 100644 --- a/core/src/main/scala/swaydb/core/util/CRC32.scala +++ b/core/src/main/scala/swaydb/core/util/CRC32.scala @@ -16,7 +16,7 @@ package swaydb.core.util -import swaydb.data.slice.Slice +import swaydb.slice.Slice private[core] object CRC32 { diff --git a/core/src/main/scala/swaydb/core/util/Collections.scala b/core/src/main/scala/swaydb/core/util/Collections.scala index 3630a9440..255fec86a 100644 --- a/core/src/main/scala/swaydb/core/util/Collections.scala +++ b/core/src/main/scala/swaydb/core/util/Collections.scala @@ -16,7 +16,7 @@ package swaydb.core.util -import swaydb.data.slice.{Slice, SliceMut} +import swaydb.slice.{Slice, SliceMut} import scala.collection.mutable.ListBuffer import scala.reflect.ClassTag diff --git a/core/src/main/scala/swaydb/core/util/KeyCompressor.scala b/core/src/main/scala/swaydb/core/util/KeyCompressor.scala index ca7b92514..1b322126e 100644 --- a/core/src/main/scala/swaydb/core/util/KeyCompressor.scala +++ b/core/src/main/scala/swaydb/core/util/KeyCompressor.scala @@ -18,7 +18,7 @@ package swaydb.core.util import swaydb.core.data.{Memory, MemoryOption} import swaydb.data.MaxKey -import swaydb.data.slice.Slice +import swaydb.slice.Slice private[core] object KeyCompressor { diff --git a/core/src/main/scala/swaydb/core/util/MinMax.scala b/core/src/main/scala/swaydb/core/util/MinMax.scala index cbf050bcf..a59df57e0 100644 --- a/core/src/main/scala/swaydb/core/util/MinMax.scala +++ b/core/src/main/scala/swaydb/core/util/MinMax.scala @@ -19,7 +19,7 @@ package swaydb.core.util import swaydb.core.data.Value.{FromValue, FromValueOption} import swaydb.core.data.{KeyValue, Memory, Value} import swaydb.core.function.FunctionStore -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.{SomeOrNone, SomeOrNoneCovariant} import scala.annotation.tailrec diff --git a/core/src/main/scala/swaydb/core/util/MurmurHash3Generic.scala b/core/src/main/scala/swaydb/core/util/MurmurHash3Generic.scala index 9432ecef3..5a0cf5e04 100644 --- a/core/src/main/scala/swaydb/core/util/MurmurHash3Generic.scala +++ b/core/src/main/scala/swaydb/core/util/MurmurHash3Generic.scala @@ -17,7 +17,7 @@ package swaydb.core.util import swaydb.core.io.reader.Reader -import swaydb.data.slice.Slice +import swaydb.slice.Slice import java.lang.Long.rotateLeft diff --git a/core/src/main/scala/swaydb/core/util/Times.scala b/core/src/main/scala/swaydb/core/util/Times.scala index b4f72a4f7..039c2d650 100644 --- a/core/src/main/scala/swaydb/core/util/Times.scala +++ b/core/src/main/scala/swaydb/core/util/Times.scala @@ -16,7 +16,7 @@ package swaydb.core.util -import swaydb.data.slice.Slice +import swaydb.slice.Slice import java.util.concurrent.TimeUnit import scala.concurrent.duration.Deadline diff --git a/core/src/main/scala/swaydb/core/util/UUIDs.scala b/core/src/main/scala/swaydb/core/util/UUIDs.scala index 5ebe412a6..1eff33976 100644 --- a/core/src/main/scala/swaydb/core/util/UUIDs.scala +++ b/core/src/main/scala/swaydb/core/util/UUIDs.scala @@ -16,7 +16,7 @@ package swaydb.core.util -import swaydb.data.slice.Slice +import swaydb.slice.Slice object UUIDs { diff --git a/core/src/test/scala/swaydb/core/CommonAssertions.scala b/core/src/test/scala/swaydb/core/CommonAssertions.scala index bdeae0ca2..425c3ea14 100644 --- a/core/src/test/scala/swaydb/core/CommonAssertions.scala +++ b/core/src/test/scala/swaydb/core/CommonAssertions.scala @@ -52,14 +52,15 @@ import swaydb.skiplist.SkipListConcurrent import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.compaction.PushStrategy import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.SliceIOImplicits._ -import swaydb.data.slice.{Reader, Slice, SliceOption, SliceReader} +import swaydb.slice.SliceIOImplicits._ +import swaydb.slice.{Reader, Slice, SliceOption, SliceReader} import swaydb.data.{Atomic, OptimiseWrites} import swaydb.effect.{Effect, IOStrategy} import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ -import swaydb.{Aggregator, Bag, Error, Glass, IO} +import swaydb.utils.Aggregator +import swaydb.{Bag, Error, Glass, IO} import java.nio.file.Paths import scala.annotation.tailrec diff --git a/core/src/test/scala/swaydb/core/PrivateMethodInvokers.scala b/core/src/test/scala/swaydb/core/PrivateMethodInvokers.scala index 3e9cda8a6..2004cbc03 100644 --- a/core/src/test/scala/swaydb/core/PrivateMethodInvokers.scala +++ b/core/src/test/scala/swaydb/core/PrivateMethodInvokers.scala @@ -23,7 +23,7 @@ import swaydb.core.segment.PersistentSegment import swaydb.core.segment.ref.SegmentRef import swaydb.core.util.queue.VolatileQueue import swaydb.core.util.{HashedMap, IDGenerator} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import java.util.concurrent.atomic.AtomicLong import java.util.concurrent.{ConcurrentHashMap, ConcurrentSkipListMap} diff --git a/core/src/test/scala/swaydb/core/TestBase.scala b/core/src/test/scala/swaydb/core/TestBase.scala index 193134e21..c4352f71c 100644 --- a/core/src/test/scala/swaydb/core/TestBase.scala +++ b/core/src/test/scala/swaydb/core/TestBase.scala @@ -49,7 +49,7 @@ import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, LevelZeroThrottle} import swaydb.data.config.{MMAP, RecoveryMode} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.storage.{Level0Storage, LevelStorage} import swaydb.data.{Atomic, OptimiseWrites} import swaydb.effect.{Dir, Effect} diff --git a/core/src/test/scala/swaydb/core/TestData.scala b/core/src/test/scala/swaydb/core/TestData.scala index ab1ff9020..8308b9d7f 100644 --- a/core/src/test/scala/swaydb/core/TestData.scala +++ b/core/src/test/scala/swaydb/core/TestData.scala @@ -66,17 +66,17 @@ import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.compaction.{LevelMeter, LevelThrottle} import swaydb.data.config._ import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.{Slice, SliceOption, SliceRO} import swaydb.data.storage.{Level0Storage, LevelStorage} import swaydb.data.{Atomic, MaxKey, OptimiseWrites} import swaydb.effect.{Dir, IOAction, IOStrategy} import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.skiplist.AtomicRanges +import swaydb.slice.{Slice, SliceOption, SliceRO} import swaydb.testkit.RunThis.FutureImplicits import swaydb.utils.StorageUnits._ -import swaydb.utils.{FiniteDurations, OperatingSystem} -import swaydb.{ActorConfig, Aggregator, Error, Glass, IO} +import swaydb.utils.{Aggregator, FiniteDurations, OperatingSystem} +import swaydb.{ActorConfig, Error, Glass, IO} import java.nio.file.Path import java.util.concurrent.TimeUnit diff --git a/core/src/test/scala/swaydb/core/TestTimer.scala b/core/src/test/scala/swaydb/core/TestTimer.scala index 6eceab18a..0d5053365 100644 --- a/core/src/test/scala/swaydb/core/TestTimer.scala +++ b/core/src/test/scala/swaydb/core/TestTimer.scala @@ -18,7 +18,7 @@ package swaydb.core import swaydb.core.data.Time import swaydb.core.log.timer.Timer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.macros.Sealed import java.util.concurrent.atomic.AtomicLong diff --git a/core/src/test/scala/swaydb/core/build/BuildSpec.scala b/core/src/test/scala/swaydb/core/build/BuildSpec.scala index 6fc6a622e..dc3fe3230 100644 --- a/core/src/test/scala/swaydb/core/build/BuildSpec.scala +++ b/core/src/test/scala/swaydb/core/build/BuildSpec.scala @@ -22,7 +22,7 @@ import swaydb.IOValues._ import swaydb.core.TestData._ import swaydb.core.{TestBase, TestCaseSweeper} import swaydb.data.DataType -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.{Effect, Extension} import swaydb.utils.ByteSizeOf diff --git a/core/src/test/scala/swaydb/core/data/TransientSpec.scala b/core/src/test/scala/swaydb/core/data/TransientSpec.scala index fb84fe7dc..d25433e19 100644 --- a/core/src/test/scala/swaydb/core/data/TransientSpec.scala +++ b/core/src/test/scala/swaydb/core/data/TransientSpec.scala @@ -21,7 +21,7 @@ //import swaydb.core.TestData._ //import swaydb.core.segment.block.SortedIndexBlock //import swaydb.core.{TestBase, TestTimer} -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.serializers.Default._ //import swaydb.serializers._ // diff --git a/core/src/test/scala/swaydb/core/io/file/ByteBufferSweeperSpec.scala b/core/src/test/scala/swaydb/core/io/file/ByteBufferSweeperSpec.scala index f79c21242..6464d38fb 100644 --- a/core/src/test/scala/swaydb/core/io/file/ByteBufferSweeperSpec.scala +++ b/core/src/test/scala/swaydb/core/io/file/ByteBufferSweeperSpec.scala @@ -25,7 +25,7 @@ import swaydb.core.TestData._ import swaydb.core.sweeper.ByteBufferSweeper.{ByteBufferSweeperActor, Command} import swaydb.core.sweeper.{ByteBufferSweeper, FileSweeper} import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestForceSave} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.Effect import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem diff --git a/core/src/test/scala/swaydb/core/io/file/DBFileSpec.scala b/core/src/test/scala/swaydb/core/io/file/DBFileSpec.scala index 14694ab08..809593419 100644 --- a/core/src/test/scala/swaydb/core/io/file/DBFileSpec.scala +++ b/core/src/test/scala/swaydb/core/io/file/DBFileSpec.scala @@ -24,7 +24,7 @@ import swaydb.core.TestCaseSweeper._ import swaydb.core.TestData._ import swaydb.core.util.PipeOps._ import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave} -import swaydb.data.slice.{Slice, Slices} +import swaydb.slice.{Slice, Slices} import swaydb.effect.Effect import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem diff --git a/core/src/test/scala/swaydb/core/io/file/EffectSpec.scala b/core/src/test/scala/swaydb/core/io/file/EffectSpec.scala index 6f5e0cf45..d0ae82eb3 100644 --- a/core/src/test/scala/swaydb/core/io/file/EffectSpec.scala +++ b/core/src/test/scala/swaydb/core/io/file/EffectSpec.scala @@ -21,7 +21,7 @@ import swaydb.IOValues._ import swaydb.core.TestData._ import swaydb.core.util.Benchmark import swaydb.core.{TestBase, TestCaseSweeper} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.{Effect, Extension} import swaydb.testkit.RunThis._ import swaydb.utils.StorageUnits._ diff --git a/core/src/test/scala/swaydb/core/io/file/MMAPFileSpec.scala b/core/src/test/scala/swaydb/core/io/file/MMAPFileSpec.scala index 9845c1416..8b8779825 100644 --- a/core/src/test/scala/swaydb/core/io/file/MMAPFileSpec.scala +++ b/core/src/test/scala/swaydb/core/io/file/MMAPFileSpec.scala @@ -22,7 +22,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.sweeper.ByteBufferCleaner import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.Effect import swaydb.testkit.RunThis._ import swaydb.utils.StorageUnits._ diff --git a/core/src/test/scala/swaydb/core/level/LevelCollpaseSpec.scala b/core/src/test/scala/swaydb/core/level/LevelCollpaseSpec.scala index 6816c2b4a..894856b34 100644 --- a/core/src/test/scala/swaydb/core/level/LevelCollpaseSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelCollpaseSpec.scala @@ -28,7 +28,7 @@ import swaydb.core.segment.ref.search.ThreadReadState import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem import swaydb.utils.StorageUnits._ diff --git a/core/src/test/scala/swaydb/core/level/LevelKeyValuesSpec.scala b/core/src/test/scala/swaydb/core/level/LevelKeyValuesSpec.scala index e81718e1d..331d15235 100644 --- a/core/src/test/scala/swaydb/core/level/LevelKeyValuesSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelKeyValuesSpec.scala @@ -29,7 +29,7 @@ import swaydb.core.segment.ref.search.ThreadReadState import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/LevelMapSpec.scala b/core/src/test/scala/swaydb/core/level/LevelMapSpec.scala index 435379a82..093a7e589 100644 --- a/core/src/test/scala/swaydb/core/level/LevelMapSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelMapSpec.scala @@ -30,7 +30,7 @@ import swaydb.core.segment.ref.search.ThreadReadState import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, OptimiseWrites} import swaydb.serializers.Default._ import swaydb.serializers._ diff --git a/core/src/test/scala/swaydb/core/level/LevelMergeSpec.scala b/core/src/test/scala/swaydb/core/level/LevelMergeSpec.scala index 68e961293..a692321ca 100644 --- a/core/src/test/scala/swaydb/core/level/LevelMergeSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelMergeSpec.scala @@ -28,7 +28,7 @@ import swaydb.core.level.compaction.io.CompactionIO import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/LevelReadNoneSpec.scala b/core/src/test/scala/swaydb/core/level/LevelReadNoneSpec.scala index ad035a3d4..84e27cb86 100644 --- a/core/src/test/scala/swaydb/core/level/LevelReadNoneSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelReadNoneSpec.scala @@ -24,7 +24,7 @@ import swaydb.core.segment.ref.search.ThreadReadState import swaydb.core.{TestBase, TestForceSave} import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/LevelReadSomeSpec.scala b/core/src/test/scala/swaydb/core/level/LevelReadSomeSpec.scala index 4137185ca..be66436f5 100644 --- a/core/src/test/scala/swaydb/core/level/LevelReadSomeSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelReadSomeSpec.scala @@ -27,7 +27,7 @@ import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave} import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem diff --git a/core/src/test/scala/swaydb/core/level/LevelReadSpec.scala b/core/src/test/scala/swaydb/core/level/LevelReadSpec.scala index 9875c1f77..21838fa7e 100644 --- a/core/src/test/scala/swaydb/core/level/LevelReadSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelReadSpec.scala @@ -33,7 +33,7 @@ import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.compaction.LevelThrottle import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.Effect._ import swaydb.serializers.Default._ import swaydb.serializers._ diff --git a/core/src/test/scala/swaydb/core/level/LevelRefreshSpec.scala b/core/src/test/scala/swaydb/core/level/LevelRefreshSpec.scala index 5be60c3e4..e7d2e4a7c 100644 --- a/core/src/test/scala/swaydb/core/level/LevelRefreshSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelRefreshSpec.scala @@ -27,7 +27,7 @@ import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/LevelRemoveSegmentSpec.scala b/core/src/test/scala/swaydb/core/level/LevelRemoveSegmentSpec.scala index e01d196d7..4e9314979 100644 --- a/core/src/test/scala/swaydb/core/level/LevelRemoveSegmentSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelRemoveSegmentSpec.scala @@ -25,7 +25,7 @@ import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave, TestTimer} import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem import swaydb.utils.StorageUnits._ diff --git a/core/src/test/scala/swaydb/core/level/LevelSegmentSpec.scala b/core/src/test/scala/swaydb/core/level/LevelSegmentSpec.scala index 0ba58cd50..c451aac63 100644 --- a/core/src/test/scala/swaydb/core/level/LevelSegmentSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelSegmentSpec.scala @@ -30,7 +30,7 @@ import swaydb.core.util.PipeOps._ import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.storage.LevelStorage import swaydb.effect.Effect._ import swaydb.effect.{Dir, Effect, Extension} diff --git a/core/src/test/scala/swaydb/core/level/LevelSpec.scala b/core/src/test/scala/swaydb/core/level/LevelSpec.scala index ee927dbf1..0d15bb2e2 100644 --- a/core/src/test/scala/swaydb/core/level/LevelSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelSpec.scala @@ -29,7 +29,7 @@ import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.storage.LevelStorage import swaydb.effect.Effect._ import swaydb.effect.{Dir, Effect, Extension} diff --git a/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelTaskAssignerSpec.scala b/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelTaskAssignerSpec.scala index ad16b28e9..7be19fa51 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelTaskAssignerSpec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelTaskAssignerSpec.scala @@ -28,7 +28,7 @@ import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave, TestTimer} import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.utils.OperatingSystem diff --git a/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_createStacks_Fixed_Spec.scala b/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_createStacks_Fixed_Spec.scala index d426f3e0d..93f89105c 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_createStacks_Fixed_Spec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_createStacks_Fixed_Spec.scala @@ -24,7 +24,7 @@ import swaydb.core.level.zero.LevelZero.LevelZeroLog import swaydb.core.{TestBase, TestCaseSweeper, TestTimer} import swaydb.data.MaxKey import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_createStacks_Range_Spec.scala b/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_createStacks_Range_Spec.scala index 78bcc9d45..3fb2bf059 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_createStacks_Range_Spec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_createStacks_Range_Spec.scala @@ -24,7 +24,7 @@ import swaydb.core.level.zero.LevelZero.LevelZeroLog import swaydb.core.{TestBase, TestCaseSweeper, TestTimer} import swaydb.data.MaxKey import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_flatten_Spec.scala b/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_flatten_Spec.scala index 23c3ab9ce..d2286f09b 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_flatten_Spec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_flatten_Spec.scala @@ -24,7 +24,7 @@ import swaydb.core.{merge => _, _} import swaydb.data.MaxKey import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_mergeStack_Spec.scala b/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_mergeStack_Spec.scala index c54e47399..a3d2911ab 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_mergeStack_Spec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/task/assigner/LevelZeroTaskAssigner_mergeStack_Spec.scala @@ -26,7 +26,7 @@ import swaydb.core.segment.Segment import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestTimer} import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/compaction/task/assigner/TaskAssigner_Assign_Quick_Spec.scala b/core/src/test/scala/swaydb/core/level/compaction/task/assigner/TaskAssigner_Assign_Quick_Spec.scala index 04c937004..4c142eba6 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/task/assigner/TaskAssigner_Assign_Quick_Spec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/task/assigner/TaskAssigner_Assign_Quick_Spec.scala @@ -27,7 +27,7 @@ import swaydb.data.NonEmptyList import swaydb.data.compaction.PushStrategy import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.utils.OperatingSystem diff --git a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_collapse_Spec.scala b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_collapse_Spec.scala index f417892d8..413503dd5 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_collapse_Spec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_collapse_Spec.scala @@ -27,7 +27,7 @@ import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_compactSegments_2Levels_Spec.scala b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_compactSegments_2Levels_Spec.scala index 250c19a96..e8c1ace73 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_compactSegments_2Levels_Spec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_compactSegments_2Levels_Spec.scala @@ -27,7 +27,7 @@ import swaydb.core.segment.Segment import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_compactSegments_MultiLevels_Spec.scala b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_compactSegments_MultiLevels_Spec.scala index fd1c32aa8..0a6de4cc5 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_compactSegments_MultiLevels_Spec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_compactSegments_MultiLevels_Spec.scala @@ -26,7 +26,7 @@ import swaydb.core.segment.Segment import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_refresh_Spec.scala b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_refresh_Spec.scala index 7e972cc41..31aad5082 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_refresh_Spec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourCompactionTask_refresh_Spec.scala @@ -25,7 +25,7 @@ import swaydb.core.level.compaction.task.CompactionTask import swaydb.core.segment.Segment import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourWakeUp_compactLastLevel_multiLevel_Spec.scala b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourWakeUp_compactLastLevel_multiLevel_Spec.scala index 56f4212cd..3080a71cc 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourWakeUp_compactLastLevel_multiLevel_Spec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourWakeUp_compactLastLevel_multiLevel_Spec.scala @@ -27,7 +27,7 @@ import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestForceSa import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.compaction.LevelThrottle import swaydb.data.config.MMAP -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourWakeUp_compactLastLevel_singleLevel_Spec.scala b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourWakeUp_compactLastLevel_singleLevel_Spec.scala index ffffb3344..8347c2d4a 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourWakeUp_compactLastLevel_singleLevel_Spec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/BehaviourWakeUp_compactLastLevel_singleLevel_Spec.scala @@ -26,7 +26,7 @@ import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestForceSave} import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/ThrottleCompactionSpec.scala b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/ThrottleCompactionSpec.scala index f0ca4b5a1..acb68dd1a 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/ThrottleCompactionSpec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/ThrottleCompactionSpec.scala @@ -31,7 +31,7 @@ //import swaydb.data.compaction.ParallelMerge //import swaydb.data.config.{MMAP, PushForwardStrategy} //import swaydb.data.order.{KeyOrder, TimeOrder} -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.data.util.OperatingSystem //import swaydb.data.util.StorageUnits._ //import swaydb.serializers.Default._ diff --git a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/ThrottleCompactorSpec.scala b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/ThrottleCompactorSpec.scala index 819553e5c..ca28dfc6d 100644 --- a/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/ThrottleCompactorSpec.scala +++ b/core/src/test/scala/swaydb/core/level/compaction/throttle/behaviour/ThrottleCompactorSpec.scala @@ -29,7 +29,7 @@ //import swaydb.data.compaction.CompactionExecutionContext //import swaydb.data.config.MMAP //import swaydb.data.order.{KeyOrder, TimeOrder} -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.data.util.OperatingSystem // //import scala.collection.mutable diff --git a/core/src/test/scala/swaydb/core/level/seek/GetNoneSpec.scala b/core/src/test/scala/swaydb/core/level/seek/GetNoneSpec.scala index c9e4bcb0e..567ce0480 100644 --- a/core/src/test/scala/swaydb/core/level/seek/GetNoneSpec.scala +++ b/core/src/test/scala/swaydb/core/level/seek/GetNoneSpec.scala @@ -26,7 +26,7 @@ import swaydb.core.data.{KeyValue, SwayFunctionOutput, Value} import swaydb.core.segment.ref.search.ThreadReadState import swaydb.core.{TestData, TestTimer} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/seek/GetSomeSpec.scala b/core/src/test/scala/swaydb/core/level/seek/GetSomeSpec.scala index b4e2712be..54111ea9c 100644 --- a/core/src/test/scala/swaydb/core/level/seek/GetSomeSpec.scala +++ b/core/src/test/scala/swaydb/core/level/seek/GetSomeSpec.scala @@ -28,7 +28,7 @@ import swaydb.core.merge.{FixedMerger, FunctionMerger, PendingApplyMerger} import swaydb.core.segment.ref.search.ThreadReadState import swaydb.core.{TestData, TestTimer} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/seek/HigherFixedNoneSpec.scala b/core/src/test/scala/swaydb/core/level/seek/HigherFixedNoneSpec.scala index 2ee94c240..52b1dcb74 100644 --- a/core/src/test/scala/swaydb/core/level/seek/HigherFixedNoneSpec.scala +++ b/core/src/test/scala/swaydb/core/level/seek/HigherFixedNoneSpec.scala @@ -26,7 +26,7 @@ import swaydb.core.data.KeyValue import swaydb.core.level.LevelSeek import swaydb.core.{TestData, TestTimer} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/seek/HigherFixedSomeSpec.scala b/core/src/test/scala/swaydb/core/level/seek/HigherFixedSomeSpec.scala index ec0161466..035c5598a 100644 --- a/core/src/test/scala/swaydb/core/level/seek/HigherFixedSomeSpec.scala +++ b/core/src/test/scala/swaydb/core/level/seek/HigherFixedSomeSpec.scala @@ -27,7 +27,7 @@ import swaydb.core.level.LevelSeek import swaydb.core.merge.FixedMerger import swaydb.core.{TestData, TestTimer} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/seek/HigherRangeNoneSpec.scala b/core/src/test/scala/swaydb/core/level/seek/HigherRangeNoneSpec.scala index 873036c7e..a86320e99 100644 --- a/core/src/test/scala/swaydb/core/level/seek/HigherRangeNoneSpec.scala +++ b/core/src/test/scala/swaydb/core/level/seek/HigherRangeNoneSpec.scala @@ -25,7 +25,7 @@ import swaydb.core.data.{KeyValue, Value} import swaydb.core.level.LevelSeek import swaydb.core.{TestData, TestTimer} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/seek/HigherRangeSomeSpec.scala b/core/src/test/scala/swaydb/core/level/seek/HigherRangeSomeSpec.scala index e26a1918f..260e3830f 100644 --- a/core/src/test/scala/swaydb/core/level/seek/HigherRangeSomeSpec.scala +++ b/core/src/test/scala/swaydb/core/level/seek/HigherRangeSomeSpec.scala @@ -27,7 +27,7 @@ import swaydb.core.data._ import swaydb.core.level.LevelSeek import swaydb.core.{TestData, TestTimer} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/seek/LowerFixedNoneSpec.scala b/core/src/test/scala/swaydb/core/level/seek/LowerFixedNoneSpec.scala index 21ca6fd66..d0ae9ff70 100644 --- a/core/src/test/scala/swaydb/core/level/seek/LowerFixedNoneSpec.scala +++ b/core/src/test/scala/swaydb/core/level/seek/LowerFixedNoneSpec.scala @@ -26,7 +26,7 @@ import swaydb.core.data.KeyValue import swaydb.core.level.LevelSeek import swaydb.core.{TestData, TestTimer} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/seek/LowerFixedSomeSpec.scala b/core/src/test/scala/swaydb/core/level/seek/LowerFixedSomeSpec.scala index 58c791668..de4e72dfd 100644 --- a/core/src/test/scala/swaydb/core/level/seek/LowerFixedSomeSpec.scala +++ b/core/src/test/scala/swaydb/core/level/seek/LowerFixedSomeSpec.scala @@ -27,7 +27,7 @@ import swaydb.core.level.LevelSeek import swaydb.core.merge.FixedMerger import swaydb.core.{TestData, TestTimer} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/seek/LowerRangeNoneSpec.scala b/core/src/test/scala/swaydb/core/level/seek/LowerRangeNoneSpec.scala index a86bf3885..e55b98d91 100644 --- a/core/src/test/scala/swaydb/core/level/seek/LowerRangeNoneSpec.scala +++ b/core/src/test/scala/swaydb/core/level/seek/LowerRangeNoneSpec.scala @@ -25,7 +25,7 @@ import swaydb.core.data.KeyValue import swaydb.core.level.LevelSeek import swaydb.core.{TestData, TestTimer} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/seek/LowerRangeSomeSpec.scala b/core/src/test/scala/swaydb/core/level/seek/LowerRangeSomeSpec.scala index 141ac1eb2..cf9fb6f2a 100644 --- a/core/src/test/scala/swaydb/core/level/seek/LowerRangeSomeSpec.scala +++ b/core/src/test/scala/swaydb/core/level/seek/LowerRangeSomeSpec.scala @@ -30,7 +30,7 @@ import swaydb.core.level.LevelSeek import swaydb.core.merge.FixedMerger import swaydb.core.{TestData, TestTimer} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/tool/AppendixRepairerSpec.scala b/core/src/test/scala/swaydb/core/level/tool/AppendixRepairerSpec.scala index 2686de239..0ca4f8a1b 100644 --- a/core/src/test/scala/swaydb/core/level/tool/AppendixRepairerSpec.scala +++ b/core/src/test/scala/swaydb/core/level/tool/AppendixRepairerSpec.scala @@ -27,7 +27,7 @@ import swaydb.data.compaction.LevelThrottle import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.repairAppendix.{AppendixRepairStrategy, OverlappingSegmentsException} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.Effect import swaydb.effect.Effect._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/level/zero/LevelZeroLogCacheSpec.scala b/core/src/test/scala/swaydb/core/level/zero/LevelZeroLogCacheSpec.scala index 3f73f843f..f6ed77ae5 100644 --- a/core/src/test/scala/swaydb/core/level/zero/LevelZeroLogCacheSpec.scala +++ b/core/src/test/scala/swaydb/core/level/zero/LevelZeroLogCacheSpec.scala @@ -27,7 +27,7 @@ import swaydb.core.merge.KeyValueMerger import swaydb.core.merge.stats.MergeStats import swaydb.skiplist.{SkipListConcurrent, SkipListSeries} import swaydb.data.order.TimeOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, OptimiseWrites} import swaydb.serializers.Default._ import swaydb.serializers._ diff --git a/core/src/test/scala/swaydb/core/level/zero/LevelZeroSpec.scala b/core/src/test/scala/swaydb/core/level/zero/LevelZeroSpec.scala index 70c9c551b..ba86878d2 100644 --- a/core/src/test/scala/swaydb/core/level/zero/LevelZeroSpec.scala +++ b/core/src/test/scala/swaydb/core/level/zero/LevelZeroSpec.scala @@ -32,7 +32,7 @@ import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.compaction.LevelThrottle import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.storage.LevelStorage import swaydb.effect.{Dir, Effect} import swaydb.serializers.Default._ diff --git a/core/src/test/scala/swaydb/core/log/LogEntrySpec.scala b/core/src/test/scala/swaydb/core/log/LogEntrySpec.scala index 5b0a082c1..03daef705 100644 --- a/core/src/test/scala/swaydb/core/log/LogEntrySpec.scala +++ b/core/src/test/scala/swaydb/core/log/LogEntrySpec.scala @@ -28,7 +28,7 @@ import swaydb.skiplist.SkipListConcurrent import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave, TestTimer} import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.utils.{ByteSizeOf, OperatingSystem} diff --git a/core/src/test/scala/swaydb/core/log/LogsSpec.scala b/core/src/test/scala/swaydb/core/log/LogsSpec.scala index 8493c6444..2f45f7a1e 100644 --- a/core/src/test/scala/swaydb/core/log/LogsSpec.scala +++ b/core/src/test/scala/swaydb/core/log/LogsSpec.scala @@ -28,7 +28,7 @@ import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave, TestTimer} import swaydb.data.accelerate.Accelerator import swaydb.data.config.{MMAP, RecoveryMode} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, OptimiseWrites} import swaydb.effect.Effect._ import swaydb.effect.{Effect, Extension} diff --git a/core/src/test/scala/swaydb/core/log/MapSpec.scala b/core/src/test/scala/swaydb/core/log/MapSpec.scala index fb4bb6d9c..a5918ae77 100644 --- a/core/src/test/scala/swaydb/core/log/MapSpec.scala +++ b/core/src/test/scala/swaydb/core/log/MapSpec.scala @@ -33,7 +33,7 @@ import swaydb.core.segment.io.SegmentReadIO import swaydb.skiplist.SkipListConcurrent import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.data.{Atomic, OptimiseWrites} import swaydb.effect.Effect._ import swaydb.effect.{Effect, Extension} diff --git a/core/src/test/scala/swaydb/core/log/MapTestUtil.scala b/core/src/test/scala/swaydb/core/log/MapTestUtil.scala index c79e672e8..e5e6450af 100644 --- a/core/src/test/scala/swaydb/core/log/MapTestUtil.scala +++ b/core/src/test/scala/swaydb/core/log/MapTestUtil.scala @@ -30,7 +30,7 @@ import swaydb.core.sweeper.ByteBufferSweeper.{ByteBufferSweeperActor, State} import swaydb.core.{TestCaseSweeper, TestExecutionContext} import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem import swaydb.{Bag, Glass} diff --git a/core/src/test/scala/swaydb/core/log/applied/AppliedFunctionsLogSpec.scala b/core/src/test/scala/swaydb/core/log/applied/AppliedFunctionsLogSpec.scala index 7b5db0850..870b5c51d 100644 --- a/core/src/test/scala/swaydb/core/log/applied/AppliedFunctionsLogSpec.scala +++ b/core/src/test/scala/swaydb/core/log/applied/AppliedFunctionsLogSpec.scala @@ -25,7 +25,7 @@ import swaydb.core.log.MapTestUtil._ import swaydb.core.log.serializer._ import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/log/counter/CounterLogSpec.scala b/core/src/test/scala/swaydb/core/log/counter/CounterLogSpec.scala index d6bcfe830..4fbe5a679 100644 --- a/core/src/test/scala/swaydb/core/log/counter/CounterLogSpec.scala +++ b/core/src/test/scala/swaydb/core/log/counter/CounterLogSpec.scala @@ -24,7 +24,7 @@ import swaydb.core.log.serializer._ import swaydb.core._ import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ import swaydb.utils.StorageUnits._ diff --git a/core/src/test/scala/swaydb/core/log/serializer/AppendixLogEntrySpec.scala b/core/src/test/scala/swaydb/core/log/serializer/AppendixLogEntrySpec.scala index eb651c448..2322c97d2 100644 --- a/core/src/test/scala/swaydb/core/log/serializer/AppendixLogEntrySpec.scala +++ b/core/src/test/scala/swaydb/core/log/serializer/AppendixLogEntrySpec.scala @@ -28,7 +28,7 @@ import swaydb.skiplist.SkipListConcurrent import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave} import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.utils.OperatingSystem diff --git a/core/src/test/scala/swaydb/core/log/serializer/Level0LogEntrySpec.scala b/core/src/test/scala/swaydb/core/log/serializer/Level0LogEntrySpec.scala index 7b3eb5dce..36d305216 100644 --- a/core/src/test/scala/swaydb/core/log/serializer/Level0LogEntrySpec.scala +++ b/core/src/test/scala/swaydb/core/log/serializer/Level0LogEntrySpec.scala @@ -27,7 +27,7 @@ import swaydb.core.log.LogEntry import swaydb.skiplist.SkipListConcurrent import swaydb.core.{TestBase, TestTimer} import swaydb.data.order.KeyOrder -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.utils.ByteSizeOf diff --git a/core/src/test/scala/swaydb/core/log/serializer/LevelZeroLogEntrySpec.scala b/core/src/test/scala/swaydb/core/log/serializer/LevelZeroLogEntrySpec.scala index b70a689f0..50b7fc3ac 100644 --- a/core/src/test/scala/swaydb/core/log/serializer/LevelZeroLogEntrySpec.scala +++ b/core/src/test/scala/swaydb/core/log/serializer/LevelZeroLogEntrySpec.scala @@ -28,7 +28,7 @@ import swaydb.core.log.LogEntry import swaydb.skiplist.SkipListConcurrent import swaydb.core.{TestBase, TestTimer} import swaydb.data.order.KeyOrder -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/log/serializer/LogEntrySerialiserSpec.scala b/core/src/test/scala/swaydb/core/log/serializer/LogEntrySerialiserSpec.scala index 06cfc04e6..cfe58f5a0 100644 --- a/core/src/test/scala/swaydb/core/log/serializer/LogEntrySerialiserSpec.scala +++ b/core/src/test/scala/swaydb/core/log/serializer/LogEntrySerialiserSpec.scala @@ -27,7 +27,7 @@ import swaydb.core.segment.io.SegmentReadIO import swaydb.skiplist.SkipListConcurrent import swaydb.core.{TestBase, TestTimer} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.serializers.Default._ import swaydb.serializers._ diff --git a/core/src/test/scala/swaydb/core/log/serializer/RangeValueSerializerSpec.scala b/core/src/test/scala/swaydb/core/log/serializer/RangeValueSerializerSpec.scala index b1796153f..a44f0e81e 100644 --- a/core/src/test/scala/swaydb/core/log/serializer/RangeValueSerializerSpec.scala +++ b/core/src/test/scala/swaydb/core/log/serializer/RangeValueSerializerSpec.scala @@ -22,7 +22,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Value import swaydb.core.data.Value.{FromValue, FromValueOption, RangeValue} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ class RangeValueSerializerSpec extends AnyWordSpec with Matchers { diff --git a/core/src/test/scala/swaydb/core/log/serializer/ValueSerializerSpec.scala b/core/src/test/scala/swaydb/core/log/serializer/ValueSerializerSpec.scala index e45952dd9..8d2bac4be 100644 --- a/core/src/test/scala/swaydb/core/log/serializer/ValueSerializerSpec.scala +++ b/core/src/test/scala/swaydb/core/log/serializer/ValueSerializerSpec.scala @@ -22,7 +22,7 @@ import swaydb.compression.CompressionInternal import swaydb.compression.CompressionTestGen._ import swaydb.core.TestData._ import swaydb.core.log.serializer.ValueSerializer.IntMapListBufferSerializer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.collection.mutable import scala.collection.mutable.ListBuffer 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 b5cdfdb07..1fcaea072 100644 --- a/core/src/test/scala/swaydb/core/log/timer/TimerSpec.scala +++ b/core/src/test/scala/swaydb/core/log/timer/TimerSpec.scala @@ -26,7 +26,7 @@ import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestForceSave} import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.OperatingSystem import java.nio.file.Path diff --git a/core/src/test/scala/swaydb/core/merge/FunctionMergerSpec.scala b/core/src/test/scala/swaydb/core/merge/FunctionMergerSpec.scala index f34aa79f0..8591b8b89 100644 --- a/core/src/test/scala/swaydb/core/merge/FunctionMergerSpec.scala +++ b/core/src/test/scala/swaydb/core/merge/FunctionMergerSpec.scala @@ -22,7 +22,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/FunctionMerger_Function_Spec.scala b/core/src/test/scala/swaydb/core/merge/FunctionMerger_Function_Spec.scala index 1ba13237e..3b7e6206c 100644 --- a/core/src/test/scala/swaydb/core/merge/FunctionMerger_Function_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/FunctionMerger_Function_Spec.scala @@ -22,7 +22,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ class FunctionMerger_Function_Spec extends AnyWordSpec with Matchers { diff --git a/core/src/test/scala/swaydb/core/merge/FunctionMerger_PendingApply_Spec.scala b/core/src/test/scala/swaydb/core/merge/FunctionMerger_PendingApply_Spec.scala index d52ab3d7d..b541c00c6 100644 --- a/core/src/test/scala/swaydb/core/merge/FunctionMerger_PendingApply_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/FunctionMerger_PendingApply_Spec.scala @@ -24,7 +24,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Memory import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ class FunctionMerger_PendingApply_Spec extends AnyWordSpec with Matchers { diff --git a/core/src/test/scala/swaydb/core/merge/FunctionMerger_Put_Spec.scala b/core/src/test/scala/swaydb/core/merge/FunctionMerger_Put_Spec.scala index 0bcc4345d..63c37bb6a 100644 --- a/core/src/test/scala/swaydb/core/merge/FunctionMerger_Put_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/FunctionMerger_Put_Spec.scala @@ -23,7 +23,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data._ import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/FunctionMerger_Remove_Spec.scala b/core/src/test/scala/swaydb/core/merge/FunctionMerger_Remove_Spec.scala index 7b0f0aace..705183af1 100644 --- a/core/src/test/scala/swaydb/core/merge/FunctionMerger_Remove_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/FunctionMerger_Remove_Spec.scala @@ -24,7 +24,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data._ import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/FunctionMerger_Update_Spec.scala b/core/src/test/scala/swaydb/core/merge/FunctionMerger_Update_Spec.scala index 98a29f534..5820204cb 100644 --- a/core/src/test/scala/swaydb/core/merge/FunctionMerger_Update_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/FunctionMerger_Update_Spec.scala @@ -26,7 +26,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data._ import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/KeyValueMerger_Fixed_Into_Range.scala b/core/src/test/scala/swaydb/core/merge/KeyValueMerger_Fixed_Into_Range.scala index df6e8a2c6..00eebe3bc 100644 --- a/core/src/test/scala/swaydb/core/merge/KeyValueMerger_Fixed_Into_Range.scala +++ b/core/src/test/scala/swaydb/core/merge/KeyValueMerger_Fixed_Into_Range.scala @@ -22,7 +22,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.{Memory, Value} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/KeyValueMerger_Range_Into_Fixed.scala b/core/src/test/scala/swaydb/core/merge/KeyValueMerger_Range_Into_Fixed.scala index 47eb75ecb..2533ba3bb 100644 --- a/core/src/test/scala/swaydb/core/merge/KeyValueMerger_Range_Into_Fixed.scala +++ b/core/src/test/scala/swaydb/core/merge/KeyValueMerger_Range_Into_Fixed.scala @@ -22,7 +22,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.{Memory, Value} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/KeyValueMerger_Range_Into_Range.scala b/core/src/test/scala/swaydb/core/merge/KeyValueMerger_Range_Into_Range.scala index 58eb17a70..c992b8fc0 100644 --- a/core/src/test/scala/swaydb/core/merge/KeyValueMerger_Range_Into_Range.scala +++ b/core/src/test/scala/swaydb/core/merge/KeyValueMerger_Range_Into_Range.scala @@ -24,7 +24,7 @@ import swaydb.core.TestTimer import swaydb.core.data.Value.FromValueOption import swaydb.core.data.{Memory, Value} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/PendingApplyMergerSpec.scala b/core/src/test/scala/swaydb/core/merge/PendingApplyMergerSpec.scala index 33527912a..767b44b4c 100644 --- a/core/src/test/scala/swaydb/core/merge/PendingApplyMergerSpec.scala +++ b/core/src/test/scala/swaydb/core/merge/PendingApplyMergerSpec.scala @@ -23,7 +23,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Memory import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/PutMergerSpec.scala b/core/src/test/scala/swaydb/core/merge/PutMergerSpec.scala index 2ccaaa164..152ccedb4 100644 --- a/core/src/test/scala/swaydb/core/merge/PutMergerSpec.scala +++ b/core/src/test/scala/swaydb/core/merge/PutMergerSpec.scala @@ -22,7 +22,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/RemoveMergerSpec.scala b/core/src/test/scala/swaydb/core/merge/RemoveMergerSpec.scala index a558fbf54..f00e40af3 100644 --- a/core/src/test/scala/swaydb/core/merge/RemoveMergerSpec.scala +++ b/core/src/test/scala/swaydb/core/merge/RemoveMergerSpec.scala @@ -23,7 +23,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Memory import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/RemoveMerger_Function_Spec.scala b/core/src/test/scala/swaydb/core/merge/RemoveMerger_Function_Spec.scala index 00bdc3b8f..41071f2f6 100644 --- a/core/src/test/scala/swaydb/core/merge/RemoveMerger_Function_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/RemoveMerger_Function_Spec.scala @@ -24,7 +24,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Memory import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/RemoveMerger_PendingApply_Spec.scala b/core/src/test/scala/swaydb/core/merge/RemoveMerger_PendingApply_Spec.scala index 4e5116d00..c3382e290 100644 --- a/core/src/test/scala/swaydb/core/merge/RemoveMerger_PendingApply_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/RemoveMerger_PendingApply_Spec.scala @@ -23,7 +23,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Memory import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/RemoveMerger_Put_Spec.scala b/core/src/test/scala/swaydb/core/merge/RemoveMerger_Put_Spec.scala index f49cce936..0e1edf7db 100644 --- a/core/src/test/scala/swaydb/core/merge/RemoveMerger_Put_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/RemoveMerger_Put_Spec.scala @@ -22,7 +22,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/RemoveMerger_Remove_Spec.scala b/core/src/test/scala/swaydb/core/merge/RemoveMerger_Remove_Spec.scala index d1bf8501e..75617e095 100644 --- a/core/src/test/scala/swaydb/core/merge/RemoveMerger_Remove_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/RemoveMerger_Remove_Spec.scala @@ -22,7 +22,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/RemoveMerger_Update_Spec.scala b/core/src/test/scala/swaydb/core/merge/RemoveMerger_Update_Spec.scala index 4352a0649..490b15ba5 100644 --- a/core/src/test/scala/swaydb/core/merge/RemoveMerger_Update_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/RemoveMerger_Update_Spec.scala @@ -22,7 +22,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/UpdateMergerSpec.scala b/core/src/test/scala/swaydb/core/merge/UpdateMergerSpec.scala index 1a1b1d90d..26dea6c0a 100644 --- a/core/src/test/scala/swaydb/core/merge/UpdateMergerSpec.scala +++ b/core/src/test/scala/swaydb/core/merge/UpdateMergerSpec.scala @@ -22,7 +22,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/UpdateMerger_Function_Spec.scala b/core/src/test/scala/swaydb/core/merge/UpdateMerger_Function_Spec.scala index 7fba6c421..17f0b9e0f 100644 --- a/core/src/test/scala/swaydb/core/merge/UpdateMerger_Function_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/UpdateMerger_Function_Spec.scala @@ -24,7 +24,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Memory import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/UpdateMerger_PendingApply_Spec.scala b/core/src/test/scala/swaydb/core/merge/UpdateMerger_PendingApply_Spec.scala index b922eab05..8a933f4a9 100644 --- a/core/src/test/scala/swaydb/core/merge/UpdateMerger_PendingApply_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/UpdateMerger_PendingApply_Spec.scala @@ -23,7 +23,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.{KeyValue, Memory} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/UpdateMerger_Put_Spec.scala b/core/src/test/scala/swaydb/core/merge/UpdateMerger_Put_Spec.scala index a9b78a247..e1dfd861f 100644 --- a/core/src/test/scala/swaydb/core/merge/UpdateMerger_Put_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/UpdateMerger_Put_Spec.scala @@ -22,7 +22,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/UpdateMerger_Remove_Spec.scala b/core/src/test/scala/swaydb/core/merge/UpdateMerger_Remove_Spec.scala index 21aa25055..ba453ab2e 100644 --- a/core/src/test/scala/swaydb/core/merge/UpdateMerger_Remove_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/UpdateMerger_Remove_Spec.scala @@ -22,7 +22,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/merge/UpdateMerger_Update_Spec.scala b/core/src/test/scala/swaydb/core/merge/UpdateMerger_Update_Spec.scala index 4b4c0bd7c..7186fe79a 100644 --- a/core/src/test/scala/swaydb/core/merge/UpdateMerger_Update_Spec.scala +++ b/core/src/test/scala/swaydb/core/merge/UpdateMerger_Update_Spec.scala @@ -22,7 +22,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/KeyMatcherSpec.scala b/core/src/test/scala/swaydb/core/segment/KeyMatcherSpec.scala index e1ecdbe79..a523e524d 100644 --- a/core/src/test/scala/swaydb/core/segment/KeyMatcherSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/KeyMatcherSpec.scala @@ -25,7 +25,7 @@ import swaydb.core.segment.block.values.ValuesBlockOffset import swaydb.core.segment.ref.search.KeyMatcher import swaydb.core.segment.ref.search.KeyMatcher.Result._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ diff --git a/core/src/test/scala/swaydb/core/segment/SegmentGetSpec.scala b/core/src/test/scala/swaydb/core/segment/SegmentGetSpec.scala index a6dcf194a..09232d811 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentGetSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentGetSpec.scala @@ -27,7 +27,7 @@ import swaydb.core.segment.ref.search.ThreadReadState import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave, TestSweeper} import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/SegmentHigherSpec.scala b/core/src/test/scala/swaydb/core/segment/SegmentHigherSpec.scala index f20c2eed1..98cea19d6 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentHigherSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentHigherSpec.scala @@ -23,7 +23,7 @@ import swaydb.core.TestData._ import swaydb.core.segment.ref.search.ThreadReadState import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave} import swaydb.data.config.MMAP -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/SegmentLowerSpec.scala b/core/src/test/scala/swaydb/core/segment/SegmentLowerSpec.scala index 1a862e7d0..109bd4c4a 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentLowerSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentLowerSpec.scala @@ -25,7 +25,7 @@ import swaydb.core.segment.ref.search.ThreadReadState import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave} import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/SegmentMemorySweeperSpec.scala b/core/src/test/scala/swaydb/core/segment/SegmentMemorySweeperSpec.scala index f27dae9ec..cc2e5cbad 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentMemorySweeperSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentMemorySweeperSpec.scala @@ -27,7 +27,7 @@ import swaydb.core.util.Benchmark import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext} import swaydb.data.config.MemoryCache import swaydb.data.order.TimeOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ import scala.concurrent.duration._ diff --git a/core/src/test/scala/swaydb/core/segment/SegmentReadSpec.scala b/core/src/test/scala/swaydb/core/segment/SegmentReadSpec.scala index 50dee462f..2af826db0 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentReadSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentReadSpec.scala @@ -30,7 +30,7 @@ import swaydb.core.segment.io.SegmentReadIO import swaydb.data.MaxKey import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.Effect import swaydb.serializers.Default._ import swaydb.serializers._ diff --git a/core/src/test/scala/swaydb/core/segment/SegmentSearcherSpec.scala b/core/src/test/scala/swaydb/core/segment/SegmentSearcherSpec.scala index 19b48d949..3ac4a53f8 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentSearcherSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentSearcherSpec.scala @@ -29,7 +29,7 @@ import swaydb.core.segment.ref.search.SegmentSearcher import swaydb.core.util.Benchmark import swaydb.core.{SegmentBlocks, TestBase, TestCaseSweeper} import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/SegmentSerialiserSpec.scala b/core/src/test/scala/swaydb/core/segment/SegmentSerialiserSpec.scala index 0cba1866f..337e150ef 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentSerialiserSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentSerialiserSpec.scala @@ -24,7 +24,7 @@ import swaydb.core.segment.io.SegmentReadIO import swaydb.core.{TestBase, TestCaseSweeper} import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ class SegmentSerialiserSpec extends TestBase { diff --git a/core/src/test/scala/swaydb/core/segment/SegmentWriteSpec.scala b/core/src/test/scala/swaydb/core/segment/SegmentWriteSpec.scala index 0fce02c42..bc201660e 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentWriteSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentWriteSpec.scala @@ -45,7 +45,7 @@ import swaydb.data.MaxKey import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.Effect._ import swaydb.effect.{Dir, Effect, Extension} import swaydb.serializers.Default._ diff --git a/core/src/test/scala/swaydb/core/segment/assigner/Assigner_AssignKeyValues_Spec.scala b/core/src/test/scala/swaydb/core/segment/assigner/Assigner_AssignKeyValues_Spec.scala index 76c6319b4..ab2d01e4c 100644 --- a/core/src/test/scala/swaydb/core/segment/assigner/Assigner_AssignKeyValues_Spec.scala +++ b/core/src/test/scala/swaydb/core/segment/assigner/Assigner_AssignKeyValues_Spec.scala @@ -26,7 +26,7 @@ import swaydb.core.util.PipeOps._ import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave, TestTimer} import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.Effect._ import swaydb.serializers.Default._ import swaydb.serializers._ diff --git a/core/src/test/scala/swaydb/core/segment/assigner/SegmentAssigner_Assign_Spec.scala b/core/src/test/scala/swaydb/core/segment/assigner/SegmentAssigner_Assign_Spec.scala index 1f892ae10..5117e1b0d 100644 --- a/core/src/test/scala/swaydb/core/segment/assigner/SegmentAssigner_Assign_Spec.scala +++ b/core/src/test/scala/swaydb/core/segment/assigner/SegmentAssigner_Assign_Spec.scala @@ -25,7 +25,7 @@ import swaydb.core.util.PipeOps._ import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave, TestTimer} import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem diff --git a/core/src/test/scala/swaydb/core/segment/block/BlockCacheSpec.scala b/core/src/test/scala/swaydb/core/segment/block/BlockCacheSpec.scala index 627b811a3..36caacf74 100644 --- a/core/src/test/scala/swaydb/core/segment/block/BlockCacheSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/BlockCacheSpec.scala @@ -23,7 +23,7 @@ import swaydb.core.TestData._ import swaydb.core.sweeper.MemorySweeper import swaydb.core.util.Bytes import swaydb.core.{TestBase, TestCaseSweeper} -import swaydb.data.slice.{Slice, SliceRO, Slices} +import swaydb.slice.{Slice, SliceRO, Slices} import swaydb.testkit.RunThis._ import swaydb.utils.StorageUnits._ diff --git a/core/src/test/scala/swaydb/core/segment/block/BlockSpec.scala b/core/src/test/scala/swaydb/core/segment/block/BlockSpec.scala index 5c93022d6..d63c24953 100644 --- a/core/src/test/scala/swaydb/core/segment/block/BlockSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/BlockSpec.scala @@ -7,7 +7,7 @@ import swaydb.core.segment.block.reader.BlockRefReader import swaydb.core.segment.block.segment.transient.TransientSegmentRef import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockOffset} import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.IOAction import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/block/SegmentBlockCacheSpec.scala b/core/src/test/scala/swaydb/core/segment/block/SegmentBlockCacheSpec.scala index 65dbdf492..9406d217d 100644 --- a/core/src/test/scala/swaydb/core/segment/block/SegmentBlockCacheSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/SegmentBlockCacheSpec.scala @@ -19,7 +19,7 @@ import swaydb.core.sweeper.MemorySweeper import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestTimer} import swaydb.data.config.MemoryCache import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.IOStrategy import swaydb.serializers.Default._ import swaydb.serializers._ diff --git a/core/src/test/scala/swaydb/core/segment/block/SegmentBlockInitialisationSpec.scala b/core/src/test/scala/swaydb/core/segment/block/SegmentBlockInitialisationSpec.scala index 81a5412e2..996107bd5 100644 --- a/core/src/test/scala/swaydb/core/segment/block/SegmentBlockInitialisationSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/SegmentBlockInitialisationSpec.scala @@ -31,7 +31,7 @@ import swaydb.core.util.Benchmark import swaydb.core.{TestBase, TestCaseSweeper, TestTimer} import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.effect.IOStrategy import swaydb.serializers.Default._ import swaydb.serializers._ diff --git a/core/src/test/scala/swaydb/core/segment/block/binarysearch/BinarySearchEntryFormatSpec.scala b/core/src/test/scala/swaydb/core/segment/block/binarysearch/BinarySearchEntryFormatSpec.scala index 3015ac079..c8b76f658 100644 --- a/core/src/test/scala/swaydb/core/segment/block/binarysearch/BinarySearchEntryFormatSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/binarysearch/BinarySearchEntryFormatSpec.scala @@ -19,7 +19,7 @@ package swaydb.core.segment.block.binarysearch import swaydb.core.TestBase import swaydb.core.TestData._ import swaydb.core.util.Bytes -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.ByteSizeOf class BinarySearchEntryFormatSpec extends TestBase { diff --git a/core/src/test/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlock_BinarySearch_Spec.scala b/core/src/test/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlock_BinarySearch_Spec.scala index a06161b48..13479d17c 100644 --- a/core/src/test/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlock_BinarySearch_Spec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlock_BinarySearch_Spec.scala @@ -25,7 +25,7 @@ //import swaydb.core.segment.block.{Block, KeyMatcher} //import swaydb.core.util.Bytes //import swaydb.data.order.KeyOrder -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice // //class BinarySearchIndexBlock_BinarySearch_Spec extends TestBase { // diff --git a/core/src/test/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlock_Segment_RandomSearch_Spec.scala b/core/src/test/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlock_Segment_RandomSearch_Spec.scala index f1b2c1d84..923c9e61d 100644 --- a/core/src/test/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlock_Segment_RandomSearch_Spec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/binarysearch/BinarySearchIndexBlock_Segment_RandomSearch_Spec.scala @@ -25,7 +25,7 @@ import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} import swaydb.core.{SegmentBlocks, TestBase, TestCaseSweeper} import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/block/hashindex/HashIndexBlockSpec.scala b/core/src/test/scala/swaydb/core/segment/block/hashindex/HashIndexBlockSpec.scala index 568e9efad..bf1f76eaf 100644 --- a/core/src/test/scala/swaydb/core/segment/block/hashindex/HashIndexBlockSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/hashindex/HashIndexBlockSpec.scala @@ -23,7 +23,7 @@ import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig import swaydb.core.{SegmentBlocks, TestBase, TestCaseSweeper} import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/block/reader/BlockReaderCacheSpec.scala b/core/src/test/scala/swaydb/core/segment/block/reader/BlockReaderCacheSpec.scala index 6f1255885..426aa8c0f 100644 --- a/core/src/test/scala/swaydb/core/segment/block/reader/BlockReaderCacheSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/reader/BlockReaderCacheSpec.scala @@ -18,7 +18,7 @@ package swaydb.core.segment.block.reader import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import swaydb.data.slice.Slice +import swaydb.slice.Slice class BlockReaderCacheSpec extends AnyWordSpec with Matchers { diff --git a/core/src/test/scala/swaydb/core/segment/block/reader/BlockRefReaderSpec.scala b/core/src/test/scala/swaydb/core/segment/block/reader/BlockRefReaderSpec.scala index 025dc332a..e6cd2f7d7 100644 --- a/core/src/test/scala/swaydb/core/segment/block/reader/BlockRefReaderSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/reader/BlockRefReaderSpec.scala @@ -26,7 +26,7 @@ import swaydb.core.segment.block.values.ValuesBlockOffset import swaydb.core.segment.block.values.ValuesBlockOffset.ValuesBlockOps import swaydb.core.segment.block.{Block, BlockCache} import swaydb.core.{TestBase, TestCaseSweeper} -import swaydb.data.slice.{Reader, Slice} +import swaydb.slice.{Reader, Slice} class BlockRefReaderSpec extends TestBase with MockFactory { diff --git a/core/src/test/scala/swaydb/core/segment/block/reader/BlockedReaderSpec.scala b/core/src/test/scala/swaydb/core/segment/block/reader/BlockedReaderSpec.scala index 4d3b5a222..cfa404c16 100644 --- a/core/src/test/scala/swaydb/core/segment/block/reader/BlockedReaderSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/reader/BlockedReaderSpec.scala @@ -23,7 +23,7 @@ import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockOffset} import swaydb.core.segment.block.values.ValuesBlockOffset import swaydb.core.segment.block.{Block, BlockCache, BlockOps} import swaydb.core.{TestBase, TestCaseSweeper} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ class BlockedReaderSpec extends TestBase with MockFactory { diff --git a/core/src/test/scala/swaydb/core/segment/block/segment/SegmentBlockSpec.scala b/core/src/test/scala/swaydb/core/segment/block/segment/SegmentBlockSpec.scala index dfd30c38d..efc3222f2 100644 --- a/core/src/test/scala/swaydb/core/segment/block/segment/SegmentBlockSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/segment/SegmentBlockSpec.scala @@ -31,7 +31,7 @@ import swaydb.core.segment.io.SegmentReadIO import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestTimer} import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/block/segment/SystemBlockBenchmarkSpec.scala b/core/src/test/scala/swaydb/core/segment/block/segment/SystemBlockBenchmarkSpec.scala index bfcd14190..6819652a6 100644 --- a/core/src/test/scala/swaydb/core/segment/block/segment/SystemBlockBenchmarkSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/segment/SystemBlockBenchmarkSpec.scala @@ -21,7 +21,7 @@ //import swaydb.testkit.RunThis._ //import swaydb.core.TestBase //import swaydb.core.util.Benchmark -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.data.util.StorageUnits._ // //import scala.concurrent.duration._ diff --git a/core/src/test/scala/swaydb/core/segment/block/values/ValuesBlockSpec.scala b/core/src/test/scala/swaydb/core/segment/block/values/ValuesBlockSpec.scala index 313f3dade..860cb8ef3 100644 --- a/core/src/test/scala/swaydb/core/segment/block/values/ValuesBlockSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/values/ValuesBlockSpec.scala @@ -24,7 +24,7 @@ import swaydb.core.segment.block.Block import swaydb.core.segment.block.reader.{BlockRefReader, BlockedReader} import swaydb.core.segment.entry.writer.EntryWriter import swaydb.core.{TestBase, TestTimer} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/defrag/DefragGapSpec.scala b/core/src/test/scala/swaydb/core/segment/defrag/DefragGapSpec.scala index 0936a9828..451d3add5 100644 --- a/core/src/test/scala/swaydb/core/segment/defrag/DefragGapSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/defrag/DefragGapSpec.scala @@ -28,7 +28,7 @@ import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.block.segment.transient.TransientSegment import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestTimer} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/defrag/DefragSegment_RunMany_Spec.scala b/core/src/test/scala/swaydb/core/segment/defrag/DefragSegment_RunMany_Spec.scala index de977dc9f..0c7d704ab 100644 --- a/core/src/test/scala/swaydb/core/segment/defrag/DefragSegment_RunMany_Spec.scala +++ b/core/src/test/scala/swaydb/core/segment/defrag/DefragSegment_RunMany_Spec.scala @@ -34,7 +34,7 @@ import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestTimer} import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ import scala.collection.mutable.ListBuffer diff --git a/core/src/test/scala/swaydb/core/segment/defrag/DefragSegment_RunOne_Spec.scala b/core/src/test/scala/swaydb/core/segment/defrag/DefragSegment_RunOne_Spec.scala index 8a06ed158..dfabd739e 100644 --- a/core/src/test/scala/swaydb/core/segment/defrag/DefragSegment_RunOne_Spec.scala +++ b/core/src/test/scala/swaydb/core/segment/defrag/DefragSegment_RunOne_Spec.scala @@ -35,7 +35,7 @@ import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestTimer} import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/defrag/DefragSpec.scala b/core/src/test/scala/swaydb/core/segment/defrag/DefragSpec.scala index 8b719d7fe..4ab454dcd 100644 --- a/core/src/test/scala/swaydb/core/segment/defrag/DefragSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/defrag/DefragSpec.scala @@ -32,7 +32,7 @@ import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestTimer} import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/entry/EntryReaderWriterSpec.scala b/core/src/test/scala/swaydb/core/segment/entry/EntryReaderWriterSpec.scala index d5389ed10..271ae5ebc 100644 --- a/core/src/test/scala/swaydb/core/segment/entry/EntryReaderWriterSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/entry/EntryReaderWriterSpec.scala @@ -27,7 +27,7 @@ import swaydb.core.segment.entry.id.MemoryToKeyValueIdBinder import swaydb.core.segment.entry.reader.PersistentParser import swaydb.core.segment.entry.writer._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/entry/writer/KeyWriterReaderSpec.scala b/core/src/test/scala/swaydb/core/segment/entry/writer/KeyWriterReaderSpec.scala index 7940c8ef5..b777270be 100644 --- a/core/src/test/scala/swaydb/core/segment/entry/writer/KeyWriterReaderSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/entry/writer/KeyWriterReaderSpec.scala @@ -22,7 +22,7 @@ import swaydb.core.TestData._ import swaydb.core.data.Memory import swaydb.core.segment.entry.id.{BaseEntryId, MemoryToKeyValueIdBinder} import swaydb.core.segment.entry.reader.{EntryReaderFailure, KeyReader} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ class KeyWriterReaderSpec extends AnyWordSpec with Matchers { diff --git a/core/src/test/scala/swaydb/core/segment/entry/writer/TimeReaderWriterSpec.scala b/core/src/test/scala/swaydb/core/segment/entry/writer/TimeReaderWriterSpec.scala index ee6883fde..25126108e 100644 --- a/core/src/test/scala/swaydb/core/segment/entry/writer/TimeReaderWriterSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/entry/writer/TimeReaderWriterSpec.scala @@ -24,7 +24,7 @@ //import swaydb.core.io.reader.Reader //import swaydb.core.segment.entry.id.BaseEntryId //import swaydb.core.segment.entry.reader.TimeReader -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice //import swaydb.serializers.Default._ //import swaydb.serializers._ // diff --git a/core/src/test/scala/swaydb/core/segment/entry/writer/ValueReaderWriterSpec.scala b/core/src/test/scala/swaydb/core/segment/entry/writer/ValueReaderWriterSpec.scala index 743658691..1bee9844b 100644 --- a/core/src/test/scala/swaydb/core/segment/entry/writer/ValueReaderWriterSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/entry/writer/ValueReaderWriterSpec.scala @@ -22,7 +22,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.data.{Memory, Time} import swaydb.core.segment.entry.id.{BaseEntryId, MemoryToKeyValueIdBinder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/ref/SegmentRefGetBehaviorSpec.scala b/core/src/test/scala/swaydb/core/segment/ref/SegmentRefGetBehaviorSpec.scala index 1d9faabb0..bb6c0d818 100644 --- a/core/src/test/scala/swaydb/core/segment/ref/SegmentRefGetBehaviorSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/ref/SegmentRefGetBehaviorSpec.scala @@ -32,7 +32,7 @@ import swaydb.core.sweeper.MemorySweeper import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext} import swaydb.data.MaxKey import swaydb.data.order.{KeyOrder, TimeOrder} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/segment/ref/search/SegmentReadStateSpec.scala b/core/src/test/scala/swaydb/core/segment/ref/search/SegmentReadStateSpec.scala index fe19bcccb..0181bf114 100644 --- a/core/src/test/scala/swaydb/core/segment/ref/search/SegmentReadStateSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/ref/search/SegmentReadStateSpec.scala @@ -21,7 +21,7 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.data.{Persistent, Time} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/util/BytesSpec.scala b/core/src/test/scala/swaydb/core/util/BytesSpec.scala index 154b9c998..ddf78c6fc 100644 --- a/core/src/test/scala/swaydb/core/util/BytesSpec.scala +++ b/core/src/test/scala/swaydb/core/util/BytesSpec.scala @@ -23,7 +23,7 @@ import swaydb.IOValues._ import swaydb.OK import swaydb.core.TestData._ import swaydb.core.io.reader.Reader -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/util/Bytes_ScalaByteOpsAPI_Spec.scala b/core/src/test/scala/swaydb/core/util/Bytes_ScalaByteOpsAPI_Spec.scala index d2c50e218..e8bb00cad 100644 --- a/core/src/test/scala/swaydb/core/util/Bytes_ScalaByteOpsAPI_Spec.scala +++ b/core/src/test/scala/swaydb/core/util/Bytes_ScalaByteOpsAPI_Spec.scala @@ -4,7 +4,7 @@ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import swaydb.core.TestData._ import swaydb.core.io.reader.Reader -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ import swaydb.utils.ByteSizeOf diff --git a/core/src/test/scala/swaydb/core/util/CRC32Spec.scala b/core/src/test/scala/swaydb/core/util/CRC32Spec.scala index 959343e15..b8878395d 100644 --- a/core/src/test/scala/swaydb/core/util/CRC32Spec.scala +++ b/core/src/test/scala/swaydb/core/util/CRC32Spec.scala @@ -19,7 +19,7 @@ package swaydb.core.util import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import swaydb.core.TestData._ -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ class CRC32Spec extends AnyFlatSpec with Matchers { diff --git a/core/src/test/scala/swaydb/core/util/CollectionsSpec.scala b/core/src/test/scala/swaydb/core/util/CollectionsSpec.scala index c0ffd552b..850fca8ab 100644 --- a/core/src/test/scala/swaydb/core/util/CollectionsSpec.scala +++ b/core/src/test/scala/swaydb/core/util/CollectionsSpec.scala @@ -19,7 +19,7 @@ package swaydb.core.util import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import swaydb.core.util.Collections._ -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.collection.mutable.{ArrayBuffer, ListBuffer} diff --git a/core/src/test/scala/swaydb/core/util/DropIteratorSpec.scala b/core/src/test/scala/swaydb/core/util/DropIteratorSpec.scala index fbc06c2de..c87cf053d 100644 --- a/core/src/test/scala/swaydb/core/util/DropIteratorSpec.scala +++ b/core/src/test/scala/swaydb/core/util/DropIteratorSpec.scala @@ -23,7 +23,7 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Value.FromValue import swaydb.core.data.{KeyValue, Memory, Value} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.utils.DropIterator diff --git a/core/src/test/scala/swaydb/core/util/MinMaxSpec.scala b/core/src/test/scala/swaydb/core/util/MinMaxSpec.scala index e7e854c2a..06f09dcbe 100644 --- a/core/src/test/scala/swaydb/core/util/MinMaxSpec.scala +++ b/core/src/test/scala/swaydb/core/util/MinMaxSpec.scala @@ -22,7 +22,7 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.core.TestData._ import swaydb.core.data.{Time, Value} import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/core/src/test/scala/swaydb/core/util/TimesSpec.scala b/core/src/test/scala/swaydb/core/util/TimesSpec.scala index bd7a35e4e..419751e3d 100644 --- a/core/src/test/scala/swaydb/core/util/TimesSpec.scala +++ b/core/src/test/scala/swaydb/core/util/TimesSpec.scala @@ -19,7 +19,7 @@ package swaydb.core.util import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import swaydb.core.util.Times._ -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.concurrent.duration._ diff --git a/data/src/main/scala/swaydb/data/MaxKey.scala b/data/src/main/scala/swaydb/data/MaxKey.scala index 850d41e4f..94f4871fd 100644 --- a/data/src/main/scala/swaydb/data/MaxKey.scala +++ b/data/src/main/scala/swaydb/data/MaxKey.scala @@ -17,7 +17,7 @@ package swaydb.data import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.SomeOrNoneCovariant sealed trait MaxKeyOption[+T] extends SomeOrNoneCovariant[MaxKeyOption[T], MaxKey[T]] { @@ -38,6 +38,53 @@ object MaxKey { override def getC: MaxKey[Nothing] = throw new Exception("MaxKey is of type Null") } + def within[T](key: Slice[T], + minKey: Slice[T], + maxKey: MaxKey[Slice[T]])(implicit keyOrder: Ordering[Slice[T]]): Boolean = + Slice.within( + key = key, + minKey = minKey, + maxKey = maxKey.maxKey, + maxKeyInclusive = maxKey.inclusive + ) + + + def within[T](source: MaxKey[T], + target: MaxKey[T])(implicit keyOrder: Ordering[T]): Boolean = { + import keyOrder._ + + source match { + case MaxKey.Fixed(sourceMaxKey) => + target match { + case MaxKey.Fixed(targetMaxKey) => + keyOrder.equiv(sourceMaxKey, targetMaxKey) + + case MaxKey.Range(targetFromKey, targetMaxKey) => + Slice.within( + key = sourceMaxKey, + minKey = targetFromKey, + maxKey = targetMaxKey, + maxKeyInclusive = false + ) + } + + case MaxKey.Range(sourceFromKey, sourceMaxKey) => + target match { + case MaxKey.Fixed(targetMaxKey) => + keyOrder.equiv(sourceFromKey, targetMaxKey) && + keyOrder.equiv(sourceMaxKey, targetMaxKey) + + case MaxKey.Range(targetFromKey, targetMaxKey) => + Slice.within( + key = sourceFromKey, + minKey = targetFromKey, + maxKey = targetMaxKey, + maxKeyInclusive = false + ) && sourceMaxKey <= targetMaxKey + } + } + } + implicit class MaxKeyImplicits(maxKey: MaxKey[Slice[Byte]]) { @inline final def cut() = maxKey match { diff --git a/data/src/main/scala/swaydb/data/order/KeyOrder.scala b/data/src/main/scala/swaydb/data/order/KeyOrder.scala index 79faf811c..83927e1a8 100644 --- a/data/src/main/scala/swaydb/data/order/KeyOrder.scala +++ b/data/src/main/scala/swaydb/data/order/KeyOrder.scala @@ -16,7 +16,7 @@ package swaydb.data.order -import swaydb.data.slice.Slice +import swaydb.slice.Slice object KeyOrder { diff --git a/data/src/main/scala/swaydb/data/order/TimeOrder.scala b/data/src/main/scala/swaydb/data/order/TimeOrder.scala index c2b17b098..d37f57fa7 100644 --- a/data/src/main/scala/swaydb/data/order/TimeOrder.scala +++ b/data/src/main/scala/swaydb/data/order/TimeOrder.scala @@ -16,8 +16,8 @@ package swaydb.data.order -import swaydb.data.slice.Slice -import swaydb.data.utils.ScalaByteOps +import swaydb.slice.Slice +import swaydb.slice.utils.ScalaByteOps private[swaydb] object TimeOrder { val long = new TimeOrder[Slice[Byte]] { diff --git a/data/src/main/scala/swaydb/data/repairAppendix/SegmentInfo.scala b/data/src/main/scala/swaydb/data/repairAppendix/SegmentInfo.scala index ea7030812..90d9687ed 100644 --- a/data/src/main/scala/swaydb/data/repairAppendix/SegmentInfo.scala +++ b/data/src/main/scala/swaydb/data/repairAppendix/SegmentInfo.scala @@ -17,7 +17,7 @@ package swaydb.data.repairAppendix import swaydb.data.MaxKey -import swaydb.data.slice.Slice +import swaydb.slice.Slice import java.nio.file.Path diff --git a/data/src/test/scala/swaydb/MaxKeySpec.scala b/data/src/test/scala/swaydb/MaxKeySpec.scala new file mode 100644 index 000000000..c71be416d --- /dev/null +++ b/data/src/test/scala/swaydb/MaxKeySpec.scala @@ -0,0 +1,152 @@ +package swaydb + +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec +import swaydb.data.MaxKey +import swaydb.data.order.KeyOrder +import swaydb.slice.Slice + +class MaxKeySpec extends AnyWordSpec with Matchers { + + implicit val keyOrder = KeyOrder.default + + "within" when { + implicit def toSlice(int: Int): Slice[Byte] = Slice.writeInt[Byte](int) + + implicit def toSliceMaxKey(int: MaxKey.Fixed[Int]): MaxKey[Slice[Byte]] = MaxKey.Fixed(Slice.writeInt[Byte](int.maxKey)) + + implicit def toSliceMaxKeyRange(int: MaxKey.Range[Int]): MaxKey[Slice[Byte]] = MaxKey.Range(Slice.writeInt[Byte](int.fromKey), Slice.writeInt[Byte](int.maxKey)) + + "max key is Fixed" in { + //0 + // 1 - 10 + MaxKey.within(key = 0, minKey = 1, maxKey = MaxKey.Fixed(10)) shouldBe false + // 1 + // 1 - 10 + MaxKey.within(key = 1, minKey = 1, maxKey = MaxKey.Fixed(10)) shouldBe true + // 5 + // 1 - 10 + MaxKey.within(key = 5, minKey = 1, maxKey = MaxKey.Fixed(10)) shouldBe true + // 10 + // 1 - 10 + MaxKey.within(key = 10, minKey = 1, maxKey = MaxKey.Fixed(10)) shouldBe true + // 11 + // 1 - 10 + MaxKey.within(key = 11, minKey = 1, maxKey = MaxKey.Fixed(10)) shouldBe false + } + + "max key is Range" in { + //0 + // 1 - (10 - 20) + MaxKey.within(key = 0, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe false + // 1 + // 1 - (10 - 20) + MaxKey.within(key = 1, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe true + // 5 + // 1 - (10 - 20) + MaxKey.within(key = 5, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe true + // 10 + // 1 - (10 - 20) + MaxKey.within(key = 10, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe true + // 11 + // 1 - (10 - 20) + MaxKey.within(key = 11, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe true + // 19 + // 1 - (10 - 20) + MaxKey.within(key = 19, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe true + // 20 + // 1 - (10 - 20) + MaxKey.within(key = 20, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe false + // 21 + // 1 - (10 - 20) + MaxKey.within(key = 21, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe false + } + + "fixed on maxKey" in { + //0 + // 10 - 20 + MaxKey.within(MaxKey.Fixed(0), MaxKey.Range(10, 20)) shouldBe false + // 10 + // 10 - 20 + MaxKey.within(MaxKey.Fixed(10), MaxKey.Range(10, 20)) shouldBe true + // 11 + // 10 - 20 + MaxKey.within(MaxKey.Fixed(11), MaxKey.Range(10, 20)) shouldBe true + // 19 + // 10 - 20 + MaxKey.within(MaxKey.Fixed(19), MaxKey.Range(10, 20)) shouldBe true + // 20 + // 10 - 20 + MaxKey.within(MaxKey.Fixed(20), MaxKey.Range(10, 20)) shouldBe false + // 21 + // 10 - 20 + MaxKey.within(MaxKey.Fixed(21), MaxKey.Range(10, 20)) shouldBe false + + } + + "maxKey on maxKey" in { + //0 - 10 + // 10 - 20 + MaxKey.within(MaxKey.Range(0, 10), MaxKey.Range(10, 20)) shouldBe false + //0 - 11 + // 10 - 20 + MaxKey.within(MaxKey.Range(0, 11), MaxKey.Range(10, 20)) shouldBe false + //0 - 20 + // 10 - 20 + MaxKey.within(MaxKey.Range(0, 20), MaxKey.Range(10, 20)) shouldBe false + //0 - 21 + // 10 - 20 + MaxKey.within(MaxKey.Range(0, 21), MaxKey.Range(10, 20)) shouldBe false + // 10|10 + // 10 - 20 + MaxKey.within(MaxKey.Range(10, 10), MaxKey.Range(10, 20)) shouldBe true + // 10 - 11 + // 10 - 20 + MaxKey.within(MaxKey.Range(10, 11), MaxKey.Range(10, 20)) shouldBe true + // 10 - 19 + // 10 - 20 + MaxKey.within(MaxKey.Range(10, 19), MaxKey.Range(10, 20)) shouldBe true + // 10 - 20 + // 10 - 20 + MaxKey.within(MaxKey.Range(10, 20), MaxKey.Range(10, 20)) shouldBe true + // 10 - 21 + // 10 - 20 + MaxKey.within(MaxKey.Range(10, 21), MaxKey.Range(10, 20)) shouldBe false + // 11 - 12 + // 10 - 20 + MaxKey.within(MaxKey.Range(11, 12), MaxKey.Range(10, 20)) shouldBe true + // 11 - 20 + // 10 - 20 + MaxKey.within(MaxKey.Range(11, 20), MaxKey.Range(10, 20)) shouldBe true + // 19- 20 + // 10 - 20 + MaxKey.within(MaxKey.Range(19, 20), MaxKey.Range(10, 20)) shouldBe true + // 20|20 + // 10 - 20 + MaxKey.within(MaxKey.Range(20, 20), MaxKey.Range(10, 20)) shouldBe false + // 20 - 21 + // 10 - 20 + MaxKey.within(MaxKey.Range(20, 21), MaxKey.Range(10, 20)) shouldBe false + + } + + "maxKey on fixed" in { + //0 - 10 + // 10 + MaxKey.within(MaxKey.Range(0, 10), MaxKey.Fixed(10)) shouldBe false + //0 - 11 + // 10 + MaxKey.within(MaxKey.Range(0, 11), MaxKey.Fixed(10)) shouldBe false + // 10|10 + // 10 + MaxKey.within(MaxKey.Range(10, 10), MaxKey.Fixed(10)) shouldBe true + // 10 - 11 + // 10 + MaxKey.within(MaxKey.Range(10, 11), MaxKey.Fixed(10)) shouldBe false + // 11 - 12 + // 10 + MaxKey.within(MaxKey.Range(11, 12), MaxKey.Fixed(10)) shouldBe false + } + } + +} diff --git a/data/src/test/scala/swaydb/data/slice/SliceSpec.scala b/data/src/test/scala/swaydb/data/slice/SliceSpec.scala deleted file mode 100644 index e2b0ae02f..000000000 --- a/data/src/test/scala/swaydb/data/slice/SliceSpec.scala +++ /dev/null @@ -1,1439 +0,0 @@ -/* - * Copyright 2018 Simer JS Plaha (simer.j@gmail.com - @simerplaha) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package swaydb.data.slice - -import org.scalatest.OptionValues._ -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec -import swaydb.data.MaxKey -import swaydb.data.order.KeyOrder -import swaydb.data.utils.ScalaByteOps -import swaydb.testkit.RunThis._ -import swaydb.utils.ByteSizeOf - -import scala.concurrent.{ExecutionContext, Future} -import scala.util.Random - -class SliceSpec extends AnyWordSpec with Matchers { - - implicit val keyOrder = KeyOrder.default - implicit val scalaByte = ScalaByteOps - - def randomByte() = (Random.nextInt(256) - 128).toByte - - "A Slice" should { - "be created by specifying it's length" in { - val slice = Slice.of[Int](10) - slice.allocatedSize shouldBe 10 - slice.size shouldBe 0 - slice.fromOffset shouldBe 0 - slice.toOffset shouldBe 9 - } - - "be created by specifying it's length and isFull" in { - val slice = Slice.of[Int](10, isFull = true) - slice.allocatedSize shouldBe 10 - slice.size shouldBe 10 - slice.fromOffset shouldBe 0 - slice.toOffset shouldBe 9 - } - - "be created from an Array" in { - val array = Array.fill[Byte](10)(1) - val slice = Slice[Byte](array) - slice.allocatedSize shouldBe 10 - slice.size shouldBe 10 - slice.fromOffset shouldBe 0 - slice.toOffset shouldBe 9 - } - - "be created from another Slice" in { - val array = Array.fill[Int](3)(Random.nextInt()) - val slice1 = Slice[Int](array) - slice1.size shouldBe 3 - slice1.allocatedSize shouldBe 3 - - val slice2 = slice1.slice(1, 2) - slice2.allocatedSize shouldBe 2 - slice2.size shouldBe 2 - slice2.fromOffset shouldBe 1 - slice2.toOffset shouldBe 2 - slice2.toList should contain inOrderElementsOf List(array(1), array(2)) - slice2.underlyingArraySize shouldBe slice1.size - - val slice2Copy = slice2.cut() - slice2Copy.allocatedSize shouldBe 2 - slice2Copy.size shouldBe 2 - slice2Copy.underlyingArraySize shouldBe 2 - } - - "be sliced for a partially written slice" in { - //slice0 is (10, 10, null, null) - val slice0 = Slice.of[Int](4) - slice0 add 10 - slice0 add 10 //second slice starts here - slice0.size shouldBe 2 - - //slice1 = (10, 10) - val slice1 = slice0.slice(0, 1) - slice1.size shouldBe 2 - slice1.toArray shouldBe Array(10, 10) - slice1.underlyingArraySize shouldBe 4 - - //slice1 = (10, null) - val slice2 = slice0.slice(1, 2) - slice2.size shouldBe 1 - slice2.toArray shouldBe Array(10) - - //slice1 = (null, null) - val slice3 = slice0.slice(2, 3) - slice3.size shouldBe 0 - slice3.toArray shouldBe empty - - //slice4 = (10, 10, null, null) - val slice4 = slice0.slice(0, 3) - slice4.size shouldBe 2 - slice4.toArray shouldBe Array(10, 10) - } - - "be sliced if the original slice is full written" in { - //slice0 = (1, 2, 3, 4) - val slice0 = Slice.of[Int](4) - slice0 add 1 - slice0 add 2 - slice0 add 3 - slice0 add 4 - slice0.size shouldBe 4 - - //slice1 = (1, 2) - val slice1 = slice0.slice(0, 1) - slice1.size shouldBe 2 - slice1.toArray shouldBe Array(1, 2) - - //slice1 = (2, 3) - val slice2 = slice0.slice(1, 2) - slice2.size shouldBe 2 - slice2.toArray shouldBe Array(2, 3) - - //slice1 = (3, 4) - val slice3 = slice0.slice(2, 3) - slice3.size shouldBe 2 - slice3.toArray shouldBe Array(3, 4) - - //slice4 = (1, 2, 3, 4) - val slice4 = slice0.slice(0, 3) - slice4.size shouldBe 4 - slice4.toArray shouldBe Array(1, 2, 3, 4) - } - - "return empty when creating a sub Slice with invalid offsets" in { - val slice1 = Slice(1, 2, 3) - slice1.size shouldBe 3 - slice1.slice(0, 3) shouldBe Slice(1, 2, 3) - slice1.slice(3, 100) shouldBe empty - slice1.slice(10, 3) shouldBe empty - - //valid subslice 2 - val slice2 = slice1.slice(1, 2) - slice2.size shouldBe 2 - slice2 shouldBe Slice(2, 3) - slice2.slice(100, 100) shouldBe empty - } - - "throw ArrayIndexOutOfBoundsException when inserting items outside the Slice offset" in { - val slice = Slice.of[Byte](1) - slice.allocatedSize shouldBe 1 - slice.size shouldBe 0 - slice.fromOffset shouldBe 0 - slice.toOffset shouldBe 0 - - slice.add(1).size shouldBe 1 - assertThrows[ArrayIndexOutOfBoundsException] { - slice.add(1) - } - slice.size shouldBe 1 - } - - "throw ArrayIndexOutOfBoundsException when adding items outside it's offset and when the Slice is a sub slice" in { - val slice1 = Slice.fill(4)(Random.nextInt()).asMut() - slice1.size shouldBe 4 - - val slice2: SliceMut[Int] = slice1.slice(1, 2) - slice2.size shouldBe 2 - - slice2.size shouldBe 2 - slice2.head shouldBe slice1(1) - slice2.last shouldBe slice1(2) - assertThrows[ArrayIndexOutOfBoundsException] { - slice2.add(0) - } - } - - "be read by it's index position" in { - val array = Array.fill(5)(Random.nextInt()) - val slice = Slice(array) - - Range.inclusive(0, 4).foreach { - index => - slice.getC(index) shouldBe array(index) - } - - val subSlice = slice.slice(1, 2) - subSlice.head shouldBe array(1) - subSlice.last shouldBe array(2) - - val subSlice2 = subSlice.slice(0, 0) - subSlice2.head shouldBe subSlice.head - subSlice2.last shouldBe subSlice.head - } - - "drop head elements" in { - val slice = Slice(1, 2, 3, 4, 5) - slice.size shouldBe 5 - - val newSlice = slice drop 2 - newSlice.size shouldBe 3 - newSlice.toList shouldBe Seq(3, 4, 5) - - val newSlice2 = newSlice.slice(1, 2).drop(1) - newSlice2.toList should contain only 5 - } - - "drop last elements" in { - val slice = Slice(1, 2, 3, 4, 5) - slice.size shouldBe 5 - - val newSlice = slice dropRight 2 - newSlice.size shouldBe 3 - newSlice.toList shouldBe Seq(1, 2, 3) - - val newSlice2 = newSlice.slice(1, 2).dropRight(1) - newSlice2.toList should contain only 2 - } - - "drop last elements when the Slice have only one element" in { - val slice = Slice.fill(1)(randomByte()) - slice.size shouldBe 1 - - val newSlice = slice dropRight 1 - newSlice shouldBe empty - } - - "take first and last elements" in { - val slice = Slice.of[Byte](5).add(0).add(1).add(2).add(3).add(4) - slice.size shouldBe 5 - - (slice take 2) should contain only(0, 1) - (slice takeRight 2) should contain only(3, 4) - - (slice.slice(1, 3) take 2) should contain only(1, 2) - (slice.slice(2, 4) takeRight 2) should contain only(3, 4) - } - - "be splittable" in { - val slice = Slice.fill(4)(randomByte()) - - val (head1, tail1) = slice.splitAt(0) - head1.isEmpty shouldBe true - tail1.size shouldBe 4 - head1.underlyingArraySize shouldBe 0 - tail1.underlyingArraySize shouldBe slice.size - - val (head2, tail2) = slice.splitAt(1) - head2.size shouldBe 1 - tail2.size shouldBe 3 - head2.underlyingArraySize shouldBe slice.size - tail2.underlyingArraySize shouldBe slice.size - - val (head3, tail3) = slice.splitAt(2) - head3.size shouldBe 2 - tail3.size shouldBe 2 - head3.underlyingArraySize shouldBe slice.size - tail3.underlyingArraySize shouldBe slice.size - - val (head4, tail4) = slice.splitAt(3) - head4.size shouldBe 3 - tail4.size shouldBe 1 - head4.underlyingArraySize shouldBe slice.size - tail4.underlyingArraySize shouldBe slice.size - - val (head5, tail5) = slice.splitAt(slice.size - 2) - head5.size shouldBe 2 - tail5.size shouldBe 2 - head5.underlyingArraySize shouldBe slice.size - tail5.underlyingArraySize shouldBe slice.size - } - - "update original slice with moveWritePosition when splits are updated" in { - val originalSlice = Slice.of[Int](2) - val (split1, split2) = originalSlice.splitInnerArrayAt(1) - split1.allocatedSize shouldBe 1 - split2.size shouldBe 0 - - split1.add(100) - split2.add(200) - - split1.size shouldBe 1 - split2.size shouldBe 1 - - originalSlice.moveWritePosition(2) - originalSlice should contain only(100, 200) - originalSlice.toArray shouldBe Array(100, 200) - } - - "group elements" in { - val slice = Slice((1 to 100).toArray) - - //even equal slices - val groupsOf5 = slice.grouped(5).toArray - groupsOf5 should have size 5 - groupsOf5.foreach(_.underlyingArraySize shouldBe slice.size) - groupsOf5(0).toList shouldBe (1 to 20) - groupsOf5(1).toList shouldBe (21 to 40) - groupsOf5(2).toList shouldBe (41 to 60) - groupsOf5(3).toList shouldBe (61 to 80) - groupsOf5(4).toList shouldBe (81 to 100) - - //odd slices - val groupsOf3 = slice.grouped(3).toArray - groupsOf3 should have size 3 - groupsOf3.foreach(_.underlyingArraySize shouldBe slice.size) - groupsOf3(0).toList shouldBe (1 to 33) - groupsOf3(1).toList shouldBe (34 to 66) - groupsOf3(2).toList shouldBe (67 to 100) - } - } - - "A sub Slice" should { - "be read in between it's offset positions and not from the original array" in { - val slice = Slice.fill(5)(Random.nextInt()) - val subSlice = slice.slice(2, 3) - subSlice(0) shouldBe slice(2) - subSlice(1) shouldBe slice(3) - - subSlice.map(int => int) should contain allOf(slice(2), slice(3)) - } - - "should return head and last element in the sub slice" in { - val slice = Slice.fill(5)(Random.nextInt()) - val subSlice = slice.slice(2, 3) - subSlice.head shouldBe slice(2) - subSlice.last shouldBe slice(3) - } - } - - "A Byte Slice (Slice[Byte])" can { - "write and read Integers" in { - val slice = Slice.of[Byte](ByteSizeOf.int * 2) - slice addInt Int.MaxValue - slice addInt Int.MinValue - - val reader = slice.createReader() - reader.readInt() shouldBe Int.MaxValue - reader.readInt() shouldBe Int.MinValue - } - - "write and read Long" in { - val slice = Slice.of[Byte](ByteSizeOf.long * 2) - slice addLong Long.MaxValue - slice addLong Long.MinValue - - val reader = slice.createReader() - reader.readLong() shouldBe Long.MaxValue - reader.readLong() shouldBe Long.MinValue - } - - "write and read Unsigned Integer" in { - val slice = Slice.of[Byte](ByteSizeOf.int + 1) - slice addUnsignedInt Int.MaxValue - slice.createReader().readUnsignedInt() shouldBe Int.MaxValue - } - - "write and read Unsigned Long" in { - val slice = Slice.of[Byte](ByteSizeOf.long + 1) - slice addUnsignedLong Long.MaxValue - slice.createReader().readUnsignedLong() shouldBe Long.MaxValue - } - - "write and read String" in { - val slice = Slice.of[Byte](10000) - slice addStringUTF8 "This is a string" - slice.close().createReader().readRemainingAsString() shouldBe "This is a string" - } - - "write and read remaining string String" in { - val slice = Slice.of[Byte](10000) - - slice addInt 1 - slice addLong 2L - slice addUnsignedInt 3 - slice addUnsignedLong 4L - slice addSignedInt -3 - slice addSignedLong -4L - slice addStringUTF8 "This is a string" - - val reader = slice.close().createReader() - reader.readInt() shouldBe 1 - reader.readLong() shouldBe 2L - reader.readUnsignedInt() shouldBe 3 - reader.readUnsignedLong() shouldBe 4L - reader.readSignedInt() shouldBe -3 - reader.readSignedLong() shouldBe -4L - reader.readRemainingAsString() shouldBe "This is a string" - } - - "write and read String of specified size" in { - val slice = Slice.of[Byte](10000) - slice addStringUTF8 "This is a string" - - val reader = slice.close().createReader() - reader.readString(8) shouldBe "This is " - reader.readString(8) shouldBe "a string" - } - } - - "write multiple with addAll" in { - Slice.of[Int](4) - .add(1) - .add(2) - .addAll(Slice(3, 4)).toList shouldBe List(1, 2, 3, 4) - } - - "addAll should fail if Slice does not have capacity" in { - assertThrows[ArrayIndexOutOfBoundsException] { - Slice.of[Int](3) - .add(1) - .add(2) - .addAll(Slice(3, 4)) - } - } - - "None ++ Some(Slice[T](...))" in { - val merged: Iterable[Slice[Int]] = Some(Slice[Int](1, 2, 3)) ++ None - merged.flatten - .toList should contain inOrderOnly(1, 2, 3) - } - - "++ empty slices" in { - val merged: Slice[Int] = Slice.empty[Int] ++ Slice.empty[Int] - merged shouldBe empty - merged.size shouldBe 0 - merged.isEmpty shouldBe true - merged.isFull shouldBe true - } - - "++ empty and non empty slices" in { - val merged: Slice[Int] = Slice.empty[Int] ++ Slice(1) - merged should contain only 1 - merged.size shouldBe 1 - merged.isEmpty shouldBe false - merged.isFull shouldBe true - } - - "++ non empty and empty slices" in { - val merged: Slice[Int] = Slice(1) ++ Slice.empty[Int] - merged should contain only 1 - merged.size shouldBe 1 - merged.isEmpty shouldBe false - merged.isFull shouldBe true - } - - "++ non empty" in { - val merged: Slice[Int] = Slice(1, 2, 3) ++ Slice(4, 5, 6) - merged.isEmpty shouldBe false - merged.isFull shouldBe true - merged.toList should contain inOrderOnly(1, 2, 3, 4, 5, 6) - } - - "within" when { - implicit def toSlice(int: Int): Slice[Byte] = Slice.writeInt[Byte](int) - - implicit def toSliceMaxKey(int: MaxKey.Fixed[Int]): MaxKey[Slice[Byte]] = MaxKey.Fixed(Slice.writeInt[Byte](int.maxKey)) - - implicit def toSliceMaxKeyRange(int: MaxKey.Range[Int]): MaxKey[Slice[Byte]] = MaxKey.Range(Slice.writeInt[Byte](int.fromKey), Slice.writeInt[Byte](int.maxKey)) - - "max key is Fixed" in { - //0 - // 1 - 10 - Slice.within(key = 0, minKey = 1, maxKey = MaxKey.Fixed(10)) shouldBe false - // 1 - // 1 - 10 - Slice.within(key = 1, minKey = 1, maxKey = MaxKey.Fixed(10)) shouldBe true - // 5 - // 1 - 10 - Slice.within(key = 5, minKey = 1, maxKey = MaxKey.Fixed(10)) shouldBe true - // 10 - // 1 - 10 - Slice.within(key = 10, minKey = 1, maxKey = MaxKey.Fixed(10)) shouldBe true - // 11 - // 1 - 10 - Slice.within(key = 11, minKey = 1, maxKey = MaxKey.Fixed(10)) shouldBe false - } - - "max key is Range" in { - //0 - // 1 - (10 - 20) - Slice.within(key = 0, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe false - // 1 - // 1 - (10 - 20) - Slice.within(key = 1, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe true - // 5 - // 1 - (10 - 20) - Slice.within(key = 5, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe true - // 10 - // 1 - (10 - 20) - Slice.within(key = 10, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe true - // 11 - // 1 - (10 - 20) - Slice.within(key = 11, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe true - // 19 - // 1 - (10 - 20) - Slice.within(key = 19, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe true - // 20 - // 1 - (10 - 20) - Slice.within(key = 20, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe false - // 21 - // 1 - (10 - 20) - Slice.within(key = 21, minKey = 1, maxKey = MaxKey.Range(10, 20)) shouldBe false - } - - "fixed on maxKey" in { - //0 - // 10 - 20 - Slice.within(MaxKey.Fixed(0), MaxKey.Range(10, 20)) shouldBe false - // 10 - // 10 - 20 - Slice.within(MaxKey.Fixed(10), MaxKey.Range(10, 20)) shouldBe true - // 11 - // 10 - 20 - Slice.within(MaxKey.Fixed(11), MaxKey.Range(10, 20)) shouldBe true - // 19 - // 10 - 20 - Slice.within(MaxKey.Fixed(19), MaxKey.Range(10, 20)) shouldBe true - // 20 - // 10 - 20 - Slice.within(MaxKey.Fixed(20), MaxKey.Range(10, 20)) shouldBe false - // 21 - // 10 - 20 - Slice.within(MaxKey.Fixed(21), MaxKey.Range(10, 20)) shouldBe false - - } - - "maxKey on maxKey" in { - //0 - 10 - // 10 - 20 - Slice.within(MaxKey.Range(0, 10), MaxKey.Range(10, 20)) shouldBe false - //0 - 11 - // 10 - 20 - Slice.within(MaxKey.Range(0, 11), MaxKey.Range(10, 20)) shouldBe false - //0 - 20 - // 10 - 20 - Slice.within(MaxKey.Range(0, 20), MaxKey.Range(10, 20)) shouldBe false - //0 - 21 - // 10 - 20 - Slice.within(MaxKey.Range(0, 21), MaxKey.Range(10, 20)) shouldBe false - // 10|10 - // 10 - 20 - Slice.within(MaxKey.Range(10, 10), MaxKey.Range(10, 20)) shouldBe true - // 10 - 11 - // 10 - 20 - Slice.within(MaxKey.Range(10, 11), MaxKey.Range(10, 20)) shouldBe true - // 10 - 19 - // 10 - 20 - Slice.within(MaxKey.Range(10, 19), MaxKey.Range(10, 20)) shouldBe true - // 10 - 20 - // 10 - 20 - Slice.within(MaxKey.Range(10, 20), MaxKey.Range(10, 20)) shouldBe true - // 10 - 21 - // 10 - 20 - Slice.within(MaxKey.Range(10, 21), MaxKey.Range(10, 20)) shouldBe false - // 11 - 12 - // 10 - 20 - Slice.within(MaxKey.Range(11, 12), MaxKey.Range(10, 20)) shouldBe true - // 11 - 20 - // 10 - 20 - Slice.within(MaxKey.Range(11, 20), MaxKey.Range(10, 20)) shouldBe true - // 19- 20 - // 10 - 20 - Slice.within(MaxKey.Range(19, 20), MaxKey.Range(10, 20)) shouldBe true - // 20|20 - // 10 - 20 - Slice.within(MaxKey.Range(20, 20), MaxKey.Range(10, 20)) shouldBe false - // 20 - 21 - // 10 - 20 - Slice.within(MaxKey.Range(20, 21), MaxKey.Range(10, 20)) shouldBe false - - } - - "maxKey on fixed" in { - //0 - 10 - // 10 - Slice.within(MaxKey.Range(0, 10), MaxKey.Fixed(10)) shouldBe false - //0 - 11 - // 10 - Slice.within(MaxKey.Range(0, 11), MaxKey.Fixed(10)) shouldBe false - // 10|10 - // 10 - Slice.within(MaxKey.Range(10, 10), MaxKey.Fixed(10)) shouldBe true - // 10 - 11 - // 10 - Slice.within(MaxKey.Range(10, 11), MaxKey.Fixed(10)) shouldBe false - // 11 - 12 - // 10 - Slice.within(MaxKey.Range(11, 12), MaxKey.Fixed(10)) shouldBe false - } - } - - "reverse" should { - "iterate in reverse" in { - val slice = Slice(1, 2, 3, 4) - slice.reverse.toList should contain inOrderOnly(4, 3, 2, 1) - } - - "iterate of slices" in { - val slice = Slice(1, 2, 3, 4, 5, 6) - - slice.take(2).reverse.toList should contain inOrderOnly(2, 1) - slice.drop(2).take(2).reverse.toList should contain inOrderOnly(4, 3) - slice.drop(4).take(2).reverse.toList should contain inOrderOnly(6, 5) - slice.dropRight(2).reverse.toList should contain inOrderOnly(4, 3, 2, 1) - slice.dropRight(0).reverse.toList should contain inOrderOnly(6, 5, 4, 3, 2, 1) - - slice.slice(0, 5).reverse.toList should contain inOrderOnly(6, 5, 4, 3, 2, 1) - } - - "partially complete" in { - val slice = Slice.of[Int](10) - (1 to 6) foreach slice.add - - slice.reverse.toList should contain inOrderOnly(6, 5, 4, 3, 2, 1) - val slice1 = slice.take(2) - val slice2 = slice.drop(2).take(2) - val slice3 = slice.drop(4).take(2) - - slice1.reverse.toList should contain inOrderOnly(2, 1) - slice2.reverse.toList should contain inOrderOnly(4, 3) - slice3.reverse.toList should contain inOrderOnly(6, 5) - } - - "on empty" in { - Slice.of[Int](10).reverse.toList shouldBe empty - } - } - - "minMax" should { - val oneTwoInclusive = (Slice.writeInt[Byte](1), Slice.writeInt[Byte](2), true) - val threeFourInclusive = (Slice.writeInt[Byte](3), Slice.writeInt[Byte](4), true) - - val oneTwoExclusive = (Slice.writeInt[Byte](1), Slice.writeInt[Byte](2), false) - val threeFourExclusive = (Slice.writeInt[Byte](3), Slice.writeInt[Byte](4), false) - - "return one or the other on none" in { - Slice.minMax(Some(oneTwoInclusive), None) should contain(oneTwoInclusive) - Slice.minMax(None, Some(threeFourInclusive)) should contain(threeFourInclusive) - - Slice.minMax(Some(oneTwoExclusive), None) should contain(oneTwoExclusive) - Slice.minMax(None, Some(threeFourExclusive)) should contain(threeFourExclusive) - } - - "return none if nones" in { - Slice.minMax(None, None) shouldBe empty - } - - "return min and max" in { - //1 - 1 - //1 - 1 - Slice.minMax( - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true)), - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true)) - - Slice.minMax( - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), false)), - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true)) - - Slice.minMax( - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true)), - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), false))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true)) - - Slice.minMax( - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), false)), - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), false))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), false)) - - //1 - 5 - // 3 - 10 - Slice.minMax( - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), true)), - Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), true))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), true)) - - Slice.minMax( - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), false)), - Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), true))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), true)) - - Slice.minMax( - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), true)), - Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), false))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), false)) - - Slice.minMax( - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), false)), - Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), false))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), false)) - - // 3 - 10 - //1 - 5 - Slice.minMax( - Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), true)), - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), true))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), true)) - - Slice.minMax( - Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), false)), - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), true))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), false)) - - Slice.minMax( - Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), true)), - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), false))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), true)) - - Slice.minMax( - Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), false)), - Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), false))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), false)) - } - } - - "take from index" in { - val slice = Slice(1, 2, 3, 4, 5, 6) - slice.take(0, 0) shouldBe Slice.empty[Int] - slice.take(0, 1) shouldBe Slice(1) - slice.take(0, 2) shouldBe Slice(1, 2) - slice.take(0, 3) shouldBe Slice(1, 2, 3) - slice.take(0, 4) shouldBe Slice(1, 2, 3, 4) - slice.take(0, 5) shouldBe Slice(1, 2, 3, 4, 5) - slice.take(0, 6) shouldBe Slice(1, 2, 3, 4, 5, 6) - slice.take(0, 7) shouldBe Slice(1, 2, 3, 4, 5, 6) - - val grouped = Slice(1, 2, 3, 4, 5, 6).groupedSlice(2) - grouped should have size 2 - - //1, 2, 3 - val slice1 = grouped(0) - slice1.take(0, 0) shouldBe Slice.empty[Int] - slice1.take(0, 1) shouldBe Slice(1) - slice1.take(0, 2) shouldBe Slice(1, 2) - slice1.take(0, 3) shouldBe Slice(1, 2, 3) - slice1.take(0, 4) shouldBe Slice(1, 2, 3) - - //4, 5, 6 - val slice2 = grouped(1) - slice2.take(0, 0) shouldBe Slice.empty[Int] - slice2.take(0, 1) shouldBe Slice(4) - slice2.take(0, 2) shouldBe Slice(4, 5) - slice2.take(0, 3) shouldBe Slice(4, 5, 6) - slice2.take(0, 4) shouldBe Slice(4, 5, 6) - } - - "manually adjusting slice random testing 1" in { - val slice = Slice.of[Int](10) - - slice.moveWritePosition(3) - - slice.size shouldBe 3 - slice add 4 - slice(3) shouldBe 4 - slice.size shouldBe 4 - slice addAll Slice(5, 6, 7, 8, 9, 10) - slice.size shouldBe 10 - - slice.head shouldBe 0 - slice.last shouldBe 10 - - slice.moveWritePosition(0) - slice.size shouldBe 10 - - slice.slice(0, 2).isFull shouldBe true - slice.slice(2, 5).isFull shouldBe true - slice.slice(5, 9).isFull shouldBe true - slice.slice(0, 9).isFull shouldBe true - slice.take(Int.MaxValue).isFull shouldBe true - } - - "manually adjusting slice random testing 2" in { - val slice = Slice.of[Int](10) - - slice.moveWritePosition(5) - slice add 6 - slice.size shouldBe 6 - slice.moveWritePosition(0) - slice add 1 - slice.size shouldBe 6 - slice add 2 - slice add 3 - slice add 4 - slice add 5 - slice.size shouldBe 6 - - slice.slice(5, 6).isEmpty shouldBe false - slice.slice(5, 6).size shouldBe 1 - slice.slice(5, 7).size shouldBe 1 - slice.slice(5, 8).size shouldBe 1 - slice.slice(5, 9).size shouldBe 1 - - slice.slice(6, 7).isEmpty shouldBe true - slice.slice(7, 8).isEmpty shouldBe true - slice.slice(9, 9).isEmpty shouldBe true - } - - "manually adjusting slice random testing with addAll" in { - val slice = Slice.of[Int](10) - - slice moveWritePosition 5 - slice addAll Slice(1, 2, 3, 4) - slice.size shouldBe 9 - //move the same position and write again. Size should remain the same - slice moveWritePosition 5 - slice addAll Slice(1, 2, 3, 4) - slice.size shouldBe 9 - - slice add 1 - slice.size shouldBe 10 - - assertThrows[ArrayIndexOutOfBoundsException] { - slice add 1 - } - slice.size shouldBe 10 - - slice.last shouldBe 1 - slice moveWritePosition 9 - slice add 2 - slice.last shouldBe 2 - slice.size shouldBe 10 - } - - "closing an empty slice" in { - val close0 = Slice.of(0).close() - close0.size shouldBe 0 - close0.size shouldBe 0 - close0.fromOffset shouldBe 0 - close0.toList shouldBe List.empty - - val close1 = Slice.of(1).close() - close1.size shouldBe 0 - close1.size shouldBe 0 - close1.fromOffset shouldBe 0 - close1.toList shouldBe List.empty - } - - "moved a closed sub slice" in { - val slice = Slice.of[Int](10) - val subSlice = slice.slice(0, 4).close() - - //can only write to a subslice - (5 to 20) foreach { - i => - assertThrows[ArrayIndexOutOfBoundsException] { - subSlice.moveWritePosition(i) - } - } - slice add 1 - subSlice shouldBe empty - slice should contain only 1 - } - - "equals" in { - val slice = Slice.fill(10)(1) - slice == Slice.fill(10)(1) shouldBe true - - slice.dropHead() == slice shouldBe false - slice.dropHead() == Slice.fill(9)(1) shouldBe true - - Slice.empty == Slice.empty shouldBe true - } - - "toOptionCut" in { - Slice.empty.cutToOption() shouldBe None - Slice.empty[Slice[Byte]].cutToOption() shouldBe None - Slice(1, 2, 3).take(0).cutToOption() shouldBe None - Slice(1, 2, 3).drop(3).cutToOption() shouldBe None - Slice(1, 2, 3).drop(1).cutToOption() shouldBe defined - Slice(1, 2, 3).drop(1).drop(1).cutToOption() shouldBe defined - Slice(1, 2, 3).drop(1).drop(1).drop(1).cutToOption() shouldBe None - } - - "toOption" in { - Slice.emptyBytes.toOption shouldBe empty - Slice(1, 2, 3).toOption shouldBe Some(Slice(1, 2, 3)) - - val slice = Slice(1, 2, 3) - val slice1 = slice.take(1).toOption.get - slice1 should have size 1 - slice1 shouldBe Slice(1) - slice1.underlyingArraySize shouldBe 3 - } - - "indexOf" when { - - "empty" in { - Slice.emptyBytes.indexOf(0) shouldBe empty - Slice.emptyBytes.indexOf(1) shouldBe empty - } - - "single" in { - val bytes = Slice(1) - - bytes.indexOf(0) shouldBe empty - bytes.indexOf(1) shouldBe Some(0) - } - - "many" in { - val bytes = Slice(1, 2, 3, 4, 5) - - bytes.indexOf(0) shouldBe empty - bytes.indexOf(1) shouldBe Some(0) - bytes.indexOf(2) shouldBe Some(1) - bytes.indexOf(3) shouldBe Some(2) - bytes.indexOf(4) shouldBe Some(3) - bytes.indexOf(5) shouldBe Some(4) - bytes.indexOf(6) shouldBe empty - } - } - - "dropTo" when { - "empty" in { - Slice.emptyBytes.dropTo(1) shouldBe empty - Slice.emptyBytes.dropTo(Byte.MaxValue) shouldBe empty - Slice.emptyBytes.dropTo(Byte.MinValue) shouldBe empty - } - - "single" in { - val bytes = Slice(1) - - bytes.dropTo(1).value shouldBe empty - bytes.dropTo(2) shouldBe empty - } - - "many" in { - val bytes = Slice(1, 2, 3, 4, 5) - - bytes.dropTo(0) shouldBe empty - bytes.dropTo(1).value shouldBe Slice(2, 3, 4, 5) - bytes.dropTo(2).value shouldBe Slice(3, 4, 5) - bytes.dropTo(3).value shouldBe Slice(4, 5) - bytes.dropTo(4).value shouldBe Slice(5) - bytes.dropTo(5).value shouldBe empty - bytes.dropTo(6) shouldBe empty - } - } - - "dropUntil" when { - "empty" in { - Slice.emptyBytes.dropUntil(1) shouldBe empty - Slice.emptyBytes.dropUntil(Byte.MaxValue) shouldBe empty - Slice.emptyBytes.dropUntil(Byte.MinValue) shouldBe empty - } - - "single" in { - val bytes = Slice(1) - - bytes.dropUntil(1).value shouldBe bytes - bytes.dropUntil(2) shouldBe empty - } - - "many" in { - val bytes = Slice(1, 2, 3, 4, 5) - - bytes.dropUntil(0) shouldBe empty - bytes.dropUntil(1).value shouldBe Slice(1, 2, 3, 4, 5) - bytes.dropUntil(2).value shouldBe Slice(2, 3, 4, 5) - bytes.dropUntil(3).value shouldBe Slice(3, 4, 5) - bytes.dropUntil(4).value shouldBe Slice(4, 5) - bytes.dropUntil(5).value shouldBe Slice(5) - bytes.dropUntil(6) shouldBe empty - } - } - - "hashCode" should { - "be same for partially and fully written slice" in { - val partiallyWritten = Slice.of[Int](100) - partiallyWritten.add(1) - partiallyWritten.add(2) - partiallyWritten.add(3) - partiallyWritten.add(4) - partiallyWritten.add(5) - - val bytes = - Seq( - Slice(1, 2, 3, 4, 5), - partiallyWritten - ) - - partiallyWritten.underlyingArraySize shouldBe 100 - - bytes foreach { - bytes => - bytes.hashCode() shouldBe bytes.## - bytes.drop(1).hashCode() shouldBe Slice(2, 3, 4, 5).## - bytes.drop(2).hashCode() shouldBe Slice(3, 4, 5).## - bytes.drop(3).hashCode() shouldBe Slice(4, 5).## - bytes.drop(4).hashCode() shouldBe Slice(5).## - bytes.drop(5).hashCode() shouldBe Slice[Int]().## - - bytes.dropRight(1).hashCode() shouldBe Slice(1, 2, 3, 4).## - bytes.dropRight(2).hashCode() shouldBe Slice(1, 2, 3).## - bytes.dropRight(3).hashCode() shouldBe Slice(1, 2).## - bytes.dropRight(4).hashCode() shouldBe Slice(1).## - bytes.dropRight(5).hashCode() shouldBe Slice[Int]().## - } - } - } - - "head and last" when { - "empty" in { - val slice = Slice.empty[Int] - slice.headOrNull.asInstanceOf[Integer] shouldBe null - slice.lastOrNull.asInstanceOf[Integer] shouldBe null - slice.headOption shouldBe empty - slice.lastOption shouldBe empty - } - } - - "existsFor" in { - val slice = Slice.range(1, 100) - - //[] - slice.existsFor(0, _ => fail("should not have run")) shouldBe false - slice.existsFor(-1, _ => fail("should not have run")) shouldBe false - slice.existsFor(Int.MinValue, _ => fail("should not have run")) shouldBe false - - slice.existsFor(1, _ == 1) shouldBe true - slice.existsFor(9, _ % 10 == 0) shouldBe false - slice.existsFor(10, _ % 10 == 0) shouldBe true - slice.existsFor(20, _ == 20) shouldBe true - } - - "range of ints" in { - val range = Slice.range(1, 10) - range.underlyingArraySize shouldBe 10 - range.toList shouldBe (1 to 10) - } - - "range of bytes" in { - val range = Slice.range(1.toByte, 10.toByte) - range.underlyingArraySize shouldBe 10 - range.toList shouldBe (1 to 10) - } - - "closeWritten" when { - "empty" in { - val slice = Slice.empty[Int] - val (left, right) = slice.splitUnwritten() - - left.isEmpty shouldBe true - left.underlyingArraySize shouldBe 0 - assertThrows[ArrayIndexOutOfBoundsException](left.asMut() add 11) - - right.isEmpty shouldBe true - right.underlyingArraySize shouldBe 0 - assertThrows[ArrayIndexOutOfBoundsException](right.asMut() add 11) - } - - "return empty for unwritten bytes" in { - val slice = Slice.of[Int](10) - val (left, right) = slice.splitUnwritten() - - left.isEmpty shouldBe true - left.underlyingArraySize shouldBe 0 - assertThrows[ArrayIndexOutOfBoundsException](left add 11) - - right.isEmpty shouldBe true - right.fromOffset shouldBe 0 - right.underlyingArraySize shouldBe 10 - right add 1 - right should contain only 1 - - val (written, unwritten) = right.splitUnwritten() - written should contain only 1 - unwritten.underlyingArraySize shouldBe 10 - unwritten.currentWritePosition shouldBe 1 - unwritten add 2 - unwritten add 3 - unwritten should contain only(2, 3) - } - - "close written bytes" in { - val slice = Slice.of[Int](10) - - (1 to 5) foreach slice.add - - val (written, unwritten) = slice.splitUnwritten() - - written.size shouldBe 5 - written should contain allElementsOf (1 to 5) - unwritten.isEmpty shouldBe true - unwritten.underlyingArraySize shouldBe 10 - unwritten.currentWritePosition shouldBe 5 - unwritten add 6 - unwritten add 7 - unwritten should contain only(6, 7) - - val (written2, unwritten2) = unwritten.splitUnwritten() - written2 should contain only(6, 7) - unwritten2.underlyingArraySize shouldBe 10 - unwritten2.currentWritePosition shouldBe 7 - unwritten2 add 8 - unwritten2 add 9 - unwritten2 should contain only(8, 9) - - val (written3, unwritten4) = unwritten2.splitUnwritten() - written3 should contain only(8, 9) - unwritten4.underlyingArraySize shouldBe 10 - unwritten4.currentWritePosition shouldBe 9 - unwritten4 add 10 - unwritten4 should contain only 10 - - val (written4, unwritten5) = unwritten4.splitUnwritten() - written4 should contain only 10 - unwritten5.underlyingArraySize shouldBe 0 - assertThrows[ArrayIndexOutOfBoundsException] { - unwritten5 add 11 - } - } - } - - "flatMap" when { - "size = 0" in { - Slice - .empty[Int] - .flatMap { - int => - fail("should have not executed") - } shouldBe empty - } - - "size = 1" in { - Slice(1) - .flatMapToSliceSlow { - int => - Slice(int, 2, 3, 4) - } shouldBe Slice(1, 2, 3, 4) - - Slice(1) - .flatMap { - int => - List(int, 2, 3, 4) - } shouldBe Iterable(1, 2, 3, 4) - } - - "size = 2" in { - Slice(1, 2) - .flatMapToSliceSlow { - int => - Slice(int, (int + "" + int).toInt) - } shouldBe Slice(1, 11, 2, 22) - - Slice(1, 2) - .flatMap { - int => - List(int, (int + "" + int).toInt) - } shouldBe Iterable(1, 11, 2, 22) - } - - "iterable" in { - runThis(20.times, log = true) { - val start = Slice.range(1, Random.nextInt(5)) - val flatten = Slice.range(1, Random.nextInt(5)) - - val expected = - (1 to start.size) - .flatMap { - _ => - flatten - } - .toList - - (start: Iterable[Int]) - .flatMap { - int => - flatten.iterator - }.toList shouldBe expected - } - } - } - - "flatten" when { - "size = 0" in { - Slice.empty[Slice[Int]].flatten shouldBe empty - assertDoesNotCompile("Slice.empty[Iterable[Int]].flattenSlice shouldBe empty") - } - - "size = 1" in { - Slice(Slice(1)).flatten shouldBe Slice(1) - Slice(Slice(1, 2, 3)).flatten shouldBe Slice(1, 2, 3) - } - - "size = 2" in { - Slice(Slice(1, 2), Slice(3, 4)).flatten shouldBe Slice(1, 2, 3, 4) - } - } - - - "write and read" when { - - "signedInt" in { - Seq(Int.MinValue, Int.MaxValue, 0, 1, 100, Byte.MinValue, Byte.MaxValue, 100000) foreach { - i => - val bytes = Slice.writeSignedInt[java.lang.Byte](i) - bytes.isFull shouldBe true - bytes.readSignedInt[java.lang.Byte]() shouldBe i - } - } - - "signedLong" in { - Seq(Long.MinValue, Long.MaxValue, 0, 1, 100, Byte.MinValue, Byte.MaxValue, 100000) foreach { - i => - val bytes = Slice.writeSignedLong[java.lang.Byte](i) - bytes.isFull shouldBe true - bytes.readSignedLong[java.lang.Byte]() shouldBe i - } - } - } - - "updateBinarySearchCopy" when { - "empty" in { - val slice = Slice.empty[Int] - assertThrows[Exception] { - slice.updateBinarySearchCopy(2, 3) - } - } - - "item does not exist" in { - runThis(50.times) { - val slice = Slice.range(1, Random.nextInt(10)) - assertThrows[Exception] { - slice.updateBinarySearchCopy(11, 3) - } - } - } - - "update head" in { - Slice.range(1, 10).updateBinarySearchCopy(1, 2).head shouldBe 2 - } - - "update last" in { - Slice.range(1, 10).updateBinarySearchCopy(10, 2).last shouldBe 2 - } - - "update mid" in { - val slice = Slice.range(0, 10) - slice foreach { - item => - slice.updateBinarySearchCopy(item, Int.MaxValue).get(item) shouldBe Int.MaxValue - } - } - } - - "replaceHeadCopy" when { - "empty" in { - val slice = Slice.empty[Int] - assertThrows[Exception] { - slice.replaceHeadCopy(3) - } - } - - "size = 1" in { - val replaced = Slice(1).replaceHeadCopy(Int.MaxValue) - replaced.head shouldBe Int.MaxValue - replaced.dropHead() shouldBe empty - } - - "size = 10" in { - val replaced = Slice.range(1, 10).replaceHeadCopy(Int.MaxValue) - replaced.head shouldBe Int.MaxValue - replaced.dropHead() shouldBe Slice.range(2, 10) - } - } - - "replaceLastCopy" when { - "empty" in { - val slice = Slice.empty[Int] - assertThrows[Exception] { - slice.replaceLastCopy(3) - } - } - - "size = 1" in { - val replaced = Slice(1).replaceLastCopy(Int.MaxValue) - replaced.head shouldBe Int.MaxValue - replaced.last shouldBe Int.MaxValue - replaced.dropHead() shouldBe empty - replaced shouldBe Slice(Int.MaxValue) - } - - "size = 10" in { - val replaced = Slice.range(1, 10).replaceLastCopy(Int.MaxValue) - replaced.last shouldBe Int.MaxValue - replaced.dropRight(1) shouldBe Slice.range(1, 9) - } - - "on subslice" in { - val replaced = Slice.range(1, 10).drop(1).dropRight(1).replaceLastCopy(Int.MaxValue) - replaced.last shouldBe Int.MaxValue - replaced shouldBe Slice(2, 3, 4, 5, 6, 7, 8, Int.MaxValue) - } - } - - "sequence" should { - implicit val ec: ExecutionContext = - scala.concurrent.ExecutionContext.Implicits.global - - "succeed" when { - - "empty" in { - val seq = Seq.empty[Future[Int]] - Slice.sequence(seq).await shouldBe empty - } - - "size = 1" in { - val seq = Seq(Future.successful(1)) - Slice.sequence(seq).await should contain only 1 - } - - "size = many" in { - val seq = Slice.range(1, 10).map(Future.successful) - Slice.sequence(seq).await shouldBe Slice.range(1, 10) - } - } - - "fail" when { - "size = 1" in { - val seq = Seq(Future.failed(new Exception("failed"))) - Slice.sequence(seq).awaitFailureInf.getMessage shouldBe "failed" - } - - "size = many" in { - val range = Seq.range(0, 10) - - range foreach { - failAtIndex => //fail at every index - val seq = //run on all range indexes and fail only at failAtIndex - range map { - index => - if (index == failAtIndex) - Future.failed(new Exception("failed")) - else - Future.successful(index) - } - - Slice.sequence(seq).awaitFailureInf.getMessage shouldBe "failed" - } - } - } - } - - "collectToSlice" when { - "empty - no head" in { - val collection: Slice[Byte] = - Slice.empty[Byte] collectToSlice { - case byte => byte - } - - collection shouldBe empty - } - - "empty - head" in { - val collection: Slice[Byte] = - Slice.empty[Byte].collectToSlice(1.toByte) { - case byte => byte - } - - collection should contain only 1 - } - - "no head" in { - val slice = Slice.range(1, 10) - - val collection: Slice[Int] = - slice collectToSlice { - case int if int % 2 == 0 => - int - } - - collection shouldBe Slice(2, 4, 6, 8, 10) - collection.size shouldBe 5 - } - - "head" in { - val slice = Slice.range(1, 10) - - val collection: Slice[Int] = - slice.collectToSlice(1) { - case int if int % 2 == 0 => - int - } - - collection shouldBe Slice(1, 2, 4, 6, 8, 10) - collection.size shouldBe 6 - } - } - - "split" when { - "slice is empty" in { - Slice.empty[Int].split(10) shouldBe empty - } - - "blockSize is <= 0" in { - assertThrows[IllegalArgumentException] { - Slice(1, 2, 3).split(0) - } - - assertThrows[IllegalArgumentException] { - Slice(1, 2, 3).split(-1) - } - } - - "blockSize < slice.size" in { - val slice: Slice[Int] = Slice((1 to 100).toArray) - //even equal slices - val splits = slice.split(10) - splits should have size 10 - - splits.zipWithIndex foreach { - case (split, index) => - split shouldBe slice.drop(index * 10).take(10) - split.underlyingArraySize shouldBe 10 - } - - Slice(splits).flatten shouldBe slice - } - - "blockSize >= slice.size" when { - def runTest(slice: Slice[Int], blockSize: Int): Unit = { - //even equal slices - val splits = slice.split(blockSize) - splits should have size 1 - splits.head shouldBe slice - } - - val slice: Slice[Int] = Slice((1 to 100).toArray) - - "blockSize == slice.slice" in { - runTest(slice, slice.size) - } - - "blockSize > slice.slice" in { - runTest(slice, slice.size + 1) - //-1 should not result in 1 slice - assertThrows[Exception](runTest(slice, slice.size - 1)) - } - } - } -} diff --git a/effect/src/main/scala/swaydb/effect/Effect.scala b/effect/src/main/scala/swaydb/effect/Effect.scala index b24344ef0..4227ddc29 100644 --- a/effect/src/main/scala/swaydb/effect/Effect.scala +++ b/effect/src/main/scala/swaydb/effect/Effect.scala @@ -127,7 +127,7 @@ private[swaydb] object Effect extends LazyLogging { * @param totalExpectedBytes Expected byte count. Invoker should compute this * at the time of building the [[ByteBuffer]] array. * This should really be handled by this function but - * this module is not dependant on swaydb.data.Slice yet. + * this module is not dependant on swaydb.slice yet. * @param buffers Byte buffers to persist. */ def writeUnclosedGathering(channel: GatheringByteChannel, diff --git a/effect/src/test/scala/swaydb/effect/IOSpec.scala b/effect/src/test/scala/swaydb/effect/IOSpec.scala index 164e6b055..6b2ed27d9 100644 --- a/effect/src/test/scala/swaydb/effect/IOSpec.scala +++ b/effect/src/test/scala/swaydb/effect/IOSpec.scala @@ -20,9 +20,9 @@ //import org.scalatest.wordspec.AnyWordSpec //import swaydb.IO //import swaydb.IO.ExceptionHandler.Throwable -//import swaydb.data.slice.Slice -//import swaydb.data.slice.Slice -//import swaydb.data.slice.Slice +//import swaydb.slice.Slice +//import swaydb.slice.Slice +//import swaydb.slice.Slice // //import scala.collection.mutable.ListBuffer // diff --git a/serializers/src/main/scala/swaydb/serializers/Default.scala b/serializers/src/main/scala/swaydb/serializers/Default.scala index 7664814e4..7c5820766 100644 --- a/serializers/src/main/scala/swaydb/serializers/Default.scala +++ b/serializers/src/main/scala/swaydb/serializers/Default.scala @@ -16,8 +16,8 @@ package swaydb.serializers -import swaydb.data.slice.Slice -import swaydb.data.utils.ScalaByteOps +import swaydb.slice.Slice +import swaydb.slice.utils.ScalaByteOps import swaydb.utils.ByteSizeOf import java.nio.ByteBuffer diff --git a/serializers/src/main/scala/swaydb/serializers/Serializer.scala b/serializers/src/main/scala/swaydb/serializers/Serializer.scala index 9389025b9..b8bc6bd7b 100644 --- a/serializers/src/main/scala/swaydb/serializers/Serializer.scala +++ b/serializers/src/main/scala/swaydb/serializers/Serializer.scala @@ -16,7 +16,7 @@ package swaydb.serializers -import swaydb.data.slice.Slice +import swaydb.slice.Slice object Serializer { private val one = Slice(1.toByte) diff --git a/serializers/src/main/scala/swaydb/serializers/package.scala b/serializers/src/main/scala/swaydb/serializers/package.scala index 0bc8dc6be..4bf9e3380 100644 --- a/serializers/src/main/scala/swaydb/serializers/package.scala +++ b/serializers/src/main/scala/swaydb/serializers/package.scala @@ -16,7 +16,7 @@ package swaydb -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.utils.TupleOrNone package object serializers { diff --git a/skiplist/src/main/scala/swaydb/skiplist/AtomicRanges.scala b/skiplist/src/main/scala/swaydb/skiplist/AtomicRanges.scala index f14a83811..26bcdc937 100644 --- a/skiplist/src/main/scala/swaydb/skiplist/AtomicRanges.scala +++ b/skiplist/src/main/scala/swaydb/skiplist/AtomicRanges.scala @@ -19,10 +19,10 @@ package swaydb.skiplist import com.typesafe.scalalogging.LazyLogging import swaydb.Bag import swaydb.Bag.Implicits._ -import swaydb.skiplist.AtomicRanges.{Action, Value} import swaydb.data.MaxKey -import swaydb.data.slice.Slice import swaydb.effect.Reserve +import swaydb.skiplist.AtomicRanges.{Action, Value} +import swaydb.slice.Slice import java.util.concurrent.ConcurrentSkipListMap import java.util.concurrent.atomic.AtomicLong diff --git a/skiplist/src/main/scala/swaydb/skiplist/SkipListConcurrentLimit.scala b/skiplist/src/main/scala/swaydb/skiplist/SkipListConcurrentLimit.scala index c2cc9d352..a563e9487 100644 --- a/skiplist/src/main/scala/swaydb/skiplist/SkipListConcurrentLimit.scala +++ b/skiplist/src/main/scala/swaydb/skiplist/SkipListConcurrentLimit.scala @@ -17,7 +17,7 @@ package swaydb.skiplist import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import java.util import scala.collection.mutable diff --git a/skiplist/src/main/scala/swaydb/skiplist/SkipListNavigable.scala b/skiplist/src/main/scala/swaydb/skiplist/SkipListNavigable.scala index 4b8ac3ba3..7f10ca496 100644 --- a/skiplist/src/main/scala/swaydb/skiplist/SkipListNavigable.scala +++ b/skiplist/src/main/scala/swaydb/skiplist/SkipListNavigable.scala @@ -18,7 +18,7 @@ package swaydb.skiplist import swaydb.utils.NullOps import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import java.util import java.util.Map diff --git a/skiplist/src/main/scala/swaydb/skiplist/SkipListSeries.scala b/skiplist/src/main/scala/swaydb/skiplist/SkipListSeries.scala index e83041d5f..150482c7c 100644 --- a/skiplist/src/main/scala/swaydb/skiplist/SkipListSeries.scala +++ b/skiplist/src/main/scala/swaydb/skiplist/SkipListSeries.scala @@ -21,7 +21,7 @@ import swaydb.series.growable.SeriesGrowableList import swaydb.utils.{English, WhenOccurs} import swaydb.data.OptimiseWrites import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import scala.collection.mutable.ListBuffer import scala.reflect.ClassTag diff --git a/skiplist/src/test/scala/swaydb/skiplist/SkipListSeriesSpec.scala b/skiplist/src/test/scala/swaydb/skiplist/SkipListSeriesSpec.scala index a4ee2082f..ef3588ff4 100644 --- a/skiplist/src/test/scala/swaydb/skiplist/SkipListSeriesSpec.scala +++ b/skiplist/src/test/scala/swaydb/skiplist/SkipListSeriesSpec.scala @@ -19,7 +19,7 @@ package swaydb.skiplist import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import swaydb.data.order.KeyOrder -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.serializers.Default._ import swaydb.serializers._ diff --git a/skiplist/src/test/scala/swaydb/skiplist/SkipListSpec.scala b/skiplist/src/test/scala/swaydb/skiplist/SkipListSpec.scala index 9e09e7d95..f39dbd7ff 100644 --- a/skiplist/src/test/scala/swaydb/skiplist/SkipListSpec.scala +++ b/skiplist/src/test/scala/swaydb/skiplist/SkipListSpec.scala @@ -19,7 +19,7 @@ package swaydb.skiplist import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import swaydb.data.order.KeyOrder -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ diff --git a/data/src/main/scala-2.12/swaydb.data.slice/SliceBuildFrom.scala b/slice/src/main/scala-2.12/swaydb.slice/SliceBuildFrom.scala similarity index 98% rename from data/src/main/scala-2.12/swaydb.data.slice/SliceBuildFrom.scala rename to slice/src/main/scala-2.12/swaydb.slice/SliceBuildFrom.scala index 5b1f124f7..89b12d211 100644 --- a/data/src/main/scala-2.12/swaydb.data.slice/SliceBuildFrom.scala +++ b/slice/src/main/scala-2.12/swaydb.slice/SliceBuildFrom.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package swaydb.data.slice +package swaydb.slice import com.typesafe.scalalogging.LazyLogging diff --git a/data/src/main/scala-2.12/swaydb.data.slice/SliceBuilder.scala b/slice/src/main/scala-2.12/swaydb.slice/SliceBuilder.scala similarity index 97% rename from data/src/main/scala-2.12/swaydb.data.slice/SliceBuilder.scala rename to slice/src/main/scala-2.12/swaydb.slice/SliceBuilder.scala index 75f6f7829..a385e6311 100644 --- a/data/src/main/scala-2.12/swaydb.data.slice/SliceBuilder.scala +++ b/slice/src/main/scala-2.12/swaydb.slice/SliceBuilder.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package swaydb.data.slice +package swaydb.slice -import swaydb.Aggregator +import swaydb.utils.Aggregator import scala.annotation.tailrec import scala.collection.compat.IterableOnce diff --git a/data/src/main/scala-2.13/swaydb/data/slice/SliceBuildFrom.scala b/slice/src/main/scala-2.13/swaydb/slice/SliceBuildFrom.scala similarity index 98% rename from data/src/main/scala-2.13/swaydb/data/slice/SliceBuildFrom.scala rename to slice/src/main/scala-2.13/swaydb/slice/SliceBuildFrom.scala index ece1f5d00..04c646b59 100644 --- a/data/src/main/scala-2.13/swaydb/data/slice/SliceBuildFrom.scala +++ b/slice/src/main/scala-2.13/swaydb/slice/SliceBuildFrom.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package swaydb.data.slice +package swaydb.slice import com.typesafe.scalalogging.LazyLogging diff --git a/data/src/main/scala-2.13/swaydb/data/slice/SliceBuilder.scala b/slice/src/main/scala-2.13/swaydb/slice/SliceBuilder.scala similarity index 96% rename from data/src/main/scala-2.13/swaydb/data/slice/SliceBuilder.scala rename to slice/src/main/scala-2.13/swaydb/slice/SliceBuilder.scala index 27f328064..16693196e 100644 --- a/data/src/main/scala-2.13/swaydb/data/slice/SliceBuilder.scala +++ b/slice/src/main/scala-2.13/swaydb/slice/SliceBuilder.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package swaydb.data.slice +package swaydb.slice -import swaydb.Aggregator +import swaydb.utils.Aggregator import scala.annotation.tailrec import scala.collection._ diff --git a/data/src/main/scala-2.13/swaydb/data/slice/SliceFactory.scala b/slice/src/main/scala-2.13/swaydb/slice/SliceFactory.scala similarity index 97% rename from data/src/main/scala-2.13/swaydb/data/slice/SliceFactory.scala rename to slice/src/main/scala-2.13/swaydb/slice/SliceFactory.scala index ff8751d6b..6a562e38e 100644 --- a/data/src/main/scala-2.13/swaydb/data/slice/SliceFactory.scala +++ b/slice/src/main/scala-2.13/swaydb/slice/SliceFactory.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package swaydb.data.slice +package swaydb.slice import scala.collection.compat.IterableOnce import scala.collection.{ClassTagIterableFactory, mutable} diff --git a/data/src/main/scala/swaydb/data/slice/Reader.scala b/slice/src/main/scala/swaydb/slice/Reader.scala similarity index 96% rename from data/src/main/scala/swaydb/data/slice/Reader.scala rename to slice/src/main/scala/swaydb/slice/Reader.scala index b1db6aeac..6685e72d9 100644 --- a/data/src/main/scala/swaydb/data/slice/Reader.scala +++ b/slice/src/main/scala/swaydb/slice/Reader.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package swaydb.data.slice +package swaydb.slice trait Reader[B] extends ReaderBase[B] { diff --git a/data/src/main/scala/swaydb/data/slice/ReaderBase.scala b/slice/src/main/scala/swaydb/slice/ReaderBase.scala similarity index 92% rename from data/src/main/scala/swaydb/data/slice/ReaderBase.scala rename to slice/src/main/scala/swaydb/slice/ReaderBase.scala index 0f747c8e2..61f041bc3 100644 --- a/data/src/main/scala/swaydb/data/slice/ReaderBase.scala +++ b/slice/src/main/scala/swaydb/slice/ReaderBase.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package swaydb.data.slice +package swaydb.slice -import swaydb.data.utils.ByteOps +import swaydb.IO +import swaydb.slice.utils.ByteOps import swaydb.utils.Maybe.Maybe -import swaydb.{IO, Pair} import java.nio.charset.{Charset, StandardCharsets} import java.nio.file.Path @@ -73,9 +73,6 @@ trait ReaderBase[B] { self => @inline def readUnsignedIntWithByteSize(): (Int, Int) = byteOps.readUnsignedIntWithByteSize(self) - @inline def readUnsignedIntWithByteSizePair(): Pair[Int, Int] = - Pair(readUnsignedIntWithByteSize()) - @inline def readNonZeroUnsignedInt(): Int = byteOps.readUnsignedIntNonZero(self) @@ -85,9 +82,6 @@ trait ReaderBase[B] { self => @inline def readNonZeroUnsignedIntWithByteSize(): (Int, Int) = byteOps.readUnsignedIntNonZeroWithByteSize(self) - @inline def readNonZeroUnsignedIntWithByteSizePair(): Pair[Int, Int] = - Pair(readNonZeroUnsignedIntWithByteSize()) - @inline def readUnsignedIntSized(): Slice[B] = read(byteOps.readUnsignedInt(self)) diff --git a/data/src/main/scala/swaydb/data/slice/Slice.scala b/slice/src/main/scala/swaydb/slice/Slice.scala similarity index 99% rename from data/src/main/scala/swaydb/data/slice/Slice.scala rename to slice/src/main/scala/swaydb/slice/Slice.scala index d17e1b5e8..2aebc2329 100644 --- a/data/src/main/scala/swaydb/data/slice/Slice.scala +++ b/slice/src/main/scala/swaydb/slice/Slice.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package swaydb.data.slice +package swaydb.slice -import swaydb.data.utils.ByteOps +import swaydb.slice.utils.ByteOps import swaydb.utils.SomeOrNoneCovariant import java.io.ByteArrayInputStream diff --git a/data/src/main/scala/swaydb/data/slice/SliceCompanion.scala b/slice/src/main/scala/swaydb/slice/SliceCompanion.scala similarity index 87% rename from data/src/main/scala/swaydb/data/slice/SliceCompanion.scala rename to slice/src/main/scala/swaydb/slice/SliceCompanion.scala index ceda22338..b3abac7e0 100644 --- a/data/src/main/scala/swaydb/data/slice/SliceCompanion.scala +++ b/slice/src/main/scala/swaydb/slice/SliceCompanion.scala @@ -14,11 +14,10 @@ * limitations under the License. */ -package swaydb.data.slice +package swaydb.slice -import swaydb.Aggregator -import swaydb.data.MaxKey -import swaydb.data.utils.ByteOps +import swaydb.utils.Aggregator +import swaydb.slice.utils.ByteOps import swaydb.utils.ByteSizeOf import java.lang @@ -198,16 +197,6 @@ trait SliceCompanion extends SliceBuildFrom { range2 = (range2._1, range2._2, true) ) - def within[T](key: Slice[T], - minKey: Slice[T], - maxKey: MaxKey[Slice[T]])(implicit keyOrder: Ordering[Slice[T]]): Boolean = - within( - key = key, - minKey = minKey, - maxKey = maxKey.maxKey, - maxKeyInclusive = maxKey.inclusive - ) - def within[T](key: Slice[T], minKey: Slice[T], maxKey: Slice[T], @@ -236,41 +225,6 @@ trait SliceCompanion extends SliceBuildFrom { } } - def within[T](source: MaxKey[T], - target: MaxKey[T])(implicit keyOrder: Ordering[T]): Boolean = { - import keyOrder._ - - source match { - case MaxKey.Fixed(sourceMaxKey) => - target match { - case MaxKey.Fixed(targetMaxKey) => - keyOrder.equiv(sourceMaxKey, targetMaxKey) - - case MaxKey.Range(targetFromKey, targetMaxKey) => - Slice.within( - key = sourceMaxKey, - minKey = targetFromKey, - maxKey = targetMaxKey, - maxKeyInclusive = false - ) - } - - case MaxKey.Range(sourceFromKey, sourceMaxKey) => - target match { - case MaxKey.Fixed(targetMaxKey) => - keyOrder.equiv(sourceFromKey, targetMaxKey) && - keyOrder.equiv(sourceMaxKey, targetMaxKey) - - case MaxKey.Range(targetFromKey, targetMaxKey) => - Slice.within( - key = sourceFromKey, - minKey = targetFromKey, - maxKey = targetMaxKey, - maxKeyInclusive = false - ) && sourceMaxKey <= targetMaxKey - } - } - } def minMax[T](left: Option[(Slice[T], Slice[T], Boolean)], right: Option[(Slice[T], Slice[T], Boolean)])(implicit keyOrder: Ordering[Slice[T]]): Option[(Slice[T], Slice[T], Boolean)] = { diff --git a/data/src/main/scala/swaydb/data/slice/SliceIOImplicits.scala b/slice/src/main/scala/swaydb/slice/SliceIOImplicits.scala similarity index 99% rename from data/src/main/scala/swaydb/data/slice/SliceIOImplicits.scala rename to slice/src/main/scala/swaydb/slice/SliceIOImplicits.scala index 0234e41b6..83afd2c8f 100644 --- a/data/src/main/scala/swaydb/data/slice/SliceIOImplicits.scala +++ b/slice/src/main/scala/swaydb/slice/SliceIOImplicits.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package swaydb.data.slice +package swaydb.slice import swaydb.IO diff --git a/data/src/main/scala/swaydb/data/slice/SliceReader.scala b/slice/src/main/scala/swaydb/slice/SliceReader.scala similarity index 97% rename from data/src/main/scala/swaydb/data/slice/SliceReader.scala rename to slice/src/main/scala/swaydb/slice/SliceReader.scala index a544af6eb..62d86ff11 100644 --- a/data/src/main/scala/swaydb/data/slice/SliceReader.scala +++ b/slice/src/main/scala/swaydb/slice/SliceReader.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package swaydb.data.slice +package swaydb.slice -import swaydb.data.utils.ByteOps +import swaydb.slice.utils.ByteOps import java.nio.file.Paths import scala.reflect.ClassTag diff --git a/data/src/main/scala/swaydb/data/utils/ByteOps.scala b/slice/src/main/scala/swaydb/slice/utils/ByteOps.scala similarity index 97% rename from data/src/main/scala/swaydb/data/utils/ByteOps.scala rename to slice/src/main/scala/swaydb/slice/utils/ByteOps.scala index 237bb5abe..62df2e0ac 100644 --- a/data/src/main/scala/swaydb/data/utils/ByteOps.scala +++ b/slice/src/main/scala/swaydb/slice/utils/ByteOps.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package swaydb.data.utils +package swaydb.slice.utils -import swaydb.data.slice.{ReaderBase, Slice, SliceMut, SliceRO, SliceReader} +import swaydb.slice.{ReaderBase, Slice, SliceMut, SliceRO, SliceReader} import swaydb.utils.Maybe.Maybe import java.nio.charset.Charset diff --git a/data/src/main/scala/swaydb/data/utils/ScalaByteOps.scala b/slice/src/main/scala/swaydb/slice/utils/ScalaByteOps.scala similarity index 99% rename from data/src/main/scala/swaydb/data/utils/ScalaByteOps.scala rename to slice/src/main/scala/swaydb/slice/utils/ScalaByteOps.scala index 013e75b32..ed4280878 100644 --- a/data/src/main/scala/swaydb/data/utils/ScalaByteOps.scala +++ b/slice/src/main/scala/swaydb/slice/utils/ScalaByteOps.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package swaydb.data.utils +package swaydb.slice.utils -import swaydb.data.slice.{ReaderBase, Slice, SliceMut, SliceRO, SliceReader} +import swaydb.slice.{ReaderBase, Slice, SliceMut, SliceRO, SliceReader} import swaydb.utils.Maybe.Maybe import swaydb.utils.{ByteSizeOf, Maybe} diff --git a/data/src/test/scala/swaydb/data/slice/SliceOptionSpec.scala b/slice/src/test/scala/swaydb/slice/SliceOptionSpec.scala similarity index 93% rename from data/src/test/scala/swaydb/data/slice/SliceOptionSpec.scala rename to slice/src/test/scala/swaydb/slice/SliceOptionSpec.scala index a839ab5e9..c13e2c0d1 100644 --- a/data/src/test/scala/swaydb/data/slice/SliceOptionSpec.scala +++ b/slice/src/test/scala/swaydb/slice/SliceOptionSpec.scala @@ -14,18 +14,15 @@ * limitations under the License. */ -package swaydb.data.slice +package swaydb.slice import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import swaydb.data.order.KeyOrder import scala.util.Random class SliceOptionSpec extends AnyWordSpec with Matchers { - implicit val keyOrder = KeyOrder.default - def randomByte() = (Random.nextInt(256) - 128).toByte val slice: Slice[Int] = Slice(1, 2, 3) diff --git a/data/src/test/scala/swaydb/data/slice/SliceSearchSpec.scala b/slice/src/test/scala/swaydb/slice/SliceSearchSpec.scala similarity index 98% rename from data/src/test/scala/swaydb/data/slice/SliceSearchSpec.scala rename to slice/src/test/scala/swaydb/slice/SliceSearchSpec.scala index ce754c844..86a8d9d13 100644 --- a/data/src/test/scala/swaydb/data/slice/SliceSearchSpec.scala +++ b/slice/src/test/scala/swaydb/slice/SliceSearchSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package swaydb.data.slice +package swaydb.slice import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/slice/src/test/scala/swaydb/slice/SliceSpec.scala b/slice/src/test/scala/swaydb/slice/SliceSpec.scala new file mode 100644 index 000000000..1e8b44ce4 --- /dev/null +++ b/slice/src/test/scala/swaydb/slice/SliceSpec.scala @@ -0,0 +1,1297 @@ +///* +// * Copyright 2018 Simer JS Plaha (simer.j@gmail.com - @simerplaha) +// * +// * Licensed under the Apache License, Version 2.0 (the "License"); +// * you may not use this file except in compliance with the License. +// * You may obtain a copy of the License at +// * +// * http://www.apache.org/licenses/LICENSE-2.0 +// * +// * Unless required by applicable law or agreed to in writing, software +// * distributed under the License is distributed on an "AS IS" BASIS, +// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// * See the License for the specific language governing permissions and +// * limitations under the License. +// */ +// +//package swaydb.slice +// +//import org.scalatest.OptionValues._ +//import org.scalatest.matchers.should.Matchers +//import org.scalatest.wordspec.AnyWordSpec +//import swaydb.slice.utils.ScalaByteOps +//import swaydb.testkit.RunThis._ +//import swaydb.utils.ByteSizeOf +// +//import scala.concurrent.{ExecutionContext, Future} +//import scala.util.Random +// +//class SliceSpec extends AnyWordSpec with Matchers { +// +// implicit val scalaByte = ScalaByteOps +// +// def randomByte() = (Random.nextInt(256) - 128).toByte +// +// "A Slice" should { +// "be created by specifying it's length" in { +// val slice = Slice.of[Int](10) +// slice.allocatedSize shouldBe 10 +// slice.size shouldBe 0 +// slice.fromOffset shouldBe 0 +// slice.toOffset shouldBe 9 +// } +// +// "be created by specifying it's length and isFull" in { +// val slice = Slice.of[Int](10, isFull = true) +// slice.allocatedSize shouldBe 10 +// slice.size shouldBe 10 +// slice.fromOffset shouldBe 0 +// slice.toOffset shouldBe 9 +// } +// +// "be created from an Array" in { +// val array = Array.fill[Byte](10)(1) +// val slice = Slice[Byte](array) +// slice.allocatedSize shouldBe 10 +// slice.size shouldBe 10 +// slice.fromOffset shouldBe 0 +// slice.toOffset shouldBe 9 +// } +// +// "be created from another Slice" in { +// val array = Array.fill[Int](3)(Random.nextInt()) +// val slice1 = Slice[Int](array) +// slice1.size shouldBe 3 +// slice1.allocatedSize shouldBe 3 +// +// val slice2 = slice1.slice(1, 2) +// slice2.allocatedSize shouldBe 2 +// slice2.size shouldBe 2 +// slice2.fromOffset shouldBe 1 +// slice2.toOffset shouldBe 2 +// slice2.toList should contain inOrderElementsOf List(array(1), array(2)) +// slice2.underlyingArraySize shouldBe slice1.size +// +// val slice2Copy = slice2.cut() +// slice2Copy.allocatedSize shouldBe 2 +// slice2Copy.size shouldBe 2 +// slice2Copy.underlyingArraySize shouldBe 2 +// } +// +// "be sliced for a partially written slice" in { +// //slice0 is (10, 10, null, null) +// val slice0 = Slice.of[Int](4) +// slice0 add 10 +// slice0 add 10 //second slice starts here +// slice0.size shouldBe 2 +// +// //slice1 = (10, 10) +// val slice1 = slice0.slice(0, 1) +// slice1.size shouldBe 2 +// slice1.toArray shouldBe Array(10, 10) +// slice1.underlyingArraySize shouldBe 4 +// +// //slice1 = (10, null) +// val slice2 = slice0.slice(1, 2) +// slice2.size shouldBe 1 +// slice2.toArray shouldBe Array(10) +// +// //slice1 = (null, null) +// val slice3 = slice0.slice(2, 3) +// slice3.size shouldBe 0 +// slice3.toArray shouldBe empty +// +// //slice4 = (10, 10, null, null) +// val slice4 = slice0.slice(0, 3) +// slice4.size shouldBe 2 +// slice4.toArray shouldBe Array(10, 10) +// } +// +// "be sliced if the original slice is full written" in { +// //slice0 = (1, 2, 3, 4) +// val slice0 = Slice.of[Int](4) +// slice0 add 1 +// slice0 add 2 +// slice0 add 3 +// slice0 add 4 +// slice0.size shouldBe 4 +// +// //slice1 = (1, 2) +// val slice1 = slice0.slice(0, 1) +// slice1.size shouldBe 2 +// slice1.toArray shouldBe Array(1, 2) +// +// //slice1 = (2, 3) +// val slice2 = slice0.slice(1, 2) +// slice2.size shouldBe 2 +// slice2.toArray shouldBe Array(2, 3) +// +// //slice1 = (3, 4) +// val slice3 = slice0.slice(2, 3) +// slice3.size shouldBe 2 +// slice3.toArray shouldBe Array(3, 4) +// +// //slice4 = (1, 2, 3, 4) +// val slice4 = slice0.slice(0, 3) +// slice4.size shouldBe 4 +// slice4.toArray shouldBe Array(1, 2, 3, 4) +// } +// +// "return empty when creating a sub Slice with invalid offsets" in { +// val slice1 = Slice(1, 2, 3) +// slice1.size shouldBe 3 +// slice1.slice(0, 3) shouldBe Slice(1, 2, 3) +// slice1.slice(3, 100) shouldBe empty +// slice1.slice(10, 3) shouldBe empty +// +// //valid subslice 2 +// val slice2 = slice1.slice(1, 2) +// slice2.size shouldBe 2 +// slice2 shouldBe Slice(2, 3) +// slice2.slice(100, 100) shouldBe empty +// } +// +// "throw ArrayIndexOutOfBoundsException when inserting items outside the Slice offset" in { +// val slice = Slice.of[Byte](1) +// slice.allocatedSize shouldBe 1 +// slice.size shouldBe 0 +// slice.fromOffset shouldBe 0 +// slice.toOffset shouldBe 0 +// +// slice.add(1).size shouldBe 1 +// assertThrows[ArrayIndexOutOfBoundsException] { +// slice.add(1) +// } +// slice.size shouldBe 1 +// } +// +// "throw ArrayIndexOutOfBoundsException when adding items outside it's offset and when the Slice is a sub slice" in { +// val slice1 = Slice.fill(4)(Random.nextInt()).asMut() +// slice1.size shouldBe 4 +// +// val slice2: SliceMut[Int] = slice1.slice(1, 2) +// slice2.size shouldBe 2 +// +// slice2.size shouldBe 2 +// slice2.head shouldBe slice1(1) +// slice2.last shouldBe slice1(2) +// assertThrows[ArrayIndexOutOfBoundsException] { +// slice2.add(0) +// } +// } +// +// "be read by it's index position" in { +// val array = Array.fill(5)(Random.nextInt()) +// val slice = Slice(array) +// +// Range.inclusive(0, 4).foreach { +// index => +// slice.getC(index) shouldBe array(index) +// } +// +// val subSlice = slice.slice(1, 2) +// subSlice.head shouldBe array(1) +// subSlice.last shouldBe array(2) +// +// val subSlice2 = subSlice.slice(0, 0) +// subSlice2.head shouldBe subSlice.head +// subSlice2.last shouldBe subSlice.head +// } +// +// "drop head elements" in { +// val slice = Slice(1, 2, 3, 4, 5) +// slice.size shouldBe 5 +// +// val newSlice = slice drop 2 +// newSlice.size shouldBe 3 +// newSlice.toList shouldBe Seq(3, 4, 5) +// +// val newSlice2 = newSlice.slice(1, 2).drop(1) +// newSlice2.toList should contain only 5 +// } +// +// "drop last elements" in { +// val slice = Slice(1, 2, 3, 4, 5) +// slice.size shouldBe 5 +// +// val newSlice = slice dropRight 2 +// newSlice.size shouldBe 3 +// newSlice.toList shouldBe Seq(1, 2, 3) +// +// val newSlice2 = newSlice.slice(1, 2).dropRight(1) +// newSlice2.toList should contain only 2 +// } +// +// "drop last elements when the Slice have only one element" in { +// val slice = Slice.fill(1)(randomByte()) +// slice.size shouldBe 1 +// +// val newSlice = slice dropRight 1 +// newSlice shouldBe empty +// } +// +// "take first and last elements" in { +// val slice = Slice.of[Byte](5).add(0).add(1).add(2).add(3).add(4) +// slice.size shouldBe 5 +// +// (slice take 2) should contain only(0, 1) +// (slice takeRight 2) should contain only(3, 4) +// +// (slice.slice(1, 3) take 2) should contain only(1, 2) +// (slice.slice(2, 4) takeRight 2) should contain only(3, 4) +// } +// +// "be splittable" in { +// val slice = Slice.fill(4)(randomByte()) +// +// val (head1, tail1) = slice.splitAt(0) +// head1.isEmpty shouldBe true +// tail1.size shouldBe 4 +// head1.underlyingArraySize shouldBe 0 +// tail1.underlyingArraySize shouldBe slice.size +// +// val (head2, tail2) = slice.splitAt(1) +// head2.size shouldBe 1 +// tail2.size shouldBe 3 +// head2.underlyingArraySize shouldBe slice.size +// tail2.underlyingArraySize shouldBe slice.size +// +// val (head3, tail3) = slice.splitAt(2) +// head3.size shouldBe 2 +// tail3.size shouldBe 2 +// head3.underlyingArraySize shouldBe slice.size +// tail3.underlyingArraySize shouldBe slice.size +// +// val (head4, tail4) = slice.splitAt(3) +// head4.size shouldBe 3 +// tail4.size shouldBe 1 +// head4.underlyingArraySize shouldBe slice.size +// tail4.underlyingArraySize shouldBe slice.size +// +// val (head5, tail5) = slice.splitAt(slice.size - 2) +// head5.size shouldBe 2 +// tail5.size shouldBe 2 +// head5.underlyingArraySize shouldBe slice.size +// tail5.underlyingArraySize shouldBe slice.size +// } +// +// "update original slice with moveWritePosition when splits are updated" in { +// val originalSlice = Slice.of[Int](2) +// val (split1, split2) = originalSlice.splitInnerArrayAt(1) +// split1.allocatedSize shouldBe 1 +// split2.size shouldBe 0 +// +// split1.add(100) +// split2.add(200) +// +// split1.size shouldBe 1 +// split2.size shouldBe 1 +// +// originalSlice.moveWritePosition(2) +// originalSlice should contain only(100, 200) +// originalSlice.toArray shouldBe Array(100, 200) +// } +// +// "group elements" in { +// val slice = Slice((1 to 100).toArray) +// +// //even equal slices +// val groupsOf5 = slice.grouped(5).toArray +// groupsOf5 should have size 5 +// groupsOf5.foreach(_.underlyingArraySize shouldBe slice.size) +// groupsOf5(0).toList shouldBe (1 to 20) +// groupsOf5(1).toList shouldBe (21 to 40) +// groupsOf5(2).toList shouldBe (41 to 60) +// groupsOf5(3).toList shouldBe (61 to 80) +// groupsOf5(4).toList shouldBe (81 to 100) +// +// //odd slices +// val groupsOf3 = slice.grouped(3).toArray +// groupsOf3 should have size 3 +// groupsOf3.foreach(_.underlyingArraySize shouldBe slice.size) +// groupsOf3(0).toList shouldBe (1 to 33) +// groupsOf3(1).toList shouldBe (34 to 66) +// groupsOf3(2).toList shouldBe (67 to 100) +// } +// } +// +// "A sub Slice" should { +// "be read in between it's offset positions and not from the original array" in { +// val slice = Slice.fill(5)(Random.nextInt()) +// val subSlice = slice.slice(2, 3) +// subSlice(0) shouldBe slice(2) +// subSlice(1) shouldBe slice(3) +// +// subSlice.map(int => int) should contain allOf(slice(2), slice(3)) +// } +// +// "should return head and last element in the sub slice" in { +// val slice = Slice.fill(5)(Random.nextInt()) +// val subSlice = slice.slice(2, 3) +// subSlice.head shouldBe slice(2) +// subSlice.last shouldBe slice(3) +// } +// } +// +// "A Byte Slice (Slice[Byte])" can { +// "write and read Integers" in { +// val slice = Slice.of[Byte](ByteSizeOf.int * 2) +// slice addInt Int.MaxValue +// slice addInt Int.MinValue +// +// val reader = slice.createReader() +// reader.readInt() shouldBe Int.MaxValue +// reader.readInt() shouldBe Int.MinValue +// } +// +// "write and read Long" in { +// val slice = Slice.of[Byte](ByteSizeOf.long * 2) +// slice addLong Long.MaxValue +// slice addLong Long.MinValue +// +// val reader = slice.createReader() +// reader.readLong() shouldBe Long.MaxValue +// reader.readLong() shouldBe Long.MinValue +// } +// +// "write and read Unsigned Integer" in { +// val slice = Slice.of[Byte](ByteSizeOf.int + 1) +// slice addUnsignedInt Int.MaxValue +// slice.createReader().readUnsignedInt() shouldBe Int.MaxValue +// } +// +// "write and read Unsigned Long" in { +// val slice = Slice.of[Byte](ByteSizeOf.long + 1) +// slice addUnsignedLong Long.MaxValue +// slice.createReader().readUnsignedLong() shouldBe Long.MaxValue +// } +// +// "write and read String" in { +// val slice = Slice.of[Byte](10000) +// slice addStringUTF8 "This is a string" +// slice.close().createReader().readRemainingAsString() shouldBe "This is a string" +// } +// +// "write and read remaining string String" in { +// val slice = Slice.of[Byte](10000) +// +// slice addInt 1 +// slice addLong 2L +// slice addUnsignedInt 3 +// slice addUnsignedLong 4L +// slice addSignedInt -3 +// slice addSignedLong -4L +// slice addStringUTF8 "This is a string" +// +// val reader = slice.close().createReader() +// reader.readInt() shouldBe 1 +// reader.readLong() shouldBe 2L +// reader.readUnsignedInt() shouldBe 3 +// reader.readUnsignedLong() shouldBe 4L +// reader.readSignedInt() shouldBe -3 +// reader.readSignedLong() shouldBe -4L +// reader.readRemainingAsString() shouldBe "This is a string" +// } +// +// "write and read String of specified size" in { +// val slice = Slice.of[Byte](10000) +// slice addStringUTF8 "This is a string" +// +// val reader = slice.close().createReader() +// reader.readString(8) shouldBe "This is " +// reader.readString(8) shouldBe "a string" +// } +// } +// +// "write multiple with addAll" in { +// Slice.of[Int](4) +// .add(1) +// .add(2) +// .addAll(Slice(3, 4)).toList shouldBe List(1, 2, 3, 4) +// } +// +// "addAll should fail if Slice does not have capacity" in { +// assertThrows[ArrayIndexOutOfBoundsException] { +// Slice.of[Int](3) +// .add(1) +// .add(2) +// .addAll(Slice(3, 4)) +// } +// } +// +// "None ++ Some(Slice[T](...))" in { +// val merged: Iterable[Slice[Int]] = Some(Slice[Int](1, 2, 3)) ++ None +// merged.flatten +// .toList should contain inOrderOnly(1, 2, 3) +// } +// +// "++ empty slices" in { +// val merged: Slice[Int] = Slice.empty[Int] ++ Slice.empty[Int] +// merged shouldBe empty +// merged.size shouldBe 0 +// merged.isEmpty shouldBe true +// merged.isFull shouldBe true +// } +// +// "++ empty and non empty slices" in { +// val merged: Slice[Int] = Slice.empty[Int] ++ Slice(1) +// merged should contain only 1 +// merged.size shouldBe 1 +// merged.isEmpty shouldBe false +// merged.isFull shouldBe true +// } +// +// "++ non empty and empty slices" in { +// val merged: Slice[Int] = Slice(1) ++ Slice.empty[Int] +// merged should contain only 1 +// merged.size shouldBe 1 +// merged.isEmpty shouldBe false +// merged.isFull shouldBe true +// } +// +// "++ non empty" in { +// val merged: Slice[Int] = Slice(1, 2, 3) ++ Slice(4, 5, 6) +// merged.isEmpty shouldBe false +// merged.isFull shouldBe true +// merged.toList should contain inOrderOnly(1, 2, 3, 4, 5, 6) +// } +// +// "reverse" should { +// "iterate in reverse" in { +// val slice = Slice(1, 2, 3, 4) +// slice.reverse.toList should contain inOrderOnly(4, 3, 2, 1) +// } +// +// "iterate of slices" in { +// val slice = Slice(1, 2, 3, 4, 5, 6) +// +// slice.take(2).reverse.toList should contain inOrderOnly(2, 1) +// slice.drop(2).take(2).reverse.toList should contain inOrderOnly(4, 3) +// slice.drop(4).take(2).reverse.toList should contain inOrderOnly(6, 5) +// slice.dropRight(2).reverse.toList should contain inOrderOnly(4, 3, 2, 1) +// slice.dropRight(0).reverse.toList should contain inOrderOnly(6, 5, 4, 3, 2, 1) +// +// slice.slice(0, 5).reverse.toList should contain inOrderOnly(6, 5, 4, 3, 2, 1) +// } +// +// "partially complete" in { +// val slice = Slice.of[Int](10) +// (1 to 6) foreach slice.add +// +// slice.reverse.toList should contain inOrderOnly(6, 5, 4, 3, 2, 1) +// val slice1 = slice.take(2) +// val slice2 = slice.drop(2).take(2) +// val slice3 = slice.drop(4).take(2) +// +// slice1.reverse.toList should contain inOrderOnly(2, 1) +// slice2.reverse.toList should contain inOrderOnly(4, 3) +// slice3.reverse.toList should contain inOrderOnly(6, 5) +// } +// +// "on empty" in { +// Slice.of[Int](10).reverse.toList shouldBe empty +// } +// } +// +// "minMax" should { +// val oneTwoInclusive = (Slice.writeInt[Byte](1), Slice.writeInt[Byte](2), true) +// val threeFourInclusive = (Slice.writeInt[Byte](3), Slice.writeInt[Byte](4), true) +// +// val oneTwoExclusive = (Slice.writeInt[Byte](1), Slice.writeInt[Byte](2), false) +// val threeFourExclusive = (Slice.writeInt[Byte](3), Slice.writeInt[Byte](4), false) +// +// "return one or the other on none" in { +// Slice.minMax(Some(oneTwoInclusive), None) should contain(oneTwoInclusive) +// Slice.minMax(None, Some(threeFourInclusive)) should contain(threeFourInclusive) +// +// Slice.minMax(Some(oneTwoExclusive), None) should contain(oneTwoExclusive) +// Slice.minMax(None, Some(threeFourExclusive)) should contain(threeFourExclusive) +// } +// +// "return none if nones" in { +// Slice.minMax(None, None) shouldBe empty +// } +// +// "return min and max" in { +// //1 - 1 +// //1 - 1 +// Slice.minMax( +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true)), +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true)) +// +// Slice.minMax( +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), false)), +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true)) +// +// Slice.minMax( +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true)), +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), false))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), true)) +// +// Slice.minMax( +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), false)), +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), false))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](1), false)) +// +// //1 - 5 +// // 3 - 10 +// Slice.minMax( +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), true)), +// Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), true))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), true)) +// +// Slice.minMax( +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), false)), +// Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), true))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), true)) +// +// Slice.minMax( +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), true)), +// Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), false))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), false)) +// +// Slice.minMax( +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), false)), +// Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), false))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), false)) +// +// // 3 - 10 +// //1 - 5 +// Slice.minMax( +// Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), true)), +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), true))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), true)) +// +// Slice.minMax( +// Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), false)), +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), true))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), false)) +// +// Slice.minMax( +// Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), true)), +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), false))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), true)) +// +// Slice.minMax( +// Some((Slice.writeInt[Byte](3), Slice.writeInt[Byte](10), false)), +// Some((Slice.writeInt[Byte](1), Slice.writeInt[Byte](3), false))) should contain((Slice.writeInt[Byte](1), Slice.writeInt[Byte](10), false)) +// } +// } +// +// "take from index" in { +// val slice = Slice(1, 2, 3, 4, 5, 6) +// slice.take(0, 0) shouldBe Slice.empty[Int] +// slice.take(0, 1) shouldBe Slice(1) +// slice.take(0, 2) shouldBe Slice(1, 2) +// slice.take(0, 3) shouldBe Slice(1, 2, 3) +// slice.take(0, 4) shouldBe Slice(1, 2, 3, 4) +// slice.take(0, 5) shouldBe Slice(1, 2, 3, 4, 5) +// slice.take(0, 6) shouldBe Slice(1, 2, 3, 4, 5, 6) +// slice.take(0, 7) shouldBe Slice(1, 2, 3, 4, 5, 6) +// +// val grouped = Slice(1, 2, 3, 4, 5, 6).groupedSlice(2) +// grouped should have size 2 +// +// //1, 2, 3 +// val slice1 = grouped(0) +// slice1.take(0, 0) shouldBe Slice.empty[Int] +// slice1.take(0, 1) shouldBe Slice(1) +// slice1.take(0, 2) shouldBe Slice(1, 2) +// slice1.take(0, 3) shouldBe Slice(1, 2, 3) +// slice1.take(0, 4) shouldBe Slice(1, 2, 3) +// +// //4, 5, 6 +// val slice2 = grouped(1) +// slice2.take(0, 0) shouldBe Slice.empty[Int] +// slice2.take(0, 1) shouldBe Slice(4) +// slice2.take(0, 2) shouldBe Slice(4, 5) +// slice2.take(0, 3) shouldBe Slice(4, 5, 6) +// slice2.take(0, 4) shouldBe Slice(4, 5, 6) +// } +// +// "manually adjusting slice random testing 1" in { +// val slice = Slice.of[Int](10) +// +// slice.moveWritePosition(3) +// +// slice.size shouldBe 3 +// slice add 4 +// slice(3) shouldBe 4 +// slice.size shouldBe 4 +// slice addAll Slice(5, 6, 7, 8, 9, 10) +// slice.size shouldBe 10 +// +// slice.head shouldBe 0 +// slice.last shouldBe 10 +// +// slice.moveWritePosition(0) +// slice.size shouldBe 10 +// +// slice.slice(0, 2).isFull shouldBe true +// slice.slice(2, 5).isFull shouldBe true +// slice.slice(5, 9).isFull shouldBe true +// slice.slice(0, 9).isFull shouldBe true +// slice.take(Int.MaxValue).isFull shouldBe true +// } +// +// "manually adjusting slice random testing 2" in { +// val slice = Slice.of[Int](10) +// +// slice.moveWritePosition(5) +// slice add 6 +// slice.size shouldBe 6 +// slice.moveWritePosition(0) +// slice add 1 +// slice.size shouldBe 6 +// slice add 2 +// slice add 3 +// slice add 4 +// slice add 5 +// slice.size shouldBe 6 +// +// slice.slice(5, 6).isEmpty shouldBe false +// slice.slice(5, 6).size shouldBe 1 +// slice.slice(5, 7).size shouldBe 1 +// slice.slice(5, 8).size shouldBe 1 +// slice.slice(5, 9).size shouldBe 1 +// +// slice.slice(6, 7).isEmpty shouldBe true +// slice.slice(7, 8).isEmpty shouldBe true +// slice.slice(9, 9).isEmpty shouldBe true +// } +// +// "manually adjusting slice random testing with addAll" in { +// val slice = Slice.of[Int](10) +// +// slice moveWritePosition 5 +// slice addAll Slice(1, 2, 3, 4) +// slice.size shouldBe 9 +// //move the same position and write again. Size should remain the same +// slice moveWritePosition 5 +// slice addAll Slice(1, 2, 3, 4) +// slice.size shouldBe 9 +// +// slice add 1 +// slice.size shouldBe 10 +// +// assertThrows[ArrayIndexOutOfBoundsException] { +// slice add 1 +// } +// slice.size shouldBe 10 +// +// slice.last shouldBe 1 +// slice moveWritePosition 9 +// slice add 2 +// slice.last shouldBe 2 +// slice.size shouldBe 10 +// } +// +// "closing an empty slice" in { +// val close0 = Slice.of(0).close() +// close0.size shouldBe 0 +// close0.size shouldBe 0 +// close0.fromOffset shouldBe 0 +// close0.toList shouldBe List.empty +// +// val close1 = Slice.of(1).close() +// close1.size shouldBe 0 +// close1.size shouldBe 0 +// close1.fromOffset shouldBe 0 +// close1.toList shouldBe List.empty +// } +// +// "moved a closed sub slice" in { +// val slice = Slice.of[Int](10) +// val subSlice = slice.slice(0, 4).close() +// +// //can only write to a subslice +// (5 to 20) foreach { +// i => +// assertThrows[ArrayIndexOutOfBoundsException] { +// subSlice.moveWritePosition(i) +// } +// } +// slice add 1 +// subSlice shouldBe empty +// slice should contain only 1 +// } +// +// "equals" in { +// val slice = Slice.fill(10)(1) +// slice == Slice.fill(10)(1) shouldBe true +// +// slice.dropHead() == slice shouldBe false +// slice.dropHead() == Slice.fill(9)(1) shouldBe true +// +// Slice.empty == Slice.empty shouldBe true +// } +// +// "toOptionCut" in { +// Slice.empty.cutToOption() shouldBe None +// Slice.empty[Slice[Byte]].cutToOption() shouldBe None +// Slice(1, 2, 3).take(0).cutToOption() shouldBe None +// Slice(1, 2, 3).drop(3).cutToOption() shouldBe None +// Slice(1, 2, 3).drop(1).cutToOption() shouldBe defined +// Slice(1, 2, 3).drop(1).drop(1).cutToOption() shouldBe defined +// Slice(1, 2, 3).drop(1).drop(1).drop(1).cutToOption() shouldBe None +// } +// +// "toOption" in { +// Slice.emptyBytes.toOption shouldBe empty +// Slice(1, 2, 3).toOption shouldBe Some(Slice(1, 2, 3)) +// +// val slice = Slice(1, 2, 3) +// val slice1 = slice.take(1).toOption.get +// slice1 should have size 1 +// slice1 shouldBe Slice(1) +// slice1.underlyingArraySize shouldBe 3 +// } +// +// "indexOf" when { +// +// "empty" in { +// Slice.emptyBytes.indexOf(0) shouldBe empty +// Slice.emptyBytes.indexOf(1) shouldBe empty +// } +// +// "single" in { +// val bytes = Slice(1) +// +// bytes.indexOf(0) shouldBe empty +// bytes.indexOf(1) shouldBe Some(0) +// } +// +// "many" in { +// val bytes = Slice(1, 2, 3, 4, 5) +// +// bytes.indexOf(0) shouldBe empty +// bytes.indexOf(1) shouldBe Some(0) +// bytes.indexOf(2) shouldBe Some(1) +// bytes.indexOf(3) shouldBe Some(2) +// bytes.indexOf(4) shouldBe Some(3) +// bytes.indexOf(5) shouldBe Some(4) +// bytes.indexOf(6) shouldBe empty +// } +// } +// +// "dropTo" when { +// "empty" in { +// Slice.emptyBytes.dropTo(1) shouldBe empty +// Slice.emptyBytes.dropTo(Byte.MaxValue) shouldBe empty +// Slice.emptyBytes.dropTo(Byte.MinValue) shouldBe empty +// } +// +// "single" in { +// val bytes = Slice(1) +// +// bytes.dropTo(1).value shouldBe empty +// bytes.dropTo(2) shouldBe empty +// } +// +// "many" in { +// val bytes = Slice(1, 2, 3, 4, 5) +// +// bytes.dropTo(0) shouldBe empty +// bytes.dropTo(1).value shouldBe Slice(2, 3, 4, 5) +// bytes.dropTo(2).value shouldBe Slice(3, 4, 5) +// bytes.dropTo(3).value shouldBe Slice(4, 5) +// bytes.dropTo(4).value shouldBe Slice(5) +// bytes.dropTo(5).value shouldBe empty +// bytes.dropTo(6) shouldBe empty +// } +// } +// +// "dropUntil" when { +// "empty" in { +// Slice.emptyBytes.dropUntil(1) shouldBe empty +// Slice.emptyBytes.dropUntil(Byte.MaxValue) shouldBe empty +// Slice.emptyBytes.dropUntil(Byte.MinValue) shouldBe empty +// } +// +// "single" in { +// val bytes = Slice(1) +// +// bytes.dropUntil(1).value shouldBe bytes +// bytes.dropUntil(2) shouldBe empty +// } +// +// "many" in { +// val bytes = Slice(1, 2, 3, 4, 5) +// +// bytes.dropUntil(0) shouldBe empty +// bytes.dropUntil(1).value shouldBe Slice(1, 2, 3, 4, 5) +// bytes.dropUntil(2).value shouldBe Slice(2, 3, 4, 5) +// bytes.dropUntil(3).value shouldBe Slice(3, 4, 5) +// bytes.dropUntil(4).value shouldBe Slice(4, 5) +// bytes.dropUntil(5).value shouldBe Slice(5) +// bytes.dropUntil(6) shouldBe empty +// } +// } +// +// "hashCode" should { +// "be same for partially and fully written slice" in { +// val partiallyWritten = Slice.of[Int](100) +// partiallyWritten.add(1) +// partiallyWritten.add(2) +// partiallyWritten.add(3) +// partiallyWritten.add(4) +// partiallyWritten.add(5) +// +// val bytes = +// Seq( +// Slice(1, 2, 3, 4, 5), +// partiallyWritten +// ) +// +// partiallyWritten.underlyingArraySize shouldBe 100 +// +// bytes foreach { +// bytes => +// bytes.hashCode() shouldBe bytes.## +// bytes.drop(1).hashCode() shouldBe Slice(2, 3, 4, 5).## +// bytes.drop(2).hashCode() shouldBe Slice(3, 4, 5).## +// bytes.drop(3).hashCode() shouldBe Slice(4, 5).## +// bytes.drop(4).hashCode() shouldBe Slice(5).## +// bytes.drop(5).hashCode() shouldBe Slice[Int]().## +// +// bytes.dropRight(1).hashCode() shouldBe Slice(1, 2, 3, 4).## +// bytes.dropRight(2).hashCode() shouldBe Slice(1, 2, 3).## +// bytes.dropRight(3).hashCode() shouldBe Slice(1, 2).## +// bytes.dropRight(4).hashCode() shouldBe Slice(1).## +// bytes.dropRight(5).hashCode() shouldBe Slice[Int]().## +// } +// } +// } +// +// "head and last" when { +// "empty" in { +// val slice = Slice.empty[Int] +// slice.headOrNull.asInstanceOf[Integer] shouldBe null +// slice.lastOrNull.asInstanceOf[Integer] shouldBe null +// slice.headOption shouldBe empty +// slice.lastOption shouldBe empty +// } +// } +// +// "existsFor" in { +// val slice = Slice.range(1, 100) +// +// //[] +// slice.existsFor(0, _ => fail("should not have run")) shouldBe false +// slice.existsFor(-1, _ => fail("should not have run")) shouldBe false +// slice.existsFor(Int.MinValue, _ => fail("should not have run")) shouldBe false +// +// slice.existsFor(1, _ == 1) shouldBe true +// slice.existsFor(9, _ % 10 == 0) shouldBe false +// slice.existsFor(10, _ % 10 == 0) shouldBe true +// slice.existsFor(20, _ == 20) shouldBe true +// } +// +// "range of ints" in { +// val range = Slice.range(1, 10) +// range.underlyingArraySize shouldBe 10 +// range.toList shouldBe (1 to 10) +// } +// +// "range of bytes" in { +// val range = Slice.range(1.toByte, 10.toByte) +// range.underlyingArraySize shouldBe 10 +// range.toList shouldBe (1 to 10) +// } +// +// "closeWritten" when { +// "empty" in { +// val slice = Slice.empty[Int] +// val (left, right) = slice.splitUnwritten() +// +// left.isEmpty shouldBe true +// left.underlyingArraySize shouldBe 0 +// assertThrows[ArrayIndexOutOfBoundsException](left.asMut() add 11) +// +// right.isEmpty shouldBe true +// right.underlyingArraySize shouldBe 0 +// assertThrows[ArrayIndexOutOfBoundsException](right.asMut() add 11) +// } +// +// "return empty for unwritten bytes" in { +// val slice = Slice.of[Int](10) +// val (left, right) = slice.splitUnwritten() +// +// left.isEmpty shouldBe true +// left.underlyingArraySize shouldBe 0 +// assertThrows[ArrayIndexOutOfBoundsException](left add 11) +// +// right.isEmpty shouldBe true +// right.fromOffset shouldBe 0 +// right.underlyingArraySize shouldBe 10 +// right add 1 +// right should contain only 1 +// +// val (written, unwritten) = right.splitUnwritten() +// written should contain only 1 +// unwritten.underlyingArraySize shouldBe 10 +// unwritten.currentWritePosition shouldBe 1 +// unwritten add 2 +// unwritten add 3 +// unwritten should contain only(2, 3) +// } +// +// "close written bytes" in { +// val slice = Slice.of[Int](10) +// +// (1 to 5) foreach slice.add +// +// val (written, unwritten) = slice.splitUnwritten() +// +// written.size shouldBe 5 +// written should contain allElementsOf (1 to 5) +// unwritten.isEmpty shouldBe true +// unwritten.underlyingArraySize shouldBe 10 +// unwritten.currentWritePosition shouldBe 5 +// unwritten add 6 +// unwritten add 7 +// unwritten should contain only(6, 7) +// +// val (written2, unwritten2) = unwritten.splitUnwritten() +// written2 should contain only(6, 7) +// unwritten2.underlyingArraySize shouldBe 10 +// unwritten2.currentWritePosition shouldBe 7 +// unwritten2 add 8 +// unwritten2 add 9 +// unwritten2 should contain only(8, 9) +// +// val (written3, unwritten4) = unwritten2.splitUnwritten() +// written3 should contain only(8, 9) +// unwritten4.underlyingArraySize shouldBe 10 +// unwritten4.currentWritePosition shouldBe 9 +// unwritten4 add 10 +// unwritten4 should contain only 10 +// +// val (written4, unwritten5) = unwritten4.splitUnwritten() +// written4 should contain only 10 +// unwritten5.underlyingArraySize shouldBe 0 +// assertThrows[ArrayIndexOutOfBoundsException] { +// unwritten5 add 11 +// } +// } +// } +// +// "flatMap" when { +// "size = 0" in { +// Slice +// .empty[Int] +// .flatMap { +// int => +// fail("should have not executed") +// } shouldBe empty +// } +// +// "size = 1" in { +// Slice(1) +// .flatMapToSliceSlow { +// int => +// Slice(int, 2, 3, 4) +// } shouldBe Slice(1, 2, 3, 4) +// +// Slice(1) +// .flatMap { +// int => +// List(int, 2, 3, 4) +// } shouldBe Iterable(1, 2, 3, 4) +// } +// +// "size = 2" in { +// Slice(1, 2) +// .flatMapToSliceSlow { +// int => +// Slice(int, (int + "" + int).toInt) +// } shouldBe Slice(1, 11, 2, 22) +// +// Slice(1, 2) +// .flatMap { +// int => +// List(int, (int + "" + int).toInt) +// } shouldBe Iterable(1, 11, 2, 22) +// } +// +// "iterable" in { +// runThis(20.times, log = true) { +// val start = Slice.range(1, Random.nextInt(5)) +// val flatten = Slice.range(1, Random.nextInt(5)) +// +// val expected = +// (1 to start.size) +// .flatMap { +// _ => +// flatten +// } +// .toList +// +// (start: Iterable[Int]) +// .flatMap { +// int => +// flatten.iterator +// }.toList shouldBe expected +// } +// } +// } +// +// "flatten" when { +// "size = 0" in { +// Slice.empty[Slice[Int]].flatten shouldBe empty +// assertDoesNotCompile("Slice.empty[Iterable[Int]].flattenSlice shouldBe empty") +// } +// +// "size = 1" in { +// Slice(Slice(1)).flatten shouldBe Slice(1) +// Slice(Slice(1, 2, 3)).flatten shouldBe Slice(1, 2, 3) +// } +// +// "size = 2" in { +// Slice(Slice(1, 2), Slice(3, 4)).flatten shouldBe Slice(1, 2, 3, 4) +// } +// } +// +// +// "write and read" when { +// +// "signedInt" in { +// Seq(Int.MinValue, Int.MaxValue, 0, 1, 100, Byte.MinValue, Byte.MaxValue, 100000) foreach { +// i => +// val bytes = Slice.writeSignedInt[java.lang.Byte](i) +// bytes.isFull shouldBe true +// bytes.readSignedInt[java.lang.Byte]() shouldBe i +// } +// } +// +// "signedLong" in { +// Seq(Long.MinValue, Long.MaxValue, 0, 1, 100, Byte.MinValue, Byte.MaxValue, 100000) foreach { +// i => +// val bytes = Slice.writeSignedLong[java.lang.Byte](i) +// bytes.isFull shouldBe true +// bytes.readSignedLong[java.lang.Byte]() shouldBe i +// } +// } +// } +// +// "updateBinarySearchCopy" when { +// "empty" in { +// val slice = Slice.empty[Int] +// assertThrows[Exception] { +// slice.updateBinarySearchCopy(2, 3) +// } +// } +// +// "item does not exist" in { +// runThis(50.times) { +// val slice = Slice.range(1, Random.nextInt(10)) +// assertThrows[Exception] { +// slice.updateBinarySearchCopy(11, 3) +// } +// } +// } +// +// "update head" in { +// Slice.range(1, 10).updateBinarySearchCopy(1, 2).head shouldBe 2 +// } +// +// "update last" in { +// Slice.range(1, 10).updateBinarySearchCopy(10, 2).last shouldBe 2 +// } +// +// "update mid" in { +// val slice = Slice.range(0, 10) +// slice foreach { +// item => +// slice.updateBinarySearchCopy(item, Int.MaxValue).get(item) shouldBe Int.MaxValue +// } +// } +// } +// +// "replaceHeadCopy" when { +// "empty" in { +// val slice = Slice.empty[Int] +// assertThrows[Exception] { +// slice.replaceHeadCopy(3) +// } +// } +// +// "size = 1" in { +// val replaced = Slice(1).replaceHeadCopy(Int.MaxValue) +// replaced.head shouldBe Int.MaxValue +// replaced.dropHead() shouldBe empty +// } +// +// "size = 10" in { +// val replaced = Slice.range(1, 10).replaceHeadCopy(Int.MaxValue) +// replaced.head shouldBe Int.MaxValue +// replaced.dropHead() shouldBe Slice.range(2, 10) +// } +// } +// +// "replaceLastCopy" when { +// "empty" in { +// val slice = Slice.empty[Int] +// assertThrows[Exception] { +// slice.replaceLastCopy(3) +// } +// } +// +// "size = 1" in { +// val replaced = Slice(1).replaceLastCopy(Int.MaxValue) +// replaced.head shouldBe Int.MaxValue +// replaced.last shouldBe Int.MaxValue +// replaced.dropHead() shouldBe empty +// replaced shouldBe Slice(Int.MaxValue) +// } +// +// "size = 10" in { +// val replaced = Slice.range(1, 10).replaceLastCopy(Int.MaxValue) +// replaced.last shouldBe Int.MaxValue +// replaced.dropRight(1) shouldBe Slice.range(1, 9) +// } +// +// "on subslice" in { +// val replaced = Slice.range(1, 10).drop(1).dropRight(1).replaceLastCopy(Int.MaxValue) +// replaced.last shouldBe Int.MaxValue +// replaced shouldBe Slice(2, 3, 4, 5, 6, 7, 8, Int.MaxValue) +// } +// } +// +// "sequence" should { +// implicit val ec: ExecutionContext = +// scala.concurrent.ExecutionContext.Implicits.global +// +// "succeed" when { +// +// "empty" in { +// val seq = Seq.empty[Future[Int]] +// Slice.sequence(seq).await shouldBe empty +// } +// +// "size = 1" in { +// val seq = Seq(Future.successful(1)) +// Slice.sequence(seq).await should contain only 1 +// } +// +// "size = many" in { +// val seq = Slice.range(1, 10).map(Future.successful) +// Slice.sequence(seq).await shouldBe Slice.range(1, 10) +// } +// } +// +// "fail" when { +// "size = 1" in { +// val seq = Seq(Future.failed(new Exception("failed"))) +// Slice.sequence(seq).awaitFailureInf.getMessage shouldBe "failed" +// } +// +// "size = many" in { +// val range = Seq.range(0, 10) +// +// range foreach { +// failAtIndex => //fail at every index +// val seq = //run on all range indexes and fail only at failAtIndex +// range map { +// index => +// if (index == failAtIndex) +// Future.failed(new Exception("failed")) +// else +// Future.successful(index) +// } +// +// Slice.sequence(seq).awaitFailureInf.getMessage shouldBe "failed" +// } +// } +// } +// } +// +// "collectToSlice" when { +// "empty - no head" in { +// val collection: Slice[Byte] = +// Slice.empty[Byte] collectToSlice { +// case byte => byte +// } +// +// collection shouldBe empty +// } +// +// "empty - head" in { +// val collection: Slice[Byte] = +// Slice.empty[Byte].collectToSlice(1.toByte) { +// case byte => byte +// } +// +// collection should contain only 1 +// } +// +// "no head" in { +// val slice = Slice.range(1, 10) +// +// val collection: Slice[Int] = +// slice collectToSlice { +// case int if int % 2 == 0 => +// int +// } +// +// collection shouldBe Slice(2, 4, 6, 8, 10) +// collection.size shouldBe 5 +// } +// +// "head" in { +// val slice = Slice.range(1, 10) +// +// val collection: Slice[Int] = +// slice.collectToSlice(1) { +// case int if int % 2 == 0 => +// int +// } +// +// collection shouldBe Slice(1, 2, 4, 6, 8, 10) +// collection.size shouldBe 6 +// } +// } +// +// "split" when { +// "slice is empty" in { +// Slice.empty[Int].split(10) shouldBe empty +// } +// +// "blockSize is <= 0" in { +// assertThrows[IllegalArgumentException] { +// Slice(1, 2, 3).split(0) +// } +// +// assertThrows[IllegalArgumentException] { +// Slice(1, 2, 3).split(-1) +// } +// } +// +// "blockSize < slice.size" in { +// val slice: Slice[Int] = Slice((1 to 100).toArray) +// //even equal slices +// val splits = slice.split(10) +// splits should have size 10 +// +// splits.zipWithIndex foreach { +// case (split, index) => +// split shouldBe slice.drop(index * 10).take(10) +// split.underlyingArraySize shouldBe 10 +// } +// +// Slice(splits).flatten shouldBe slice +// } +// +// "blockSize >= slice.size" when { +// def runTest(slice: Slice[Int], blockSize: Int): Unit = { +// //even equal slices +// val splits = slice.split(blockSize) +// splits should have size 1 +// splits.head shouldBe slice +// } +// +// val slice: Slice[Int] = Slice((1 to 100).toArray) +// +// "blockSize == slice.slice" in { +// runTest(slice, slice.size) +// } +// +// "blockSize > slice.slice" in { +// runTest(slice, slice.size + 1) +// //-1 should not result in 1 slice +// assertThrows[Exception](runTest(slice, slice.size - 1)) +// } +// } +// } +//} diff --git a/data/src/test/scala/swaydb/data/slice/SlicesSpec.scala b/slice/src/test/scala/swaydb/slice/SlicesSpec.scala similarity index 99% rename from data/src/test/scala/swaydb/data/slice/SlicesSpec.scala rename to slice/src/test/scala/swaydb/slice/SlicesSpec.scala index f9892b32e..d63cd6a18 100644 --- a/data/src/test/scala/swaydb/data/slice/SlicesSpec.scala +++ b/slice/src/test/scala/swaydb/slice/SlicesSpec.scala @@ -1,4 +1,4 @@ -package swaydb.data.slice +package swaydb.slice import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/swaydb-java/src/main/scala/swaydb/java/KeyComparator.scala b/swaydb-java/src/main/scala/swaydb/java/KeyComparator.scala index 587e4b40e..b9798ba61 100644 --- a/swaydb-java/src/main/scala/swaydb/java/KeyComparator.scala +++ b/swaydb-java/src/main/scala/swaydb/java/KeyComparator.scala @@ -17,7 +17,7 @@ package swaydb.java import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.utils.Java.JavaFunction import java.util.Comparator diff --git a/swaydb-java/src/main/scala/swaydb/java/KeyOrderConverter.scala b/swaydb-java/src/main/scala/swaydb/java/KeyOrderConverter.scala index 9ecc7fd37..2bfc28a70 100644 --- a/swaydb-java/src/main/scala/swaydb/java/KeyOrderConverter.scala +++ b/swaydb-java/src/main/scala/swaydb/java/KeyOrderConverter.scala @@ -17,7 +17,7 @@ package swaydb.java import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Serializer protected object KeyOrderConverter { diff --git a/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentMap.scala b/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentMap.scala index 8df4346b8..bb5bf5227 100644 --- a/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentMap.scala @@ -22,7 +22,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.CompactionConfig import swaydb.data.config._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.eventually.persistent.DefaultConfigs diff --git a/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentMultiMap.scala b/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentMultiMap.scala index c262d38c8..bbd3cf8c5 100644 --- a/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentMultiMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentMultiMap.scala @@ -22,7 +22,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.CompactionConfig import swaydb.data.config._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.eventually.persistent.DefaultConfigs diff --git a/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentQueue.scala b/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentQueue.scala index f4f8ab064..82bf4f4b6 100644 --- a/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentQueue.scala +++ b/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentQueue.scala @@ -20,7 +20,7 @@ import swaydb.configs.level.DefaultExecutionContext import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.CompactionConfig import swaydb.data.config._ -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, OptimiseWrites} import swaydb.effect.Dir import swaydb.eventually.persistent.DefaultConfigs diff --git a/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentSet.scala b/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentSet.scala index 50386fdf0..479e83f05 100644 --- a/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentSet.scala +++ b/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentSet.scala @@ -22,7 +22,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.CompactionConfig import swaydb.data.config._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.eventually.persistent.DefaultConfigs diff --git a/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentSetMap.scala b/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentSetMap.scala index 73affb148..69a1f43b1 100644 --- a/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentSetMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/eventually/persistent/EventuallyPersistentSetMap.scala @@ -22,7 +22,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.CompactionConfig import swaydb.data.config._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, OptimiseWrites} import swaydb.effect.Dir import swaydb.eventually.persistent.DefaultConfigs diff --git a/swaydb-java/src/main/scala/swaydb/java/memory/MemoryMap.scala b/swaydb-java/src/main/scala/swaydb/java/memory/MemoryMap.scala index 319794dbb..43fa06a14 100644 --- a/swaydb-java/src/main/scala/swaydb/java/memory/MemoryMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/memory/MemoryMap.scala @@ -22,7 +22,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, LevelZeroThrottle} import swaydb.data.config.{FileCache, ThreadStateCache} import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, Functions, OptimiseWrites} import swaydb.java.serializers.{SerializerConverter, Serializer => JavaSerializer} import swaydb.java.{KeyComparator, KeyOrderConverter} diff --git a/swaydb-java/src/main/scala/swaydb/java/memory/MemoryMultiMap.scala b/swaydb-java/src/main/scala/swaydb/java/memory/MemoryMultiMap.scala index 99a63788a..3b643be46 100644 --- a/swaydb-java/src/main/scala/swaydb/java/memory/MemoryMultiMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/memory/MemoryMultiMap.scala @@ -22,7 +22,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, LevelZeroThrottle} import swaydb.data.config.{FileCache, ThreadStateCache} import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, Functions, OptimiseWrites} import swaydb.java.serializers.{SerializerConverter, Serializer => JavaSerializer} import swaydb.java.{KeyComparator, KeyOrderConverter, MultiMap} diff --git a/swaydb-java/src/main/scala/swaydb/java/memory/MemorySet.scala b/swaydb-java/src/main/scala/swaydb/java/memory/MemorySet.scala index 383c3fe42..79af9a66c 100644 --- a/swaydb-java/src/main/scala/swaydb/java/memory/MemorySet.scala +++ b/swaydb-java/src/main/scala/swaydb/java/memory/MemorySet.scala @@ -22,7 +22,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, LevelZeroThrottle} import swaydb.data.config.{FileCache, ThreadStateCache} import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, Functions, OptimiseWrites} import swaydb.java._ import swaydb.java.serializers.{SerializerConverter, Serializer => JavaSerializer} diff --git a/swaydb-java/src/main/scala/swaydb/java/memory/MemorySetMap.scala b/swaydb-java/src/main/scala/swaydb/java/memory/MemorySetMap.scala index 045005866..3251aa2c8 100644 --- a/swaydb-java/src/main/scala/swaydb/java/memory/MemorySetMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/memory/MemorySetMap.scala @@ -22,7 +22,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, LevelZeroThrottle} import swaydb.data.config.{FileCache, ThreadStateCache} import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, OptimiseWrites} import swaydb.java._ import swaydb.java.serializers.{SerializerConverter, Serializer => JavaSerializer} diff --git a/swaydb-java/src/main/scala/swaydb/java/multimap/MultiPrepareBuilder.scala b/swaydb-java/src/main/scala/swaydb/java/multimap/MultiPrepareBuilder.scala index 0bf137642..dc947d552 100644 --- a/swaydb-java/src/main/scala/swaydb/java/multimap/MultiPrepareBuilder.scala +++ b/swaydb-java/src/main/scala/swaydb/java/multimap/MultiPrepareBuilder.scala @@ -16,9 +16,10 @@ package swaydb.java.multimap +import swaydb.Prepare import swaydb.java.MultiMap import swaydb.multimap.MultiPrepare -import swaydb.{Aggregator, Prepare} +import swaydb.utils.Aggregator import java.util import java.util.stream.Stream diff --git a/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentMap.scala b/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentMap.scala index 08b6d0bc4..adf60ca15 100644 --- a/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentMap.scala @@ -22,7 +22,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, LevelZeroThrottle} import swaydb.data.config._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.java.serializers.{SerializerConverter, Serializer => JavaSerializer} diff --git a/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentMultiMap.scala b/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentMultiMap.scala index 8c32722c4..767fdd205 100644 --- a/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentMultiMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentMultiMap.scala @@ -22,7 +22,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, LevelZeroThrottle} import swaydb.data.config._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.java.serializers.{SerializerConverter, Serializer => JavaSerializer} diff --git a/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentSet.scala b/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentSet.scala index 5637cedfa..855e39f89 100644 --- a/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentSet.scala +++ b/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentSet.scala @@ -22,7 +22,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, LevelZeroThrottle} import swaydb.data.config._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.java._ diff --git a/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentSetMap.scala b/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentSetMap.scala index e6c9f6ffd..586d47d42 100644 --- a/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentSetMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentSetMap.scala @@ -22,7 +22,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, LevelZeroThrottle} import swaydb.data.config._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, OptimiseWrites} import swaydb.effect.Dir import swaydb.java._ diff --git a/swaydb-java/src/main/scala/swaydb/java/serializers/Default.scala b/swaydb-java/src/main/scala/swaydb/java/serializers/Default.scala index 8ddf0a8df..c7417edbb 100644 --- a/swaydb-java/src/main/scala/swaydb/java/serializers/Default.scala +++ b/swaydb-java/src/main/scala/swaydb/java/serializers/Default.scala @@ -16,7 +16,7 @@ package swaydb.java.serializers -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import java.nio.charset.StandardCharsets diff --git a/swaydb-java/src/main/scala/swaydb/java/serializers/Serializer.scala b/swaydb-java/src/main/scala/swaydb/java/serializers/Serializer.scala index 2c845d302..966ff0b4e 100644 --- a/swaydb-java/src/main/scala/swaydb/java/serializers/Serializer.scala +++ b/swaydb-java/src/main/scala/swaydb/java/serializers/Serializer.scala @@ -16,7 +16,7 @@ package swaydb.java.serializers -import swaydb.data.slice.Slice +import swaydb.slice.Slice trait Serializer[T] { diff --git a/swaydb-java/src/main/scala/swaydb/java/serializers/SerializerConverter.scala b/swaydb-java/src/main/scala/swaydb/java/serializers/SerializerConverter.scala index 9bdaf6ce1..6ecb13145 100644 --- a/swaydb-java/src/main/scala/swaydb/java/serializers/SerializerConverter.scala +++ b/swaydb-java/src/main/scala/swaydb/java/serializers/SerializerConverter.scala @@ -16,7 +16,7 @@ package swaydb.java.serializers -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.java.serializers.{Serializer => JavaSerializer} import swaydb.serializers.{Serializer => ScalaSerializer} diff --git a/swaydb-java/src/test/java/swaydb/java/MapFunctionsOffTest.java b/swaydb-java/src/test/java/swaydb/java/MapFunctionsOffTest.java index 54bd26a1b..22080daca 100644 --- a/swaydb-java/src/test/java/swaydb/java/MapFunctionsOffTest.java +++ b/swaydb-java/src/test/java/swaydb/java/MapFunctionsOffTest.java @@ -25,8 +25,8 @@ import swaydb.Pair; import swaydb.Prepare; import swaydb.data.java.TestBase; -import swaydb.data.slice.Slice; -import swaydb.data.utils.ByteOps; +import swaydb.slice.Slice; +import swaydb.slice.utils.ByteOps; import swaydb.java.serializers.Serializer; import java.io.IOException; diff --git a/swaydb-java/src/test/java/swaydb/java/slice/SliceTest.java b/swaydb-java/src/test/java/swaydb/java/slice/SliceTest.java index 91ef6b6cf..db6997e5b 100644 --- a/swaydb-java/src/test/java/swaydb/java/slice/SliceTest.java +++ b/swaydb-java/src/test/java/swaydb/java/slice/SliceTest.java @@ -19,9 +19,9 @@ import org.junit.jupiter.api.Test; import scala.Int; import scala.reflect.ClassTag; -import swaydb.data.slice.Slice; -import swaydb.data.slice.SliceReader; -import swaydb.data.utils.ByteOps; +import swaydb.slice.Slice; +import swaydb.slice.SliceReader; +import swaydb.slice.utils.ByteOps; import java.util.ArrayList; import java.util.Arrays; diff --git a/swaydb-java/src/test/java/swaydb/java/table/domain/table/key/KeySerializer.java b/swaydb-java/src/test/java/swaydb/java/table/domain/table/key/KeySerializer.java index 72428d3d9..f72d898d7 100644 --- a/swaydb-java/src/test/java/swaydb/java/table/domain/table/key/KeySerializer.java +++ b/swaydb-java/src/test/java/swaydb/java/table/domain/table/key/KeySerializer.java @@ -16,9 +16,9 @@ package swaydb.java.table.domain.table.key; -import swaydb.data.slice.Slice; -import swaydb.data.slice.SliceReader; -import swaydb.data.utils.ByteOps; +import swaydb.slice.Slice; +import swaydb.slice.SliceReader; +import swaydb.slice.utils.ByteOps; import swaydb.java.serializers.Serializer; public class KeySerializer implements Serializer { diff --git a/swaydb-java/src/test/java/swaydb/java/table/domain/table/mapKey/MapKeySerializer.java b/swaydb-java/src/test/java/swaydb/java/table/domain/table/mapKey/MapKeySerializer.java index cef14e2c9..649316837 100644 --- a/swaydb-java/src/test/java/swaydb/java/table/domain/table/mapKey/MapKeySerializer.java +++ b/swaydb-java/src/test/java/swaydb/java/table/domain/table/mapKey/MapKeySerializer.java @@ -16,7 +16,7 @@ package swaydb.java.table.domain.table.mapKey; -import swaydb.data.slice.Slice; +import swaydb.slice.Slice; import swaydb.java.serializers.Serializer; /** diff --git a/swaydb-java/src/test/java/swaydb/java/table/domain/table/value/ValueSerializer.java b/swaydb-java/src/test/java/swaydb/java/table/domain/table/value/ValueSerializer.java index 875eb240f..4926c186d 100644 --- a/swaydb-java/src/test/java/swaydb/java/table/domain/table/value/ValueSerializer.java +++ b/swaydb-java/src/test/java/swaydb/java/table/domain/table/value/ValueSerializer.java @@ -16,9 +16,9 @@ package swaydb.java.table.domain.table.value; -import swaydb.data.slice.Slice; -import swaydb.data.slice.SliceReader; -import swaydb.data.utils.ByteOps; +import swaydb.slice.Slice; +import swaydb.slice.SliceReader; +import swaydb.slice.utils.ByteOps; import swaydb.java.serializers.Serializer; public class ValueSerializer implements Serializer { diff --git a/swaydb-stress/src/test/scala/swaydb/stress/simulation/Domain.scala b/swaydb-stress/src/test/scala/swaydb/stress/simulation/Domain.scala index 05d44f0d3..7126711fd 100644 --- a/swaydb-stress/src/test/scala/swaydb/stress/simulation/Domain.scala +++ b/swaydb-stress/src/test/scala/swaydb/stress/simulation/Domain.scala @@ -16,7 +16,7 @@ package swaydb.stress.simulation -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Serializer sealed trait Domain diff --git a/swaydb-stress/src/test/scala/swaydb/stress/simulation/SimulationSpec.scala b/swaydb-stress/src/test/scala/swaydb/stress/simulation/SimulationSpec.scala index 9687eecfe..887d3b54b 100644 --- a/swaydb-stress/src/test/scala/swaydb/stress/simulation/SimulationSpec.scala +++ b/swaydb-stress/src/test/scala/swaydb/stress/simulation/SimulationSpec.scala @@ -24,7 +24,7 @@ import swaydb.api.TestBaseEmbedded import swaydb.core.TestCaseSweeper import swaydb.core.TestData._ import swaydb.data.Functions -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.function.FunctionConverter import swaydb.serializers.Default._ import swaydb.stress.simulation.Domain._ diff --git a/swaydb/src/main/scala/swaydb/KeyOrderConverter.scala b/swaydb/src/main/scala/swaydb/KeyOrderConverter.scala index 51f29ec93..d20eac879 100644 --- a/swaydb/src/main/scala/swaydb/KeyOrderConverter.scala +++ b/swaydb/src/main/scala/swaydb/KeyOrderConverter.scala @@ -18,7 +18,7 @@ package swaydb import swaydb.core.util.Eithers import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Serializer protected object KeyOrderConverter { diff --git a/swaydb/src/main/scala/swaydb/Map.scala b/swaydb/src/main/scala/swaydb/Map.scala index 83863923d..cd059daa0 100644 --- a/swaydb/src/main/scala/swaydb/Map.scala +++ b/swaydb/src/main/scala/swaydb/Map.scala @@ -21,7 +21,7 @@ import swaydb.core.Core import swaydb.core.segment.ref.search.ThreadReadState import swaydb.data.accelerate.LevelZeroMeter import swaydb.data.compaction.LevelMeter -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.serializers._ import swaydb.stream.{From, SourceFree} import swaydb.utils.TupleOrNone diff --git a/swaydb/src/main/scala/swaydb/MultiMap.scala b/swaydb/src/main/scala/swaydb/MultiMap.scala index 2e3b2fa5a..f26012409 100644 --- a/swaydb/src/main/scala/swaydb/MultiMap.scala +++ b/swaydb/src/main/scala/swaydb/MultiMap.scala @@ -22,7 +22,7 @@ import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.util.Times._ import swaydb.data.accelerate.LevelZeroMeter import swaydb.data.compaction.LevelMeter -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.multimap.{MultiKey, MultiPrepare, MultiValue, Schema} import swaydb.serializers.{Serializer, _} import swaydb.stream.{From, SourceFree, StreamFree} diff --git a/swaydb/src/main/scala/swaydb/PrepareImplicits.scala b/swaydb/src/main/scala/swaydb/PrepareImplicits.scala index 88cdf358b..99dd51045 100644 --- a/swaydb/src/main/scala/swaydb/PrepareImplicits.scala +++ b/swaydb/src/main/scala/swaydb/PrepareImplicits.scala @@ -16,7 +16,7 @@ package swaydb -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.serializers._ import scala.collection.compat.IterableOnce diff --git a/swaydb/src/main/scala/swaydb/Queue.scala b/swaydb/src/main/scala/swaydb/Queue.scala index b1517b729..e43d9320c 100644 --- a/swaydb/src/main/scala/swaydb/Queue.scala +++ b/swaydb/src/main/scala/swaydb/Queue.scala @@ -21,7 +21,7 @@ import swaydb.core.util.Bytes import swaydb.data.accelerate.LevelZeroMeter import swaydb.data.compaction.LevelMeter import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Serializer import swaydb.stream.StreamFree diff --git a/swaydb/src/main/scala/swaydb/Set.scala b/swaydb/src/main/scala/swaydb/Set.scala index 9ba5f3bc6..ef28d21e0 100644 --- a/swaydb/src/main/scala/swaydb/Set.scala +++ b/swaydb/src/main/scala/swaydb/Set.scala @@ -21,7 +21,7 @@ import swaydb.core.Core import swaydb.core.segment.ref.search.ThreadReadState import swaydb.data.accelerate.LevelZeroMeter import swaydb.data.compaction.LevelMeter -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.serializers.{Serializer, _} import swaydb.stream.{From, SourceFree} diff --git a/swaydb/src/main/scala/swaydb/SetMap.scala b/swaydb/src/main/scala/swaydb/SetMap.scala index 40a87fcfd..71eb82067 100644 --- a/swaydb/src/main/scala/swaydb/SetMap.scala +++ b/swaydb/src/main/scala/swaydb/SetMap.scala @@ -20,7 +20,7 @@ import swaydb.core.util.Bytes import swaydb.data.accelerate.LevelZeroMeter import swaydb.data.compaction.LevelMeter import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Serializer import swaydb.stream.{From, SourceFree} diff --git a/swaydb/src/main/scala/swaydb/SwayDB.scala b/swaydb/src/main/scala/swaydb/SwayDB.scala index d2aa9168a..97bc5ee63 100644 --- a/swaydb/src/main/scala/swaydb/SwayDB.scala +++ b/swaydb/src/main/scala/swaydb/SwayDB.scala @@ -24,7 +24,7 @@ import swaydb.data.MaxKey import swaydb.data.order.KeyOrder import swaydb.data.repairAppendix.RepairResult.OverlappingSegments import swaydb.data.repairAppendix._ -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Serializer import java.nio.file.Path diff --git a/swaydb/src/main/scala/swaydb/eventually/persistent/Map.scala b/swaydb/src/main/scala/swaydb/eventually/persistent/Map.scala index 7207eb553..8a21d4ca4 100644 --- a/swaydb/src/main/scala/swaydb/eventually/persistent/Map.scala +++ b/swaydb/src/main/scala/swaydb/eventually/persistent/Map.scala @@ -25,7 +25,7 @@ import swaydb.data.compaction.CompactionConfig import swaydb.data.config._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, DataType, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.function.FunctionConverter diff --git a/swaydb/src/main/scala/swaydb/eventually/persistent/MultiMap.scala b/swaydb/src/main/scala/swaydb/eventually/persistent/MultiMap.scala index 23e639a56..79dd8cd61 100644 --- a/swaydb/src/main/scala/swaydb/eventually/persistent/MultiMap.scala +++ b/swaydb/src/main/scala/swaydb/eventually/persistent/MultiMap.scala @@ -24,7 +24,7 @@ import swaydb.data.compaction.CompactionConfig import swaydb.data.config._ import swaydb.data.order.KeyOrder import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, DataType, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.function.FunctionConverter diff --git a/swaydb/src/main/scala/swaydb/eventually/persistent/Queue.scala b/swaydb/src/main/scala/swaydb/eventually/persistent/Queue.scala index fbb271b74..3aef3e893 100644 --- a/swaydb/src/main/scala/swaydb/eventually/persistent/Queue.scala +++ b/swaydb/src/main/scala/swaydb/eventually/persistent/Queue.scala @@ -24,7 +24,7 @@ import swaydb.data.compaction.CompactionConfig import swaydb.data.config._ import swaydb.data.order.KeyOrder import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, DataType, OptimiseWrites} import swaydb.effect.Dir import swaydb.serializers.Serializer diff --git a/swaydb/src/main/scala/swaydb/eventually/persistent/Set.scala b/swaydb/src/main/scala/swaydb/eventually/persistent/Set.scala index 2b90a862a..3f9c1ebe0 100644 --- a/swaydb/src/main/scala/swaydb/eventually/persistent/Set.scala +++ b/swaydb/src/main/scala/swaydb/eventually/persistent/Set.scala @@ -26,7 +26,7 @@ import swaydb.data.compaction.CompactionConfig import swaydb.data.config._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, DataType, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.function.FunctionConverter diff --git a/swaydb/src/main/scala/swaydb/eventually/persistent/SetMap.scala b/swaydb/src/main/scala/swaydb/eventually/persistent/SetMap.scala index 4ecfb5c6a..6a48c52e1 100644 --- a/swaydb/src/main/scala/swaydb/eventually/persistent/SetMap.scala +++ b/swaydb/src/main/scala/swaydb/eventually/persistent/SetMap.scala @@ -26,7 +26,7 @@ import swaydb.data.compaction.CompactionConfig import swaydb.data.config._ import swaydb.data.order.KeyOrder import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, DataType, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.serializers.Serializer diff --git a/swaydb/src/main/scala/swaydb/function/FunctionConverter.scala b/swaydb/src/main/scala/swaydb/function/FunctionConverter.scala index af15d1360..ad61c5edf 100644 --- a/swaydb/src/main/scala/swaydb/function/FunctionConverter.scala +++ b/swaydb/src/main/scala/swaydb/function/FunctionConverter.scala @@ -19,7 +19,7 @@ package swaydb.function import swaydb.core.data.SwayFunctionOutput import swaydb.core.function.FunctionStore import swaydb.data.Functions -import swaydb.data.slice.{Slice, SliceOption} +import swaydb.slice.{Slice, SliceOption} import swaydb.multimap.{MultiKey, MultiValue} import swaydb.serializers.Serializer import swaydb.{Apply, Expiration, MultiMap, PureFunction, PureFunctionJava, PureFunctionScala} diff --git a/swaydb/src/main/scala/swaydb/memory/Map.scala b/swaydb/src/main/scala/swaydb/memory/Map.scala index 1920f58bd..18d188b50 100644 --- a/swaydb/src/main/scala/swaydb/memory/Map.scala +++ b/swaydb/src/main/scala/swaydb/memory/Map.scala @@ -25,7 +25,7 @@ import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, Leve import swaydb.data.config.{FileCache, MemoryCache, ThreadStateCache} import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, DataType, Functions, OptimiseWrites} import swaydb.function.FunctionConverter import swaydb.serializers.Serializer diff --git a/swaydb/src/main/scala/swaydb/memory/MultiMap.scala b/swaydb/src/main/scala/swaydb/memory/MultiMap.scala index 4e23b6da8..d13214a58 100644 --- a/swaydb/src/main/scala/swaydb/memory/MultiMap.scala +++ b/swaydb/src/main/scala/swaydb/memory/MultiMap.scala @@ -24,7 +24,7 @@ import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, Leve import swaydb.data.config._ import swaydb.data.order.KeyOrder import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, Functions, OptimiseWrites} import swaydb.function.FunctionConverter import swaydb.multimap.{MultiKey, MultiValue} diff --git a/swaydb/src/main/scala/swaydb/memory/Queue.scala b/swaydb/src/main/scala/swaydb/memory/Queue.scala index 71e414522..87ee19fa3 100644 --- a/swaydb/src/main/scala/swaydb/memory/Queue.scala +++ b/swaydb/src/main/scala/swaydb/memory/Queue.scala @@ -23,7 +23,7 @@ import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, Leve import swaydb.data.config._ import swaydb.data.order.KeyOrder import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, OptimiseWrites} import swaydb.serializers.Serializer import swaydb.{Bag, CommonConfigs} diff --git a/swaydb/src/main/scala/swaydb/memory/Set.scala b/swaydb/src/main/scala/swaydb/memory/Set.scala index 63eb01fe9..ed211e08e 100644 --- a/swaydb/src/main/scala/swaydb/memory/Set.scala +++ b/swaydb/src/main/scala/swaydb/memory/Set.scala @@ -26,7 +26,7 @@ import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, Leve import swaydb.data.config.{FileCache, MemoryCache, ThreadStateCache} import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, DataType, Functions, OptimiseWrites} import swaydb.function.FunctionConverter import swaydb.serializers.{Default, Serializer} diff --git a/swaydb/src/main/scala/swaydb/memory/SetMap.scala b/swaydb/src/main/scala/swaydb/memory/SetMap.scala index 4cd3a53b6..1ce077251 100644 --- a/swaydb/src/main/scala/swaydb/memory/SetMap.scala +++ b/swaydb/src/main/scala/swaydb/memory/SetMap.scala @@ -25,7 +25,7 @@ import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, Leve import swaydb.data.config.{FileCache, ThreadStateCache} import swaydb.data.order.KeyOrder import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, Functions, OptimiseWrites} import swaydb.serializers.Serializer diff --git a/swaydb/src/main/scala/swaydb/multimap/MultiKey.scala b/swaydb/src/main/scala/swaydb/multimap/MultiKey.scala index d0d9146cc..1a3ab668e 100644 --- a/swaydb/src/main/scala/swaydb/multimap/MultiKey.scala +++ b/swaydb/src/main/scala/swaydb/multimap/MultiKey.scala @@ -19,7 +19,7 @@ package swaydb.multimap import swaydb.core.io.reader.Reader import swaydb.core.util.Bytes import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Serializer private[swaydb] sealed trait MultiKey[+C, +K] { diff --git a/swaydb/src/main/scala/swaydb/multimap/MultiPrepare.scala b/swaydb/src/main/scala/swaydb/multimap/MultiPrepare.scala index d7315c003..9f6b00eb6 100644 --- a/swaydb/src/main/scala/swaydb/multimap/MultiPrepare.scala +++ b/swaydb/src/main/scala/swaydb/multimap/MultiPrepare.scala @@ -16,7 +16,8 @@ package swaydb.multimap -import swaydb.{Aggregator, MultiMap, Prepare} +import swaydb.utils.Aggregator +import swaydb.{MultiMap, Prepare} import scala.collection.mutable import scala.concurrent.duration.Deadline diff --git a/swaydb/src/main/scala/swaydb/multimap/MultiValue.scala b/swaydb/src/main/scala/swaydb/multimap/MultiValue.scala index 1bda12b26..8b9608efb 100644 --- a/swaydb/src/main/scala/swaydb/multimap/MultiValue.scala +++ b/swaydb/src/main/scala/swaydb/multimap/MultiValue.scala @@ -17,7 +17,7 @@ package swaydb.multimap import swaydb.core.util.Bytes -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Serializer private[swaydb] sealed trait MultiValue[+V] diff --git a/swaydb/src/main/scala/swaydb/persistent/Map.scala b/swaydb/src/main/scala/swaydb/persistent/Map.scala index 0670bf7b3..53bd77ea2 100644 --- a/swaydb/src/main/scala/swaydb/persistent/Map.scala +++ b/swaydb/src/main/scala/swaydb/persistent/Map.scala @@ -25,7 +25,7 @@ import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, Leve import swaydb.data.config._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, DataType, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.function.FunctionConverter diff --git a/swaydb/src/main/scala/swaydb/persistent/MultiMap.scala b/swaydb/src/main/scala/swaydb/persistent/MultiMap.scala index 67d4d33db..2dd0ac8ca 100644 --- a/swaydb/src/main/scala/swaydb/persistent/MultiMap.scala +++ b/swaydb/src/main/scala/swaydb/persistent/MultiMap.scala @@ -24,7 +24,7 @@ import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, Leve import swaydb.data.config._ import swaydb.data.order.KeyOrder import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, DataType, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.function.FunctionConverter diff --git a/swaydb/src/main/scala/swaydb/persistent/Queue.scala b/swaydb/src/main/scala/swaydb/persistent/Queue.scala index 7ba6ee779..b1de2b003 100644 --- a/swaydb/src/main/scala/swaydb/persistent/Queue.scala +++ b/swaydb/src/main/scala/swaydb/persistent/Queue.scala @@ -24,7 +24,7 @@ import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, Leve import swaydb.data.config._ import swaydb.data.order.KeyOrder import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, DataType, OptimiseWrites} import swaydb.effect.Dir import swaydb.serializers.Serializer diff --git a/swaydb/src/main/scala/swaydb/persistent/Set.scala b/swaydb/src/main/scala/swaydb/persistent/Set.scala index 2d828a635..6c1e5834e 100644 --- a/swaydb/src/main/scala/swaydb/persistent/Set.scala +++ b/swaydb/src/main/scala/swaydb/persistent/Set.scala @@ -26,7 +26,7 @@ import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, Leve import swaydb.data.config._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, DataType, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.function.FunctionConverter diff --git a/swaydb/src/main/scala/swaydb/persistent/SetMap.scala b/swaydb/src/main/scala/swaydb/persistent/SetMap.scala index e6364ff24..209d88614 100644 --- a/swaydb/src/main/scala/swaydb/persistent/SetMap.scala +++ b/swaydb/src/main/scala/swaydb/persistent/SetMap.scala @@ -26,7 +26,7 @@ import swaydb.data.compaction.{CompactionConfig, LevelMeter, LevelThrottle, Leve import swaydb.data.config._ import swaydb.data.order.KeyOrder import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.data.{Atomic, DataType, Functions, OptimiseWrites} import swaydb.effect.Dir import swaydb.serializers.Serializer diff --git a/swaydb/src/test/scala/swaydb/api/SwayDBPartialSetSpec.scala b/swaydb/src/test/scala/swaydb/api/SwayDBPartialSetSpec.scala index 33656def8..688a10ca0 100644 --- a/swaydb/src/test/scala/swaydb/api/SwayDBPartialSetSpec.scala +++ b/swaydb/src/test/scala/swaydb/api/SwayDBPartialSetSpec.scala @@ -21,7 +21,7 @@ import swaydb.Glass import swaydb.core.TestCaseSweeper import swaydb.core.TestCaseSweeper._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.testkit.RunThis._ import swaydb.utils.StorageUnits._ diff --git a/swaydb/src/test/scala/swaydb/api/SwayDBReverseSpec.scala b/swaydb/src/test/scala/swaydb/api/SwayDBReverseSpec.scala index 26830a9fb..094a7cabc 100644 --- a/swaydb/src/test/scala/swaydb/api/SwayDBReverseSpec.scala +++ b/swaydb/src/test/scala/swaydb/api/SwayDBReverseSpec.scala @@ -21,7 +21,7 @@ import swaydb._ import swaydb.core.TestCaseSweeper import swaydb.core.TestCaseSweeper._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.testkit.RunThis._ diff --git a/swaydb/src/test/scala/swaydb/api/TestBaseEmbedded.scala b/swaydb/src/test/scala/swaydb/api/TestBaseEmbedded.scala index c5337b5f0..fe444ff05 100644 --- a/swaydb/src/test/scala/swaydb/api/TestBaseEmbedded.scala +++ b/swaydb/src/test/scala/swaydb/api/TestBaseEmbedded.scala @@ -24,7 +24,7 @@ import swaydb._ import swaydb.core.CommonAssertions.eitherOne import swaydb.core.{Core, TestBase, TestExecutionContext} import swaydb.data.sequencer.Sequencer -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.multimap.{MultiKey, MultiValue} import swaydb.testkit.RunThis._ diff --git a/swaydb/src/test/scala/swaydb/api/multimap/MultiKeySpec.scala b/swaydb/src/test/scala/swaydb/api/multimap/MultiKeySpec.scala index 525a49e9a..2f83e1b10 100644 --- a/swaydb/src/test/scala/swaydb/api/multimap/MultiKeySpec.scala +++ b/swaydb/src/test/scala/swaydb/api/multimap/MultiKeySpec.scala @@ -20,7 +20,7 @@ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import swaydb.core.TestData._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.multimap.MultiKey import swaydb.serializers.Default._ import swaydb.serializers.Serializer diff --git a/swaydb/src/test/scala/swaydb/api/multimap/MultiMapFunctionsSpec.scala b/swaydb/src/test/scala/swaydb/api/multimap/MultiMapFunctionsSpec.scala index 7e0287167..559e40adb 100644 --- a/swaydb/src/test/scala/swaydb/api/multimap/MultiMapFunctionsSpec.scala +++ b/swaydb/src/test/scala/swaydb/api/multimap/MultiMapFunctionsSpec.scala @@ -23,7 +23,7 @@ import swaydb.core.TestCaseSweeper import swaydb.core.TestCaseSweeper._ import swaydb.data.Functions import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Default._ import swaydb.utils.StorageUnits._ import swaydb.{Apply, Bag, Glass, MultiMap, Prepare, PureFunction} diff --git a/swaydb/src/test/scala/swaydb/api/multimap/MultiMapSpec.scala b/swaydb/src/test/scala/swaydb/api/multimap/MultiMapSpec.scala index 34da997a7..4dd549880 100644 --- a/swaydb/src/test/scala/swaydb/api/multimap/MultiMapSpec.scala +++ b/swaydb/src/test/scala/swaydb/api/multimap/MultiMapSpec.scala @@ -23,7 +23,7 @@ import swaydb.core.TestCaseSweeper import swaydb.core.TestCaseSweeper._ import swaydb.core.TestData._ import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.multimap.MultiPrepare import swaydb.serializers.Default._ import swaydb.testkit.RunThis._ diff --git a/swaydb/src/test/scala/swaydb/api/multimap/MultiMapSpec_OLD.scala b/swaydb/src/test/scala/swaydb/api/multimap/MultiMapSpec_OLD.scala index 5c775fe10..baea717d8 100644 --- a/swaydb/src/test/scala/swaydb/api/multimap/MultiMapSpec_OLD.scala +++ b/swaydb/src/test/scala/swaydb/api/multimap/MultiMapSpec_OLD.scala @@ -22,7 +22,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestCaseSweeper._ import swaydb.core.{TestCaseSweeper, TestExecutionContext} import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.multimap.{MultiKey, MultiValue} import swaydb.serializers.Default._ import swaydb.testkit.RunThis._ diff --git a/swaydb/src/test/scala/swaydb/api/multimap/NestedOptionValueSpec.scala b/swaydb/src/test/scala/swaydb/api/multimap/NestedOptionValueSpec.scala index cea53117a..2529e133c 100644 --- a/swaydb/src/test/scala/swaydb/api/multimap/NestedOptionValueSpec.scala +++ b/swaydb/src/test/scala/swaydb/api/multimap/NestedOptionValueSpec.scala @@ -20,7 +20,7 @@ import org.scalatest.OptionValues._ import swaydb.api.TestBaseEmbedded import swaydb.core.TestCaseSweeper import swaydb.core.TestCaseSweeper._ -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Serializer import swaydb.{Bag, Glass} diff --git a/swaydb/src/test/scala/swaydb/api/multimap/multiprepare/PrimaryKey.scala b/swaydb/src/test/scala/swaydb/api/multimap/multiprepare/PrimaryKey.scala index dd7d0bff3..48b32112d 100644 --- a/swaydb/src/test/scala/swaydb/api/multimap/multiprepare/PrimaryKey.scala +++ b/swaydb/src/test/scala/swaydb/api/multimap/multiprepare/PrimaryKey.scala @@ -17,7 +17,7 @@ package swaydb.api.multimap.multiprepare import boopickle.Default.{Pickle, Unpickle, _} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Serializer /** diff --git a/swaydb/src/test/scala/swaydb/api/multimap/multiprepare/Row.scala b/swaydb/src/test/scala/swaydb/api/multimap/multiprepare/Row.scala index 51025f1b3..5c6f42d94 100644 --- a/swaydb/src/test/scala/swaydb/api/multimap/multiprepare/Row.scala +++ b/swaydb/src/test/scala/swaydb/api/multimap/multiprepare/Row.scala @@ -17,7 +17,7 @@ package swaydb.api.multimap.multiprepare import boopickle.Default.{Pickle, Unpickle, _} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Serializer /** diff --git a/swaydb/src/test/scala/swaydb/api/multimap/multiprepare/Table.scala b/swaydb/src/test/scala/swaydb/api/multimap/multiprepare/Table.scala index 5cca5eedb..5294ee4b2 100644 --- a/swaydb/src/test/scala/swaydb/api/multimap/multiprepare/Table.scala +++ b/swaydb/src/test/scala/swaydb/api/multimap/multiprepare/Table.scala @@ -17,7 +17,7 @@ package swaydb.api.multimap.multiprepare import boopickle.Default.{Pickle, Unpickle, _} -import swaydb.data.slice.Slice +import swaydb.slice.Slice import swaydb.serializers.Serializer /** diff --git a/data/src/main/scala/swaydb/Aggregator.scala b/utils/src/main/scala/swaydb/utils/Aggregator.scala similarity index 92% rename from data/src/main/scala/swaydb/Aggregator.scala rename to utils/src/main/scala/swaydb/utils/Aggregator.scala index 99c2e5ef1..d6f16bc83 100644 --- a/data/src/main/scala/swaydb/Aggregator.scala +++ b/utils/src/main/scala/swaydb/utils/Aggregator.scala @@ -14,14 +14,11 @@ * limitations under the License. */ -package swaydb - -import swaydb.data.slice.Slice +package swaydb.utils import scala.collection.compat.IterableOnce import scala.collection.mutable import scala.collection.mutable.ListBuffer -import scala.reflect.ClassTag /** * [[scala.collection.mutable.Builder]] requires two implementations for 2.13 and 2.12. @@ -64,11 +61,11 @@ case object Aggregator { () => Aggregator.listBuffer[A] - def slice[A: ClassTag]() = - new CreatorSizeable[A, Slice[A]] { - override def createNewSizeHint(size: Int): Aggregator[A, Slice[A]] = - Slice.newAggregator(size) - } +// def slice[A: ClassTag]() = +// new CreatorSizeable[A, Slice[A]] { +// override def createNewSizeHint(size: Int): Aggregator[A, Slice[A]] = +// Slice.newAggregator(size) +// } /** * Nothing disables inserting and adding elements the [[Aggregator]]. diff --git a/x-interop-boopickle/src/main/scala/swaydb/serializers/BooPickle.scala b/x-interop-boopickle/src/main/scala/swaydb/serializers/BooPickle.scala index 9f588485f..71a1e4ac7 100644 --- a/x-interop-boopickle/src/main/scala/swaydb/serializers/BooPickle.scala +++ b/x-interop-boopickle/src/main/scala/swaydb/serializers/BooPickle.scala @@ -18,7 +18,7 @@ package swaydb.serializers import boopickle.Default.{Pickle, Unpickle} import boopickle.{PickleState, Pickler} -import swaydb.data.slice.Slice +import swaydb.slice.Slice object BooPickle {