Skip to content

Commit

Permalink
Replace some test usages of search(Query, Collector)
Browse files Browse the repository at this point in the history 
The leftover usages of the deprecated  search(Query, TotalHitCountCollector)
have been replaced with search(Query, TotalHitCountCollectorManager)
  • Loading branch information
@javanna
javanna committed Sep 30, 2024
1 parent 5c840f7 commit c2b4296
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 48 deletions.
51 changes: 26 additions & 25 deletions server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
import org.apache.lucene.search.SortedSetSortField;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TotalHitCountCollector;
import org.apache.lucene.search.TotalHitCountCollectorManager;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.Lock;
Expand Down Expand Up @@ -640,9 +640,8 @@ public void testTranslogMultipleOperationsSameDocument() throws IOException {
recoverFromTranslog(recoveringEngine, translogHandler, Long.MAX_VALUE);
recoveringEngine.refresh("test");
try (Engine.Searcher searcher = recoveringEngine.acquireSearcher("test")) {
final TotalHitCountCollector collector = new TotalHitCountCollector();
searcher.search(new MatchAllDocsQuery(), collector);
assertThat(collector.getTotalHits(), equalTo(operations.get(operations.size() - 1) instanceof Engine.Delete ? 0 : 1));
Integer totalHits = searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
assertThat(totalHits, equalTo(operations.get(operations.size() - 1) instanceof Engine.Delete ? 0 : 1));
}
}
}
Expand Down Expand Up @@ -2009,16 +2008,20 @@ public void testConcurrentOutOfOrderDocsOnReplica() throws IOException, Interrup

if (lastFieldValueDoc1 != null) {
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
final TotalHitCountCollector collector = new TotalHitCountCollector();
searcher.search(new TermQuery(new Term("value", lastFieldValueDoc1)), collector);
assertThat(collector.getTotalHits(), equalTo(1));
Integer totalHits = searcher.search(
new TermQuery(new Term("value", lastFieldValueDoc1)),
new TotalHitCountCollectorManager()
);
assertThat(totalHits, equalTo(1));
}
}
if (lastFieldValueDoc2 != null) {
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
final TotalHitCountCollector collector = new TotalHitCountCollector();
searcher.search(new TermQuery(new Term("value", lastFieldValueDoc2)), collector);
assertThat(collector.getTotalHits(), equalTo(1));
Integer totalHits = searcher.search(
new TermQuery(new Term("value", lastFieldValueDoc2)),
new TotalHitCountCollectorManager()
);
assertThat(totalHits, equalTo(1));
}
}

Expand Down Expand Up @@ -2244,9 +2247,11 @@ private int assertOpsOnPrimary(List<Engine.Operation> ops, long currentOpVersion
// first op and it failed.
if (docDeleted == false && lastFieldValue != null) {
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
final TotalHitCountCollector collector = new TotalHitCountCollector();
searcher.search(new TermQuery(new Term("value", lastFieldValue)), collector);
assertThat(collector.getTotalHits(), equalTo(1));
Integer totalHits = searcher.search(
new TermQuery(new Term("value", lastFieldValue)),
new TotalHitCountCollectorManager()
);
assertThat(totalHits, equalTo(1));
}
}
}
Expand All @@ -2270,9 +2275,8 @@ private int assertOpsOnPrimary(List<Engine.Operation> ops, long currentOpVersion
assertVisibleCount(engine, docDeleted ? 0 : 1);
if (docDeleted == false) {
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
final TotalHitCountCollector collector = new TotalHitCountCollector();
searcher.search(new TermQuery(new Term("value", lastFieldValue)), collector);
assertThat(collector.getTotalHits(), equalTo(1));
Integer totalHits = searcher.search(new TermQuery(new Term("value", lastFieldValue)), new TotalHitCountCollectorManager());
assertThat(totalHits, equalTo(1));
}
}
return opsPerformed;
Expand Down Expand Up @@ -2357,9 +2361,8 @@ public void testNonInternalVersioningOnPrimary() throws IOException {
if (docDeleted == false) {
logger.info("searching for [{}]", lastFieldValue);
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
final TotalHitCountCollector collector = new TotalHitCountCollector();
searcher.search(new TermQuery(new Term("value", lastFieldValue)), collector);
assertThat(collector.getTotalHits(), equalTo(1));
Integer totalHits = searcher.search(new TermQuery(new Term("value", lastFieldValue)), new TotalHitCountCollectorManager());
assertThat(totalHits, equalTo(1));
}
}
}
Expand All @@ -2375,9 +2378,8 @@ public void testVersioningPromotedReplica() throws IOException {
final int opsOnPrimary = assertOpsOnPrimary(primaryOps, finalReplicaVersion, deletedOnReplica, replicaEngine);
final long currentSeqNo = getSequenceID(replicaEngine, new Engine.Get(false, false, Term.toString(lastReplicaOp.uid()))).v1();
try (Engine.Searcher searcher = engine.acquireSearcher("test", Engine.SearcherScope.INTERNAL)) {
final TotalHitCountCollector collector = new TotalHitCountCollector();
searcher.search(new MatchAllDocsQuery(), collector);
if (collector.getTotalHits() > 0) {
Integer totalHits = searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
if (totalHits > 0) {
// last op wasn't delete
assertThat(currentSeqNo, equalTo(finalReplicaSeqNo + opsOnPrimary));
}
Expand All @@ -2400,9 +2402,8 @@ public void testConcurrentExternalVersioningOnPrimary() throws IOException, Inte
assertVisibleCount(engine, lastFieldValue == null ? 0 : 1);
if (lastFieldValue != null) {
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
final TotalHitCountCollector collector = new TotalHitCountCollector();
searcher.search(new TermQuery(new Term("value", lastFieldValue)), collector);
assertThat(collector.getTotalHits(), equalTo(1));
Integer totalHits = searcher.search(new TermQuery(new Term("value", lastFieldValue)), new TotalHitCountCollectorManager());
assertThat(totalHits, equalTo(1));
}
}
}
Expand Down
14 changes: 6 additions & 8 deletions server/src/test/java/org/elasticsearch/search/SearchCancellationTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.TotalHitCountCollector;
import org.apache.lucene.search.TotalHitCountCollectorManager;
import org.apache.lucene.store.Directory;
import org.apache.lucene.tests.index.RandomIndexWriter;
import org.apache.lucene.tests.util.TestUtil;
Expand Down Expand Up @@ -96,7 +96,6 @@ public void testAddingCancellationActions() throws IOException {
}

public void testCancellableCollector() throws IOException {
TotalHitCountCollector collector1 = new TotalHitCountCollector();
Runnable cancellation = () -> { throw new TaskCancelledException("cancelled"); };
ContextIndexSearcher searcher = new ContextIndexSearcher(
reader,
Expand All @@ -106,16 +105,15 @@ public void testCancellableCollector() throws IOException {
true
);

searcher.search(new MatchAllDocsQuery(), collector1);
assertThat(collector1.getTotalHits(), equalTo(reader.numDocs()));
Integer totalHits = searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
assertThat(totalHits, equalTo(reader.numDocs()));

searcher.addQueryCancellation(cancellation);
expectThrows(TaskCancelledException.class, () -> searcher.search(new MatchAllDocsQuery(), collector1));
expectThrows(TaskCancelledException.class, () -> searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager()));

searcher.removeQueryCancellation(cancellation);
TotalHitCountCollector collector2 = new TotalHitCountCollector();
searcher.search(new MatchAllDocsQuery(), collector2);
assertThat(collector2.getTotalHits(), equalTo(reader.numDocs()));
Integer totalHits2 = searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
assertThat(totalHits2, equalTo(reader.numDocs()));
}

public void testExitableDirectoryReader() throws IOException {
Expand Down
17 changes: 7 additions & 10 deletions test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TotalHitCountCollector;
import org.apache.lucene.search.TotalHitCountCollectorManager;
import org.apache.lucene.search.Weight;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
Expand Down Expand Up @@ -178,9 +178,8 @@ protected static void assertVisibleCount(Engine engine, int numDocs, boolean ref
engine.refresh("test");
}
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
final TotalHitCountCollector collector = new TotalHitCountCollector();
searcher.search(new MatchAllDocsQuery(), collector);
assertThat(collector.getTotalHits(), equalTo(numDocs));
Integer totalHits = searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
assertThat(totalHits, equalTo(numDocs));
}
}

Expand Down Expand Up @@ -971,9 +970,8 @@ protected static void assertVisibleCount(InternalEngine engine, int numDocs, boo
engine.refresh("test");
}
try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
final TotalHitCountCollector collector = new TotalHitCountCollector();
searcher.search(new MatchAllDocsQuery(), collector);
assertThat(collector.getTotalHits(), equalTo(numDocs));
Integer totalHits = searcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
assertThat(totalHits, equalTo(numDocs));
}
}

Expand Down Expand Up @@ -1170,9 +1168,8 @@ public static void assertOpsOnReplica(
assertVisibleCount(replicaEngine, lastFieldValue == null ? 0 : 1);
if (lastFieldValue != null) {
try (Engine.Searcher searcher = replicaEngine.acquireSearcher("test")) {
final TotalHitCountCollector collector = new TotalHitCountCollector();
searcher.search(new TermQuery(new Term("value", lastFieldValue)), collector);
assertThat(collector.getTotalHits(), equalTo(1));
Integer totalHits = searcher.search(new TermQuery(new Term("value", lastFieldValue)), new TotalHitCountCollectorManager());
assertThat(totalHits, equalTo(1));
}
}
}
Expand Down
8 changes: 3 additions & 5 deletions ...h/xpack/core/security/authz/accesscontrol/SecurityIndexReaderWrapperIntegrationTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TotalHitCountCollector;
import org.apache.lucene.search.TotalHitCountCollectorManager;
import org.apache.lucene.store.Directory;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.common.bytes.BytesArray;
Expand Down Expand Up @@ -193,10 +193,8 @@ protected IndicesAccessControl getIndicesAccessControl() {
int expectedHitCount = valuesHitCount[i];
logger.info("Going to verify hit count with query [{}] with expected total hits [{}]", parsedQuery.query(), expectedHitCount);

TotalHitCountCollector countCollector = new TotalHitCountCollector();
indexSearcher.search(new MatchAllDocsQuery(), countCollector);

assertThat(countCollector.getTotalHits(), equalTo(expectedHitCount));
Integer totalHits = indexSearcher.search(new MatchAllDocsQuery(), new TotalHitCountCollectorManager());
assertThat(totalHits, equalTo(expectedHitCount));
assertThat(wrappedDirectoryReader.numDocs(), equalTo(expectedHitCount));
}

Expand Down

0 comments on commit c2b4296

Please sign in to comment.