forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 2024/05/31/update-complete-marker-on-progress
- Loading branch information
Showing
8 changed files
with
240 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| pr: 109470 | ||
| summary: Enabling profiling for `RankBuilders` and adding tests for RRF | ||
| area: Ranking | ||
| type: enhancement | ||
| issues: [] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
218 changes: 218 additions & 0 deletions
218
.../rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/600_rrf_retriever_profile.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,218 @@ | ||
| setup: | ||
| - requires: | ||
| cluster_features: "gte_v8.15.0" | ||
| reason: 'profile for rrf was enabled in 8.15' | ||
| test_runner_features: close_to | ||
|
|
||
| - do: | ||
| indices.create: | ||
| index: test | ||
| body: | ||
| settings: | ||
| number_of_shards: 1 | ||
| number_of_replicas: 0 | ||
| mappings: | ||
| properties: | ||
| text: | ||
| type: text | ||
| integer: | ||
| type: integer | ||
| vector: | ||
| type: dense_vector | ||
| dims: 1 | ||
| index: true | ||
| similarity: l2_norm | ||
| index_options: | ||
| type: hnsw | ||
| ef_construction: 100 | ||
| m: 16 | ||
|
|
||
| - do: | ||
| index: | ||
| index: test | ||
| id: "1" | ||
| body: | ||
| text: "term" | ||
| integer: 1 | ||
| vector: [5] | ||
|
|
||
| - do: | ||
| index: | ||
| index: test | ||
| id: "2" | ||
| body: | ||
| text: "term term" | ||
| integer: 2 | ||
| vector: [4] | ||
|
|
||
| - do: | ||
| index: | ||
| index: test | ||
| id: "3" | ||
| body: | ||
| text: "term term term" | ||
| integer: 3 | ||
| vector: [3] | ||
| - do: | ||
| index: | ||
| index: test | ||
| id: "4" | ||
| body: | ||
| text: "term term term term" | ||
| integer: 3 | ||
|
|
||
| - do: | ||
| index: | ||
| index: test | ||
| id: "5" | ||
| body: | ||
| integer: 1 | ||
| vector: [0] | ||
|
|
||
| - do: | ||
| indices.refresh: {} | ||
|
|
||
| --- | ||
| "profile standard and knn query": | ||
|
|
||
| - do: | ||
| search: | ||
| index: test | ||
| body: | ||
| fields: [ "text", "integer" ] | ||
| retriever: | ||
| rrf: | ||
| retrievers: [ | ||
| { | ||
| standard: { | ||
| query: { | ||
| term: { | ||
| text: "term" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| standard: { | ||
| query: { | ||
| knn: { | ||
| field: "vector", | ||
| query_vector: [ 3 ], | ||
| num_candidates: 5 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| rank_window_size: 5 | ||
| rank_constant: 1 | ||
| size: 3 | ||
| profile: true | ||
|
|
||
| - match: { hits.hits.0._id: "3" } | ||
| - match: { hits.hits.1._id: "2" } | ||
| - match: { hits.hits.2._id: "4" } | ||
|
|
||
| - not_exists: profile.shards.0.dfs | ||
| - match: { profile.shards.0.searches.0.query.0.type: ConstantScoreQuery } | ||
| - length: { profile.shards.0.searches.0.query.0.children: 1 } | ||
| - match: { profile.shards.0.searches.0.query.0.children.0.type: BooleanQuery } | ||
| - length: { profile.shards.0.searches.0.query.0.children.0.children: 2 } | ||
| - match: { profile.shards.0.searches.0.query.0.children.0.children.0.type: TermQuery } | ||
| - match: { profile.shards.0.searches.0.query.0.children.0.children.1.type: DocAndScoreQuery } | ||
|
|
||
| --- | ||
| "profile standard and knn dfs retrievers": | ||
|
|
||
| - do: | ||
| search: | ||
| index: test | ||
| body: | ||
| fields: [ "text", "integer" ] | ||
| retriever: | ||
| rrf: | ||
| retrievers: [ | ||
| { | ||
| standard: { | ||
| query: { | ||
| term: { | ||
| text: "term" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| knn: { | ||
| field: "vector", | ||
| query_vector: [ 3 ], | ||
| num_candidates: 5, | ||
| k: 5 | ||
| } | ||
| } | ||
| ] | ||
| rank_window_size: 5 | ||
| rank_constant: 1 | ||
| size: 3 | ||
| profile: true | ||
|
|
||
| - match: { hits.hits.0._id: "3" } | ||
| - match: { hits.hits.1._id: "2" } | ||
| - match: { hits.hits.2._id: "4" } | ||
|
|
||
| - exists: profile.shards.0.dfs | ||
| - length: { profile.shards.0.dfs.knn: 1 } | ||
| - length: { profile.shards.0.dfs.knn.0.query: 1 } | ||
| - match: { profile.shards.0.dfs.knn.0.query.0.type: DocAndScoreQuery } | ||
|
|
||
| - match: { profile.shards.0.searches.0.query.0.type: ConstantScoreQuery } | ||
| - length: { profile.shards.0.searches.0.query.0.children: 1 } | ||
| - match: { profile.shards.0.searches.0.query.0.children.0.type: BooleanQuery } | ||
| - length: { profile.shards.0.searches.0.query.0.children.0.children: 2 } | ||
| - match: { profile.shards.0.searches.0.query.0.children.0.children.0.type: TermQuery } | ||
| - match: { profile.shards.0.searches.0.query.0.children.0.children.1.type: KnnScoreDocQuery } | ||
|
|
||
| --- | ||
| "using query and dfs knn search": | ||
|
|
||
| - do: | ||
| search: | ||
| index: test | ||
| body: | ||
| fields: [ "text", "integer" ] | ||
| query: { | ||
| term: { | ||
| text: { | ||
| value: "term" | ||
| } | ||
| } | ||
| } | ||
| knn: { | ||
| field: "vector", | ||
| query_vector: [ 3 ], | ||
| num_candidates: 5, | ||
| k: 5 | ||
| } | ||
| rank: { | ||
| rrf: { | ||
| rank_window_size: 5, | ||
| rank_constant: 1 | ||
| } | ||
| } | ||
| size: 3 | ||
| profile: true | ||
|
|
||
| - match: { hits.hits.0._id: "3" } | ||
| - match: { hits.hits.1._id: "2" } | ||
| - match: { hits.hits.2._id: "4" } | ||
|
|
||
| - exists: profile.shards.0.dfs | ||
| - length: { profile.shards.0.dfs.knn: 1 } | ||
| - length: { profile.shards.0.dfs.knn.0.query: 1 } | ||
| - match: { profile.shards.0.dfs.knn.0.query.0.type: DocAndScoreQuery } | ||
|
|
||
| - match: { profile.shards.0.searches.0.query.0.type: ConstantScoreQuery } | ||
| - length: { profile.shards.0.searches.0.query.0.children: 1 } | ||
| - match: { profile.shards.0.searches.0.query.0.children.0.type: BooleanQuery } | ||
| - length: { profile.shards.0.searches.0.query.0.children.0.children: 2 } | ||
| - match: { profile.shards.0.searches.0.query.0.children.0.children.0.type: TermQuery } | ||
| - match: { profile.shards.0.searches.0.query.0.children.0.children.1.type: KnnScoreDocQuery } |