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.

Sign up for GitHub

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

release-19.1: distsqlpb: rename protos back to distsqlrun #36573

Merged
merged 1 commit into from
Apr 5, 2019
Merged

release-19.1: distsqlpb: rename protos back to distsqlrun #36573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 100 additions & 94 deletions pkg/sql/distsqlpb/api.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion pkg/sql/distsqlpb/api.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
// APIs for distributed SQL; see docs/RFCS/distributed_sql.md

syntax = "proto2";
package cockroach.sql.distsqlpb;
// Beware! This package name must not be changed, even though it doesn't match
// the Go package name, because it defines the Protobuf message names which
// can't be changed without breaking backward compatibility.
package cockroach.sql.distsqlrun;
option go_package = "distsqlpb";

import "gogoproto/gogo.proto";
Expand Down
340 changes: 173 additions & 167 deletions pkg/sql/distsqlpb/data.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion pkg/sql/distsqlpb/data.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
// All the concepts here are "physical plan" concepts.

syntax = "proto2";
package cockroach.sql.distsqlpb;
// Beware! This package name must not be changed, even though it doesn't match
// the Go package name, because it defines the Protobuf message names which
// can't be changed without breaking backward compatibility.
package cockroach.sql.distsqlrun;
option go_package = "distsqlpb";

import "jobs/jobspb/jobs.proto";
Expand Down
754 changes: 380 additions & 374 deletions pkg/sql/distsqlpb/processors.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion pkg/sql/distsqlpb/processors.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
// All the concepts here are "physical plan" concepts.

syntax = "proto2";
package cockroach.sql.distsqlpb;
// Beware! This package name must not be changed, even though it doesn't match
// the Go package name, because it defines the Protobuf message names which
// can't be changed without breaking backward compatibility.
package cockroach.sql.distsqlrun;
option go_package = "distsqlpb";

import "jobs/jobspb/jobs.proto";
Expand Down
4 changes: 2 additions & 2 deletions pkg/sql/trace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func TestTrace(t *testing.T) {
// Depending on whether the data is local or not, we may not see these
// spans.
optionalSpans: []string{
"/cockroach.sql.distsqlpb.DistSQL/SetupFlow",
"/cockroach.sql.distsqlrun.DistSQL/SetupFlow",
"noop",
},
},
Expand Down Expand Up @@ -201,7 +201,7 @@ func TestTrace(t *testing.T) {
// Depending on whether the data is local or not, we may not see these
// spans.
optionalSpans: []string{
"/cockroach.sql.distsqlpb.DistSQL/SetupFlow",
"/cockroach.sql.distsqlrun.DistSQL/SetupFlow",
"noop",
},
},
Expand Down