Skip to content

Commit ac450ce

Browse files
mayya-sharipovamayya-sharipova
authored
Remove temp XIntervals (#119937)
PR #114234 introduced XIntervals as a temp solution while waiting for a fix in Lucene 10.1. With Lucene 10.1 we don't need this class anymore. Related to #113554
1 parent 1586708 commit ac450ce

File tree

4 files changed

+16
-122
lines changed

4 files changed

+16
-122
lines changed

‎server/src/main/java/org/elasticsearch/index/query/IntervalBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ protected static IntervalsSource combineSources(List<IntervalsSource> sources, i
126126
if (maxGaps == 0 && ordered) {
127127
return Intervals.phrase(sourcesArray);
128128
}
129-
IntervalsSource inner = ordered ? XIntervals.ordered(sourcesArray) : XIntervals.unordered(sourcesArray);
129+
IntervalsSource inner = ordered ? Intervals.ordered(sourcesArray) : Intervals.unordered(sourcesArray);
130130
if (maxGaps == -1) {
131131
return inner;
132132
}

‎server/src/main/java/org/elasticsearch/index/query/XIntervals.java‎

Lines changed: 0 additions & 106 deletions
This file was deleted.

‎server/src/test/java/org/elasticsearch/index/query/IntervalBuilderTests.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void testOrdered() throws IOException {
4646
CannedTokenStream ts = new CannedTokenStream(new Token("term1", 1, 2), new Token("term2", 3, 4), new Token("term3", 5, 6));
4747

4848
IntervalsSource source = BUILDER.analyzeText(new CachingTokenFilter(ts), -1, true);
49-
IntervalsSource expected = XIntervals.ordered(Intervals.term("term1"), Intervals.term("term2"), Intervals.term("term3"));
49+
IntervalsSource expected = Intervals.ordered(Intervals.term("term1"), Intervals.term("term2"), Intervals.term("term3"));
5050

5151
assertEquals(expected, source);
5252

@@ -57,7 +57,7 @@ public void testUnordered() throws IOException {
5757
CannedTokenStream ts = new CannedTokenStream(new Token("term1", 1, 2), new Token("term2", 3, 4), new Token("term3", 5, 6));
5858

5959
IntervalsSource source = BUILDER.analyzeText(new CachingTokenFilter(ts), -1, false);
60-
IntervalsSource expected = XIntervals.unordered(Intervals.term("term1"), Intervals.term("term2"), Intervals.term("term3"));
60+
IntervalsSource expected = Intervals.unordered(Intervals.term("term1"), Intervals.term("term2"), Intervals.term("term3"));
6161

6262
assertEquals(expected, source);
6363

@@ -101,7 +101,7 @@ public void testSimpleSynonyms() throws IOException {
101101
);
102102

103103
IntervalsSource source = BUILDER.analyzeText(new CachingTokenFilter(ts), -1, true);
104-
IntervalsSource expected = XIntervals.ordered(
104+
IntervalsSource expected = Intervals.ordered(
105105
Intervals.term("term1"),
106106
Intervals.or(Intervals.term("term2"), Intervals.term("term4")),
107107
Intervals.term("term3")
@@ -122,7 +122,7 @@ public void testSimpleSynonymsWithGap() throws IOException {
122122
);
123123

124124
IntervalsSource source = BUILDER.analyzeText(new CachingTokenFilter(ts), -1, true);
125-
IntervalsSource expected = XIntervals.ordered(
125+
IntervalsSource expected = Intervals.ordered(
126126
Intervals.term("term1"),
127127
Intervals.extend(Intervals.or(Intervals.term("term2"), Intervals.term("term3"), Intervals.term("term4")), 1, 0),
128128
Intervals.term("term5")
@@ -143,7 +143,7 @@ public void testGraphSynonyms() throws IOException {
143143
);
144144

145145
IntervalsSource source = BUILDER.analyzeText(new CachingTokenFilter(ts), -1, true);
146-
IntervalsSource expected = XIntervals.ordered(
146+
IntervalsSource expected = Intervals.ordered(
147147
Intervals.term("term1"),
148148
Intervals.or(Intervals.term("term2"), Intervals.phrase("term3", "term4")),
149149
Intervals.term("term5")
@@ -166,7 +166,7 @@ public void testGraphSynonymsWithGaps() throws IOException {
166166
);
167167

168168
IntervalsSource source = BUILDER.analyzeText(new CachingTokenFilter(ts), -1, true);
169-
IntervalsSource expected = XIntervals.ordered(
169+
IntervalsSource expected = Intervals.ordered(
170170
Intervals.term("term1"),
171171
Intervals.or(
172172
Intervals.extend(Intervals.term("term2"), 1, 0),
@@ -190,7 +190,7 @@ public void testGraphTerminatesOnGap() throws IOException {
190190
);
191191

192192
IntervalsSource source = BUILDER.analyzeText(new CachingTokenFilter(ts), -1, true);
193-
IntervalsSource expected = XIntervals.ordered(
193+
IntervalsSource expected = Intervals.ordered(
194194
Intervals.term("term1"),
195195
Intervals.or(Intervals.term("term2"), Intervals.phrase("term3", "term4")),
196196
Intervals.extend(Intervals.term("term5"), 1, 0)

‎server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public void testMatchInterval() throws IOException {
203203
}""", TEXT_FIELD_NAME);
204204

205205
IntervalQueryBuilder builder = (IntervalQueryBuilder) parseQuery(json);
206-
Query expected = new IntervalQuery(TEXT_FIELD_NAME, XIntervals.unordered(Intervals.term("hello"), Intervals.term("world")));
206+
Query expected = new IntervalQuery(TEXT_FIELD_NAME, Intervals.unordered(Intervals.term("hello"), Intervals.term("world")));
207207

208208
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
209209

@@ -222,7 +222,7 @@ public void testMatchInterval() throws IOException {
222222
builder = (IntervalQueryBuilder) parseQuery(json);
223223
expected = new IntervalQuery(
224224
TEXT_FIELD_NAME,
225-
Intervals.maxgaps(40, XIntervals.unordered(Intervals.term("hello"), Intervals.term("world")))
225+
Intervals.maxgaps(40, Intervals.unordered(Intervals.term("hello"), Intervals.term("world")))
226226
);
227227
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
228228

@@ -241,7 +241,7 @@ public void testMatchInterval() throws IOException {
241241

242242
builder = (IntervalQueryBuilder) parseQuery(json);
243243
expected = new BoostQuery(
244-
new IntervalQuery(TEXT_FIELD_NAME, XIntervals.ordered(Intervals.term("hello"), Intervals.term("world"))),
244+
new IntervalQuery(TEXT_FIELD_NAME, Intervals.ordered(Intervals.term("hello"), Intervals.term("world"))),
245245
2
246246
);
247247
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
@@ -263,7 +263,7 @@ public void testMatchInterval() throws IOException {
263263
builder = (IntervalQueryBuilder) parseQuery(json);
264264
expected = new IntervalQuery(
265265
TEXT_FIELD_NAME,
266-
Intervals.maxgaps(10, XIntervals.ordered(Intervals.term("Hello"), Intervals.term("world")))
266+
Intervals.maxgaps(10, Intervals.ordered(Intervals.term("Hello"), Intervals.term("world")))
267267
);
268268
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
269269

@@ -285,7 +285,7 @@ public void testMatchInterval() throws IOException {
285285
builder = (IntervalQueryBuilder) parseQuery(json);
286286
expected = new IntervalQuery(
287287
TEXT_FIELD_NAME,
288-
Intervals.fixField(MASKED_FIELD, Intervals.maxgaps(10, XIntervals.ordered(Intervals.term("Hello"), Intervals.term("world"))))
288+
Intervals.fixField(MASKED_FIELD, Intervals.maxgaps(10, Intervals.ordered(Intervals.term("Hello"), Intervals.term("world"))))
289289
);
290290
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
291291

@@ -314,7 +314,7 @@ public void testMatchInterval() throws IOException {
314314
expected = new IntervalQuery(
315315
TEXT_FIELD_NAME,
316316
Intervals.containing(
317-
Intervals.maxgaps(10, XIntervals.ordered(Intervals.term("Hello"), Intervals.term("world"))),
317+
Intervals.maxgaps(10, Intervals.ordered(Intervals.term("Hello"), Intervals.term("world"))),
318318
Intervals.term("blah")
319319
)
320320
);
@@ -426,7 +426,7 @@ public void testCombineInterval() throws IOException {
426426
Intervals.containedBy(
427427
Intervals.maxgaps(
428428
30,
429-
XIntervals.ordered(Intervals.term("one"), XIntervals.unordered(Intervals.term("two"), Intervals.term("three")))
429+
Intervals.ordered(Intervals.term("one"), Intervals.unordered(Intervals.term("two"), Intervals.term("three")))
430430
),
431431
Intervals.term("SENTENCE")
432432
)
@@ -486,7 +486,7 @@ public void testCombineDisjunctionInterval() throws IOException {
486486
Intervals.notContainedBy(
487487
Intervals.maxgaps(
488488
30,
489-
XIntervals.ordered(Intervals.term("atmosphere"), Intervals.or(Intervals.term("cold"), Intervals.term("outside")))
489+
Intervals.ordered(Intervals.term("atmosphere"), Intervals.or(Intervals.term("cold"), Intervals.term("outside")))
490490
),
491491
Intervals.term("freeze")
492492
)

0 commit comments

Comments
 (0)