Added indexes and docAndIndexes support to AsyncQuery

outr · Oct 5, 2024 · 2bbba91 · 2bbba91
1 parent e93325d
commit 2bbba91
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/async/src/main/scala/lightdb/async/AsyncQuery.scala b/async/src/main/scala/lightdb/async/AsyncQuery.scala
@@ -11,7 +11,7 @@ import lightdb.doc.{Document, DocumentModel}
 import lightdb.facet.FacetQuery
 import lightdb.field.{Field, IndexingState}
 import lightdb.filter._
-import lightdb.materialized.MaterializedIndex
+import lightdb.materialized.{MaterializedAndDoc, MaterializedIndex}
 import lightdb.spatial.{DistanceAndDoc, Geo}
 import lightdb.store.Conversion
 import lightdb.transaction.Transaction
@@ -103,6 +103,15 @@ case class AsyncQuery[Doc <: Document[Doc], Model <: DocumentModel[Doc]](collect
                       (implicit transaction: Transaction[Doc]): fs2.Stream[IO, (MaterializedIndex[Doc, Model], Double)] =
         apply(Conversion.Materialized[Doc, Model](f(collection.model)))
 
+      def indexes()(implicit transaction: Transaction[Doc]): fs2.Stream[IO, (MaterializedIndex[Doc, Model], Double)] = {
+        val fields = collection.model.fields.filter(_.indexed)
+        apply(Conversion.Materialized[Doc, Model](fields))
+      }
+
+      def docAndIndexes()(implicit transaction: Transaction[Doc]): fs2.Stream[IO, (MaterializedAndDoc[Doc, Model], Double)] = {
+        apply(Conversion.DocAndIndexes[Doc, Model]())
+      }
+
       def distance[G <: Geo](f: Model => Field[Doc, List[G]],
                              from: Geo.Point,
                              sort: Boolean = true,
@@ -137,6 +146,15 @@ case class AsyncQuery[Doc <: Document[Doc], Model <: DocumentModel[Doc]](collect
                     (implicit transaction: Transaction[Doc]): fs2.Stream[IO, MaterializedIndex[Doc, Model]] =
       apply(Conversion.Materialized[Doc, Model](f(collection.model)))
 
+    def indexes()(implicit transaction: Transaction[Doc]): fs2.Stream[IO, MaterializedIndex[Doc, Model]] = {
+      val fields = collection.model.fields.filter(_.indexed)
+      apply(Conversion.Materialized[Doc, Model](fields))
+    }
+
+    def docAndIndexes()(implicit transaction: Transaction[Doc]): fs2.Stream[IO, MaterializedAndDoc[Doc, Model]] = {
+      apply(Conversion.DocAndIndexes[Doc, Model]())
+    }
+
     def distance[G <: Geo](f: Model => Field[Doc, List[G]],
                            from: Geo.Point,
                            sort: Boolean = true,
@@ -182,6 +200,15 @@ case class AsyncQuery[Doc <: Document[Doc], Model <: DocumentModel[Doc]](collect
                     (implicit transaction: Transaction[Doc]): IO[AsyncSearchResults[Doc, Model, MaterializedIndex[Doc, Model]]] =
       apply(Conversion.Materialized(f(collection.model)))
 
+    def indexes()(implicit transaction: Transaction[Doc]): IO[AsyncSearchResults[Doc, Model, MaterializedIndex[Doc, Model]]] = {
+      val fields = collection.model.fields.filter(_.indexed)
+      apply(Conversion.Materialized(fields))
+    }
+
+    def docAndIndexes()(implicit transaction: Transaction[Doc]): IO[AsyncSearchResults[Doc, Model, MaterializedAndDoc[Doc, Model]]] = {
+      apply(Conversion.DocAndIndexes())
+    }
+
     def distance[G <: Geo](f: Model => Field[Doc, List[G]],
                            from: Geo.Point,
                            sort: Boolean = true,

diff --git a/build.sbt b/build.sbt
@@ -15,7 +15,7 @@ val developerURL: String = "https://matthicks.com"
 
 name := projectName
 ThisBuild / organization := org
-ThisBuild / version := "0.14.1"
+ThisBuild / version := "0.14.2-SNAPSHOT"
 ThisBuild / scalaVersion := scala213
 ThisBuild / crossScalaVersions := allScalaVersions
 ThisBuild / scalacOptions ++= Seq("-unchecked", "-deprecation")