Fix protobuf regeneration script. #5291
Merged
Conversation
This file contains 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
Need to explicitly include --proto_path /usr/local/include in order to pick up the standard protobuf files.
parasssh
approved these changes
Apr 24, 2020
There was a problem hiding this comment.
Reviewable status: 0 of 1 files reviewed, 2 unresolved discussions (waiting on @danielmai and @manishrjain)
a discussion (no related file):
protos/Makefile, line 46 at r1 (raw file):
@protoc \ --proto_path=/usr/local/include \ --proto_path=${PROTO_PATH} \
Formatting looks odd.
martinmr
reviewed
Apr 24, 2020
There was a problem hiding this comment.
It fixes it on my machine but it changes the go.mod and go.sum files.
Reviewable status: 0 of 1 files reviewed, 2 unresolved discussions (waiting on @danielmai and @manishrjain)
martinmr
approved these changes
Apr 24, 2020
There was a problem hiding this comment.
Reviewed 1 of 1 files at r1.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @danielmai and @manishrjain)
Unlike go get, go install does not update the dependency version in go.mod.
parasssh
approved these changes
Apr 24, 2020
danielmai
commented
Apr 24, 2020
There was a problem hiding this comment.
Reviewable status: 0 of 3 files reviewed, 2 unresolved discussions (waiting on @manishrjain, @martinmr, and @parasssh)
a discussion (no related file):
Previously, parasssh wrote…
:lgtm: minor comment below.
Done.
protos/Makefile, line 46 at r1 (raw file):
Previously, parasssh wrote…
Formatting looks odd.
Done.
danielmai
added a commit
that referenced
this pull request
Apr 24, 2020
release/v20.03-specific change: use dgo/v2 instead of dgo/v200.
This fixes the make regenerate command that should create the generated
protobuf code.
1. make regenerate fails to run (error log attached in PR)
2. The protobuf dependencies are unintentionally updated to the latest
version.
3. It was referencing protobuf definitions from GOPATH. So, if a package
was not updated to the right version (e.g., updating
github.com/dgraph-io/badger to the latest master), then there could
be errors like the following when referencing the wrong version of a
proto:
pb.proto:285:18: "badgerpb2.KV" is not defined.
pb.proto:297:11: "badgerpb2.KV" is not defined.
pb.proto:545:5: "badgerpb2.KVList" is not defined.
pb.proto:537:60: "badgerpb2.KVList" is not defined.
pb.proto:28:1: warning: Import github.com/dgraph-io/badger/pb/pb.proto is unused.
Changes
* Include proto path /usr/local/include in protoc command to fix (1).
* Update depcheck.sh to check that this directory exists. Error out with
installation instructions otherwise if it's missing.
* Install protobuf libraries from the versions in go.mod, and use go install
instead of go get so the protobuf versions aren't updated automatically to fix
(2).
* Copy to temporary directory for proper import paths from go mod versions to
remove any dependencies on $GOPATH to fix (3).
* protos from proto library
* proto from badger
* proto from dgo
* Regenerate protos
danielmai
added a commit
that referenced
this pull request
Apr 24, 2020
release/v20.03-specific change: use dgo/v2 instead of dgo/v200.
This fixes the make regenerate command that should create the generated
protobuf code.
1. make regenerate fails to run (error log attached in PR)
2. The protobuf dependencies are unintentionally updated to the latest
version.
3. It was referencing protobuf definitions from GOPATH. So, if a package
was not updated to the right version (e.g., updating
github.com/dgraph-io/badger to the latest master), then there could
be errors like the following when referencing the wrong version of a
proto:
pb.proto:285:18: "badgerpb2.KV" is not defined.
pb.proto:297:11: "badgerpb2.KV" is not defined.
pb.proto:545:5: "badgerpb2.KVList" is not defined.
pb.proto:537:60: "badgerpb2.KVList" is not defined.
pb.proto:28:1: warning: Import github.com/dgraph-io/badger/pb/pb.proto is unused.
Changes
* Include proto path /usr/local/include in protoc command to fix (1).
* Update depcheck.sh to check that this directory exists. Error out with
installation instructions otherwise if it's missing.
* Install protobuf libraries from the versions in go.mod, and use go install
instead of go get so the protobuf versions aren't updated automatically to fix
(2).
* Copy to temporary directory for proper import paths from go mod versions to
remove any dependencies on $GOPATH to fix (3).
* protos from proto library
* proto from badger
* proto from dgo
* Regenerate protos
danielmai
added a commit
that referenced
this pull request
Apr 24, 2020
release/v1.2-specific change: use dgo/v2.
This fixes the make regenerate command that should create the generated
protobuf code.
1. make regenerate fails to run (error log attached in PR)
2. The protobuf dependencies are unintentionally updated to the latest
version.
3. It was referencing protobuf definitions from GOPATH. So, if a package
was not updated to the right version (e.g., updating
github.com/dgraph-io/badger to the latest master), then there could
be errors like the following when referencing the wrong version of a
proto:
pb.proto:285:18: "badgerpb2.KV" is not defined.
pb.proto:297:11: "badgerpb2.KV" is not defined.
pb.proto:545:5: "badgerpb2.KVList" is not defined.
pb.proto:537:60: "badgerpb2.KVList" is not defined.
pb.proto:28:1: warning: Import github.com/dgraph-io/badger/pb/pb.proto is unused.
Changes
* Include proto path /usr/local/include in protoc command to fix (1).
* Update depcheck.sh to check that this directory exists. Error out with
installation instructions otherwise if it's missing.
* Install protobuf libraries from the versions in go.mod, and use go install
instead of go get so the protobuf versions aren't updated automatically to fix
(2).
* Copy to temporary directory for proper import paths from go mod versions to
remove any dependencies on $GOPATH to fix (3).
* protos from proto library
* proto from badger
* proto from dgo
* Regenerate protos
danielmai
added a commit
that referenced
this pull request
Apr 24, 2020
release/v1.2-specific change: use dgo/v2.
This fixes the make regenerate command that should create the generated
protobuf code.
1. make regenerate fails to run (error log attached in PR)
2. The protobuf dependencies are unintentionally updated to the latest
version.
3. It was referencing protobuf definitions from GOPATH. So, if a package
was not updated to the right version (e.g., updating
github.com/dgraph-io/badger to the latest master), then there could
be errors like the following when referencing the wrong version of a
proto:
pb.proto:285:18: "badgerpb2.KV" is not defined.
pb.proto:297:11: "badgerpb2.KV" is not defined.
pb.proto:545:5: "badgerpb2.KVList" is not defined.
pb.proto:537:60: "badgerpb2.KVList" is not defined.
pb.proto:28:1: warning: Import github.com/dgraph-io/badger/pb/pb.proto is unused.
Changes
* Include proto path /usr/local/include in protoc command to fix (1).
* Update depcheck.sh to check that this directory exists. Error out with
installation instructions otherwise if it's missing.
* Install protobuf libraries from the versions in go.mod, and use go install
instead of go get so the protobuf versions aren't updated automatically to fix
(2).
* Copy to temporary directory for proper import paths from go mod versions to
remove any dependencies on $GOPATH to fix (3).
* protos from proto library
* proto from badger
* proto from dgo
* Regenerate protos
dna2github
pushed a commit
to dna2fork/dgraph
that referenced
this pull request
Jul 18, 2020
This fixes the make regenerate command that should create the generated
protobuf code.
1. make regenerate fails to run (error log attached in PR)
2. The protobuf dependencies are unintentionally updated to the latest
version.
3. It was referencing protobuf definitions from GOPATH. So, if a package
was not updated to the right version (e.g., updating
github.com/dgraph-io/badger to the latest master), then there could
be errors like the following when referencing the wrong version of a
proto:
pb.proto:285:18: "badgerpb2.KV" is not defined.
pb.proto:297:11: "badgerpb2.KV" is not defined.
pb.proto:545:5: "badgerpb2.KVList" is not defined.
pb.proto:537:60: "badgerpb2.KVList" is not defined.
pb.proto:28:1: warning: Import github.com/dgraph-io/badger/pb/pb.proto is unused.
Changes
* Include proto path /usr/local/include in protoc command to fix (1).
* Update depcheck.sh to check that this directory exists. Error out with
installation instructions otherwise if it's missing.
* Install protobuf libraries from the versions in go.mod, and use go install
instead of go get so the protobuf versions aren't updated automatically to fix
(2).
* Copy to temporary directory for proper import paths from go mod versions to
remove any dependencies on $GOPATH to fix (3).
* protos from proto library
* proto from badger
* proto from dgo
* Regenerate protos
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In master, the
make regeneratecommand that should create the generated protobuf code doesn't work:make regeneratefails to run, showing the following error messages:make regenerateerror logThe protobuf dependencies are updated in the latest version, which is not intended.
It was referencing protobuf definitions from GOPATH. So, if a package was not updated to the right version (e.g., updating
github.com/dgraph-io/badgerto the latest master), then there could be errors like these:Changes
go installinstead ofgo getso the protobuf versions aren't updated automatically to fix (2).$GOPATHto fix (3).This change is