Skip to content

Commit de42ce3

Browse files
committed
improve
1 parent 87cba1e commit de42ce3

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

server/src/internalClusterTest/java/org/elasticsearch/search/KnnSearchIT.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,30 +50,22 @@ private XContentBuilder createKnnMapping() throws Exception {
5050
public void testKnnSearchWithScroll() throws Exception {
5151
Client client = client();
5252

53-
// create index
5453
client.admin().indices().prepareCreate(INDEX_NAME).setMapping(createKnnMapping()).get();
5554

56-
// 插入测试数据
5755
int count = randomIntBetween(10, 20);
5856
for (int i = 0; i < count; i++) {
59-
client.prepareIndex(INDEX_NAME)
60-
.setSource(XContentType.JSON, VECTOR_FIELD, new float[]{i, i})
61-
.get();
57+
client.prepareIndex(INDEX_NAME).setSource(XContentType.JSON, VECTOR_FIELD, new float[] { i, i }).get();
6258
}
6359

64-
6560
refresh(INDEX_NAME);
6661

67-
// 构建KNN搜索请求
6862
SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
6963
int k = count / 2;
70-
sourceBuilder.knnSearch(List.of(new KnnSearchBuilder(VECTOR_FIELD, new float[]{0, 0}, k, k, null, null)));
64+
sourceBuilder.knnSearch(List.of(new KnnSearchBuilder(VECTOR_FIELD, new float[] { 0, 0 }, k, k, null, null)));
7165

7266
SearchRequest searchRequest = new SearchRequest(INDEX_NAME);
73-
searchRequest.source(sourceBuilder)
74-
.scroll(TimeValue.timeValueMinutes(1));
67+
searchRequest.source(sourceBuilder).scroll(TimeValue.timeValueMinutes(1));
7568

76-
// 执行首次搜索
7769
SearchResponse firstResponse = client.search(searchRequest).actionGet();
7870
assertThat(firstResponse.getScrollId(), notNullValue());
7971
assertThat(firstResponse.getHits().getHits().length, equalTo(k));
@@ -90,7 +82,6 @@ public void testKnnSearchWithScroll() throws Exception {
9082
assertThat(scrollResponse.getHits().getTotalHits().value(), equalTo((long) k));
9183
}
9284

93-
// 清理Scroll上下文
9485
client.prepareClearScroll().addScrollId(firstResponse.getScrollId()).get();
9586
}
9687
}

server/src/main/java/org/elasticsearch/search/internal/LegacyReaderContext.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public Engine.Searcher acquireSearcher(String source) {
7373
@Override
7474
public ShardSearchRequest getShardSearchRequest(ShardSearchRequest other) {
7575
if (other != null) {
76+
// the source builder maybe changed in knn query or another case
7677
shardSearchRequest.source(other.source());
7778
}
7879
return shardSearchRequest;

0 commit comments

Comments
 (0)