workloadccl: relocate to pkg/workload#169746
Open
stevendanna wants to merge 4 commits intocockroachdb:masterfrom
Open
workloadccl: relocate to pkg/workload#169746stevendanna wants to merge 4 commits intocockroachdb:masterfrom
stevendanna wants to merge 4 commits intocockroachdb:masterfrom
Conversation
While here, we also rename some functions since the package name now makes it clear that the types refer to fixtures. Epic: none Release note: None
Epic: none Release note: None
No Sub-package keeps cloud-storage providers (pulled in via pkg/workload/fixture) out of generic workloadcli importers. Misleading "enterprise license required/not required" wording on load/import short descriptions becomes "via RESTORE"/"via IMPORT". Epic: none Release note: None
The aggregator lived under pkg/ccl because it bundled the (then) CCL-only roachmart workload; with roachmart relocated, the aggregator follows. This deletes the last subdirectory of pkg/ccl/workloadccl; the matching CODEOWNERS entry and a stale pkg/cli/cli.go comment are repointed at the new path. Epic: none Release note: None
stevendanna
requested review from
cpj2195 and
herkolategan
and removed request for
a team
Contributor
|
Merging to
After your PR is submitted to the merge queue, this comment will be automatically updated with its status. If the PR fails, failure details will also be posted here |
Member
|
This change is |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Drains
pkg/ccl/workloadccl/topkg/workload/. None of the code inthat tree implements a CCL gate; it lived under
pkg/ccl/forhistorical organizational reasons only.
The four commits each move one piece, in dependency order:
pkg/workload/fixture— fixture/storage core. Drops stutter fromthe public API at the same time (
FixtureConfig->Config,MakeFixture->Make, etc.).pkg/workload/roachmart— the workload generator.pkg/workload/cli/fixturescmd— the cobrafixturessubcommand.Lives in a sub-package of
pkg/workload/cli/so genericworkloadcliimporters don't drag in the cloud-storage providers.pkg/workload/all— the aggregator. Removing this clears the lastsubdirectory of
pkg/ccl/workloadccl/, so the parent goes too.The cherry-pick of workloads in
pkg/cli/cli.go(which intentionallyomits some of the aggregator's set) is preserved; the only update to
that file is repointing the explanatory comment at the new aggregator
path.
Epic: none