diff --git a/all/src/test/scala/spec/AirportSpec.scala b/all/src/test/scala/spec/AirportSpec.scala index 6bb12c0d..bec9c952 100644 --- a/all/src/test/scala/spec/AirportSpec.scala +++ b/all/src/test/scala/spec/AirportSpec.scala @@ -3,22 +3,21 @@ package spec import fabric.rw._ import lightdb.collection.Collection import lightdb.doc.{Document, DocumentModel, JsonConversion} -import lightdb.field.Field import lightdb.halodb.HaloDBStore import lightdb.lucene.LuceneStore -import lightdb.{Id, LightDB, Persistence, StoredValue, Unique} +import lightdb.store.StoreManager import lightdb.store.split.SplitStoreManager -import lightdb.store.{StoreManager, StoreMode} import lightdb.upgrade.DatabaseUpgrade +import lightdb.{Id, LightDB, Unique} import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.{AnyWordSpec, AsyncWordSpec} +import org.scalatest.wordspec.AsyncWordSpec import rapid.{AsyncTaskSpec, Task} +import scribe.{rapid => logger} -import java.nio.file.{Path, Paths} +import java.nio.file.Path import scala.collection.mutable import scala.collection.mutable.ListBuffer import scala.io.Source -import scribe.{rapid => logger} @EmbeddedTest class AirportSpec extends AsyncWordSpec with AsyncTaskSpec with Matchers { diff --git a/all/src/test/scala/spec/HaloDBAndLuceneSpec.scala b/all/src/test/scala/spec/HaloDBAndLuceneSpec.scala index 41eee70e..301bcee3 100644 --- a/all/src/test/scala/spec/HaloDBAndLuceneSpec.scala +++ b/all/src/test/scala/spec/HaloDBAndLuceneSpec.scala @@ -1,7 +1,7 @@ package spec import lightdb.halodb.HaloDBStore import lightdb.lucene.LuceneStore -import lightdb.store.{StoreManager, StoreMode} +import lightdb.store.StoreManager import lightdb.store.split.SplitStoreManager @EmbeddedTest diff --git a/all/src/test/scala/spec/RocksDBAndLuceneSpec.scala b/all/src/test/scala/spec/RocksDBAndLuceneSpec.scala index 65f88258..de5a7ac4 100644 --- a/all/src/test/scala/spec/RocksDBAndLuceneSpec.scala +++ b/all/src/test/scala/spec/RocksDBAndLuceneSpec.scala @@ -2,7 +2,7 @@ package spec import lightdb.lucene.LuceneStore import lightdb.rocksdb.RocksDBStore -import lightdb.store.{StoreManager, StoreMode} +import lightdb.store.StoreManager import lightdb.store.split.SplitStoreManager @EmbeddedTest diff --git a/benchmark/graphs/imports.svg b/benchmark/graphs/imports.svg index 91a81b69..648655be 100644 --- a/benchmark/graphs/imports.svg +++ b/benchmark/graphs/imports.svg @@ -1 +1,2 @@ -Data Import020,00040,00060,00080,000100,000LightDBPostgreSQLMongoDBArangoDBMariaDBSQLiteDatabaseRecords Per Second \ No newline at end of file + +Data Import020,00040,00060,00080,000100,000LightDBPostgreSQLMongoDBArangoDBMariaDBSQLiteDatabaseRecords Per Second \ No newline at end of file diff --git a/benchmark/graphs/search-titles.svg b/benchmark/graphs/search-titles.svg index af624f55..04399fc0 100644 --- a/benchmark/graphs/search-titles.svg +++ b/benchmark/graphs/search-titles.svg @@ -1 +1,2 @@ -Search Titles0200,000400,000600,000LightDBPostgreSQLMongoDBArangoDBMariaDBSQLiteDatabaseRecords Per Second \ No newline at end of file + +Search Titles0200,000400,000600,000LightDBPostgreSQLMongoDBArangoDBMariaDBSQLiteDatabaseRecords Per Second \ No newline at end of file diff --git a/benchmark/graphs/validate-ids.svg b/benchmark/graphs/validate-ids.svg index e5c470a0..86834261 100644 --- a/benchmark/graphs/validate-ids.svg +++ b/benchmark/graphs/validate-ids.svg @@ -1 +1,2 @@ -Validate Ids01,000,0002,000,0003,000,0004,000,000LightDBPostgreSQLMongoDBArangoDBMariaDBSQLiteDatabaseRecords Per Second \ No newline at end of file + +Validate Ids01,000,0002,000,0003,000,0004,000,000LightDBPostgreSQLMongoDBArangoDBMariaDBSQLiteDatabaseRecords Per Second \ No newline at end of file diff --git a/benchmark/src/main/scala/benchmark/FlushingBacklog.scala b/benchmark/src/main/scala/benchmark/FlushingBacklog.scala index 8c0055be..4c797894 100644 --- a/benchmark/src/main/scala/benchmark/FlushingBacklog.scala +++ b/benchmark/src/main/scala/benchmark/FlushingBacklog.scala @@ -1,6 +1,5 @@ package benchmark -import cats.effect.IO import rapid._ import java.util.concurrent.ConcurrentHashMap diff --git a/benchmark/src/main/scala/benchmark/IOIterator.scala b/benchmark/src/main/scala/benchmark/IOIterator.scala index 20d8bf38..89fe1fa2 100644 --- a/benchmark/src/main/scala/benchmark/IOIterator.scala +++ b/benchmark/src/main/scala/benchmark/IOIterator.scala @@ -1,6 +1,5 @@ package benchmark -import cats.implicits._ import rapid.Task import java.util.concurrent.atomic.AtomicInteger diff --git a/benchmark/src/main/scala/benchmark/bench/Bench.scala b/benchmark/src/main/scala/benchmark/bench/Bench.scala index bebf4357..f5f2b605 100644 --- a/benchmark/src/main/scala/benchmark/bench/Bench.scala +++ b/benchmark/src/main/scala/benchmark/bench/Bench.scala @@ -1,7 +1,7 @@ package benchmark.bench import benchmark.ActionIterator -import lightdb.{Id, Unique} +import lightdb.Unique import java.sql.ResultSet import scala.collection.parallel.CollectionConverters._ diff --git a/benchmark/src/main/scala/benchmark/bench/ReportGenerator.scala b/benchmark/src/main/scala/benchmark/bench/ReportGenerator.scala index 1ce92179..8322f73a 100644 --- a/benchmark/src/main/scala/benchmark/bench/ReportGenerator.scala +++ b/benchmark/src/main/scala/benchmark/bench/ReportGenerator.scala @@ -4,7 +4,6 @@ import fabric.io.{JsonFormatter, JsonParser} import fabric.rw._ import io.quickchart.QuickChart import org.apache.commons.io.FileUtils -import perfolation.double2Implicits import java.io.File diff --git a/benchmark/src/main/scala/benchmark/bench/Runner.scala b/benchmark/src/main/scala/benchmark/bench/Runner.scala index 6bf959e5..57b81b7b 100644 --- a/benchmark/src/main/scala/benchmark/bench/Runner.scala +++ b/benchmark/src/main/scala/benchmark/bench/Runner.scala @@ -1,16 +1,14 @@ package benchmark.bench -import benchmark.bench.impl.{DerbyBench, H2Bench, LightDBAsyncBench, LightDBBench, MongoDBBench, PostgreSQLBench, SQLiteBench} +import benchmark.bench.impl._ import fabric.io.JsonFormatter import fabric.rw._ import lightdb.h2.H2Store import lightdb.halodb.HaloDBStore import lightdb.lucene.LuceneStore -import lightdb.postgresql.PostgreSQLStoreManager import lightdb.rocksdb.RocksDBStore import lightdb.sql.SQLiteStore -import lightdb.sql.connect.{HikariConnectionManager, SQLConfig} -import lightdb.store.{MapStore, StoreMode} +import lightdb.store.MapStore import lightdb.store.split.SplitStoreManager import org.apache.commons.io.FileUtils diff --git a/benchmark/src/main/scala/benchmark/bench/StatusCallback.scala b/benchmark/src/main/scala/benchmark/bench/StatusCallback.scala index 5f900294..7db2a92d 100644 --- a/benchmark/src/main/scala/benchmark/bench/StatusCallback.scala +++ b/benchmark/src/main/scala/benchmark/bench/StatusCallback.scala @@ -3,7 +3,7 @@ package benchmark.bench import com.sun.management.OperatingSystemMXBean import java.lang.management.ManagementFactory -import java.util.concurrent.atomic.{AtomicInteger, AtomicLong, AtomicReference} +import java.util.concurrent.atomic.AtomicInteger case class StatusCallback(every: Long = 30_000L) { private val _progress = new AtomicInteger(0) diff --git a/benchmark/src/main/scala/benchmark/bench/impl/DerbyBench.scala b/benchmark/src/main/scala/benchmark/bench/impl/DerbyBench.scala index 8b0deefa..ccc0c52f 100644 --- a/benchmark/src/main/scala/benchmark/bench/impl/DerbyBench.scala +++ b/benchmark/src/main/scala/benchmark/bench/impl/DerbyBench.scala @@ -1,12 +1,10 @@ package benchmark.bench.impl -import benchmark.bench.{Bench, StatusCallback} -import benchmark.imdb.MariaDBImplementation.{TitleAkaPG, fromRS} +import benchmark.bench.Bench import lightdb.Unique import java.io.File import java.sql.{Connection, DriverManager} -import scala.collection.parallel.CollectionConverters._ object DerbyBench extends Bench { private lazy val connection: Connection = { diff --git a/benchmark/src/main/scala/benchmark/bench/impl/H2Bench.scala b/benchmark/src/main/scala/benchmark/bench/impl/H2Bench.scala index e2a764b6..0fcb326c 100644 --- a/benchmark/src/main/scala/benchmark/bench/impl/H2Bench.scala +++ b/benchmark/src/main/scala/benchmark/bench/impl/H2Bench.scala @@ -1,11 +1,10 @@ package benchmark.bench.impl -import benchmark.bench.{Bench, StatusCallback} +import benchmark.bench.Bench import lightdb.Unique import java.io.File import java.sql.{Connection, DriverManager} -import scala.collection.parallel.CollectionConverters._ object H2Bench extends Bench { private lazy val connection: Connection = { diff --git a/benchmark/src/main/scala/benchmark/bench/impl/LightDBAsyncBench.scala b/benchmark/src/main/scala/benchmark/bench/impl/LightDBAsyncBench.scala index dcc3e642..cda16818 100644 --- a/benchmark/src/main/scala/benchmark/bench/impl/LightDBAsyncBench.scala +++ b/benchmark/src/main/scala/benchmark/bench/impl/LightDBAsyncBench.scala @@ -3,11 +3,10 @@ package benchmark.bench.impl import benchmark.bench.Bench import fabric.rw.RW import lightdb.Id -import lightdb.async.{AsyncCollection, AsyncDatabaseUpgrade, AsyncLightDB} import lightdb.collection.Collection -import lightdb.store.StoreManager import lightdb.doc.{Document, DocumentModel, JsonConversion} import lightdb.sql.SQLConversion +import lightdb.store.StoreManager import rapid.Task import java.nio.file.Path diff --git a/benchmark/src/main/scala/benchmark/bench/impl/LightDBBench.scala b/benchmark/src/main/scala/benchmark/bench/impl/LightDBBench.scala index 2f7e204e..6e4971b4 100644 --- a/benchmark/src/main/scala/benchmark/bench/impl/LightDBBench.scala +++ b/benchmark/src/main/scala/benchmark/bench/impl/LightDBBench.scala @@ -1,14 +1,13 @@ package benchmark.bench.impl -import benchmark.bench.{Bench, StatusCallback} +import benchmark.bench.Bench +import fabric.rw._ import lightdb.collection.Collection import lightdb.doc.{Document, DocumentModel, JsonConversion} import lightdb.sql.SQLConversion import lightdb.store.StoreManager import lightdb.upgrade.DatabaseUpgrade import lightdb.{Id, LightDB} -import fabric.rw._ -import lightdb.field.Field import java.nio.file.Path import java.sql.ResultSet diff --git a/benchmark/src/main/scala/benchmark/bench/impl/MongoDBBench.scala b/benchmark/src/main/scala/benchmark/bench/impl/MongoDBBench.scala index cc19d35b..2773ba86 100644 --- a/benchmark/src/main/scala/benchmark/bench/impl/MongoDBBench.scala +++ b/benchmark/src/main/scala/benchmark/bench/impl/MongoDBBench.scala @@ -2,7 +2,7 @@ package benchmark.bench.impl import benchmark.bench.Bench import com.mongodb.client.MongoClients -import com.mongodb.client.model.{Aggregates, Filters, Indexes} +import com.mongodb.client.model.{Filters, Indexes} import org.bson.Document import scala.jdk.CollectionConverters._ diff --git a/benchmark/src/main/scala/benchmark/bench/impl/PostgreSQLBench.scala b/benchmark/src/main/scala/benchmark/bench/impl/PostgreSQLBench.scala index e97c673a..d916d6a1 100644 --- a/benchmark/src/main/scala/benchmark/bench/impl/PostgreSQLBench.scala +++ b/benchmark/src/main/scala/benchmark/bench/impl/PostgreSQLBench.scala @@ -1,11 +1,9 @@ package benchmark.bench.impl -import benchmark.bench.{Bench, StatusCallback} +import benchmark.bench.Bench import lightdb.Unique -import java.io.File import java.sql.{Connection, DriverManager} -import scala.collection.parallel.CollectionConverters._ object PostgreSQLBench extends Bench { private lazy val connection: Connection = { diff --git a/benchmark/src/main/scala/benchmark/bench/impl/SQLiteBench.scala b/benchmark/src/main/scala/benchmark/bench/impl/SQLiteBench.scala index 9494dd7c..3bffb24e 100644 --- a/benchmark/src/main/scala/benchmark/bench/impl/SQLiteBench.scala +++ b/benchmark/src/main/scala/benchmark/bench/impl/SQLiteBench.scala @@ -1,11 +1,10 @@ package benchmark.bench.impl -import benchmark.bench.{Bench, StatusCallback} +import benchmark.bench.Bench import lightdb.Unique import java.io.File import java.sql.{Connection, DriverManager} -import scala.collection.parallel.CollectionConverters._ object SQLiteBench extends Bench { private lazy val connection: Connection = { diff --git a/benchmark/src/main/scala/benchmark/imdb/MariaDBImplementation.scala b/benchmark/src/main/scala/benchmark/imdb/MariaDBImplementation.scala index 32f1cb17..878dea25 100644 --- a/benchmark/src/main/scala/benchmark/imdb/MariaDBImplementation.scala +++ b/benchmark/src/main/scala/benchmark/imdb/MariaDBImplementation.scala @@ -1,7 +1,6 @@ package benchmark.imdb import benchmark.FlushingBacklog -import cats.effect.IO import cats.effect.unsafe.IORuntime import rapid.Task diff --git a/benchmark/src/main/scala/benchmark/imdb/MongoDBImplementation.scala b/benchmark/src/main/scala/benchmark/imdb/MongoDBImplementation.scala index 69f2646c..2f4228ae 100644 --- a/benchmark/src/main/scala/benchmark/imdb/MongoDBImplementation.scala +++ b/benchmark/src/main/scala/benchmark/imdb/MongoDBImplementation.scala @@ -1,7 +1,6 @@ package benchmark.imdb import benchmark.FlushingBacklog -import cats.effect.IO import cats.effect.unsafe.IORuntime import com.mongodb.client.MongoClients import com.mongodb.client.model.Indexes diff --git a/benchmark/src/main/scala/benchmark/imdb/PostgresImplementation.scala b/benchmark/src/main/scala/benchmark/imdb/PostgresImplementation.scala index 55203780..57a3d69c 100644 --- a/benchmark/src/main/scala/benchmark/imdb/PostgresImplementation.scala +++ b/benchmark/src/main/scala/benchmark/imdb/PostgresImplementation.scala @@ -1,7 +1,6 @@ package benchmark.imdb import benchmark.FlushingBacklog -import cats.effect.IO import cats.effect.unsafe.IORuntime import rapid.Task diff --git a/benchmark/src/main/scala/benchmark/imdb/SQLiteImplementation.scala b/benchmark/src/main/scala/benchmark/imdb/SQLiteImplementation.scala index e009cacf..659d23fe 100644 --- a/benchmark/src/main/scala/benchmark/imdb/SQLiteImplementation.scala +++ b/benchmark/src/main/scala/benchmark/imdb/SQLiteImplementation.scala @@ -1,7 +1,6 @@ package benchmark.imdb import benchmark.FlushingBacklog -import cats.effect.IO import cats.effect.unsafe.IORuntime import lightdb.Unique import rapid.Task diff --git a/core/src/main/scala/lightdb/LightDB.scala b/core/src/main/scala/lightdb/LightDB.scala index c68a5651..f5a68499 100644 --- a/core/src/main/scala/lightdb/LightDB.scala +++ b/core/src/main/scala/lightdb/LightDB.scala @@ -4,7 +4,7 @@ import fabric.rw._ import lightdb.collection.Collection import lightdb.doc.{Document, DocumentModel} import lightdb.feature.{DBFeatureKey, FeatureSupport} -import lightdb.store.{Store, StoreManager, StoreMode} +import lightdb.store.{StoreManager, StoreMode} import lightdb.upgrade.DatabaseUpgrade import lightdb.util.{Disposable, Initializable} import rapid._ diff --git a/core/src/main/scala/lightdb/Query.scala b/core/src/main/scala/lightdb/Query.scala index e0e79232..9abae938 100644 --- a/core/src/main/scala/lightdb/Query.scala +++ b/core/src/main/scala/lightdb/Query.scala @@ -1,18 +1,17 @@ package lightdb import fabric.Json -import lightdb.field.Field._ import lightdb.aggregate.{AggregateFunction, AggregateQuery} -import lightdb.collection.Collection import lightdb.distance.Distance import lightdb.doc.{Document, DocumentModel} import lightdb.error.NonIndexedFieldException import lightdb.facet.FacetQuery +import lightdb.field.Field._ import lightdb.field.{Field, IndexingState} import lightdb.filter._ import lightdb.materialized.{MaterializedAndDoc, MaterializedIndex} import lightdb.spatial.{DistanceAndDoc, Geo} -import lightdb.store.{Conversion, Store, StoreMode} +import lightdb.store.{Conversion, Store} import lightdb.transaction.Transaction import rapid.{Forge, Grouped, Task} diff --git a/core/src/main/scala/lightdb/SearchResults.scala b/core/src/main/scala/lightdb/SearchResults.scala index 89650b16..9ac924a3 100644 --- a/core/src/main/scala/lightdb/SearchResults.scala +++ b/core/src/main/scala/lightdb/SearchResults.scala @@ -1,8 +1,8 @@ package lightdb -import lightdb.field.Field._ import lightdb.doc.{Document, DocumentModel} import lightdb.facet.FacetResult +import lightdb.field.Field._ import lightdb.transaction.Transaction import rapid.Task diff --git a/core/src/main/scala/lightdb/aggregate/AggregateFunction.scala b/core/src/main/scala/lightdb/aggregate/AggregateFunction.scala index 06836e5c..59ac1113 100644 --- a/core/src/main/scala/lightdb/aggregate/AggregateFunction.scala +++ b/core/src/main/scala/lightdb/aggregate/AggregateFunction.scala @@ -4,7 +4,7 @@ import fabric.rw._ import lightdb.distance.Distance import lightdb.doc.Document import lightdb.field.Field -import lightdb.filter.{Condition, Filter, FilterClause, FilterSupport} +import lightdb.filter.FilterSupport import lightdb.materialized.Materializable import lightdb.spatial.Geo diff --git a/core/src/main/scala/lightdb/aggregate/AggregateQuery.scala b/core/src/main/scala/lightdb/aggregate/AggregateQuery.scala index 956da35a..e03f8041 100644 --- a/core/src/main/scala/lightdb/aggregate/AggregateQuery.scala +++ b/core/src/main/scala/lightdb/aggregate/AggregateQuery.scala @@ -1,9 +1,9 @@ package lightdb.aggregate -import lightdb.{Query, SortDirection} import lightdb.doc.{Document, DocumentModel} import lightdb.materialized.MaterializedAggregate import lightdb.transaction.Transaction +import lightdb.{Query, SortDirection} import rapid.Task case class AggregateQuery[Doc <: Document[Doc], Model <: DocumentModel[Doc]](query: Query[Doc, Model], diff --git a/core/src/main/scala/lightdb/backup/DatabaseBackup.scala b/core/src/main/scala/lightdb/backup/DatabaseBackup.scala index 5f866da5..9ce7665f 100644 --- a/core/src/main/scala/lightdb/backup/DatabaseBackup.scala +++ b/core/src/main/scala/lightdb/backup/DatabaseBackup.scala @@ -2,8 +2,8 @@ package lightdb.backup import fabric.Json import fabric.io.JsonFormatter +import lightdb.LightDB import lightdb.collection.Collection -import lightdb.{KeyValue, LightDB} import rapid._ import java.io.{File, FileOutputStream, PrintWriter} diff --git a/core/src/main/scala/lightdb/collection/Collection.scala b/core/src/main/scala/lightdb/collection/Collection.scala index 4c9e5187..21227952 100644 --- a/core/src/main/scala/lightdb/collection/Collection.scala +++ b/core/src/main/scala/lightdb/collection/Collection.scala @@ -3,21 +3,17 @@ package lightdb.collection import fabric.Json import fabric.define.DefType import fabric.rw._ +import lightdb._ import lightdb.doc.{Document, DocumentModel, JsonConversion} import lightdb.error.{DocNotFoundException, ModelMissingFieldsException} +import lightdb.field.Field._ +import lightdb.lock.LockManager import lightdb.store.Store import lightdb.transaction.Transaction -import lightdb.trigger.CollectionTriggers import lightdb.util.Initializable -import lightdb._ -import lightdb.field.Field._ -import lightdb.lock.LockManager import rapid._ import scribe.{rapid => logger} -import java.util.concurrent.ConcurrentHashMap -import scala.jdk.CollectionConverters.IteratorHasAsScala - case class Collection[Doc <: Document[Doc], Model <: DocumentModel[Doc]](name: String, model: Model, store: Store[Doc, Model]) extends Initializable { collection => diff --git a/core/src/main/scala/lightdb/doc/DocumentModel.scala b/core/src/main/scala/lightdb/doc/DocumentModel.scala index 342ae96a..b8bdb272 100644 --- a/core/src/main/scala/lightdb/doc/DocumentModel.scala +++ b/core/src/main/scala/lightdb/doc/DocumentModel.scala @@ -1,12 +1,12 @@ package lightdb.doc import fabric.rw._ +import lightdb._ import lightdb.collection.Collection import lightdb.facet.{FacetConfig, FacetValue} -import lightdb.filter.FilterBuilder -import lightdb._ -import lightdb.field.{Field, FieldGetter} import lightdb.field.Field._ +import lightdb.field.{Field, FieldGetter} +import lightdb.filter.FilterBuilder import rapid.Task import scala.language.implicitConversions diff --git a/core/src/main/scala/lightdb/doc/JsonConversion.scala b/core/src/main/scala/lightdb/doc/JsonConversion.scala index dc96f4c7..7a01cd46 100644 --- a/core/src/main/scala/lightdb/doc/JsonConversion.scala +++ b/core/src/main/scala/lightdb/doc/JsonConversion.scala @@ -1,7 +1,7 @@ package lightdb.doc import fabric.Json -import fabric.rw.{Asable, RW} +import fabric.rw.Asable trait JsonConversion[Doc <: Document[Doc]] extends DocumentModel[Doc] { def convertFromJson(json: Json): Doc = json.as[Doc] diff --git a/core/src/main/scala/lightdb/doc/MaterializedModel.scala b/core/src/main/scala/lightdb/doc/MaterializedModel.scala index 6213488a..79753743 100644 --- a/core/src/main/scala/lightdb/doc/MaterializedModel.scala +++ b/core/src/main/scala/lightdb/doc/MaterializedModel.scala @@ -1,6 +1,5 @@ package lightdb.doc -import lightdb.Id import lightdb.collection.Collection import lightdb.transaction.Transaction import lightdb.trigger.BasicCollectionTrigger diff --git a/core/src/main/scala/lightdb/doc/RecordDocumentModel.scala b/core/src/main/scala/lightdb/doc/RecordDocumentModel.scala index c70280ff..c3470082 100644 --- a/core/src/main/scala/lightdb/doc/RecordDocumentModel.scala +++ b/core/src/main/scala/lightdb/doc/RecordDocumentModel.scala @@ -1,6 +1,5 @@ package lightdb.doc -import fabric.rw._ import lightdb.Timestamp trait RecordDocumentModel[Doc <: RecordDocument[Doc]] extends DocumentModel[Doc] { diff --git a/core/src/main/scala/lightdb/facet/FacetQuery.scala b/core/src/main/scala/lightdb/facet/FacetQuery.scala index 6ed09442..8a0a978d 100644 --- a/core/src/main/scala/lightdb/facet/FacetQuery.scala +++ b/core/src/main/scala/lightdb/facet/FacetQuery.scala @@ -1,7 +1,7 @@ package lightdb.facet -import lightdb.field.Field.FacetField import lightdb.doc.Document +import lightdb.field.Field.FacetField case class FacetQuery[Doc <: Document[Doc]](field: FacetField[Doc], path: List[String], diff --git a/core/src/main/scala/lightdb/filter/package.scala b/core/src/main/scala/lightdb/filter/package.scala index 26a507e0..b213e7f1 100644 --- a/core/src/main/scala/lightdb/filter/package.scala +++ b/core/src/main/scala/lightdb/filter/package.scala @@ -1,6 +1,6 @@ package lightdb -import lightdb.doc.{Document, DocumentModel} +import lightdb.doc.Document import scala.language.implicitConversions diff --git a/core/src/main/scala/lightdb/spatial/Spatial.scala b/core/src/main/scala/lightdb/spatial/Spatial.scala index aba72726..fe240360 100644 --- a/core/src/main/scala/lightdb/spatial/Spatial.scala +++ b/core/src/main/scala/lightdb/spatial/Spatial.scala @@ -1,12 +1,10 @@ package lightdb.spatial import lightdb.distance._ -import org.locationtech.jts.geom.{Coordinate, Geometry, GeometryFactory, LineString, Polygon} -import org.locationtech.spatial4j.context.SpatialContext +import org.locationtech.jts.geom._ import org.locationtech.spatial4j.context.jts.JtsSpatialContext import org.locationtech.spatial4j.distance.DistanceUtils import org.locationtech.spatial4j.shape -import org.locationtech.spatial4j.shape.Shape import org.locationtech.spatial4j.shape.ShapeFactory.{LineStringBuilder, PolygonBuilder} import org.locationtech.spatial4j.shape.jts.JtsGeometry diff --git a/core/src/main/scala/lightdb/store/InMemoryIndexes.scala b/core/src/main/scala/lightdb/store/InMemoryIndexes.scala index 8982f06c..6ebf4c0b 100644 --- a/core/src/main/scala/lightdb/store/InMemoryIndexes.scala +++ b/core/src/main/scala/lightdb/store/InMemoryIndexes.scala @@ -1,9 +1,8 @@ package lightdb.store import lightdb._ -import lightdb.field.Field._ -import lightdb.collection.Collection import lightdb.doc.{Document, DocumentModel} +import lightdb.field.Field._ import lightdb.field.IndexingState import lightdb.transaction.Transaction import lightdb.util.InMemoryIndex diff --git a/core/src/main/scala/lightdb/store/MapStore.scala b/core/src/main/scala/lightdb/store/MapStore.scala index 5efaa4fa..938f6fe0 100644 --- a/core/src/main/scala/lightdb/store/MapStore.scala +++ b/core/src/main/scala/lightdb/store/MapStore.scala @@ -1,10 +1,9 @@ package lightdb.store -import lightdb.aggregate.AggregateQuery -import lightdb.collection.Collection import lightdb._ -import lightdb.field.Field._ +import lightdb.aggregate.AggregateQuery import lightdb.doc.{Document, DocumentModel} +import lightdb.field.Field._ import lightdb.materialized.MaterializedAggregate import lightdb.transaction.Transaction import rapid.Task diff --git a/core/src/main/scala/lightdb/store/Store.scala b/core/src/main/scala/lightdb/store/Store.scala index 97f36fd5..718e5c5c 100644 --- a/core/src/main/scala/lightdb/store/Store.scala +++ b/core/src/main/scala/lightdb/store/Store.scala @@ -3,16 +3,16 @@ package lightdb.store import fabric.Json import fabric.io.{JsonFormatter, JsonParser} import fabric.rw.{Asable, Convertible} +import lightdb._ import lightdb.aggregate.AggregateQuery import lightdb.collection.Collection import lightdb.doc.{Document, DocumentModel} -import lightdb.materialized.MaterializedAggregate -import lightdb.transaction.Transaction -import lightdb._ import lightdb.error.DocNotFoundException import lightdb.field.Field import lightdb.field.Field._ import lightdb.lock.LockManager +import lightdb.materialized.MaterializedAggregate +import lightdb.transaction.Transaction import lightdb.trigger.CollectionTriggers import rapid.{Forge, Task} import scribe.{rapid => logger} diff --git a/core/src/main/scala/lightdb/store/split/SplitStore.scala b/core/src/main/scala/lightdb/store/split/SplitStore.scala index 053e9800..16827a65 100644 --- a/core/src/main/scala/lightdb/store/split/SplitStore.scala +++ b/core/src/main/scala/lightdb/store/split/SplitStore.scala @@ -1,14 +1,13 @@ package lightdb.store.split import fabric.Json +import lightdb._ import lightdb.aggregate.AggregateQuery -import lightdb.collection.Collection import lightdb.doc.{Document, DocumentModel} +import lightdb.field.Field._ import lightdb.materialized.MaterializedAggregate import lightdb.store.{Conversion, Store, StoreMode} import lightdb.transaction.{Transaction, TransactionKey} -import lightdb._ -import lightdb.field.Field._ import rapid.Task import scala.language.implicitConversions diff --git a/core/src/main/scala/lightdb/trigger/CollectionTriggers.scala b/core/src/main/scala/lightdb/trigger/CollectionTriggers.scala index ec9f9064..d8e25992 100644 --- a/core/src/main/scala/lightdb/trigger/CollectionTriggers.scala +++ b/core/src/main/scala/lightdb/trigger/CollectionTriggers.scala @@ -1,7 +1,7 @@ package lightdb.trigger -import lightdb.field.Field.UniqueIndex import lightdb.doc.Document +import lightdb.field.Field.UniqueIndex import lightdb.transaction.Transaction import rapid._ diff --git a/core/src/main/scala/lightdb/util/Aggregator.scala b/core/src/main/scala/lightdb/util/Aggregator.scala index d43c5015..3b2c21a0 100644 --- a/core/src/main/scala/lightdb/util/Aggregator.scala +++ b/core/src/main/scala/lightdb/util/Aggregator.scala @@ -4,7 +4,6 @@ import fabric.rw._ import fabric.{Json, Null, Num, NumDec, NumInt, Obj, Str, num} import lightdb.SortDirection.Ascending import lightdb.aggregate.{AggregateQuery, AggregateType} -import lightdb.collection.Collection import lightdb.doc.{Document, DocumentModel} import lightdb.field.Field import lightdb.materialized.MaterializedAggregate diff --git a/core/src/main/scala/lightdb/util/InMemoryIndex.scala b/core/src/main/scala/lightdb/util/InMemoryIndex.scala index 3da4d7dc..e8c5415d 100644 --- a/core/src/main/scala/lightdb/util/InMemoryIndex.scala +++ b/core/src/main/scala/lightdb/util/InMemoryIndex.scala @@ -1,8 +1,8 @@ package lightdb.util import lightdb._ -import lightdb.field.Field._ import lightdb.doc.Document +import lightdb.field.Field._ import lightdb.field.IndexingState import java.util.Comparator diff --git a/core/src/test/scala/spec/AbstractBasicSpec.scala b/core/src/test/scala/spec/AbstractBasicSpec.scala index 70d8814c..7067916c 100644 --- a/core/src/test/scala/spec/AbstractBasicSpec.scala +++ b/core/src/test/scala/spec/AbstractBasicSpec.scala @@ -1,19 +1,16 @@ package spec -import fabric._ import fabric.rw._ import lightdb.backup.{DatabaseBackup, DatabaseRestore} import lightdb.collection.Collection -import lightdb.doc.{DocState, Document, DocumentModel, JsonConversion, MaterializedBatchModel, MaterializedModel} +import lightdb.doc._ import lightdb.feature.DBFeatureKey -import lightdb.field.Field import lightdb.filter._ import lightdb.store.StoreManager -import lightdb.transaction.Transaction import lightdb.upgrade.DatabaseUpgrade import lightdb.{Id, LightDB, Sort, StoredValue} import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.{AnyWordSpec, AsyncWordSpec} +import org.scalatest.wordspec.AsyncWordSpec import perfolation.double2Implicits import rapid.{AsyncTaskSpec, Task} diff --git a/core/src/test/scala/spec/AbstractFacetSpec.scala b/core/src/test/scala/spec/AbstractFacetSpec.scala index 22a80170..e486500d 100644 --- a/core/src/test/scala/spec/AbstractFacetSpec.scala +++ b/core/src/test/scala/spec/AbstractFacetSpec.scala @@ -2,14 +2,14 @@ package spec import fabric.rw._ import lightdb.collection.Collection -import lightdb.{Id, LightDB} import lightdb.doc.{Document, DocumentModel, JsonConversion} import lightdb.facet.{FacetConfig, FacetValue} import lightdb.filter._ import lightdb.store.StoreManager import lightdb.upgrade.DatabaseUpgrade +import lightdb.{Id, LightDB} import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.{AnyWordSpec, AsyncWordSpec} +import org.scalatest.wordspec.AsyncWordSpec import rapid.AsyncTaskSpec import java.nio.file.Path diff --git a/core/src/test/scala/spec/AbstractKeyValueSpec.scala b/core/src/test/scala/spec/AbstractKeyValueSpec.scala index 92c347cc..48acffcc 100644 --- a/core/src/test/scala/spec/AbstractKeyValueSpec.scala +++ b/core/src/test/scala/spec/AbstractKeyValueSpec.scala @@ -2,12 +2,12 @@ package spec import fabric.rw._ import lightdb.collection.Collection -import lightdb.{Id, LightDB} import lightdb.doc.{Document, DocumentModel, JsonConversion} import lightdb.store.StoreManager import lightdb.upgrade.DatabaseUpgrade +import lightdb.{Id, LightDB} import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.{AnyWordSpec, AsyncWordSpec} +import org.scalatest.wordspec.AsyncWordSpec import rapid.{AsyncTaskSpec, Task} import java.nio.file.Path diff --git a/core/src/test/scala/spec/AbstractSpatialSpec.scala b/core/src/test/scala/spec/AbstractSpatialSpec.scala index c8d5debc..9d77f30a 100644 --- a/core/src/test/scala/spec/AbstractSpatialSpec.scala +++ b/core/src/test/scala/spec/AbstractSpatialSpec.scala @@ -5,13 +5,12 @@ import fabric.rw._ import lightdb.collection.Collection import lightdb.distance._ import lightdb.doc.{Document, DocumentModel, JsonConversion} -import lightdb.field.Field import lightdb.spatial.Geo import lightdb.store.StoreManager import lightdb.upgrade.DatabaseUpgrade import lightdb.{Id, LightDB} import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.{AnyWordSpec, AsyncWordSpec} +import org.scalatest.wordspec.AsyncWordSpec import rapid.AsyncTaskSpec import java.nio.file.Path diff --git a/core/src/test/scala/spec/AbstractSpecialCasesSpec.scala b/core/src/test/scala/spec/AbstractSpecialCasesSpec.scala index e4608e33..4058f05c 100644 --- a/core/src/test/scala/spec/AbstractSpecialCasesSpec.scala +++ b/core/src/test/scala/spec/AbstractSpecialCasesSpec.scala @@ -8,7 +8,7 @@ import lightdb.store.StoreManager import lightdb.upgrade.DatabaseUpgrade import lightdb.{Id, LightDB, Sort, Timestamp} import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.{AnyWordSpec, AsyncWordSpec} +import org.scalatest.wordspec.AsyncWordSpec import rapid.AsyncTaskSpec import java.nio.file.Path diff --git a/duckdb/src/main/scala/lightdb/duckdb/DuckDBStore.scala b/duckdb/src/main/scala/lightdb/duckdb/DuckDBStore.scala index 44428e15..96bf9ee9 100644 --- a/duckdb/src/main/scala/lightdb/duckdb/DuckDBStore.scala +++ b/duckdb/src/main/scala/lightdb/duckdb/DuckDBStore.scala @@ -2,11 +2,9 @@ package lightdb.duckdb import lightdb.LightDB import lightdb.doc.{Document, DocumentModel} -import lightdb.sql.{SQLDatabase, SQLStore} import lightdb.sql.connect.{ConnectionManager, SQLConfig, SingleConnectionManager} +import lightdb.sql.{SQLDatabase, SQLStore} import lightdb.store.{Store, StoreManager, StoreMode} -import lightdb.transaction.Transaction -import org.duckdb.DuckDBConnection import java.nio.file.Path import java.sql.Connection diff --git a/h2/src/main/scala/lightdb/h2/H2Store.scala b/h2/src/main/scala/lightdb/h2/H2Store.scala index 0127b624..70bf46dd 100644 --- a/h2/src/main/scala/lightdb/h2/H2Store.scala +++ b/h2/src/main/scala/lightdb/h2/H2Store.scala @@ -1,12 +1,11 @@ package lightdb.h2 -import lightdb.{LightDB, Unique} import lightdb.doc.{Document, DocumentModel} +import lightdb.sql.connect.{ConnectionManager, SQLConfig, SingleConnectionManager} import lightdb.sql.{SQLDatabase, SQLStore} -import lightdb.sql.connect.{ConnectionManager, HikariConnectionManager, SQLConfig, SingleConnectionManager} import lightdb.store.{Store, StoreManager, StoreMode} +import lightdb.{LightDB, Unique} -import java.io.File import java.nio.file.Path import java.sql.Connection diff --git a/halodb/src/main/scala/lightdb/halodb/HaloDBStore.scala b/halodb/src/main/scala/lightdb/halodb/HaloDBStore.scala index 823be7b8..8c97c3f9 100644 --- a/halodb/src/main/scala/lightdb/halodb/HaloDBStore.scala +++ b/halodb/src/main/scala/lightdb/halodb/HaloDBStore.scala @@ -4,11 +4,10 @@ import com.oath.halodb.{HaloDB, HaloDBOptions} import fabric.Json import fabric.io.{JsonFormatter, JsonParser} import fabric.rw.{Asable, Convertible} -import lightdb.aggregate.AggregateQuery -import lightdb.collection.Collection import lightdb._ -import lightdb.field.Field._ +import lightdb.aggregate.AggregateQuery import lightdb.doc.{Document, DocumentModel} +import lightdb.field.Field._ import lightdb.materialized.MaterializedAggregate import lightdb.store.{Conversion, Store, StoreManager, StoreMode} import lightdb.transaction.Transaction diff --git a/lucene/src/main/scala/lightdb/lucene/LucenePaginatedIterator.scala b/lucene/src/main/scala/lightdb/lucene/LucenePaginatedIterator.scala index 35f8f2ce..93ac8e86 100644 --- a/lucene/src/main/scala/lightdb/lucene/LucenePaginatedIterator.scala +++ b/lucene/src/main/scala/lightdb/lucene/LucenePaginatedIterator.scala @@ -1,8 +1,8 @@ package lightdb.lucene -import org.apache.lucene.search._ import org.apache.lucene.document._ import org.apache.lucene.index.StoredFields +import org.apache.lucene.search._ case class LucenePaginatedIterator(searcher: IndexSearcher, query: Query, diff --git a/lucene/src/main/scala/lightdb/lucene/LuceneState.scala b/lucene/src/main/scala/lightdb/lucene/LuceneState.scala index 5f51de58..17af3a15 100644 --- a/lucene/src/main/scala/lightdb/lucene/LuceneState.scala +++ b/lucene/src/main/scala/lightdb/lucene/LuceneState.scala @@ -2,7 +2,7 @@ package lightdb.lucene import lightdb.doc.Document import lightdb.lucene.index.Index -import lightdb.transaction.{Transaction, TransactionFeature} +import lightdb.transaction.TransactionFeature import org.apache.lucene.facet.taxonomy.TaxonomyReader import org.apache.lucene.search.IndexSearcher import rapid.Task diff --git a/lucene/src/main/scala/lightdb/lucene/LuceneStore.scala b/lucene/src/main/scala/lightdb/lucene/LuceneStore.scala index 8c5e8e08..dbafb5a2 100644 --- a/lucene/src/main/scala/lightdb/lucene/LuceneStore.scala +++ b/lucene/src/main/scala/lightdb/lucene/LuceneStore.scala @@ -3,14 +3,12 @@ package lightdb.lucene import fabric._ import fabric.define.DefType import fabric.io.JsonFormatter -import fabric.rw.{Asable, Convertible} -import lightdb.SortDirection.Ascending -import lightdb.aggregate.{AggregateQuery, AggregateType} -import lightdb.collection.Collection +import fabric.rw.Asable import lightdb._ -import lightdb.field.Field._ +import lightdb.aggregate.AggregateQuery import lightdb.doc.{Document, DocumentModel, JsonConversion} import lightdb.facet.{FacetResult, FacetResultValue} +import lightdb.field.Field._ import lightdb.field.{Field, IndexingState} import lightdb.filter.{Condition, Filter} import lightdb.lucene.index.Index @@ -19,20 +17,19 @@ import lightdb.spatial.{DistanceAndDoc, Geo, Spatial} import lightdb.store.{Conversion, Store, StoreManager, StoreMode} import lightdb.transaction.Transaction import lightdb.util.Aggregator -import org.apache.lucene.document.{DoubleField, DoublePoint, IntField, IntPoint, LatLonDocValuesField, LatLonPoint, LatLonShape, LongField, LongPoint, NumericDocValuesField, SortedDocValuesField, SortedNumericDocValuesField, StoredField, StringField, TextField, Document => LuceneDocument, Field => LuceneField} +import org.apache.lucene.document.{DoubleField, DoublePoint, IntField, IntPoint, LatLonDocValuesField, LatLonPoint, LatLonShape, LongField, LongPoint, NumericDocValuesField, SortedDocValuesField, StoredField, StringField, TextField, Document => LuceneDocument, Field => LuceneField} import org.apache.lucene.facet.taxonomy.FastTaxonomyFacetCounts +import org.apache.lucene.facet.{DrillDownQuery, FacetsCollector, FacetsCollectorManager, FacetsConfig, FacetField => LuceneFacetField} import org.apache.lucene.geo.{Line, Polygon} -import org.apache.lucene.search.{BooleanClause, BooleanQuery, BoostQuery, FieldExistsQuery, IndexSearcher, MatchAllDocsQuery, MultiCollectorManager, PrefixQuery, RegexpQuery, ScoreDoc, SearcherFactory, SearcherManager, SortField, SortedNumericSortField, TermQuery, TopFieldCollector, TopFieldCollectorManager, TopFieldDocs, TotalHitCountCollector, TotalHitCountCollectorManager, WildcardQuery, Query => LuceneQuery, Sort => LuceneSort} -import org.apache.lucene.index.{DirectoryReader, SegmentInfos, SegmentReader, StoredFields, Term} +import org.apache.lucene.index.{DirectoryReader, SegmentReader, StoredFields, Term} import org.apache.lucene.queryparser.classic.QueryParser -import org.apache.lucene.util.{BytesRef, Version} -import org.apache.lucene.facet.{DrillDownQuery, FacetsCollector, FacetsCollectorManager, FacetsConfig, FacetField => LuceneFacetField} +import org.apache.lucene.search.{BooleanClause, BooleanQuery, BoostQuery, IndexSearcher, MatchAllDocsQuery, MultiCollectorManager, RegexpQuery, ScoreDoc, SortField, SortedNumericSortField, TermQuery, TopFieldCollectorManager, TopFieldDocs, TotalHitCountCollectorManager, WildcardQuery, Query => LuceneQuery, Sort => LuceneSort} import org.apache.lucene.store.FSDirectory +import org.apache.lucene.util.{BytesRef, Version} import rapid.Task import java.nio.file.{Files, Path} import scala.language.implicitConversions -import scala.util.Try class LuceneStore[Doc <: Document[Doc], Model <: DocumentModel[Doc]](name: String, model: Model, diff --git a/lucene/src/main/scala/lightdb/lucene/index/Index.scala b/lucene/src/main/scala/lightdb/lucene/index/Index.scala index 890f27e2..a2a36e99 100644 --- a/lucene/src/main/scala/lightdb/lucene/index/Index.scala +++ b/lucene/src/main/scala/lightdb/lucene/index/Index.scala @@ -2,9 +2,9 @@ package lightdb.lucene.index import org.apache.lucene.analysis.Analyzer import org.apache.lucene.analysis.standard.StandardAnalyzer -import org.apache.lucene.facet.taxonomy.{TaxonomyReader, TaxonomyWriter} +import org.apache.lucene.facet.taxonomy.TaxonomyReader import org.apache.lucene.facet.taxonomy.directory.{DirectoryTaxonomyReader, DirectoryTaxonomyWriter} -import org.apache.lucene.index.{IndexWriter, IndexWriterConfig, memory} +import org.apache.lucene.index.{IndexWriter, IndexWriterConfig} import org.apache.lucene.queryparser.classic.QueryParser import org.apache.lucene.search.{IndexSearcher, SearcherFactory, SearcherManager} import org.apache.lucene.store.{BaseDirectory, ByteBuffersDirectory, FSDirectory} diff --git a/mapdb/src/main/scala/lightdb/mapdb/MapDBStore.scala b/mapdb/src/main/scala/lightdb/mapdb/MapDBStore.scala index cd2f0fd0..8584f8d7 100644 --- a/mapdb/src/main/scala/lightdb/mapdb/MapDBStore.scala +++ b/mapdb/src/main/scala/lightdb/mapdb/MapDBStore.scala @@ -1,10 +1,9 @@ package lightdb.mapdb -import lightdb.aggregate.AggregateQuery -import lightdb.collection.Collection import lightdb._ -import lightdb.field.Field._ +import lightdb.aggregate.AggregateQuery import lightdb.doc.{Document, DocumentModel} +import lightdb.field.Field._ import lightdb.materialized.MaterializedAggregate import lightdb.store.{Conversion, Store, StoreManager, StoreMode} import lightdb.transaction.Transaction diff --git a/redis/src/main/scala/lightdb/redis/RedisStore.scala b/redis/src/main/scala/lightdb/redis/RedisStore.scala index ed701fe6..0bbd05b0 100644 --- a/redis/src/main/scala/lightdb/redis/RedisStore.scala +++ b/redis/src/main/scala/lightdb/redis/RedisStore.scala @@ -1,14 +1,13 @@ package lightdb.redis -import lightdb.aggregate.AggregateQuery -import lightdb.collection.Collection +import _root_.redis.clients.jedis.{Jedis, JedisPool, JedisPoolConfig} import lightdb._ -import lightdb.field.Field._ +import lightdb.aggregate.AggregateQuery import lightdb.doc.{Document, DocumentModel} +import lightdb.field.Field._ import lightdb.materialized.MaterializedAggregate import lightdb.store.{Conversion, Store, StoreMode} import lightdb.transaction.{Transaction, TransactionKey} -import _root_.redis.clients.jedis.{Jedis, JedisPool, JedisPoolConfig} import rapid.Task import scala.jdk.CollectionConverters.IteratorHasAsScala diff --git a/rocksdb/src/main/scala/lightdb/rocksdb/RocksDBStore.scala b/rocksdb/src/main/scala/lightdb/rocksdb/RocksDBStore.scala index 0af56c5a..4b410785 100644 --- a/rocksdb/src/main/scala/lightdb/rocksdb/RocksDBStore.scala +++ b/rocksdb/src/main/scala/lightdb/rocksdb/RocksDBStore.scala @@ -2,11 +2,10 @@ package lightdb.rocksdb import fabric.io.{JsonFormatter, JsonParser} import fabric.rw.{Asable, Convertible} -import lightdb.aggregate.AggregateQuery -import lightdb.collection.Collection import lightdb._ -import lightdb.field.Field._ +import lightdb.aggregate.AggregateQuery import lightdb.doc.{Document, DocumentModel} +import lightdb.field.Field._ import lightdb.materialized.MaterializedAggregate import lightdb.store.{Conversion, Store, StoreManager, StoreMode} import lightdb.transaction.Transaction diff --git a/sql/src/main/scala/lightdb/sql/SQLArg.scala b/sql/src/main/scala/lightdb/sql/SQLArg.scala index 8243f5cb..916b68f0 100644 --- a/sql/src/main/scala/lightdb/sql/SQLArg.scala +++ b/sql/src/main/scala/lightdb/sql/SQLArg.scala @@ -4,13 +4,13 @@ import fabric._ import fabric.define.DefType import fabric.io.JsonFormatter import fabric.rw._ -import lightdb.doc.Document -import lightdb.spatial.Geo import lightdb._ -import lightdb.field.{Field, IndexingState} +import lightdb.doc.Document import lightdb.field.Field._ +import lightdb.field.{Field, IndexingState} +import lightdb.spatial.Geo -import java.sql.{JDBCType, PreparedStatement, SQLType, Types} +import java.sql.{PreparedStatement, Types} trait SQLArg { def set(ps: PreparedStatement, index: Int): Unit diff --git a/sql/src/main/scala/lightdb/sql/SQLQueryBuilder.scala b/sql/src/main/scala/lightdb/sql/SQLQueryBuilder.scala index b01b34f4..67ee96d0 100644 --- a/sql/src/main/scala/lightdb/sql/SQLQueryBuilder.scala +++ b/sql/src/main/scala/lightdb/sql/SQLQueryBuilder.scala @@ -1,9 +1,8 @@ package lightdb.sql -import lightdb.collection.Collection import lightdb.doc.Document -import java.sql.{PreparedStatement, ResultSet, SQLException} +import java.sql.SQLException case class SQLQueryBuilder[Doc <: Document[Doc]](store: SQLStore[Doc, _], state: SQLState[Doc], diff --git a/sql/src/main/scala/lightdb/sql/SQLState.scala b/sql/src/main/scala/lightdb/sql/SQLState.scala index 96b8f610..de8366f4 100644 --- a/sql/src/main/scala/lightdb/sql/SQLState.scala +++ b/sql/src/main/scala/lightdb/sql/SQLState.scala @@ -2,12 +2,12 @@ package lightdb.sql import lightdb.doc.Document import lightdb.sql.connect.ConnectionManager -import lightdb.transaction.{Transaction, TransactionFeature, TransactionKey} +import lightdb.transaction.{Transaction, TransactionFeature} import rapid.Task import java.sql.{Connection, PreparedStatement, ResultSet, Statement} -import java.util.concurrent.{ConcurrentHashMap, ConcurrentLinkedQueue} import java.util.concurrent.atomic.AtomicInteger +import java.util.concurrent.{ConcurrentHashMap, ConcurrentLinkedQueue} import scala.util.Try case class SQLState[Doc <: Document[Doc]](connectionManager: ConnectionManager, diff --git a/sql/src/main/scala/lightdb/sql/SQLStore.scala b/sql/src/main/scala/lightdb/sql/SQLStore.scala index ae3259c2..08fd8562 100644 --- a/sql/src/main/scala/lightdb/sql/SQLStore.scala +++ b/sql/src/main/scala/lightdb/sql/SQLStore.scala @@ -4,20 +4,20 @@ import fabric._ import fabric.define.DefType import fabric.io.{JsonFormatter, JsonParser} import fabric.rw._ +import lightdb._ import lightdb.aggregate.{AggregateFilter, AggregateFunction, AggregateQuery, AggregateType} import lightdb.collection.Collection import lightdb.distance.Distance import lightdb.doc.{Document, DocumentModel, JsonConversion} +import lightdb.field.Field._ +import lightdb.field.{Field, IndexingState} import lightdb.filter.{Condition, Filter} import lightdb.materialized.{MaterializedAggregate, MaterializedAndDoc, MaterializedIndex} import lightdb.spatial.{DistanceAndDoc, Geo} import lightdb.sql.connect.ConnectionManager import lightdb.store.{Conversion, Store, StoreMode} -import lightdb.transaction.{Transaction, TransactionKey} +import lightdb.transaction.Transaction import lightdb.util.ActionIterator -import lightdb._ -import lightdb.field.{Field, IndexingState} -import lightdb.field.Field._ import rapid.Task import java.sql.{Connection, PreparedStatement, ResultSet} diff --git a/sqlite/src/main/scala/lightdb/sql/SQLiteStore.scala b/sqlite/src/main/scala/lightdb/sql/SQLiteStore.scala index 812ddfc5..902e6249 100644 --- a/sqlite/src/main/scala/lightdb/sql/SQLiteStore.scala +++ b/sqlite/src/main/scala/lightdb/sql/SQLiteStore.scala @@ -1,27 +1,23 @@ package lightdb.sql import fabric._ -import fabric.define.DefType import fabric.io.{JsonFormatter, JsonParser} import fabric.rw._ -import lightdb.collection.Collection import lightdb.distance.Distance -import lightdb.sql.connect.{ConnectionManager, DBCPConnectionManager, SQLConfig, SingleConnectionManager} -import lightdb.{LightDB, SortDirection} import lightdb.doc.{Document, DocumentModel} import lightdb.field.Field import lightdb.filter.Filter import lightdb.spatial.{Geo, Spatial} +import lightdb.sql.connect.{ConnectionManager, SQLConfig, SingleConnectionManager} import lightdb.store.{Conversion, Store, StoreManager, StoreMode} import lightdb.transaction.Transaction -import org.sqlite.{Collation, SQLiteConfig, SQLiteOpenMode} -import org.sqlite.SQLiteConfig.{JournalMode, LockingMode, SynchronousMode, TransactionMode} +import lightdb.{LightDB, SortDirection} +import org.sqlite.Collation +import rapid._ -import java.io.File -import java.nio.file.{Files, Path, StandardCopyOption} +import java.nio.file.Path import java.sql.Connection import java.util.regex.Pattern -import rapid._ class SQLiteStore[Doc <: Document[Doc], Model <: DocumentModel[Doc]](name: String, model: Model, diff --git a/sqlite/src/test/scala/spec/SQLiteAndMapSplitSpec.scala b/sqlite/src/test/scala/spec/SQLiteAndMapSplitSpec.scala index 6fb68834..dce84363 100644 --- a/sqlite/src/test/scala/spec/SQLiteAndMapSplitSpec.scala +++ b/sqlite/src/test/scala/spec/SQLiteAndMapSplitSpec.scala @@ -1,8 +1,8 @@ package spec import lightdb.sql.SQLiteStore -import lightdb.store.{MapStore, StoreManager} import lightdb.store.split.SplitStoreManager +import lightdb.store.{MapStore, StoreManager} @EmbeddedTest class SQLiteAndMapSplitSpec extends AbstractBasicSpec { diff --git a/sqlite/src/test/scala/spec/SQLiteSpatialSpec.scala b/sqlite/src/test/scala/spec/SQLiteSpatialSpec.scala index 50f25d9b..9034922e 100644 --- a/sqlite/src/test/scala/spec/SQLiteSpatialSpec.scala +++ b/sqlite/src/test/scala/spec/SQLiteSpatialSpec.scala @@ -1,6 +1,6 @@ package spec -import lightdb.sql.{SQLQueryBuilder, SQLiteStore} +import lightdb.sql.SQLiteStore import lightdb.store.StoreManager @EmbeddedTest diff --git a/sqlite/src/test/scala/spec/SQLiteSpec.scala b/sqlite/src/test/scala/spec/SQLiteSpec.scala index a8dd07d2..0aa6056b 100644 --- a/sqlite/src/test/scala/spec/SQLiteSpec.scala +++ b/sqlite/src/test/scala/spec/SQLiteSpec.scala @@ -1,9 +1,7 @@ package spec -import lightdb.sql.{SQLDatabase, SQLQueryBuilder, SQLiteStore} +import lightdb.sql.SQLiteStore import lightdb.store.StoreManager -import java.nio.file.Path - @EmbeddedTest class SQLiteSpec extends AbstractBasicSpec { // SQLQueryBuilder.LogQueries = true