cherrypick-1.1: cli: simplify and improve dump performance #19400
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.
Cherrypick #18472 and #19325.
#18472 was initially not included in 1.1 because it was thought to only be a performance increase, and the release cycle was late enough that it wasn't worth the risk to include it. However #18500 showed that the 1.1 branch had a known bug, so now it may be important enough to include here.
We could have alternatively made a from-scratch change to just fix the bug in 1.1, but I think it's better to cherrypick a more thought out and tested solution instead.
Our other option is to not accept the risk of the code changes here, and document the bug as a known limitation. However I think the change is safe enough to include, and comes with a hefty performance improvement to boot.
Fixes #18500