Sparse global order reader: refactor merge algorithm. #3173
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
While running tests with real world array, I noticed that the optimization trying to find the the length of a cell slab once a cell to be merged was found didn't work. Trying to use a binary search across the whole tile resulted in more comparisons than a linear search since the cell slab lengths are never that long. Also, next_cell in ResultCoords didn't use the bitmap, which caused some issues, so ResultCoords was split into two classes, ResultCoords and GlobalOrderResultCoords (which has access to the bitmap). This also allowed to push some of the logic of the merge down into that class to simplify graetly the merge function. --- TYPE: IMPROVEMENT DESC: Sparse global order reader: refactor merge algorithm.
ypatia
reviewed
May 16, 2022
| std::vector<BitmapType> bitmap_; | ||
|
|
||
| /** Number of cells in this bitmap. */ | ||
| uint64_t bitmap_result_num_; |
There was a problem hiding this comment.
Can we make those attributes private and access/update through member functions so that we can actually follow/test the behavior of that class?
Same for GlobalOrderResultTile
When this is done, we should also consider adding UTs, again there are methods that are safer to validate by UT than by reading.
There was a problem hiding this comment.
I did some, but for ResultTileWithBitmap, it would be a change too big for a patch release so I filed the following: https://app.shortcut.com/tiledb-inc/story/17815/make-resulttilewithbtimap-more-opaque
There was a problem hiding this comment.
Also not that some unit tests are already present in unit-result-tile.cc.
KiterLuc
force-pushed
the
lr/sparse-global-order-next-fix
branch
from
41c3a0a
to
21c3d7d
Compare
KiterLuc
force-pushed
the
lr/sparse-global-order-next-fix
branch
from
21c3d7d
to
10182eb
Compare
ypatia
reviewed
May 16, 2022
ypatia
approved these changes
May 17, 2022
|
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-release-2.9 release-2.9
# Navigate to the new working tree
cd .worktrees/backport-release-2.9
# Create a new branch
git switch --create backport-3173-to-release-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 1b9a20e85416f7c8fd8286d2352306b652a91fda
# Push it to GitHub
git push --set-upstream origin backport-3173-to-release-2.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-2.9Then, create a pull request where the |
KiterLuc
added a commit
that referenced
this pull request
May 17, 2022
* Sparse global order reader: refactor merge algorithm. While running tests with real world array, I noticed that the optimization trying to find the the length of a cell slab once a cell to be merged was found didn't work. Trying to use a binary search across the whole tile resulted in more comparisons than a linear search since the cell slab lengths are never that long. Also, next_cell in ResultCoords didn't use the bitmap, which caused some issues, so ResultCoords was split into two classes, ResultCoords and GlobalOrderResultCoords (which has access to the bitmap). This also allowed to push some of the logic of the merge down into that class to simplify graetly the merge function. --- TYPE: IMPROVEMENT DESC: Sparse global order reader: refactor merge algorithm. * Addressing feedback from @ypatia. * Addressing feedback from @ypatia, part 2.
ihnorton
pushed a commit
that referenced
this pull request
May 17, 2022
* Sparse global order reader: refactor merge algorithm. While running tests with real world array, I noticed that the optimization trying to find the the length of a cell slab once a cell to be merged was found didn't work. Trying to use a binary search across the whole tile resulted in more comparisons than a linear search since the cell slab lengths are never that long. Also, next_cell in ResultCoords didn't use the bitmap, which caused some issues, so ResultCoords was split into two classes, ResultCoords and GlobalOrderResultCoords (which has access to the bitmap). This also allowed to push some of the logic of the merge down into that class to simplify graetly the merge function. --- TYPE: IMPROVEMENT DESC: Sparse global order reader: refactor merge algorithm. * Addressing feedback from ypatia. * Addressing feedback from ypatia, part 2.
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.
While running tests with real world array, I noticed that the
optimization trying to find the the length of a cell slab once a cell
to be merged was found didn't work. Trying to use a binary search across
the whole tile resulted in more comparisons than a linear search since
the cell slab lengths are never that long. Also, next_cell in
ResultCoords didn't use the bitmap, which caused some issues, so
ResultCoords was split into two classes, ResultCoords and
GlobalOrderResultCoords (which has access to the bitmap). This also
allowed to push some of the logic of the merge down into that class to
simplify graetly the merge function.
TYPE: IMPROVEMENT
DESC: Sparse global order reader: refactor merge algorithm.