moved cache and compression to core packages

simerplaha · Nov 17, 2021 · ec5f447 · ec5f447
1 parent 1bac172
commit ec5f447
Show file tree

Hide file tree

Showing 26 changed files with 30 additions and 30 deletions.
diff --git a/actor/src/main/scala/swaydb/Actor.scala b/actor/src/main/scala/swaydb/Actor.scala
@@ -19,7 +19,7 @@ package swaydb
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.ActorConfig.QueueOrder
 import swaydb.Bag.Implicits._
-import swaydb.cache.{Cache, CacheNoIO}
+import swaydb.core.cache.{Cache, CacheNoIO}
 import swaydb.effect.Reserve
 import swaydb.utils.{AtomicThreadLocalBoolean, FunctionSafe, Options}
 

diff --git a/actor/src/main/scala/swaydb/ActorHooks.scala b/actor/src/main/scala/swaydb/ActorHooks.scala
@@ -18,7 +18,7 @@ package swaydb
 
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.IO.ExceptionHandler
-import swaydb.cache.CacheNoIO
+import swaydb.core.cache.CacheNoIO
 
 import scala.concurrent.ExecutionContext
 

diff --git a/build.sbt b/build.sbt
@@ -147,10 +147,10 @@ lazy val SwayDB =
       `core-interop`,
       actor,
       stream,
-      cache,
+      `core-cache`,
       swaydb,
       `swaydb-java`,
-      compression,
+      `core-compression`,
       configs,
       serializers,
       `x-interop-boopickle`,
@@ -196,13 +196,13 @@ lazy val core =
       utils,
       `core-queue`,
       slice,
-      cache,
+      `core-cache`,
       actor,
-      compression,
+      `core-compression`,
       `core-skiplist`,
       testkit % Test,
       macros % "test->test;compile-internal",
-      compression % Test,
+      `core-compression` % Test,
       configs % Test,
       serializers % Test
     )
@@ -266,7 +266,7 @@ lazy val actor =
     .settings(commonSettings)
     .settings(publishSettings)
     .settings(libraryDependencies ++= commonDependencies(scalaVersion.value))
-    .dependsOn(effect, cache)
+    .dependsOn(effect, `core-cache`)
 
 lazy val stream =
   project
@@ -275,7 +275,7 @@ lazy val stream =
     .settings(libraryDependencies ++= commonDependencies(scalaVersion.value))
     .dependsOn(effect, utils, testkit % Test)
 
-lazy val cache =
+lazy val `core-cache` =
   project
     .settings(commonSettings)
     .settings(publishSettings)
@@ -323,7 +323,7 @@ lazy val `core-performance` =
     .settings(libraryDependencies ++= testDependencies(scalaVersion.value))
     .dependsOn(core)
 
-lazy val compression =
+lazy val `core-compression` =
   project
     .settings(commonSettings)
     .settings(publishSettings)

diff --git a/...e/src/main/scala/swaydb/cache/Cache.scala → .../main/scala/swaydb/core/cache/Cache.scala b/...e/src/main/scala/swaydb/cache/Cache.scala → .../main/scala/swaydb/core/cache/Cache.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package swaydb.cache
+package swaydb.core.cache
 
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.IO

diff --git a/cache/src/main/scala/swaydb/cache/Lazy.scala → ...c/main/scala/swaydb/core/cache/Lazy.scala b/cache/src/main/scala/swaydb/cache/Lazy.scala → ...c/main/scala/swaydb/core/cache/Lazy.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package swaydb.cache
+package swaydb.core.cache
 
 import swaydb.IO
 

diff --git a/...c/test/scala/swaydb/cache/CacheSpec.scala → ...t/scala/swaydb/core/cache/CacheSpec.scala b/...c/test/scala/swaydb/cache/CacheSpec.scala → ...t/scala/swaydb/core/cache/CacheSpec.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package swaydb.cache
+package swaydb.core.cache
 
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.matchers.should.Matchers

diff --git a/...rc/test/scala/swaydb/cache/LazySpec.scala → ...st/scala/swaydb/core/cache/LazySpec.scala b/...rc/test/scala/swaydb/cache/LazySpec.scala → ...st/scala/swaydb/core/cache/LazySpec.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package swaydb.cache
+package swaydb.core.cache
 
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.matchers.should.Matchers

diff --git a/...ydb/compression/CompressionInternal.scala → ...ore/compression/CompressionInternal.scala b/...ydb/compression/CompressionInternal.scala → ...ore/compression/CompressionInternal.scala
diff --git a/...aydb/compression/CompressorInternal.scala → ...core/compression/CompressorInternal.scala b/...aydb/compression/CompressorInternal.scala → ...core/compression/CompressorInternal.scala
diff --git a/...db/compression/DecompressorInternal.scala → ...re/compression/DecompressorInternal.scala b/...db/compression/DecompressorInternal.scala → ...re/compression/DecompressorInternal.scala
diff --git a/compression/src/test/resources/logback.xml → ...ompression/src/test/resources/logback.xml b/compression/src/test/resources/logback.xml → ...ompression/src/test/resources/logback.xml
diff --git a/.../swaydb/compression/CompressionSpec.scala → ...db/core/compression/CompressionSpec.scala b/.../swaydb/compression/CompressionSpec.scala → ...db/core/compression/CompressionSpec.scala
diff --git a/...aydb/compression/CompressionTestGen.scala → ...core/compression/CompressionTestGen.scala b/...aydb/compression/CompressionTestGen.scala → ...core/compression/CompressionTestGen.scala
diff --git a/core-performance/src/test/scala/swaydb/core/cache/CachePerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/cache/CachePerformanceSpec.scala
@@ -20,7 +20,7 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import swaydb.Error.Segment.ExceptionHandler
 import swaydb.IO
-import swaydb.cache.Cache
+import swaydb.core.cache.Cache
 import swaydb.core.CommonAssertions._
 import swaydb.Benchmark
 import swaydb.effect.Reserve

diff --git a/core/src/main/scala/swaydb/core/data/KeyValue.scala b/core/src/main/scala/swaydb/core/data/KeyValue.scala
@@ -16,7 +16,7 @@
 
 package swaydb.core.data
 
-import swaydb.cache.{Cache, CacheNoIO}
+import swaydb.core.cache.{Cache, CacheNoIO}
 import swaydb.core.log.serializer.RangeValueSerializer.OptionRangeValueSerializer
 import swaydb.core.log.serializer.{RangeValueSerializer, ValueSerializer}
 import swaydb.core.segment.assigner.Assignable

diff --git a/core/src/main/scala/swaydb/core/io/file/DBFile.scala b/core/src/main/scala/swaydb/core/io/file/DBFile.scala
@@ -18,7 +18,7 @@ package swaydb.core.io.file
 
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.Error.IO.ExceptionHandler
-import swaydb.cache.Cache
+import swaydb.core.cache.Cache
 import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.sweeper.{ByteBufferSweeper, FileSweeper, FileSweeperItem}
 import swaydb.config.ForceSave

diff --git a/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala b/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala
@@ -19,7 +19,7 @@ package swaydb.core.segment
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.Error.Segment.ExceptionHandler
 import swaydb.IO
-import swaydb.cache.{Cache, CacheNoIO}
+import swaydb.core.cache.{Cache, CacheNoIO}
 import swaydb.core.data._
 import swaydb.core.function.FunctionStore
 import swaydb.core.io.file.{DBFile, ForceSaveApplier}

diff --git a/core/src/main/scala/swaydb/core/segment/block/BlockCache.scala b/core/src/main/scala/swaydb/core/segment/block/BlockCache.scala
@@ -17,7 +17,7 @@
 package swaydb.core.segment.block
 
 import com.typesafe.scalalogging.LazyLogging
-import swaydb.cache.Cache
+import swaydb.core.cache.Cache
 import swaydb.core.sweeper.MemorySweeper
 import swaydb.utils.HashedMap
 import swaydb.slice.{Slice, SliceOption, SliceRO, Slices}

diff --git a/core/src/main/scala/swaydb/core/segment/block/BlockCacheState.scala b/core/src/main/scala/swaydb/core/segment/block/BlockCacheState.scala
@@ -1,6 +1,6 @@
 package swaydb.core.segment.block
 
-import swaydb.cache.CacheNoIO
+import swaydb.core.cache.CacheNoIO
 import swaydb.core.sweeper.MemorySweeper
 import swaydb.utils.HashedMap
 import swaydb.slice.{Slice, SliceOption}

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
@@ -17,7 +17,7 @@
 package swaydb.core.segment.block.segment
 
 import swaydb.Error.Segment.ExceptionHandler
-import swaydb.cache.{Cache, Lazy}
+import swaydb.core.cache.{Cache, Lazy}
 import swaydb.core.data.Persistent
 import swaydb.core.io.file.DBFile
 import swaydb.core.segment.block.binarysearch.{BinarySearchIndexBlock, BinarySearchIndexBlockOffset}

diff --git a/core/src/main/scala/swaydb/core/sweeper/ByteBufferSweeper.scala b/core/src/main/scala/swaydb/core/sweeper/ByteBufferSweeper.scala
@@ -21,7 +21,7 @@ import swaydb.ActorConfig.QueueOrder
 import swaydb.Bag.Implicits._
 import swaydb.Error.IO.ExceptionHandler
 import swaydb._
-import swaydb.cache.{Cache, CacheNoIO}
+import swaydb.core.cache.{Cache, CacheNoIO}
 import swaydb.core.io.file.ForceSaveApplier
 import swaydb.core.sweeper.ByteBufferCleaner.Cleaner
 import swaydb.utils.English

diff --git a/core/src/main/scala/swaydb/core/sweeper/FileSweeper.scala b/core/src/main/scala/swaydb/core/sweeper/FileSweeper.scala
@@ -18,7 +18,7 @@ package swaydb.core.sweeper
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.ActorConfig.QueueOrder
 import swaydb.Bag.Implicits._
-import swaydb.cache.CacheNoIO
+import swaydb.core.cache.CacheNoIO
 import swaydb.core.level.zero.LevelZero
 import swaydb.core.level.{LevelRef, NextLevel}
 import swaydb.config.FileCache

diff --git a/core/src/main/scala/swaydb/core/sweeper/MemorySweeper.scala b/core/src/main/scala/swaydb/core/sweeper/MemorySweeper.scala
@@ -18,7 +18,7 @@ package swaydb.core.sweeper
 
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.ActorConfig.QueueOrder
-import swaydb.cache.CacheNoIO
+import swaydb.core.cache.CacheNoIO
 import swaydb.core.data.Persistent
 import swaydb.utils.HashedMap
 import swaydb.core.skiplist.SkipList
@@ -37,7 +37,7 @@ private[core] object Command {
                                   val skipListRef: WeakReference[SkipList[_, _, Slice[Byte], _]]) extends Command
 
   private[sweeper] class Cache(val weight: Int,
-                               val cache: WeakReference[swaydb.cache.Cache[_, _, _]]) extends Command
+                               val cache: WeakReference[swaydb.core.cache.Cache[_, _, _]]) extends Command
 
   private[sweeper] class SkipListMap(val key: Slice[Byte],
                                      val weight: Int,
@@ -213,11 +213,11 @@ private[core] object MemorySweeper extends LazyLogging {
 
   sealed trait Cache extends On {
 
-    def add(weight: Int, cache: swaydb.cache.Cache[_, _, _]): Unit =
+    def add(weight: Int, cache: swaydb.core.cache.Cache[_, _, _]): Unit =
       if (actor.isDefined) {
         actor.get send new Command.Cache(
           weight = weight,
-          cache = new WeakReference[swaydb.cache.Cache[_, _, _]](cache)
+          cache = new WeakReference[swaydb.core.cache.Cache[_, _, _]](cache)
         )
       } else {
         val exception = new Exception("Cache is not enabled")

diff --git a/core/src/test/scala/swaydb/core/TestCaseSweeper.scala b/core/src/test/scala/swaydb/core/TestCaseSweeper.scala
@@ -17,7 +17,7 @@
 package swaydb.core
 
 import com.typesafe.scalalogging.LazyLogging
-import swaydb.cache.{Cache, CacheNoIO}
+import swaydb.core.cache.{Cache, CacheNoIO}
 import swaydb.configs.level.DefaultExecutionContext
 import swaydb.core.TestSweeper._
 import swaydb.core.io.file.{DBFile, ForceSaveApplier}

diff --git a/core/src/test/scala/swaydb/core/TestData.scala b/core/src/test/scala/swaydb/core/TestData.scala
@@ -21,7 +21,7 @@ import org.scalatest.matchers.should.Matchers._
 import swaydb.Error.Segment.ExceptionHandler
 import swaydb.IO.ExceptionHandler.Nothing
 import swaydb.IOValues._
-import swaydb.cache.Cache
+import swaydb.core.cache.Cache
 import swaydb.compression.CompressionInternal
 import swaydb.compression.CompressionTestGen._
 import swaydb.config.accelerate.Accelerator

diff --git a/core/src/test/scala/swaydb/core/segment/KeyMatcherSpec.scala b/core/src/test/scala/swaydb/core/segment/KeyMatcherSpec.scala
@@ -16,7 +16,7 @@
 
 package swaydb.core.segment
 
-import swaydb.cache.Cache
+import swaydb.core.cache.Cache
 import swaydb.core.TestBase
 import swaydb.core.data.Persistent._
 import swaydb.core.data.Value.FromValueOption