From 77959ad20440e778ad4513802832752ab8a55337 Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Thu, 15 Aug 2019 11:48:23 -0700 Subject: [PATCH] proto: Makefile: Make pb.go generation more hermetic by using golang-protobuf submodule for proto-gen-go. --- .gitmodules | 3 + .../remotesapi_v1alpha1/chunkstore.pb.go | 458 ++++++++---------- .../remotesapi_v1alpha1/credentials.pb.go | 83 ++-- go/go.mod | 2 + proto/Makefile | 10 +- proto/third_party/golang-protobuf | 1 + 6 files changed, 258 insertions(+), 299 deletions(-) create mode 160000 proto/third_party/golang-protobuf diff --git a/.gitmodules b/.gitmodules index 9f844a3a2e..169b385bac 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "proto/third_party/googleapis"] path = proto/third_party/googleapis url = git@github.com:googleapis/googleapis.git +[submodule "proto/third_party/golang-protobuf"] + path = proto/third_party/golang-protobuf + url = https://github.com/golang/protobuf.git diff --git a/go/gen/proto/dolt/services/remotesapi_v1alpha1/chunkstore.pb.go b/go/gen/proto/dolt/services/remotesapi_v1alpha1/chunkstore.pb.go index cd0cda525b..df589da01b 100644 --- a/go/gen/proto/dolt/services/remotesapi_v1alpha1/chunkstore.pb.go +++ b/go/gen/proto/dolt/services/remotesapi_v1alpha1/chunkstore.pb.go @@ -1,15 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: dolt/services/remotesapi/v1alpha1/chunkstore.proto -package remotesapi // import "dolt/services/remotesapi_v1alpha1" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +package remotesapi import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -21,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type RepoId struct { Org string `protobuf:"bytes,1,opt,name=org,proto3" json:"org,omitempty"` @@ -35,16 +36,17 @@ func (m *RepoId) Reset() { *m = RepoId{} } func (m *RepoId) String() string { return proto.CompactTextString(m) } func (*RepoId) ProtoMessage() {} func (*RepoId) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{0} + return fileDescriptor_702c187af9ca94ec, []int{0} } + func (m *RepoId) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RepoId.Unmarshal(m, b) } func (m *RepoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RepoId.Marshal(b, m, deterministic) } -func (dst *RepoId) XXX_Merge(src proto.Message) { - xxx_messageInfo_RepoId.Merge(dst, src) +func (m *RepoId) XXX_Merge(src proto.Message) { + xxx_messageInfo_RepoId.Merge(m, src) } func (m *RepoId) XXX_Size() int { return xxx_messageInfo_RepoId.Size(m) @@ -81,16 +83,17 @@ func (m *HasChunksRequest) Reset() { *m = HasChunksRequest{} } func (m *HasChunksRequest) String() string { return proto.CompactTextString(m) } func (*HasChunksRequest) ProtoMessage() {} func (*HasChunksRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{1} + return fileDescriptor_702c187af9ca94ec, []int{1} } + func (m *HasChunksRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HasChunksRequest.Unmarshal(m, b) } func (m *HasChunksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_HasChunksRequest.Marshal(b, m, deterministic) } -func (dst *HasChunksRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_HasChunksRequest.Merge(dst, src) +func (m *HasChunksRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_HasChunksRequest.Merge(m, src) } func (m *HasChunksRequest) XXX_Size() int { return xxx_messageInfo_HasChunksRequest.Size(m) @@ -126,16 +129,17 @@ func (m *HasChunksResponse) Reset() { *m = HasChunksResponse{} } func (m *HasChunksResponse) String() string { return proto.CompactTextString(m) } func (*HasChunksResponse) ProtoMessage() {} func (*HasChunksResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{2} + return fileDescriptor_702c187af9ca94ec, []int{2} } + func (m *HasChunksResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HasChunksResponse.Unmarshal(m, b) } func (m *HasChunksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_HasChunksResponse.Marshal(b, m, deterministic) } -func (dst *HasChunksResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_HasChunksResponse.Merge(dst, src) +func (m *HasChunksResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_HasChunksResponse.Merge(m, src) } func (m *HasChunksResponse) XXX_Size() int { return xxx_messageInfo_HasChunksResponse.Size(m) @@ -165,16 +169,17 @@ func (m *HttpGetChunk) Reset() { *m = HttpGetChunk{} } func (m *HttpGetChunk) String() string { return proto.CompactTextString(m) } func (*HttpGetChunk) ProtoMessage() {} func (*HttpGetChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{3} + return fileDescriptor_702c187af9ca94ec, []int{3} } + func (m *HttpGetChunk) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HttpGetChunk.Unmarshal(m, b) } func (m *HttpGetChunk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_HttpGetChunk.Marshal(b, m, deterministic) } -func (dst *HttpGetChunk) XXX_Merge(src proto.Message) { - xxx_messageInfo_HttpGetChunk.Merge(dst, src) +func (m *HttpGetChunk) XXX_Merge(src proto.Message) { + xxx_messageInfo_HttpGetChunk.Merge(m, src) } func (m *HttpGetChunk) XXX_Size() int { return xxx_messageInfo_HttpGetChunk.Size(m) @@ -212,16 +217,17 @@ func (m *RangeChunk) Reset() { *m = RangeChunk{} } func (m *RangeChunk) String() string { return proto.CompactTextString(m) } func (*RangeChunk) ProtoMessage() {} func (*RangeChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{4} + return fileDescriptor_702c187af9ca94ec, []int{4} } + func (m *RangeChunk) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RangeChunk.Unmarshal(m, b) } func (m *RangeChunk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RangeChunk.Marshal(b, m, deterministic) } -func (dst *RangeChunk) XXX_Merge(src proto.Message) { - xxx_messageInfo_RangeChunk.Merge(dst, src) +func (m *RangeChunk) XXX_Merge(src proto.Message) { + xxx_messageInfo_RangeChunk.Merge(m, src) } func (m *RangeChunk) XXX_Size() int { return xxx_messageInfo_RangeChunk.Size(m) @@ -265,16 +271,17 @@ func (m *HttpGetRange) Reset() { *m = HttpGetRange{} } func (m *HttpGetRange) String() string { return proto.CompactTextString(m) } func (*HttpGetRange) ProtoMessage() {} func (*HttpGetRange) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{5} + return fileDescriptor_702c187af9ca94ec, []int{5} } + func (m *HttpGetRange) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HttpGetRange.Unmarshal(m, b) } func (m *HttpGetRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_HttpGetRange.Marshal(b, m, deterministic) } -func (dst *HttpGetRange) XXX_Merge(src proto.Message) { - xxx_messageInfo_HttpGetRange.Merge(dst, src) +func (m *HttpGetRange) XXX_Merge(src proto.Message) { + xxx_messageInfo_HttpGetRange.Merge(m, src) } func (m *HttpGetRange) XXX_Size() int { return xxx_messageInfo_HttpGetRange.Size(m) @@ -313,16 +320,17 @@ func (m *DownloadLoc) Reset() { *m = DownloadLoc{} } func (m *DownloadLoc) String() string { return proto.CompactTextString(m) } func (*DownloadLoc) ProtoMessage() {} func (*DownloadLoc) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{6} + return fileDescriptor_702c187af9ca94ec, []int{6} } + func (m *DownloadLoc) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DownloadLoc.Unmarshal(m, b) } func (m *DownloadLoc) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DownloadLoc.Marshal(b, m, deterministic) } -func (dst *DownloadLoc) XXX_Merge(src proto.Message) { - xxx_messageInfo_DownloadLoc.Merge(dst, src) +func (m *DownloadLoc) XXX_Merge(src proto.Message) { + xxx_messageInfo_DownloadLoc.Merge(m, src) } func (m *DownloadLoc) XXX_Size() int { return xxx_messageInfo_DownloadLoc.Size(m) @@ -370,80 +378,14 @@ func (m *DownloadLoc) GetHttpGetRange() *HttpGetRange { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*DownloadLoc) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _DownloadLoc_OneofMarshaler, _DownloadLoc_OneofUnmarshaler, _DownloadLoc_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*DownloadLoc) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*DownloadLoc_HttpGet)(nil), (*DownloadLoc_HttpGetRange)(nil), } } -func _DownloadLoc_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*DownloadLoc) - // location - switch x := m.Location.(type) { - case *DownloadLoc_HttpGet: - b.EncodeVarint(1<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.HttpGet); err != nil { - return err - } - case *DownloadLoc_HttpGetRange: - b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.HttpGetRange); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("DownloadLoc.Location has unexpected type %T", x) - } - return nil -} - -func _DownloadLoc_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*DownloadLoc) - switch tag { - case 1: // location.http_get - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(HttpGetChunk) - err := b.DecodeMessage(msg) - m.Location = &DownloadLoc_HttpGet{msg} - return true, err - case 2: // location.http_get_range - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(HttpGetRange) - err := b.DecodeMessage(msg) - m.Location = &DownloadLoc_HttpGetRange{msg} - return true, err - default: - return false, nil - } -} - -func _DownloadLoc_OneofSizer(msg proto.Message) (n int) { - m := msg.(*DownloadLoc) - // location - switch x := m.Location.(type) { - case *DownloadLoc_HttpGet: - s := proto.Size(x.HttpGet) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *DownloadLoc_HttpGetRange: - s := proto.Size(x.HttpGetRange) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type HttpPostChunk struct { Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -455,16 +397,17 @@ func (m *HttpPostChunk) Reset() { *m = HttpPostChunk{} } func (m *HttpPostChunk) String() string { return proto.CompactTextString(m) } func (*HttpPostChunk) ProtoMessage() {} func (*HttpPostChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{7} + return fileDescriptor_702c187af9ca94ec, []int{7} } + func (m *HttpPostChunk) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HttpPostChunk.Unmarshal(m, b) } func (m *HttpPostChunk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_HttpPostChunk.Marshal(b, m, deterministic) } -func (dst *HttpPostChunk) XXX_Merge(src proto.Message) { - xxx_messageInfo_HttpPostChunk.Merge(dst, src) +func (m *HttpPostChunk) XXX_Merge(src proto.Message) { + xxx_messageInfo_HttpPostChunk.Merge(m, src) } func (m *HttpPostChunk) XXX_Size() int { return xxx_messageInfo_HttpPostChunk.Size(m) @@ -496,16 +439,17 @@ func (m *UploadLoc) Reset() { *m = UploadLoc{} } func (m *UploadLoc) String() string { return proto.CompactTextString(m) } func (*UploadLoc) ProtoMessage() {} func (*UploadLoc) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{8} + return fileDescriptor_702c187af9ca94ec, []int{8} } + func (m *UploadLoc) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UploadLoc.Unmarshal(m, b) } func (m *UploadLoc) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UploadLoc.Marshal(b, m, deterministic) } -func (dst *UploadLoc) XXX_Merge(src proto.Message) { - xxx_messageInfo_UploadLoc.Merge(dst, src) +func (m *UploadLoc) XXX_Merge(src proto.Message) { + xxx_messageInfo_UploadLoc.Merge(m, src) } func (m *UploadLoc) XXX_Size() int { return xxx_messageInfo_UploadLoc.Size(m) @@ -547,61 +491,13 @@ func (m *UploadLoc) GetHttpPost() *HttpPostChunk { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*UploadLoc) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _UploadLoc_OneofMarshaler, _UploadLoc_OneofUnmarshaler, _UploadLoc_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*UploadLoc) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*UploadLoc_HttpPost)(nil), } } -func _UploadLoc_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*UploadLoc) - // location - switch x := m.Location.(type) { - case *UploadLoc_HttpPost: - b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.HttpPost); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("UploadLoc.Location has unexpected type %T", x) - } - return nil -} - -func _UploadLoc_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*UploadLoc) - switch tag { - case 2: // location.http_post - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(HttpPostChunk) - err := b.DecodeMessage(msg) - m.Location = &UploadLoc_HttpPost{msg} - return true, err - default: - return false, nil - } -} - -func _UploadLoc_OneofSizer(msg proto.Message) (n int) { - m := msg.(*UploadLoc) - // location - switch x := m.Location.(type) { - case *UploadLoc_HttpPost: - s := proto.Size(x.HttpPost) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type GetDownloadLocsRequest struct { RepoId *RepoId `protobuf:"bytes,1,opt,name=repo_id,json=repoId,proto3" json:"repo_id,omitempty"` Hashes [][]byte `protobuf:"bytes,2,rep,name=hashes,proto3" json:"hashes,omitempty"` @@ -614,16 +510,17 @@ func (m *GetDownloadLocsRequest) Reset() { *m = GetDownloadLocsRequest{} func (m *GetDownloadLocsRequest) String() string { return proto.CompactTextString(m) } func (*GetDownloadLocsRequest) ProtoMessage() {} func (*GetDownloadLocsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{9} + return fileDescriptor_702c187af9ca94ec, []int{9} } + func (m *GetDownloadLocsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetDownloadLocsRequest.Unmarshal(m, b) } func (m *GetDownloadLocsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetDownloadLocsRequest.Marshal(b, m, deterministic) } -func (dst *GetDownloadLocsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetDownloadLocsRequest.Merge(dst, src) +func (m *GetDownloadLocsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetDownloadLocsRequest.Merge(m, src) } func (m *GetDownloadLocsRequest) XXX_Size() int { return xxx_messageInfo_GetDownloadLocsRequest.Size(m) @@ -659,16 +556,17 @@ func (m *GetDownloadLocsResponse) Reset() { *m = GetDownloadLocsResponse func (m *GetDownloadLocsResponse) String() string { return proto.CompactTextString(m) } func (*GetDownloadLocsResponse) ProtoMessage() {} func (*GetDownloadLocsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{10} + return fileDescriptor_702c187af9ca94ec, []int{10} } + func (m *GetDownloadLocsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetDownloadLocsResponse.Unmarshal(m, b) } func (m *GetDownloadLocsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetDownloadLocsResponse.Marshal(b, m, deterministic) } -func (dst *GetDownloadLocsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetDownloadLocsResponse.Merge(dst, src) +func (m *GetDownloadLocsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetDownloadLocsResponse.Merge(m, src) } func (m *GetDownloadLocsResponse) XXX_Size() int { return xxx_messageInfo_GetDownloadLocsResponse.Size(m) @@ -698,16 +596,17 @@ func (m *GetUploadLocsRequest) Reset() { *m = GetUploadLocsRequest{} } func (m *GetUploadLocsRequest) String() string { return proto.CompactTextString(m) } func (*GetUploadLocsRequest) ProtoMessage() {} func (*GetUploadLocsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{11} + return fileDescriptor_702c187af9ca94ec, []int{11} } + func (m *GetUploadLocsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUploadLocsRequest.Unmarshal(m, b) } func (m *GetUploadLocsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetUploadLocsRequest.Marshal(b, m, deterministic) } -func (dst *GetUploadLocsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetUploadLocsRequest.Merge(dst, src) +func (m *GetUploadLocsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUploadLocsRequest.Merge(m, src) } func (m *GetUploadLocsRequest) XXX_Size() int { return xxx_messageInfo_GetUploadLocsRequest.Size(m) @@ -743,16 +642,17 @@ func (m *GetUploadLocsResponse) Reset() { *m = GetUploadLocsResponse{} } func (m *GetUploadLocsResponse) String() string { return proto.CompactTextString(m) } func (*GetUploadLocsResponse) ProtoMessage() {} func (*GetUploadLocsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{12} + return fileDescriptor_702c187af9ca94ec, []int{12} } + func (m *GetUploadLocsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUploadLocsResponse.Unmarshal(m, b) } func (m *GetUploadLocsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetUploadLocsResponse.Marshal(b, m, deterministic) } -func (dst *GetUploadLocsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetUploadLocsResponse.Merge(dst, src) +func (m *GetUploadLocsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUploadLocsResponse.Merge(m, src) } func (m *GetUploadLocsResponse) XXX_Size() int { return xxx_messageInfo_GetUploadLocsResponse.Size(m) @@ -781,16 +681,17 @@ func (m *RebaseRequest) Reset() { *m = RebaseRequest{} } func (m *RebaseRequest) String() string { return proto.CompactTextString(m) } func (*RebaseRequest) ProtoMessage() {} func (*RebaseRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{13} + return fileDescriptor_702c187af9ca94ec, []int{13} } + func (m *RebaseRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RebaseRequest.Unmarshal(m, b) } func (m *RebaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RebaseRequest.Marshal(b, m, deterministic) } -func (dst *RebaseRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RebaseRequest.Merge(dst, src) +func (m *RebaseRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RebaseRequest.Merge(m, src) } func (m *RebaseRequest) XXX_Size() int { return xxx_messageInfo_RebaseRequest.Size(m) @@ -818,16 +719,17 @@ func (m *RebaseResponse) Reset() { *m = RebaseResponse{} } func (m *RebaseResponse) String() string { return proto.CompactTextString(m) } func (*RebaseResponse) ProtoMessage() {} func (*RebaseResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{14} + return fileDescriptor_702c187af9ca94ec, []int{14} } + func (m *RebaseResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RebaseResponse.Unmarshal(m, b) } func (m *RebaseResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RebaseResponse.Marshal(b, m, deterministic) } -func (dst *RebaseResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_RebaseResponse.Merge(dst, src) +func (m *RebaseResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_RebaseResponse.Merge(m, src) } func (m *RebaseResponse) XXX_Size() int { return xxx_messageInfo_RebaseResponse.Size(m) @@ -849,16 +751,17 @@ func (m *RootRequest) Reset() { *m = RootRequest{} } func (m *RootRequest) String() string { return proto.CompactTextString(m) } func (*RootRequest) ProtoMessage() {} func (*RootRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{15} + return fileDescriptor_702c187af9ca94ec, []int{15} } + func (m *RootRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RootRequest.Unmarshal(m, b) } func (m *RootRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RootRequest.Marshal(b, m, deterministic) } -func (dst *RootRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RootRequest.Merge(dst, src) +func (m *RootRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RootRequest.Merge(m, src) } func (m *RootRequest) XXX_Size() int { return xxx_messageInfo_RootRequest.Size(m) @@ -887,16 +790,17 @@ func (m *RootResponse) Reset() { *m = RootResponse{} } func (m *RootResponse) String() string { return proto.CompactTextString(m) } func (*RootResponse) ProtoMessage() {} func (*RootResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{16} + return fileDescriptor_702c187af9ca94ec, []int{16} } + func (m *RootResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RootResponse.Unmarshal(m, b) } func (m *RootResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RootResponse.Marshal(b, m, deterministic) } -func (dst *RootResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_RootResponse.Merge(dst, src) +func (m *RootResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_RootResponse.Merge(m, src) } func (m *RootResponse) XXX_Size() int { return xxx_messageInfo_RootResponse.Size(m) @@ -926,16 +830,17 @@ func (m *ChunkTableInfo) Reset() { *m = ChunkTableInfo{} } func (m *ChunkTableInfo) String() string { return proto.CompactTextString(m) } func (*ChunkTableInfo) ProtoMessage() {} func (*ChunkTableInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{17} + return fileDescriptor_702c187af9ca94ec, []int{17} } + func (m *ChunkTableInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ChunkTableInfo.Unmarshal(m, b) } func (m *ChunkTableInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ChunkTableInfo.Marshal(b, m, deterministic) } -func (dst *ChunkTableInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_ChunkTableInfo.Merge(dst, src) +func (m *ChunkTableInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_ChunkTableInfo.Merge(m, src) } func (m *ChunkTableInfo) XXX_Size() int { return xxx_messageInfo_ChunkTableInfo.Size(m) @@ -975,16 +880,17 @@ func (m *CommitRequest) Reset() { *m = CommitRequest{} } func (m *CommitRequest) String() string { return proto.CompactTextString(m) } func (*CommitRequest) ProtoMessage() {} func (*CommitRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{18} + return fileDescriptor_702c187af9ca94ec, []int{18} } + func (m *CommitRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommitRequest.Unmarshal(m, b) } func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic) } -func (dst *CommitRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CommitRequest.Merge(dst, src) +func (m *CommitRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommitRequest.Merge(m, src) } func (m *CommitRequest) XXX_Size() int { return xxx_messageInfo_CommitRequest.Size(m) @@ -1041,16 +947,17 @@ func (m *CommitResponse) Reset() { *m = CommitResponse{} } func (m *CommitResponse) String() string { return proto.CompactTextString(m) } func (*CommitResponse) ProtoMessage() {} func (*CommitResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{19} + return fileDescriptor_702c187af9ca94ec, []int{19} } + func (m *CommitResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommitResponse.Unmarshal(m, b) } func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic) } -func (dst *CommitResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_CommitResponse.Merge(dst, src) +func (m *CommitResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommitResponse.Merge(m, src) } func (m *CommitResponse) XXX_Size() int { return xxx_messageInfo_CommitResponse.Size(m) @@ -1080,16 +987,17 @@ func (m *GetRepoMetadataRequest) Reset() { *m = GetRepoMetadataRequest{} func (m *GetRepoMetadataRequest) String() string { return proto.CompactTextString(m) } func (*GetRepoMetadataRequest) ProtoMessage() {} func (*GetRepoMetadataRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{20} + return fileDescriptor_702c187af9ca94ec, []int{20} } + func (m *GetRepoMetadataRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetRepoMetadataRequest.Unmarshal(m, b) } func (m *GetRepoMetadataRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetRepoMetadataRequest.Marshal(b, m, deterministic) } -func (dst *GetRepoMetadataRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetRepoMetadataRequest.Merge(dst, src) +func (m *GetRepoMetadataRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetRepoMetadataRequest.Merge(m, src) } func (m *GetRepoMetadataRequest) XXX_Size() int { return xxx_messageInfo_GetRepoMetadataRequest.Size(m) @@ -1130,16 +1038,17 @@ func (m *GetRepoMetadataResponse) Reset() { *m = GetRepoMetadataResponse func (m *GetRepoMetadataResponse) String() string { return proto.CompactTextString(m) } func (*GetRepoMetadataResponse) ProtoMessage() {} func (*GetRepoMetadataResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{21} + return fileDescriptor_702c187af9ca94ec, []int{21} } + func (m *GetRepoMetadataResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetRepoMetadataResponse.Unmarshal(m, b) } func (m *GetRepoMetadataResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetRepoMetadataResponse.Marshal(b, m, deterministic) } -func (dst *GetRepoMetadataResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetRepoMetadataResponse.Merge(dst, src) +func (m *GetRepoMetadataResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetRepoMetadataResponse.Merge(m, src) } func (m *GetRepoMetadataResponse) XXX_Size() int { return xxx_messageInfo_GetRepoMetadataResponse.Size(m) @@ -1176,16 +1085,17 @@ func (m *ClientRepoFormat) Reset() { *m = ClientRepoFormat{} } func (m *ClientRepoFormat) String() string { return proto.CompactTextString(m) } func (*ClientRepoFormat) ProtoMessage() {} func (*ClientRepoFormat) Descriptor() ([]byte, []int) { - return fileDescriptor_chunkstore_6a769066ddb98dcb, []int{22} + return fileDescriptor_702c187af9ca94ec, []int{22} } + func (m *ClientRepoFormat) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ClientRepoFormat.Unmarshal(m, b) } func (m *ClientRepoFormat) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ClientRepoFormat.Marshal(b, m, deterministic) } -func (dst *ClientRepoFormat) XXX_Merge(src proto.Message) { - xxx_messageInfo_ClientRepoFormat.Merge(dst, src) +func (m *ClientRepoFormat) XXX_Merge(src proto.Message) { + xxx_messageInfo_ClientRepoFormat.Merge(m, src) } func (m *ClientRepoFormat) XXX_Size() int { return xxx_messageInfo_ClientRepoFormat.Size(m) @@ -1236,6 +1146,71 @@ func init() { proto.RegisterType((*ClientRepoFormat)(nil), "dolt.services.remotesapi.v1alpha1.ClientRepoFormat") } +func init() { + proto.RegisterFile("dolt/services/remotesapi/v1alpha1/chunkstore.proto", fileDescriptor_702c187af9ca94ec) +} + +var fileDescriptor_702c187af9ca94ec = []byte{ + // 908 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x73, 0xdb, 0x44, + 0x14, 0x8e, 0x12, 0xe3, 0xd8, 0xcf, 0x3f, 0x70, 0x35, 0x50, 0x34, 0xe6, 0xd0, 0x74, 0x4f, 0x81, + 0x16, 0xbb, 0x71, 0x99, 0x69, 0x81, 0x0b, 0x93, 0x50, 0xe2, 0xce, 0x14, 0x28, 0x9b, 0x02, 0x03, + 0x1d, 0x46, 0xb3, 0x96, 0xd7, 0x96, 0x06, 0x79, 0x57, 0x68, 0xd7, 0xe1, 0xc2, 0x1d, 0x2e, 0xfc, + 0x4d, 0xc0, 0x5f, 0xc5, 0x95, 0xd9, 0xa7, 0x95, 0x23, 0xbb, 0xce, 0xb0, 0xa1, 0x99, 0xdc, 0xb4, + 0xcf, 0xfb, 0xbd, 0xf7, 0x7d, 0xdf, 0xae, 0xde, 0x93, 0x61, 0x34, 0x95, 0xa9, 0x1e, 0x2a, 0x9e, + 0x9f, 0x27, 0x11, 0x57, 0xc3, 0x9c, 0x2f, 0xa4, 0xe6, 0x8a, 0x65, 0xc9, 0xf0, 0xfc, 0x88, 0xa5, + 0x59, 0xcc, 0x8e, 0x86, 0x51, 0xbc, 0x14, 0x3f, 0x29, 0x2d, 0x73, 0x3e, 0xc8, 0x72, 0xa9, 0xa5, + 0x7f, 0xd7, 0x60, 0x06, 0x25, 0x66, 0x70, 0x81, 0x19, 0x94, 0x18, 0xf2, 0x08, 0xea, 0x94, 0x67, + 0xf2, 0xe9, 0xd4, 0xef, 0xc1, 0x9e, 0xcc, 0xe7, 0x81, 0x77, 0xe0, 0x1d, 0x36, 0xa9, 0x79, 0xf4, + 0xdf, 0x85, 0x66, 0xce, 0x33, 0x19, 0x0a, 0xb6, 0xe0, 0xc1, 0x2e, 0xc6, 0x1b, 0x26, 0xf0, 0x25, + 0x5b, 0x70, 0x22, 0xa0, 0x37, 0x66, 0xea, 0x04, 0x4b, 0x52, 0xfe, 0xf3, 0x92, 0x2b, 0xed, 0x1f, + 0xc3, 0x3e, 0x02, 0x92, 0x29, 0xa6, 0x69, 0x8d, 0xde, 0x1b, 0xfc, 0x27, 0x83, 0x41, 0x51, 0x9e, + 0xd6, 0xf3, 0x82, 0xc6, 0x6d, 0xa8, 0xc7, 0x4c, 0xc5, 0x5c, 0x05, 0xbb, 0x07, 0x7b, 0x87, 0x6d, + 0x6a, 0x57, 0xe4, 0x1e, 0xdc, 0xaa, 0xd4, 0x53, 0x99, 0x14, 0x8a, 0x9b, 0xcd, 0x6c, 0xa2, 0xb8, + 0xd0, 0x81, 0x77, 0xb0, 0x77, 0xf8, 0x06, 0xb5, 0x2b, 0xf2, 0x18, 0xda, 0x63, 0xad, 0xb3, 0x53, + 0xae, 0x11, 0x60, 0xb4, 0x2d, 0xf3, 0xb4, 0xd4, 0xb6, 0xcc, 0xd3, 0x4b, 0xcb, 0x3c, 0x07, 0xa0, + 0x4c, 0xcc, 0x79, 0x81, 0xf3, 0xa1, 0x66, 0xe2, 0x08, 0x6c, 0x53, 0x7c, 0x36, 0x48, 0x39, 0x9b, + 0x29, 0xae, 0xd1, 0x92, 0x1a, 0xb5, 0x2b, 0x13, 0x4f, 0xb9, 0x98, 0xeb, 0x38, 0xd8, 0x3b, 0xf0, + 0x0e, 0x3b, 0xd4, 0xae, 0xc8, 0x7c, 0xc5, 0x05, 0x13, 0x6f, 0xe1, 0xf2, 0x04, 0xea, 0xb9, 0xf9, + 0xa9, 0xe0, 0xd2, 0x1a, 0x7d, 0xe0, 0xe2, 0xda, 0x8a, 0x24, 0xb5, 0x60, 0xf2, 0x97, 0x07, 0xad, + 0xcf, 0xe4, 0x2f, 0x22, 0x95, 0x6c, 0xfa, 0x4c, 0x46, 0xfe, 0x33, 0x68, 0xc4, 0x5a, 0x67, 0xe1, + 0x9c, 0x6b, 0x7b, 0x1c, 0x43, 0x87, 0xc4, 0x55, 0xdf, 0xc6, 0x3b, 0x74, 0x3f, 0x2e, 0xd6, 0xfe, + 0x77, 0xd0, 0x2d, 0xb3, 0x85, 0x58, 0x10, 0xe5, 0x5f, 0x29, 0x27, 0x72, 0x1e, 0xef, 0xd0, 0x76, + 0x5c, 0x59, 0x1f, 0x03, 0x34, 0x52, 0x19, 0x31, 0x9d, 0x48, 0x41, 0xee, 0x42, 0xc7, 0xec, 0x7d, + 0x2e, 0xd5, 0x65, 0x07, 0x47, 0x7e, 0x85, 0xe6, 0x37, 0x59, 0x29, 0x71, 0xdb, 0xf9, 0x7c, 0x05, + 0x4d, 0x24, 0x9a, 0x49, 0xa5, 0x2d, 0xc7, 0x07, 0x8e, 0x1c, 0x57, 0x75, 0xc7, 0x3b, 0x14, 0xbd, + 0x33, 0x81, 0x35, 0x82, 0x1a, 0x6e, 0x9f, 0x72, 0x5d, 0x71, 0xf9, 0x46, 0xee, 0xfe, 0x8f, 0xf0, + 0xce, 0x2b, 0x55, 0xed, 0x1b, 0x70, 0x0c, 0xb5, 0x54, 0x46, 0x0a, 0xef, 0x7f, 0x6b, 0x34, 0x70, + 0xa8, 0x59, 0x49, 0x43, 0x11, 0x4b, 0x72, 0x78, 0xeb, 0x94, 0xeb, 0x95, 0xab, 0x37, 0x22, 0xe9, + 0x7b, 0x78, 0x7b, 0xa3, 0xa6, 0x15, 0xf4, 0xe9, 0x9a, 0xa0, 0xfb, 0x0e, 0x15, 0x57, 0x49, 0xac, + 0x9c, 0x33, 0xe8, 0x50, 0x3e, 0x61, 0x8a, 0x5f, 0xa3, 0x0e, 0xd2, 0x83, 0x6e, 0x99, 0xb4, 0x20, + 0x4a, 0xbe, 0x86, 0x16, 0x95, 0x52, 0x5f, 0x67, 0x91, 0x7b, 0xd0, 0x2e, 0x52, 0x5a, 0x2f, 0x4c, + 0x03, 0x96, 0x52, 0x87, 0x95, 0x3b, 0xde, 0x30, 0x81, 0x31, 0x53, 0x31, 0x79, 0x02, 0x5d, 0xbc, + 0xab, 0x2f, 0xd8, 0x24, 0xe5, 0x4f, 0xc5, 0x4c, 0x6e, 0x7d, 0x1b, 0xee, 0x40, 0x0b, 0xc7, 0x42, + 0x18, 0xc9, 0xa5, 0x28, 0xde, 0x87, 0x0e, 0x05, 0x0c, 0x9d, 0x98, 0x08, 0xf9, 0x7b, 0x17, 0x3a, + 0x27, 0x72, 0xb1, 0x48, 0xae, 0x53, 0x89, 0x1f, 0xc0, 0x7e, 0xb4, 0xcc, 0x73, 0x6e, 0x4b, 0xb6, + 0x69, 0xb9, 0x34, 0x24, 0x53, 0xa6, 0x34, 0x36, 0xc9, 0x36, 0xc5, 0x67, 0xff, 0x25, 0xf4, 0x0a, + 0x92, 0xda, 0x68, 0x09, 0x13, 0x31, 0x93, 0x41, 0x0d, 0xcf, 0xff, 0xc8, 0xa1, 0xf4, 0xba, 0x0b, + 0xb4, 0x1b, 0xad, 0xbb, 0xc2, 0xc0, 0x8f, 0xd2, 0x84, 0x0b, 0x1d, 0xa2, 0xaa, 0x99, 0xcc, 0x17, + 0x4c, 0x07, 0x5d, 0x54, 0xf6, 0xd0, 0x25, 0x3d, 0x82, 0x8d, 0xbe, 0xcf, 0x11, 0x4a, 0x7b, 0xd1, + 0x46, 0x84, 0xbc, 0x0f, 0xdd, 0xd2, 0x42, 0x7b, 0x72, 0x01, 0xec, 0xab, 0x65, 0x14, 0x71, 0xa5, + 0xd0, 0xc3, 0x06, 0x2d, 0x97, 0xe4, 0x4f, 0x0f, 0x5b, 0x88, 0x41, 0x7f, 0xc1, 0x35, 0x9b, 0x32, + 0xcd, 0xae, 0xd3, 0xf8, 0x1b, 0x50, 0xfb, 0x12, 0xbb, 0xd1, 0xba, 0x00, 0x2b, 0xfb, 0x0e, 0xb4, + 0xc4, 0x64, 0x16, 0x9e, 0xf3, 0x5c, 0x25, 0x52, 0xd8, 0xb6, 0x0d, 0x62, 0x32, 0xfb, 0xb6, 0x88, + 0x14, 0x1b, 0xd4, 0x6a, 0xc3, 0x6e, 0xb9, 0x41, 0xd9, 0x0d, 0xe4, 0x05, 0xf4, 0x36, 0x29, 0xbc, + 0x7e, 0xd6, 0xd1, 0x3f, 0x75, 0xb8, 0x85, 0xd7, 0xe4, 0xcc, 0x7c, 0x1d, 0x9d, 0x15, 0x06, 0xf8, + 0xbf, 0x7b, 0xf0, 0xe6, 0x86, 0x12, 0xff, 0x23, 0x07, 0x8f, 0xb6, 0x1f, 0x5f, 0xff, 0xe3, 0xff, + 0x03, 0xb5, 0xc6, 0x9d, 0x43, 0x73, 0xf5, 0x75, 0xe3, 0xbb, 0x9c, 0xd3, 0xe6, 0xb7, 0x57, 0xff, + 0xc3, 0xab, 0x81, 0x6c, 0xdd, 0x3f, 0x3c, 0xec, 0xfd, 0x95, 0x99, 0x80, 0x73, 0x4e, 0xb9, 0xfa, + 0xb0, 0x65, 0x12, 0xba, 0xfa, 0xb0, 0x75, 0x9c, 0xfd, 0xe6, 0x81, 0x5f, 0x9d, 0x0b, 0x96, 0xcd, + 0x23, 0xb7, 0x94, 0xaf, 0x8c, 0xb0, 0xfe, 0xe3, 0xab, 0x03, 0x2d, 0x93, 0x85, 0xf9, 0x30, 0x36, + 0x0d, 0xdf, 0x7f, 0xe0, 0xf4, 0x16, 0x56, 0x06, 0x4e, 0xff, 0xe8, 0x0a, 0x08, 0x5b, 0x6e, 0x0e, + 0x35, 0xd3, 0xfa, 0x7d, 0x97, 0x09, 0x5e, 0x19, 0x3b, 0xfd, 0xa1, 0xf3, 0xfe, 0x0b, 0x5d, 0x45, + 0xaf, 0x72, 0xd2, 0xb5, 0x36, 0x19, 0x9c, 0x74, 0xad, 0x37, 0xc2, 0xe3, 0xc1, 0x0f, 0xf7, 0x2f, + 0xfb, 0xe3, 0x12, 0x96, 0x98, 0x4f, 0x2e, 0x62, 0x93, 0x3a, 0xfe, 0x73, 0x79, 0xf8, 0x6f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x97, 0xea, 0xa1, 0x84, 0xef, 0x0c, 0x00, 0x00, +} + // Reference imports to suppress errors if they are not otherwise used. var _ context.Context var _ grpc.ClientConn @@ -1339,6 +1314,32 @@ type ChunkStoreServiceServer interface { Commit(context.Context, *CommitRequest) (*CommitResponse, error) } +// UnimplementedChunkStoreServiceServer can be embedded to have forward compatible implementations. +type UnimplementedChunkStoreServiceServer struct { +} + +func (*UnimplementedChunkStoreServiceServer) GetRepoMetadata(ctx context.Context, req *GetRepoMetadataRequest) (*GetRepoMetadataResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetRepoMetadata not implemented") +} +func (*UnimplementedChunkStoreServiceServer) HasChunks(ctx context.Context, req *HasChunksRequest) (*HasChunksResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method HasChunks not implemented") +} +func (*UnimplementedChunkStoreServiceServer) GetDownloadLocations(ctx context.Context, req *GetDownloadLocsRequest) (*GetDownloadLocsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetDownloadLocations not implemented") +} +func (*UnimplementedChunkStoreServiceServer) GetUploadLocations(ctx context.Context, req *GetUploadLocsRequest) (*GetUploadLocsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetUploadLocations not implemented") +} +func (*UnimplementedChunkStoreServiceServer) Rebase(ctx context.Context, req *RebaseRequest) (*RebaseResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Rebase not implemented") +} +func (*UnimplementedChunkStoreServiceServer) Root(ctx context.Context, req *RootRequest) (*RootResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Root not implemented") +} +func (*UnimplementedChunkStoreServiceServer) Commit(ctx context.Context, req *CommitRequest) (*CommitResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Commit not implemented") +} + func RegisterChunkStoreServiceServer(s *grpc.Server, srv ChunkStoreServiceServer) { s.RegisterService(&_ChunkStoreService_serviceDesc, srv) } @@ -1505,68 +1506,3 @@ var _ChunkStoreService_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "dolt/services/remotesapi/v1alpha1/chunkstore.proto", } - -func init() { - proto.RegisterFile("dolt/services/remotesapi/v1alpha1/chunkstore.proto", fileDescriptor_chunkstore_6a769066ddb98dcb) -} - -var fileDescriptor_chunkstore_6a769066ddb98dcb = []byte{ - // 908 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x73, 0xdb, 0x44, - 0x14, 0x8e, 0x12, 0xe3, 0xd8, 0xcf, 0x3f, 0x70, 0x35, 0x50, 0x34, 0xe6, 0xd0, 0x74, 0x4f, 0x81, - 0x16, 0xbb, 0x71, 0x99, 0x69, 0x81, 0x0b, 0x93, 0x50, 0xe2, 0xce, 0x14, 0x28, 0x9b, 0x02, 0x03, - 0x1d, 0x46, 0xb3, 0x96, 0xd7, 0x96, 0x06, 0x79, 0x57, 0x68, 0xd7, 0xe1, 0xc2, 0x1d, 0x2e, 0xfc, - 0x4d, 0xc0, 0x5f, 0xc5, 0x95, 0xd9, 0xa7, 0x95, 0x23, 0xbb, 0xce, 0xb0, 0xa1, 0x99, 0xdc, 0xb4, - 0xcf, 0xfb, 0xbd, 0xf7, 0x7d, 0xdf, 0xae, 0xde, 0x93, 0x61, 0x34, 0x95, 0xa9, 0x1e, 0x2a, 0x9e, - 0x9f, 0x27, 0x11, 0x57, 0xc3, 0x9c, 0x2f, 0xa4, 0xe6, 0x8a, 0x65, 0xc9, 0xf0, 0xfc, 0x88, 0xa5, - 0x59, 0xcc, 0x8e, 0x86, 0x51, 0xbc, 0x14, 0x3f, 0x29, 0x2d, 0x73, 0x3e, 0xc8, 0x72, 0xa9, 0xa5, - 0x7f, 0xd7, 0x60, 0x06, 0x25, 0x66, 0x70, 0x81, 0x19, 0x94, 0x18, 0xf2, 0x08, 0xea, 0x94, 0x67, - 0xf2, 0xe9, 0xd4, 0xef, 0xc1, 0x9e, 0xcc, 0xe7, 0x81, 0x77, 0xe0, 0x1d, 0x36, 0xa9, 0x79, 0xf4, - 0xdf, 0x85, 0x66, 0xce, 0x33, 0x19, 0x0a, 0xb6, 0xe0, 0xc1, 0x2e, 0xc6, 0x1b, 0x26, 0xf0, 0x25, - 0x5b, 0x70, 0x22, 0xa0, 0x37, 0x66, 0xea, 0x04, 0x4b, 0x52, 0xfe, 0xf3, 0x92, 0x2b, 0xed, 0x1f, - 0xc3, 0x3e, 0x02, 0x92, 0x29, 0xa6, 0x69, 0x8d, 0xde, 0x1b, 0xfc, 0x27, 0x83, 0x41, 0x51, 0x9e, - 0xd6, 0xf3, 0x82, 0xc6, 0x6d, 0xa8, 0xc7, 0x4c, 0xc5, 0x5c, 0x05, 0xbb, 0x07, 0x7b, 0x87, 0x6d, - 0x6a, 0x57, 0xe4, 0x1e, 0xdc, 0xaa, 0xd4, 0x53, 0x99, 0x14, 0x8a, 0x9b, 0xcd, 0x6c, 0xa2, 0xb8, - 0xd0, 0x81, 0x77, 0xb0, 0x77, 0xf8, 0x06, 0xb5, 0x2b, 0xf2, 0x18, 0xda, 0x63, 0xad, 0xb3, 0x53, - 0xae, 0x11, 0x60, 0xb4, 0x2d, 0xf3, 0xb4, 0xd4, 0xb6, 0xcc, 0xd3, 0x4b, 0xcb, 0x3c, 0x07, 0xa0, - 0x4c, 0xcc, 0x79, 0x81, 0xf3, 0xa1, 0x66, 0xe2, 0x08, 0x6c, 0x53, 0x7c, 0x36, 0x48, 0x39, 0x9b, - 0x29, 0xae, 0xd1, 0x92, 0x1a, 0xb5, 0x2b, 0x13, 0x4f, 0xb9, 0x98, 0xeb, 0x38, 0xd8, 0x3b, 0xf0, - 0x0e, 0x3b, 0xd4, 0xae, 0xc8, 0x7c, 0xc5, 0x05, 0x13, 0x6f, 0xe1, 0xf2, 0x04, 0xea, 0xb9, 0xf9, - 0xa9, 0xe0, 0xd2, 0x1a, 0x7d, 0xe0, 0xe2, 0xda, 0x8a, 0x24, 0xb5, 0x60, 0xf2, 0x97, 0x07, 0xad, - 0xcf, 0xe4, 0x2f, 0x22, 0x95, 0x6c, 0xfa, 0x4c, 0x46, 0xfe, 0x33, 0x68, 0xc4, 0x5a, 0x67, 0xe1, - 0x9c, 0x6b, 0x7b, 0x1c, 0x43, 0x87, 0xc4, 0x55, 0xdf, 0xc6, 0x3b, 0x74, 0x3f, 0x2e, 0xd6, 0xfe, - 0x77, 0xd0, 0x2d, 0xb3, 0x85, 0x58, 0x10, 0xe5, 0x5f, 0x29, 0x27, 0x72, 0x1e, 0xef, 0xd0, 0x76, - 0x5c, 0x59, 0x1f, 0x03, 0x34, 0x52, 0x19, 0x31, 0x9d, 0x48, 0x41, 0xee, 0x42, 0xc7, 0xec, 0x7d, - 0x2e, 0xd5, 0x65, 0x07, 0x47, 0x7e, 0x85, 0xe6, 0x37, 0x59, 0x29, 0x71, 0xdb, 0xf9, 0x7c, 0x05, - 0x4d, 0x24, 0x9a, 0x49, 0xa5, 0x2d, 0xc7, 0x07, 0x8e, 0x1c, 0x57, 0x75, 0xc7, 0x3b, 0x14, 0xbd, - 0x33, 0x81, 0x35, 0x82, 0x1a, 0x6e, 0x9f, 0x72, 0x5d, 0x71, 0xf9, 0x46, 0xee, 0xfe, 0x8f, 0xf0, - 0xce, 0x2b, 0x55, 0xed, 0x1b, 0x70, 0x0c, 0xb5, 0x54, 0x46, 0x0a, 0xef, 0x7f, 0x6b, 0x34, 0x70, - 0xa8, 0x59, 0x49, 0x43, 0x11, 0x4b, 0x72, 0x78, 0xeb, 0x94, 0xeb, 0x95, 0xab, 0x37, 0x22, 0xe9, - 0x7b, 0x78, 0x7b, 0xa3, 0xa6, 0x15, 0xf4, 0xe9, 0x9a, 0xa0, 0xfb, 0x0e, 0x15, 0x57, 0x49, 0xac, - 0x9c, 0x33, 0xe8, 0x50, 0x3e, 0x61, 0x8a, 0x5f, 0xa3, 0x0e, 0xd2, 0x83, 0x6e, 0x99, 0xb4, 0x20, - 0x4a, 0xbe, 0x86, 0x16, 0x95, 0x52, 0x5f, 0x67, 0x91, 0x7b, 0xd0, 0x2e, 0x52, 0x5a, 0x2f, 0x4c, - 0x03, 0x96, 0x52, 0x87, 0x95, 0x3b, 0xde, 0x30, 0x81, 0x31, 0x53, 0x31, 0x79, 0x02, 0x5d, 0xbc, - 0xab, 0x2f, 0xd8, 0x24, 0xe5, 0x4f, 0xc5, 0x4c, 0x6e, 0x7d, 0x1b, 0xee, 0x40, 0x0b, 0xc7, 0x42, - 0x18, 0xc9, 0xa5, 0x28, 0xde, 0x87, 0x0e, 0x05, 0x0c, 0x9d, 0x98, 0x08, 0xf9, 0x7b, 0x17, 0x3a, - 0x27, 0x72, 0xb1, 0x48, 0xae, 0x53, 0x89, 0x1f, 0xc0, 0x7e, 0xb4, 0xcc, 0x73, 0x6e, 0x4b, 0xb6, - 0x69, 0xb9, 0x34, 0x24, 0x53, 0xa6, 0x34, 0x36, 0xc9, 0x36, 0xc5, 0x67, 0xff, 0x25, 0xf4, 0x0a, - 0x92, 0xda, 0x68, 0x09, 0x13, 0x31, 0x93, 0x41, 0x0d, 0xcf, 0xff, 0xc8, 0xa1, 0xf4, 0xba, 0x0b, - 0xb4, 0x1b, 0xad, 0xbb, 0xc2, 0xc0, 0x8f, 0xd2, 0x84, 0x0b, 0x1d, 0xa2, 0xaa, 0x99, 0xcc, 0x17, - 0x4c, 0x07, 0x5d, 0x54, 0xf6, 0xd0, 0x25, 0x3d, 0x82, 0x8d, 0xbe, 0xcf, 0x11, 0x4a, 0x7b, 0xd1, - 0x46, 0x84, 0xbc, 0x0f, 0xdd, 0xd2, 0x42, 0x7b, 0x72, 0x01, 0xec, 0xab, 0x65, 0x14, 0x71, 0xa5, - 0xd0, 0xc3, 0x06, 0x2d, 0x97, 0xe4, 0x4f, 0x0f, 0x5b, 0x88, 0x41, 0x7f, 0xc1, 0x35, 0x9b, 0x32, - 0xcd, 0xae, 0xd3, 0xf8, 0x1b, 0x50, 0xfb, 0x12, 0xbb, 0xd1, 0xba, 0x00, 0x2b, 0xfb, 0x0e, 0xb4, - 0xc4, 0x64, 0x16, 0x9e, 0xf3, 0x5c, 0x25, 0x52, 0xd8, 0xb6, 0x0d, 0x62, 0x32, 0xfb, 0xb6, 0x88, - 0x14, 0x1b, 0xd4, 0x6a, 0xc3, 0x6e, 0xb9, 0x41, 0xd9, 0x0d, 0xe4, 0x05, 0xf4, 0x36, 0x29, 0xbc, - 0x7e, 0xd6, 0xd1, 0x3f, 0x75, 0xb8, 0x85, 0xd7, 0xe4, 0xcc, 0x7c, 0x1d, 0x9d, 0x15, 0x06, 0xf8, - 0xbf, 0x7b, 0xf0, 0xe6, 0x86, 0x12, 0xff, 0x23, 0x07, 0x8f, 0xb6, 0x1f, 0x5f, 0xff, 0xe3, 0xff, - 0x03, 0xb5, 0xc6, 0x9d, 0x43, 0x73, 0xf5, 0x75, 0xe3, 0xbb, 0x9c, 0xd3, 0xe6, 0xb7, 0x57, 0xff, - 0xc3, 0xab, 0x81, 0x6c, 0xdd, 0x3f, 0x3c, 0xec, 0xfd, 0x95, 0x99, 0x80, 0x73, 0x4e, 0xb9, 0xfa, - 0xb0, 0x65, 0x12, 0xba, 0xfa, 0xb0, 0x75, 0x9c, 0xfd, 0xe6, 0x81, 0x5f, 0x9d, 0x0b, 0x96, 0xcd, - 0x23, 0xb7, 0x94, 0xaf, 0x8c, 0xb0, 0xfe, 0xe3, 0xab, 0x03, 0x2d, 0x93, 0x85, 0xf9, 0x30, 0x36, - 0x0d, 0xdf, 0x7f, 0xe0, 0xf4, 0x16, 0x56, 0x06, 0x4e, 0xff, 0xe8, 0x0a, 0x08, 0x5b, 0x6e, 0x0e, - 0x35, 0xd3, 0xfa, 0x7d, 0x97, 0x09, 0x5e, 0x19, 0x3b, 0xfd, 0xa1, 0xf3, 0xfe, 0x0b, 0x5d, 0x45, - 0xaf, 0x72, 0xd2, 0xb5, 0x36, 0x19, 0x9c, 0x74, 0xad, 0x37, 0xc2, 0xe3, 0xc1, 0x0f, 0xf7, 0x2f, - 0xfb, 0xe3, 0x12, 0x96, 0x98, 0x4f, 0x2e, 0x62, 0x93, 0x3a, 0xfe, 0x73, 0x79, 0xf8, 0x6f, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x97, 0xea, 0xa1, 0x84, 0xef, 0x0c, 0x00, 0x00, -} diff --git a/go/gen/proto/dolt/services/remotesapi_v1alpha1/credentials.pb.go b/go/gen/proto/dolt/services/remotesapi_v1alpha1/credentials.pb.go index d2fd7efecc..c6fcaa1c1e 100644 --- a/go/gen/proto/dolt/services/remotesapi_v1alpha1/credentials.pb.go +++ b/go/gen/proto/dolt/services/remotesapi_v1alpha1/credentials.pb.go @@ -1,15 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: dolt/services/remotesapi/v1alpha1/credentials.proto -package remotesapi // import "dolt/services/remotesapi_v1alpha1" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +package remotesapi import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -21,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type WhoAmIRequest struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -33,16 +34,17 @@ func (m *WhoAmIRequest) Reset() { *m = WhoAmIRequest{} } func (m *WhoAmIRequest) String() string { return proto.CompactTextString(m) } func (*WhoAmIRequest) ProtoMessage() {} func (*WhoAmIRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_credentials_79a5d545e04425e9, []int{0} + return fileDescriptor_24ed1d4c5faa311b, []int{0} } + func (m *WhoAmIRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WhoAmIRequest.Unmarshal(m, b) } func (m *WhoAmIRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_WhoAmIRequest.Marshal(b, m, deterministic) } -func (dst *WhoAmIRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_WhoAmIRequest.Merge(dst, src) +func (m *WhoAmIRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_WhoAmIRequest.Merge(m, src) } func (m *WhoAmIRequest) XXX_Size() int { return xxx_messageInfo_WhoAmIRequest.Size(m) @@ -69,16 +71,17 @@ func (m *WhoAmIResponse) Reset() { *m = WhoAmIResponse{} } func (m *WhoAmIResponse) String() string { return proto.CompactTextString(m) } func (*WhoAmIResponse) ProtoMessage() {} func (*WhoAmIResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_credentials_79a5d545e04425e9, []int{1} + return fileDescriptor_24ed1d4c5faa311b, []int{1} } + func (m *WhoAmIResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WhoAmIResponse.Unmarshal(m, b) } func (m *WhoAmIResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_WhoAmIResponse.Marshal(b, m, deterministic) } -func (dst *WhoAmIResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_WhoAmIResponse.Merge(dst, src) +func (m *WhoAmIResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_WhoAmIResponse.Merge(m, src) } func (m *WhoAmIResponse) XXX_Size() int { return xxx_messageInfo_WhoAmIResponse.Size(m) @@ -115,6 +118,29 @@ func init() { proto.RegisterType((*WhoAmIResponse)(nil), "dolt.services.remotesapi.v1alpha1.WhoAmIResponse") } +func init() { + proto.RegisterFile("dolt/services/remotesapi/v1alpha1/credentials.proto", fileDescriptor_24ed1d4c5faa311b) +} + +var fileDescriptor_24ed1d4c5faa311b = []byte{ + // 237 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x90, 0xb1, 0x4b, 0x43, 0x31, + 0x10, 0xc6, 0x79, 0x0a, 0x45, 0xcf, 0x56, 0x21, 0x53, 0xe9, 0x64, 0xeb, 0xe2, 0x20, 0x79, 0x3e, + 0x3b, 0x3a, 0x55, 0x27, 0x17, 0x87, 0x3a, 0x08, 0x2e, 0x8f, 0xb3, 0x39, 0x68, 0x20, 0x79, 0x89, + 0xb9, 0xb4, 0xe0, 0xec, 0x3f, 0x2e, 0x2f, 0x31, 0x3e, 0x1c, 0x44, 0x1c, 0xef, 0x77, 0xf7, 0x83, + 0xef, 0x3b, 0x58, 0x2a, 0x67, 0x62, 0xcd, 0x14, 0xf6, 0x7a, 0x43, 0x5c, 0x07, 0xb2, 0x2e, 0x12, + 0xa3, 0xd7, 0xf5, 0xbe, 0x41, 0xe3, 0xb7, 0xd8, 0xd4, 0x9b, 0x40, 0x8a, 0xba, 0xa8, 0xd1, 0xb0, + 0xf4, 0xc1, 0x45, 0x27, 0xe6, 0xbd, 0x24, 0x8b, 0x24, 0x07, 0x49, 0x16, 0x69, 0x71, 0x06, 0x93, + 0xe7, 0xad, 0x5b, 0xd9, 0x87, 0x35, 0xbd, 0xed, 0x88, 0xe3, 0x22, 0xc2, 0x69, 0x01, 0xec, 0x5d, + 0xc7, 0x24, 0x66, 0x70, 0xb4, 0x63, 0x0a, 0x1d, 0x5a, 0x9a, 0x56, 0xe7, 0xd5, 0xe5, 0xf1, 0xfa, + 0x7b, 0x16, 0x73, 0x18, 0x2b, 0xcd, 0xde, 0xe0, 0x7b, 0x9b, 0xf6, 0x07, 0x69, 0x7f, 0xf2, 0xc5, + 0x1e, 0xfb, 0x93, 0x0b, 0x98, 0x90, 0x45, 0x6d, 0x5a, 0x54, 0x2a, 0x10, 0xf3, 0xf4, 0x30, 0xdd, + 0x8c, 0x13, 0x5c, 0x65, 0x76, 0xf3, 0x51, 0x81, 0xb8, 0x1f, 0xf2, 0x3f, 0xe5, 0xc8, 0xc2, 0xc2, + 0x28, 0x87, 0x11, 0xd7, 0xf2, 0xcf, 0x2e, 0xf2, 0x47, 0x91, 0x59, 0xf3, 0x0f, 0x23, 0x37, 0xbd, + 0x93, 0x2f, 0x57, 0xbf, 0xbd, 0xb9, 0x2d, 0xce, 0xed, 0xc0, 0x5e, 0x47, 0xe9, 0xcd, 0xcb, 0xcf, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x74, 0x1c, 0x7d, 0xef, 0x9d, 0x01, 0x00, 0x00, +} + // Reference imports to suppress errors if they are not otherwise used. var _ context.Context var _ grpc.ClientConn @@ -152,6 +178,14 @@ type CredentialsServiceServer interface { WhoAmI(context.Context, *WhoAmIRequest) (*WhoAmIResponse, error) } +// UnimplementedCredentialsServiceServer can be embedded to have forward compatible implementations. +type UnimplementedCredentialsServiceServer struct { +} + +func (*UnimplementedCredentialsServiceServer) WhoAmI(ctx context.Context, req *WhoAmIRequest) (*WhoAmIResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method WhoAmI not implemented") +} + func RegisterCredentialsServiceServer(s *grpc.Server, srv CredentialsServiceServer) { s.RegisterService(&_CredentialsService_serviceDesc, srv) } @@ -186,26 +220,3 @@ var _CredentialsService_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "dolt/services/remotesapi/v1alpha1/credentials.proto", } - -func init() { - proto.RegisterFile("dolt/services/remotesapi/v1alpha1/credentials.proto", fileDescriptor_credentials_79a5d545e04425e9) -} - -var fileDescriptor_credentials_79a5d545e04425e9 = []byte{ - // 237 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x90, 0xb1, 0x4b, 0x43, 0x31, - 0x10, 0xc6, 0x79, 0x0a, 0x45, 0xcf, 0x56, 0x21, 0x53, 0xe9, 0x64, 0xeb, 0xe2, 0x20, 0x79, 0x3e, - 0x3b, 0x3a, 0x55, 0x27, 0x17, 0x87, 0x3a, 0x08, 0x2e, 0x8f, 0xb3, 0x39, 0x68, 0x20, 0x79, 0x89, - 0xb9, 0xb4, 0xe0, 0xec, 0x3f, 0x2e, 0x2f, 0x31, 0x3e, 0x1c, 0x44, 0x1c, 0xef, 0x77, 0xf7, 0x83, - 0xef, 0x3b, 0x58, 0x2a, 0x67, 0x62, 0xcd, 0x14, 0xf6, 0x7a, 0x43, 0x5c, 0x07, 0xb2, 0x2e, 0x12, - 0xa3, 0xd7, 0xf5, 0xbe, 0x41, 0xe3, 0xb7, 0xd8, 0xd4, 0x9b, 0x40, 0x8a, 0xba, 0xa8, 0xd1, 0xb0, - 0xf4, 0xc1, 0x45, 0x27, 0xe6, 0xbd, 0x24, 0x8b, 0x24, 0x07, 0x49, 0x16, 0x69, 0x71, 0x06, 0x93, - 0xe7, 0xad, 0x5b, 0xd9, 0x87, 0x35, 0xbd, 0xed, 0x88, 0xe3, 0x22, 0xc2, 0x69, 0x01, 0xec, 0x5d, - 0xc7, 0x24, 0x66, 0x70, 0xb4, 0x63, 0x0a, 0x1d, 0x5a, 0x9a, 0x56, 0xe7, 0xd5, 0xe5, 0xf1, 0xfa, - 0x7b, 0x16, 0x73, 0x18, 0x2b, 0xcd, 0xde, 0xe0, 0x7b, 0x9b, 0xf6, 0x07, 0x69, 0x7f, 0xf2, 0xc5, - 0x1e, 0xfb, 0x93, 0x0b, 0x98, 0x90, 0x45, 0x6d, 0x5a, 0x54, 0x2a, 0x10, 0xf3, 0xf4, 0x30, 0xdd, - 0x8c, 0x13, 0x5c, 0x65, 0x76, 0xf3, 0x51, 0x81, 0xb8, 0x1f, 0xf2, 0x3f, 0xe5, 0xc8, 0xc2, 0xc2, - 0x28, 0x87, 0x11, 0xd7, 0xf2, 0xcf, 0x2e, 0xf2, 0x47, 0x91, 0x59, 0xf3, 0x0f, 0x23, 0x37, 0xbd, - 0x93, 0x2f, 0x57, 0xbf, 0xbd, 0xb9, 0x2d, 0xce, 0xed, 0xc0, 0x5e, 0x47, 0xe9, 0xcd, 0xcb, 0xcf, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x74, 0x1c, 0x7d, 0xef, 0x9d, 0x01, 0x00, 0x00, -} diff --git a/go/go.mod b/go/go.mod index 3e7f8cd4fe..20d6030fe1 100644 --- a/go/go.mod +++ b/go/go.mod @@ -58,4 +58,6 @@ require ( replace github.com/src-d/go-mysql-server => github.com/liquidata-inc/go-mysql-server v0.4.1-0.20190710171053-b2883167103a +replace github.com/golang/protobuf => ../proto/third_party/golang-protobuf + replace vitess.io/vitess => github.com/liquidata-inc/vitess v0.0.0-20190625235908-66745781a796 diff --git a/proto/Makefile b/proto/Makefile index dab84fa9c3..5c69973097 100644 --- a/proto/Makefile +++ b/proto/Makefile @@ -3,8 +3,9 @@ THIRD_PARTY_ROOT := ./third_party GOOGLEAPIS := $(THIRD_PARTY_ROOT)/googleapis PROTOBUF := $(THIRD_PARTY_ROOT)/protobuf/src +PROTOC_GEN_GO := third_party/golang-protobuf/._protoc-gen-go PROTOC := $(THIRD_PARTY_ROOT)/protobuf/bazel-bin/protoc -PROTOC_FLAGS = -I . -I $(GOOGLEAPIS) -I $(PROTOBUF) +PROTOC_FLAGS = --plugin=protoc-gen-go=$(PROTOC_GEN_GO) -I . -I $(GOOGLEAPIS) -I $(PROTOBUF) pbgo_out := ../go/gen/proto @@ -17,6 +18,11 @@ PBGO_pkgs := REMOTESAPI all: +$(PROTOC_GEN_GO): + @echo "ERROR: Could not find $(PROTOC_GEN_GO)" + @echo "ERROR: Run "'`'"go build -o ._protoc-gen-go ./protoc-gen-go"'`'" in third_party/golang-protobuf to build protoc-gen-go." + @exit 1 + $(PROTOC): @echo "ERROR: Could not find $(PROTOC)" @echo "ERROR: Run "'`'"bazel build //:protoc"'`'" in $(THIRD_PARTY_ROOT)/protobuf to build protoc." @@ -28,7 +34,7 @@ clean: @rm -f $(ALL_OUTPUTS) define PROTOC_template # 1=proto, 2=outputs, 3=flags -$(2) : $(1) +$(2) : $(1) $(PROTOC) $(PROTOC_GEN_GO) @$$(PROTOC) $$(PROTOC_FLAGS) $(3) $(1) ALL_OUTPUTS += $(2) all: $(2) diff --git a/proto/third_party/golang-protobuf b/proto/third_party/golang-protobuf new file mode 160000 index 0000000000..4c88cc3f1a --- /dev/null +++ b/proto/third_party/golang-protobuf @@ -0,0 +1 @@ +Subproject commit 4c88cc3f1a34ffade77b79abc53335d1e511f25b