BTreeMap: split up range_search into two stages #81094
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
rust-highfive
added
the
S-waiting-on-review
|
Just noticed that my fancy description applies to code in a parallel universe, and this one isn't quite as elegant. |
ssomers
force-pushed
the
btree_drainy_refactor_3
branch
from
d3aee77
to
b793c0e
Compare
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 18, 2021
…Simulacrum BTreeMap: convert search functions to methods And further tweak the signature of `search_linear`, in preparation of a better rust-lang#81094. r? `@Mark-Simulacrum`
Mark-Simulacrum
added
S-waiting-on-author
ssomers
force-pushed
the
btree_drainy_refactor_3
branch
2 times, most recently
from
bb63d07
to
ec0ba4a
Compare
|
@rustbot modify labels: -S-waiting-on-author +S-waiting-on-review |
rustbot
added
S-waiting-on-review
|
☔ The latest upstream changes (presumably #81169) made this pull request unmergeable. Please resolve the merge conflicts. |
ssomers
force-pushed
the
btree_drainy_refactor_3
branch
3 times, most recently
from
b601803
to
4ccf0f7
Compare
|
Splitting off more parts as separate PRs while merge conflicts come in. |
This was referenced Jan 24, 2021
ssomers
force-pushed
the
btree_drainy_refactor_3
branch
from
4ccf0f7
to
769e245
Compare
Mark-Simulacrum
added
S-waiting-on-author
ssomers
force-pushed
the
btree_drainy_refactor_3
branch
2 times, most recently
from
c739e02
to
43ec3f9
Compare
|
☔ The latest upstream changes (presumably #81073) made this pull request unmergeable. Please resolve the merge conflicts. |
ssomers
force-pushed
the
btree_drainy_refactor_3
branch
from
43ec3f9
to
a5d623e
Compare
ssomers
force-pushed
the
btree_drainy_refactor_3
branch
from
a5d623e
to
8d76f5c
Compare
|
☔ The latest upstream changes (presumably #81853) made this pull request unmergeable. Please resolve the merge conflicts. |
ssomers
force-pushed
the
btree_drainy_refactor_3
branch
from
8d76f5c
to
5687130
Compare
ssomers
force-pushed
the
btree_drainy_refactor_3
branch
from
5687130
to
23f83a8
Compare
This was referenced Feb 9, 2021
ssomers
force-pushed
the
btree_drainy_refactor_3
branch
2 times, most recently
from
e619ead
to
34978ef
Compare
|
☔ The latest upstream changes (presumably #82103) made this pull request unmergeable. Please resolve the merge conflicts. |
ssomers
force-pushed
the
btree_drainy_refactor_3
branch
2 times, most recently
from
287ded3
to
f5e205c
Compare
|
☔ The latest upstream changes (presumably #81937) made this pull request unmergeable. Please resolve the merge conflicts. |
ssomers
force-pushed
the
btree_drainy_refactor_3
branch
from
f5e205c
to
deebb63
Compare
|
@rustbot modify labels: -S-waiting-on-author +S-waiting-on-review |
rustbot
added
S-waiting-on-review
|
This looks good to me, thanks. @bors r+ rollup=never |
|
📌 Commit deebb63 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
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.
range_searchexpects the caller to pass the same root twice and starts searching a node for both bounds of a range. It's not very clear that in the early iterations, it searches twice in the same node. This PR splits that search up in an initialfind_leaf_edges_spanning_rangethat postpones aliasing until the last second, and a second phase for continuing the search for the range in the each subtree independently (find_lower_bound_edge&find_upper_bound_edge), which greatly helps for use in #81075. It also moves those functions over to the search module.r? @Mark-Simulacrum