Merge branch 'filodb:develop' into develop

yu-shipit · Aug 4, 2023 · 297d1ea · 297d1ea
2 parents 033ff49 + dd59325
commit 297d1ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/core/src/main/scala/filodb.core/memstore/PartKeyLuceneIndex.scala b/core/src/main/scala/filodb.core/memstore/PartKeyLuceneIndex.scala
@@ -822,7 +822,10 @@ class PartKeyLuceneIndex(ref: DatasetRef,
     filter match {
       case EqualsRegex(value) =>
         val regex = removeRegexAnchors(value.toString)
-        if (regex.replaceAll("\\.\\*", "").nonEmpty) new RegexpQuery(new Term(column, regex), RegExp.NONE)
+        if (regex.replaceAll("\\.\\*", "") == "")
+          new MatchAllDocsQuery
+        else if (regex.nonEmpty)
+          new RegexpQuery(new Term(column, regex), RegExp.NONE)
         else leafFilter(column, NotEqualsRegex(".+")) // value="" means the label is absent or has an empty value.
 
       case NotEqualsRegex(value) =>

diff --git a/core/src/test/scala/filodb.core/memstore/PartKeyLuceneIndexSpec.scala b/core/src/test/scala/filodb.core/memstore/PartKeyLuceneIndexSpec.scala
@@ -1058,5 +1058,11 @@ class PartKeyLuceneIndexSpec extends AnyFunSpec with Matchers with BeforeAndAfte
     val expected5 = Seq(pkrs(7), pkrs(8), pkrs(9))
     result5.map(_.partKey.toSeq) shouldEqual expected5.map(_.partKey.toSeq)
     result5.map(p => (p.startTime, p.endTime)) shouldEqual expected5.map(p => (p.startTime, p.endTime))
+
+
+    val filter10 = ColumnFilter("Actor2Code", EqualsRegex(".*".utf8))
+    val result10= keyIndex.partKeyRecordsFromFilters(Seq(filter10), 0, Long.MaxValue)
+    result10.map(_.partKey.toSeq) shouldEqual pkrs.map(_.partKey.toSeq)
+    result10.map(p => (p.startTime, p.endTime)) shouldEqual pkrs.map(p => (p.startTime, p.endTime))
   }
 }