Skip to content

Apache Lucene open-source search software

Fix ordered intervals query over interleaved terms (#12214)

Hongyu Yana6475cecbf2f
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index b228c491329..7aee28c6743 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -179,6 +179,8 @@ Bug Fixes
* GITHUB#12202: Fix MultiFieldQueryParser to apply boosts to regexp, wildcard, prefix, range, fuzzy queries. (Jasir KT)
+* GITHUB#12214: Fix ordered intervals query to avoid skipping some of the results over interleaved terms. (Hongyu Yan)
+
Build
---------------------
diff --git a/lucene/queries/src/java/org/apache/lucene/queries/intervals/OrderedIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/OrderedIntervalsSource.java
index a7472862096..65fa6d03395 100644
--- a/lucene/queries/src/java/org/apache/lucene/queries/intervals/OrderedIntervalsSource.java
+++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/OrderedIntervalsSource.java
@@ -112,7 +112,7 @@ class OrderedIntervalsSource extends MinimizingConjunctionIntervalsSource {
private static class OrderedIntervalIterator extends ConjunctionIntervalIterator {
- int start = -1, end = -1, i;
+ int start = -1, end = -1, i = 1;
int slop;
final MatchCallback onMatch;
@@ -136,7 +136,6 @@ class OrderedIntervalsSource extends MinimizingConjunctionIntervalsSource {
start = end = slop = IntervalIterator.NO_MORE_INTERVALS;
int lastStart = Integer.MAX_VALUE;
boolean minimizing = false;
- i = 1;
while (true) {
while (true) {
if (subIterators.get(i - 1).end() >= lastStart) {
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java
index 1275c1db6d4..d9141882c94 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java
@@ -84,7 +84,8 @@ public class TestIntervalQuery extends LuceneTestCase {
"greater new york",
"x x x x x intend x x x message x x x message x x x addressed x x",
"issue with intervals queries from search engine. So it's a big issue for us as we need to do ordered searches. Thank you to help us concerning that issue",
- "場外好朋友"
+ "場外好朋友",
+ "alice bob alice alice carl alice bob alice carl"
};
private void checkHits(Query query, int[] results) throws IOException {
@@ -348,6 +349,17 @@ public class TestIntervalQuery extends LuceneTestCase {
checkHits(q, new int[] {});
}
+ public void testOrderedWithGaps2() throws IOException {
+ Query q =
+ new IntervalQuery(
+ field,
+ Intervals.maxgaps(
+ 1,
+ Intervals.ordered(
+ Intervals.term("alice"), Intervals.term("bob"), Intervals.term("carl"))));
+ checkHits(q, new int[] {12});
+ }
+
public void testNestedOrInContainedBy() throws IOException {
Query q =
new IntervalQuery(