Fix graph merge stats size calculation #1844
Merged
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
Signed-off-by: Ryan Bogan <[email protected]>
ryanbogan
requested review from
heemin32,
navneet1v,
VijayanB,
vamshin,
jmazanec15,
naveentatikonda,
junqiu-lei,
martin-gaievski and
luyuncheng
as code owners
Signed-off-by: Ryan Bogan <[email protected]>
|
BWC failures are unrelated to this PR |
Signed-off-by: Ryan Bogan <[email protected]>
heemin32
reviewed
Jul 18, 2024
src/main/java/org/opensearch/knn/index/codec/util/KNNCodecUtil.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
heemin32
previously approved these changes
Jul 26, 2024
navneet1v
reviewed
Jul 26, 2024
| vectorsSize += vectorsSize % JAVA_ROUNDING_NUMBER; | ||
| } | ||
| return vectorsSize; | ||
| if (serializationMode == SerializationMode.COLLECTIONS_OF_BYTES) { |
There was a problem hiding this comment.
can we get rid of this serializationMode attribute completely?
There was a problem hiding this comment.
This method is used to calculate array size from a Pair class typically. The issue is that the KNNCodecUtil.Pair class only has doc id's, a vector address, dimension, and serialization mode as instance variables. Therefore, without reading memory from the vector address I don't think it's possible to differentiate whether the data is floats or bytes without the serialization mode.
There was a problem hiding this comment.
Can we use vector datatype to know if the vector is byte or float?
There was a problem hiding this comment.
Yeah I think that would work, binary type would be the same calculation as byte right?
Signed-off-by: Ryan Bogan <[email protected]>
navneet1v
reviewed
Aug 6, 2024
src/main/java/org/opensearch/knn/index/codec/util/KNNCodecUtil.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Ryan Bogan <[email protected]>
heemin32
approved these changes
Aug 7, 2024
navneet1v
approved these changes
Aug 7, 2024
|
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-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1844-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e3158f990d058b02568da617688fd4857d0d521b
# Push it to GitHub
git push --set-upstream origin backport/backport-1844-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.xThen, create a pull request where the |
ryanbogan
added a commit
that referenced
this pull request
Aug 8, 2024
* Fix graph merge stats size calculation Signed-off-by: Ryan Bogan <[email protected]> * Add changelog entry Signed-off-by: Ryan Bogan <[email protected]> * Add javadocs Signed-off-by: Ryan Bogan <[email protected]> * Make calculations easier to read Signed-off-by: Ryan Bogan <[email protected]> * Remove java overhead from calculations Signed-off-by: Ryan Bogan <[email protected]> * Change from serialization mode to vector data type for calculations Signed-off-by: Ryan Bogan <[email protected]> * Minor change to if statements Signed-off-by: Ryan Bogan <[email protected]> --------- Signed-off-by: Ryan Bogan <[email protected]> (cherry picked from commit e3158f9)
5 tasks
ryanbogan
added a commit
that referenced
this pull request
Aug 9, 2024
* Fix graph merge stats size calculation Signed-off-by: Ryan Bogan <[email protected]> * Add changelog entry Signed-off-by: Ryan Bogan <[email protected]> * Add javadocs Signed-off-by: Ryan Bogan <[email protected]> * Make calculations easier to read Signed-off-by: Ryan Bogan <[email protected]> * Remove java overhead from calculations Signed-off-by: Ryan Bogan <[email protected]> * Change from serialization mode to vector data type for calculations Signed-off-by: Ryan Bogan <[email protected]> * Minor change to if statements Signed-off-by: Ryan Bogan <[email protected]> --------- Signed-off-by: Ryan Bogan <[email protected]> (cherry picked from commit e3158f9)
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 the calculations for size of merges in the graph stats section of KNNStats API. This PR changes the logic to properly round values to the correct number of bytes.
Continuation of #1818, which had too many merge conflicts to fix cleanly.
Issues Resolved
#1789
Check List
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.