Fix bytes offset bug and duplicate readers and add uTs for derived source #2494
Conversation
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
jmazanec15
added
Bug Fixes
jmazanec15
requested review from
heemin32,
navneet1v,
VijayanB,
vamshin,
naveentatikonda,
junqiu-lei,
martin-gaievski,
ryanbogan,
luyuncheng,
shatejas and
0ctopus13prime
as code owners
shatejas
reviewed
Feb 5, 2025
| verify(derivedSourceVectorInjector, times(0)).injectVectors(anyInt(), any()); | ||
| verify(delegate, times(1)).binaryField(any(), any()); | ||
|
|
||
| // When field is not _source, then do call the injector |
There was a problem hiding this comment.
nit: When the field is _source, then do call the injector
| FieldInfo fieldInfo = KNNCodecTestUtil.FieldInfoBuilder.builder(FIELD_NAME).build(); | ||
| try (MockedStatic<KNNVectorValuesFactory> mockedKnnVectorValues = Mockito.mockStatic(KNNVectorValuesFactory.class)) { | ||
| mockedKnnVectorValues.when(() -> KNNVectorValuesFactory.getVectorValues(fieldInfo, null, null)) | ||
| .thenReturn(new KNNVectorValues<float[]>(new KNNVectorValuesIterator() { |
There was a problem hiding this comment.
nit: You can probably use TestVectorValues
There was a problem hiding this comment.
I tried to use it - but seems that it might be easier to just mock the iterator. Ill update.
| @@ -79,7 +79,7 @@ public void writeField(FieldInfo fieldInfo, BytesRef bytesRef) throws IOExceptio | |||
| // Reference: | |||
| // https://github.com/opensearch-project/OpenSearch/blob/2.18.0/server/src/main/java/org/opensearch/index/mapper/SourceFieldMapper.java#L322 | |||
| Tuple<? extends MediaType, Map<String, Object>> mapTuple = XContentHelper.convertToMap( | |||
| BytesReference.fromByteBuffer(ByteBuffer.wrap(bytesRef.bytes)), | |||
| BytesReference.fromByteBuffer(ByteBuffer.wrap(bytesRef.bytes, bytesRef.offset, bytesRef.length)), | |||
There was a problem hiding this comment.
Should we add a UT for this case?
There was a problem hiding this comment.
makes sense - added and validated fix before and after
Fixes a bug in the derived source writer where we are reading the entire bytes array from the bytes ref instead of just the offset+length. Along with that, touches up the ParentChildHelper (no prod impact) and also adds some unit tests. Signed-off-by: John Mazanec <[email protected]>
jmazanec15
force-pushed
the
derived-fix
branch
from
c13bc82 to
4bce385
Compare
jmazanec15
changed the title
Signed-off-by: John Mazanec <[email protected]>
jmazanec15
force-pushed
the
derived-fix
branch
from
23ecfc0 to
91365c9
Compare
Signed-off-by: John Mazanec <[email protected]>
navneet1v
approved these changes
Feb 6, 2025
| @@ -23,7 +24,8 @@ | |||
| */ | |||
| @RequiredArgsConstructor | |||
| @Getter | |||
| public class DerivedSourceReaders implements Closeable { | |||
| @Log4j2 | |||
There was a problem hiding this comment.
[nit-pick] you are not using Log4j2 in the code
shatejas
approved these changes
Feb 6, 2025
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-main main
# Navigate to the new working tree
cd .worktrees/backport-main
# Create a new branch
git switch --create backport/backport-2494-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ab33538a23db95be4c1f41f41c3a4a9d8f848a3e
# Push it to GitHub
git push --set-upstream origin backport/backport-2494-to-main
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-mainThen, create a pull request where the |
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Feb 6, 2025
…urce (#2494) Fixes a bug in the derived source writer where we are reading the entire bytes array from the bytes ref instead of just the offset+length. Also reuses readers to prevent memory leak Along with that, touches up the ParentChildHelper (no prod impact) and also adds some unit tests. Signed-off-by: John Mazanec <[email protected]> (cherry picked from commit ab33538)
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Fixes a bug in the derived source writer where we are reading the entire bytes array from the bytes ref instead of just the offset+length.
This was the error:
In order to hit this error, I was using OpenSearch Benchmarks. However, when I dont use OpenSearch benchmarks (i.e. curl or plugin iTs), it seems to work fine. But, with OpenSearch benchmarks locally, I verified the fix.
Also, fixes readers to only open one (extra) per segment
Along with that, touches up the ParentChildHelper (no prod impact) and also adds some unit tests.
Check List
--signoff.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.