From 50905e8b5465b629ff275199f0a1da451982a844 Mon Sep 17 00:00:00 2001 From: simerplaha Date: Fri, 12 Nov 2021 04:35:27 +1100 Subject: [PATCH] format --- .github/FUNDING.yml | 2 +- .../main/scala/swaydb/test/TestActor.scala | 2 +- .../PathsDistributorPerformanceSpec.scala | 4 +- .../segment/SegmentReadPerformanceSpec.scala | 14 +++--- .../scala/swaydb/core/CoreInitializer.scala | 8 ++-- .../scala/swaydb/core/data/KeyValue.scala | 1 - .../swaydb/core/function/FunctionStore.scala | 3 +- .../main/scala/swaydb/core/gc/GCStats.scala | 1 - .../scala/swaydb/core/level/LevelRef.scala | 2 +- .../swaydb/core/level/PathsDistributor.scala | 7 ++- .../behaviour/BehaviourCompactionTask.scala | 1 - .../scala/swaydb/core/log/PersistentLog.scala | 2 +- .../log/applied/AppliedFunctionsLog.scala | 2 +- .../core/log/serializer/ValueSerializer.scala | 1 - .../swaydb/core/merge/KeyValueGrouper.scala | 2 +- .../stats/MergeStatsSizeCalculator.scala | 4 +- .../swaydb/core/segment/MemorySegment.scala | 9 ++-- .../core/segment/PersistentSegment.scala | 12 ++--- .../core/segment/PersistentSegmentMany.scala | 12 ++--- .../core/segment/PersistentSegmentOne.scala | 12 ++--- .../scala/swaydb/core/segment/Segment.scala | 2 +- .../core/segment/assigner/Assigner.scala | 10 ++--- .../swaydb/core/segment/block/Block.scala | 1 - .../swaydb/core/segment/block/BlockOps.scala | 2 + .../block/reader/BlockReaderBase.scala | 1 - .../segment/block/reader/BlockRefReader.scala | 2 +- .../segment/block/reader/BlockedReader.scala | 3 +- .../block/reader/UnblockedReader.scala | 10 +++-- .../block/segment/SegmentBlockCache.scala | 4 +- .../segment/footer/SegmentFooterBlock.scala | 7 ++- .../block/sortedindex/SortedIndexBlock.scala | 10 ++--- .../swaydb/core/segment/defrag/Defrag.scala | 2 +- .../core/segment/defrag/DefragCommon.scala | 2 +- .../core/segment/defrag/DefragGap.scala | 2 +- .../segment/defrag/DefragMemorySegment.scala | 2 +- .../entry/generators/IdsGenerator.scala | 4 +- .../generators/IfConditionGenerator.scala | 4 +- .../core/segment/entry/id/KeyValueId.scala | 1 - .../core/segment/entry/reader/KeyReader.scala | 1 - .../segment/entry/writer/DeadlineWriter.scala | 1 - .../segment/entry/writer/TimeWriter.scala | 20 ++++----- .../segment/entry/writer/ValueWriter.scala | 1 - .../core/segment/io/SegmentReadIO.scala | 8 ++-- .../core/sweeper/ByteBufferCleaner.scala | 10 ++--- .../core/sweeper/ByteBufferSweeper.scala | 4 +- .../scala/swaydb/core/util/Benchmark.scala | 10 ++--- .../swaydb/core/util/KeyCompressor.scala | 1 - .../swaydb/core/PrivateMethodInvokers.scala | 2 +- .../src/test/scala/swaydb/core/TestBase.scala | 28 ++++++------ .../scala/swaydb/core/TestCaseSweeper.scala | 2 +- .../src/test/scala/swaydb/core/TestData.scala | 16 +++---- .../scala/swaydb/core/TestForceSave.scala | 2 +- .../test/scala/swaydb/core/TestSweeper.scala | 2 +- .../test/scala/swaydb/core/TestTimer.scala | 3 +- .../swaydb/core/level/LevelCollpaseSpec.scala | 10 ++--- .../core/level/LevelKeyValuesSpec.scala | 2 +- .../swaydb/core/level/LevelMergeSpec.scala | 4 +- .../swaydb/core/level/LevelReadNoneSpec.scala | 2 +- .../swaydb/core/level/LevelReadSomeSpec.scala | 7 +-- .../swaydb/core/level/LevelReadSpec.scala | 10 ++--- .../swaydb/core/level/LevelRefreshSpec.scala | 2 +- .../core/level/LevelRemoveSegmentSpec.scala | 10 ++--- .../swaydb/core/level/LevelSegmentSpec.scala | 2 +- .../scala/swaydb/core/level/LevelSpec.scala | 2 +- .../core/level/PathsDistributorSpec.scala | 10 ++--- .../task/assigner/LevelTaskAssignerSpec.scala | 2 +- ...ehaviourCompactionTask_collapse_Spec.scala | 2 +- ...eUp_compactLastLevel_multiLevel_Spec.scala | 2 +- ...Up_compactLastLevel_singleLevel_Spec.scala | 2 +- .../level/tool/AppendixRepairerSpec.scala | 2 +- .../core/log/counter/CounterLogSpec.scala | 2 +- .../log/serializer/AppendixLogEntrySpec.scala | 1 - .../core/merge/FunctionMergerSpec.scala | 2 +- .../merge/FunctionMerger_Function_Spec.scala | 2 +- .../FunctionMerger_PendingApply_Spec.scala | 2 +- .../core/merge/FunctionMerger_Put_Spec.scala | 2 +- .../merge/FunctionMerger_Remove_Spec.scala | 2 +- .../merge/FunctionMerger_Update_Spec.scala | 2 +- .../core/merge/KeyValueGrouperSpec.scala | 2 +- .../KeyValueMerger_Fixed_Into_Range.scala | 3 +- .../KeyValueMerger_Range_Into_Fixed.scala | 3 +- .../KeyValueMerger_Range_Into_Range.scala | 7 ++- .../core/merge/PendingApplyMergerSpec.scala | 2 +- .../swaydb/core/merge/PutMergerSpec.scala | 2 +- .../swaydb/core/merge/RemoveMergerSpec.scala | 2 +- .../merge/RemoveMerger_Function_Spec.scala | 2 +- .../RemoveMerger_PendingApply_Spec.scala | 2 +- .../core/merge/RemoveMerger_Put_Spec.scala | 2 +- .../core/merge/RemoveMerger_Remove_Spec.scala | 2 +- .../core/merge/RemoveMerger_Update_Spec.scala | 2 +- .../swaydb/core/merge/UpdateMergerSpec.scala | 2 +- .../merge/UpdateMerger_Function_Spec.scala | 2 +- .../UpdateMerger_PendingApply_Spec.scala | 2 +- .../core/merge/UpdateMerger_Put_Spec.scala | 2 +- .../core/merge/UpdateMerger_Remove_Spec.scala | 2 +- .../core/merge/UpdateMerger_Update_Spec.scala | 2 +- .../stats/MergeStatsSizeCalculatorSpec.scala | 4 +- .../swaydb/core/segment/KeyMatcherSpec.scala | 4 +- .../swaydb/core/segment/SegmentGetSpec.scala | 7 +-- .../segment/SegmentKeyValueCountSpec.scala | 6 +-- .../segment/SegmentMemorySweeperSpec.scala | 4 +- .../swaydb/core/segment/SegmentReadSpec.scala | 14 ++---- .../core/segment/SegmentSerialiserSpec.scala | 2 +- .../core/segment/SegmentWriteSpec.scala | 10 ++--- .../SegmentAssigner_Assign_Spec.scala | 11 ++--- .../core/segment/block/BlockCacheSpec.scala | 8 +--- .../swaydb/core/segment/block/BlockSpec.scala | 5 +-- .../segment/block/SegmentBlockCacheSpec.scala | 10 ++--- .../SegmentBlockInitialisationSpec.scala | 8 ++-- ...IndexBlock_Segment_RandomSearch_Spec.scala | 8 ++-- .../bloomfilter/BloomFilterBlockSpec.scala | 2 +- .../block/hashindex/HashIndexBlockSpec.scala | 6 +-- .../block/reader/BlockedReaderSpec.scala | 4 +- .../block/segment/SegmentBlockSpec.scala | 6 +-- .../sortedindex/SortedIndexBlockSpec.scala | 4 +- .../block/values/ValuesBlockSpec.scala | 4 +- .../core/segment/defrag/DefragGapSpec.scala | 44 +++++++++---------- .../defrag/DefragSegment_RunMany_Spec.scala | 10 ++--- .../defrag/DefragSegment_RunOne_Spec.scala | 12 ++--- .../core/segment/defrag/DefragSpec.scala | 12 ++--- .../segment/entry/EntryReaderWriterSpec.scala | 2 +- .../writer/DeadlineReaderWriterSpec.scala | 5 +-- .../entry/writer/KeyWriterReaderSpec.scala | 2 +- .../entry/writer/ValueReaderWriterSpec.scala | 6 +-- .../ref/SegmentRefGetBehaviorSpec.scala | 2 +- .../ref/search/SegmentReadStateSpec.scala | 2 +- .../swaydb/core/sweeper/FileSweeperSpec.scala | 2 +- .../scala/swaydb/core/util/BytesSpec.scala | 1 - .../swaydb/core/util/CollectionsSpec.scala | 1 - data/src/main/scala/swaydb/Expiration.scala | 1 - data/src/main/scala/swaydb/Prepare.scala | 1 - .../MemoryLevelZeroConfigBuilder.scala | 2 - .../data/repairAppendix/SegmentInfo.scala | 4 +- .../swaydb/data/slice/SliceOptionSpec.scala | 1 - .../scala/swaydb/effect/ReserveSpec.scala | 2 +- .../scala/swaydb/macros/VersionReader.scala | 1 - .../scala/swaydb/java/KeyComparator.scala | 3 +- .../src/main/scala/swaydb/java/MapT.scala | 4 +- .../src/main/scala/swaydb/java/MultiMap.scala | 2 +- .../src/main/scala/swaydb/java/Queue.scala | 6 +-- .../src/main/scala/swaydb/java/Set.scala | 2 +- .../src/main/scala/swaydb/java/SetMap.scala | 2 +- .../src/main/scala/swaydb/java/SetMapT.scala | 8 ++-- .../main/scala/swaydb/java/StorageUnits.scala | 1 + .../persistent/EventuallyPersistentMap.scala | 4 +- .../EventuallyPersistentMultiMap.scala | 4 +- .../EventuallyPersistentQueue.scala | 3 +- .../persistent/EventuallyPersistentSet.scala | 4 +- .../EventuallyPersistentSetMap.scala | 4 +- .../swaydb/java/memory/MemoryMultiMap.scala | 1 - .../swaydb/java/memory/MemoryQueue.scala | 1 - .../swaydb/java/memory/MemorySetMap.scala | 1 - .../java/multimap/MultiPrepareBuilder.scala | 5 +-- .../java/persistent/PersistentMultiMap.scala | 3 +- .../java/persistent/PersistentQueue.scala | 3 +- .../java/persistent/PersistentSet.scala | 3 +- .../java/persistent/PersistentSetMap.scala | 1 - .../swaydb/java/serializers/Default.scala | 6 +-- .../PersistentReportRebootErrorsTest.java | 2 +- .../src/test/java/swaydb/java/QueueTest.java | 3 +- .../stress/simulation/SimulationSpec.scala | 5 +-- .../simulation/SimulationSuiteSpec.scala | 1 - .../stress/weather/WeatherDataSuiteSpec.scala | 3 +- swaydb/src/main/scala/swaydb/Map.scala | 2 +- swaydb/src/main/scala/swaydb/MultiMap.scala | 2 +- swaydb/src/main/scala/swaydb/Queue.scala | 2 +- swaydb/src/main/scala/swaydb/Set.scala | 2 +- swaydb/src/main/scala/swaydb/SetMap.scala | 2 +- .../swaydb/eventually/persistent/Map.scala | 2 +- .../eventually/persistent/MultiMap.scala | 2 +- .../main/scala/swaydb/multimap/MultiKey.scala | 1 - .../main/scala/swaydb/persistent/Map.scala | 1 - .../scala/swaydb/persistent/MultiMap.scala | 1 - .../main/scala/swaydb/persistent/Queue.scala | 1 - .../main/scala/swaydb/persistent/Set.scala | 1 - .../api/SwayDBAppliedFunctionsSpec.scala | 2 +- 176 files changed, 343 insertions(+), 413 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index f80201a6c..910d20929 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,3 @@ # These are supported funding model platforms -github: [simerplaha] +github: [ simerplaha ] diff --git a/actor/src/main/scala/swaydb/test/TestActor.scala b/actor/src/main/scala/swaydb/test/TestActor.scala index df5911041..2441fd72f 100644 --- a/actor/src/main/scala/swaydb/test/TestActor.scala +++ b/actor/src/main/scala/swaydb/test/TestActor.scala @@ -17,7 +17,7 @@ package swaydb.test import swaydb.ActorConfig.QueueOrder -import swaydb.{Actor, ActorQueue, IO, Scheduler} +import swaydb.{Actor, ActorQueue, Scheduler} import java.util.concurrent.ConcurrentLinkedQueue import scala.concurrent.duration.{FiniteDuration, _} diff --git a/core-performance/src/test/scala/swaydb/core/level/PathsDistributorPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/level/PathsDistributorPerformanceSpec.scala index 4dd6afc54..0603cb008 100644 --- a/core-performance/src/test/scala/swaydb/core/level/PathsDistributorPerformanceSpec.scala +++ b/core-performance/src/test/scala/swaydb/core/level/PathsDistributorPerformanceSpec.scala @@ -65,8 +65,8 @@ class PathsDistributorPerformanceSpec extends TestBase { effect.Dir(path5, 5) ), segments = - //for each Segment's request randomly distribute Segments so that there is always un-even distribution - //of Segments between all 5 folders. + //for each Segment's request randomly distribute Segments so that there is always un-even distribution + //of Segments between all 5 folders. randomlyDistributeSegments ) 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 ce29412f1..31bc3f863 100644 --- a/core-performance/src/test/scala/swaydb/core/segment/SegmentReadPerformanceSpec.scala +++ b/core-performance/src/test/scala/swaydb/core/segment/SegmentReadPerformanceSpec.scala @@ -22,12 +22,12 @@ 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, BinarySearchIndexBlockConfig} -import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockConfig} -import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig} -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +import swaydb.core.segment.block.binarysearch.{BinarySearchEntryFormat, BinarySearchIndexBlockConfig} +import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig +import swaydb.core.segment.block.hashindex.HashIndexBlockConfig +import swaydb.core.segment.block.segment.SegmentBlockConfig +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig +import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.segment.entry.reader.PersistentReader import swaydb.core.segment.io.SegmentReadIO import swaydb.core.segment.ref.search.ThreadReadState @@ -166,7 +166,7 @@ class SegmentReadPerformanceSpec extends TestBase { cacheBlocksOnCreate = false, minSize = Int.MaxValue, maxCount = - // keyValuesCount / 100, + // keyValuesCount / 100, keyValuesCount, segmentRefCacheLife = SegmentRefCacheLife.Temporary, enableHashIndexForListSegment = true, diff --git a/core/src/main/scala/swaydb/core/CoreInitializer.scala b/core/src/main/scala/swaydb/core/CoreInitializer.scala index 53655a796..512ce4a4b 100644 --- a/core/src/main/scala/swaydb/core/CoreInitializer.scala +++ b/core/src/main/scala/swaydb/core/CoreInitializer.scala @@ -27,10 +27,10 @@ import swaydb.core.level.zero.LevelZero import swaydb.core.level.{Level, LevelCloser, NextLevel} import swaydb.core.segment.block import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig -import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockConfig} -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig +import swaydb.core.segment.block.segment.SegmentBlockConfig +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig +import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.segment.ref.search.ThreadReadState import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.sweeper.{ByteBufferSweeper, FileSweeper, MemorySweeper} diff --git a/core/src/main/scala/swaydb/core/data/KeyValue.scala b/core/src/main/scala/swaydb/core/data/KeyValue.scala index f1a5f93be..b7793722e 100644 --- a/core/src/main/scala/swaydb/core/data/KeyValue.scala +++ b/core/src/main/scala/swaydb/core/data/KeyValue.scala @@ -16,7 +16,6 @@ package swaydb.core.data -import swaydb.IO 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/function/FunctionStore.scala b/core/src/main/scala/swaydb/core/function/FunctionStore.scala index ed65c2f59..deda58142 100644 --- a/core/src/main/scala/swaydb/core/function/FunctionStore.scala +++ b/core/src/main/scala/swaydb/core/function/FunctionStore.scala @@ -16,13 +16,12 @@ package swaydb.core.function -import java.util.concurrent.ConcurrentHashMap - import swaydb.OK import swaydb.core.data.{SwayFunction, Value} import swaydb.data.order.KeyOrder import swaydb.data.slice.Slice +import java.util.concurrent.ConcurrentHashMap import scala.annotation.tailrec import scala.collection.mutable import scala.jdk.CollectionConverters._ diff --git a/core/src/main/scala/swaydb/core/gc/GCStats.scala b/core/src/main/scala/swaydb/core/gc/GCStats.scala index 53230bfbd..1ede01333 100644 --- a/core/src/main/scala/swaydb/core/gc/GCStats.scala +++ b/core/src/main/scala/swaydb/core/gc/GCStats.scala @@ -17,7 +17,6 @@ package swaydb.core.gc import com.sun.management.GarbageCollectionNotificationInfo -import swaydb.utils.StorageUnits._ import javax.management.{Notification, NotificationEmitter, NotificationListener} import scala.concurrent.{Future, Promise} diff --git a/core/src/main/scala/swaydb/core/level/LevelRef.scala b/core/src/main/scala/swaydb/core/level/LevelRef.scala index 79c10647a..3bb5166a3 100644 --- a/core/src/main/scala/swaydb/core/level/LevelRef.scala +++ b/core/src/main/scala/swaydb/core/level/LevelRef.scala @@ -16,7 +16,6 @@ package swaydb.core.level -import java.nio.file.Path import swaydb.core.data.KeyValue import swaydb.core.level.zero.LevelZero import swaydb.core.segment.ref.search.ThreadReadState @@ -26,6 +25,7 @@ import swaydb.data.config.{ForceSave, MMAP} import swaydb.data.slice.{Slice, SliceOption} import swaydb.{Bag, IO} +import java.nio.file.Path import scala.annotation.tailrec import scala.collection.mutable.ListBuffer import scala.concurrent.duration.FiniteDuration diff --git a/core/src/main/scala/swaydb/core/level/PathsDistributor.scala b/core/src/main/scala/swaydb/core/level/PathsDistributor.scala index 343c1a239..2284314f1 100644 --- a/core/src/main/scala/swaydb/core/level/PathsDistributor.scala +++ b/core/src/main/scala/swaydb/core/level/PathsDistributor.scala @@ -16,10 +16,6 @@ package swaydb.core.level -import java.nio.file.Path -import java.util -import java.util.concurrent.ConcurrentLinkedDeque -import java.util.concurrent.atomic.AtomicBoolean import com.typesafe.scalalogging.LazyLogging import swaydb.Error.Segment.ExceptionHandler import swaydb.IO @@ -27,6 +23,9 @@ import swaydb.core.segment.Segment import swaydb.effect.{Dir, Reserve} import swaydb.utils.Options +import java.nio.file.Path +import java.util +import java.util.concurrent.ConcurrentLinkedDeque import scala.annotation.tailrec import scala.collection.compat._ import scala.jdk.CollectionConverters._ 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 3a9e9ab9f..4e5736770 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 @@ -17,7 +17,6 @@ package swaydb.core.level.compaction.throttle.behaviour import com.typesafe.scalalogging.LazyLogging -import swaydb.DefActor import swaydb.core.data.DefIO import swaydb.core.level._ import swaydb.core.level.compaction.io.CompactionIO diff --git a/core/src/main/scala/swaydb/core/log/PersistentLog.scala b/core/src/main/scala/swaydb/core/log/PersistentLog.scala index 47c059042..3a8efb4b3 100644 --- a/core/src/main/scala/swaydb/core/log/PersistentLog.scala +++ b/core/src/main/scala/swaydb/core/log/PersistentLog.scala @@ -20,7 +20,7 @@ import com.typesafe.scalalogging.LazyLogging import swaydb.Error.Log.ExceptionHandler import swaydb.IO import swaydb.core.io.file.{DBFile, ForceSaveApplier} -import swaydb.core.log.serializer.{LogEntrySerialiser, LogEntryReader, LogEntryWriter} +import swaydb.core.log.serializer.{LogEntryReader, LogEntrySerialiser, LogEntryWriter} import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.sweeper.{ByteBufferSweeper, FileSweeper} import swaydb.data.config.MMAP 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 e9bcf0f66..8d84f11cd 100644 --- a/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLog.scala +++ b/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLog.scala @@ -20,8 +20,8 @@ import com.typesafe.scalalogging.LazyLogging import swaydb.core.function.FunctionStore import swaydb.core.io.file.ForceSaveApplier import swaydb.core.log -import swaydb.core.log.{Log, RecoveryResult} import swaydb.core.log.serializer.{AppliedFunctionsLogEntryReader, AppliedFunctionsLogEntryWriter} +import swaydb.core.log.{Log, RecoveryResult} import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.sweeper.FileSweeper import swaydb.data.config.MMAP 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 5855afbb5..4c749284e 100644 --- a/core/src/main/scala/swaydb/core/log/serializer/ValueSerializer.scala +++ b/core/src/main/scala/swaydb/core/log/serializer/ValueSerializer.scala @@ -16,7 +16,6 @@ package swaydb.core.log.serializer -import swaydb.IO import swaydb.core.data.{Time, Value} import swaydb.core.io.reader.Reader import swaydb.core.util.Times._ diff --git a/core/src/main/scala/swaydb/core/merge/KeyValueGrouper.scala b/core/src/main/scala/swaydb/core/merge/KeyValueGrouper.scala index e3b0ecb1c..383f1ee27 100644 --- a/core/src/main/scala/swaydb/core/merge/KeyValueGrouper.scala +++ b/core/src/main/scala/swaydb/core/merge/KeyValueGrouper.scala @@ -17,7 +17,7 @@ package swaydb.core.merge import com.typesafe.scalalogging.LazyLogging -import swaydb.core.data.{Memory, Persistent, Value, _} +import swaydb.core.data._ import swaydb.core.merge.stats.MergeStats /** diff --git a/core/src/main/scala/swaydb/core/merge/stats/MergeStatsSizeCalculator.scala b/core/src/main/scala/swaydb/core/merge/stats/MergeStatsSizeCalculator.scala index 689aab966..c02116dc4 100644 --- a/core/src/main/scala/swaydb/core/merge/stats/MergeStatsSizeCalculator.scala +++ b/core/src/main/scala/swaydb/core/merge/stats/MergeStatsSizeCalculator.scala @@ -17,8 +17,8 @@ package swaydb.core.merge.stats import swaydb.core.data.Memory -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlockConfig, SortedIndexBlock} +import swaydb.core.segment.block.segment.SegmentBlockConfig +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig import scala.collection.mutable.ListBuffer diff --git a/core/src/main/scala/swaydb/core/segment/MemorySegment.scala b/core/src/main/scala/swaydb/core/segment/MemorySegment.scala index d7032af3b..751353e64 100644 --- a/core/src/main/scala/swaydb/core/segment/MemorySegment.scala +++ b/core/src/main/scala/swaydb/core/segment/MemorySegment.scala @@ -17,13 +17,12 @@ package swaydb.core.segment import com.typesafe.scalalogging.LazyLogging -import swaydb.core.data.{DefIO, Memory, _} +import swaydb.core.data._ import swaydb.core.function.FunctionStore import swaydb.core.level.PathsDistributor import swaydb.core.merge.stats.MergeStats import swaydb.core.segment.assigner.Assignable -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.SortedIndexBlock +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.defrag.DefragMemorySegment import swaydb.core.segment.ref.search.ThreadReadState import swaydb.core.sweeper.FileSweeper @@ -82,8 +81,8 @@ private[core] final case class MemorySegment(path: Path, removeDeletes: Boolean, createdInLevel: Int, segmentConfig: SegmentBlockConfig)(implicit idGenerator: IDGenerator, - executionContext: ExecutionContext, - compactionParallelism: CompactionParallelism): Future[DefIO[MemorySegmentOption, Iterable[MemorySegment]]] = + executionContext: ExecutionContext, + compactionParallelism: CompactionParallelism): Future[DefIO[MemorySegmentOption, Iterable[MemorySegment]]] = if (deleted) Future.failed(swaydb.Exception.NoSuchFile(path)) else { diff --git a/core/src/main/scala/swaydb/core/segment/PersistentSegment.scala b/core/src/main/scala/swaydb/core/segment/PersistentSegment.scala index 6d17673f9..b07fa95aa 100644 --- a/core/src/main/scala/swaydb/core/segment/PersistentSegment.scala +++ b/core/src/main/scala/swaydb/core/segment/PersistentSegment.scala @@ -24,11 +24,11 @@ import swaydb.core.merge.stats.MergeStats import swaydb.core.segment.assigner.Assignable import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig -import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig} -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.hashindex.HashIndexBlockConfig +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.block.segment.data.TransientSegment -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig +import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.util.IDGenerator import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.{MMAP, SegmentRefCacheLife} @@ -82,8 +82,8 @@ trait PersistentSegment extends Segment with PersistentSegmentOption { hashIndexConfig: HashIndexBlockConfig, bloomFilterConfig: BloomFilterBlockConfig, segmentConfig: SegmentBlockConfig)(implicit idGenerator: IDGenerator, - ec: ExecutionContext, - compactionParallelism: CompactionParallelism): Future[DefIO[PersistentSegment, Slice[TransientSegment.OneOrRemoteRefOrMany]]] + ec: ExecutionContext, + compactionParallelism: CompactionParallelism): Future[DefIO[PersistentSegment, Slice[TransientSegment.OneOrRemoteRefOrMany]]] } diff --git a/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala b/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala index 391d077f0..8fb9c97da 100644 --- a/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala +++ b/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala @@ -30,12 +30,12 @@ import swaydb.core.segment.assigner.Assignable import swaydb.core.segment.block.BlockCache import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig -import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig} +import swaydb.core.segment.block.hashindex.HashIndexBlockConfig import swaydb.core.segment.block.reader.BlockRefReader -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig, SegmentBlockOffset} import swaydb.core.segment.block.segment.data.{TransientSegment, TransientSegmentSerialiser} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +import swaydb.core.segment.block.segment.{SegmentBlockConfig, SegmentBlockOffset} +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig +import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.segment.defrag.DefragPersistentSegment import swaydb.core.segment.io.SegmentReadIO import swaydb.core.segment.ref.search.ThreadReadState @@ -871,8 +871,8 @@ protected case class PersistentSegmentMany(file: DBFile, hashIndexConfig: HashIndexBlockConfig, bloomFilterConfig: BloomFilterBlockConfig, segmentConfig: SegmentBlockConfig)(implicit idGenerator: IDGenerator, - ec: ExecutionContext, - compactionParallelism: CompactionParallelism): Future[DefIO[PersistentSegmentMany, Slice[TransientSegment.OneOrRemoteRefOrMany]]] = + ec: ExecutionContext, + compactionParallelism: CompactionParallelism): Future[DefIO[PersistentSegmentMany, Slice[TransientSegment.OneOrRemoteRefOrMany]]] = Segment.refreshForNewLevel( keyValues = iterator(segmentConfig.initialiseIteratorsInOneSeek), removeDeletes = removeDeletes, diff --git a/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala b/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala index 04513795e..63f193505 100644 --- a/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala +++ b/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala @@ -27,13 +27,13 @@ import swaydb.core.level.compaction.io.CompactionIO import swaydb.core.merge.stats.MergeStats import swaydb.core.segment.assigner.Assignable import swaydb.core.segment.block.BlockCache -import swaydb.core.segment.block.binarysearch.{BinarySearchIndexBlock, BinarySearchIndexBlockOffset, BinarySearchIndexBlockConfig} -import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockOffset, BloomFilterBlockConfig} -import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockOffset, HashIndexBlockConfig} +import swaydb.core.segment.block.binarysearch.{BinarySearchIndexBlock, BinarySearchIndexBlockConfig, BinarySearchIndexBlockOffset} +import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockConfig, BloomFilterBlockOffset} +import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig, HashIndexBlockOffset} import swaydb.core.segment.block.reader.{BlockRefReader, UnblockedReader} import swaydb.core.segment.block.segment.data.TransientSegment import swaydb.core.segment.block.segment.footer.SegmentFooterBlock -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockCache, SegmentBlockConfig} +import swaydb.core.segment.block.segment.{SegmentBlockCache, SegmentBlockConfig} import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig, SortedIndexBlockOffset} import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig, ValuesBlockOffset} import swaydb.core.segment.defrag.DefragPersistentSegment @@ -352,8 +352,8 @@ protected case class PersistentSegmentOne(file: DBFile, hashIndexConfig: HashIndexBlockConfig, bloomFilterConfig: BloomFilterBlockConfig, segmentConfig: SegmentBlockConfig)(implicit idGenerator: IDGenerator, - ec: ExecutionContext, - compactionParallelism: CompactionParallelism): Future[DefIO[PersistentSegment, Slice[TransientSegment.OneOrRemoteRefOrMany]]] = { + ec: ExecutionContext, + compactionParallelism: CompactionParallelism): Future[DefIO[PersistentSegment, Slice[TransientSegment.OneOrRemoteRefOrMany]]] = { // val footer = ref.getFooter() //if it's created in the same level the required spaces for sortedIndex and values //will be the same as existing or less than the current sizes so there is no need to create a diff --git a/core/src/main/scala/swaydb/core/segment/Segment.scala b/core/src/main/scala/swaydb/core/segment/Segment.scala index 83bb4ddb6..54c95b383 100644 --- a/core/src/main/scala/swaydb/core/segment/Segment.scala +++ b/core/src/main/scala/swaydb/core/segment/Segment.scala @@ -17,6 +17,7 @@ package swaydb.core.segment import com.typesafe.scalalogging.LazyLogging +import swaydb.Aggregator import swaydb.Error.Segment.ExceptionHandler import swaydb.core.data._ import swaydb.core.function.FunctionStore @@ -49,7 +50,6 @@ import swaydb.data.slice.{Slice, SliceOption} import swaydb.effect.Effect import swaydb.utils.Futures.FutureUnitImplicits import swaydb.utils.{FiniteDurations, SomeOrNone} -import swaydb.{Aggregator, IO} import java.nio.file.Path import scala.annotation.tailrec 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 55a1fcf49..26bc75cf7 100644 --- a/core/src/main/scala/swaydb/core/segment/assigner/Assigner.scala +++ b/core/src/main/scala/swaydb/core/segment/assigner/Assigner.scala @@ -62,7 +62,7 @@ private[core] object Assigner { def assignUnsafeGaps[GAP](keyValues: IterableOnce[Assignable], segments: IterableOnce[Segment], initialiseIteratorsInOneSeek: Boolean)(implicit keyOrder: KeyOrder[Slice[Byte]], - gapCreator: Aggregator.Creator[Assignable, GAP]): ListBuffer[Assignment[GAP, ListBuffer[Assignable], Segment]] = + gapCreator: Aggregator.Creator[Assignable, GAP]): ListBuffer[Assignment[GAP, ListBuffer[Assignable], Segment]] = assignUnsafe[GAP, ListBuffer[Assignable], Segment]( keyValues = keyValues.iterator, segmentsIterator = segments.iterator, @@ -73,7 +73,7 @@ private[core] object Assigner { def assignUnsafeGapsSegmentRef[GAP](keyValues: IterableOnce[Assignable], segments: IterableOnce[SegmentRef], initialiseIteratorsInOneSeek: Boolean)(implicit keyOrder: KeyOrder[Slice[Byte]], - gapCreator: Aggregator.Creator[Assignable, GAP]): ListBuffer[Assignment[GAP, ListBuffer[Assignable], SegmentRef]] = + gapCreator: Aggregator.Creator[Assignable, GAP]): ListBuffer[Assignment[GAP, ListBuffer[Assignable], SegmentRef]] = assignUnsafe[GAP, ListBuffer[Assignable], SegmentRef]( keyValues = keyValues.iterator, segmentsIterator = segments.iterator, @@ -84,9 +84,9 @@ private[core] object Assigner { def assignUnsafeGaps[GAP, MID <: Iterable[_], SEG >: Null](keyValues: IterableOnce[Assignable], segments: IterableOnce[SEG], initialiseIteratorsInOneSeek: Boolean)(implicit keyOrder: KeyOrder[Slice[Byte]], - midCreator: Aggregator.Creator[Assignable, MID], - gapCreator: Aggregator.Creator[Assignable, GAP], - assignmentTarget: AssignmentTarget[SEG]): ListBuffer[Assignment[GAP, MID, SEG]] = + midCreator: Aggregator.Creator[Assignable, MID], + gapCreator: Aggregator.Creator[Assignable, GAP], + assignmentTarget: AssignmentTarget[SEG]): ListBuffer[Assignment[GAP, MID, SEG]] = assignUnsafe[GAP, MID, SEG]( keyValues = keyValues.iterator, segmentsIterator = segments.iterator, 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 796e32cb5..99df296a1 100644 --- a/core/src/main/scala/swaydb/core/segment/block/Block.scala +++ b/core/src/main/scala/swaydb/core/segment/block/Block.scala @@ -17,7 +17,6 @@ package swaydb.core.segment.block import com.typesafe.scalalogging.LazyLogging -import swaydb.IO import swaydb.compression.{CompressionInternal, DecompressorInternal} import swaydb.core.io.reader.Reader import swaydb.core.segment.block.reader.{BlockRefReader, BlockedReader, UnblockedReader} diff --git a/core/src/main/scala/swaydb/core/segment/block/BlockOps.scala b/core/src/main/scala/swaydb/core/segment/block/BlockOps.scala index 6c8f5ce54..ed81241fa 100644 --- a/core/src/main/scala/swaydb/core/segment/block/BlockOps.scala +++ b/core/src/main/scala/swaydb/core/segment/block/BlockOps.scala @@ -17,9 +17,11 @@ package swaydb.core.segment.block private[core] trait BlockOps[O <: BlockOffset, B <: Block[O]] { + def updateBlockOffset(block: B, start: Int, size: Int): B def createOffset(start: Int, size: Int): O def readBlock(header: BlockHeader[O]): B + } 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 b24e958be..7bad4f552 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 @@ -17,7 +17,6 @@ package swaydb.core.segment.block.reader import com.typesafe.scalalogging.LazyLogging -import swaydb.IO import swaydb.core.segment.block.{BlockCache, BlockCacheSource, BlockOffset} import swaydb.data.slice.{Reader, ReaderBase, Slice, SliceOption} 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 aa6e6c419..33a53b50c 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 @@ -19,7 +19,7 @@ package swaydb.core.segment.block.reader import swaydb.core.io.file.DBFile import swaydb.core.io.reader.{FileReader, Reader} import swaydb.core.segment.block._ -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockOffset} +import swaydb.core.segment.block.segment.SegmentBlockOffset import swaydb.data.slice.{Reader, Slice, SliceReader} import swaydb.data.utils.ByteOps 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 e0ffe0e14..3718dfa9b 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 @@ -58,7 +58,8 @@ private[core] class BlockedReader[O <: BlockOffset, B <: Block[O]] private(priva val blockCache: Option[BlockCache.State], val block: B)(implicit val byteOps: ByteOps[Byte]) extends BlockReaderBase { - val offset = block.offset + def offset: O = + block.offset override def moveTo(newPosition: Long): BlockedReader[O, B] = { moveTo(newPosition.toInt) 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 21a93a081..7b6e4f8f6 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 @@ -86,13 +86,15 @@ private[core] class UnblockedReader[O <: BlockOffset, B <: Block[O]] private(val val blockCache: Option[BlockCache.State], private[reader] val reader: Reader[Byte])(implicit val byteOps: ByteOps[Byte]) extends BlockReaderBase with UnblockedReaderOption[O, B] { - val offset = block.offset - - override def isNone: Boolean = false - val hasBlockCache: Boolean = blockCache.isDefined + def offset: O = + block.offset + + override def isNone: Boolean = + false + def underlyingArraySizeOrReaderSize: Int = reader match { case reader: FileReader => 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 cf508d09f..513119996 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 @@ -16,7 +16,6 @@ package swaydb.core.segment.block.segment -import java.nio.file.Path import swaydb.Error.Segment.ExceptionHandler import swaydb.core.data.Persistent import swaydb.core.io.file.DBFile @@ -30,12 +29,13 @@ import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} import swaydb.core.segment.block.{Block, BlockCache, BlockOffset, BlockOps} import swaydb.core.segment.io.SegmentReadIO import swaydb.core.sweeper.MemorySweeper -import swaydb.effect.IOStrategy import swaydb.data.cache.{Cache, Lazy} import swaydb.data.slice.Slice import swaydb.effect.{IOAction, IOStrategy, Reserve} import swaydb.{Error, IO} +import java.nio.file.Path + private[core] object SegmentBlockCache { private val nullIO: IO[Error.Segment, Null] = IO(null) 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 d2954101b..d8042118f 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 @@ -16,17 +16,16 @@ package swaydb.core.segment.block.segment.footer -import swaydb.IO import swaydb.core.io.reader.Reader import swaydb.core.segment.block._ import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockOffset import swaydb.core.segment.block.bloomfilter.BloomFilterBlockOffset import swaydb.core.segment.block.hashindex.HashIndexBlockOffset import swaydb.core.segment.block.reader.UnblockedReader -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockOffset} import swaydb.core.segment.block.segment.data.ClosedBlocks -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockOffset} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} +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.utils.ByteSizeOf 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 358635111..5bc1613b8 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 @@ -468,7 +468,7 @@ private[core] case object SortedIndexBlock extends LazyLogging { //read the minimum number of bytes required for parse this indexEntry. val bytes = sortedIndexReader.read(ByteSizeOf.varInt) val (headerInteger, headerIntegerByteSize) = bytes.readUnsignedIntWithByteSize() - //open the slice if it's a subslice, + //open the slice if it's a sub-slice, val openBytes = bytes.openEnd() //check if the read bytes are enough to parse the entry. @@ -1085,18 +1085,18 @@ private[core] case class SortedIndexBlock(offset: SortedIndexBlockOffset, headerSize: Int, segmentMaxIndexEntrySize: Int, compressionInfo: Option[BlockCompressionInfo]) extends Block[SortedIndexBlockOffset] { - val isBinarySearchable = + val isBinarySearchable: Boolean = !hasPrefixCompression && (normalised || isPreNormalised) - val isNotPreNormalised = + val isNotPreNormalised: Boolean = !hasPrefixCompression && normalised && !isPreNormalised val normalisedByteSize: Int = if (normalised) segmentMaxIndexEntrySize else 0 - val sortedIndexEndOffsetForReads = + val sortedIndexEndOffsetForReads: Int = offset.size - 1 - val hasNormalisedBytes = + val hasNormalisedBytes: Boolean = !isPreNormalised && normalised } 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 72a8a1761..b61b7f07f 100644 --- a/core/src/main/scala/swaydb/core/segment/defrag/Defrag.scala +++ b/core/src/main/scala/swaydb/core/segment/defrag/Defrag.scala @@ -20,7 +20,7 @@ import swaydb.core.data.{DefIO, Memory} import swaydb.core.function.FunctionStore import swaydb.core.merge.stats.{MergeStats, MergeStatsCreator, MergeStatsSizeCalculator} import swaydb.core.segment.assigner.Assignable -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.block.segment.data.TransientSegment import swaydb.core.segment.defrag.DefragSource._ import swaydb.data.order.{KeyOrder, TimeOrder} diff --git a/core/src/main/scala/swaydb/core/segment/defrag/DefragCommon.scala b/core/src/main/scala/swaydb/core/segment/defrag/DefragCommon.scala index a95faa8a1..6e671f0f7 100644 --- a/core/src/main/scala/swaydb/core/segment/defrag/DefragCommon.scala +++ b/core/src/main/scala/swaydb/core/segment/defrag/DefragCommon.scala @@ -17,7 +17,7 @@ package swaydb.core.segment.defrag import swaydb.core.segment.Segment -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.block.segment.data.TransientSegment import swaydb.core.segment.ref.SegmentRef diff --git a/core/src/main/scala/swaydb/core/segment/defrag/DefragGap.scala b/core/src/main/scala/swaydb/core/segment/defrag/DefragGap.scala index 3a491456d..7305cea20 100644 --- a/core/src/main/scala/swaydb/core/segment/defrag/DefragGap.scala +++ b/core/src/main/scala/swaydb/core/segment/defrag/DefragGap.scala @@ -19,7 +19,7 @@ package swaydb.core.segment.defrag import swaydb.core.data.{KeyValue, Memory} import swaydb.core.merge.stats.{MergeStats, MergeStatsCreator, MergeStatsSizeCalculator} import swaydb.core.segment.assigner.Assignable -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.block.segment.data.TransientSegment import swaydb.core.segment.ref.SegmentRef import swaydb.core.segment.{MemorySegment, PersistentSegment, PersistentSegmentMany, Segment} 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 79a564890..d02e0a63f 100644 --- a/core/src/main/scala/swaydb/core/segment/defrag/DefragMemorySegment.scala +++ b/core/src/main/scala/swaydb/core/segment/defrag/DefragMemorySegment.scala @@ -22,7 +22,7 @@ import swaydb.core.level.PathsDistributor import swaydb.core.merge.stats.MergeStats import swaydb.core.segment._ import swaydb.core.segment.assigner.Assignable -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.block.segment.data.TransientSegment import swaydb.core.sweeper.FileSweeper import swaydb.core.util.IDGenerator 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 281914b9c..3f3052bd6 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 @@ -16,11 +16,11 @@ package swaydb.core.segment.entry.generators -import java.nio.file.Paths import swaydb.core.segment.entry.id._ -import swaydb.effect.Effect import swaydb.data.slice.Slice +import swaydb.effect.Effect +import java.nio.file.Paths import scala.collection.mutable.ListBuffer import scala.io.Source diff --git a/core/src/main/scala/swaydb/core/segment/entry/generators/IfConditionGenerator.scala b/core/src/main/scala/swaydb/core/segment/entry/generators/IfConditionGenerator.scala index 470c15e56..75b257189 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/generators/IfConditionGenerator.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/generators/IfConditionGenerator.scala @@ -16,12 +16,12 @@ package swaydb.core.segment.entry.generators -import java.io.PrintWriter -import java.nio.file.Paths import swaydb.core.segment.entry.id._ import swaydb.core.segment.entry.reader.base.BaseEntryReader import swaydb.effect.Effect +import java.io.PrintWriter +import java.nio.file.Paths import scala.jdk.CollectionConverters._ /** diff --git a/core/src/main/scala/swaydb/core/segment/entry/id/KeyValueId.scala b/core/src/main/scala/swaydb/core/segment/entry/id/KeyValueId.scala index 31814ad35..7dbd80d55 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/id/KeyValueId.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/id/KeyValueId.scala @@ -16,7 +16,6 @@ package swaydb.core.segment.entry.id -import swaydb.IO import swaydb.core.segment.entry.reader.base.BaseEntryReader import swaydb.macros.Sealed 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 526052b5a..08eef1798 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 @@ -16,7 +16,6 @@ package swaydb.core.segment.entry.reader -import swaydb.IO import swaydb.core.io.reader.Reader import swaydb.core.segment.entry.id.KeyValueId import swaydb.core.util.Bytes diff --git a/core/src/main/scala/swaydb/core/segment/entry/writer/DeadlineWriter.scala b/core/src/main/scala/swaydb/core/segment/entry/writer/DeadlineWriter.scala index c41fd4120..c08bd577e 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/writer/DeadlineWriter.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/writer/DeadlineWriter.scala @@ -16,7 +16,6 @@ package swaydb.core.segment.entry.writer -import swaydb.IO import swaydb.core.data.Memory import swaydb.core.segment.entry.id.BaseEntryId.DeadlineId import swaydb.core.segment.entry.id.{BaseEntryId, MemoryToKeyValueIdBinder} diff --git a/core/src/main/scala/swaydb/core/segment/entry/writer/TimeWriter.scala b/core/src/main/scala/swaydb/core/segment/entry/writer/TimeWriter.scala index 37d59da18..4cdb0aa71 100644 --- a/core/src/main/scala/swaydb/core/segment/entry/writer/TimeWriter.scala +++ b/core/src/main/scala/swaydb/core/segment/entry/writer/TimeWriter.scala @@ -23,21 +23,21 @@ import swaydb.utils.Options.when private[segment] trait TimeWriter { private[segment] def write[T <: Memory](current: T, - entryId: BaseEntryId.Key, - builder: EntryWriter.Builder)(implicit binder: MemoryToKeyValueIdBinder[T], - valueWriter: ValueWriter, - keyWriter: KeyWriter, - deadlineWriter: DeadlineWriter): Unit + entryId: BaseEntryId.Key, + builder: EntryWriter.Builder)(implicit binder: MemoryToKeyValueIdBinder[T], + valueWriter: ValueWriter, + keyWriter: KeyWriter, + deadlineWriter: DeadlineWriter): Unit } private[segment] object TimeWriter extends TimeWriter { private[segment] def write[T <: Memory](current: T, - entryId: BaseEntryId.Key, - builder: EntryWriter.Builder)(implicit binder: MemoryToKeyValueIdBinder[T], - valueWriter: ValueWriter, - keyWriter: KeyWriter, - deadlineWriter: DeadlineWriter): Unit = + entryId: BaseEntryId.Key, + builder: EntryWriter.Builder)(implicit binder: MemoryToKeyValueIdBinder[T], + valueWriter: ValueWriter, + keyWriter: KeyWriter, + deadlineWriter: DeadlineWriter): Unit = if (current.persistentTime.nonEmpty) when(builder.enablePrefixCompressionForCurrentWrite && !builder.prefixCompressKeysOnly)(builder.previous.mapS(getTime)) flatMap { previousTime => 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 ec50ee636..ad5ec2803 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 @@ -16,7 +16,6 @@ package swaydb.core.segment.entry.writer -import swaydb.IO import swaydb.core.data.Memory import swaydb.core.segment.entry.id.{BaseEntryId, MemoryToKeyValueIdBinder} import swaydb.core.util.Bytes diff --git a/core/src/main/scala/swaydb/core/segment/io/SegmentReadIO.scala b/core/src/main/scala/swaydb/core/segment/io/SegmentReadIO.scala index 25c79faff..5c05dcd4a 100644 --- a/core/src/main/scala/swaydb/core/segment/io/SegmentReadIO.scala +++ b/core/src/main/scala/swaydb/core/segment/io/SegmentReadIO.scala @@ -18,10 +18,10 @@ package swaydb.core.segment.io import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig -import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig} -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +import swaydb.core.segment.block.hashindex.HashIndexBlockConfig +import swaydb.core.segment.block.segment.SegmentBlockConfig +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig +import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.effect.{IOAction, IOStrategy} private[core] object SegmentReadIO { diff --git a/core/src/main/scala/swaydb/core/sweeper/ByteBufferCleaner.scala b/core/src/main/scala/swaydb/core/sweeper/ByteBufferCleaner.scala index 6bc0925b3..885468c98 100644 --- a/core/src/main/scala/swaydb/core/sweeper/ByteBufferCleaner.scala +++ b/core/src/main/scala/swaydb/core/sweeper/ByteBufferCleaner.scala @@ -16,17 +16,17 @@ package swaydb.core.sweeper -import java.lang.invoke.{MethodHandle, MethodHandles, MethodType} -import java.nio.file.Path -import java.nio.{ByteBuffer, MappedByteBuffer} -import java.util.concurrent.atomic.AtomicBoolean - import com.typesafe.scalalogging.LazyLogging import swaydb.IO import swaydb.IO.ExceptionHandler import swaydb.core.io.file.ForceSaveApplier import swaydb.data.config.ForceSave +import java.lang.invoke.{MethodHandle, MethodHandles, MethodType} +import java.nio.file.Path +import java.nio.{ByteBuffer, MappedByteBuffer} +import java.util.concurrent.atomic.AtomicBoolean + private[core] case object ByteBufferCleaner extends LazyLogging { object Cleaner { diff --git a/core/src/main/scala/swaydb/core/sweeper/ByteBufferSweeper.scala b/core/src/main/scala/swaydb/core/sweeper/ByteBufferSweeper.scala index a0779a2af..c0d35775c 100644 --- a/core/src/main/scala/swaydb/core/sweeper/ByteBufferSweeper.scala +++ b/core/src/main/scala/swaydb/core/sweeper/ByteBufferSweeper.scala @@ -17,6 +17,7 @@ package swaydb.core.sweeper import com.typesafe.scalalogging.LazyLogging +import swaydb.ActorConfig.QueueOrder import swaydb.Bag.Implicits._ import swaydb.Error.IO.ExceptionHandler import swaydb._ @@ -24,9 +25,8 @@ import swaydb.core.io.file.ForceSaveApplier import swaydb.core.sweeper.ByteBufferCleaner.Cleaner import swaydb.core.util.English import swaydb.data.cache.{Cache, CacheNoIO} -import swaydb.ActorConfig.QueueOrder -import swaydb.effect.Effect import swaydb.data.config.ForceSave +import swaydb.effect.Effect import swaydb.utils.FiniteDurations.FiniteDurationImplicits import java.io.FileNotFoundException diff --git a/core/src/main/scala/swaydb/core/util/Benchmark.scala b/core/src/main/scala/swaydb/core/util/Benchmark.scala index f3acd2625..a28da89b5 100644 --- a/core/src/main/scala/swaydb/core/util/Benchmark.scala +++ b/core/src/main/scala/swaydb/core/util/Benchmark.scala @@ -44,11 +44,11 @@ object Benchmark extends LazyLogging { print(message) private def run[R, BAG[_]](message: String, inlinePrint: Boolean, useLazyLogging: Boolean)(benchmarkThis: => BAG[R])(implicit bag: Bag[BAG]): BAG[(R, BigDecimal)] = { -// if (!useLazyLogging) //don't need header Benchmarking log when using lazyLogging. LazyLogging is generally for user's viewing only. -// if (inlinePrint) -// doPrint(message = s"Benchmarking: ${if (message.isEmpty) "" else s"$message: "}", useLazyLogging = useLazyLogging, newLine = false) -// else -// doPrint(message = s"Benchmarking: $message", useLazyLogging = useLazyLogging, newLine = true) + // if (!useLazyLogging) //don't need header Benchmarking log when using lazyLogging. LazyLogging is generally for user's viewing only. + // if (inlinePrint) + // doPrint(message = s"Benchmarking: ${if (message.isEmpty) "" else s"$message: "}", useLazyLogging = useLazyLogging, newLine = false) + // else + // doPrint(message = s"Benchmarking: $message", useLazyLogging = useLazyLogging, newLine = true) val collectionTimeBefore = ManagementFactory.getGarbageCollectorMXBeans.asScala.foldLeft(0L)(_ + _.getCollectionTime) diff --git a/core/src/main/scala/swaydb/core/util/KeyCompressor.scala b/core/src/main/scala/swaydb/core/util/KeyCompressor.scala index ad3bff40c..ca7b92514 100644 --- a/core/src/main/scala/swaydb/core/util/KeyCompressor.scala +++ b/core/src/main/scala/swaydb/core/util/KeyCompressor.scala @@ -16,7 +16,6 @@ package swaydb.core.util -import swaydb.IO import swaydb.core.data.{Memory, MemoryOption} import swaydb.data.MaxKey import swaydb.data.slice.Slice diff --git a/core/src/test/scala/swaydb/core/PrivateMethodInvokers.scala b/core/src/test/scala/swaydb/core/PrivateMethodInvokers.scala index 0e3af4739..3e9cda8a6 100644 --- a/core/src/test/scala/swaydb/core/PrivateMethodInvokers.scala +++ b/core/src/test/scala/swaydb/core/PrivateMethodInvokers.scala @@ -21,8 +21,8 @@ import swaydb.core.log.timer.Timer import swaydb.core.log.{Log, LogCache, Logs} import swaydb.core.segment.PersistentSegment import swaydb.core.segment.ref.SegmentRef -import swaydb.core.util.{HashedMap, IDGenerator} import swaydb.core.util.queue.VolatileQueue +import swaydb.core.util.{HashedMap, IDGenerator} import swaydb.data.slice.Slice import java.util.concurrent.atomic.AtomicLong diff --git a/core/src/test/scala/swaydb/core/TestBase.scala b/core/src/test/scala/swaydb/core/TestBase.scala index 1b7f4cb76..8c1ae4b81 100644 --- a/core/src/test/scala/swaydb/core/TestBase.scala +++ b/core/src/test/scala/swaydb/core/TestBase.scala @@ -39,8 +39,8 @@ import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig import swaydb.core.segment.block.hashindex.HashIndexBlockConfig import swaydb.core.segment.block.segment.SegmentBlockConfig -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig +import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.segment.io.SegmentReadIO import swaydb.core.segment.{PersistentSegment, Segment} import swaydb.core.util.IDGenerator @@ -236,9 +236,9 @@ trait TestBase extends AnyWordSpec with Matchers with BeforeAndAfterAll with Bef hashIndexConfig: HashIndexBlockConfig = HashIndexBlockConfig.random, bloomFilterConfig: BloomFilterBlockConfig = BloomFilterBlockConfig.random, segmentConfig: SegmentBlockConfig = SegmentBlockConfig.random.copy(mmap = mmapSegments))(implicit keyOrder: KeyOrder[Slice[Byte]] = KeyOrder.default, - timeOrder: TimeOrder[Slice[Byte]] = TimeOrder.long, - sweeper: TestCaseSweeper, - ec: ExecutionContext = TestExecutionContext.executionContext): Segment = { + timeOrder: TimeOrder[Slice[Byte]] = TimeOrder.long, + sweeper: TestCaseSweeper, + ec: ExecutionContext = TestExecutionContext.executionContext): Segment = { val segmentNumber = Effect.numberFileId(path)._1 - 1 @@ -276,9 +276,9 @@ trait TestBase extends AnyWordSpec with Matchers with BeforeAndAfterAll with Bef hashIndexConfig: HashIndexBlockConfig = HashIndexBlockConfig.random, bloomFilterConfig: BloomFilterBlockConfig = BloomFilterBlockConfig.random, segmentConfig: SegmentBlockConfig = SegmentBlockConfig.random.copy(mmap = mmapSegments))(implicit keyOrder: KeyOrder[Slice[Byte]] = KeyOrder.default, - timeOrder: TimeOrder[Slice[Byte]] = TimeOrder.long, - sweeper: TestCaseSweeper, - ec: ExecutionContext = TestExecutionContext.executionContext): Segment = { + timeOrder: TimeOrder[Slice[Byte]] = TimeOrder.long, + sweeper: TestCaseSweeper, + ec: ExecutionContext = TestExecutionContext.executionContext): Segment = { val segmentNumber = Effect.numberFileId(path)._1 - 1 @@ -311,12 +311,12 @@ trait TestBase extends AnyWordSpec with Matchers with BeforeAndAfterAll with Bef hashIndexConfig: HashIndexBlockConfig = HashIndexBlockConfig.random, bloomFilterConfig: BloomFilterBlockConfig = BloomFilterBlockConfig.random, segmentConfig: SegmentBlockConfig = SegmentBlockConfig.random.copy(mmap = mmapSegments))(implicit keyOrder: KeyOrder[Slice[Byte]] = KeyOrder.default, - timeOrder: TimeOrder[Slice[Byte]] = TimeOrder.long, - pathsDistributor: PathsDistributor, - idGenerator: IDGenerator, - sweeper: TestCaseSweeper, - ec: ExecutionContext = TestExecutionContext.executionContext, - compactionParallelism: CompactionParallelism = CompactionParallelism.availableProcessors()): Slice[Segment] = { + timeOrder: TimeOrder[Slice[Byte]] = TimeOrder.long, + pathsDistributor: PathsDistributor, + idGenerator: IDGenerator, + sweeper: TestCaseSweeper, + ec: ExecutionContext = TestExecutionContext.executionContext, + compactionParallelism: CompactionParallelism = CompactionParallelism.availableProcessors()): Slice[Segment] = { import sweeper._ implicit val segmentIO: SegmentReadIO = diff --git a/core/src/test/scala/swaydb/core/TestCaseSweeper.scala b/core/src/test/scala/swaydb/core/TestCaseSweeper.scala index 076867d75..f336db8fc 100644 --- a/core/src/test/scala/swaydb/core/TestCaseSweeper.scala +++ b/core/src/test/scala/swaydb/core/TestCaseSweeper.scala @@ -22,8 +22,8 @@ import swaydb.core.TestSweeper._ import swaydb.core.io.file.{DBFile, ForceSaveApplier} import swaydb.core.level.LevelRef import swaydb.core.level.compaction.io.CompactionIO -import swaydb.core.log.{Log, Logs} import swaydb.core.log.counter.CounterLog +import swaydb.core.log.{Log, Logs} import swaydb.core.segment.Segment import swaydb.core.segment.block.BlockCache import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor diff --git a/core/src/test/scala/swaydb/core/TestData.scala b/core/src/test/scala/swaydb/core/TestData.scala index 6e2b026cc..55eec5f95 100644 --- a/core/src/test/scala/swaydb/core/TestData.scala +++ b/core/src/test/scala/swaydb/core/TestData.scala @@ -26,7 +26,7 @@ import swaydb.compression.CompressionTestGen._ import swaydb.core.CommonAssertions._ import swaydb.core.TestCaseSweeper._ import swaydb.core.data.Value.{FromValue, FromValueOption, RangeValue} -import swaydb.core.data.{DefIO, KeyValue, _} +import swaydb.core.data._ import swaydb.core.function.FunctionStore import swaydb.core.io.file.DBFile import swaydb.core.level.compaction.io.CompactionIO @@ -39,13 +39,13 @@ import swaydb.core.merge.{KeyValueGrouper, KeyValueMerger} import swaydb.core.segment._ import swaydb.core.segment.assigner.Assignable import swaydb.core.segment.block._ -import swaydb.core.segment.block.binarysearch.{BinarySearchEntryFormat, BinarySearchIndexBlock, BinarySearchIndexBlockConfig} -import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockConfig} -import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig, HashIndexEntryFormat} +import swaydb.core.segment.block.binarysearch.{BinarySearchEntryFormat, BinarySearchIndexBlockConfig} +import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig +import swaydb.core.segment.block.hashindex.{HashIndexBlockConfig, HashIndexEntryFormat} import swaydb.core.segment.block.reader.{BlockedReader, UnblockedReader} -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig, SegmentBlockOffset} import swaydb.core.segment.block.segment.data.TransientSegment -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} +import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig, SegmentBlockOffset} +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig, ValuesBlockOffset} import swaydb.core.segment.entry.id.BaseEntryIdFormatA import swaydb.core.segment.entry.writer.EntryWriter @@ -1863,8 +1863,8 @@ object TestData { sortedIndexConfig: SortedIndexBlockConfig = SortedIndexBlockConfig.random, valuesConfig: ValuesBlockConfig = ValuesBlockConfig.random, segmentConfig: SegmentBlockConfig = SegmentBlockConfig.random)(implicit keyOrder: KeyOrder[Slice[Byte]], - ec: ExecutionContext, - compactionParallelism: CompactionParallelism = CompactionParallelism.availableProcessors()): TransientSegment.One = { + ec: ExecutionContext, + compactionParallelism: CompactionParallelism = CompactionParallelism.availableProcessors()): TransientSegment.One = { val segments = SegmentBlock.writeOnes( mergeStats = diff --git a/core/src/test/scala/swaydb/core/TestForceSave.scala b/core/src/test/scala/swaydb/core/TestForceSave.scala index 492586e35..7496aae5a 100644 --- a/core/src/test/scala/swaydb/core/TestForceSave.scala +++ b/core/src/test/scala/swaydb/core/TestForceSave.scala @@ -37,7 +37,7 @@ object TestForceSave { /** * Enables [[ForceSave]] to be random. * - * @param 0.0 disables randomness - [[ForceSave.Off]]. + * @param 0.0 disables randomness - [[ForceSave.Off]]. * 0.5 would give 50% chance to be random and 50% to be [[ForceSave.Off]]. * 1.1 will always apply randomness. * diff --git a/core/src/test/scala/swaydb/core/TestSweeper.scala b/core/src/test/scala/swaydb/core/TestSweeper.scala index 678c63570..e2f733352 100644 --- a/core/src/test/scala/swaydb/core/TestSweeper.scala +++ b/core/src/test/scala/swaydb/core/TestSweeper.scala @@ -23,9 +23,9 @@ import swaydb.core.segment.block.BlockCache import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor import swaydb.core.sweeper.{ByteBufferSweeper, FileSweeper, MemorySweeper} import swaydb.data.config.MemoryCache +import swaydb.utils.StorageUnits._ import scala.concurrent.duration._ -import swaydb.utils.StorageUnits._ private[swaydb] object TestSweeper { diff --git a/core/src/test/scala/swaydb/core/TestTimer.scala b/core/src/test/scala/swaydb/core/TestTimer.scala index 61b022b45..6eceab18a 100644 --- a/core/src/test/scala/swaydb/core/TestTimer.scala +++ b/core/src/test/scala/swaydb/core/TestTimer.scala @@ -16,13 +16,12 @@ package swaydb.core -import java.util.concurrent.atomic.AtomicLong - import swaydb.core.data.Time import swaydb.core.log.timer.Timer import swaydb.data.slice.Slice import swaydb.macros.Sealed +import java.util.concurrent.atomic.AtomicLong import scala.util.Random sealed trait TestTimer extends Timer diff --git a/core/src/test/scala/swaydb/core/level/LevelCollpaseSpec.scala b/core/src/test/scala/swaydb/core/level/LevelCollpaseSpec.scala index 4e5dfb9e2..6816c2b4a 100644 --- a/core/src/test/scala/swaydb/core/level/LevelCollpaseSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelCollpaseSpec.scala @@ -16,27 +16,25 @@ package swaydb.core.level -import swaydb.core.TestCaseSweeper._ import org.scalatest.OptionValues._ import swaydb.IO import swaydb.IOValues._ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ +import swaydb.core._ import swaydb.core.data._ -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.ref.search.ThreadReadState -import swaydb.core._ -import swaydb.core.level.compaction.io.CompactionIO import swaydb.data.compaction.CompactionConfig.CompactionParallelism -import swaydb.testkit.RunThis._ import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice +import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem +import swaydb.utils.StorageUnits._ import scala.collection.mutable.ListBuffer import scala.concurrent.duration._ -import swaydb.utils.StorageUnits._ class LevelCollapseSpec0 extends LevelCollapseSpec diff --git a/core/src/test/scala/swaydb/core/level/LevelKeyValuesSpec.scala b/core/src/test/scala/swaydb/core/level/LevelKeyValuesSpec.scala index 2e2092015..e81718e1d 100644 --- a/core/src/test/scala/swaydb/core/level/LevelKeyValuesSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelKeyValuesSpec.scala @@ -24,7 +24,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core._ import swaydb.core.data._ -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.ref.search.ThreadReadState import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP diff --git a/core/src/test/scala/swaydb/core/level/LevelMergeSpec.scala b/core/src/test/scala/swaydb/core/level/LevelMergeSpec.scala index d37e36f9f..68e961293 100644 --- a/core/src/test/scala/swaydb/core/level/LevelMergeSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelMergeSpec.scala @@ -20,10 +20,12 @@ import org.scalamock.scalatest.MockFactory import org.scalatest.PrivateMethodTester import swaydb.IO import swaydb.core.CommonAssertions._ +import swaydb.core.TestCaseSweeper._ import swaydb.core.TestData._ import swaydb.core._ import swaydb.core.data.Value.FromValue 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 @@ -31,8 +33,6 @@ import swaydb.serializers.Default._ import swaydb.serializers._ import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem -import TestCaseSweeper._ -import swaydb.data.compaction.CompactionConfig.CompactionParallelism class LevelMergeSpec0 extends LevelMergeSpec diff --git a/core/src/test/scala/swaydb/core/level/LevelReadNoneSpec.scala b/core/src/test/scala/swaydb/core/level/LevelReadNoneSpec.scala index 44497b16f..ad035a3d4 100644 --- a/core/src/test/scala/swaydb/core/level/LevelReadNoneSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelReadNoneSpec.scala @@ -22,12 +22,12 @@ import swaydb.core.TestData._ import swaydb.core.data.{Memory, Value} import swaydb.core.segment.ref.search.ThreadReadState import swaydb.core.{TestBase, TestForceSave} -import swaydb.testkit.RunThis._ import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem class LevelReadNoneSpec0 extends LevelReadNoneSpec diff --git a/core/src/test/scala/swaydb/core/level/LevelReadSomeSpec.scala b/core/src/test/scala/swaydb/core/level/LevelReadSomeSpec.scala index 4cd877c2b..4137185ca 100644 --- a/core/src/test/scala/swaydb/core/level/LevelReadSomeSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelReadSomeSpec.scala @@ -25,16 +25,13 @@ import swaydb.core.TestData._ import swaydb.core.segment.ref.search.ThreadReadState import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave} import swaydb.data.compaction.CompactionConfig.CompactionParallelism -import swaydb.testkit.RunThis._ import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice +import swaydb.testkit.RunThis._ +import swaydb.utils.OperatingSystem import scala.util.{Failure, Success, Try} -import swaydb.utils.OperatingSystem -import swaydb.utils.OperatingSystem._ -import swaydb.utils.FiniteDurations._ -import swaydb.utils.StorageUnits._ class LevelReadSomeSpec0 extends LevelReadSomeSpec diff --git a/core/src/test/scala/swaydb/core/level/LevelReadSpec.scala b/core/src/test/scala/swaydb/core/level/LevelReadSpec.scala index a434c5ad3..9875c1f77 100644 --- a/core/src/test/scala/swaydb/core/level/LevelReadSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelReadSpec.scala @@ -22,11 +22,11 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core._ import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig -import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockConfig} -import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig} -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig +import swaydb.core.segment.block.hashindex.HashIndexBlockConfig +import swaydb.core.segment.block.segment.SegmentBlockConfig +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig +import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.segment.io.SegmentReadIO import swaydb.core.segment.ref.search.ThreadReadState import swaydb.data.compaction.CompactionConfig.CompactionParallelism diff --git a/core/src/test/scala/swaydb/core/level/LevelRefreshSpec.scala b/core/src/test/scala/swaydb/core/level/LevelRefreshSpec.scala index c2173de51..5be60c3e4 100644 --- a/core/src/test/scala/swaydb/core/level/LevelRefreshSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelRefreshSpec.scala @@ -23,7 +23,7 @@ import swaydb.IOValues._ import swaydb.core.TestData._ import swaydb.core._ import swaydb.core.data._ -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} diff --git a/core/src/test/scala/swaydb/core/level/LevelRemoveSegmentSpec.scala b/core/src/test/scala/swaydb/core/level/LevelRemoveSegmentSpec.scala index 8aae591e1..e01d196d7 100644 --- a/core/src/test/scala/swaydb/core/level/LevelRemoveSegmentSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelRemoveSegmentSpec.scala @@ -20,20 +20,18 @@ import org.scalamock.scalatest.MockFactory import org.scalatest.PrivateMethodTester import swaydb.IO import swaydb.core.TestData._ -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave, TestTimer} import swaydb.data.compaction.CompactionConfig.CompactionParallelism -import swaydb.testkit.RunThis._ import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice - -import scala.concurrent.duration.{Duration, DurationInt} +import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem -import swaydb.utils.OperatingSystem._ -import swaydb.utils.FiniteDurations._ import swaydb.utils.StorageUnits._ +import scala.concurrent.duration.{Duration, DurationInt} + class LevelRemoveSegmentSpec0 extends LevelRemoveSegmentSpec class LevelRemoveSegmentSpec1 extends LevelRemoveSegmentSpec { diff --git a/core/src/test/scala/swaydb/core/level/LevelSegmentSpec.scala b/core/src/test/scala/swaydb/core/level/LevelSegmentSpec.scala index c1d48d438..0ba58cd50 100644 --- a/core/src/test/scala/swaydb/core/level/LevelSegmentSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelSegmentSpec.scala @@ -24,7 +24,7 @@ import swaydb.core.TestData._ import swaydb.core._ import swaydb.core.data._ import swaydb.core.level.compaction.io.CompactionIO -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.util.IDGenerator import swaydb.core.util.PipeOps._ import swaydb.data.compaction.CompactionConfig.CompactionParallelism diff --git a/core/src/test/scala/swaydb/core/level/LevelSpec.scala b/core/src/test/scala/swaydb/core/level/LevelSpec.scala index a64b5e41b..ee927dbf1 100644 --- a/core/src/test/scala/swaydb/core/level/LevelSpec.scala +++ b/core/src/test/scala/swaydb/core/level/LevelSpec.scala @@ -25,7 +25,7 @@ import swaydb.core._ import swaydb.core.data._ import swaydb.core.log.LogEntry import swaydb.core.segment.Segment -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} diff --git a/core/src/test/scala/swaydb/core/level/PathsDistributorSpec.scala b/core/src/test/scala/swaydb/core/level/PathsDistributorSpec.scala index 24105f225..078fc20d0 100644 --- a/core/src/test/scala/swaydb/core/level/PathsDistributorSpec.scala +++ b/core/src/test/scala/swaydb/core/level/PathsDistributorSpec.scala @@ -16,17 +16,17 @@ package swaydb.core.level -import java.nio.file.{Path, Paths} import org.scalamock.scalatest.MockFactory import swaydb.IOValues._ import swaydb.core.TestCaseSweeper._ import swaydb.core.segment.Segment import swaydb.core.{TestBase, TestCaseSweeper} -import swaydb.{data, effect} -import swaydb.effect.Effect -import swaydb.testkit.RunThis._ import swaydb.data.order.KeyOrder -import swaydb.effect.Dir +import swaydb.effect +import swaydb.effect.{Dir, Effect} +import swaydb.testkit.RunThis._ + +import java.nio.file.{Path, Paths} class PathsDistributorSpec extends TestBase with MockFactory { 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 b8cf405b8..ad16b28e9 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 @@ -23,7 +23,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.data.Memory import swaydb.core.segment.Segment -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave, TestTimer} import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP 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 08022c091..f417892d8 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 @@ -23,7 +23,7 @@ import swaydb.core._ import swaydb.core.data.Memory import swaydb.core.level.compaction.task.CompactionTask import swaydb.core.segment.Segment -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder 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 68bf15b2b..56f4212cd 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 @@ -22,7 +22,7 @@ import swaydb.core.TestData._ import swaydb.core.data.DefIO import swaydb.core.level.compaction.throttle.LevelState import swaydb.core.segment.Segment -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestForceSave} import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.compaction.LevelThrottle 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 a0818ec0c..ffffb3344 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 @@ -22,7 +22,7 @@ import swaydb.core.TestData._ import swaydb.core.data.DefIO import swaydb.core.level.compaction.throttle.LevelState import swaydb.core.segment.Segment -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +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 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 290035dce..2686de239 100644 --- a/core/src/test/scala/swaydb/core/level/tool/AppendixRepairerSpec.scala +++ b/core/src/test/scala/swaydb/core/level/tool/AppendixRepairerSpec.scala @@ -20,7 +20,7 @@ import swaydb.Glass import swaydb.IOValues._ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestForceSave} import swaydb.data.compaction.CompactionConfig.CompactionParallelism import swaydb.data.compaction.LevelThrottle 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 86b52ec1e..d6bcfe830 100644 --- a/core/src/test/scala/swaydb/core/log/counter/CounterLogSpec.scala +++ b/core/src/test/scala/swaydb/core/log/counter/CounterLogSpec.scala @@ -21,7 +21,7 @@ import swaydb.core.TestCaseSweeper._ import swaydb.core.TestData._ import swaydb.core.log.MapTestUtil._ import swaydb.core.log.serializer._ -import swaydb.core.{TestBase, _} +import swaydb.core._ import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder import swaydb.data.slice.Slice 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 6060a0baf..56c158dde 100644 --- a/core/src/test/scala/swaydb/core/log/serializer/AppendixLogEntrySpec.scala +++ b/core/src/test/scala/swaydb/core/log/serializer/AppendixLogEntrySpec.scala @@ -171,7 +171,6 @@ class AppendixLogEntrySpec extends TestBase { scalaSkipList.get(segment5.minKey).value shouldBe segment5 } //write skip list to bytes should result in the same skip list as before - import appendixReader.AppendixReader val bytes = LogEntrySerialiser.write[Slice[Byte], Segment](skipList.iterator) val crcEntries = LogEntrySerialiser.read[Slice[Byte], Segment](bytes, false).value.item.value skipList.clear() diff --git a/core/src/test/scala/swaydb/core/merge/FunctionMergerSpec.scala b/core/src/test/scala/swaydb/core/merge/FunctionMergerSpec.scala index 550d045a4..f34aa79f0 100644 --- a/core/src/test/scala/swaydb/core/merge/FunctionMergerSpec.scala +++ b/core/src/test/scala/swaydb/core/merge/FunctionMergerSpec.scala @@ -21,11 +21,11 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class FunctionMergerSpec extends AnyWordSpec with Matchers { 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 513ea9f70..1ba13237e 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 @@ -21,9 +21,9 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.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 e36ac669a..d52ab3d7d 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 @@ -23,9 +23,9 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Memory -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.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 51bde8ee4..0bcc4345d 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 @@ -22,11 +22,11 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data._ -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class FunctionMerger_Put_Spec extends AnyWordSpec with Matchers { 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 906b2adc5..7b0f0aace 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 @@ -23,11 +23,11 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data._ -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class FunctionMerger_Remove_Spec extends AnyWordSpec with Matchers { 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 0767a6bc1..98a29f534 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 @@ -25,11 +25,11 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data._ -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class FunctionMerger_Update_Spec extends AnyWordSpec with Matchers with MockFactory { diff --git a/core/src/test/scala/swaydb/core/merge/KeyValueGrouperSpec.scala b/core/src/test/scala/swaydb/core/merge/KeyValueGrouperSpec.scala index 30e6c2cbb..72c34ff23 100644 --- a/core/src/test/scala/swaydb/core/merge/KeyValueGrouperSpec.scala +++ b/core/src/test/scala/swaydb/core/merge/KeyValueGrouperSpec.scala @@ -21,9 +21,9 @@ import swaydb.core.TestData._ import swaydb.core.data._ import swaydb.core.merge.stats.MergeStats import swaydb.core.{TestBase, TestTimer} -import swaydb.testkit.RunThis._ import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class KeyValueGrouperSpec extends TestBase { 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 c35564828..df6e8a2c6 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 @@ -21,12 +21,11 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.{Memory, Value} -import swaydb.core.merge.FixedMerger -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ import scala.concurrent.duration._ import scala.util.Random 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 f4a3c30b4..47eb75ecb 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 @@ -21,12 +21,11 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.{Memory, Value} -import swaydb.core.merge.FixedMerger -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ import scala.util.Random 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 b07a287c6..58eb17a70 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 @@ -23,12 +23,11 @@ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Value.FromValueOption import swaydb.core.data.{Memory, Value} -import swaydb.core.merge.{FixedMerger, ValueMerger} -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class KeyValueMerger_Range_Into_Range extends AnyWordSpec { @@ -239,7 +238,7 @@ class KeyValueMerger_Range_Into_Range extends AnyWordSpec { fromKey = 10, toKey = 20, fromValue = - //different approach used pattern matching instead of using similar approach like in SegmentMerge.scala + //different approach used pattern matching instead of using similar approach like in SegmentMerge.scala oldKeyValue.fromValue match { case oldFromValue: Value.FromValue => FixedMerger(newKeyValue.fromValue.getOrElseS(newKeyValue.rangeValue).toMemory(10), oldFromValue.toMemory(10)).toFromValue() @@ -285,7 +284,7 @@ class KeyValueMerger_Range_Into_Range extends AnyWordSpec { fromKey = 10, toKey = 20, fromValue = - //different approach used pattern matching instead of using similar approach just like in SegmentMerge.scala + //different approach used pattern matching instead of using similar approach just like in SegmentMerge.scala oldKeyValue.fromValue match { case oldFromValue: Value.FromValue => FixedMerger(newKeyValue.fromValue.getOrElseS(newKeyValue.rangeValue).toMemory(10), oldFromValue.toMemory(10)).toFromValue() diff --git a/core/src/test/scala/swaydb/core/merge/PendingApplyMergerSpec.scala b/core/src/test/scala/swaydb/core/merge/PendingApplyMergerSpec.scala index 3c52388e5..33527912a 100644 --- a/core/src/test/scala/swaydb/core/merge/PendingApplyMergerSpec.scala +++ b/core/src/test/scala/swaydb/core/merge/PendingApplyMergerSpec.scala @@ -22,11 +22,11 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Memory -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class PendingApplyMergerSpec extends AnyWordSpec with Matchers { diff --git a/core/src/test/scala/swaydb/core/merge/PutMergerSpec.scala b/core/src/test/scala/swaydb/core/merge/PutMergerSpec.scala index ab28c2f22..2ccaaa164 100644 --- a/core/src/test/scala/swaydb/core/merge/PutMergerSpec.scala +++ b/core/src/test/scala/swaydb/core/merge/PutMergerSpec.scala @@ -21,11 +21,11 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class PutMergerSpec extends AnyWordSpec with Matchers { diff --git a/core/src/test/scala/swaydb/core/merge/RemoveMergerSpec.scala b/core/src/test/scala/swaydb/core/merge/RemoveMergerSpec.scala index 690f03c71..a558fbf54 100644 --- a/core/src/test/scala/swaydb/core/merge/RemoveMergerSpec.scala +++ b/core/src/test/scala/swaydb/core/merge/RemoveMergerSpec.scala @@ -22,11 +22,11 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Memory -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class RemoveMergerSpec extends AnyWordSpec with Matchers { 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 e7c3008c1..00bdc3b8f 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 @@ -23,11 +23,11 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Memory -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class RemoveMerger_Function_Spec extends AnyWordSpec with Matchers { 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 2d018e2ef..4e5116d00 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 @@ -22,11 +22,11 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Memory -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class RemoveMerger_PendingApply_Spec extends AnyWordSpec with Matchers { 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 15a1dcf44..f49cce936 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 @@ -21,11 +21,11 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class RemoveMerger_Put_Spec extends AnyWordSpec with Matchers { 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 1a8fd1c29..d1bf8501e 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 @@ -21,11 +21,11 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class RemoveMerger_Remove_Spec extends AnyWordSpec with Matchers { 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 a3cbcaba0..4352a0649 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 @@ -21,11 +21,11 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class RemoveMerger_Update_Spec extends AnyWordSpec with Matchers { diff --git a/core/src/test/scala/swaydb/core/merge/UpdateMergerSpec.scala b/core/src/test/scala/swaydb/core/merge/UpdateMergerSpec.scala index 59d3a70ee..1a1b1d90d 100644 --- a/core/src/test/scala/swaydb/core/merge/UpdateMergerSpec.scala +++ b/core/src/test/scala/swaydb/core/merge/UpdateMergerSpec.scala @@ -21,11 +21,11 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class UpdateMergerSpec extends AnyWordSpec with Matchers { 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 8bc2cbbd0..7fba6c421 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 @@ -23,11 +23,11 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.Memory -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class UpdateMerger_Function_Spec extends AnyWordSpec with Matchers { 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 b4319b44e..b922eab05 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 @@ -22,11 +22,11 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer import swaydb.core.data.{KeyValue, Memory} -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class UpdateMerger_PendingApply_Spec extends AnyWordSpec with Matchers { 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 8ab046d53..a9b78a247 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 @@ -21,11 +21,11 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class UpdateMerger_Put_Spec extends AnyWordSpec with Matchers { 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 bbed5fb5d..21aa25055 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 @@ -21,11 +21,11 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class UpdateMerger_Remove_Spec extends AnyWordSpec with Matchers { 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 a39468c64..4b4c0bd7c 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 @@ -21,11 +21,11 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.TestTimer -import swaydb.testkit.RunThis._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class UpdateMerger_Update_Spec extends AnyWordSpec with Matchers { diff --git a/core/src/test/scala/swaydb/core/merge/stats/MergeStatsSizeCalculatorSpec.scala b/core/src/test/scala/swaydb/core/merge/stats/MergeStatsSizeCalculatorSpec.scala index 8411b76d8..5118e61ce 100644 --- a/core/src/test/scala/swaydb/core/merge/stats/MergeStatsSizeCalculatorSpec.scala +++ b/core/src/test/scala/swaydb/core/merge/stats/MergeStatsSizeCalculatorSpec.scala @@ -20,8 +20,8 @@ import org.scalamock.scalatest.MockFactory import org.scalatest.EitherValues import swaydb.core.TestData._ import swaydb.core.data.Memory -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlockConfig, SortedIndexBlock} +import swaydb.core.segment.block.segment.SegmentBlockConfig +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig import swaydb.core.{TestBase, TestExecutionContext, TestTimer} import swaydb.serializers.Default._ import swaydb.serializers._ diff --git a/core/src/test/scala/swaydb/core/segment/KeyMatcherSpec.scala b/core/src/test/scala/swaydb/core/segment/KeyMatcherSpec.scala index cf2675a9c..eb5154b8f 100644 --- a/core/src/test/scala/swaydb/core/segment/KeyMatcherSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/KeyMatcherSpec.scala @@ -20,9 +20,9 @@ import swaydb.core.TestBase import swaydb.core.data.Persistent._ import swaydb.core.data.Value.FromValueOption import swaydb.core.data.{Persistent, Time, Value} -import swaydb.core.segment.ref.search.KeyMatcher.Result._ -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} +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.cache.Cache import swaydb.data.order.KeyOrder import swaydb.data.slice.Slice diff --git a/core/src/test/scala/swaydb/core/segment/SegmentGetSpec.scala b/core/src/test/scala/swaydb/core/segment/SegmentGetSpec.scala index 5dbe5fc4b..117a496e4 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentGetSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentGetSpec.scala @@ -25,20 +25,15 @@ import swaydb.core.TestData._ import swaydb.core.data._ import swaydb.core.segment.ref.search.ThreadReadState import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave, TestSweeper} -import swaydb.testkit.RunThis._ import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem import scala.util.Random -import swaydb.utils.OperatingSystem -import swaydb.utils.OperatingSystem._ -import swaydb.utils.FiniteDurations._ -import swaydb.utils.StorageUnits._ -import swaydb.utils.ByteSizeOf._ class SegmentGetSpec0 extends SegmentGetSpec { val keyValuesCount = 1000 diff --git a/core/src/test/scala/swaydb/core/segment/SegmentKeyValueCountSpec.scala b/core/src/test/scala/swaydb/core/segment/SegmentKeyValueCountSpec.scala index 2cb3a8ba6..6f234a8a8 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentKeyValueCountSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentKeyValueCountSpec.scala @@ -21,14 +21,10 @@ import org.scalatest.concurrent.ScalaFutures import swaydb.IOValues._ import swaydb.core.TestData._ import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave} -import swaydb.testkit.RunThis._ import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder +import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem -import swaydb.utils.OperatingSystem._ -import swaydb.utils.FiniteDurations._ -import swaydb.utils.StorageUnits._ -import swaydb.utils.ByteSizeOf._ class SegmentKeyValueCount0 extends SegmentKeyValueCount { val keyValuesCount = 1000 diff --git a/core/src/test/scala/swaydb/core/segment/SegmentMemorySweeperSpec.scala b/core/src/test/scala/swaydb/core/segment/SegmentMemorySweeperSpec.scala index c4cc81801..f27dae9ec 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentMemorySweeperSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentMemorySweeperSpec.scala @@ -21,14 +21,14 @@ import swaydb.ActorConfig import swaydb.core.CommonAssertions._ import swaydb.core.TestCaseSweeper._ import swaydb.core.TestData._ -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.sweeper.MemorySweeper import swaydb.core.util.Benchmark import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext} -import swaydb.testkit.RunThis._ import swaydb.data.config.MemoryCache import swaydb.data.order.TimeOrder import swaydb.data.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 d8e6c01a7..50dee462f 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentReadSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentReadSpec.scala @@ -16,7 +16,6 @@ package swaydb.core.segment -import java.nio.file.NoSuchFileException import org.scalatest.OptionValues._ import org.scalatest.concurrent.ScalaFutures import swaydb.Error.Segment.ExceptionHandler @@ -24,28 +23,23 @@ import swaydb.IO import swaydb.IOValues._ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ -import swaydb.core.data._ -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.Segment import swaydb.core._ +import swaydb.core.data._ +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.io.SegmentReadIO import swaydb.data.MaxKey -import swaydb.testkit.RunThis._ import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder import swaydb.data.slice.Slice import swaydb.effect.Effect import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem +import java.nio.file.NoSuchFileException import scala.concurrent.duration._ import scala.util.Random -import swaydb.utils.OperatingSystem -import swaydb.utils.OperatingSystem._ -import swaydb.utils.FiniteDurations._ -import swaydb.utils.StorageUnits._ -import swaydb.utils.ByteSizeOf._ class SegmentReadSpec0 extends SegmentReadSpec { val keyValuesCount = 100 diff --git a/core/src/test/scala/swaydb/core/segment/SegmentSerialiserSpec.scala b/core/src/test/scala/swaydb/core/segment/SegmentSerialiserSpec.scala index 8b7e48134..0cba1866f 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentSerialiserSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentSerialiserSpec.scala @@ -22,10 +22,10 @@ import swaydb.core.TestData._ import swaydb.core.io.reader.Reader import swaydb.core.segment.io.SegmentReadIO import swaydb.core.{TestBase, TestCaseSweeper} -import swaydb.testkit.RunThis._ import swaydb.data.config.MMAP import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.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 91a00aa8a..d62aba0ca 100644 --- a/core/src/test/scala/swaydb/core/segment/SegmentWriteSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/SegmentWriteSpec.scala @@ -31,11 +31,11 @@ import swaydb.core.merge.KeyValueMerger import swaydb.core.merge.stats.MergeStats import swaydb.core.segment.block.BlockCache import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig -import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockConfig} -import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig} -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig +import swaydb.core.segment.block.hashindex.HashIndexBlockConfig +import swaydb.core.segment.block.segment.SegmentBlockConfig +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig +import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.segment.io.SegmentReadIO import swaydb.core.segment.ref.SegmentRef import swaydb.core.segment.ref.search.ThreadReadState 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 c1680b420..1f892ae10 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 @@ -18,23 +18,18 @@ package swaydb.core.segment.assigner import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.{PersistentSegment, PersistentSegmentMany, PersistentSegmentOne, Segment} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.io.SegmentReadIO +import swaydb.core.segment.{PersistentSegment, PersistentSegmentMany, PersistentSegmentOne, Segment} import swaydb.core.util.PipeOps._ import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave, TestTimer} -import swaydb.testkit.RunThis._ import swaydb.data.config.MMAP import swaydb.data.order.KeyOrder import swaydb.data.slice.Slice +import swaydb.testkit.RunThis._ import swaydb.utils.OperatingSystem import scala.collection.mutable.ListBuffer -import swaydb.utils.OperatingSystem -import swaydb.utils.OperatingSystem._ -import swaydb.utils.FiniteDurations._ -import swaydb.utils.StorageUnits._ -import swaydb.utils.ByteSizeOf._ class SegmentAssigner_Assign_Spec0 extends SegmentAssigner_Assign_Spec { val keyValueCount = 100 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 8e0b739ae..42944f97a 100644 --- a/core/src/test/scala/swaydb/core/segment/block/BlockCacheSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/BlockCacheSpec.scala @@ -23,15 +23,11 @@ import swaydb.core.TestData._ import swaydb.core.sweeper.MemorySweeper import swaydb.core.util.Bytes import swaydb.core.{TestBase, TestCaseSweeper} -import swaydb.testkit.RunThis._ import swaydb.data.slice.Slice +import swaydb.testkit.RunThis._ +import swaydb.utils.StorageUnits._ import scala.jdk.CollectionConverters._ -import swaydb.utils.OperatingSystem -import swaydb.utils.OperatingSystem._ -import swaydb.utils.FiniteDurations._ -import swaydb.utils.StorageUnits._ -import swaydb.utils.ByteSizeOf._ class BlockCacheSpec extends TestBase with MockFactory { 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 151d7484d..32a9ad1c8 100644 --- a/core/src/test/scala/swaydb/core/segment/block/BlockSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/BlockSpec.scala @@ -4,14 +4,13 @@ import org.scalatest.OptionValues._ import swaydb.compression.CompressionInternal import swaydb.core.TestBase import swaydb.core.TestData._ -import swaydb.core.segment.block.BlockCompressionInfo import swaydb.core.segment.block.reader.BlockRefReader -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockOffset} import swaydb.core.segment.block.segment.data.TransientSegmentRef +import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockOffset} import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} -import swaydb.testkit.RunThis._ import swaydb.data.slice.Slice import swaydb.effect.IOAction +import swaydb.testkit.RunThis._ class BlockSpec extends TestBase { 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 bc924c879..65dbdf492 100644 --- a/core/src/test/scala/swaydb/core/segment/block/SegmentBlockCacheSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/SegmentBlockCacheSpec.scala @@ -8,12 +8,12 @@ import swaydb.core.TestCaseSweeper._ import swaydb.core.TestData._ import swaydb.core.data.Memory import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig -import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockConfig} -import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig} +import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig +import swaydb.core.segment.block.hashindex.HashIndexBlockConfig import swaydb.core.segment.block.reader.UnblockedReader -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockCache, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +import swaydb.core.segment.block.segment.{SegmentBlockCache, SegmentBlockConfig} +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig +import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.segment.{PersistentSegment, PersistentSegmentMany, PersistentSegmentOne} import swaydb.core.sweeper.MemorySweeper import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestTimer} 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 7d062855d..81a5412e2 100644 --- a/core/src/test/scala/swaydb/core/segment/block/SegmentBlockInitialisationSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/SegmentBlockInitialisationSpec.scala @@ -21,11 +21,11 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.data._ import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig -import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockConfig} +import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig} -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig +import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.segment.{PersistentSegmentMany, PersistentSegmentOne} import swaydb.core.util.Benchmark import swaydb.core.{TestBase, TestCaseSweeper, TestTimer} 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 421d0da67..f1b2c1d84 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 @@ -21,14 +21,14 @@ import swaydb.IOValues._ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.data.{Memory, Persistent, PersistentOption} -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlockConfig, SortedIndexBlock} +import swaydb.core.segment.block.segment.SegmentBlockConfig +import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} import swaydb.core.{SegmentBlocks, TestBase, TestCaseSweeper} -import swaydb.testkit.RunThis._ import swaydb.data.order.KeyOrder import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ import scala.util.Try @@ -380,7 +380,7 @@ class BinarySearchIndexBlock_Segment_RandomSearch_Spec extends TestBase with Moc eitherOne( left = Persistent.Null, right = //There is a random test. It could get index out of bounds. - // Try(keyValues(index + randomIntMax(keyValues.size - 1))).toOption flatMap { + // Try(keyValues(index + randomIntMax(keyValues.size - 1))).toOption flatMap { Try(keyValues(index)) .toOption .flatMapOption(Persistent.Null: PersistentOption) { diff --git a/core/src/test/scala/swaydb/core/segment/block/bloomfilter/BloomFilterBlockSpec.scala b/core/src/test/scala/swaydb/core/segment/block/bloomfilter/BloomFilterBlockSpec.scala index 97a22ef1c..866fd02b3 100644 --- a/core/src/test/scala/swaydb/core/segment/block/bloomfilter/BloomFilterBlockSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/bloomfilter/BloomFilterBlockSpec.scala @@ -22,10 +22,10 @@ import swaydb.core.TestData._ import swaydb.core.segment.block.reader.{BlockRefReader, UnblockedReader} import swaydb.core.segment.block.{Block, BlockCache} import swaydb.core.{TestBase, TestCaseSweeper} -import swaydb.testkit.RunThis._ import swaydb.data.order.KeyOrder import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ import scala.util.Random 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 3f6f90675..568e9efad 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 @@ -19,14 +19,14 @@ package swaydb.core.segment.block.hashindex import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.data.Persistent -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlockConfig, SortedIndexBlock} +import swaydb.core.segment.block.segment.SegmentBlockConfig +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig import swaydb.core.{SegmentBlocks, TestBase, TestCaseSweeper} -import swaydb.testkit.RunThis._ import swaydb.data.order.KeyOrder import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class HashIndexBlockSpec extends TestBase { 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 c11ebb636..b33372cb1 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 @@ -19,8 +19,8 @@ package swaydb.core.segment.block.reader import org.scalamock.scalatest.MockFactory import swaydb.core.CommonAssertions.orNone import swaydb.core.TestData._ -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockOffset} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockOffset} +import swaydb.core.segment.block.segment.SegmentBlockOffset +import swaydb.core.segment.block.values.ValuesBlockOffset import swaydb.core.segment.block.{Block, BlockCache} import swaydb.core.{TestBase, TestCaseSweeper} import swaydb.data.slice.Slice 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 eadc7b70d..b35167836 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 @@ -23,10 +23,10 @@ import swaydb.core.data._ import swaydb.core.io.reader.Reader import swaydb.core.merge.stats.MergeStats import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig -import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockConfig} -import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig} +import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig +import swaydb.core.segment.block.hashindex.HashIndexBlockConfig import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.segment.io.SegmentReadIO import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestTimer} import swaydb.data.compaction.CompactionConfig.CompactionParallelism diff --git a/core/src/test/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlockSpec.scala b/core/src/test/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlockSpec.scala index fb79d5f94..b1106741e 100644 --- a/core/src/test/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlockSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/block/sortedindex/SortedIndexBlockSpec.scala @@ -28,13 +28,13 @@ import swaydb.core.segment.block.reader.{BlockRefReader, UnblockedReader} import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig, ValuesBlockOffset} import swaydb.core.segment.io.SegmentReadIO import swaydb.core.util.Benchmark -import swaydb.testkit.RunThis._ import swaydb.data.compression.{LZ4Compressor, LZ4Decompressor, LZ4Instance} import swaydb.data.config.{PrefixCompression, UncompressedBlockInfo} import swaydb.data.order.KeyOrder +import swaydb.testkit.RunThis._ -import scala.collection.parallel.CollectionConverters._ import scala.collection.mutable.ListBuffer +import scala.collection.parallel.CollectionConverters._ class SortedIndexBlockSpec extends TestBase with PrivateMethodTester { 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 ed3799017..0ea69dcb6 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,13 +24,13 @@ 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.testkit.RunThis._ import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ -import scala.collection.parallel.CollectionConverters._ import scala.collection.mutable.ListBuffer +import scala.collection.parallel.CollectionConverters._ import scala.concurrent.duration._ class ValuesBlockSpec extends TestBase { 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 00caff27f..fd6cc6e35 100644 --- a/core/src/test/scala/swaydb/core/segment/defrag/DefragGapSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/defrag/DefragGapSpec.scala @@ -24,9 +24,9 @@ import swaydb.core.data.Memory import swaydb.core.level.PathsDistributor import swaydb.core.merge.stats.{MergeStats, MergeStatsCreator, MergeStatsSizeCalculator} import swaydb.core.segment._ -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.block.segment.data.TransientSegment -import swaydb.core.segment.block.sortedindex.{SortedIndexBlockConfig, SortedIndexBlock} +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestTimer} import swaydb.data.slice.Slice import swaydb.serializers.Default._ @@ -421,32 +421,32 @@ sealed trait DefragGapSpec[SEG <: Segment, NULL_SEG >: SEG, S >: Null <: MergeSt } } - "expand Segment" when { - "it contains removable key-values" in { - runThis(10.times, log = true) { - TestCaseSweeper { - implicit sweeper => + "expand Segment" when { + "it contains removable key-values" in { + runThis(10.times, log = true) { + TestCaseSweeper { + implicit sweeper => - implicit val pathsDistributor = createPathDistributor + implicit val pathsDistributor = createPathDistributor - val segments = ListBuffer.range(0, 5).map(_ => TestSegment(keyValues = Slice(Memory.remove(1), Memory.remove(2), Memory.update(3)))) - segments.foreach(_.hasUpdateOrRange shouldBe true) + val segments = ListBuffer.range(0, 5).map(_ => TestSegment(keyValues = Slice(Memory.remove(1), Memory.remove(2), Memory.update(3)))) + segments.foreach(_.hasUpdateOrRange shouldBe true) - implicit val sortedIndexConfig: SortedIndexBlockConfig = SortedIndexBlockConfig.random - implicit val segmentConfig: SegmentBlockConfig = SegmentBlockConfig.random + implicit val sortedIndexConfig: SortedIndexBlockConfig = SortedIndexBlockConfig.random + implicit val segmentConfig: SegmentBlockConfig = SegmentBlockConfig.random - val resultFragments = - DefragGap.run[S]( - gap = segments, - fragments = ListBuffer.empty, - removeDeletes = true, - createdInLevel = 1, - hasNext = false - ) + val resultFragments = + DefragGap.run[S]( + gap = segments, + fragments = ListBuffer.empty, + removeDeletes = true, + createdInLevel = 1, + hasNext = false + ) - resultFragments shouldBe empty - } + resultFragments shouldBe empty } } } + } } 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 fe95a4691..de977dc9f 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 @@ -23,11 +23,11 @@ import swaydb.core.TestData._ import swaydb.core.level.PathsDistributor import swaydb.core.segment.assigner.Assignable import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig -import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockConfig} -import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig} -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig +import swaydb.core.segment.block.hashindex.HashIndexBlockConfig +import swaydb.core.segment.block.segment.SegmentBlockConfig +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig +import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.segment.io.SegmentReadIO import swaydb.core.segment.{PersistentSegment, PersistentSegmentMany} import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestTimer} 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 0816dce20..8a06ed158 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 @@ -23,12 +23,12 @@ import swaydb.core.TestData._ import swaydb.core.data.{KeyValue, Memory} import swaydb.core.merge.stats.MergeStats import swaydb.core.segment.assigner.Assignable -import swaydb.core.segment.block.binarysearch.{BinarySearchIndexBlock, BinarySearchIndexBlockConfig} -import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockConfig} -import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig} -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig +import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig +import swaydb.core.segment.block.hashindex.HashIndexBlockConfig +import swaydb.core.segment.block.segment.SegmentBlockConfig +import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig +import swaydb.core.segment.block.values.ValuesBlockConfig import swaydb.core.segment.io.SegmentReadIO import swaydb.core.segment.{PersistentSegment, Segment} import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestTimer} 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 ccc405501..16c776868 100644 --- a/core/src/test/scala/swaydb/core/segment/defrag/DefragSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/defrag/DefragSpec.scala @@ -23,13 +23,13 @@ import swaydb.core.TestData._ import swaydb.core.data.{KeyValue, Memory} import swaydb.core.merge.stats.{MergeStats, MergeStatsCreator, MergeStatsSizeCalculator} import swaydb.core.segment._ -import swaydb.core.segment.block.binarysearch.{BinarySearchIndexBlock, BinarySearchIndexBlockConfig} -import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockConfig} -import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockConfig} -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.binarysearch.BinarySearchIndexBlockConfig +import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig +import swaydb.core.segment.block.hashindex.HashIndexBlockConfig +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.block.segment.data.TransientSegment -import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockConfig} -import swaydb.core.segment.block.values.{ValuesBlock, ValuesBlockConfig} +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 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 c35351ca3..d5389ed10 100644 --- a/core/src/test/scala/swaydb/core/segment/entry/EntryReaderWriterSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/entry/EntryReaderWriterSpec.scala @@ -26,11 +26,11 @@ import swaydb.core.io.reader.Reader import swaydb.core.segment.entry.id.MemoryToKeyValueIdBinder import swaydb.core.segment.entry.reader.PersistentParser import swaydb.core.segment.entry.writer._ -import swaydb.testkit.RunThis._ import swaydb.data.order.KeyOrder import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ import scala.util.Random diff --git a/core/src/test/scala/swaydb/core/segment/entry/writer/DeadlineReaderWriterSpec.scala b/core/src/test/scala/swaydb/core/segment/entry/writer/DeadlineReaderWriterSpec.scala index 8968f6a75..08bf6d6c5 100644 --- a/core/src/test/scala/swaydb/core/segment/entry/writer/DeadlineReaderWriterSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/entry/writer/DeadlineReaderWriterSpec.scala @@ -16,8 +16,6 @@ package swaydb.core.segment.entry.writer -import java.util.concurrent.TimeUnit - import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import swaydb.core.CommonAssertions._ @@ -25,10 +23,11 @@ import swaydb.core.TestData._ import swaydb.core.data.Memory import swaydb.core.segment.entry.id.{BaseEntryId, MemoryToKeyValueIdBinder} import swaydb.core.util.Times._ -import swaydb.testkit.RunThis._ import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ +import java.util.concurrent.TimeUnit import scala.concurrent.duration.{FiniteDuration, _} class DeadlineReaderWriterSpec extends AnyWordSpec with Matchers { 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 73711cae5..7940c8ef5 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,8 +22,8 @@ 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.testkit.RunThis._ import swaydb.data.slice.Slice +import swaydb.testkit.RunThis._ class KeyWriterReaderSpec extends AnyWordSpec with Matchers { 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 ab11feb0c..743658691 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,10 +22,10 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.data.{Memory, Time} import swaydb.core.segment.entry.id.{BaseEntryId, MemoryToKeyValueIdBinder} -import swaydb.testkit.RunThis._ import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ class ValueReaderWriterSpec extends AnyWordSpec with Matchers { @@ -55,8 +55,8 @@ class ValueReaderWriterSpec extends AnyWordSpec with Matchers { implicit val deadlineWriter: DeadlineWriter = new DeadlineWriter { override private[segment] def write[T <: Memory](current: T, - builder: EntryWriter.Builder, - deadlineId: BaseEntryId.DeadlineId)(implicit binder: MemoryToKeyValueIdBinder[T], keyWriter: KeyWriter): Unit = + builder: EntryWriter.Builder, + deadlineId: BaseEntryId.DeadlineId)(implicit binder: MemoryToKeyValueIdBinder[T], keyWriter: KeyWriter): Unit = () } 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 f61d694ab..347f54c4d 100644 --- a/core/src/test/scala/swaydb/core/segment/ref/SegmentRefGetBehaviorSpec.scala +++ b/core/src/test/scala/swaydb/core/segment/ref/SegmentRefGetBehaviorSpec.scala @@ -21,7 +21,7 @@ import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.data.{Persistent, PersistentOption, Time} import swaydb.core.segment.block.binarysearch.{BinarySearchIndexBlock, BinarySearchIndexBlockOffset} -import swaydb.core.segment.block.bloomfilter.{BloomFilterBlock, BloomFilterBlockConfig} +import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig import swaydb.core.segment.block.hashindex.{HashIndexBlock, HashIndexBlockOffset} import swaydb.core.segment.block.reader.UnblockedReader import swaydb.core.segment.block.sortedindex.{SortedIndexBlock, SortedIndexBlockOffset} 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 996155991..fe19bcccb 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,10 +21,10 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.core.CommonAssertions._ import swaydb.core.TestData._ import swaydb.core.data.{Persistent, Time} -import swaydb.testkit.RunThis._ import swaydb.data.slice.Slice import swaydb.serializers.Default._ import swaydb.serializers._ +import swaydb.testkit.RunThis._ import swaydb.utils.TupleOrNone import java.nio.file.Paths diff --git a/core/src/test/scala/swaydb/core/sweeper/FileSweeperSpec.scala b/core/src/test/scala/swaydb/core/sweeper/FileSweeperSpec.scala index 1bcbf80d6..a15950fe9 100644 --- a/core/src/test/scala/swaydb/core/sweeper/FileSweeperSpec.scala +++ b/core/src/test/scala/swaydb/core/sweeper/FileSweeperSpec.scala @@ -22,7 +22,7 @@ import swaydb.core.TestCaseSweeper._ import swaydb.core.TestData._ import swaydb.core._ import swaydb.core.data.Memory -import swaydb.core.segment.block.segment.{SegmentBlock, SegmentBlockConfig} +import swaydb.core.segment.block.segment.SegmentBlockConfig import swaydb.core.segment.ref.search.ThreadReadState import swaydb.core.sweeper.FileSweeper._ import swaydb.data.compaction.CompactionConfig.CompactionParallelism diff --git a/core/src/test/scala/swaydb/core/util/BytesSpec.scala b/core/src/test/scala/swaydb/core/util/BytesSpec.scala index 6a99986d1..154b9c998 100644 --- a/core/src/test/scala/swaydb/core/util/BytesSpec.scala +++ b/core/src/test/scala/swaydb/core/util/BytesSpec.scala @@ -22,7 +22,6 @@ import org.scalatest.wordspec.AnyWordSpec import swaydb.IOValues._ import swaydb.OK import swaydb.core.TestData._ -import swaydb.core.TestExecutionContext import swaydb.core.io.reader.Reader import swaydb.data.slice.Slice import swaydb.serializers.Default._ diff --git a/core/src/test/scala/swaydb/core/util/CollectionsSpec.scala b/core/src/test/scala/swaydb/core/util/CollectionsSpec.scala index f0d284d74..c0ffd552b 100644 --- a/core/src/test/scala/swaydb/core/util/CollectionsSpec.scala +++ b/core/src/test/scala/swaydb/core/util/CollectionsSpec.scala @@ -155,7 +155,6 @@ class CollectionsSpec extends AnyWordSpec with Matchers { object Item extends Item - "1 item" in { val items = Slice(Item) diff --git a/data/src/main/scala/swaydb/Expiration.scala b/data/src/main/scala/swaydb/Expiration.scala index d098f4c44..760377a1e 100644 --- a/data/src/main/scala/swaydb/Expiration.scala +++ b/data/src/main/scala/swaydb/Expiration.scala @@ -18,7 +18,6 @@ package swaydb import java.time.Duration import java.util.Optional - import scala.compat.java8.DurationConverters._ import scala.concurrent.duration.Deadline diff --git a/data/src/main/scala/swaydb/Prepare.scala b/data/src/main/scala/swaydb/Prepare.scala index f677ef022..d59399f26 100644 --- a/data/src/main/scala/swaydb/Prepare.scala +++ b/data/src/main/scala/swaydb/Prepare.scala @@ -17,7 +17,6 @@ package swaydb import java.time.Duration - import scala.compat.java8.DurationConverters._ import scala.concurrent.duration.{Deadline, FiniteDuration} diff --git a/data/src/main/scala/swaydb/data/config/builder/MemoryLevelZeroConfigBuilder.scala b/data/src/main/scala/swaydb/data/config/builder/MemoryLevelZeroConfigBuilder.scala index 78fa36a20..ba624a871 100644 --- a/data/src/main/scala/swaydb/data/config/builder/MemoryLevelZeroConfigBuilder.scala +++ b/data/src/main/scala/swaydb/data/config/builder/MemoryLevelZeroConfigBuilder.scala @@ -22,8 +22,6 @@ import swaydb.data.config.ConfigWizard import swaydb.data.{Atomic, OptimiseWrites} import swaydb.utils.Java.JavaFunction -import scala.concurrent.duration.FiniteDuration - /** * Java Builder class for [[swaydb.data.config.MemoryLevelZeroConfig]] */ diff --git a/data/src/main/scala/swaydb/data/repairAppendix/SegmentInfo.scala b/data/src/main/scala/swaydb/data/repairAppendix/SegmentInfo.scala index 37cb3865d..ea7030812 100644 --- a/data/src/main/scala/swaydb/data/repairAppendix/SegmentInfo.scala +++ b/data/src/main/scala/swaydb/data/repairAppendix/SegmentInfo.scala @@ -16,11 +16,11 @@ package swaydb.data.repairAppendix -import java.nio.file.Path - import swaydb.data.MaxKey import swaydb.data.slice.Slice +import java.nio.file.Path + private[swaydb] case class SegmentInfoUnTyped(path: Path, minKey: Slice[Byte], maxKey: MaxKey[Slice[Byte]], diff --git a/data/src/test/scala/swaydb/data/slice/SliceOptionSpec.scala b/data/src/test/scala/swaydb/data/slice/SliceOptionSpec.scala index a42c2d6c4..a839ab5e9 100644 --- a/data/src/test/scala/swaydb/data/slice/SliceOptionSpec.scala +++ b/data/src/test/scala/swaydb/data/slice/SliceOptionSpec.scala @@ -19,7 +19,6 @@ package swaydb.data.slice import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import swaydb.data.order.KeyOrder -import swaydb.data.slice.Slice import scala.util.Random diff --git a/effect/src/test/scala/swaydb/effect/ReserveSpec.scala b/effect/src/test/scala/swaydb/effect/ReserveSpec.scala index 60a24bbe8..918b39e76 100644 --- a/effect/src/test/scala/swaydb/effect/ReserveSpec.scala +++ b/effect/src/test/scala/swaydb/effect/ReserveSpec.scala @@ -18,12 +18,12 @@ package swaydb.effect import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers +import swaydb.testkit.RunThis._ import java.util.concurrent.ConcurrentLinkedQueue import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.{Future, Promise} import scala.util.Random -import swaydb.testkit.RunThis._ class ReserveSpec extends AnyFlatSpec with Matchers { diff --git a/macros/src/main/scala/swaydb/macros/VersionReader.scala b/macros/src/main/scala/swaydb/macros/VersionReader.scala index e21bc4bf7..2c67b0f0f 100644 --- a/macros/src/main/scala/swaydb/macros/VersionReader.scala +++ b/macros/src/main/scala/swaydb/macros/VersionReader.scala @@ -17,7 +17,6 @@ package swaydb.macros import java.nio.file.{Files, Paths} - import scala.jdk.CollectionConverters._ import scala.language.experimental.macros import scala.reflect.macros.blackbox diff --git a/swaydb-java/src/main/scala/swaydb/java/KeyComparator.scala b/swaydb-java/src/main/scala/swaydb/java/KeyComparator.scala index 51c726457..587e4b40e 100644 --- a/swaydb-java/src/main/scala/swaydb/java/KeyComparator.scala +++ b/swaydb-java/src/main/scala/swaydb/java/KeyComparator.scala @@ -16,11 +16,12 @@ package swaydb.java -import java.util.Comparator import swaydb.data.order.KeyOrder import swaydb.data.slice.Slice import swaydb.utils.Java.JavaFunction +import java.util.Comparator + object KeyComparator { final val lexicographic: KeyComparator[Slice[java.lang.Byte]] = new KeyComparator[Slice[java.lang.Byte]] { diff --git a/swaydb-java/src/main/scala/swaydb/java/MapT.scala b/swaydb-java/src/main/scala/swaydb/java/MapT.scala index f317cbfe5..98dd1c22f 100644 --- a/swaydb-java/src/main/scala/swaydb/java/MapT.scala +++ b/swaydb-java/src/main/scala/swaydb/java/MapT.scala @@ -16,11 +16,11 @@ package swaydb.java +import swaydb.{Expiration, KeyVal, Pair, Prepare} + import java.time.Duration import java.util.Optional -import swaydb.{Expiration, KeyVal, Pair, Prepare} - /** * Base trait for a basic SwayDB Map type. */ diff --git a/swaydb-java/src/main/scala/swaydb/java/MultiMap.scala b/swaydb-java/src/main/scala/swaydb/java/MultiMap.scala index 015623085..442685cb7 100644 --- a/swaydb-java/src/main/scala/swaydb/java/MultiMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/MultiMap.scala @@ -21,8 +21,8 @@ import swaydb.data.accelerate.LevelZeroMeter import swaydb.data.compaction.LevelMeter import swaydb.java.data.util.Java._ import swaydb.multimap.MultiPrepare -import swaydb.{Expiration, Glass, KeyVal, Pair, Prepare, PureFunction} import swaydb.utils.Java._ +import swaydb.{Expiration, Glass, KeyVal, Pair, Prepare, PureFunction} import java.nio.file.Path import java.time.Duration diff --git a/swaydb-java/src/main/scala/swaydb/java/Queue.scala b/swaydb-java/src/main/scala/swaydb/java/Queue.scala index 4e387b57a..c8c6f72ee 100644 --- a/swaydb-java/src/main/scala/swaydb/java/Queue.scala +++ b/swaydb-java/src/main/scala/swaydb/java/Queue.scala @@ -16,13 +16,13 @@ package swaydb.java -import java.nio.file.Path -import java.util.Optional -import java.util.function.Supplier import swaydb.Glass import swaydb.data.accelerate.LevelZeroMeter import swaydb.data.compaction.LevelMeter +import java.nio.file.Path +import java.util.Optional +import java.util.function.Supplier import scala.compat.java8.DurationConverters._ import scala.jdk.CollectionConverters._ diff --git a/swaydb-java/src/main/scala/swaydb/java/Set.scala b/swaydb-java/src/main/scala/swaydb/java/Set.scala index 0e426b7f4..f2db6713f 100644 --- a/swaydb-java/src/main/scala/swaydb/java/Set.scala +++ b/swaydb-java/src/main/scala/swaydb/java/Set.scala @@ -19,6 +19,7 @@ package swaydb.java import swaydb.data.accelerate.LevelZeroMeter import swaydb.data.compaction.LevelMeter import swaydb.java.data.util.Java._ +import swaydb.utils.Java._ import swaydb.{Apply, Expiration, Glass, Pair, Prepare, PureFunction} import java.nio.file.Path @@ -26,7 +27,6 @@ import java.util.Optional import java.{lang, util} import scala.compat.java8.DurationConverters._ import scala.jdk.CollectionConverters._ -import swaydb.utils.Java._ /** * Documentation - http://swaydb.io/ diff --git a/swaydb-java/src/main/scala/swaydb/java/SetMap.scala b/swaydb-java/src/main/scala/swaydb/java/SetMap.scala index 823d02045..de95fddc6 100644 --- a/swaydb-java/src/main/scala/swaydb/java/SetMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/SetMap.scala @@ -20,6 +20,7 @@ import swaydb.KeyVal._ import swaydb.data.accelerate.LevelZeroMeter import swaydb.data.compaction.LevelMeter import swaydb.java.data.util.Java._ +import swaydb.utils.Java._ import swaydb.{Expiration, Glass, KeyVal} import java.nio.file.Path @@ -28,7 +29,6 @@ import java.util import java.util.Optional import scala.compat.java8.DurationConverters._ import scala.jdk.CollectionConverters._ -import swaydb.utils.Java._ /** * Documentation - http://swaydb.io/ diff --git a/swaydb-java/src/main/scala/swaydb/java/SetMapT.scala b/swaydb-java/src/main/scala/swaydb/java/SetMapT.scala index 3e08f680d..7a0198842 100644 --- a/swaydb-java/src/main/scala/swaydb/java/SetMapT.scala +++ b/swaydb-java/src/main/scala/swaydb/java/SetMapT.scala @@ -16,14 +16,14 @@ package swaydb.java -import java.nio.file.Path -import java.time.Duration -import java.util.Optional - import swaydb.data.accelerate.LevelZeroMeter import swaydb.data.compaction.LevelMeter import swaydb.{Expiration, KeyVal} +import java.nio.file.Path +import java.time.Duration +import java.util.Optional + /** * Base trait for a basic SwayDB SetMap type. */ diff --git a/swaydb-java/src/main/scala/swaydb/java/StorageUnits.scala b/swaydb-java/src/main/scala/swaydb/java/StorageUnits.scala index 2dce15a06..26f7d9a2e 100644 --- a/swaydb-java/src/main/scala/swaydb/java/StorageUnits.scala +++ b/swaydb-java/src/main/scala/swaydb/java/StorageUnits.scala @@ -15,6 +15,7 @@ */ package swaydb.java + import swaydb.utils.StorageUnits._ object StorageUnits { 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 04ed08184..8df4346b8 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 @@ -29,6 +29,8 @@ import swaydb.eventually.persistent.DefaultConfigs import swaydb.java.serializers.{SerializerConverter, Serializer => JavaSerializer} import swaydb.java.{KeyComparator, KeyOrderConverter} import swaydb.serializers.Serializer +import swaydb.utils.Java._ +import swaydb.utils.StorageUnits._ import swaydb.{Apply, Bag, CommonConfigs, Glass, PureFunction} import java.nio.file.Path @@ -38,8 +40,6 @@ import scala.compat.java8.FunctionConverters._ import scala.concurrent.duration.FiniteDuration import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag -import swaydb.utils.Java._ -import swaydb.utils.StorageUnits._ object EventuallyPersistentMap { 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 af59bc6bd..c262d38c8 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 @@ -29,6 +29,8 @@ import swaydb.eventually.persistent.DefaultConfigs import swaydb.java.serializers.{SerializerConverter, Serializer => JavaSerializer} import swaydb.java.{KeyComparator, KeyOrderConverter} import swaydb.serializers.Serializer +import swaydb.utils.Java._ +import swaydb.utils.StorageUnits._ import swaydb.{Apply, Bag, CommonConfigs, Glass, PureFunction} import java.nio.file.Path @@ -38,8 +40,6 @@ import scala.compat.java8.FunctionConverters._ import scala.concurrent.duration.FiniteDuration import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag -import swaydb.utils.Java._ -import swaydb.utils.StorageUnits._ object EventuallyPersistentMultiMap { 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 e9cb7b742..f4f8ab064 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 @@ -28,6 +28,7 @@ import swaydb.java._ import swaydb.java.serializers.{SerializerConverter, Serializer => JavaSerializer} import swaydb.serializers.Serializer import swaydb.utils.Java.JavaFunction +import swaydb.utils.StorageUnits._ import swaydb.{Bag, CommonConfigs, Glass} import java.nio.file.Path @@ -36,8 +37,6 @@ import scala.compat.java8.DurationConverters.DurationOps import scala.compat.java8.FunctionConverters._ import scala.concurrent.duration.FiniteDuration import scala.jdk.CollectionConverters._ -import swaydb.utils.Java._ -import swaydb.utils.StorageUnits._ object EventuallyPersistentQueue { 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 db19d4c31..50386fdf0 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 @@ -29,6 +29,8 @@ import swaydb.eventually.persistent.DefaultConfigs import swaydb.java._ import swaydb.java.serializers.{SerializerConverter, Serializer => JavaSerializer} import swaydb.serializers.Serializer +import swaydb.utils.Java._ +import swaydb.utils.StorageUnits._ import swaydb.{Apply, Bag, CommonConfigs, Glass, PureFunction} import java.nio.file.Path @@ -38,8 +40,6 @@ import scala.compat.java8.FunctionConverters._ import scala.concurrent.duration.FiniteDuration import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag -import swaydb.utils.Java._ -import swaydb.utils.StorageUnits._ object EventuallyPersistentSet { 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 70c879376..73affb148 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 @@ -29,6 +29,8 @@ import swaydb.eventually.persistent.DefaultConfigs import swaydb.java._ import swaydb.java.serializers.{SerializerConverter, Serializer => JavaSerializer} import swaydb.serializers.Serializer +import swaydb.utils.Java._ +import swaydb.utils.StorageUnits._ import swaydb.{Bag, CommonConfigs, Glass} import java.nio.file.Path @@ -37,8 +39,6 @@ import scala.compat.java8.DurationConverters.DurationOps import scala.compat.java8.FunctionConverters._ import scala.concurrent.duration.FiniteDuration import scala.jdk.CollectionConverters._ -import swaydb.utils.Java._ -import swaydb.utils.StorageUnits._ object EventuallyPersistentSetMap { 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 fcdeb1a7d..99a63788a 100644 --- a/swaydb-java/src/main/scala/swaydb/java/memory/MemoryMultiMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/memory/MemoryMultiMap.scala @@ -34,7 +34,6 @@ import swaydb.{Apply, Bag, CommonConfigs, Glass, PureFunction} import scala.compat.java8.FunctionConverters._ import scala.concurrent.duration._ import scala.reflect.ClassTag -import swaydb.utils.Java._ object MemoryMultiMap { diff --git a/swaydb-java/src/main/scala/swaydb/java/memory/MemoryQueue.scala b/swaydb-java/src/main/scala/swaydb/java/memory/MemoryQueue.scala index c54141d59..4cae84ede 100644 --- a/swaydb-java/src/main/scala/swaydb/java/memory/MemoryQueue.scala +++ b/swaydb-java/src/main/scala/swaydb/java/memory/MemoryQueue.scala @@ -29,7 +29,6 @@ import swaydb.{Bag, CommonConfigs, Glass} import scala.compat.java8.FunctionConverters._ import scala.concurrent.duration._ -import swaydb.utils.Java._ object MemoryQueue { 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 a59a2d9be..045005866 100644 --- a/swaydb-java/src/main/scala/swaydb/java/memory/MemorySetMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/memory/MemorySetMap.scala @@ -33,7 +33,6 @@ import swaydb.{Bag, CommonConfigs, Glass} import scala.compat.java8.FunctionConverters._ import scala.concurrent.duration._ -import swaydb.utils.Java._ object MemorySetMap { 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 022e12d51..e1d3ff07a 100644 --- a/swaydb-java/src/main/scala/swaydb/java/multimap/MultiPrepareBuilder.scala +++ b/swaydb-java/src/main/scala/swaydb/java/multimap/MultiPrepareBuilder.scala @@ -16,13 +16,12 @@ package swaydb.java.multimap -import java.util -import java.util.stream.Stream - import swaydb.java.MultiMap import swaydb.multimap.MultiPrepare import swaydb.{Aggregator, Prepare} +import java.util +import java.util.stream.Stream import scala.jdk.CollectionConverters._ object MultiPrepareBuilder { 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 016e16f8b..8c32722c4 100644 --- a/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentMultiMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentMultiMap.scala @@ -30,15 +30,14 @@ import swaydb.java.{KeyComparator, KeyOrderConverter} import swaydb.persistent.DefaultConfigs import swaydb.serializers.Serializer import swaydb.utils.Java.JavaFunction +import swaydb.utils.StorageUnits._ import swaydb.{Apply, Bag, CommonConfigs, Glass, PureFunction} import java.nio.file.Path import java.util.Collections import scala.compat.java8.FunctionConverters._ -import scala.concurrent.duration.FiniteDuration import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag -import swaydb.utils.StorageUnits._ object PersistentMultiMap { diff --git a/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentQueue.scala b/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentQueue.scala index d2fc81bae..6d20ee949 100644 --- a/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentQueue.scala +++ b/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentQueue.scala @@ -26,14 +26,13 @@ import swaydb.java.serializers.{SerializerConverter, Serializer => JavaSerialize import swaydb.persistent.DefaultConfigs import swaydb.serializers.Serializer import swaydb.utils.Java.JavaFunction +import swaydb.utils.StorageUnits._ import swaydb.{Bag, CommonConfigs, Glass} import java.nio.file.Path import java.util.Collections import scala.compat.java8.FunctionConverters._ -import scala.concurrent.duration.FiniteDuration import scala.jdk.CollectionConverters._ -import swaydb.utils.StorageUnits._ object PersistentQueue { 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 dd2e7321b..5637cedfa 100644 --- a/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentSet.scala +++ b/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentSet.scala @@ -30,15 +30,14 @@ import swaydb.java.serializers.{SerializerConverter, Serializer => JavaSerialize import swaydb.persistent.DefaultConfigs import swaydb.serializers.Serializer import swaydb.utils.Java.JavaFunction +import swaydb.utils.StorageUnits._ import swaydb.{Apply, Bag, CommonConfigs, Glass, PureFunction} import java.nio.file.Path import java.util.Collections import scala.compat.java8.FunctionConverters._ -import scala.concurrent.duration.FiniteDuration import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag -import swaydb.utils.StorageUnits._ object PersistentSet { 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 4b92e721e..e6c9f6ffd 100644 --- a/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentSetMap.scala +++ b/swaydb-java/src/main/scala/swaydb/java/persistent/PersistentSetMap.scala @@ -36,7 +36,6 @@ import swaydb.{Bag, CommonConfigs, Glass} import java.nio.file.Path import java.util.Collections import scala.compat.java8.FunctionConverters._ -import scala.concurrent.duration.FiniteDuration import scala.jdk.CollectionConverters._ object PersistentSetMap { 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 a46753f8e..8ddf0a8df 100644 --- a/swaydb-java/src/main/scala/swaydb/java/serializers/Default.scala +++ b/swaydb-java/src/main/scala/swaydb/java/serializers/Default.scala @@ -16,12 +16,12 @@ package swaydb.java.serializers -import java.nio.charset.StandardCharsets -import java.util.Optional - import swaydb.data.slice.Slice import swaydb.serializers.Default._ +import java.nio.charset.StandardCharsets +import java.util.Optional + object Default { def intSerializer(): Serializer[java.lang.Integer] = JavaIntSerializer diff --git a/swaydb-java/src/test/java/swaydb/java/PersistentReportRebootErrorsTest.java b/swaydb-java/src/test/java/swaydb/java/PersistentReportRebootErrorsTest.java index 6a134027c..5b5ef17bc 100644 --- a/swaydb-java/src/test/java/swaydb/java/PersistentReportRebootErrorsTest.java +++ b/swaydb-java/src/test/java/swaydb/java/PersistentReportRebootErrorsTest.java @@ -28,7 +28,7 @@ import java.nio.file.Path; import static org.junit.jupiter.api.Assertions.assertThrows; -import static swaydb.data.java.JavaTest.*; +import static swaydb.data.java.JavaTest.shouldBe; import static swaydb.java.serializers.Default.intSerializer; diff --git a/swaydb-java/src/test/java/swaydb/java/QueueTest.java b/swaydb-java/src/test/java/swaydb/java/QueueTest.java index a9680850c..62f72bc3f 100644 --- a/swaydb-java/src/test/java/swaydb/java/QueueTest.java +++ b/swaydb-java/src/test/java/swaydb/java/QueueTest.java @@ -23,9 +23,10 @@ import java.io.IOException; import java.time.Duration; -import static swaydb.data.java.JavaTest.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import static swaydb.data.java.JavaTest.foreachRange; +import static swaydb.data.java.JavaTest.shouldContain; import static swaydb.java.serializers.Default.intSerializer; abstract class QueueTest extends TestBase { 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 42a951ef1..9687eecfe 100644 --- a/swaydb-stress/src/test/scala/swaydb/stress/simulation/SimulationSpec.scala +++ b/swaydb-stress/src/test/scala/swaydb/stress/simulation/SimulationSpec.scala @@ -16,16 +16,14 @@ package swaydb.stress.simulation -import java.util.concurrent.atomic.AtomicInteger - import com.typesafe.scalalogging.LazyLogging import org.scalatest.wordspec.AnyWordSpec +import swaydb.ActorConfig.QueueOrder import swaydb.PureFunctionScala._ import swaydb.api.TestBaseEmbedded import swaydb.core.TestCaseSweeper import swaydb.core.TestData._ import swaydb.data.Functions -import swaydb.ActorConfig.QueueOrder import swaydb.data.slice.Slice import swaydb.function.FunctionConverter import swaydb.serializers.Default._ @@ -34,6 +32,7 @@ import swaydb.stress.simulation.ProductCommand._ import swaydb.stress.simulation.RemoveAsserted._ import swaydb.{Actor, ActorRef, Apply, Glass, IO, PureFunction, Scheduler} +import java.util.concurrent.atomic.AtomicInteger import scala.collection.mutable import scala.concurrent.duration._ import scala.concurrent.{Await, Future} diff --git a/swaydb-stress/src/test/scala/swaydb/stress/simulation/SimulationSuiteSpec.scala b/swaydb-stress/src/test/scala/swaydb/stress/simulation/SimulationSuiteSpec.scala index b09a1ee95..42a629a8d 100644 --- a/swaydb-stress/src/test/scala/swaydb/stress/simulation/SimulationSuiteSpec.scala +++ b/swaydb-stress/src/test/scala/swaydb/stress/simulation/SimulationSuiteSpec.scala @@ -18,7 +18,6 @@ package swaydb.stress.simulation import swaydb.core.TestCaseSweeper import swaydb.core.TestCaseSweeper._ -import swaydb.data.accelerate.Accelerator import swaydb.data.{Atomic, Functions} import swaydb.serializers.Default._ import swaydb.stress.simulation.Domain._ diff --git a/swaydb-stress/src/test/scala/swaydb/stress/weather/WeatherDataSuiteSpec.scala b/swaydb-stress/src/test/scala/swaydb/stress/weather/WeatherDataSuiteSpec.scala index 4776fb66d..c0e6693fa 100644 --- a/swaydb-stress/src/test/scala/swaydb/stress/weather/WeatherDataSuiteSpec.scala +++ b/swaydb-stress/src/test/scala/swaydb/stress/weather/WeatherDataSuiteSpec.scala @@ -19,8 +19,7 @@ package swaydb.stress.weather import swaydb.IO import swaydb.core.TestCaseSweeper import swaydb.core.TestCaseSweeper._ -import swaydb.data.{Atomic, OptimiseWrites} -import swaydb.data.accelerate.Accelerator +import swaydb.data.Atomic import swaydb.serializers.Default._ class Memory_NonAtomic_WeatherDataSpec extends WeatherDataSpec { diff --git a/swaydb/src/main/scala/swaydb/Map.scala b/swaydb/src/main/scala/swaydb/Map.scala index 1434b647c..83863923d 100644 --- a/swaydb/src/main/scala/swaydb/Map.scala +++ b/swaydb/src/main/scala/swaydb/Map.scala @@ -22,8 +22,8 @@ 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.stream.{From, SourceFree} import swaydb.serializers._ +import swaydb.stream.{From, SourceFree} import swaydb.utils.TupleOrNone import java.nio.file.Path diff --git a/swaydb/src/main/scala/swaydb/MultiMap.scala b/swaydb/src/main/scala/swaydb/MultiMap.scala index f868e9df5..2e3b2fa5a 100644 --- a/swaydb/src/main/scala/swaydb/MultiMap.scala +++ b/swaydb/src/main/scala/swaydb/MultiMap.scala @@ -23,9 +23,9 @@ import swaydb.core.util.Times._ import swaydb.data.accelerate.LevelZeroMeter import swaydb.data.compaction.LevelMeter import swaydb.data.slice.Slice -import swaydb.stream.{From, SourceFree, StreamFree} import swaydb.multimap.{MultiKey, MultiPrepare, MultiValue, Schema} import swaydb.serializers.{Serializer, _} +import swaydb.stream.{From, SourceFree, StreamFree} import java.nio.file.Path import scala.collection.compat.IterableOnce diff --git a/swaydb/src/main/scala/swaydb/Queue.scala b/swaydb/src/main/scala/swaydb/Queue.scala index 435dad3e6..b1517b729 100644 --- a/swaydb/src/main/scala/swaydb/Queue.scala +++ b/swaydb/src/main/scala/swaydb/Queue.scala @@ -22,8 +22,8 @@ import swaydb.data.accelerate.LevelZeroMeter import swaydb.data.compaction.LevelMeter import swaydb.data.order.KeyOrder import swaydb.data.slice.Slice -import swaydb.stream.StreamFree import swaydb.serializers.Serializer +import swaydb.stream.StreamFree import java.nio.file.Path import java.util.concurrent.ConcurrentLinkedQueue diff --git a/swaydb/src/main/scala/swaydb/Set.scala b/swaydb/src/main/scala/swaydb/Set.scala index 0600a01a6..9ba5f3bc6 100644 --- a/swaydb/src/main/scala/swaydb/Set.scala +++ b/swaydb/src/main/scala/swaydb/Set.scala @@ -22,8 +22,8 @@ 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.stream.{From, SourceFree} import swaydb.serializers.{Serializer, _} +import swaydb.stream.{From, SourceFree} import java.nio.file.Path import scala.collection.compat.IterableOnce diff --git a/swaydb/src/main/scala/swaydb/SetMap.scala b/swaydb/src/main/scala/swaydb/SetMap.scala index c90d2eb84..40a87fcfd 100644 --- a/swaydb/src/main/scala/swaydb/SetMap.scala +++ b/swaydb/src/main/scala/swaydb/SetMap.scala @@ -21,8 +21,8 @@ import swaydb.data.accelerate.LevelZeroMeter import swaydb.data.compaction.LevelMeter import swaydb.data.order.KeyOrder import swaydb.data.slice.Slice -import swaydb.stream.{From, SourceFree} import swaydb.serializers.Serializer +import swaydb.stream.{From, SourceFree} import java.nio.file.Path import scala.collection.compat.IterableOnce diff --git a/swaydb/src/main/scala/swaydb/eventually/persistent/Map.scala b/swaydb/src/main/scala/swaydb/eventually/persistent/Map.scala index 4043aeb13..7207eb553 100644 --- a/swaydb/src/main/scala/swaydb/eventually/persistent/Map.scala +++ b/swaydb/src/main/scala/swaydb/eventually/persistent/Map.scala @@ -22,7 +22,7 @@ import swaydb.core.Core import swaydb.core.build.BuildValidator import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.CompactionConfig -import swaydb.data.config.{ThreadStateCache, _} +import swaydb.data.config._ import swaydb.data.order.{KeyOrder, TimeOrder} import swaydb.data.sequencer.Sequencer import swaydb.data.slice.Slice diff --git a/swaydb/src/main/scala/swaydb/eventually/persistent/MultiMap.scala b/swaydb/src/main/scala/swaydb/eventually/persistent/MultiMap.scala index a8a8e346d..23e639a56 100644 --- a/swaydb/src/main/scala/swaydb/eventually/persistent/MultiMap.scala +++ b/swaydb/src/main/scala/swaydb/eventually/persistent/MultiMap.scala @@ -21,7 +21,7 @@ import swaydb.configs.level.DefaultExecutionContext import swaydb.core.build.BuildValidator import swaydb.data.accelerate.{Accelerator, LevelZeroMeter} import swaydb.data.compaction.CompactionConfig -import swaydb.data.config.{ThreadStateCache, _} +import swaydb.data.config._ import swaydb.data.order.KeyOrder import swaydb.data.sequencer.Sequencer import swaydb.data.slice.Slice diff --git a/swaydb/src/main/scala/swaydb/multimap/MultiKey.scala b/swaydb/src/main/scala/swaydb/multimap/MultiKey.scala index d47b15476..d0d9146cc 100644 --- a/swaydb/src/main/scala/swaydb/multimap/MultiKey.scala +++ b/swaydb/src/main/scala/swaydb/multimap/MultiKey.scala @@ -16,7 +16,6 @@ package swaydb.multimap -import swaydb.IO import swaydb.core.io.reader.Reader import swaydb.core.util.Bytes import swaydb.data.order.KeyOrder diff --git a/swaydb/src/main/scala/swaydb/persistent/Map.scala b/swaydb/src/main/scala/swaydb/persistent/Map.scala index c1336b3e8..0670bf7b3 100644 --- a/swaydb/src/main/scala/swaydb/persistent/Map.scala +++ b/swaydb/src/main/scala/swaydb/persistent/Map.scala @@ -34,7 +34,6 @@ import swaydb.utils.StorageUnits._ import swaydb.{Apply, CommonConfigs, KeyOrderConverter, PureFunction} import java.nio.file.Path -import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag object Map extends LazyLogging { diff --git a/swaydb/src/main/scala/swaydb/persistent/MultiMap.scala b/swaydb/src/main/scala/swaydb/persistent/MultiMap.scala index a9029d110..67d4d33db 100644 --- a/swaydb/src/main/scala/swaydb/persistent/MultiMap.scala +++ b/swaydb/src/main/scala/swaydb/persistent/MultiMap.scala @@ -34,7 +34,6 @@ import swaydb.utils.StorageUnits._ import swaydb.{Apply, CommonConfigs, KeyOrderConverter, MultiMap, PureFunction} import java.nio.file.Path -import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag object MultiMap extends LazyLogging { diff --git a/swaydb/src/main/scala/swaydb/persistent/Queue.scala b/swaydb/src/main/scala/swaydb/persistent/Queue.scala index eba9bac3b..7ba6ee779 100644 --- a/swaydb/src/main/scala/swaydb/persistent/Queue.scala +++ b/swaydb/src/main/scala/swaydb/persistent/Queue.scala @@ -32,7 +32,6 @@ import swaydb.utils.StorageUnits._ import swaydb.{Bag, CommonConfigs} import java.nio.file.Path -import scala.concurrent.duration.FiniteDuration object Queue extends LazyLogging { diff --git a/swaydb/src/main/scala/swaydb/persistent/Set.scala b/swaydb/src/main/scala/swaydb/persistent/Set.scala index 947f8be9c..2d828a635 100644 --- a/swaydb/src/main/scala/swaydb/persistent/Set.scala +++ b/swaydb/src/main/scala/swaydb/persistent/Set.scala @@ -35,7 +35,6 @@ import swaydb.utils.StorageUnits._ import swaydb.{Apply, CommonConfigs, KeyOrderConverter, PureFunction} import java.nio.file.Path -import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag object Set extends LazyLogging { diff --git a/swaydb/src/test/scala/swaydb/api/SwayDBAppliedFunctionsSpec.scala b/swaydb/src/test/scala/swaydb/api/SwayDBAppliedFunctionsSpec.scala index 2bce3f9da..681c5e022 100644 --- a/swaydb/src/test/scala/swaydb/api/SwayDBAppliedFunctionsSpec.scala +++ b/swaydb/src/test/scala/swaydb/api/SwayDBAppliedFunctionsSpec.scala @@ -17,7 +17,6 @@ package swaydb.api import swaydb.PureFunctionScala._ -import swaydb.{Glass, _} import swaydb.core.TestCaseSweeper import swaydb.core.TestCaseSweeper._ import swaydb.core.log.applied.AppliedFunctionsLog @@ -25,6 +24,7 @@ import swaydb.core.util.Benchmark import swaydb.data.Functions import swaydb.serializers.Default._ import swaydb.testkit.RunThis.{eventual, runThis} +import swaydb.{Glass, _} import java.nio.file.Files import scala.concurrent.duration.DurationInt