Separate reset and skip

Author: dnhatn

server/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java

@@ -516,8 +516,10 @@ private GroupShardsIterator<SearchShardIterator> getIterator(
  // shards available in order to produce a valid search result.
  int shardIndexToQuery = 0;
  for (int i = 0; i < shardsIts.size(); i++) {
- if (shardsIts.get(i).size() > 0) {
+ SearchShardIterator it = shardsIts.get(i);
+ if (it.size() > 0) {
  shardIndexToQuery = i;
+ it.skip(false); // un-skip which is needed when all the remote shards were skipped by the remote can_match
  break;
  }
  }
@@ -526,8 +528,13 @@ private GroupShardsIterator<SearchShardIterator> getIterator(
  SearchSourceBuilder source = request.source();
  int i = 0;
  for (SearchShardIterator iter : shardsIts) {
+ iter.reset();
  boolean match = possibleMatches.get(i++);
- iter.reset(match == false);
+ if (match) {
+ assert iter.skip() == false;
+ } else {
+ iter.skip(true);
+ }
  }
  if (shouldSortShards(results.minAndMaxes) == false) {
  return shardsIts;

server/src/main/java/org/elasticsearch/action/search/SearchShardIterator.java

@@ -130,8 +130,7 @@ List<String> getTargetNodeIds() {
  return targetNodesIterator.asList();
  }
 
- void reset(boolean skip) {
- this.skip = skip;
+ void reset() {
  targetNodesIterator.reset();
  }
 
@@ -142,6 +141,13 @@ boolean skip() {
  return skip;
  }
 
+ /**
+ * Specifies if the search execution should skip this shard copies
+ */
+ void skip(boolean skip) {
+ this.skip = skip;
+ }
+
  /**
  * Returns {@code true} if this iterator was applied pre-filtered
  */

server/src/main/java/org/elasticsearch/action/search/TransportSearchShardsAction.java

@@ -144,7 +144,7 @@ private static List<SearchShardsGroup> toGroups(GroupShardsIterator<SearchShardI
  List<SearchShardsGroup> groups = new ArrayList<>(shardIts.size());
  for (SearchShardIterator shardIt : shardIts) {
  boolean skip = shardIt.skip();
- shardIt.reset(skip);
+ shardIt.reset();
  List<String> targetNodes = new ArrayList<>();
  SearchShardTarget target;
  while ((target = shardIt.nextOrNull()) != null) {

server/src/test/java/org/elasticsearch/action/search/AbstractSearchAsyncActionTests.java

@@ -241,7 +241,8 @@ public void testShardNotAvailableWithDisallowPartialFailures() {
  AbstractSearchAsyncAction<SearchPhaseResult> action = createAction(searchRequest, phaseResults, listener, false, new AtomicLong());
  // skip one to avoid the "all shards failed" failure.
  SearchShardIterator skipIterator = new SearchShardIterator(null, null, Collections.emptyList(), null);
- skipIterator.reset(true);
+ skipIterator.skip(true);
+ skipIterator.reset();
  action.skipShard(skipIterator);
  assertThat(exception.get(), instanceOf(SearchPhaseExecutionException.class));
  SearchPhaseExecutionException searchPhaseExecutionException = (SearchPhaseExecutionException) exception.get();

server/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java

@@ -81,7 +81,7 @@ public void testSkipSearchShards() throws InterruptedException {
  int numSkipped = 0;
  for (SearchShardIterator iter : shardsIter) {
  if (iter.shardId().id() % 2 == 0) {
- iter.reset(true);
+ iter.skip(true);
  numSkipped++;
  }
  }
@@ -633,7 +633,8 @@ public void testSkipUnavailableSearchShards() throws InterruptedException {
  originalIndices
  );
  // Skip all the shards
- searchShardIterator.reset(true);
+ searchShardIterator.skip(true);
+ searchShardIterator.reset();
  searchShardIterators.add(searchShardIterator);
  }
  GroupShardsIterator<SearchShardIterator> shardsIter = new GroupShardsIterator<>(searchShardIterators);