Merge branch '1.0' into extract-lucene

outr · Apr 9, 2024 · 051a3c7 · 051a3c7
2 parents 31d11c7 + 2349c24
commit 051a3c7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/core/src/test/scala/spec/SimpleSpec.scala b/core/src/test/scala/spec/SimpleSpec.scala
@@ -8,6 +8,7 @@ import lightdb.query._
 import lightdb.upgrade.DatabaseUpgrade
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AsyncWordSpec
+import scribe.{Level, Logger}
 
 import java.nio.file.Paths
 
@@ -20,6 +21,7 @@ class SimpleSpec extends AsyncWordSpec with AsyncIOSpec with Matchers {
 
   "Simple database" should {
     "initialize the database" in {
+      Logger("com.oath.halodb").withMinimumLevel(Level.Warn).replace()
       DB.init(truncate = true)
     }
     "store John Doe" in {

diff --git a/lucene/src/main/scala/lightdb/lucene/index/StringField.scala b/lucene/src/main/scala/lightdb/lucene/index/StringField.scala
@@ -5,7 +5,7 @@ import lightdb.lucene.LuceneIndexedField
 import lightdb.query.Filter
 import lightdb.{Collection, Document}
 import org.apache.lucene.index.Term
-import org.apache.lucene.search.{SortField, TermQuery}
+import org.apache.lucene.search.{BooleanClause, BooleanQuery, SortField, TermQuery}
 import org.apache.lucene.{document => ld}
 
 case class StringField[D <: Document[D]](fieldName: String,
@@ -16,6 +16,15 @@ case class StringField[D <: Document[D]](fieldName: String,
 
   def is(value: String): Filter[D] = Filter(new TermQuery(new Term(fieldName, value)))
 
+  def includedIn(values: Seq[String]): Filter[D] = {
+    val b = new BooleanQuery.Builder
+    b.setMinimumNumberShouldMatch(1)
+    values.foreach { value =>
+      b.add(is(value).asQuery, BooleanClause.Occur.SHOULD)
+    }
+    Filter(b.build())
+  }
+
   override protected[lightdb] def createFields(doc: D): List[ld.Field] = List(
     new ld.StringField(fieldName, get(doc), if (store) ld.Field.Store.YES else ld.Field.Store.NO)
   )