/cockroach

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

storage: move protos to storagepb #31322

Merged
merged 4 commits into from Oct 13, 2018

Conversation

Reviewers

@tschottdorf tschottdorf

@a-robinson a-robinson

@cockroachdb/core-prs core-prs

@cockroachdb/cli-prs cli-prs

@cockroachdb/sql-execution-prs sql-execution-prs

@cockroachdb/sql-planning-prs sql-planning-prs

@cockroachdb/admin-ui-prs admin-ui-prs

@cockroachdb/sql-bulk-prs sql-bulk-prs

@benesch benesch

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@jordanlewis @cockroach-teamcity @tschottdorf @a-robinson
@jordanlewis
Member

jordanlewis commented Oct 12, 2018

This is a mechanical change that moves the protobufs that used to live
in storage to a new package, storagepb. The purpose of this change is to
permit packages (such as sql) that need just protobuf definitions in
storage to not have to depend on the whole storage package.

First 2 commits are #31309.

Updates #30001.

Release note: None

@jordanlewis jordanlewis requested review from benesch, tschottdorf and a-robinson Oct 12, 2018

@jordanlewis jordanlewis requested review from cockroachdb/cli-prs as code owners Oct 12, 2018

@cockroach-teamcity

This comment has been minimized.

Show comment
Hide comment
@cockroach-teamcity

cockroach-teamcity Oct 12, 2018

Member

This change is Reviewable
Member

cockroach-teamcity commented Oct 12, 2018

This change is Reviewable
@a-robinson

a-robinson reviewed Oct 12, 2018
View changes

:lgtm:

Reviewed 17 of 17 files at r1, 1 of 1 files at r2, 41 of 41 files at r3.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale)

pkg/storage/client_raft_test.go, line 261 at r3 (raw file):

		},
		repl.Desc(),
		storagepb.reasonrangeUnderReplicated,

I think your renamer got overzealous with this? reasonrangeUnderReplicated is both an unexported name and the r in Range should be capitalized regardless.

@jordanlewis jordanlewis requested a review from cockroachdb/sql-bulk-prs as a code owner Oct 12, 2018

@jordanlewis jordanlewis requested a review from cockroachdb/admin-ui-prs as a code owner Oct 12, 2018

@tschottdorf

tschottdorf approved these changes Oct 12, 2018
View changes

:lgtm:

Reviewed 3 of 17 files at r1, 11 of 54 files at r4, 2 of 2 files at r5, 36 of 43 files at r6, 36 of 36 files at r7.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 2 stale)

pkg/storage/replica_proposal.go, line 26 at r7 (raw file):

	"unsafe"

	"github.com/cockroachdb/cockroach/pkg/storage/storagepb"

We agreed we weren't gonna worry about this, right?

@jordanlewis

This comment has been minimized.

Show comment
Hide comment
@jordanlewis

jordanlewis Oct 12, 2018

Member

We agreed we weren't gonna worry about this, right?

Yes. But now that Nikhil's merged cockroachdb/crlfmt#22, I'll run that :)
Member

jordanlewis commented Oct 12, 2018

We agreed we weren't gonna worry about this, right?

Yes. But now that Nikhil's merged cockroachdb/crlfmt#22, I'll run that :)

@jordanlewis jordanlewis dismissed a-robinson’s stale review Oct 12, 2018

Done.

@jordanlewis

This comment has been minimized.

Show comment
Hide comment
@jordanlewis

jordanlewis Oct 12, 2018

Member

TFTRs!

bors r+
Member

jordanlewis commented Oct 12, 2018

TFTRs!

bors r+
@craig

This comment has been minimized.

Show comment
Hide comment
@craig

craig bot Oct 12, 2018

Merge conflict (retrying...)

craig bot commented Oct 12, 2018

Merge conflict (retrying...)
@craig

This comment has been minimized.

Show comment
Hide comment
@craig

craig bot Oct 12, 2018

Merge conflict

craig bot commented Oct 12, 2018

Merge conflict

jordanlewis added some commits Oct 12, 2018

@jordanlewis
*: move server/status -> server/status/statuspb 
This allows dependents of the protobufs in server/status to not have to
depend on server/status.

Release note: None
Verified
This commit was signed with a verified signature.
@jordanlewis jordanlewis Jordan Lewis
GPG key ID: CB92F5D43A08059A Learn about signing commits
2b5799d
@jordanlewis
sql: remove dependency on server/status 
We were importing server/status to get the MetricsRecorder struct, but
we only use one method on it. Remove that edge by adding a narrowed
interface, local to sql.

Release note: None
Verified
This commit was signed with a verified signature.
@jordanlewis jordanlewis Jordan Lewis
GPG key ID: CB92F5D43A08059A Learn about signing commits
526a947
@jordanlewis
storage: move protos to storagepb 
This is a mechanical change that moves the protobufs that used to live
in storage to a new package, storagepb. The purpose of this change is to
permit packages (such as sql) that need just protobuf definitions in
storage to not have to depend on the whole storage package.

Release note: None
Verified
This commit was signed with a verified signature.
@jordanlewis jordanlewis Jordan Lewis
GPG key ID: CB92F5D43A08059A Learn about signing commits
a6c788a
@jordanlewis
storage: move protos from storagebase to storagepb 
... to be like other packages in CockroachDB, which keep their protos in
a "foopb" package.

Release note: None
Verified
This commit was signed with a verified signature.
@jordanlewis jordanlewis Jordan Lewis
GPG key ID: CB92F5D43A08059A Learn about signing commits
Loading status checks…
a49eaef
@jordanlewis

This comment has been minimized.

Show comment
Hide comment
@jordanlewis

jordanlewis Oct 13, 2018

Member

bors r+
Member

jordanlewis commented Oct 13, 2018

bors r+
@craig

This comment has been minimized.

Show comment
Hide comment
@craig

craig bot Oct 13, 2018

Merge conflict (retrying...)

craig bot commented Oct 13, 2018

Merge conflict (retrying...)

craig bot pushed a commit that referenced this pull request Oct 13, 2018

craig[bot] @jordanlewis
Merge #31322 
31322: storage: move protos to storagepb r=jordanlewis a=jordanlewis

This is a mechanical change that moves the protobufs that used to live
in storage to a new package, storagepb. The purpose of this change is to
permit packages (such as sql) that need just protobuf definitions in
storage to not have to depend on the whole storage package.

First 2 commits are #31309.

Updates #30001.

Release note: None

Co-authored-by: Jordan Lewis <jordanthelewis@gmail.com>
Loading status checks…
3e1c440
@craig

This comment has been minimized.

Show comment
Hide comment
@craig

craig bot Oct 13, 2018

Build succeeded

craig bot commented Oct 13, 2018

Build succeeded

@craig craig bot merged commit a49eaef into cockroachdb:master Oct 13, 2018
3 checks passed

3 checks passed

GitHub CI (Cockroach) TeamCity build finished
Details
bors Build succeeded
Details
license/cla Contributor License Agreement is signed.
Details

@jordanlewis jordanlewis deleted the jordanlewis:storagepb branch Oct 13, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment