shuffling files to fix package names

simerplaha · Jan 30, 2021 · c807520 · c807520
1 parent 0e346a6
commit c807520
Show file tree

Hide file tree

Showing 455 changed files with 1,049 additions and 982 deletions.
diff --git a/actor/src/main/scala/swaydb/Actor.scala b/actor/src/main/scala/swaydb/Actor.scala
@@ -25,12 +25,11 @@
 package swaydb
 
 import com.typesafe.scalalogging.LazyLogging
+import swaydb.ActorConfig.QueueOrder
 import swaydb.Bag.Implicits._
-import swaydb.data.Reserve
 import swaydb.data.cache.{Cache, CacheNoIO}
-import swaydb.data.config.ActorConfig
-import swaydb.data.config.ActorConfig.QueueOrder
-import swaydb.data.util.{AtomicThreadLocalBoolean, FunctionSafe, Options}
+import swaydb.effect.Reserve
+import swaydb.utils.{AtomicThreadLocalBoolean, FunctionSafe, Options}
 
 import java.util.TimerTask
 import java.util.concurrent.TimeUnit

diff --git a/actor/src/main/scala/swaydb/ActorConfig.scala b/actor/src/main/scala/swaydb/ActorConfig.scala
@@ -22,7 +22,7 @@
  * permission to convey the resulting work.
  */
 
-package swaydb.data.config
+package swaydb
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration.FiniteDuration

diff --git a/actor/src/main/scala/swaydb/ActorQueue.scala b/actor/src/main/scala/swaydb/ActorQueue.scala
@@ -24,9 +24,9 @@
 
 package swaydb
 
-import java.util.concurrent.{ConcurrentLinkedQueue, ConcurrentSkipListSet}
+import swaydb.ActorConfig.QueueOrder
 
-import swaydb.data.config.ActorConfig.QueueOrder
+import java.util.concurrent.{ConcurrentLinkedQueue, ConcurrentSkipListSet}
 
 protected sealed trait ActorQueue[T] {
   def add(item: T): Boolean

diff --git a/actor/src/main/scala/swaydb/DefActor.scala b/actor/src/main/scala/swaydb/DefActor.scala
@@ -24,13 +24,12 @@
 
 package swaydb
 
-import java.util.{TimerTask, UUID}
 import swaydb.Actor.Task
-import swaydb.data.config.ActorConfig.QueueOrder
+import swaydb.ActorConfig.QueueOrder
 
-import scala.annotation.unchecked.uncheckedVariance
-import scala.concurrent.{ExecutionContext, Promise}
+import java.util.{TimerTask, UUID}
 import scala.concurrent.duration.FiniteDuration
+import scala.concurrent.{ExecutionContext, Promise}
 import scala.util.Try
 
 object DefActor {

diff --git a/actor/src/main/scala/swaydb/Scheduler.scala b/actor/src/main/scala/swaydb/Scheduler.scala
@@ -25,7 +25,6 @@
 package swaydb
 
 import java.util.{Timer, TimerTask}
-
 import scala.concurrent._
 import scala.concurrent.duration.FiniteDuration
 

diff --git a/actor/src/main/scala/swaydb/test/TestActor.scala b/actor/src/main/scala/swaydb/test/TestActor.scala
@@ -24,11 +24,10 @@
 
 package swaydb.test
 
-import java.util.concurrent.ConcurrentLinkedQueue
-
-import swaydb.data.config.ActorConfig.QueueOrder
+import swaydb.ActorConfig.QueueOrder
 import swaydb.{Actor, ActorQueue, IO, Scheduler}
 
+import java.util.concurrent.ConcurrentLinkedQueue
 import scala.concurrent.duration.{FiniteDuration, _}
 import scala.concurrent.{Await, ExecutionContext, TimeoutException}
 import scala.util.{Failure, Success, Try}

diff --git a/build.sbt b/build.sbt
@@ -183,7 +183,7 @@ lazy val effect =
     .settings(commonSettings)
     .settings(publishSettings)
     .settings(libraryDependencies ++= commonDependencies(scalaVersion.value))
-    .dependsOn(utils)
+    .dependsOn(utils, testkit % Test)
 
 lazy val core =
   project

diff --git a/cache/src/main/scala/swaydb/data/cache/Cache.scala b/cache/src/main/scala/swaydb/data/cache/Cache.scala
@@ -26,9 +26,8 @@ package swaydb.data.cache
 
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.IO
-import swaydb.data.Reserve
-import swaydb.data.config.IOStrategy
-import swaydb.data.util.{FunctionSafe, Options}
+import swaydb.effect.{IOStrategy, Reserve}
+import swaydb.utils.{FunctionSafe, Options}
 
 sealed trait CacheOrNull[+E, -I, +O]
 

diff --git a/cache/src/test/scala/swaydb/data/cache/CacheSpec.scala b/cache/src/test/scala/swaydb/data/cache/CacheSpec.scala
@@ -28,10 +28,9 @@ import org.scalamock.scalatest.MockFactory
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import swaydb.Error.Segment.ExceptionHandler
-import swaydb.data.Base._
-import swaydb.data.Reserve
-import swaydb.data.RunThis._
-import swaydb.data.config.IOStrategy
+import swaydb.effect.Base._
+import swaydb.effect.{IOStrategy, Reserve}
+import swaydb.testkit.RunThis._
 import swaydb.{Error, IO}
 
 import scala.annotation.tailrec

diff --git a/cache/src/test/scala/swaydb/data/cache/LazySpec.scala b/cache/src/test/scala/swaydb/data/cache/LazySpec.scala
@@ -28,12 +28,12 @@ import org.scalamock.scalatest.MockFactory
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import swaydb.IO
-import swaydb.data.RunThis._
-import swaydb.data.Base._
+import swaydb.effect.Base._
+import swaydb.testkit.RunThis._
 
+import scala.collection.parallel.CollectionConverters._
 import scala.concurrent.duration._
 import scala.util.Random
-import scala.collection.parallel.CollectionConverters._
 
 class LazySpec extends AnyWordSpec with Matchers with MockFactory {
 

diff --git a/compression/src/main/scala/swaydb/compression/CompressionInternal.scala b/compression/src/main/scala/swaydb/compression/CompressionInternal.scala
@@ -27,8 +27,6 @@ package swaydb.compression
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.Compression
 
-import scala.util.Random
-
 /**
  * Internal types that have 1 to 1 mapping with the more configurable [[Compression]] type.
  */

diff --git a/compression/src/test/scala/swaydb/compression/CompressionSpec.scala b/compression/src/test/scala/swaydb/compression/CompressionSpec.scala
@@ -26,11 +26,11 @@ 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.data.util.ByteSizeOf
 import swaydb.serializers.Default._
 import swaydb.serializers._
-import CompressionTestGen._
+import swaydb.utils.ByteSizeOf
 
 import scala.util.Random
 

diff --git a/configs/src/main/scala/swaydb/configs/level/DefaultEventuallyPersistentConfig.scala b/configs/src/main/scala/swaydb/configs/level/DefaultEventuallyPersistentConfig.scala
@@ -29,6 +29,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter}
 import swaydb.data.compaction.{LevelMeter, Throttle}
 import swaydb.data.config._
 import swaydb.data.{Atomic, OptimiseWrites}
+import swaydb.effect.Dir
 
 import java.nio.file.Path
 import scala.concurrent.duration._

diff --git a/configs/src/main/scala/swaydb/configs/level/DefaultPersistentConfig.scala b/configs/src/main/scala/swaydb/configs/level/DefaultPersistentConfig.scala
@@ -29,6 +29,7 @@ import swaydb.data.accelerate.{Accelerator, LevelZeroMeter}
 import swaydb.data.compaction.{LevelMeter, Throttle}
 import swaydb.data.config._
 import swaydb.data.{Atomic, OptimiseWrites}
+import swaydb.effect.Dir
 
 import java.nio.file.Path
 import scala.concurrent.duration._

diff --git a/core-performance/src/test/scala/swaydb/core/actor/ActorPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/actor/ActorPerformanceSpec.scala
@@ -24,15 +24,14 @@
 
 package swaydb.core.actor
 
-import java.util.concurrent.ConcurrentLinkedQueue
-
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
+import swaydb.ActorConfig.QueueOrder
 import swaydb.core.TestExecutionContext
 import swaydb.core.util.Benchmark
-import swaydb.data.config.ActorConfig.QueueOrder
 import swaydb.{Actor, ActorRef}
 
+import java.util.concurrent.ConcurrentLinkedQueue
 import scala.collection.parallel.CollectionConverters._
 import scala.concurrent.duration._
 

diff --git a/core-performance/src/test/scala/swaydb/core/cache/CachePerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/cache/CachePerformanceSpec.scala
@@ -29,9 +29,9 @@ import org.scalatest.wordspec.AnyWordSpec
 import swaydb.Error.Segment.ExceptionHandler
 import swaydb.IO
 import swaydb.core.CommonAssertions._
-import swaydb.data.RunThis._
 import swaydb.core.util.Benchmark
-import swaydb.data.Reserve
+import swaydb.effect.Reserve
+import swaydb.testkit.RunThis._
 
 import scala.collection.parallel.CollectionConverters._
 

diff --git a/core-performance/src/test/scala/swaydb/core/io/file/BlockCachePerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/io/file/BlockCachePerformanceSpec.scala
@@ -29,7 +29,7 @@ import swaydb.core.segment.block.BlockCache
 import swaydb.core.sweeper.MemorySweeper
 import swaydb.core.util.Benchmark
 import swaydb.core.{TestBase, TestCaseSweeper}
-import swaydb.data.util.StorageUnits._
+import swaydb.utils.StorageUnits._
 
 class BlockCachePerformanceSpec extends TestBase {
 

diff --git a/core-performance/src/test/scala/swaydb/core/io/file/DBFileWriteReadPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/io/file/DBFileWriteReadPerformanceSpec.scala
@@ -24,22 +24,15 @@
 
 package swaydb.core.io.file
 
-import java.nio.channels.FileChannel
-import java.nio.file.StandardOpenOption
-import java.util.concurrent.ConcurrentHashMap
-import swaydb.IOValues._
-import swaydb.core.CommonAssertions.{randomIOStrategy, randomThreadSafeIOStrategy}
 import swaydb.core.TestData._
 import swaydb.core.segment.block.BlockCache
 import swaydb.core.segment.block.reader.BlockRefReader
 import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.sweeper.{FileSweeper, MemorySweeper}
-import swaydb.core.util.{Benchmark, Bytes}
+import swaydb.core.util.Benchmark
 import swaydb.core.{TestBase, TestCaseSweeper, TestSweeper}
-import swaydb.data.config.{ForceSave, IOStrategy}
-import swaydb.data.slice.Slice
-import swaydb.data.util.OperatingSystem
-import swaydb.data.util.StorageUnits._
+import swaydb.effect.{Effect, IOStrategy}
+import swaydb.utils.StorageUnits._
 
 import scala.util.Random
 

diff --git a/core-performance/src/test/scala/swaydb/core/io/file/ForceSavePerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/io/file/ForceSavePerformanceSpec.scala
@@ -24,18 +24,20 @@
 
 package swaydb.core.io.file
 
-import java.nio.channels.FileChannel
-import java.nio.channels.FileChannel.MapMode
-import java.nio.file.StandardOpenOption
-import java.util.concurrent.atomic.AtomicBoolean
 import swaydb.core.TestData.randomBytesSlice
 import swaydb.core.sweeper.ByteBufferCleaner
 import swaydb.core.util.Benchmark
 import swaydb.core.{TestBase, TestCaseSweeper}
-import swaydb.data.RunThis._
 import swaydb.data.config.ForceSave
-import swaydb.data.util.OperatingSystem
-import swaydb.data.util.StorageUnits._
+import swaydb.effect.Effect
+import swaydb.testkit.RunThis._
+import swaydb.utils.OperatingSystem
+import swaydb.utils.StorageUnits._
+
+import java.nio.channels.FileChannel
+import java.nio.channels.FileChannel.MapMode
+import java.nio.file.StandardOpenOption
+import java.util.concurrent.atomic.AtomicBoolean
 
 class ForceSavePerformanceSpec extends TestBase {
 

diff --git a/core-performance/src/test/scala/swaydb/core/level/LevelPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/level/LevelPerformanceSpec.scala
@@ -20,7 +20,7 @@
 //package swaydb.core.level
 //
 //import swaydb.IOValues._
-//import swaydb.data.RunThis._
+//import swaydb.testkit.RunThis._
 //import swaydb.core.{TestBase, TestSweeper}
 //import swaydb.core.TestData._
 //import swaydb.core.sweeper.MemorySweeper

diff --git a/core-performance/src/test/scala/swaydb/core/level/PathsDistributorPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/level/PathsDistributorPerformanceSpec.scala
@@ -25,13 +25,13 @@
 package swaydb.core.level
 
 import swaydb.IOValues._
-import swaydb.core.{TestBase, TestCaseSweeper}
-import swaydb.core.io.file.Effect
+import swaydb.core.TestCaseSweeper._
 import swaydb.core.segment.Segment
 import swaydb.core.util.Benchmark
-import swaydb.data.config.Dir
+import swaydb.core.{TestBase, TestCaseSweeper}
 import swaydb.data.order.KeyOrder
-import TestCaseSweeper._
+import swaydb.effect
+import swaydb.effect.{Dir, Effect}
 
 import scala.util.Random
 
@@ -67,10 +67,10 @@ class PathsDistributorPerformanceSpec extends TestBase {
             dirs =
               Seq(
                 Dir(path1, 1),
-                Dir(path2, 2),
-                Dir(path3, 3),
-                Dir(path4, 4),
-                Dir(path5, 5)
+                effect.Dir(path2, 2),
+                effect.Dir(path3, 3),
+                effect.Dir(path4, 4),
+                effect.Dir(path5, 5)
               ),
             segments =
               //for each Segment's request randomly distribute Segments so that there is always un-even distribution

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
@@ -24,15 +24,12 @@
 
 package swaydb.core.merge
 
-import swaydb.Aggregator
-import swaydb.core.TestData._
 import swaydb.core.data.{Memory, Time}
-import swaydb.core.merge.stats.MergeStats
 import swaydb.core.util.Benchmark
 import swaydb.core.{TestBase, TestTimer}
-import swaydb.data.RunThis._
 import swaydb.data.order.{KeyOrder, TimeOrder}
 import swaydb.data.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
@@ -24,32 +24,30 @@
 
 package swaydb.core.segment
 
-import java.nio.file.Path
+import swaydb.core.TestCaseSweeper._
 import swaydb.core.TestData._
 import swaydb.core.data.Memory
 import swaydb.core.io.file.ForceSaveApplier
+import swaydb.core.level.PathsDistributor
+import swaydb.core.merge.stats.MergeStats
 import swaydb.core.segment.block.binarysearch.{BinarySearchEntryFormat, BinarySearchIndexBlock}
 import swaydb.core.segment.block.bloomfilter.BloomFilterBlock
-import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexEntryFormat}
+import swaydb.core.segment.block.hashindex.HashIndexBlock
 import swaydb.core.segment.block.segment.SegmentBlock
 import swaydb.core.segment.block.sortedindex.SortedIndexBlock
 import swaydb.core.segment.block.values.ValuesBlock
 import swaydb.core.segment.entry.reader.PersistentReader
-import swaydb.core.segment.{PersistentSegmentMany, PersistentSegmentOne, Segment}
+import swaydb.core.segment.io.SegmentReadIO
+import swaydb.core.segment.ref.search.ThreadReadState
+import swaydb.core.sweeper.MemorySweeper
 import swaydb.core.util.Benchmark
-import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave, TestSweeper, TestTimer}
-import swaydb.data.config.{Dir, IOAction, IOStrategy, MMAP}
+import swaydb.core.{TestBase, TestCaseSweeper, TestSweeper}
 import swaydb.data.order.{KeyOrder, TimeOrder}
 import swaydb.data.slice.Slice
-import swaydb.data.util.OperatingSystem
-import TestCaseSweeper._
-import swaydb.core.level.PathsDistributor
-import swaydb.core.merge.stats.MergeStats
-import swaydb.core.segment.io.SegmentReadIO
-import swaydb.core.segment.ref.search.ThreadReadState
-import swaydb.core.sweeper.{FileSweeper, MemorySweeper}
-import swaydb.data.util.StorageUnits._
+import swaydb.effect.{Dir, IOAction, IOStrategy}
+import swaydb.utils.StorageUnits._
 
+import java.nio.file.Path
 import scala.concurrent.duration._
 import scala.util.Random
 

diff --git a/core-performance/src/test/scala/swaydb/core/util/LimitHashMapPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/util/LimitHashMapPerformanceSpec.scala
@@ -24,8 +24,6 @@
 
 package swaydb.core.util
 
-import java.util.concurrent.ConcurrentHashMap
-
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 

diff --git a/core-stress/src/test/scala/swaydb/core/io/file/DBFileStressWriteSpec.scala b/core-stress/src/test/scala/swaydb/core/io/file/DBFileStressWriteSpec.scala
@@ -25,7 +25,7 @@
 //package swaydb.core.io.file
 //
 //import swaydb.IOValues._
-//import swaydb.data.RunThis._
+//import swaydb.testkit.RunThis._
 //import swaydb.core.TestData._
 //import swaydb.core.sweeper.FileSweeper
 //import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor

diff --git a/core-stress/src/test/scala/swaydb/core/level/LevelStressSpec.scala b/core-stress/src/test/scala/swaydb/core/level/LevelStressSpec.scala
@@ -22,7 +22,7 @@
 //import swaydb.IO
 //import swaydb.core.CommonAssertions._
 //import swaydb.IOValues._
-//import swaydb.data.RunThis._
+//import swaydb.testkit.RunThis._
 //import swaydb.core.TestBase
 //import swaydb.core.TestData._
 //import swaydb.core.group.compression.data.GroupByInternal.KeyValues

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
@@ -51,7 +51,7 @@
 //import swaydb.serializers._
 //import swaydb.core.TestData._
 //import swaydb.core.CommonAssertions._
-//import swaydb.data.RunThis._
+//import swaydb.testkit.RunThis._
 //
 //
 ////@formatter:off