Implement iter::size_hint and ExactSizeIterator for Witness Iter #1053
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
RCasatta
force-pushed
the
witness_size_hint
branch
from
895b5cd
to
df71ecd
Compare
dpc
reviewed
Jun 13, 2022
src/blockdata/witness.rs
Outdated
| @@ -43,7 +43,7 @@ pub struct Witness { | |||
| } | |||
|
|
|||
| /// Support structure to allow efficient and convenient iteration over the Witness elements | |||
| pub struct Iter<'a>(::core::slice::Iter<'a, u8>); | |||
| pub struct Iter<'a>(::core::slice::Iter<'a, u8>, usize); | |||
There was a problem hiding this comment.
If it is already two fields, I would name them.
There was a problem hiding this comment.
sure, I added a small test also
RCasatta
force-pushed
the
witness_size_hint
branch
2 times, most recently
from
1149c35
to
52014d7
Compare
dpc
previously approved these changes
Jun 13, 2022
tcharding
previously approved these changes
Jun 13, 2022
tcharding
reviewed
Jun 13, 2022
src/blockdata/witness.rs
Outdated
| @@ -43,7 +43,10 @@ pub struct Witness { | |||
| } | |||
|
|
|||
| /// Support structure to allow efficient and convenient iteration over the Witness elements | |||
| pub struct Iter<'a>(::core::slice::Iter<'a, u8>); | |||
| pub struct Iter<'a> { | |||
| inner: ::core::slice::Iter<'a, u8>, | |||
There was a problem hiding this comment.
nit: We don't need these leading colons anymore, since the MSRV bump.
There was a problem hiding this comment.
Will hold off on merging since I'd like this to have a chance to be addressed.
apoelstra
previously approved these changes
Jun 15, 2022
// with size_hint // test blockdata::witness::benches::bench_big_witness_to_vec ... bench: 313 ns/iter (+/- 13) // test blockdata::witness::benches::bench_witness_to_vec ... bench: 204 ns/iter (+/- 11) // without // test blockdata::witness::benches::bench_big_witness_to_vec ... bench: 489 ns/iter (+/- 28) // test blockdata::witness::benches::bench_witness_to_vec ... bench: 221 ns/iter (+/- 102)
RCasatta
force-pushed
the
witness_size_hint
branch
from
52014d7
to
ec8dada
Compare
Kixunil
approved these changes
Jun 16, 2022
apoelstra
approved these changes
Jun 16, 2022
ChallengeDev210
pushed a commit
to ChallengeDev210/rust-bitcoin
that referenced
this pull request
Aug 1, 2022
…xactSizeIterator for Witness Iter ec8dada Implement iter::size_hint and ExactSizeIterator for Witness Iter (Riccardo Casatta) Pull request description: close rust-bitcoin/rust-bitcoin#1050 I don't think we need to change the `collect` since it use the `size_hint()` lower bound to initially allocate // with size_hint // test blockdata::witness::benches::bench_big_witness_to_vec ... bench: 313 ns/iter (+/- 13) // test blockdata::witness::benches::bench_witness_to_vec ... bench: 204 ns/iter (+/- 11) // without // test blockdata::witness::benches::bench_big_witness_to_vec ... bench: 489 ns/iter (+/- 28) // test blockdata::witness::benches::bench_witness_to_vec ... bench: 221 ns/iter (+/- 102) The reason why the small witness doesn't get big perf boost is because by default vec allocates 4 slots ACKs for top commit: Kixunil: ACK ec8dada apoelstra: ACK ec8dada Tree-SHA512: dbe09ba6ebd4014fe0639412894beedab6cc7e844a5ec1697af8f0694b62ae5d423a801df1b48ac7029444c01877975e2d5168728f038fbd4f5808bda90e0f2f
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.
close #1050
I don't think we need to change the
collectsince it use thesize_hint()lower bound to initially allocate// with size_hint
// test blockdata::witness::benches::bench_big_witness_to_vec ... bench: 313 ns/iter (+/- 13)
// test blockdata::witness::benches::bench_witness_to_vec ... bench: 204 ns/iter (+/- 11)
// without
// test blockdata::witness::benches::bench_big_witness_to_vec ... bench: 489 ns/iter (+/- 28)
// test blockdata::witness::benches::bench_witness_to_vec ... bench: 221 ns/iter (+/- 102)
The reason why the small witness doesn't get big perf boost is because by default vec allocates 4 slots