This is an automated email from the ASF dual-hosted git repository. francischuang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/calcite-avatica-go.git
commit 127418a0cd0d28c706b9484e2d6cff49df299234 Author: Francis Chuang <francischu...@apache.org> AuthorDate: Thu Apr 9 09:20:23 2020 +1000 [CALCITE-3903] Upgrade protobuf generation dependencies and regenerate avatica protobufs --- docker-compose.yml | 5 +++-- docker.sh | 6 +++++- message/common.pb.go | 4 +++- message/requests.pb.go | 4 +++- message/responses.pb.go | 4 +++- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2bc4572..6234a1d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -92,8 +92,9 @@ services: working_dir: /source command: sh -c "apk --no-cache --no-progress add bash; ./docker.sh compile-protobuf" environment: - AVATICA_VERSION: 1.14.0 - PROTOBUF_VERSION: 3.7.1 + AVATICA_VERSION: 1.16.0 + PROTOBUF_VERSION: 3.11.4 + GLIBC_VERSION: 2.31-r0 volumes: - .:/source - $GOPATH/pkg/mod/cache:/go/pkg/mod/cache \ No newline at end of file diff --git a/docker.sh b/docker.sh index da4fcc4..4cad782 100755 --- a/docker.sh +++ b/docker.sh @@ -562,11 +562,15 @@ compile_protobuf(){ echo "The PROTOBUF_VERSION environment variable must be set to a valid protobuf version" fi + if [ -z "$GLIBC_VERSION" ]; then + echo "The GLIBC_VERSION environment variable must be set to a valid protobuf version" + fi + apk --no-cache add ca-certificates git wget # Install glibc wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub - wget -q -O /tmp/glibc.apk https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.29-r0/glibc-2.29-r0.apk + wget -q -O /tmp/glibc.apk https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk apk add /tmp/glibc.apk diff --git a/message/common.pb.go b/message/common.pb.go index 9cfcc66..76b69c2 100644 --- a/message/common.pb.go +++ b/message/common.pb.go @@ -1607,7 +1607,9 @@ func init() { proto.RegisterType((*QueryState)(nil), "QueryState") } -func init() { proto.RegisterFile("common.proto", fileDescriptor_555bd8c177793206) } +func init() { + proto.RegisterFile("common.proto", fileDescriptor_555bd8c177793206) +} var fileDescriptor_555bd8c177793206 = []byte{ // 2227 bytes of a gzipped FileDescriptorProto diff --git a/message/requests.pb.go b/message/requests.pb.go index dfa3db1..3ee68ae 100644 --- a/message/requests.pb.go +++ b/message/requests.pb.go @@ -1221,7 +1221,9 @@ func init() { proto.RegisterType((*ExecuteBatchRequest)(nil), "ExecuteBatchRequest") } -func init() { proto.RegisterFile("requests.proto", fileDescriptor_9c9ccec99da7c9b4) } +func init() { + proto.RegisterFile("requests.proto", fileDescriptor_9c9ccec99da7c9b4) +} var fileDescriptor_9c9ccec99da7c9b4 = []byte{ // 904 bytes of a gzipped FileDescriptorProto diff --git a/message/responses.pb.go b/message/responses.pb.go index 55525be..0853239 100644 --- a/message/responses.pb.go +++ b/message/responses.pb.go @@ -943,7 +943,9 @@ func init() { proto.RegisterType((*ExecuteBatchResponse)(nil), "ExecuteBatchResponse") } -func init() { proto.RegisterFile("responses.proto", fileDescriptor_2f8192a35440e287) } +func init() { + proto.RegisterFile("responses.proto", fileDescriptor_2f8192a35440e287) +} var fileDescriptor_2f8192a35440e287 = []byte{ // 802 bytes of a gzipped FileDescriptorProto