Skip to content

Revert "tpcc: use multiple column families to avoid contention"#55983

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
nvb:nvanbenschoten/revertTPCCColFams
Oct 26, 2020
Merged

Revert "tpcc: use multiple column families to avoid contention"#55983
craig[bot] merged 1 commit intocockroachdb:masterfrom
nvb:nvanbenschoten/revertTPCCColFams

Conversation

@nvb
Copy link
Copy Markdown
Contributor

@nvb nvb commented Oct 26, 2020

This reverts commit 6b11918.

Fixes #55954.
Fixes #55953.
Fixes #55952.
Fixes #55951.
Fixes #55949.

In #30624, we split various column families up in the TPC-C workload. This
had the unintended consequence of breaking CDC roachtests, because CDC
does not support multiple column families per row:

CHANGEFEEDs are currently supported on tables with exactly 1 column family: warehouse has 2

This PR reverts that commit. I intend to come back to this and introduce
a --families flag to TPC-C (like we have to YCSB) that can be used to
selectively toggle column families on or off. However, I'll do this
after #51897 lands, because it's going to be more effort than it's worth
to conditionally set this flag based on whether the version of workload
used in the test supports it or not.

This reverts commit 6b11918.

Fixes cockroachdb#55954.
Fixes cockroachdb#55953.
Fixes cockroachdb#55952.
Fixes cockroachdb#55951.
Fixes cockroachdb#55949.

In cockroachdb#30624, we split various column families up in the TPC-C workload. This
had the unintended consequence of breaking CDC roachtests, because CDC
does not support multiple column families per row:
```
CHANGEFEEDs are currently supported on tables with exactly 1 column family: warehouse has 2
```

This PR reverts that commit. I intend to come back to this and introduce
a `--families` flag to TPC-C (like we have to YCSB) that can be used to
selectively toggle column families on or off. However, I'll do this
after cockroachdb#51897 lands, because it's going to be more effort than it's worth
to conditionally set this flag based on whether the version of workload
used in the test supports it or not.
@nvb nvb requested a review from aayushshah15 October 26, 2020 17:11
@nvb nvb requested a review from a team as a code owner October 26, 2020 17:11
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@aayushshah15 aayushshah15 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 @aayushshah15)

@nvb
Copy link
Copy Markdown
Contributor Author

nvb commented Oct 26, 2020

TFTR!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Oct 26, 2020

Build succeeded:

@craig craig bot merged commit a2db135 into cockroachdb:master Oct 26, 2020
@nvb nvb deleted the nvanbenschoten/revertTPCCColFams branch November 12, 2020 18:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

3 participants