-
Couldn't load subscription status.
- Fork 2.3k
Add support for Elastic Search _shard_doc equivalent #18924
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
gaobinlong
merged 14 commits into
opensearch-project:main
from
laminelam:feature/shardid_docid_tie_breaker_0508
Sep 30, 2025
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
d6edffd
add a new sort tiebreaker based on shard id and docid
7199347
add a new sort tiebreaker based on shard id and docid
396dd0e
add a test class plus some refactoring
743d2ef
add microbenchmark
1889dc7
spotless
2fde916
spotless
4d441f4
Merge branch 'main' into feature/shardid_docid_tie_breaker_0508
27449ce
add yaml rest test cases
8081cbb
Merge remote-tracking branch 'origin/main' into feature/shardid_docid…
f7d8f73
change log
9467d06
some changes to the shard_doc yaml rest test file
efa56c9
Add PIT param to ShardDocFieldComparatorSourceIT's search requests
a719fb7
Merge branch 'main' into feature/shardid_docid_tie_breaker_0508
60f438d
add more logic for shard_doc parsing
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
148 changes: 148 additions & 0 deletions
148
...marks/src/main/java/org/opensearch/benchmark/search/sort/ShardDocComparatorBenchmark.java
This file contains hidden or 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,148 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| package org.opensearch.benchmark.search.sort; | ||
|
|
||
| import org.openjdk.jmh.annotations.Benchmark; | ||
| import org.openjdk.jmh.annotations.BenchmarkMode; | ||
| import org.openjdk.jmh.annotations.Fork; | ||
| import org.openjdk.jmh.annotations.Measurement; | ||
| import org.openjdk.jmh.annotations.Mode; | ||
| import org.openjdk.jmh.annotations.OutputTimeUnit; | ||
| import org.openjdk.jmh.annotations.Param; | ||
| import org.openjdk.jmh.annotations.Scope; | ||
| import org.openjdk.jmh.annotations.Setup; | ||
| import org.openjdk.jmh.annotations.State; | ||
| import org.openjdk.jmh.annotations.Warmup; | ||
| import org.openjdk.jmh.infra.Blackhole; | ||
|
|
||
| import java.util.Random; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| /** | ||
| * JMH microbenchmarks for the _shard_doc composite key path: | ||
| * key = (shardKeyPrefix | (docBase + doc)) | ||
| * | ||
| * Mirrors hot operations in ShardDocFieldComparatorSource without needing Lucene classes. | ||
| */ | ||
| @Fork(3) | ||
| @Warmup(iterations = 5) | ||
| @Measurement(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS) | ||
| @BenchmarkMode(Mode.Throughput) | ||
| @OutputTimeUnit(TimeUnit.MILLISECONDS) | ||
| @State(Scope.Benchmark) | ||
|
|
||
| public class ShardDocComparatorBenchmark { | ||
|
|
||
| @Param({ "1", "4", "16" }) | ||
| public int segments; | ||
|
|
||
| @Param({ "50000" }) | ||
| public int docsPerSegment; | ||
|
|
||
| @Param({ "7" }) | ||
| public int shardId; | ||
|
|
||
| private long shardKeyPrefix; | ||
| private int[] docBases; | ||
| private int[] docs; | ||
| private long[] keys; // precomputed composite keys | ||
|
|
||
| // per-doc global doc (docBase + doc) for doc-only baseline | ||
| private int[] globalDocs; | ||
|
|
||
| @Setup | ||
| public void setup() { | ||
| shardKeyPrefix = ((long) shardId) << 32; // Must mirror ShardDocFieldComparatorSource.shardKeyPrefix | ||
|
|
||
| docBases = new int[segments]; | ||
| for (int i = 1; i < segments; i++) { | ||
| docBases[i] = docBases[i - 1] + docsPerSegment; | ||
| } | ||
|
|
||
| int total = segments * docsPerSegment; | ||
| docs = new int[total]; | ||
| keys = new long[total]; | ||
| globalDocs = new int[total]; | ||
|
|
||
| Random r = new Random(42); | ||
| int pos = 0; | ||
| for (int s = 0; s < segments; s++) { | ||
| int base = docBases[s]; | ||
| for (int d = 0; d < docsPerSegment; d++) { | ||
| int doc = r.nextInt(docsPerSegment); | ||
| docs[pos] = doc; | ||
| keys[pos] = computeGlobalDocKey(base, doc); | ||
| globalDocs[pos] = base + doc; | ||
| pos++; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** Baseline: compare only globalDoc */ | ||
| @Benchmark | ||
| public long compareDocOnlyAsc() { | ||
| long acc = 0; | ||
| for (int i = 1; i < globalDocs.length; i++) { | ||
| acc += Integer.compare(globalDocs[i - 1], globalDocs[i]); | ||
| } | ||
| return acc; | ||
| } | ||
|
|
||
| /** raw key packing cost */ | ||
| @Benchmark | ||
| public void packKey(Blackhole bh) { | ||
| int total = segments * docsPerSegment; | ||
| int idx = 0; | ||
| for (int s = 0; s < segments; s++) { | ||
| int base = docBases[s]; | ||
| for (int d = 0; d < docsPerSegment; d++) { | ||
| long k = computeGlobalDocKey(base, docs[idx++]); | ||
| bh.consume(k); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** compare already-packed keys as ASC */ | ||
| @Benchmark | ||
| public long compareAsc() { | ||
| long acc = 0; | ||
| for (int i = 1; i < keys.length; i++) { | ||
| acc += Long.compare(keys[i - 1], keys[i]); | ||
| } | ||
| return acc; | ||
| } | ||
|
|
||
| /** compare already-packed keys as DESC */ | ||
| @Benchmark | ||
| public long compareDesc() { | ||
| long acc = 0; | ||
| for (int i = 1; i < keys.length; i++) { | ||
| acc += Long.compare(keys[i], keys[i - 1]); // reversed | ||
| } | ||
| return acc; | ||
| } | ||
|
|
||
| /** rough “collector loop” mix: copy + occasional compareBottom */ | ||
| @Benchmark | ||
| public int copyAndCompareBottomAsc() { | ||
| long bottom = Long.MIN_VALUE; | ||
| int worse = 0; | ||
| for (int i = 0; i < keys.length; i++) { | ||
| long v = keys[i]; // simulate copy(slot, doc) | ||
| if ((i & 31) == 0) bottom = v; // simulate setBottom every 32 items | ||
| if (Long.compare(bottom, v) < 0) worse++; | ||
| } | ||
| return worse; | ||
| } | ||
|
|
||
| // Must mirror ShardDocFieldComparatorSource.computeGlobalDocKey: (shardId << 32) | (docBase + doc) | ||
| private long computeGlobalDocKey(int docBase, int doc) { | ||
| return shardKeyPrefix | (docBase + doc); | ||
| } | ||
| } |
191 changes: 191 additions & 0 deletions
191
rest-api-spec/src/main/resources/rest-api-spec/test/search/95_search_after_shard_doc.yml
This file contains hidden or 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,191 @@ | ||
| --- | ||
| setup: | ||
| - skip: | ||
| version: " - 3.2.99" | ||
| reason: "introduced in 3.3.0" | ||
|
|
||
| # Multi-shard index | ||
| - do: | ||
| indices.create: | ||
| index: sharddoc_paging | ||
| body: | ||
| settings: | ||
| number_of_shards: 4 | ||
| number_of_replicas: 0 | ||
| mappings: | ||
| properties: | ||
| id: { type: integer } | ||
| txt: { type: keyword } | ||
| - do: | ||
| cluster.health: | ||
| wait_for_status: green | ||
| index: sharddoc_paging | ||
| - do: | ||
| bulk: | ||
| refresh: true | ||
| index: sharddoc_paging | ||
| body: | | ||
| {"index":{}} | ||
| {"id":1,"txt":"a"} | ||
| {"index":{}} | ||
| {"id":2,"txt":"b"} | ||
| {"index":{}} | ||
| {"id":3,"txt":"c"} | ||
| {"index":{}} | ||
| {"id":4,"txt":"d"} | ||
| {"index":{}} | ||
| {"id":5,"txt":"e"} | ||
| {"index":{}} | ||
| {"id":6,"txt":"f"} | ||
| {"index":{}} | ||
| {"id":7,"txt":"g"} | ||
| {"index":{}} | ||
| {"id":8,"txt":"h"} | ||
| {"index":{}} | ||
| {"id":9,"txt":"i"} | ||
| {"index":{}} | ||
| {"id":10,"txt":"j"} | ||
| {"index":{}} | ||
| {"id":11,"txt":"k"} | ||
| {"index":{}} | ||
| {"id":12,"txt":"l"} | ||
| {"index":{}} | ||
| {"id":13,"txt":"m"} | ||
| {"index":{}} | ||
| {"id":14,"txt":"n"} | ||
| {"index":{}} | ||
| {"id":15,"txt":"o"} | ||
| {"index":{}} | ||
| {"id":16,"txt":"p"} | ||
| {"index":{}} | ||
| {"id":17,"txt":"q"} | ||
| {"index":{}} | ||
| {"id":18,"txt":"r"} | ||
| {"index":{}} | ||
| {"id":19,"txt":"s"} | ||
| {"index":{}} | ||
| {"id":20,"txt":"t"} | ||
| {"index":{}} | ||
| {"id":21,"txt":"u"} | ||
| {"index":{}} | ||
| {"id":22,"txt":"v"} | ||
|
|
||
| # ------------------------------------------------------------------- | ||
| # VALIDATION | ||
| # ------------------------------------------------------------------- | ||
|
|
||
| --- | ||
| "reject _shard_doc without PIT": | ||
| - do: | ||
| catch: bad_request | ||
| search: | ||
| index: sharddoc_paging | ||
| body: | ||
| sort: | ||
| - _shard_doc | ||
| - match: { status: 400 } | ||
| - match: { error.type: action_request_validation_exception } | ||
| - match: { error.reason: "/.*_shard_doc is only supported with point-in-time.*|.*PIT.*/" } | ||
|
|
||
| --- | ||
| "detect _shard_doc via FieldSortBuilder-style object without PIT": | ||
| - do: | ||
| catch: bad_request | ||
| search: | ||
| index: sharddoc_paging | ||
| body: | ||
| sort: | ||
| - _shard_doc: { } # object form, still invalid without PIT | ||
| - match: { status: 400 } | ||
| - match: { error.type: action_request_validation_exception } | ||
| - match: { error.reason: "/.*_shard_doc is only supported with point-in-time.*|.*PIT.*/" } | ||
|
|
||
|
|
||
| # ------------------------------------------------------------------- | ||
| # HAPPY PATH: PAGINATION WITH PIT ON MULTI-SHARD INDEX | ||
| # ------------------------------------------------------------------- | ||
|
|
||
| --- | ||
| "accept _shard_doc with PIT + paginate with search_after (multi-shard)": | ||
| - do: | ||
| create_pit: | ||
| index: sharddoc_paging | ||
| keep_alive: 1m | ||
| - set: { pit_id: pit_id } | ||
|
|
||
| # Page 1 | ||
| - do: | ||
| search: | ||
| body: | ||
| size: 10 | ||
| pit: { id: "$pit_id", keep_alive: "1m" } | ||
| sort: | ||
| - _shard_doc: {} | ||
| - match: { _shards.failed: 0 } | ||
| - length: { hits.hits: 10 } | ||
| - is_true: hits.hits.9.sort | ||
|
|
||
| - set: { hits.hits.9.sort: after1 } | ||
|
|
||
| # Page 2 | ||
| - do: | ||
| search: | ||
| body: | ||
| size: 10 | ||
| pit: { id: "$pit_id", keep_alive: "1m" } | ||
| sort: | ||
| - _shard_doc: { } | ||
| search_after: $after1 | ||
|
|
||
| - match: { _shards.failed: 0 } | ||
| - length: { hits.hits: 10 } | ||
| - is_true: hits.hits.9.sort | ||
|
|
||
| - set: { hits.hits.9.sort: after2 } | ||
| - set: { hits.hits.9.sort.0: last_value_page2 } | ||
|
|
||
| # Check that the sort values increase from one hit to the next without ever decreasing. | ||
| - set: { hits.hits.0.sort.0: prev } | ||
| - gt: { hits.hits.1.sort.0: $prev } | ||
|
|
||
| - set: { hits.hits.1.sort.0: prev } | ||
| - gt: { hits.hits.2.sort.0: $prev } | ||
|
|
||
| - set: { hits.hits.2.sort.0: prev } | ||
| - gt: { hits.hits.3.sort.0: $prev } | ||
|
|
||
| - set: { hits.hits.3.sort.0: prev } | ||
| - gt: { hits.hits.4.sort.0: $prev } | ||
|
|
||
| - set: { hits.hits.4.sort.0: prev } | ||
| - gt: { hits.hits.5.sort.0: $prev } | ||
|
|
||
| - set: { hits.hits.5.sort.0: prev } | ||
| - gt: { hits.hits.6.sort.0: $prev } | ||
|
|
||
| - set: { hits.hits.6.sort.0: prev } | ||
| - gt: { hits.hits.7.sort.0: $prev } | ||
|
|
||
| - set: { hits.hits.7.sort.0: prev } | ||
| - gt: { hits.hits.8.sort.0: $prev } | ||
|
|
||
| - set: { hits.hits.8.sort.0: prev } | ||
| - gt: { hits.hits.9.sort.0: $prev } | ||
|
|
||
| # Page 3: drain the rest (22 docs total => 10 + 10 + 2) | ||
| - do: | ||
| search: | ||
| body: | ||
| size: 10 | ||
| pit: { id: "$pit_id", keep_alive: "1m" } | ||
| sort: | ||
| - _shard_doc: {} | ||
| search_after: $after2 | ||
|
|
||
| - match: { _shards.failed: 0 } | ||
| - length: { hits.hits: 2 } | ||
|
|
||
| - do: | ||
| delete_pit: | ||
| body: | ||
| pit_id: [ "$pit_id" ] | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.