Skip to content

Commit

Permalink
added slice module
Browse files Browse the repository at this point in the history
  • Loading branch information
simerplaha committed Nov 16, 2021
1 parent 0d8f6ee commit baf5b76
Show file tree
Hide file tree
Showing 394 changed files with 1,953 additions and 1,939 deletions.
12 changes: 12 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ lazy val core =
data,
effect,
utils,
slice,
cache,
actor,
compression,
Expand All @@ -217,6 +218,7 @@ lazy val data =
effect,
actor,
utils,
slice,
testkit % Test
)

Expand All @@ -243,6 +245,16 @@ lazy val series =
serializers % Test
)

lazy val slice =
project
.settings(commonSettings)
.settings(publishSettings)
.settings(libraryDependencies ++= commonDependencies(scalaVersion.value))
.dependsOn(
effect,
testkit % Test,
)

lazy val `data-java` =
project
.settings(commonSettings)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import org.xerial.snappy
import swaydb.data.compression.LZ4Compressor.{Fast, High}
import swaydb.data.compression.LZ4Instance
import swaydb.data.compression.LZ4Instance._
import swaydb.data.slice.Slice
import swaydb.slice.Slice

import java.nio.ByteBuffer

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package swaydb.compression
import net.jpountz.lz4.{LZ4Factory, LZ4FastDecompressor, LZ4SafeDecompressor}
import org.xerial.snappy
import swaydb.data.compression.{DecompressorId, LZ4Decompressor, LZ4Instance}
import swaydb.data.slice.Slice
import swaydb.slice.Slice

/**
* Internal types that have 1 to 1 mapping with the more configurable swaydb.Decompressor types.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package swaydb.compression
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
import swaydb.compression.CompressionTestGen._
import swaydb.data.slice.Slice
import swaydb.slice.Slice
import swaydb.serializers.Default._
import swaydb.serializers._
import swaydb.utils.ByteSizeOf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
//import swaydb.core.util.Benchmark
//import swaydb.data.config.{IOAction, IOStrategy}
//import swaydb.data.order.KeyOrder
//import swaydb.data.slice.Slice
//import swaydb.slice.Slice
//import swaydb.data.util.StorageUnits._
//import swaydb.core.CommonAssertions._
//import scala.util.Random
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
//import swaydb.core.util.{Benchmark, SkipList}
//import swaydb.core.{TestBase, TestSweeper}
//import swaydb.data.order.KeyOrder
//import swaydb.data.slice.Slice
//import swaydb.slice.Slice
//import swaydb.data.util.StorageUnits._
//
//import scala.util.Random
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
//import swaydb.data.accelerate.Accelerator
//import swaydb.data.config.RecoveryMode
//import swaydb.data.order.{KeyOrder, TimeOrder}
//import swaydb.data.slice.Slice
//import swaydb.slice.Slice


//import swaydb.data.util.StorageUnits._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import swaydb.core.data.{Memory, Time}
import swaydb.core.util.Benchmark
import swaydb.core.{TestBase, TestTimer}
import swaydb.data.order.{KeyOrder, TimeOrder}
import swaydb.data.slice.Slice
import swaydb.slice.Slice
import swaydb.testkit.RunThis._

class SegmentMerge_Performance_Spec extends TestBase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestSweeper
import swaydb.data.compaction.CompactionConfig.CompactionParallelism
import swaydb.data.config.SegmentRefCacheLife
import swaydb.data.order.{KeyOrder, TimeOrder}
import swaydb.data.slice.Slice
import swaydb.slice.Slice
import swaydb.effect.{Dir, IOAction, IOStrategy}
import swaydb.testkit.RunThis.FutureImplicits
import swaydb.utils.StorageUnits._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
//import swaydb.core.util.Benchmark
//import swaydb.data.config.IOStrategy
//import swaydb.data.order.KeyOrder
//import swaydb.data.slice.Slice
//import swaydb.slice.Slice
//import swaydb.serializers.Default._
//import swaydb.serializers._
//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
//
//import swaydb.core.TestBase
//import swaydb.core.util.{Benchmark, Delay}
//import swaydb.data.slice.Slice
//import swaydb.slice.Slice
//import swaydb.data.order.KeyOrder
//import swaydb.serializers.Default._
//import swaydb.core.IOAssert._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
//import swaydb.core.log.serializer.LevelZeroLogEntryWriter.Level0PutWriter
//import swaydb.core.{TestBase, TestSweeper, TestTimer}
//import swaydb.data.order.{KeyOrder, TimeOrder}
//import swaydb.data.slice.Slice
//import swaydb.slice.Slice
//import swaydb.data.util.StorageUnits._
//
//class MapStressSpec extends TestBase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
//import swaydb.data.accelerate.{Accelerator, LevelZeroMeter}
//import swaydb.data.config.RecoveryMode
//import swaydb.data.order.{KeyOrder, TimeOrder}
//import swaydb.data.slice.Slice
//import swaydb.slice.Slice
//import swaydb.data.util.StorageUnits._
//
//class MapsStressSpec extends TestBase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
//import swaydb.core.TestData._
//import swaydb.core.TestTimer
//import swaydb.core.data.{KeyValue, Memory, Value}
//import swaydb.data.slice.Slice
//import swaydb.slice.Slice
//import swaydb.serializers.Default._
//import swaydb.serializers._
//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
//import swaydb.core.segment.block.hashindex.HashIndexBlock
//import swaydb.core.util.Benchmark
//import swaydb.data.order.{KeyOrder, TimeOrder}
//import swaydb.data.slice.Slice
//import swaydb.slice.Slice
//import swaydb.data.util.StorageUnits._
//
//class SegmentMergeStressSpec extends TestBase {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/swaydb/core/Core.scala
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import swaydb.data.compaction.{CompactionConfig, LevelMeter}
import swaydb.data.config._
import swaydb.data.order.{KeyOrder, TimeOrder}
import swaydb.data.sequencer.Sequencer
import swaydb.data.slice.{Slice, SliceOption}
import swaydb.slice.{Slice, SliceOption}
import swaydb.utils.TupleOrNone

import java.nio.file.Path
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/swaydb/core/CoreInitializer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import swaydb.data.compaction.CompactionConfig
import swaydb.data.config._
import swaydb.data.order.{KeyOrder, TimeOrder}
import swaydb.data.sequencer.Sequencer
import swaydb.data.slice.Slice
import swaydb.slice.Slice
import swaydb.data.storage.{Level0Storage, LevelStorage}
import swaydb.data.{Atomic, OptimiseWrites}
import swaydb.effect.Effect._
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/swaydb/core/build/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package swaydb.core.build
import com.typesafe.scalalogging.LazyLogging
import swaydb.IO
import swaydb.data.DataType
import swaydb.data.slice.Slice
import swaydb.slice.Slice
import swaydb.effect.Effect
import swaydb.macros.VersionReader

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package swaydb.core.build

import swaydb.core.util.CRC32
import swaydb.data.DataType
import swaydb.data.slice.Slice
import swaydb.slice.Slice
import swaydb.utils.ByteSizeOf

import java.nio.file.Path
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/swaydb/core/data/KeyValue.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import swaydb.core.segment.ref.search.KeyMatcher
import swaydb.core.util.Bytes
import swaydb.data.MaxKey
import swaydb.data.order.KeyOrder
import swaydb.data.slice.{Slice, SliceOption}
import swaydb.slice.{Slice, SliceOption}
import swaydb.utils.{SomeOrNone, SomeOrNoneCovariant, TupleOrNone}

import scala.concurrent.duration.{Deadline, FiniteDuration}
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/swaydb/core/data/SwayFunction.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package swaydb.core.data

import swaydb.data.slice.{Slice, SliceOption}
import swaydb.slice.{Slice, SliceOption}

import scala.concurrent.duration.Deadline

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/swaydb/core/data/Time.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package swaydb.core.data

import swaydb.IO
import swaydb.data.order.TimeOrder
import swaydb.data.slice.Slice
import swaydb.data.utils.ScalaByteOps
import swaydb.slice.Slice
import swaydb.slice.utils.ScalaByteOps
import swaydb.utils.ByteSizeOf

private[core] object Time {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/swaydb/core/data/Value.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package swaydb.core.data

import swaydb.data.slice.{Slice, SliceOption}
import swaydb.slice.{Slice, SliceOption}
import swaydb.utils.SomeOrNone

import scala.concurrent.duration.Deadline
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package swaydb.core.function
import swaydb.OK
import swaydb.core.data.{SwayFunction, Value}
import swaydb.data.order.KeyOrder
import swaydb.data.slice.Slice
import swaydb.slice.Slice

import java.util.concurrent.ConcurrentHashMap
import scala.annotation.tailrec
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/swaydb/core/io/file/DBFile.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import swaydb.cache.Cache
import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
import swaydb.core.sweeper.{ByteBufferSweeper, FileSweeper, FileSweeperItem}
import swaydb.data.config.ForceSave
import swaydb.data.slice.{Slice, SliceRO}
import swaydb.slice.{Slice, SliceRO}
import swaydb.effect.{Effect, IOStrategy, Reserve}
import swaydb.{Error, IO}

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/swaydb/core/io/file/DBFileType.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package swaydb.core.io.file

import swaydb.core.sweeper.FileSweeperItem
import swaydb.data.slice.{Slice, SliceRO}
import swaydb.slice.{Slice, SliceRO}

import java.nio.channels.WritableByteChannel
import java.nio.file.Path
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/swaydb/core/io/file/MMAPFile.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import com.typesafe.scalalogging.LazyLogging
import swaydb.core.sweeper.ByteBufferSweeper
import swaydb.core.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
import swaydb.data.config.ForceSave
import swaydb.data.slice.{Slice, SliceRO, Slices}
import swaydb.slice.{Slice, SliceRO, Slices}
import swaydb.effect.{Effect, Reserve}

import java.nio.channels.FileChannel.MapMode
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/swaydb/core/io/file/StandardFile.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package swaydb.core.io.file
import com.typesafe.scalalogging.LazyLogging
import swaydb.core.util.Collections
import swaydb.data.config.ForceSave
import swaydb.data.slice.{Slice, SliceRO, Slices}
import swaydb.slice.{Slice, SliceRO, Slices}
import swaydb.effect.Effect

import java.nio.ByteBuffer
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/swaydb/core/io/reader/FileReader.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package swaydb.core.io.reader

import com.typesafe.scalalogging.LazyLogging
import swaydb.core.io.file.DBFile
import swaydb.data.slice.{Reader, Slice, SliceRO}
import swaydb.data.utils.ByteOps
import swaydb.slice.{Reader, Slice, SliceRO}
import swaydb.slice.utils.ByteOps

import java.nio.file.Path

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/swaydb/core/io/reader/Reader.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package swaydb.core.io.reader

import swaydb.core.io.file.DBFile
import swaydb.data.slice.{Slice, SliceReader}
import swaydb.slice.{Slice, SliceReader}

private[swaydb] object Reader {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import swaydb.core.log.{LogCache, LogCacheBuilder, LogEntry}
import swaydb.core.segment.{Segment, SegmentOption}
import swaydb.skiplist.SkipListConcurrent
import swaydb.data.order.KeyOrder
import swaydb.data.slice.{Slice, SliceOption}
import swaydb.slice.{Slice, SliceOption}

import scala.reflect.ClassTag

Expand Down
8 changes: 4 additions & 4 deletions core/src/main/scala/swaydb/core/level/Level.scala
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ import swaydb.core.util._
import swaydb.data.compaction.CompactionConfig.CompactionParallelism
import swaydb.data.compaction.{LevelMeter, LevelThrottle}
import swaydb.data.order.{KeyOrder, TimeOrder}
import swaydb.data.slice.SliceIOImplicits._
import swaydb.data.slice.{Slice, SliceOption}
import swaydb.slice.SliceIOImplicits._
import swaydb.slice.{Slice, SliceOption}
import swaydb.data.storage.LevelStorage
import swaydb.effect.Effect._
import swaydb.effect.{Dir, Effect, Extension, FileLocker}
import swaydb.utils.Futures
import swaydb.{Aggregator, Bag, Error, IO}
import swaydb.utils.{Aggregator, Futures}
import swaydb.{Bag, Error, IO}

import java.nio.channels.FileChannel
import java.nio.file.{Path, StandardOpenOption}
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/swaydb/core/level/LevelRef.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import swaydb.core.segment.ref.search.ThreadReadState
import swaydb.core.segment.{Segment, SegmentOption}
import swaydb.data.compaction.LevelMeter
import swaydb.data.config.{ForceSave, MMAP}
import swaydb.data.slice.{Slice, SliceOption}
import swaydb.slice.{Slice, SliceOption}
import swaydb.{Bag, IO}

import java.nio.file.Path
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/swaydb/core/level/NextLevel.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import swaydb.core.segment.block.segment.transient.TransientSegment
import swaydb.core.segment.{Segment, SegmentOption}
import swaydb.data.compaction.CompactionConfig.CompactionParallelism
import swaydb.data.compaction.{LevelMeter, LevelThrottle}
import swaydb.data.slice.Slice
import swaydb.slice.Slice
import swaydb.effect.Dir
import swaydb.{Error, IO}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import swaydb.core.sweeper.{FileSweeper, MemorySweeper}
import swaydb.core.util.IDGenerator
import swaydb.data.config.{MMAP, SegmentRefCacheLife}
import swaydb.data.order.{KeyOrder, TimeOrder}
import swaydb.data.slice.Slice
import swaydb.slice.Slice
import swaydb.{Actor, DefActor}

import java.util.concurrent.ConcurrentHashMap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import swaydb.core.segment.Segment
import swaydb.data.NonEmptyList
import swaydb.data.compaction.PushStrategy
import swaydb.data.order.KeyOrder
import swaydb.data.slice.Slice
import swaydb.slice.Slice

case object LevelTaskAssigner {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package swaydb.core.level.compaction.task.assigner

import swaydb.Aggregator
import swaydb.utils.Aggregator
import swaydb.core.data.{KeyValue, Memory}
import swaydb.core.function.FunctionStore
import swaydb.core.level.Level
Expand All @@ -30,7 +30,7 @@ import swaydb.core.segment.assigner.Assignable
import swaydb.data.compaction.CompactionConfig.CompactionParallelism
import swaydb.data.compaction.PushStrategy
import swaydb.data.order.{KeyOrder, TimeOrder}
import swaydb.data.slice.Slice
import swaydb.slice.Slice
import swaydb.data.{MaxKey, NonEmptyList}
import swaydb.utils.Futures

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package swaydb.core.level.compaction.task.assigner

import swaydb.Aggregator
import swaydb.utils.Aggregator
import swaydb.core.data.Value.FromValue
import swaydb.core.data.{Memory, Time, Value}
import swaydb.core.level.Level
Expand All @@ -26,7 +26,7 @@ import swaydb.core.segment.Segment
import swaydb.core.segment.assigner.{Assignable, Assigner, Assignment, AssignmentResult}
import swaydb.data.compaction.PushStrategy
import swaydb.data.order.KeyOrder
import swaydb.data.slice.Slice
import swaydb.slice.Slice
import swaydb.data.{MaxKey, NonEmptyList}

import scala.annotation.tailrec
Expand Down
Loading

0 comments on commit baf5b76

Please sign in to comment.