Skip to content

Commit 7e154ee

Browse files
javannajavanna
authored
Replace some test usages of search(Query, Collector) (elastic#113818) (elastic#114212)
The leftover usages of the deprecated search(Query, TotalHitCountCollector) have been replaced with search(Query, TotalHitCountCollectorManager)
1 parent f0f8cb4 commit 7e154ee

File tree

4 files changed

+42
-48
lines changed

4 files changed

+42
-48
lines changed

‎server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import org.apache.lucene.search.SortedSetSortField;
5656
import org.apache.lucene.search.TermQuery;
5757
import org.apache.lucene.search.TopDocs;
58-
import org.apache.lucene.search.TotalHitCountCollector;
58+
import org.apache.lucene.search.TotalHitCountCollectorManager;
5959
import org.apache.lucene.store.AlreadyClosedException;
6060
import org.apache.lucene.store.Directory;
6161
import org.apache.lucene.store.Lock;
@@ -641,9 +641,8 @@ public void testTranslogMultipleOperationsSameDocument() throws IOException {
641641
recoverFromTranslog(recoveringEngine, translogHandler, Long.MAX_VALUE);
642642
recoveringEngine.refresh("test");
643643
try (Engine.Searcher searcher = recoveringEngine.acquireSearcher("test")) {
644-
final TotalHitCountCollector collector = new TotalHitCountCollector();
645-
searcher.search(new MatchAllDocsQuery(), collector);
646-
assertThat(collector.getTotalHits(), equalTo(operations.get(operations.size() - 1) instanceof Engine.Delete ? 0 : 1));
644+
Integer totalHits = searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
645+
assertThat(totalHits, equalTo(operations.get(operations.size() - 1) instanceof Engine.Delete ? 0 : 1));
647646
}
648647
}
649648
}
@@ -2010,16 +2009,20 @@ public void testConcurrentOutOfOrderDocsOnReplica() throws IOException, Interrup
20102009

20112010
if (lastFieldValueDoc1 != null) {
20122011
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
2013-
final TotalHitCountCollector collector = new TotalHitCountCollector();
2014-
searcher.search(new TermQuery(new Term("value", lastFieldValueDoc1)), collector);
2015-
assertThat(collector.getTotalHits(), equalTo(1));
2012+
Integer totalHits = searcher.search(
2013+
new TermQuery(new Term("value", lastFieldValueDoc1)),
2014+
new TotalHitCountCollectorManager()
2015+
);
2016+
assertThat(totalHits, equalTo(1));
20162017
}
20172018
}
20182019
if (lastFieldValueDoc2 != null) {
20192020
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
2020-
final TotalHitCountCollector collector = new TotalHitCountCollector();
2021-
searcher.search(new TermQuery(new Term("value", lastFieldValueDoc2)), collector);
2022-
assertThat(collector.getTotalHits(), equalTo(1));
2021+
Integer totalHits = searcher.search(
2022+
new TermQuery(new Term("value", lastFieldValueDoc2)),
2023+
new TotalHitCountCollectorManager()
2024+
);
2025+
assertThat(totalHits, equalTo(1));
20232026
}
20242027
}
20252028

@@ -2245,9 +2248,11 @@ private int assertOpsOnPrimary(List<Engine.Operation> ops, long currentOpVersion
22452248
// first op and it failed.
22462249
if (docDeleted == false && lastFieldValue != null) {
22472250
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
2248-
final TotalHitCountCollector collector = new TotalHitCountCollector();
2249-
searcher.search(new TermQuery(new Term("value", lastFieldValue)), collector);
2250-
assertThat(collector.getTotalHits(), equalTo(1));
2251+
Integer totalHits = searcher.search(
2252+
new TermQuery(new Term("value", lastFieldValue)),
2253+
new TotalHitCountCollectorManager()
2254+
);
2255+
assertThat(totalHits, equalTo(1));
22512256
}
22522257
}
22532258
}
@@ -2271,9 +2276,8 @@ private int assertOpsOnPrimary(List<Engine.Operation> ops, long currentOpVersion
22712276
assertVisibleCount(engine, docDeleted ? 0 : 1);
22722277
if (docDeleted == false) {
22732278
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
2274-
final TotalHitCountCollector collector = new TotalHitCountCollector();
2275-
searcher.search(new TermQuery(new Term("value", lastFieldValue)), collector);
2276-
assertThat(collector.getTotalHits(), equalTo(1));
2279+
Integer totalHits = searcher.search(new TermQuery(new Term("value", lastFieldValue)), new TotalHitCountCollectorManager());
2280+
assertThat(totalHits, equalTo(1));
22772281
}
22782282
}
22792283
return opsPerformed;
@@ -2358,9 +2362,8 @@ public void testNonInternalVersioningOnPrimary() throws IOException {
23582362
if (docDeleted == false) {
23592363
logger.info("searching for [{}]", lastFieldValue);
23602364
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
2361-
final TotalHitCountCollector collector = new TotalHitCountCollector();
2362-
searcher.search(new TermQuery(new Term("value", lastFieldValue)), collector);
2363-
assertThat(collector.getTotalHits(), equalTo(1));
2365+
Integer totalHits = searcher.search(new TermQuery(new Term("value", lastFieldValue)), new TotalHitCountCollectorManager());
2366+
assertThat(totalHits, equalTo(1));
23642367
}
23652368
}
23662369
}
@@ -2376,9 +2379,8 @@ public void testVersioningPromotedReplica() throws IOException {
23762379
final int opsOnPrimary = assertOpsOnPrimary(primaryOps, finalReplicaVersion, deletedOnReplica, replicaEngine);
23772380
final long currentSeqNo = getSequenceID(replicaEngine, new Engine.Get(false, false, Term.toString(lastReplicaOp.uid()))).v1();
23782381
try (Engine.Searcher searcher = engine.acquireSearcher("test", Engine.SearcherScope.INTERNAL)) {
2379-
final TotalHitCountCollector collector = new TotalHitCountCollector();
2380-
searcher.search(new MatchAllDocsQuery(), collector);
2381-
if (collector.getTotalHits() > 0) {
2382+
Integer totalHits = searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
2383+
if (totalHits > 0) {
23822384
// last op wasn't delete
23832385
assertThat(currentSeqNo, equalTo(finalReplicaSeqNo + opsOnPrimary));
23842386
}
@@ -2401,9 +2403,8 @@ public void testConcurrentExternalVersioningOnPrimary() throws IOException, Inte
24012403
assertVisibleCount(engine, lastFieldValue == null ? 0 : 1);
24022404
if (lastFieldValue != null) {
24032405
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
2404-
final TotalHitCountCollector collector = new TotalHitCountCollector();
2405-
searcher.search(new TermQuery(new Term("value", lastFieldValue)), collector);
2406-
assertThat(collector.getTotalHits(), equalTo(1));
2406+
Integer totalHits = searcher.search(new TermQuery(new Term("value", lastFieldValue)), new TotalHitCountCollectorManager());
2407+
assertThat(totalHits, equalTo(1));
24072408
}
24082409
}
24092410
}

‎server/src/test/java/org/elasticsearch/search/SearchCancellationTests.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.apache.lucene.index.TermsEnum;
2323
import org.apache.lucene.search.IndexSearcher;
2424
import org.apache.lucene.search.MatchAllDocsQuery;
25-
import org.apache.lucene.search.TotalHitCountCollector;
25+
import org.apache.lucene.search.TotalHitCountCollectorManager;
2626
import org.apache.lucene.store.Directory;
2727
import org.apache.lucene.tests.index.RandomIndexWriter;
2828
import org.apache.lucene.tests.util.TestUtil;
@@ -96,7 +96,6 @@ public void testAddingCancellationActions() throws IOException {
9696
}
9797

9898
public void testCancellableCollector() throws IOException {
99-
TotalHitCountCollector collector1 = new TotalHitCountCollector();
10099
Runnable cancellation = () -> { throw new TaskCancelledException("cancelled"); };
101100
ContextIndexSearcher searcher = new ContextIndexSearcher(
102101
reader,
@@ -106,16 +105,15 @@ public void testCancellableCollector() throws IOException {
106105
true
107106
);
108107

109-
searcher.search(new MatchAllDocsQuery(), collector1);
110-
assertThat(collector1.getTotalHits(), equalTo(reader.numDocs()));
108+
Integer totalHits = searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
109+
assertThat(totalHits, equalTo(reader.numDocs()));
111110

112111
searcher.addQueryCancellation(cancellation);
113-
expectThrows(TaskCancelledException.class, () -> searcher.search(new MatchAllDocsQuery(), collector1));
112+
expectThrows(TaskCancelledException.class, () -> searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager()));
114113

115114
searcher.removeQueryCancellation(cancellation);
116-
TotalHitCountCollector collector2 = new TotalHitCountCollector();
117-
searcher.search(new MatchAllDocsQuery(), collector2);
118-
assertThat(collector2.getTotalHits(), equalTo(reader.numDocs()));
115+
Integer totalHits2 = searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
116+
assertThat(totalHits2, equalTo(reader.numDocs()));
119117
}
120118

121119
public void testExitableDirectoryReader() throws IOException {

‎test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.apache.lucene.search.Scorer;
4343
import org.apache.lucene.search.Sort;
4444
import org.apache.lucene.search.TermQuery;
45-
import org.apache.lucene.search.TotalHitCountCollector;
45+
import org.apache.lucene.search.TotalHitCountCollectorManager;
4646
import org.apache.lucene.search.Weight;
4747
import org.apache.lucene.store.AlreadyClosedException;
4848
import org.apache.lucene.store.Directory;
@@ -178,9 +178,8 @@ protected static void assertVisibleCount(Engine engine, int numDocs, boolean ref
178178
engine.refresh("test");
179179
}
180180
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
181-
final TotalHitCountCollector collector = new TotalHitCountCollector();
182-
searcher.search(new MatchAllDocsQuery(), collector);
183-
assertThat(collector.getTotalHits(), equalTo(numDocs));
181+
Integer totalHits = searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
182+
assertThat(totalHits, equalTo(numDocs));
184183
}
185184
}
186185

@@ -971,9 +970,8 @@ protected static void assertVisibleCount(InternalEngine engine, int numDocs, boo
971970
engine.refresh("test");
972971
}
973972
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
974-
final TotalHitCountCollector collector = new TotalHitCountCollector();
975-
searcher.search(new MatchAllDocsQuery(), collector);
976-
assertThat(collector.getTotalHits(), equalTo(numDocs));
973+
Integer totalHits = searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
974+
assertThat(totalHits, equalTo(numDocs));
977975
}
978976
}
979977

@@ -1170,9 +1168,8 @@ public static void assertOpsOnReplica(
11701168
assertVisibleCount(replicaEngine, lastFieldValue == null ? 0 : 1);
11711169
if (lastFieldValue != null) {
11721170
try (Engine.Searcher searcher = replicaEngine.acquireSearcher("test")) {
1173-
final TotalHitCountCollector collector = new TotalHitCountCollector();
1174-
searcher.search(new TermQuery(new Term("value", lastFieldValue)), collector);
1175-
assertThat(collector.getTotalHits(), equalTo(1));
1171+
Integer totalHits = searcher.search(new TermQuery(new Term("value", lastFieldValue)), new TotalHitCountCollectorManager());
1172+
assertThat(totalHits, equalTo(1));
11761173
}
11771174
}
11781175
}

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/SecurityIndexReaderWrapperIntegrationTests.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.lucene.search.MatchAllDocsQuery;
2121
import org.apache.lucene.search.ScoreDoc;
2222
import org.apache.lucene.search.TermQuery;
23-
import org.apache.lucene.search.TotalHitCountCollector;
23+
import org.apache.lucene.search.TotalHitCountCollectorManager;
2424
import org.apache.lucene.store.Directory;
2525
import org.elasticsearch.client.internal.Client;
2626
import org.elasticsearch.common.bytes.BytesArray;
@@ -193,10 +193,8 @@ protected IndicesAccessControl getIndicesAccessControl() {
193193
int expectedHitCount = valuesHitCount[i];
194194
logger.info("Going to verify hit count with query [{}] with expected total hits [{}]", parsedQuery.query(), expectedHitCount);
195195

196-
TotalHitCountCollector countCollector = new TotalHitCountCollector();
197-
indexSearcher.search(new MatchAllDocsQuery(), countCollector);
198-
199-
assertThat(countCollector.getTotalHits(), equalTo(expectedHitCount));
196+
Integer totalHits = indexSearcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
197+
assertThat(totalHits, equalTo(expectedHitCount));
200198
assertThat(wrappedDirectoryReader.numDocs(), equalTo(expectedHitCount));
201199
}
202200

0 commit comments

Comments
 (0)