-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Make writerWithOffset fully delegate to the writer it wraps #126937
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
Merged
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
0c41d29
Make writerWithOffset fully delegate to the writer it wraps
andreidan c454ccf
Merge branch 'main' into writerWithOffset
andreidan b00af73
Merge branch 'main' into writerWithOffset
andreidan ec0adfb
Merge branch 'main' into writerWithOffset
andreidan b95c7d7
Merge branch 'main' into writerWithOffset
andreidan dfabe15
Merge branch 'main' into writerWithOffset
elasticmachine 7b4f16e
Merge branch 'main' into writerWithOffset
elasticmachine 9b06d0f
Merge branch 'main' into writerWithOffset
elasticmachine f1643d2
Merge branch 'main' into writerWithOffset
elasticmachine f89c72b
add clarifying (hopefully) docs regarding the writerWithOffset
andreidan 7a3c412
line length
andreidan 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if this works - since it does not apply the offset in that case?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm, would the
relativePos - writeOffsetparameter passed infillCacheRangenot do the trick here?My understanding on
sharedInputStreamFactoryis that it has to do with how much we can parallelise the calls tofillCacheRangebut the place we read from is therelativePospassed in (which will take the offset into account as it'll berelativePos - writeOffset?We could return
nullafter callingwriter.sharedInputStreamFactory(gaps)here if you think it's better? i.e.:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we want to return the shard input stream factory there.
Is there a test demonstrating that it works?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The cache tests should have this covered - e.g. https://github.com/elastic/elasticsearch/blob/main/x-pack/plugin/blob-cache/src/test/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceTests.java#L1157
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My link above still only overrides the fill cache method. I'll add one more test that calls
maybeFetchRangewith a realSequentialRangeMissingHandlerinstance. Thanks Henning!There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@henningandersen adding a unit test with
SequentialRangeMissingHandlerproven to be quite the mission (we'd end up mostly mocking things) so I added an integration test instead in https://github.com/elastic/elasticsearch-serverless/pull/3853