Skip to content

storage/concurrency: move lock_table testdata to directory#45010

Merged
craig[bot] merged 2 commits intocockroachdb:masterfrom
nvb:nvanbenschoten/lockTableDir
Feb 12, 2020
Merged

storage/concurrency: move lock_table testdata to directory#45010
craig[bot] merged 2 commits intocockroachdb:masterfrom
nvb:nvanbenschoten/lockTableDir

Conversation

@nvb
Copy link
Copy Markdown
Contributor

@nvb nvb commented Feb 12, 2020

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.

This creates room for new concurrency_manager testdata.
Large diff, but just an outdent.

We should probably get this in because cockroachdb#44975 so that we
can put those new test cases in a new file.
@nvb nvb requested a review from sumeerbhola February 12, 2020 14:30
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Collaborator

@sumeerbhola sumeerbhola 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 (waiting on @sumeerbhola)

@nvb nvb force-pushed the nvanbenschoten/lockTableDir branch from f0bacdb to 2e425b7 Compare February 12, 2020 16:08
@nvb
Copy link
Copy Markdown
Contributor Author

nvb commented Feb 12, 2020

bors r+

@craig
Copy link
Copy Markdown
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
Copy Markdown
Contributor

craig bot commented Feb 12, 2020

Build succeeded

@craig craig bot merged commit 2e425b7 into cockroachdb:master Feb 12, 2020
@nvb nvb deleted the nvanbenschoten/lockTableDir branch February 12, 2020 17:02
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