From ec5f447d0c1e3f0e98843c5e32c4ebffd88fa323 Mon Sep 17 00:00:00 2001 From: simerplaha Date: Wed, 17 Nov 2021 21:44:49 +1100 Subject: [PATCH] moved cache and compression to core packages --- actor/src/main/scala/swaydb/Actor.scala | 2 +- actor/src/main/scala/swaydb/ActorHooks.scala | 2 +- build.sbt | 16 ++++++++-------- .../main/scala/swaydb/core}/cache/Cache.scala | 2 +- .../src/main/scala/swaydb/core}/cache/Lazy.scala | 2 +- .../scala/swaydb/core}/cache/CacheSpec.scala | 2 +- .../test/scala/swaydb/core}/cache/LazySpec.scala | 2 +- .../core}/compression/CompressionInternal.scala | 0 .../core}/compression/CompressorInternal.scala | 0 .../core}/compression/DecompressorInternal.scala | 0 .../src/test/resources/logback.xml | 0 .../core}/compression/CompressionSpec.scala | 0 .../core}/compression/CompressionTestGen.scala | 0 .../swaydb/core/cache/CachePerformanceSpec.scala | 2 +- .../main/scala/swaydb/core/data/KeyValue.scala | 2 +- .../main/scala/swaydb/core/io/file/DBFile.scala | 2 +- .../core/segment/PersistentSegmentMany.scala | 2 +- .../swaydb/core/segment/block/BlockCache.scala | 2 +- .../core/segment/block/BlockCacheState.scala | 2 +- .../block/segment/SegmentBlockCache.scala | 2 +- .../swaydb/core/sweeper/ByteBufferSweeper.scala | 2 +- .../scala/swaydb/core/sweeper/FileSweeper.scala | 2 +- .../swaydb/core/sweeper/MemorySweeper.scala | 8 ++++---- .../test/scala/swaydb/core/TestCaseSweeper.scala | 2 +- core/src/test/scala/swaydb/core/TestData.scala | 2 +- .../swaydb/core/segment/KeyMatcherSpec.scala | 2 +- 26 files changed, 30 insertions(+), 30 deletions(-) rename {cache/src/main/scala/swaydb => core-cache/src/main/scala/swaydb/core}/cache/Cache.scala (99%) rename {cache/src/main/scala/swaydb => core-cache/src/main/scala/swaydb/core}/cache/Lazy.scala (99%) rename {cache/src/test/scala/swaydb => core-cache/src/test/scala/swaydb/core}/cache/CacheSpec.scala (99%) rename {cache/src/test/scala/swaydb => core-cache/src/test/scala/swaydb/core}/cache/LazySpec.scala (99%) rename {compression/src/main/scala/swaydb => core-compression/src/main/scala/swaydb/core}/compression/CompressionInternal.scala (100%) rename {compression/src/main/scala/swaydb => core-compression/src/main/scala/swaydb/core}/compression/CompressorInternal.scala (100%) rename {compression/src/main/scala/swaydb => core-compression/src/main/scala/swaydb/core}/compression/DecompressorInternal.scala (100%) rename {compression => core-compression}/src/test/resources/logback.xml (100%) rename {compression/src/test/scala/swaydb => core-compression/src/test/scala/swaydb/core}/compression/CompressionSpec.scala (100%) rename {compression/src/test/scala/swaydb => core-compression/src/test/scala/swaydb/core}/compression/CompressionTestGen.scala (100%) diff --git a/actor/src/main/scala/swaydb/Actor.scala b/actor/src/main/scala/swaydb/Actor.scala index 02a2a2ad1..7f01ff514 100644 --- 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 index d89390b6d..503cb3fb4 100644 --- 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 index 6217300f0..8e5ede869 100644 --- 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/cache/src/main/scala/swaydb/cache/Cache.scala b/core-cache/src/main/scala/swaydb/core/cache/Cache.scala similarity index 99% rename from cache/src/main/scala/swaydb/cache/Cache.scala rename to core-cache/src/main/scala/swaydb/core/cache/Cache.scala index 9dfcf13cf..975a04ea7 100644 --- a/cache/src/main/scala/swaydb/cache/Cache.scala +++ b/core-cache/src/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 b/core-cache/src/main/scala/swaydb/core/cache/Lazy.scala similarity index 99% rename from cache/src/main/scala/swaydb/cache/Lazy.scala rename to core-cache/src/main/scala/swaydb/core/cache/Lazy.scala index 80a07aa50..575ca1aec 100644 --- a/cache/src/main/scala/swaydb/cache/Lazy.scala +++ b/core-cache/src/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/cache/src/test/scala/swaydb/cache/CacheSpec.scala b/core-cache/src/test/scala/swaydb/core/cache/CacheSpec.scala similarity index 99% rename from cache/src/test/scala/swaydb/cache/CacheSpec.scala rename to core-cache/src/test/scala/swaydb/core/cache/CacheSpec.scala index 18bd6c84b..c6d1192b9 100644 --- a/cache/src/test/scala/swaydb/cache/CacheSpec.scala +++ b/core-cache/src/test/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/cache/src/test/scala/swaydb/cache/LazySpec.scala b/core-cache/src/test/scala/swaydb/core/cache/LazySpec.scala similarity index 99% rename from cache/src/test/scala/swaydb/cache/LazySpec.scala rename to core-cache/src/test/scala/swaydb/core/cache/LazySpec.scala index 23d8cdfef..c3c78ddd6 100644 --- a/cache/src/test/scala/swaydb/cache/LazySpec.scala +++ b/core-cache/src/test/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/compression/src/main/scala/swaydb/compression/CompressionInternal.scala b/core-compression/src/main/scala/swaydb/core/compression/CompressionInternal.scala similarity index 100% rename from compression/src/main/scala/swaydb/compression/CompressionInternal.scala rename to core-compression/src/main/scala/swaydb/core/compression/CompressionInternal.scala diff --git a/compression/src/main/scala/swaydb/compression/CompressorInternal.scala b/core-compression/src/main/scala/swaydb/core/compression/CompressorInternal.scala similarity index 100% rename from compression/src/main/scala/swaydb/compression/CompressorInternal.scala rename to core-compression/src/main/scala/swaydb/core/compression/CompressorInternal.scala diff --git a/compression/src/main/scala/swaydb/compression/DecompressorInternal.scala b/core-compression/src/main/scala/swaydb/core/compression/DecompressorInternal.scala similarity index 100% rename from compression/src/main/scala/swaydb/compression/DecompressorInternal.scala rename to core-compression/src/main/scala/swaydb/core/compression/DecompressorInternal.scala diff --git a/compression/src/test/resources/logback.xml b/core-compression/src/test/resources/logback.xml similarity index 100% rename from compression/src/test/resources/logback.xml rename to core-compression/src/test/resources/logback.xml diff --git a/compression/src/test/scala/swaydb/compression/CompressionSpec.scala b/core-compression/src/test/scala/swaydb/core/compression/CompressionSpec.scala similarity index 100% rename from compression/src/test/scala/swaydb/compression/CompressionSpec.scala rename to core-compression/src/test/scala/swaydb/core/compression/CompressionSpec.scala diff --git a/compression/src/test/scala/swaydb/compression/CompressionTestGen.scala b/core-compression/src/test/scala/swaydb/core/compression/CompressionTestGen.scala similarity index 100% rename from compression/src/test/scala/swaydb/compression/CompressionTestGen.scala rename to core-compression/src/test/scala/swaydb/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 index e546c7e88..da289ea68 100644 --- 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 index 888b4d5d6..318cc0a9d 100644 --- 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 index 8b13bd372..5ff768bb4 100644 --- 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 index f982a09bf..91edef6ce 100644 --- 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 index f4cda7002..ffd4a6b9c 100644 --- 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 index 7623d61bf..f6800f491 100644 --- 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 index 5e218fd9f..ff669a66a 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 @@ -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 index dc7cf7631..b2b1b597c 100644 --- 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 index d518dbc7f..fe23f6623 100644 --- 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 index 10f362b69..f2fd98f08 100644 --- 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 index 4f962517b..c199bafba 100644 --- 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 index b63587318..e17736438 100644 --- 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 index a9664377a..0823ead25 100644 --- 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