|
@@ -19,28 +19,6 @@
|
|
|
|
|
|
package org.elasticsearch.action.search;
|
|
|
|
|
|
-import static org.elasticsearch.test.InternalAggregationTestCase.emptyReduceContextBuilder;
|
|
|
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.awaitLatch;
|
|
|
-import static org.hamcrest.CoreMatchers.containsString;
|
|
|
-import static org.hamcrest.CoreMatchers.instanceOf;
|
|
|
-import static org.hamcrest.CoreMatchers.startsWith;
|
|
|
-
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.HashSet;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Set;
|
|
|
-import java.util.concurrent.CopyOnWriteArrayList;
|
|
|
-import java.util.concurrent.CountDownLatch;
|
|
|
-import java.util.concurrent.TimeUnit;
|
|
|
-import java.util.concurrent.atomic.AtomicInteger;
|
|
|
-import java.util.concurrent.atomic.AtomicReference;
|
|
|
-import java.util.function.BiFunction;
|
|
|
-import java.util.function.Function;
|
|
|
-
|
|
|
import org.apache.lucene.search.TotalHits;
|
|
|
import org.apache.lucene.util.SetOnce;
|
|
|
import org.elasticsearch.Version;
|
|
@@ -101,6 +79,28 @@ import org.elasticsearch.transport.TransportRequest;
|
|
|
import org.elasticsearch.transport.TransportRequestOptions;
|
|
|
import org.elasticsearch.transport.TransportService;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Arrays;
|
|
|
+import java.util.Collections;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.HashSet;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+import java.util.Set;
|
|
|
+import java.util.concurrent.CopyOnWriteArrayList;
|
|
|
+import java.util.concurrent.CountDownLatch;
|
|
|
+import java.util.concurrent.TimeUnit;
|
|
|
+import java.util.concurrent.atomic.AtomicInteger;
|
|
|
+import java.util.concurrent.atomic.AtomicReference;
|
|
|
+import java.util.function.BiFunction;
|
|
|
+import java.util.function.Function;
|
|
|
+
|
|
|
+import static org.elasticsearch.test.InternalAggregationTestCase.emptyReduceContextBuilder;
|
|
|
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.awaitLatch;
|
|
|
+import static org.hamcrest.CoreMatchers.containsString;
|
|
|
+import static org.hamcrest.CoreMatchers.instanceOf;
|
|
|
+import static org.hamcrest.CoreMatchers.startsWith;
|
|
|
+
|
|
|
public class TransportSearchActionTests extends ESTestCase {
|
|
|
|
|
|
private final ThreadPool threadPool = new TestThreadPool(getClass().getName());
|
|
@@ -844,7 +844,6 @@ public class TransportSearchActionTests extends ESTestCase {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/55514")
|
|
|
public void testShouldPreFilterSearchShards() {
|
|
|
int numIndices = randomIntBetween(2, 10);
|
|
|
Index[] indices = new Index[numIndices];
|
|
@@ -856,17 +855,17 @@ public class TransportSearchActionTests extends ESTestCase {
|
|
|
{
|
|
|
SearchRequest searchRequest = new SearchRequest();
|
|
|
assertFalse(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
|
|
|
- indices, randomIntBetween(2, 127)));
|
|
|
+ indices, randomIntBetween(2, 128)));
|
|
|
assertFalse(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
|
|
|
- indices, randomIntBetween(127, 10000)));
|
|
|
+ indices, randomIntBetween(129, 10000)));
|
|
|
}
|
|
|
{
|
|
|
SearchRequest searchRequest = new SearchRequest()
|
|
|
.source(new SearchSourceBuilder().query(QueryBuilders.rangeQuery("timestamp")));
|
|
|
assertFalse(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
|
|
|
- indices, randomIntBetween(2, 127)));
|
|
|
+ indices, randomIntBetween(2, 128)));
|
|
|
assertTrue(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
|
|
|
- indices, randomIntBetween(127, 10000)));
|
|
|
+ indices, randomIntBetween(129, 10000)));
|
|
|
}
|
|
|
{
|
|
|
SearchRequest searchRequest = new SearchRequest()
|
|
@@ -881,9 +880,9 @@ public class TransportSearchActionTests extends ESTestCase {
|
|
|
.source(new SearchSourceBuilder().sort(SortBuilders.fieldSort("timestamp")))
|
|
|
.scroll("5m");
|
|
|
assertTrue(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
|
|
|
- indices, randomIntBetween(2, 127)));
|
|
|
+ indices, randomIntBetween(2, 128)));
|
|
|
assertTrue(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
|
|
|
- indices, randomIntBetween(127, 10000)));
|
|
|
+ indices, randomIntBetween(129, 10000)));
|
|
|
}
|
|
|
}
|
|
|
|