Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backup,import: count system table rows as rows #44965

Merged
merged 1 commit into from
Feb 12, 2020

Conversation

dt
Copy link
Member

@dt dt commented Feb 11, 2020

Previously we counted any KVs belonging to non-user tables as 'system records'
rather than as 'rows' or 'index entries' the way they are counted for regular
tables. This however meant that BACKUP or RESTORE would confusingly say that
it had backed up 0 rows from a given system table when it in fact backed up
its rows normally, unless one separately looked at the 'system record' count.
Even if one does so, that is also confusing since it doesn't distinguish rows
from index entries so the count does not match. Given that these counts are
rolled up by table anyway the distinction gains us little.

Release note: none.

@dt dt requested a review from pbardea February 11, 2020 16:07
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@dt dt force-pushed the system-rows branch 2 times, most recently from c1dc5bf to 378ba4e Compare February 11, 2020 17:57
Previously we counted any KVs belonging to non-user tables as 'system records'
rather than as 'rows' or 'index entries' the way they are counted for regular
tables. This however meant that BACKUP or RESTORE would confusingly say that
it had backed up 0 rows from a given system table when it in fact backed up
its rows normally, unless one separately looked at the 'system record' count.
Even if one does so, that is also confusing since it doesn't distinguish rows
from index entries so the count does not match. Given that these counts are
rolled up by table anyway the distinction gains us little.

Release note (enterprise change): rows counts in BACKUP and RESTORE now include rows in system tables.
Copy link
Contributor

@pbardea pbardea left a comment

Choose a reason for hiding this comment

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

LGTM, sorry for the delay!

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @pbardea)

Copy link
Contributor

@pbardea pbardea left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

@dt
Copy link
Member Author

dt commented Feb 12, 2020

TFTR!

bors r+

@craig
Copy link
Contributor

craig bot commented Feb 12, 2020

Build failed (retrying...)

craig bot pushed a commit that referenced this pull request Feb 12, 2020
44965: backup,import: count system table rows as rows r=dt a=dt

Previously we counted any KVs belonging to non-user tables as 'system records'
rather than as 'rows' or 'index entries' the way they are counted for regular
tables. This however meant that BACKUP or RESTORE would confusingly say that
it had backed up 0 rows from a given system table when it in fact backed up
its rows normally, unless one separately looked at the 'system record' count.
Even if one does so, that is also confusing since it doesn't distinguish rows
from index entries so the count does not match. Given that these counts are
rolled up by table anyway the distinction gains us little.

Release note: none.

45010: storage/concurrency: move lock_table testdata to directory r=nvanbenschoten a=nvanbenschoten

This creates room for new concurrency_manager testdata. There is a large diff, but it's just an outdent.

We should probably get this in because #44975 so that we can put those new test cases in a new file.

Co-authored-by: David Taylor <tinystatemachine@gmail.com>
Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
@craig
Copy link
Contributor

craig bot commented Feb 12, 2020

Build succeeded

@craig craig bot merged commit b3869b5 into cockroachdb:master Feb 12, 2020
@dt dt deleted the system-rows branch February 13, 2020 13:28
@dt dt mentioned this pull request Feb 13, 2020
19 tasks
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.

None yet

3 participants