Skip to content

internal/keyspan: clean up InterleavingIter#1654

Merged
jbowens merged 1 commit intocockroachdb:masterfrom
jbowens:interleaving-iter-todos
Apr 18, 2022
Merged

internal/keyspan: clean up InterleavingIter#1654
jbowens merged 1 commit intocockroachdb:masterfrom
jbowens:interleaving-iter-todos

Conversation

@jbowens
Copy link
Copy Markdown
Contributor

@jbowens jbowens commented Apr 15, 2022

Remove superfluous Split parameter. Split was required for implementing
masking, but a direct implementation of masking was replaced with generic
Hooks.

Also, don't interleave a synthetic marker for empty spans. The synthetic marker
doesn't serve any purpose if there are no keys defined over the span. This
allows us to return a synthetic marker using an arbitrary Key's kind (rather
than always using RANGEKEYSET, even if the Span contained no RANGEKEYSET keys).

Remove superfluous Split parameter. Split was required for implementing
masking, but a direct implementation of masking was replaced with generic
Hooks.

Also, don't interleave a synthetic marker for empty spans. The synthetic marker
doesn't serve any purpose if there are no keys defined over the span. This
allows us to return a synthetic marker using an arbitrary Key's kind (rather
than always using RANGEKEYSET, even if the Span contained no RANGEKEYSET keys).
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@jbowens jbowens requested a review from a team April 15, 2022 21:23
Copy link
Copy Markdown
Contributor

@itsbilal itsbilal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 6 of 6 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @jbowens)

Copy link
Copy Markdown
Contributor Author

@jbowens jbowens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TFTR!

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @jbowens)

@jbowens jbowens merged commit 785bb36 into cockroachdb:master Apr 18, 2022
@jbowens jbowens deleted the interleaving-iter-todos branch April 18, 2022 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants