Skip to content

Commit 7963cf1

Browse files
lktslkts
committed
iter
1 parent ea27bba commit 7963cf1

File tree

12 files changed

+206
-95
lines changed

12 files changed

+206
-95
lines changed

‎server/src/main/resources/transport/definitions/referable/shard_search_request_reshard_shard_count_summary.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9185000

‎server/src/main/resources/transport/upper_bounds/9.2.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
esql_aggregate_metric_double_created_version,9184000
1+
shard_search_request_reshard_shard_count_summary,9185000

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ private AbstractSearchAsyncAction<SearchPhaseResult> createAction(
8282
null,
8383
request,
8484
listener,
85-
Collections.singletonList(new SearchShardIterator(null, new ShardId("index", "_na", 0), Collections.emptyList(), null)),
85+
Collections.singletonList(new SearchShardIterator(null, new ShardId("index", "_na", 0), Collections.emptyList(), null, 0)),
8686
timeProvider,
8787
ClusterState.EMPTY_STATE,
8888
null,
@@ -153,7 +153,8 @@ public void testBuildShardSearchTransportRequest() {
153153
clusterAlias,
154154
new ShardId(new Index("name", "foo"), 1),
155155
Collections.emptyList(),
156-
new OriginalIndices(new String[] { "name", "name1" }, IndicesOptions.strictExpand())
156+
new OriginalIndices(new String[] { "name", "name1" }, IndicesOptions.strictExpand()),
157+
0
157158
);
158159
ShardSearchRequest shardSearchTransportRequest = action.buildShardSearchRequest(iterator, 10);
159160
assertEquals(IndicesOptions.strictExpand(), shardSearchTransportRequest.indicesOptions());

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,8 @@ public void testSkipUnavailableSearchShards() throws InterruptedException {
640640
null,
641641
new ShardId(index, 0),
642642
Collections.emptyList(),
643-
originalIndices
643+
originalIndices,
644+
0
644645
);
645646
// Skip all the shards
646647
searchShardIterator.skip(true);
@@ -760,7 +761,7 @@ static List<SearchShardIterator> getShardsIter(
760761
}
761762
Collections.shuffle(started, random());
762763
started.addAll(initializing);
763-
list.add(new SearchShardIterator(null, new ShardId(index, i), started, originalIndices));
764+
list.add(new SearchShardIterator(null, new ShardId(index, i), started, originalIndices, 0));
764765
}
765766
return list;
766767
}

‎server/src/test/java/org/elasticsearch/action/search/SearchShardIteratorTests.java‎

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ private static List<ShardRouting> randomShardRoutings(ShardId shardId, int numRe
4545

4646
public void testShardId() {
4747
ShardId shardId = new ShardId(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLength(10), randomInt());
48-
SearchShardIterator searchShardIterator = new SearchShardIterator(null, shardId, Collections.emptyList(), OriginalIndices.NONE);
48+
SearchShardIterator searchShardIterator = new SearchShardIterator(null, shardId, Collections.emptyList(), OriginalIndices.NONE, 0);
4949
assertSame(shardId, searchShardIterator.shardId());
5050
}
5151

@@ -55,7 +55,7 @@ public void testGetOriginalIndices() {
5555
new String[] { randomAlphaOfLengthBetween(3, 10) },
5656
IndicesOptions.fromOptions(randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean())
5757
);
58-
SearchShardIterator searchShardIterator = new SearchShardIterator(null, shardId, Collections.emptyList(), originalIndices);
58+
SearchShardIterator searchShardIterator = new SearchShardIterator(null, shardId, Collections.emptyList(), originalIndices, 0);
5959
assertSame(originalIndices, searchShardIterator.getOriginalIndices());
6060
}
6161

@@ -66,7 +66,8 @@ public void testGetClusterAlias() {
6666
clusterAlias,
6767
shardId,
6868
Collections.emptyList(),
69-
OriginalIndices.NONE
69+
OriginalIndices.NONE,
70+
0
7071
);
7172
assertEquals(clusterAlias, searchShardIterator.getClusterAlias());
7273
}
@@ -88,7 +89,8 @@ public void testNewSearchShardTarget() {
8889
null,
8990
null,
9091
false,
91-
false
92+
false,
93+
0
9294
);
9395
final SearchShardTarget searchShardTarget = searchShardIterator.nextOrNull();
9496
assertNotNull(searchShardTarget);
@@ -109,7 +111,8 @@ public void testEqualsAndHashcode() {
109111
s.getSearchContextId(),
110112
s.getSearchContextKeepAlive(),
111113
s.prefiltered(),
112-
s.skip()
114+
s.skip(),
115+
s.getReshardSplitShardCountSummary()
113116
),
114117
s -> {
115118
if (randomBoolean()) {
@@ -127,7 +130,8 @@ public void testEqualsAndHashcode() {
127130
s.getSearchContextId(),
128131
s.getSearchContextKeepAlive(),
129132
s.prefiltered(),
130-
s.skip()
133+
s.skip(),
134+
s.getReshardSplitShardCountSummary()
131135
);
132136
} else {
133137
ShardId shardId = new ShardId(
@@ -143,7 +147,8 @@ public void testEqualsAndHashcode() {
143147
s.getSearchContextId(),
144148
s.getSearchContextKeepAlive(),
145149
s.prefiltered(),
146-
s.skip()
150+
s.skip(),
151+
s.getReshardSplitShardCountSummary()
147152
);
148153
}
149154
}
@@ -164,15 +169,22 @@ public void testCompareTo() {
164169
for (String uuid : uuids) {
165170
ShardId shardId = new ShardId(index, uuid, i);
166171
shardIterators.add(
167-
new SearchShardIterator(null, shardId, randomShardRoutings(shardId), OriginalIndicesTests.randomOriginalIndices())
172+
new SearchShardIterator(
173+
null,
174+
shardId,
175+
randomShardRoutings(shardId),
176+
OriginalIndicesTests.randomOriginalIndices(),
177+
randomIntBetween(0, 1024)
178+
)
168179
);
169180
for (String cluster : clusters) {
170181
shardIterators.add(
171182
new SearchShardIterator(
172183
cluster,
173184
shardId,
174185
randomShardRoutings(shardId),
175-
OriginalIndicesTests.randomOriginalIndices()
186+
OriginalIndicesTests.randomOriginalIndices(),
187+
randomIntBetween(0, 1024)
176188
)
177189
);
178190
}
@@ -207,7 +219,8 @@ public void testCompareToEqualItems() {
207219
shardIterator1.getSearchContextId(),
208220
shardIterator1.getSearchContextKeepAlive(),
209221
shardIterator1.prefiltered(),
210-
shardIterator1.skip()
222+
shardIterator1.skip(),
223+
shardIterator1.getReshardSplitShardCountSummary()
211224
);
212225
assertEquals(shardIterator1, shardIterator2);
213226
assertEquals(0, shardIterator1.compareTo(shardIterator2));
@@ -217,6 +230,12 @@ public void testCompareToEqualItems() {
217230
private static SearchShardIterator randomSearchShardIterator() {
218231
String clusterAlias = randomBoolean() ? null : randomAlphaOfLengthBetween(5, 10);
219232
ShardId shardId = new ShardId(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLength(10), randomIntBetween(0, Integer.MAX_VALUE));
220-
return new SearchShardIterator(clusterAlias, shardId, randomShardRoutings(shardId), OriginalIndicesTests.randomOriginalIndices());
233+
return new SearchShardIterator(
234+
clusterAlias,
235+
shardId,
236+
randomShardRoutings(shardId),
237+
OriginalIndicesTests.randomOriginalIndices(),
238+
randomIntBetween(0, 1024)
239+
);
221240
}
222241
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private static SearchShardIterator createSearchShardIterator(
153153
) {
154154
ShardId shardId = new ShardId(index, id);
155155
List<ShardRouting> shardRoutings = SearchShardIteratorTests.randomShardRoutings(shardId);
156-
return new SearchShardIterator(clusterAlias, shardId, shardRoutings, originalIndices);
156+
return new SearchShardIterator(clusterAlias, shardId, shardRoutings, originalIndices, 0);
157157
}
158158

159159
private static ResolvedIndices createMockResolvedIndices(

0 commit comments

Comments
 (0)