Skip to content

Commit cdb4bc1

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 1ecc447 commit cdb4bc1

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,13 @@ public SearchShardIterator(@Nullable String clusterAlias, ShardId shardId, List<
6262
* @param originalIndices the indices that the search request originally related to (before any rewriting happened)
6363
* @param skip if true, then this group won't have matches, and it can be safely skipped from the search
6464
*/
65-
public SearchShardIterator(@Nullable String clusterAlias, ShardId shardId, List<ShardRouting> shards, OriginalIndices originalIndices, boolean skip) {
65+
public SearchShardIterator(
66+
@Nullable String clusterAlias,
67+
ShardId shardId,
68+
List<ShardRouting> shards,
69+
OriginalIndices originalIndices,
70+
boolean skip
71+
) {
6672
this(clusterAlias, shardId, shards.stream().map(ShardRouting::currentNodeId).toList(), originalIndices, null, null, false, skip);
6773
}
6874

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1895,7 +1895,13 @@ List<SearchShardIterator> getLocalShardsIterator(
18951895
final ShardId shardId = shardRouting.shardId();
18961896
OriginalIndices finalIndices = originalIndices.get(shardId.getIndex().getName());
18971897
assert finalIndices != null;
1898-
list[i++] = new SearchShardIterator(clusterAlias, shardId, shardRouting.getShardRoutings(), finalIndices, finalIndices == SKIPPED_INDICES);
1898+
list[i++] = new SearchShardIterator(
1899+
clusterAlias,
1900+
shardId,
1901+
shardRouting.getShardRoutings(),
1902+
finalIndices,
1903+
finalIndices == SKIPPED_INDICES
1904+
);
18991905
}
19001906
// the returned list must support in-place sorting, so this is the most memory efficient we can do here
19011907
return Arrays.asList(list);

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,7 +1822,7 @@ public void testSkippedIndicesWithRefreshBlock() {
18221822

18231823
String normalIndexName = "test-normal";
18241824
String blockedIndexName = "test-blocked";
1825-
final String[] indexNames = {normalIndexName, blockedIndexName};
1825+
final String[] indexNames = { normalIndexName, blockedIndexName };
18261826
final Index normalIndex = new Index(normalIndexName, UUIDs.randomBase64UUID());
18271827
final Index blockedIndex = new Index(blockedIndexName, UUIDs.randomBase64UUID());
18281828
final int numberOfShards = randomIntBetween(1, 3);
@@ -1859,9 +1859,7 @@ public void testSkippedIndicesWithRefreshBlock() {
18591859
when(clusterService.getSettings()).thenReturn(Settings.EMPTY);
18601860
when(clusterService.operationRouting()).thenReturn(operationRouting);
18611861

1862-
Settings settings = Settings.builder()
1863-
.put("node.name", TransportSearchAction.class.getSimpleName())
1864-
.build();
1862+
Settings settings = Settings.builder().put("node.name", TransportSearchAction.class.getSimpleName()).build();
18651863
TransportVersion transportVersion = TransportVersionUtils.getNextVersion(TransportVersions.MINIMUM_CCS_VERSION, true);
18661864
ThreadPool threadPool = new ThreadPool(settings, MeterRegistry.NOOP, new DefaultBuiltInExecutorBuilders());
18671865
try {

0 commit comments

Comments
 (0)