Skip to content

tool: fix find to support custom comparers and mergers#1104

Merged
petermattis merged 1 commit intocockroachdb:masterfrom
petermattis:pmattis/find-tool
Apr 5, 2021
Merged

tool: fix find to support custom comparers and mergers#1104
petermattis merged 1 commit intocockroachdb:masterfrom
petermattis:pmattis/find-tool

Conversation

@petermattis
Copy link
Copy Markdown
Collaborator

Add support for custom comparers and mergers to find. This involved
plumbing through the mergers from the top-level tool as was already
being done for the other tool commands.

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Member

@tbg tbg 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 17 of 17 files at r1.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @petermattis and @sumeerbhola)


tool/testdata/find, line 16 at r1 (raw file):

----
000002.log
    aaa#1,SET [31]

🤔 I don't understand why these have changed. Was the file just not regenerated in a while and we're picking this up from some other change?

tbg added a commit to tbg/cockroach that referenced this pull request Apr 5, 2021
Add support for custom comparers and mergers to `find`. This involved
plumbing through the mergers from the top-level tool as was already
being done for the other tool commands.
@petermattis petermattis changed the title tool: fix find to support customer comparers and mergers tool: fix find to support custom comparers and mergers Apr 5, 2021
Copy link
Copy Markdown
Collaborator Author

@petermattis petermattis 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: 15 of 19 files reviewed, 1 unresolved discussion (waiting on @sumeerbhola and @tbg)


tool/testdata/find, line 16 at r1 (raw file):

Previously, tbg (Tobias Grieger) wrote…

🤔 I don't understand why these have changed. Was the file just not regenerated in a while and we're picking this up from some other change?

Yes, the testdata/find-db data had not been regenerated in a while and we've picked up a change that adjusted how the first sequence number is allocated. In particular, we're picking up d2ecbc2 which changed the first seqnum to be 1 to match RocksDB. That commit landed in Mar 2020, while the testdata/find-db data had previously been updated in Jan 2020.

@petermattis petermattis merged commit 9408371 into cockroachdb:master Apr 5, 2021
@petermattis petermattis deleted the pmattis/find-tool branch April 5, 2021 12:37
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