Release 0.14.1

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

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
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.0"
+ThisBuild / version := "0.14.1"
 ThisBuild / scalaVersion := scala213
 ThisBuild / crossScalaVersions := allScalaVersions
 ThisBuild / scalacOptions ++= Seq("-unchecked", "-deprecation")

diff --git a/lucene/src/main/scala/lightdb/lucene/LuceneStore.scala b/lucene/src/main/scala/lightdb/lucene/LuceneStore.scala
@@ -26,7 +26,7 @@ import org.apache.lucene.search.{BooleanClause, BooleanQuery, BoostQuery, FieldE
 import org.apache.lucene.index.{StoredFields, Term}
 import org.apache.lucene.queryparser.classic.QueryParser
 import org.apache.lucene.util.BytesRef
-import org.apache.lucene.facet.{DrillDownQuery, FacetsCollector, FacetsConfig, FacetField => LuceneFacetField}
+import org.apache.lucene.facet.{DrillDownQuery, FacetsCollector, FacetsCollectorManager, FacetsConfig, FacetField => LuceneFacetField}
 
 import java.nio.file.Path
 import scala.language.implicitConversions
@@ -216,17 +216,19 @@ class LuceneStore[Doc <: Document[Doc], Model <: DocumentModel[Doc]](directory:
     }
     val s = new LuceneSort(sortFields: _*)
     val indexSearcher = state.indexSearcher
-    var facetsCollector: Option[FacetsCollector] = None
+    var facetsCollectorManager: Option[FacetsCollectorManager] = None
     val limit = query.limit.map(l => math.min(l, 100)).getOrElse(100) + query.offset
     if (limit <= 0) throw new RuntimeException(s"Limit must be a positive value, but set to $limit")
     var facetResults: Map[FacetField[Doc], FacetResult] = Map.empty
     def search(total: Option[Int]): TopFieldDocs = {
       if (query.facets.nonEmpty) {
-        facetsCollector = Some(new FacetsCollector)
+        facetsCollectorManager = Some(new FacetsCollectorManager(query.scoreDocs))
       }
-      val topFieldDocs = facetsCollector match {
-        case Some(fc) => FacetsCollector.search(indexSearcher, q, total.getOrElse(limit), s, query.scoreDocs, fc)
-        case None => indexSearcher.search(q, total.getOrElse(limit), s, query.scoreDocs)
+      val (facetsCollector, topFieldDocs) = facetsCollectorManager match {
+        case Some(fcm) =>
+          val facetsResult = FacetsCollectorManager.search(indexSearcher, q, total.getOrElse(limit), s, query.scoreDocs, fcm)
+          (Some(facetsResult.facetsCollector()), facetsResult.topDocs().asInstanceOf[TopFieldDocs])
+        case None => (None, indexSearcher.search(q, total.getOrElse(limit), s, query.scoreDocs))
       }
       facetResults = facetsCollector match {
         case Some(fc) =>