diff --git a/Makefile b/Makefile index ba3d994a8..52d246c64 100644 --- a/Makefile +++ b/Makefile @@ -166,9 +166,14 @@ generate-stringer: generate-pql: require-peg cd pql && peg -inline pql.peg && cd .. -# dunno if protoc-gen-gofast is actually needed here -generate-proto-grpc: require-protoc require-protoc-gen-gofast +generate-proto-grpc: require-protoc require-protoc-gen-go protoc -I proto proto/pilosa.proto --go_out=plugins=grpc:proto + protoc -I proto proto/vdsm/vdsm.proto --go_out=plugins=grpc:proto + # TODO: Modify above commands and remove the below mv if possible. + # See https://go-review.googlesource.com/c/protobuf/+/219298/ for info on --go-opt + # I couldn't get it to work during development - Cody + cp -r proto/github.com/pilosa/pilosa/v2/proto/ proto/ + rm -rf proto/github.com # `go generate` all needed packages generate: generate-protoc generate-statik generate-stringer generate-pql @@ -386,6 +391,9 @@ install-stringer: install-protoc-gen-gofast: GO111MODULE=off go get -u github.com/gogo/protobuf/protoc-gen-gofast +install-protoc-gen-go: + GO111MODULE=off go get -u github.com/golang/protobuf/protoc-gen-go + install-protoc: @echo This tool cannot automatically install protoc. Please download and install protoc from https://google.github.io/proto-lens/installing-protoc.html diff --git a/license.exceptions b/license.exceptions index ffb08a26e..5fb7846e8 100644 --- a/license.exceptions +++ b/license.exceptions @@ -19,3 +19,5 @@ ./cmd/pilosa-keydump/vprint.go ./cmd/pilosa-keydump/keydump.go ./synthload/vprint.go +./proto/vdsm/vdsm.proto +./proto/vdsm/vdsm.pb.go diff --git a/proto/interface.go b/proto/interface.go index af2599707..77ba3fd8d 100644 --- a/proto/interface.go +++ b/proto/interface.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package pilosa +package proto import ( "fmt" diff --git a/proto/pilosa.pb.go b/proto/pilosa.pb.go index a48ae519b..973b6e173 100644 --- a/proto/pilosa.pb.go +++ b/proto/pilosa.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: pilosa.proto -package pilosa +package proto import ( context "context" @@ -24,349 +24,6 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type VDS struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *VDS) Reset() { *m = VDS{} } -func (m *VDS) String() string { return proto.CompactTextString(m) } -func (*VDS) ProtoMessage() {} -func (*VDS) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{0} -} - -func (m *VDS) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_VDS.Unmarshal(m, b) -} -func (m *VDS) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_VDS.Marshal(b, m, deterministic) -} -func (m *VDS) XXX_Merge(src proto.Message) { - xxx_messageInfo_VDS.Merge(m, src) -} -func (m *VDS) XXX_Size() int { - return xxx_messageInfo_VDS.Size(m) -} -func (m *VDS) XXX_DiscardUnknown() { - xxx_messageInfo_VDS.DiscardUnknown(m) -} - -var xxx_messageInfo_VDS proto.InternalMessageInfo - -func (m *VDS) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -type GetVDSsRequest struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetVDSsRequest) Reset() { *m = GetVDSsRequest{} } -func (m *GetVDSsRequest) String() string { return proto.CompactTextString(m) } -func (*GetVDSsRequest) ProtoMessage() {} -func (*GetVDSsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{1} -} - -func (m *GetVDSsRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetVDSsRequest.Unmarshal(m, b) -} -func (m *GetVDSsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetVDSsRequest.Marshal(b, m, deterministic) -} -func (m *GetVDSsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetVDSsRequest.Merge(m, src) -} -func (m *GetVDSsRequest) XXX_Size() int { - return xxx_messageInfo_GetVDSsRequest.Size(m) -} -func (m *GetVDSsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetVDSsRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_GetVDSsRequest proto.InternalMessageInfo - -type GetVDSsResponse struct { - Vdss []*VDS `protobuf:"bytes,1,rep,name=vdss,proto3" json:"vdss,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetVDSsResponse) Reset() { *m = GetVDSsResponse{} } -func (m *GetVDSsResponse) String() string { return proto.CompactTextString(m) } -func (*GetVDSsResponse) ProtoMessage() {} -func (*GetVDSsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{2} -} - -func (m *GetVDSsResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetVDSsResponse.Unmarshal(m, b) -} -func (m *GetVDSsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetVDSsResponse.Marshal(b, m, deterministic) -} -func (m *GetVDSsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetVDSsResponse.Merge(m, src) -} -func (m *GetVDSsResponse) XXX_Size() int { - return xxx_messageInfo_GetVDSsResponse.Size(m) -} -func (m *GetVDSsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetVDSsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_GetVDSsResponse proto.InternalMessageInfo - -func (m *GetVDSsResponse) GetVdss() []*VDS { - if m != nil { - return m.Vdss - } - return nil -} - -type GetVDSRequest struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetVDSRequest) Reset() { *m = GetVDSRequest{} } -func (m *GetVDSRequest) String() string { return proto.CompactTextString(m) } -func (*GetVDSRequest) ProtoMessage() {} -func (*GetVDSRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{3} -} - -func (m *GetVDSRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetVDSRequest.Unmarshal(m, b) -} -func (m *GetVDSRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetVDSRequest.Marshal(b, m, deterministic) -} -func (m *GetVDSRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetVDSRequest.Merge(m, src) -} -func (m *GetVDSRequest) XXX_Size() int { - return xxx_messageInfo_GetVDSRequest.Size(m) -} -func (m *GetVDSRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetVDSRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_GetVDSRequest proto.InternalMessageInfo - -func (m *GetVDSRequest) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -type GetVDSResponse struct { - Vds *VDS `protobuf:"bytes,1,opt,name=vds,proto3" json:"vds,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetVDSResponse) Reset() { *m = GetVDSResponse{} } -func (m *GetVDSResponse) String() string { return proto.CompactTextString(m) } -func (*GetVDSResponse) ProtoMessage() {} -func (*GetVDSResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{4} -} - -func (m *GetVDSResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetVDSResponse.Unmarshal(m, b) -} -func (m *GetVDSResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetVDSResponse.Marshal(b, m, deterministic) -} -func (m *GetVDSResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetVDSResponse.Merge(m, src) -} -func (m *GetVDSResponse) XXX_Size() int { - return xxx_messageInfo_GetVDSResponse.Size(m) -} -func (m *GetVDSResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetVDSResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_GetVDSResponse proto.InternalMessageInfo - -func (m *GetVDSResponse) GetVds() *VDS { - if m != nil { - return m.Vds - } - return nil -} - -type PostVDSRequest struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Keys bool `protobuf:"varint,2,opt,name=keys,proto3" json:"keys,omitempty"` - TrackExistence bool `protobuf:"varint,3,opt,name=trackExistence,proto3" json:"trackExistence,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *PostVDSRequest) Reset() { *m = PostVDSRequest{} } -func (m *PostVDSRequest) String() string { return proto.CompactTextString(m) } -func (*PostVDSRequest) ProtoMessage() {} -func (*PostVDSRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{5} -} - -func (m *PostVDSRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_PostVDSRequest.Unmarshal(m, b) -} -func (m *PostVDSRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_PostVDSRequest.Marshal(b, m, deterministic) -} -func (m *PostVDSRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_PostVDSRequest.Merge(m, src) -} -func (m *PostVDSRequest) XXX_Size() int { - return xxx_messageInfo_PostVDSRequest.Size(m) -} -func (m *PostVDSRequest) XXX_DiscardUnknown() { - xxx_messageInfo_PostVDSRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_PostVDSRequest proto.InternalMessageInfo - -func (m *PostVDSRequest) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *PostVDSRequest) GetKeys() bool { - if m != nil { - return m.Keys - } - return false -} - -func (m *PostVDSRequest) GetTrackExistence() bool { - if m != nil { - return m.TrackExistence - } - return false -} - -type PostVDSResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *PostVDSResponse) Reset() { *m = PostVDSResponse{} } -func (m *PostVDSResponse) String() string { return proto.CompactTextString(m) } -func (*PostVDSResponse) ProtoMessage() {} -func (*PostVDSResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{6} -} - -func (m *PostVDSResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_PostVDSResponse.Unmarshal(m, b) -} -func (m *PostVDSResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_PostVDSResponse.Marshal(b, m, deterministic) -} -func (m *PostVDSResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_PostVDSResponse.Merge(m, src) -} -func (m *PostVDSResponse) XXX_Size() int { - return xxx_messageInfo_PostVDSResponse.Size(m) -} -func (m *PostVDSResponse) XXX_DiscardUnknown() { - xxx_messageInfo_PostVDSResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_PostVDSResponse proto.InternalMessageInfo - -type DeleteVDSRequest struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *DeleteVDSRequest) Reset() { *m = DeleteVDSRequest{} } -func (m *DeleteVDSRequest) String() string { return proto.CompactTextString(m) } -func (*DeleteVDSRequest) ProtoMessage() {} -func (*DeleteVDSRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{7} -} - -func (m *DeleteVDSRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DeleteVDSRequest.Unmarshal(m, b) -} -func (m *DeleteVDSRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DeleteVDSRequest.Marshal(b, m, deterministic) -} -func (m *DeleteVDSRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeleteVDSRequest.Merge(m, src) -} -func (m *DeleteVDSRequest) XXX_Size() int { - return xxx_messageInfo_DeleteVDSRequest.Size(m) -} -func (m *DeleteVDSRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DeleteVDSRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_DeleteVDSRequest proto.InternalMessageInfo - -func (m *DeleteVDSRequest) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -type DeleteVDSResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *DeleteVDSResponse) Reset() { *m = DeleteVDSResponse{} } -func (m *DeleteVDSResponse) String() string { return proto.CompactTextString(m) } -func (*DeleteVDSResponse) ProtoMessage() {} -func (*DeleteVDSResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{8} -} - -func (m *DeleteVDSResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DeleteVDSResponse.Unmarshal(m, b) -} -func (m *DeleteVDSResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DeleteVDSResponse.Marshal(b, m, deterministic) -} -func (m *DeleteVDSResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeleteVDSResponse.Merge(m, src) -} -func (m *DeleteVDSResponse) XXX_Size() int { - return xxx_messageInfo_DeleteVDSResponse.Size(m) -} -func (m *DeleteVDSResponse) XXX_DiscardUnknown() { - xxx_messageInfo_DeleteVDSResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_DeleteVDSResponse proto.InternalMessageInfo - type QueryPQLRequest struct { Index string `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"` Pql string `protobuf:"bytes,2,opt,name=pql,proto3" json:"pql,omitempty"` @@ -379,7 +36,7 @@ func (m *QueryPQLRequest) Reset() { *m = QueryPQLRequest{} } func (m *QueryPQLRequest) String() string { return proto.CompactTextString(m) } func (*QueryPQLRequest) ProtoMessage() {} func (*QueryPQLRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{9} + return fileDescriptor_ef0691a44d1e275c, []int{0} } func (m *QueryPQLRequest) XXX_Unmarshal(b []byte) error { @@ -425,7 +82,7 @@ func (m *QuerySQLRequest) Reset() { *m = QuerySQLRequest{} } func (m *QuerySQLRequest) String() string { return proto.CompactTextString(m) } func (*QuerySQLRequest) ProtoMessage() {} func (*QuerySQLRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{10} + return fileDescriptor_ef0691a44d1e275c, []int{1} } func (m *QuerySQLRequest) XXX_Unmarshal(b []byte) error { @@ -465,7 +122,7 @@ func (m *StatusError) Reset() { *m = StatusError{} } func (m *StatusError) String() string { return proto.CompactTextString(m) } func (*StatusError) ProtoMessage() {} func (*StatusError) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{11} + return fileDescriptor_ef0691a44d1e275c, []int{2} } func (m *StatusError) XXX_Unmarshal(b []byte) error { @@ -513,7 +170,7 @@ func (m *RowResponse) Reset() { *m = RowResponse{} } func (m *RowResponse) String() string { return proto.CompactTextString(m) } func (*RowResponse) ProtoMessage() {} func (*RowResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{12} + return fileDescriptor_ef0691a44d1e275c, []int{3} } func (m *RowResponse) XXX_Unmarshal(b []byte) error { @@ -566,7 +223,7 @@ func (m *Row) Reset() { *m = Row{} } func (m *Row) String() string { return proto.CompactTextString(m) } func (*Row) ProtoMessage() {} func (*Row) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{13} + return fileDescriptor_ef0691a44d1e275c, []int{4} } func (m *Row) XXX_Unmarshal(b []byte) error { @@ -607,7 +264,7 @@ func (m *TableResponse) Reset() { *m = TableResponse{} } func (m *TableResponse) String() string { return proto.CompactTextString(m) } func (*TableResponse) ProtoMessage() {} func (*TableResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{14} + return fileDescriptor_ef0691a44d1e275c, []int{5} } func (m *TableResponse) XXX_Unmarshal(b []byte) error { @@ -661,7 +318,7 @@ func (m *ColumnInfo) Reset() { *m = ColumnInfo{} } func (m *ColumnInfo) String() string { return proto.CompactTextString(m) } func (*ColumnInfo) ProtoMessage() {} func (*ColumnInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{15} + return fileDescriptor_ef0691a44d1e275c, []int{6} } func (m *ColumnInfo) XXX_Unmarshal(b []byte) error { @@ -717,7 +374,7 @@ func (m *ColumnResponse) Reset() { *m = ColumnResponse{} } func (m *ColumnResponse) String() string { return proto.CompactTextString(m) } func (*ColumnResponse) ProtoMessage() {} func (*ColumnResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{16} + return fileDescriptor_ef0691a44d1e275c, []int{7} } func (m *ColumnResponse) XXX_Unmarshal(b []byte) error { @@ -893,7 +550,7 @@ func (m *Decimal) Reset() { *m = Decimal{} } func (m *Decimal) String() string { return proto.CompactTextString(m) } func (*Decimal) ProtoMessage() {} func (*Decimal) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{17} + return fileDescriptor_ef0691a44d1e275c, []int{8} } func (m *Decimal) XXX_Unmarshal(b []byte) error { @@ -944,7 +601,7 @@ func (m *InspectRequest) Reset() { *m = InspectRequest{} } func (m *InspectRequest) String() string { return proto.CompactTextString(m) } func (*InspectRequest) ProtoMessage() {} func (*InspectRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{18} + return fileDescriptor_ef0691a44d1e275c, []int{9} } func (m *InspectRequest) XXX_Unmarshal(b []byte) error { @@ -1018,7 +675,7 @@ func (m *Uint64Array) Reset() { *m = Uint64Array{} } func (m *Uint64Array) String() string { return proto.CompactTextString(m) } func (*Uint64Array) ProtoMessage() {} func (*Uint64Array) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{19} + return fileDescriptor_ef0691a44d1e275c, []int{10} } func (m *Uint64Array) XXX_Unmarshal(b []byte) error { @@ -1057,7 +714,7 @@ func (m *StringArray) Reset() { *m = StringArray{} } func (m *StringArray) String() string { return proto.CompactTextString(m) } func (*StringArray) ProtoMessage() {} func (*StringArray) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{20} + return fileDescriptor_ef0691a44d1e275c, []int{11} } func (m *StringArray) XXX_Unmarshal(b []byte) error { @@ -1099,7 +756,7 @@ func (m *IdsOrKeys) Reset() { *m = IdsOrKeys{} } func (m *IdsOrKeys) String() string { return proto.CompactTextString(m) } func (*IdsOrKeys) ProtoMessage() {} func (*IdsOrKeys) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{21} + return fileDescriptor_ef0691a44d1e275c, []int{12} } func (m *IdsOrKeys) XXX_Unmarshal(b []byte) error { @@ -1166,15 +823,6 @@ func (*IdsOrKeys) XXX_OneofWrappers() []interface{} { } func init() { - proto.RegisterType((*VDS)(nil), "pilosa.VDS") - proto.RegisterType((*GetVDSsRequest)(nil), "pilosa.GetVDSsRequest") - proto.RegisterType((*GetVDSsResponse)(nil), "pilosa.GetVDSsResponse") - proto.RegisterType((*GetVDSRequest)(nil), "pilosa.GetVDSRequest") - proto.RegisterType((*GetVDSResponse)(nil), "pilosa.GetVDSResponse") - proto.RegisterType((*PostVDSRequest)(nil), "pilosa.PostVDSRequest") - proto.RegisterType((*PostVDSResponse)(nil), "pilosa.PostVDSResponse") - proto.RegisterType((*DeleteVDSRequest)(nil), "pilosa.DeleteVDSRequest") - proto.RegisterType((*DeleteVDSResponse)(nil), "pilosa.DeleteVDSResponse") proto.RegisterType((*QueryPQLRequest)(nil), "pilosa.QueryPQLRequest") proto.RegisterType((*QuerySQLRequest)(nil), "pilosa.QuerySQLRequest") proto.RegisterType((*StatusError)(nil), "pilosa.StatusError") @@ -1193,64 +841,54 @@ func init() { func init() { proto.RegisterFile("pilosa.proto", fileDescriptor_ef0691a44d1e275c) } var fileDescriptor_ef0691a44d1e275c = []byte{ - // 897 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x72, 0xdb, 0x44, - 0x14, 0xb6, 0x90, 0x6a, 0x59, 0xc7, 0x89, 0x93, 0x6c, 0x20, 0xb8, 0x1e, 0xa0, 0x66, 0x3b, 0x53, - 0xcc, 0xc0, 0x94, 0x12, 0x28, 0x4c, 0x21, 0x5c, 0x34, 0x75, 0xc1, 0x19, 0x60, 0x70, 0xd7, 0xd4, - 0xd7, 0x6c, 0xac, 0x75, 0xd0, 0x54, 0xd1, 0x3a, 0x5a, 0x39, 0xa9, 0x5f, 0x80, 0x37, 0xe0, 0x0d, - 0x78, 0x0b, 0xae, 0x78, 0x33, 0x66, 0x7f, 0x25, 0xb9, 0x31, 0x2d, 0xb9, 0xd3, 0x39, 0xdf, 0x77, - 0xfe, 0xf6, 0xec, 0x9e, 0x23, 0xd8, 0x5a, 0x24, 0x29, 0x17, 0xf4, 0xfe, 0x22, 0xe7, 0x05, 0x47, - 0x4d, 0x2d, 0xe1, 0xdb, 0xe0, 0x4f, 0x87, 0x13, 0x84, 0x20, 0xc8, 0xe8, 0x39, 0xeb, 0x7a, 0x7d, - 0x6f, 0x10, 0x11, 0xf5, 0x8d, 0x77, 0xa1, 0xf3, 0x03, 0x2b, 0xa6, 0xc3, 0x89, 0x20, 0xec, 0x62, - 0xc9, 0x44, 0x81, 0x0f, 0x61, 0xc7, 0x69, 0xc4, 0x82, 0x67, 0x82, 0xa1, 0x3b, 0x10, 0x5c, 0xc6, - 0x42, 0x74, 0xbd, 0xbe, 0x3f, 0x68, 0x1f, 0xb6, 0xef, 0x9b, 0x20, 0xd3, 0xe1, 0x84, 0x28, 0x00, - 0xdf, 0x85, 0x6d, 0x6d, 0x63, 0x9c, 0x5c, 0x1b, 0xea, 0x33, 0x1b, 0xca, 0xf9, 0x7d, 0x1f, 0xfc, - 0xcb, 0x58, 0x28, 0xd2, 0x9a, 0x5b, 0xa9, 0xc7, 0xbf, 0x41, 0x67, 0xcc, 0xc5, 0x6b, 0xdc, 0x4a, - 0xdd, 0x0b, 0xb6, 0x12, 0xdd, 0xb7, 0xfa, 0xde, 0xa0, 0x45, 0xd4, 0x37, 0xba, 0x07, 0x9d, 0x22, - 0xa7, 0xb3, 0x17, 0x4f, 0x5f, 0x26, 0xa2, 0x60, 0xd9, 0x8c, 0x75, 0x7d, 0x85, 0xae, 0x69, 0xf1, - 0x1e, 0xec, 0xb8, 0x08, 0x3a, 0x27, 0x7c, 0x0f, 0x76, 0x87, 0x2c, 0x65, 0x05, 0x7b, 0x4d, 0x35, - 0xfb, 0xb0, 0x57, 0xe1, 0x19, 0xe3, 0x47, 0xb0, 0xf3, 0x6c, 0xc9, 0xf2, 0xd5, 0xf8, 0xd9, 0x4f, - 0xd6, 0xf6, 0x6d, 0xb8, 0x95, 0x64, 0x31, 0x7b, 0x69, 0x8c, 0xb5, 0x80, 0x76, 0xc1, 0x5f, 0x5c, - 0xa4, 0x2a, 0xe7, 0x88, 0xc8, 0x4f, 0x7c, 0xd7, 0x98, 0x4e, 0x4a, 0xd3, 0x5d, 0xf0, 0xc5, 0x45, - 0x6a, 0x0c, 0xe5, 0x27, 0xfe, 0x16, 0xda, 0x93, 0x82, 0x16, 0x4b, 0xf1, 0x34, 0xcf, 0x79, 0x2e, - 0xf3, 0x7a, 0xc2, 0x63, 0x9d, 0xd7, 0x36, 0x51, 0xdf, 0xa8, 0x0b, 0xe1, 0xcf, 0x4c, 0x08, 0x7a, - 0xc6, 0x8c, 0x77, 0x2b, 0xe2, 0xbf, 0x3c, 0x68, 0x13, 0x7e, 0xe5, 0x4e, 0xff, 0x53, 0x08, 0x7f, - 0x67, 0x34, 0x66, 0xb9, 0x6d, 0x2c, 0xb2, 0x1d, 0x78, 0xc2, 0xd3, 0xe5, 0x79, 0x76, 0x92, 0xcd, - 0x39, 0xb1, 0x14, 0xf4, 0x00, 0xc2, 0x99, 0x52, 0xcb, 0x93, 0x96, 0xec, 0x83, 0x3a, 0xdb, 0xba, - 0x25, 0x96, 0x86, 0x1e, 0xd6, 0x92, 0x55, 0x1d, 0x68, 0x1f, 0xee, 0x5b, 0xab, 0x0a, 0x44, 0xaa, - 0x3c, 0xfc, 0x35, 0xf8, 0x84, 0x5f, 0x55, 0xe3, 0x79, 0x6f, 0x14, 0x0f, 0xff, 0xe9, 0xc1, 0xf6, - 0xaf, 0xf4, 0x34, 0x65, 0x37, 0xac, 0xf0, 0x0e, 0x04, 0x39, 0xbf, 0xb2, 0xe5, 0xb9, 0xeb, 0x28, - 0x8f, 0x4c, 0x01, 0x37, 0x2d, 0xe8, 0x08, 0xa0, 0x0c, 0x77, 0xed, 0x15, 0xee, 0x41, 0x2b, 0xa6, - 0x05, 0x2d, 0x56, 0x0b, 0xdb, 0x34, 0x27, 0xe3, 0x3f, 0x7c, 0xe8, 0xd4, 0x2b, 0x46, 0x1f, 0x40, - 0x24, 0x8a, 0x3c, 0xc9, 0xce, 0xa6, 0xd4, 0xdc, 0x8e, 0x51, 0x83, 0x94, 0x2a, 0x89, 0x2f, 0x93, - 0xac, 0xf8, 0xea, 0x4b, 0x89, 0x4b, 0x7f, 0x81, 0xc4, 0x9d, 0x0a, 0xbd, 0x07, 0x2d, 0x07, 0xcb, - 0x22, 0xfc, 0x51, 0x83, 0x38, 0x0d, 0xea, 0x41, 0x78, 0xca, 0x79, 0x2a, 0xc1, 0x40, 0x3e, 0x9a, - 0x51, 0x83, 0x58, 0x85, 0xc2, 0x52, 0x7e, 0x2a, 0xb1, 0x5b, 0x7d, 0x6f, 0xb0, 0xa5, 0x30, 0xad, - 0x40, 0xdf, 0x41, 0x47, 0x87, 0x78, 0x9c, 0xe7, 0x74, 0x25, 0x29, 0xcd, 0xfa, 0x01, 0x3d, 0x2f, - 0xd1, 0x51, 0x83, 0xac, 0x91, 0xa5, 0xb9, 0xae, 0xc0, 0x99, 0x87, 0xeb, 0xe7, 0xeb, 0x50, 0x69, - 0x5e, 0x27, 0xa3, 0x3e, 0xc0, 0x3c, 0xe5, 0xd4, 0x54, 0xd5, 0xea, 0x7b, 0x03, 0x6f, 0xd4, 0x20, - 0x15, 0x1d, 0xfa, 0x1c, 0x20, 0x66, 0xb3, 0xe4, 0x9c, 0xaa, 0xd2, 0x22, 0xe5, 0x7c, 0xc7, 0x3a, - 0x1f, 0x6a, 0x44, 0x9a, 0x94, 0xa4, 0xe3, 0x36, 0x44, 0xfa, 0x72, 0x4d, 0x69, 0x8a, 0x1f, 0x42, - 0x68, 0x58, 0xf2, 0x4d, 0x5f, 0xd2, 0x74, 0xa9, 0x9b, 0xe8, 0x13, 0x2d, 0x48, 0xad, 0x98, 0xd1, - 0x54, 0xb7, 0xd0, 0x27, 0x5a, 0xc0, 0x7f, 0x7b, 0xd0, 0x39, 0xc9, 0xc4, 0x82, 0xcd, 0x8a, 0xff, - 0x1e, 0x09, 0x9f, 0x54, 0x1f, 0x98, 0x4c, 0x6e, 0xcf, 0x26, 0x77, 0x12, 0x8b, 0x5f, 0xf2, 0x1f, - 0xd9, 0x4a, 0x94, 0x6f, 0x0b, 0xc3, 0xd6, 0x3c, 0x49, 0x0b, 0x96, 0x7f, 0x9f, 0xb0, 0x34, 0x16, - 0x5d, 0xbf, 0xef, 0x0f, 0x22, 0x52, 0xd3, 0xc9, 0x30, 0x69, 0x72, 0x9e, 0x14, 0xaa, 0x8d, 0x01, - 0xd1, 0x02, 0x3a, 0x80, 0x26, 0x9f, 0xcf, 0x05, 0x2b, 0x54, 0x07, 0x03, 0x62, 0x24, 0xc9, 0xbe, - 0x90, 0xf3, 0x47, 0x75, 0x2d, 0x22, 0x5a, 0xc0, 0x1f, 0x42, 0xbb, 0xd2, 0x36, 0x79, 0x79, 0x2f, - 0x69, 0xaa, 0x5f, 0x53, 0x40, 0xd4, 0xb7, 0xa4, 0x54, 0x5a, 0x53, 0xa3, 0x44, 0x86, 0x72, 0x06, - 0x91, 0xab, 0x01, 0x7d, 0x04, 0x7e, 0xe2, 0x86, 0xfe, 0x86, 0xcb, 0x21, 0x19, 0xe8, 0xe3, 0xca, - 0x60, 0xdf, 0x78, 0x0f, 0x14, 0xe5, 0xb8, 0x09, 0x81, 0x7c, 0x2c, 0x87, 0xff, 0x04, 0xd0, 0x1c, - 0x2b, 0x1a, 0x3a, 0x82, 0xd0, 0xac, 0x31, 0xe4, 0x26, 0x47, 0x7d, 0xd3, 0xf5, 0xde, 0x7d, 0x45, - 0x6f, 0xc6, 0x78, 0x03, 0x3d, 0x82, 0xa6, 0x56, 0xa2, 0x77, 0xea, 0x24, 0x6b, 0x7b, 0xb0, 0xae, - 0x76, 0xa6, 0x47, 0x10, 0x9a, 0x9d, 0x52, 0x06, 0xae, 0xaf, 0xb1, 0x32, 0xf0, 0xfa, 0xf2, 0x69, - 0xa0, 0x63, 0x88, 0xdc, 0x5a, 0x41, 0xdd, 0xf2, 0x7a, 0xd6, 0x37, 0x52, 0xef, 0xf6, 0x35, 0x48, - 0x25, 0x83, 0x96, 0x5d, 0x25, 0xc8, 0x85, 0x5a, 0x5b, 0x2e, 0xbd, 0xfd, 0xea, 0x7c, 0x73, 0xb6, - 0x0f, 0x3c, 0xf4, 0x18, 0xb6, 0x2d, 0xf7, 0x79, 0x46, 0xf3, 0xd5, 0x66, 0x17, 0xee, 0x68, 0x6a, - 0x53, 0xb7, 0x92, 0xc0, 0xf8, 0x95, 0x04, 0xc6, 0xff, 0x23, 0x81, 0xf1, 0xf5, 0x09, 0x8c, 0xdf, - 0x20, 0x81, 0x6f, 0x20, 0x34, 0x6f, 0xae, 0xec, 0x41, 0xfd, 0x11, 0x6e, 0x0c, 0x7f, 0xda, 0x54, - 0xff, 0x4e, 0x5f, 0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x1e, 0xff, 0x07, 0x47, 0x4b, 0x09, 0x00, - 0x00, + // 745 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xdd, 0x72, 0xd3, 0x3a, + 0x10, 0x8e, 0x6b, 0x37, 0x89, 0x37, 0xfd, 0x3b, 0xea, 0x39, 0x3d, 0x99, 0xce, 0x99, 0x83, 0xeb, + 0x5e, 0x10, 0x06, 0xa6, 0x2d, 0x81, 0xc2, 0x00, 0xe5, 0xa2, 0x2d, 0x30, 0xe9, 0x00, 0x43, 0xaa, + 0xd2, 0x5e, 0x70, 0xa7, 0xc4, 0x4a, 0xea, 0x41, 0xb1, 0x12, 0xcb, 0x69, 0xc9, 0x0b, 0xf0, 0x06, + 0xbc, 0x01, 0x6f, 0xc1, 0x3d, 0xcf, 0xc5, 0x48, 0xb2, 0x1c, 0xbb, 0x10, 0xa6, 0xf4, 0xca, 0xda, + 0xfd, 0xbe, 0xd5, 0xee, 0x6a, 0x7f, 0x0c, 0x0b, 0xc3, 0x90, 0x71, 0x41, 0xb6, 0x86, 0x31, 0x4f, + 0x38, 0x2a, 0x6b, 0xc9, 0x7f, 0x02, 0xcb, 0xc7, 0x63, 0x1a, 0x4f, 0xda, 0xc7, 0x6f, 0x30, 0x1d, + 0x8d, 0xa9, 0x48, 0xd0, 0xdf, 0x30, 0x1f, 0x46, 0x01, 0xfd, 0x54, 0xb7, 0x3c, 0xab, 0xe1, 0x62, + 0x2d, 0xa0, 0x15, 0xb0, 0x87, 0x23, 0x56, 0x9f, 0x53, 0x3a, 0x79, 0xf4, 0x37, 0x53, 0xd3, 0x93, + 0xa9, 0xe9, 0x0a, 0xd8, 0x62, 0xc4, 0x52, 0x43, 0x79, 0xf4, 0x9f, 0x41, 0xed, 0x24, 0x21, 0xc9, + 0x58, 0xbc, 0x8c, 0x63, 0x1e, 0x23, 0x04, 0xce, 0x21, 0x0f, 0xa8, 0x62, 0x2c, 0x62, 0x75, 0x46, + 0x75, 0xa8, 0xbc, 0xa5, 0x42, 0x90, 0x3e, 0x4d, 0x6f, 0x37, 0xa2, 0xff, 0xd5, 0x82, 0x1a, 0xe6, + 0x97, 0x98, 0x8a, 0x21, 0x8f, 0x04, 0x45, 0xf7, 0xa0, 0x72, 0x4e, 0x49, 0x40, 0x63, 0x51, 0xb7, + 0x3c, 0xbb, 0x51, 0x6b, 0xa2, 0xad, 0x34, 0xa9, 0x43, 0xce, 0xc6, 0x83, 0xe8, 0x28, 0xea, 0x71, + 0x6c, 0x28, 0x68, 0x07, 0x2a, 0x5d, 0xa5, 0x16, 0xf5, 0x39, 0xc5, 0x5e, 0x2b, 0xb2, 0xcd, 0xb5, + 0xd8, 0xd0, 0xd0, 0x6e, 0x21, 0xd8, 0xba, 0xed, 0x59, 0x8d, 0x5a, 0x73, 0xd5, 0x58, 0xe5, 0x20, + 0x9c, 0xe7, 0xf9, 0x8f, 0xc1, 0xc6, 0xfc, 0x32, 0xef, 0xcf, 0xba, 0x96, 0x3f, 0xff, 0x8b, 0x05, + 0x8b, 0xef, 0x49, 0x87, 0xd1, 0x1b, 0x66, 0x78, 0x0b, 0x9c, 0x98, 0x5f, 0x9a, 0xf4, 0x6a, 0x86, + 0x2a, 0x9f, 0x4c, 0x01, 0x37, 0x4d, 0x68, 0x0f, 0x60, 0xea, 0x4e, 0xd6, 0x2c, 0x22, 0x03, 0x9a, + 0x56, 0x55, 0x9d, 0xd1, 0x3a, 0x54, 0x03, 0x92, 0x90, 0x64, 0x32, 0x34, 0x45, 0xcb, 0x64, 0xff, + 0xb3, 0x0d, 0x4b, 0xc5, 0x8c, 0xd1, 0xff, 0xe0, 0x8a, 0x24, 0x0e, 0xa3, 0xfe, 0x19, 0x49, 0xbb, + 0xa3, 0x55, 0xc2, 0x53, 0x95, 0xc4, 0xc7, 0x61, 0x94, 0x3c, 0x7a, 0x28, 0x71, 0x79, 0x9f, 0x23, + 0xf1, 0x4c, 0x85, 0xfe, 0x83, 0x6a, 0x06, 0xcb, 0x24, 0xec, 0x56, 0x09, 0x67, 0x1a, 0xb4, 0x0e, + 0x95, 0x0e, 0xe7, 0x4c, 0x82, 0x8e, 0x67, 0x35, 0xaa, 0xad, 0x12, 0x36, 0x0a, 0x85, 0x31, 0xde, + 0x91, 0xd8, 0xbc, 0x67, 0x35, 0x16, 0x14, 0xa6, 0x15, 0xe8, 0x39, 0x2c, 0x69, 0x17, 0xfb, 0x71, + 0x4c, 0x26, 0x92, 0x52, 0x2e, 0x3e, 0xd0, 0xe9, 0x14, 0x6d, 0x95, 0xf0, 0x15, 0xb2, 0x34, 0xd7, + 0x19, 0x64, 0xe6, 0x95, 0xab, 0xef, 0x9b, 0xa1, 0xd2, 0xbc, 0x48, 0x46, 0x1e, 0x40, 0x8f, 0x71, + 0x92, 0x66, 0x55, 0xf5, 0xac, 0x86, 0xd5, 0x2a, 0xe1, 0x9c, 0x0e, 0xdd, 0x07, 0x08, 0x68, 0x37, + 0x1c, 0x10, 0x95, 0x9a, 0xab, 0x2e, 0x5f, 0x36, 0x97, 0xbf, 0xd0, 0x88, 0x34, 0x99, 0x92, 0x0e, + 0x6a, 0xe0, 0xea, 0xe6, 0x3a, 0x23, 0xcc, 0xdf, 0x85, 0x4a, 0xca, 0x92, 0x33, 0x7d, 0x41, 0xd8, + 0x58, 0x17, 0xd1, 0xc6, 0x5a, 0x90, 0x5a, 0xd1, 0x25, 0x4c, 0x97, 0xd0, 0xc6, 0x5a, 0xf0, 0xbf, + 0x59, 0xb0, 0x74, 0x14, 0x89, 0x21, 0xed, 0x26, 0xbf, 0x5f, 0x09, 0x77, 0xf3, 0x03, 0x26, 0x83, + 0xfb, 0xcb, 0x04, 0x77, 0x14, 0x88, 0x77, 0xf1, 0x6b, 0x3a, 0x11, 0xd3, 0xd9, 0xf2, 0x61, 0xa1, + 0x17, 0xb2, 0x84, 0xc6, 0xaf, 0x42, 0xca, 0x02, 0x51, 0xb7, 0x3d, 0xbb, 0xe1, 0xe2, 0x82, 0x4e, + 0xba, 0x61, 0xe1, 0x20, 0x4c, 0x54, 0x19, 0x1d, 0xac, 0x05, 0xb4, 0x06, 0x65, 0xde, 0xeb, 0x09, + 0x9a, 0xa8, 0x0a, 0x3a, 0x38, 0x95, 0x24, 0x7b, 0x24, 0xf7, 0x8f, 0xaa, 0x9a, 0x8b, 0xb5, 0xe0, + 0x6f, 0x40, 0x2d, 0x57, 0x36, 0xd9, 0xbc, 0x17, 0x84, 0xe9, 0x69, 0x72, 0xb0, 0x3a, 0x4b, 0x4a, + 0xae, 0x34, 0x05, 0x8a, 0x9b, 0x52, 0xfa, 0xe0, 0x66, 0x39, 0xa0, 0xdb, 0x60, 0x87, 0x81, 0x50, + 0xb9, 0xcf, 0x6c, 0x0e, 0xc9, 0x40, 0x77, 0xc0, 0xf9, 0x48, 0x27, 0xe6, 0x35, 0x66, 0xf4, 0x81, + 0xa2, 0x1c, 0x94, 0xc1, 0x91, 0xc3, 0xd2, 0xfc, 0x3e, 0x07, 0xe5, 0xb6, 0xa2, 0xa1, 0x3d, 0xa8, + 0x9a, 0x7d, 0x8a, 0xfe, 0x35, 0xb6, 0x57, 0x36, 0xec, 0xfa, 0x6a, 0x7e, 0xc8, 0xd3, 0xf1, 0xf2, + 0x4b, 0x3b, 0x16, 0xda, 0x87, 0x45, 0xc3, 0x3d, 0x8d, 0x48, 0x3c, 0x99, 0x7d, 0xc5, 0x3f, 0x06, + 0x28, 0xac, 0x1e, 0xbf, 0x94, 0x05, 0xd0, 0xfe, 0x29, 0x80, 0xf6, 0x1f, 0x04, 0xd0, 0xfe, 0x75, + 0x00, 0xed, 0x6b, 0x04, 0xf0, 0x14, 0x2a, 0x69, 0xe3, 0xa1, 0x6c, 0x77, 0x16, 0x3b, 0x71, 0xa6, + 0xfb, 0x83, 0xcd, 0x0f, 0x1b, 0xfd, 0x30, 0x39, 0x1f, 0x77, 0xb6, 0xba, 0x7c, 0xb0, 0xad, 0x49, + 0xe6, 0x73, 0xd1, 0xdc, 0x56, 0x7f, 0xbd, 0x4e, 0x59, 0x7d, 0x1e, 0xfc, 0x08, 0x00, 0x00, 0xff, + 0xff, 0x60, 0xce, 0x2e, 0x49, 0x0c, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1265,10 +903,6 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type PilosaClient interface { - GetVDSs(ctx context.Context, in *GetVDSsRequest, opts ...grpc.CallOption) (*GetVDSsResponse, error) - GetVDS(ctx context.Context, in *GetVDSRequest, opts ...grpc.CallOption) (*GetVDSResponse, error) - PostVDS(ctx context.Context, in *PostVDSRequest, opts ...grpc.CallOption) (*PostVDSResponse, error) - DeleteVDS(ctx context.Context, in *DeleteVDSRequest, opts ...grpc.CallOption) (*DeleteVDSResponse, error) QuerySQL(ctx context.Context, in *QuerySQLRequest, opts ...grpc.CallOption) (Pilosa_QuerySQLClient, error) QuerySQLUnary(ctx context.Context, in *QuerySQLRequest, opts ...grpc.CallOption) (*TableResponse, error) QueryPQL(ctx context.Context, in *QueryPQLRequest, opts ...grpc.CallOption) (Pilosa_QueryPQLClient, error) @@ -1284,42 +918,6 @@ func NewPilosaClient(cc *grpc.ClientConn) PilosaClient { return &pilosaClient{cc} } -func (c *pilosaClient) GetVDSs(ctx context.Context, in *GetVDSsRequest, opts ...grpc.CallOption) (*GetVDSsResponse, error) { - out := new(GetVDSsResponse) - err := c.cc.Invoke(ctx, "/pilosa.Pilosa/GetVDSs", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *pilosaClient) GetVDS(ctx context.Context, in *GetVDSRequest, opts ...grpc.CallOption) (*GetVDSResponse, error) { - out := new(GetVDSResponse) - err := c.cc.Invoke(ctx, "/pilosa.Pilosa/GetVDS", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *pilosaClient) PostVDS(ctx context.Context, in *PostVDSRequest, opts ...grpc.CallOption) (*PostVDSResponse, error) { - out := new(PostVDSResponse) - err := c.cc.Invoke(ctx, "/pilosa.Pilosa/PostVDS", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *pilosaClient) DeleteVDS(ctx context.Context, in *DeleteVDSRequest, opts ...grpc.CallOption) (*DeleteVDSResponse, error) { - out := new(DeleteVDSResponse) - err := c.cc.Invoke(ctx, "/pilosa.Pilosa/DeleteVDS", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *pilosaClient) QuerySQL(ctx context.Context, in *QuerySQLRequest, opts ...grpc.CallOption) (Pilosa_QuerySQLClient, error) { stream, err := c.cc.NewStream(ctx, &_Pilosa_serviceDesc.Streams[0], "/pilosa.Pilosa/QuerySQL", opts...) if err != nil { @@ -1436,10 +1034,6 @@ func (x *pilosaInspectClient) Recv() (*RowResponse, error) { // PilosaServer is the server API for Pilosa service. type PilosaServer interface { - GetVDSs(context.Context, *GetVDSsRequest) (*GetVDSsResponse, error) - GetVDS(context.Context, *GetVDSRequest) (*GetVDSResponse, error) - PostVDS(context.Context, *PostVDSRequest) (*PostVDSResponse, error) - DeleteVDS(context.Context, *DeleteVDSRequest) (*DeleteVDSResponse, error) QuerySQL(*QuerySQLRequest, Pilosa_QuerySQLServer) error QuerySQLUnary(context.Context, *QuerySQLRequest) (*TableResponse, error) QueryPQL(*QueryPQLRequest, Pilosa_QueryPQLServer) error @@ -1451,18 +1045,6 @@ type PilosaServer interface { type UnimplementedPilosaServer struct { } -func (*UnimplementedPilosaServer) GetVDSs(ctx context.Context, req *GetVDSsRequest) (*GetVDSsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetVDSs not implemented") -} -func (*UnimplementedPilosaServer) GetVDS(ctx context.Context, req *GetVDSRequest) (*GetVDSResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetVDS not implemented") -} -func (*UnimplementedPilosaServer) PostVDS(ctx context.Context, req *PostVDSRequest) (*PostVDSResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method PostVDS not implemented") -} -func (*UnimplementedPilosaServer) DeleteVDS(ctx context.Context, req *DeleteVDSRequest) (*DeleteVDSResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method DeleteVDS not implemented") -} func (*UnimplementedPilosaServer) QuerySQL(req *QuerySQLRequest, srv Pilosa_QuerySQLServer) error { return status.Errorf(codes.Unimplemented, "method QuerySQL not implemented") } @@ -1483,78 +1065,6 @@ func RegisterPilosaServer(s *grpc.Server, srv PilosaServer) { s.RegisterService(&_Pilosa_serviceDesc, srv) } -func _Pilosa_GetVDSs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetVDSsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(PilosaServer).GetVDSs(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/pilosa.Pilosa/GetVDSs", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PilosaServer).GetVDSs(ctx, req.(*GetVDSsRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Pilosa_GetVDS_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetVDSRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(PilosaServer).GetVDS(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/pilosa.Pilosa/GetVDS", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PilosaServer).GetVDS(ctx, req.(*GetVDSRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Pilosa_PostVDS_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(PostVDSRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(PilosaServer).PostVDS(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/pilosa.Pilosa/PostVDS", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PilosaServer).PostVDS(ctx, req.(*PostVDSRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Pilosa_DeleteVDS_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(DeleteVDSRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(PilosaServer).DeleteVDS(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/pilosa.Pilosa/DeleteVDS", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PilosaServer).DeleteVDS(ctx, req.(*DeleteVDSRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Pilosa_QuerySQL_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(QuerySQLRequest) if err := stream.RecvMsg(m); err != nil { @@ -1658,22 +1168,6 @@ var _Pilosa_serviceDesc = grpc.ServiceDesc{ ServiceName: "pilosa.Pilosa", HandlerType: (*PilosaServer)(nil), Methods: []grpc.MethodDesc{ - { - MethodName: "GetVDSs", - Handler: _Pilosa_GetVDSs_Handler, - }, - { - MethodName: "GetVDS", - Handler: _Pilosa_GetVDS_Handler, - }, - { - MethodName: "PostVDS", - Handler: _Pilosa_PostVDS_Handler, - }, - { - MethodName: "DeleteVDS", - Handler: _Pilosa_DeleteVDS_Handler, - }, { MethodName: "QuerySQLUnary", Handler: _Pilosa_QuerySQLUnary_Handler, diff --git a/proto/pilosa.proto b/proto/pilosa.proto index f51a45502..05bfbd9e4 100644 --- a/proto/pilosa.proto +++ b/proto/pilosa.proto @@ -1,42 +1,9 @@ syntax = "proto3"; package pilosa; -import "public.proto"; +//import "public.proto"; -message VDS { - string name = 1; -} - -message GetVDSsRequest { -} - -message GetVDSsResponse { - repeated VDS vdss = 1; -} - -message GetVDSRequest { - string name = 1; -} - -message GetVDSResponse { - VDS vds = 1; -} - -message PostVDSRequest { - string name = 1; - bool keys = 2; - bool trackExistence = 3; -} - -message PostVDSResponse { -} - -message DeleteVDSRequest { - string name = 1; -} - -message DeleteVDSResponse { -} +option go_package = "github.com/pilosa/pilosa/v2/proto"; message QueryPQLRequest { string index = 1; @@ -117,14 +84,10 @@ message IdsOrKeys { } service Pilosa { - rpc GetVDSs(GetVDSsRequest) returns (GetVDSsResponse) {}; - rpc GetVDS(GetVDSRequest) returns (GetVDSResponse) {}; - rpc PostVDS(PostVDSRequest) returns (PostVDSResponse) {}; - rpc DeleteVDS(DeleteVDSRequest) returns (DeleteVDSResponse) {}; rpc QuerySQL(QuerySQLRequest) returns (stream RowResponse) {}; rpc QuerySQLUnary(QuerySQLRequest) returns (TableResponse) {}; rpc QueryPQL(QueryPQLRequest) returns (stream RowResponse) {}; rpc QueryPQLUnary(QueryPQLRequest) returns (TableResponse) {}; rpc Inspect(InspectRequest) returns (stream RowResponse) {}; - rpc ImportAtomicRecord(stream AtomicRecord) returns (AtomicImportResponse) {}; + //rpc ImportAtomicRecord(stream AtomicRecord) returns (AtomicImportResponse) {}; } diff --git a/proto/vdsm/vdsm.pb.go b/proto/vdsm/vdsm.pb.go new file mode 100644 index 000000000..99f04cda2 --- /dev/null +++ b/proto/vdsm/vdsm.pb.go @@ -0,0 +1,1071 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: vdsm/vdsm.proto + +package vdsm + +import ( + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto1 "github.com/pilosa/pilosa/v2/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. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// 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.ProtoPackageIsVersion3 // please upgrade the proto package + +// deprecated +type DataSource struct { + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` + Type string `protobuf:"bytes,4,opt,name=type,proto3" json:"type,omitempty"` + Config map[string]string `protobuf:"bytes,5,rep,name=config,proto3" json:"config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Status string `protobuf:"bytes,6,opt,name=status,proto3" json:"status,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DataSource) Reset() { *m = DataSource{} } +func (m *DataSource) String() string { return proto.CompactTextString(m) } +func (*DataSource) ProtoMessage() {} +func (*DataSource) Descriptor() ([]byte, []int) { + return fileDescriptor_3849c3e549495f50, []int{0} +} + +func (m *DataSource) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DataSource.Unmarshal(m, b) +} +func (m *DataSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DataSource.Marshal(b, m, deterministic) +} +func (m *DataSource) XXX_Merge(src proto.Message) { + xxx_messageInfo_DataSource.Merge(m, src) +} +func (m *DataSource) XXX_Size() int { + return xxx_messageInfo_DataSource.Size(m) +} +func (m *DataSource) XXX_DiscardUnknown() { + xxx_messageInfo_DataSource.DiscardUnknown(m) +} + +var xxx_messageInfo_DataSource proto.InternalMessageInfo + +func (m *DataSource) GetId() int64 { + if m != nil { + return m.Id + } + return 0 +} + +func (m *DataSource) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *DataSource) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + +func (m *DataSource) GetType() string { + if m != nil { + return m.Type + } + return "" +} + +func (m *DataSource) GetConfig() map[string]string { + if m != nil { + return m.Config + } + return nil +} + +func (m *DataSource) GetStatus() string { + if m != nil { + return m.Status + } + return "" +} + +type VDS struct { + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` + PilosaIndex string `protobuf:"bytes,4,opt,name=pilosa_index,json=pilosaIndex,proto3" json:"pilosa_index,omitempty"` + Datasources []*DataSource `protobuf:"bytes,5,rep,name=datasources,proto3" json:"datasources,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *VDS) Reset() { *m = VDS{} } +func (m *VDS) String() string { return proto.CompactTextString(m) } +func (*VDS) ProtoMessage() {} +func (*VDS) Descriptor() ([]byte, []int) { + return fileDescriptor_3849c3e549495f50, []int{1} +} + +func (m *VDS) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_VDS.Unmarshal(m, b) +} +func (m *VDS) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_VDS.Marshal(b, m, deterministic) +} +func (m *VDS) XXX_Merge(src proto.Message) { + xxx_messageInfo_VDS.Merge(m, src) +} +func (m *VDS) XXX_Size() int { + return xxx_messageInfo_VDS.Size(m) +} +func (m *VDS) XXX_DiscardUnknown() { + xxx_messageInfo_VDS.DiscardUnknown(m) +} + +var xxx_messageInfo_VDS proto.InternalMessageInfo + +func (m *VDS) GetId() string { + if m != nil { + return m.Id + } + return "" +} + +func (m *VDS) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *VDS) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + +func (m *VDS) GetPilosaIndex() string { + if m != nil { + return m.PilosaIndex + } + return "" +} + +func (m *VDS) GetDatasources() []*DataSource { + if m != nil { + return m.Datasources + } + return nil +} + +type GetVDSsRequest struct { + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetVDSsRequest) Reset() { *m = GetVDSsRequest{} } +func (m *GetVDSsRequest) String() string { return proto.CompactTextString(m) } +func (*GetVDSsRequest) ProtoMessage() {} +func (*GetVDSsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_3849c3e549495f50, []int{2} +} + +func (m *GetVDSsRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetVDSsRequest.Unmarshal(m, b) +} +func (m *GetVDSsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetVDSsRequest.Marshal(b, m, deterministic) +} +func (m *GetVDSsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetVDSsRequest.Merge(m, src) +} +func (m *GetVDSsRequest) XXX_Size() int { + return xxx_messageInfo_GetVDSsRequest.Size(m) +} +func (m *GetVDSsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetVDSsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetVDSsRequest proto.InternalMessageInfo + +type GetVDSsResponse struct { + Vdss []*VDS `protobuf:"bytes,1,rep,name=vdss,proto3" json:"vdss,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetVDSsResponse) Reset() { *m = GetVDSsResponse{} } +func (m *GetVDSsResponse) String() string { return proto.CompactTextString(m) } +func (*GetVDSsResponse) ProtoMessage() {} +func (*GetVDSsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_3849c3e549495f50, []int{3} +} + +func (m *GetVDSsResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetVDSsResponse.Unmarshal(m, b) +} +func (m *GetVDSsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetVDSsResponse.Marshal(b, m, deterministic) +} +func (m *GetVDSsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetVDSsResponse.Merge(m, src) +} +func (m *GetVDSsResponse) XXX_Size() int { + return xxx_messageInfo_GetVDSsResponse.Size(m) +} +func (m *GetVDSsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetVDSsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetVDSsResponse proto.InternalMessageInfo + +func (m *GetVDSsResponse) GetVdss() []*VDS { + if m != nil { + return m.Vdss + } + return nil +} + +type GetVDSRequest struct { + // Types that are valid to be assigned to IdOrName: + // *GetVDSRequest_Id + // *GetVDSRequest_Name + IdOrName isGetVDSRequest_IdOrName `protobuf_oneof:"idOrName"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetVDSRequest) Reset() { *m = GetVDSRequest{} } +func (m *GetVDSRequest) String() string { return proto.CompactTextString(m) } +func (*GetVDSRequest) ProtoMessage() {} +func (*GetVDSRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_3849c3e549495f50, []int{4} +} + +func (m *GetVDSRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetVDSRequest.Unmarshal(m, b) +} +func (m *GetVDSRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetVDSRequest.Marshal(b, m, deterministic) +} +func (m *GetVDSRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetVDSRequest.Merge(m, src) +} +func (m *GetVDSRequest) XXX_Size() int { + return xxx_messageInfo_GetVDSRequest.Size(m) +} +func (m *GetVDSRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetVDSRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetVDSRequest proto.InternalMessageInfo + +type isGetVDSRequest_IdOrName interface { + isGetVDSRequest_IdOrName() +} + +type GetVDSRequest_Id struct { + Id string `protobuf:"bytes,1,opt,name=id,proto3,oneof"` +} + +type GetVDSRequest_Name struct { + Name string `protobuf:"bytes,2,opt,name=name,proto3,oneof"` +} + +func (*GetVDSRequest_Id) isGetVDSRequest_IdOrName() {} + +func (*GetVDSRequest_Name) isGetVDSRequest_IdOrName() {} + +func (m *GetVDSRequest) GetIdOrName() isGetVDSRequest_IdOrName { + if m != nil { + return m.IdOrName + } + return nil +} + +func (m *GetVDSRequest) GetId() string { + if x, ok := m.GetIdOrName().(*GetVDSRequest_Id); ok { + return x.Id + } + return "" +} + +func (m *GetVDSRequest) GetName() string { + if x, ok := m.GetIdOrName().(*GetVDSRequest_Name); ok { + return x.Name + } + return "" +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*GetVDSRequest) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*GetVDSRequest_Id)(nil), + (*GetVDSRequest_Name)(nil), + } +} + +type GetVDSResponse struct { + Vds *VDS `protobuf:"bytes,1,opt,name=vds,proto3" json:"vds,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetVDSResponse) Reset() { *m = GetVDSResponse{} } +func (m *GetVDSResponse) String() string { return proto.CompactTextString(m) } +func (*GetVDSResponse) ProtoMessage() {} +func (*GetVDSResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_3849c3e549495f50, []int{5} +} + +func (m *GetVDSResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetVDSResponse.Unmarshal(m, b) +} +func (m *GetVDSResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetVDSResponse.Marshal(b, m, deterministic) +} +func (m *GetVDSResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetVDSResponse.Merge(m, src) +} +func (m *GetVDSResponse) XXX_Size() int { + return xxx_messageInfo_GetVDSResponse.Size(m) +} +func (m *GetVDSResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetVDSResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetVDSResponse proto.InternalMessageInfo + +func (m *GetVDSResponse) GetVds() *VDS { + if m != nil { + return m.Vds + } + return nil +} + +type PostVDSRequest struct { + Definition string `protobuf:"bytes,1,opt,name=definition,proto3" json:"definition,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *PostVDSRequest) Reset() { *m = PostVDSRequest{} } +func (m *PostVDSRequest) String() string { return proto.CompactTextString(m) } +func (*PostVDSRequest) ProtoMessage() {} +func (*PostVDSRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_3849c3e549495f50, []int{6} +} + +func (m *PostVDSRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_PostVDSRequest.Unmarshal(m, b) +} +func (m *PostVDSRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_PostVDSRequest.Marshal(b, m, deterministic) +} +func (m *PostVDSRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_PostVDSRequest.Merge(m, src) +} +func (m *PostVDSRequest) XXX_Size() int { + return xxx_messageInfo_PostVDSRequest.Size(m) +} +func (m *PostVDSRequest) XXX_DiscardUnknown() { + xxx_messageInfo_PostVDSRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_PostVDSRequest proto.InternalMessageInfo + +func (m *PostVDSRequest) GetDefinition() string { + if m != nil { + return m.Definition + } + return "" +} + +type PostVDSResponse struct { + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Uri string `protobuf:"bytes,2,opt,name=uri,proto3" json:"uri,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *PostVDSResponse) Reset() { *m = PostVDSResponse{} } +func (m *PostVDSResponse) String() string { return proto.CompactTextString(m) } +func (*PostVDSResponse) ProtoMessage() {} +func (*PostVDSResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_3849c3e549495f50, []int{7} +} + +func (m *PostVDSResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_PostVDSResponse.Unmarshal(m, b) +} +func (m *PostVDSResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_PostVDSResponse.Marshal(b, m, deterministic) +} +func (m *PostVDSResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_PostVDSResponse.Merge(m, src) +} +func (m *PostVDSResponse) XXX_Size() int { + return xxx_messageInfo_PostVDSResponse.Size(m) +} +func (m *PostVDSResponse) XXX_DiscardUnknown() { + xxx_messageInfo_PostVDSResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_PostVDSResponse proto.InternalMessageInfo + +func (m *PostVDSResponse) GetId() string { + if m != nil { + return m.Id + } + return "" +} + +func (m *PostVDSResponse) GetUri() string { + if m != nil { + return m.Uri + } + return "" +} + +type DeleteVDSRequest struct { + // Types that are valid to be assigned to IdOrName: + // *DeleteVDSRequest_Id + // *DeleteVDSRequest_Name + IdOrName isDeleteVDSRequest_IdOrName `protobuf_oneof:"idOrName"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DeleteVDSRequest) Reset() { *m = DeleteVDSRequest{} } +func (m *DeleteVDSRequest) String() string { return proto.CompactTextString(m) } +func (*DeleteVDSRequest) ProtoMessage() {} +func (*DeleteVDSRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_3849c3e549495f50, []int{8} +} + +func (m *DeleteVDSRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DeleteVDSRequest.Unmarshal(m, b) +} +func (m *DeleteVDSRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DeleteVDSRequest.Marshal(b, m, deterministic) +} +func (m *DeleteVDSRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteVDSRequest.Merge(m, src) +} +func (m *DeleteVDSRequest) XXX_Size() int { + return xxx_messageInfo_DeleteVDSRequest.Size(m) +} +func (m *DeleteVDSRequest) XXX_DiscardUnknown() { + xxx_messageInfo_DeleteVDSRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_DeleteVDSRequest proto.InternalMessageInfo + +type isDeleteVDSRequest_IdOrName interface { + isDeleteVDSRequest_IdOrName() +} + +type DeleteVDSRequest_Id struct { + Id string `protobuf:"bytes,1,opt,name=id,proto3,oneof"` +} + +type DeleteVDSRequest_Name struct { + Name string `protobuf:"bytes,2,opt,name=name,proto3,oneof"` +} + +func (*DeleteVDSRequest_Id) isDeleteVDSRequest_IdOrName() {} + +func (*DeleteVDSRequest_Name) isDeleteVDSRequest_IdOrName() {} + +func (m *DeleteVDSRequest) GetIdOrName() isDeleteVDSRequest_IdOrName { + if m != nil { + return m.IdOrName + } + return nil +} + +func (m *DeleteVDSRequest) GetId() string { + if x, ok := m.GetIdOrName().(*DeleteVDSRequest_Id); ok { + return x.Id + } + return "" +} + +func (m *DeleteVDSRequest) GetName() string { + if x, ok := m.GetIdOrName().(*DeleteVDSRequest_Name); ok { + return x.Name + } + return "" +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*DeleteVDSRequest) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*DeleteVDSRequest_Id)(nil), + (*DeleteVDSRequest_Name)(nil), + } +} + +type DeleteVDSResponse struct { + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DeleteVDSResponse) Reset() { *m = DeleteVDSResponse{} } +func (m *DeleteVDSResponse) String() string { return proto.CompactTextString(m) } +func (*DeleteVDSResponse) ProtoMessage() {} +func (*DeleteVDSResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_3849c3e549495f50, []int{9} +} + +func (m *DeleteVDSResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DeleteVDSResponse.Unmarshal(m, b) +} +func (m *DeleteVDSResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DeleteVDSResponse.Marshal(b, m, deterministic) +} +func (m *DeleteVDSResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteVDSResponse.Merge(m, src) +} +func (m *DeleteVDSResponse) XXX_Size() int { + return xxx_messageInfo_DeleteVDSResponse.Size(m) +} +func (m *DeleteVDSResponse) XXX_DiscardUnknown() { + xxx_messageInfo_DeleteVDSResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_DeleteVDSResponse proto.InternalMessageInfo + +func init() { + proto.RegisterType((*DataSource)(nil), "vdsm.DataSource") + proto.RegisterMapType((map[string]string)(nil), "vdsm.DataSource.ConfigEntry") + proto.RegisterType((*VDS)(nil), "vdsm.VDS") + proto.RegisterType((*GetVDSsRequest)(nil), "vdsm.GetVDSsRequest") + proto.RegisterType((*GetVDSsResponse)(nil), "vdsm.GetVDSsResponse") + proto.RegisterType((*GetVDSRequest)(nil), "vdsm.GetVDSRequest") + proto.RegisterType((*GetVDSResponse)(nil), "vdsm.GetVDSResponse") + proto.RegisterType((*PostVDSRequest)(nil), "vdsm.PostVDSRequest") + proto.RegisterType((*PostVDSResponse)(nil), "vdsm.PostVDSResponse") + proto.RegisterType((*DeleteVDSRequest)(nil), "vdsm.DeleteVDSRequest") + proto.RegisterType((*DeleteVDSResponse)(nil), "vdsm.DeleteVDSResponse") +} + +func init() { proto.RegisterFile("vdsm/vdsm.proto", fileDescriptor_3849c3e549495f50) } + +var fileDescriptor_3849c3e549495f50 = []byte{ + // 604 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcd, 0x6e, 0xd3, 0x4c, + 0x14, 0x8d, 0xe3, 0x34, 0x6d, 0x6e, 0xbe, 0xb6, 0xfe, 0xa6, 0x69, 0x6b, 0x85, 0x1f, 0x05, 0x2f, + 0x50, 0x36, 0xa4, 0x51, 0x0a, 0x52, 0xa8, 0x10, 0x12, 0x6d, 0x80, 0x56, 0xe2, 0x27, 0x75, 0x20, + 0x0b, 0x36, 0x68, 0x62, 0x4f, 0xcb, 0x08, 0xc7, 0x36, 0x9e, 0x71, 0x20, 0xaf, 0xc3, 0x2b, 0xf0, + 0x60, 0xbc, 0x02, 0xf2, 0xfc, 0x38, 0x4e, 0x5a, 0x04, 0xa8, 0x9b, 0xf6, 0xfa, 0xcc, 0x3d, 0xf7, + 0x9c, 0x73, 0x27, 0x1a, 0xd8, 0x9e, 0xf9, 0x6c, 0x7a, 0x90, 0xfd, 0xe9, 0xc4, 0x49, 0xc4, 0x23, + 0x54, 0xc9, 0xea, 0xe6, 0x7f, 0x31, 0x0d, 0x22, 0x86, 0x25, 0xe6, 0xfc, 0x34, 0x00, 0x06, 0x98, + 0xe3, 0x51, 0x94, 0x26, 0x1e, 0x41, 0x5b, 0x50, 0xa6, 0xbe, 0x6d, 0xb4, 0x8c, 0xb6, 0xe9, 0x96, + 0xa9, 0x8f, 0x10, 0x54, 0x42, 0x3c, 0x25, 0x76, 0xb9, 0x65, 0xb4, 0x6b, 0xae, 0xa8, 0x51, 0x0b, + 0xea, 0x3e, 0x61, 0x5e, 0x42, 0x63, 0x4e, 0xa3, 0xd0, 0x36, 0xc5, 0x51, 0x11, 0xca, 0x58, 0x7c, + 0x1e, 0x13, 0xbb, 0x22, 0x59, 0x59, 0x8d, 0x1e, 0x42, 0xd5, 0x8b, 0xc2, 0x0b, 0x7a, 0x69, 0xaf, + 0xb5, 0xcc, 0x76, 0xbd, 0x77, 0xbb, 0x23, 0x9c, 0x2d, 0xb4, 0x3b, 0x27, 0xe2, 0xf8, 0x79, 0xc8, + 0x93, 0xb9, 0xab, 0x7a, 0xd1, 0x1e, 0x54, 0x19, 0xc7, 0x3c, 0x65, 0x76, 0x55, 0xcc, 0x52, 0x5f, + 0xcd, 0xc7, 0x50, 0x2f, 0xb4, 0x23, 0x0b, 0xcc, 0xcf, 0x64, 0x2e, 0x7c, 0xd7, 0xdc, 0xac, 0x44, + 0x0d, 0x58, 0x9b, 0xe1, 0x20, 0xd5, 0xce, 0xe5, 0xc7, 0x51, 0xb9, 0x6f, 0x38, 0xdf, 0x0d, 0x30, + 0xc7, 0x83, 0x51, 0x21, 0x6a, 0xed, 0x06, 0x51, 0xef, 0x81, 0xda, 0xe7, 0x47, 0x1a, 0xfa, 0xe4, + 0x9b, 0x8a, 0x5c, 0x97, 0xd8, 0x59, 0x06, 0xa1, 0x1e, 0xd4, 0x7d, 0xcc, 0x31, 0x13, 0x29, 0x99, + 0x8a, 0x6f, 0xad, 0xc6, 0x77, 0x8b, 0x4d, 0x8e, 0x05, 0x5b, 0x2f, 0x09, 0x1f, 0x0f, 0x46, 0xcc, + 0x25, 0x5f, 0x52, 0xc2, 0xb8, 0xd3, 0x85, 0xed, 0x1c, 0x61, 0x71, 0x14, 0x32, 0x82, 0xee, 0x40, + 0x76, 0xa3, 0xcc, 0x36, 0xc4, 0xc4, 0x9a, 0x9c, 0x38, 0x1e, 0x8c, 0x5c, 0x01, 0x3b, 0x27, 0xb0, + 0x29, 0x19, 0x6a, 0x04, 0xb2, 0x16, 0x89, 0x4f, 0x4b, 0x22, 0x73, 0xa3, 0x98, 0xf9, 0xb4, 0x24, + 0x53, 0x1f, 0x03, 0x6c, 0x50, 0xff, 0x6d, 0xf2, 0x06, 0x4f, 0x89, 0xf3, 0x40, 0x1b, 0xc9, 0x55, + 0x6f, 0x81, 0x39, 0xf3, 0x99, 0x18, 0xb3, 0x24, 0x9a, 0xa1, 0x4e, 0x17, 0xb6, 0x86, 0x11, 0x2b, + 0x8a, 0xde, 0x05, 0xf0, 0xc9, 0x05, 0x0d, 0xa9, 0xd8, 0xa0, 0x5c, 0x77, 0x01, 0x71, 0x0e, 0x61, + 0x3b, 0x67, 0x28, 0x85, 0xd5, 0x9b, 0xb1, 0xc0, 0x4c, 0x13, 0xaa, 0x2e, 0x26, 0x2b, 0x9d, 0x17, + 0x60, 0x0d, 0x48, 0x40, 0x38, 0xb9, 0x61, 0xba, 0x1d, 0xf8, 0xbf, 0x30, 0x47, 0xca, 0xf7, 0x7e, + 0x54, 0x60, 0xe3, 0x75, 0x14, 0x10, 0x2f, 0x0d, 0x30, 0xea, 0xc3, 0xba, 0x5a, 0x3b, 0x6a, 0xc8, + 0xac, 0xcb, 0xf7, 0xd2, 0xdc, 0x5d, 0x41, 0xe5, 0x10, 0xa7, 0x84, 0x1e, 0x41, 0x55, 0x82, 0x68, + 0xa7, 0xd8, 0xa2, 0x79, 0x8d, 0x65, 0x30, 0xa7, 0xf5, 0x61, 0x5d, 0xed, 0x43, 0x0b, 0x2e, 0x2f, + 0x54, 0x0b, 0xae, 0x2c, 0xcd, 0x29, 0xa1, 0xa7, 0x50, 0xcb, 0xc3, 0xa0, 0x3d, 0xf5, 0xfb, 0x5a, + 0xd9, 0x52, 0x73, 0xff, 0x0a, 0x9e, 0xf3, 0x9f, 0xc0, 0xc6, 0x79, 0x4a, 0x92, 0xf9, 0xe8, 0xfc, + 0x15, 0xda, 0xef, 0xa8, 0x57, 0x42, 0x23, 0x9a, 0xbf, 0xa3, 0x0f, 0xdc, 0xe8, 0xeb, 0x82, 0xdb, + 0x35, 0xd0, 0x33, 0xd8, 0xd4, 0xbd, 0xef, 0x43, 0x9c, 0xcc, 0x7f, 0x3f, 0x62, 0x57, 0x1f, 0xbc, + 0xc3, 0x93, 0x80, 0x5c, 0x63, 0x60, 0x78, 0xc5, 0xc0, 0xf0, 0x1f, 0x0c, 0x0c, 0xaf, 0x37, 0x30, + 0xfc, 0x0b, 0x03, 0x47, 0xb0, 0x7e, 0x16, 0xb2, 0x98, 0x78, 0x1c, 0xed, 0xe9, 0x1e, 0x05, 0xfc, + 0x49, 0xfe, 0xb8, 0xfd, 0xe1, 0xfe, 0x25, 0xe5, 0x9f, 0xd2, 0x49, 0xc7, 0x8b, 0xa6, 0x07, 0xb2, + 0x49, 0xff, 0x9b, 0xf5, 0x0e, 0xc4, 0x6b, 0x2b, 0x1e, 0xe3, 0x49, 0x55, 0xd4, 0x87, 0xbf, 0x02, + 0x00, 0x00, 0xff, 0xff, 0x39, 0x92, 0xf5, 0x8e, 0xa0, 0x05, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +const _ = grpc.SupportPackageIsVersion4 + +// MoleculaClient is the client API for Molecula service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type MoleculaClient interface { + GetVDSs(ctx context.Context, in *GetVDSsRequest, opts ...grpc.CallOption) (*GetVDSsResponse, error) + GetVDS(ctx context.Context, in *GetVDSRequest, opts ...grpc.CallOption) (*GetVDSResponse, error) + PostVDS(ctx context.Context, in *PostVDSRequest, opts ...grpc.CallOption) (*PostVDSResponse, error) + DeleteVDS(ctx context.Context, in *DeleteVDSRequest, opts ...grpc.CallOption) (*DeleteVDSResponse, error) + QuerySQL(ctx context.Context, in *proto1.QuerySQLRequest, opts ...grpc.CallOption) (Molecula_QuerySQLClient, error) + QuerySQLUnary(ctx context.Context, in *proto1.QuerySQLRequest, opts ...grpc.CallOption) (*proto1.TableResponse, error) + QueryPQL(ctx context.Context, in *proto1.QueryPQLRequest, opts ...grpc.CallOption) (Molecula_QueryPQLClient, error) + QueryPQLUnary(ctx context.Context, in *proto1.QueryPQLRequest, opts ...grpc.CallOption) (*proto1.TableResponse, error) + Inspect(ctx context.Context, in *proto1.InspectRequest, opts ...grpc.CallOption) (Molecula_InspectClient, error) +} + +type moleculaClient struct { + cc *grpc.ClientConn +} + +func NewMoleculaClient(cc *grpc.ClientConn) MoleculaClient { + return &moleculaClient{cc} +} + +func (c *moleculaClient) GetVDSs(ctx context.Context, in *GetVDSsRequest, opts ...grpc.CallOption) (*GetVDSsResponse, error) { + out := new(GetVDSsResponse) + err := c.cc.Invoke(ctx, "/vdsm.Molecula/GetVDSs", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *moleculaClient) GetVDS(ctx context.Context, in *GetVDSRequest, opts ...grpc.CallOption) (*GetVDSResponse, error) { + out := new(GetVDSResponse) + err := c.cc.Invoke(ctx, "/vdsm.Molecula/GetVDS", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *moleculaClient) PostVDS(ctx context.Context, in *PostVDSRequest, opts ...grpc.CallOption) (*PostVDSResponse, error) { + out := new(PostVDSResponse) + err := c.cc.Invoke(ctx, "/vdsm.Molecula/PostVDS", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *moleculaClient) DeleteVDS(ctx context.Context, in *DeleteVDSRequest, opts ...grpc.CallOption) (*DeleteVDSResponse, error) { + out := new(DeleteVDSResponse) + err := c.cc.Invoke(ctx, "/vdsm.Molecula/DeleteVDS", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *moleculaClient) QuerySQL(ctx context.Context, in *proto1.QuerySQLRequest, opts ...grpc.CallOption) (Molecula_QuerySQLClient, error) { + stream, err := c.cc.NewStream(ctx, &_Molecula_serviceDesc.Streams[0], "/vdsm.Molecula/QuerySQL", opts...) + if err != nil { + return nil, err + } + x := &moleculaQuerySQLClient{stream} + if err := x.ClientStream.SendMsg(in); err != nil { + return nil, err + } + if err := x.ClientStream.CloseSend(); err != nil { + return nil, err + } + return x, nil +} + +type Molecula_QuerySQLClient interface { + Recv() (*proto1.RowResponse, error) + grpc.ClientStream +} + +type moleculaQuerySQLClient struct { + grpc.ClientStream +} + +func (x *moleculaQuerySQLClient) Recv() (*proto1.RowResponse, error) { + m := new(proto1.RowResponse) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +func (c *moleculaClient) QuerySQLUnary(ctx context.Context, in *proto1.QuerySQLRequest, opts ...grpc.CallOption) (*proto1.TableResponse, error) { + out := new(proto1.TableResponse) + err := c.cc.Invoke(ctx, "/vdsm.Molecula/QuerySQLUnary", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *moleculaClient) QueryPQL(ctx context.Context, in *proto1.QueryPQLRequest, opts ...grpc.CallOption) (Molecula_QueryPQLClient, error) { + stream, err := c.cc.NewStream(ctx, &_Molecula_serviceDesc.Streams[1], "/vdsm.Molecula/QueryPQL", opts...) + if err != nil { + return nil, err + } + x := &moleculaQueryPQLClient{stream} + if err := x.ClientStream.SendMsg(in); err != nil { + return nil, err + } + if err := x.ClientStream.CloseSend(); err != nil { + return nil, err + } + return x, nil +} + +type Molecula_QueryPQLClient interface { + Recv() (*proto1.RowResponse, error) + grpc.ClientStream +} + +type moleculaQueryPQLClient struct { + grpc.ClientStream +} + +func (x *moleculaQueryPQLClient) Recv() (*proto1.RowResponse, error) { + m := new(proto1.RowResponse) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +func (c *moleculaClient) QueryPQLUnary(ctx context.Context, in *proto1.QueryPQLRequest, opts ...grpc.CallOption) (*proto1.TableResponse, error) { + out := new(proto1.TableResponse) + err := c.cc.Invoke(ctx, "/vdsm.Molecula/QueryPQLUnary", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *moleculaClient) Inspect(ctx context.Context, in *proto1.InspectRequest, opts ...grpc.CallOption) (Molecula_InspectClient, error) { + stream, err := c.cc.NewStream(ctx, &_Molecula_serviceDesc.Streams[2], "/vdsm.Molecula/Inspect", opts...) + if err != nil { + return nil, err + } + x := &moleculaInspectClient{stream} + if err := x.ClientStream.SendMsg(in); err != nil { + return nil, err + } + if err := x.ClientStream.CloseSend(); err != nil { + return nil, err + } + return x, nil +} + +type Molecula_InspectClient interface { + Recv() (*proto1.RowResponse, error) + grpc.ClientStream +} + +type moleculaInspectClient struct { + grpc.ClientStream +} + +func (x *moleculaInspectClient) Recv() (*proto1.RowResponse, error) { + m := new(proto1.RowResponse) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +// MoleculaServer is the server API for Molecula service. +type MoleculaServer interface { + GetVDSs(context.Context, *GetVDSsRequest) (*GetVDSsResponse, error) + GetVDS(context.Context, *GetVDSRequest) (*GetVDSResponse, error) + PostVDS(context.Context, *PostVDSRequest) (*PostVDSResponse, error) + DeleteVDS(context.Context, *DeleteVDSRequest) (*DeleteVDSResponse, error) + QuerySQL(*proto1.QuerySQLRequest, Molecula_QuerySQLServer) error + QuerySQLUnary(context.Context, *proto1.QuerySQLRequest) (*proto1.TableResponse, error) + QueryPQL(*proto1.QueryPQLRequest, Molecula_QueryPQLServer) error + QueryPQLUnary(context.Context, *proto1.QueryPQLRequest) (*proto1.TableResponse, error) + Inspect(*proto1.InspectRequest, Molecula_InspectServer) error +} + +// UnimplementedMoleculaServer can be embedded to have forward compatible implementations. +type UnimplementedMoleculaServer struct { +} + +func (*UnimplementedMoleculaServer) GetVDSs(ctx context.Context, req *GetVDSsRequest) (*GetVDSsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetVDSs not implemented") +} +func (*UnimplementedMoleculaServer) GetVDS(ctx context.Context, req *GetVDSRequest) (*GetVDSResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetVDS not implemented") +} +func (*UnimplementedMoleculaServer) PostVDS(ctx context.Context, req *PostVDSRequest) (*PostVDSResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PostVDS not implemented") +} +func (*UnimplementedMoleculaServer) DeleteVDS(ctx context.Context, req *DeleteVDSRequest) (*DeleteVDSResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeleteVDS not implemented") +} +func (*UnimplementedMoleculaServer) QuerySQL(req *proto1.QuerySQLRequest, srv Molecula_QuerySQLServer) error { + return status.Errorf(codes.Unimplemented, "method QuerySQL not implemented") +} +func (*UnimplementedMoleculaServer) QuerySQLUnary(ctx context.Context, req *proto1.QuerySQLRequest) (*proto1.TableResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method QuerySQLUnary not implemented") +} +func (*UnimplementedMoleculaServer) QueryPQL(req *proto1.QueryPQLRequest, srv Molecula_QueryPQLServer) error { + return status.Errorf(codes.Unimplemented, "method QueryPQL not implemented") +} +func (*UnimplementedMoleculaServer) QueryPQLUnary(ctx context.Context, req *proto1.QueryPQLRequest) (*proto1.TableResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method QueryPQLUnary not implemented") +} +func (*UnimplementedMoleculaServer) Inspect(req *proto1.InspectRequest, srv Molecula_InspectServer) error { + return status.Errorf(codes.Unimplemented, "method Inspect not implemented") +} + +func RegisterMoleculaServer(s *grpc.Server, srv MoleculaServer) { + s.RegisterService(&_Molecula_serviceDesc, srv) +} + +func _Molecula_GetVDSs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetVDSsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MoleculaServer).GetVDSs(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/vdsm.Molecula/GetVDSs", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MoleculaServer).GetVDSs(ctx, req.(*GetVDSsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Molecula_GetVDS_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetVDSRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MoleculaServer).GetVDS(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/vdsm.Molecula/GetVDS", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MoleculaServer).GetVDS(ctx, req.(*GetVDSRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Molecula_PostVDS_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(PostVDSRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MoleculaServer).PostVDS(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/vdsm.Molecula/PostVDS", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MoleculaServer).PostVDS(ctx, req.(*PostVDSRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Molecula_DeleteVDS_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteVDSRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MoleculaServer).DeleteVDS(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/vdsm.Molecula/DeleteVDS", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MoleculaServer).DeleteVDS(ctx, req.(*DeleteVDSRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Molecula_QuerySQL_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(proto1.QuerySQLRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(MoleculaServer).QuerySQL(m, &moleculaQuerySQLServer{stream}) +} + +type Molecula_QuerySQLServer interface { + Send(*proto1.RowResponse) error + grpc.ServerStream +} + +type moleculaQuerySQLServer struct { + grpc.ServerStream +} + +func (x *moleculaQuerySQLServer) Send(m *proto1.RowResponse) error { + return x.ServerStream.SendMsg(m) +} + +func _Molecula_QuerySQLUnary_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(proto1.QuerySQLRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MoleculaServer).QuerySQLUnary(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/vdsm.Molecula/QuerySQLUnary", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MoleculaServer).QuerySQLUnary(ctx, req.(*proto1.QuerySQLRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Molecula_QueryPQL_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(proto1.QueryPQLRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(MoleculaServer).QueryPQL(m, &moleculaQueryPQLServer{stream}) +} + +type Molecula_QueryPQLServer interface { + Send(*proto1.RowResponse) error + grpc.ServerStream +} + +type moleculaQueryPQLServer struct { + grpc.ServerStream +} + +func (x *moleculaQueryPQLServer) Send(m *proto1.RowResponse) error { + return x.ServerStream.SendMsg(m) +} + +func _Molecula_QueryPQLUnary_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(proto1.QueryPQLRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MoleculaServer).QueryPQLUnary(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/vdsm.Molecula/QueryPQLUnary", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MoleculaServer).QueryPQLUnary(ctx, req.(*proto1.QueryPQLRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Molecula_Inspect_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(proto1.InspectRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(MoleculaServer).Inspect(m, &moleculaInspectServer{stream}) +} + +type Molecula_InspectServer interface { + Send(*proto1.RowResponse) error + grpc.ServerStream +} + +type moleculaInspectServer struct { + grpc.ServerStream +} + +func (x *moleculaInspectServer) Send(m *proto1.RowResponse) error { + return x.ServerStream.SendMsg(m) +} + +var _Molecula_serviceDesc = grpc.ServiceDesc{ + ServiceName: "vdsm.Molecula", + HandlerType: (*MoleculaServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "GetVDSs", + Handler: _Molecula_GetVDSs_Handler, + }, + { + MethodName: "GetVDS", + Handler: _Molecula_GetVDS_Handler, + }, + { + MethodName: "PostVDS", + Handler: _Molecula_PostVDS_Handler, + }, + { + MethodName: "DeleteVDS", + Handler: _Molecula_DeleteVDS_Handler, + }, + { + MethodName: "QuerySQLUnary", + Handler: _Molecula_QuerySQLUnary_Handler, + }, + { + MethodName: "QueryPQLUnary", + Handler: _Molecula_QueryPQLUnary_Handler, + }, + }, + Streams: []grpc.StreamDesc{ + { + StreamName: "QuerySQL", + Handler: _Molecula_QuerySQL_Handler, + ServerStreams: true, + }, + { + StreamName: "QueryPQL", + Handler: _Molecula_QueryPQL_Handler, + ServerStreams: true, + }, + { + StreamName: "Inspect", + Handler: _Molecula_Inspect_Handler, + ServerStreams: true, + }, + }, + Metadata: "vdsm/vdsm.proto", +} diff --git a/proto/vdsm/vdsm.proto b/proto/vdsm/vdsm.proto new file mode 100644 index 000000000..b72622ac9 --- /dev/null +++ b/proto/vdsm/vdsm.proto @@ -0,0 +1,73 @@ +syntax = "proto3"; +package vdsm; + +option go_package = "github.com/pilosa/pilosa/v2/proto/vdsm"; + +import "pilosa.proto"; + +// deprecated +message DataSource { + int64 id = 1; + string name = 2; + string description = 3; + string type = 4; + map config = 5; + string status = 6; +} + +message VDS { + string id = 1; + string name = 2; + string description = 3; + string pilosa_index = 4; + repeated DataSource datasources = 5; +} + +message GetVDSsRequest { +} + +message GetVDSsResponse { + repeated VDS vdss = 1; +} + +message GetVDSRequest { + oneof idOrName { + string id = 1; + string name = 2; + } +} + +message GetVDSResponse { + VDS vds = 1; +} + +message PostVDSRequest { + string definition = 1; +} + +message PostVDSResponse { + string id = 1; + string uri = 2; +} + +message DeleteVDSRequest { + oneof idOrName { + string id = 1; + string name = 2; + } +} + +message DeleteVDSResponse { +} + +service Molecula { + rpc GetVDSs(GetVDSsRequest) returns (GetVDSsResponse) {}; + rpc GetVDS(GetVDSRequest) returns (GetVDSResponse) {}; + rpc PostVDS(PostVDSRequest) returns (PostVDSResponse) {}; + rpc DeleteVDS(DeleteVDSRequest) returns (DeleteVDSResponse) {}; + rpc QuerySQL(pilosa.QuerySQLRequest) returns (stream pilosa.RowResponse) {}; + rpc QuerySQLUnary(pilosa.QuerySQLRequest) returns (pilosa.TableResponse) {}; + rpc QueryPQL(pilosa.QueryPQLRequest) returns (stream pilosa.RowResponse) {}; + rpc QueryPQLUnary(pilosa.QueryPQLRequest) returns (pilosa.TableResponse) {}; + rpc Inspect(pilosa.InspectRequest) returns (stream pilosa.RowResponse) {}; +} diff --git a/server/grpc.go b/server/grpc.go index ec99f0685..f378fd403 100644 --- a/server/grpc.go +++ b/server/grpc.go @@ -26,6 +26,7 @@ import ( "github.com/pilosa/pilosa/v2" "github.com/pilosa/pilosa/v2/logger" pb "github.com/pilosa/pilosa/v2/proto" + vdsm_pb "github.com/pilosa/pilosa/v2/proto/vdsm" "github.com/pilosa/pilosa/v2/stats" "github.com/pkg/errors" "google.golang.org/grpc" @@ -125,48 +126,6 @@ func errToStatusError(err error) error { return status.Error(codes.Unknown, err.Error()) } -// GetVDSs returns a single VDS given a name -func (h *GRPCHandler) GetVDS(ctx context.Context, req *pb.GetVDSRequest) (*pb.GetVDSResponse, error) { - // TODO: Return all schema information associated with the VDS. - // It's obviously not very useful to return the same data as given. - schema := h.api.Schema(ctx) - for _, index := range schema { - if req.Name == index.Name { - return &pb.GetVDSResponse{Vds: &pb.VDS{Name: index.Name}}, nil - } - } - return nil, status.Error(codes.NotFound, fmt.Sprintf("VDS with name %s not found", req.Name)) -} - -// GetVDSs returns a list of all VDSs -func (h *GRPCHandler) GetVDSs(ctx context.Context, req *pb.GetVDSsRequest) (*pb.GetVDSsResponse, error) { - schema := h.api.Schema(ctx) - vdss := make([]*pb.VDS, len(schema)) - for i, index := range schema { - vdss[i] = &pb.VDS{Name: index.Name} - } - return &pb.GetVDSsResponse{Vdss: vdss}, nil -} - -// PostVDS creates a new VDS -func (h *GRPCHandler) PostVDS(ctx context.Context, req *pb.PostVDSRequest) (*pb.PostVDSResponse, error) { - opts := pilosa.IndexOptions{Keys: req.Keys, TrackExistence: req.TrackExistence} - _, err := h.api.CreateIndex(ctx, req.Name, opts) - if err != nil { - return nil, errToStatusError(err) - } - return &pb.PostVDSResponse{}, nil -} - -// DeleteVDS deletes a VDS -func (h *GRPCHandler) DeleteVDS(ctx context.Context, req *pb.DeleteVDSRequest) (*pb.DeleteVDSResponse, error) { - err := h.api.DeleteIndex(ctx, req.Name) - if err != nil { - return nil, errToStatusError(err) - } - return &pb.DeleteVDSResponse{}, nil -} - func (h *GRPCHandler) execSQL(ctx context.Context, queryStr string) (pb.ToRowser, error) { h.stats.Count(pilosa.MetricSqlQueries, 1, 1) return execSQL(ctx, h.api, h.logger, queryStr) @@ -292,6 +251,100 @@ func (h *GRPCHandler) QueryPQLUnary(ctx context.Context, req *pb.QueryPQLRequest return table, errToStatusError(nil) } +// VDSMGRPCHandler contains methods which handle the various gRPC requests, ported from VDSM. +type VDSMGRPCHandler struct { + grpcHandler *GRPCHandler + api *pilosa.API + logger logger.Logger + stats stats.StatsClient +} + +func NewVDSMGRPCHandler(grpcHandler *GRPCHandler, api *pilosa.API) *VDSMGRPCHandler { + return &VDSMGRPCHandler{grpcHandler: grpcHandler, api: api, logger: logger.NopLogger, stats: stats.NopStatsClient} +} + +func (h *VDSMGRPCHandler) WithLogger(logger logger.Logger) *VDSMGRPCHandler { + h.logger = logger + return h +} + +func (h *VDSMGRPCHandler) WithStats(stats stats.StatsClient) *VDSMGRPCHandler { + h.stats = stats + return h +} + +// GetVDSs returns a single VDS given a name +func (h *VDSMGRPCHandler) GetVDS(ctx context.Context, req *vdsm_pb.GetVDSRequest) (*vdsm_pb.GetVDSResponse, error) { + typedIdOrName := req.GetIdOrName() + switch idOrName := typedIdOrName.(type) { + case *vdsm_pb.GetVDSRequest_Id: + return nil, status.Error(codes.InvalidArgument, "VDS IDs are no longer supported") + case *vdsm_pb.GetVDSRequest_Name: + schema := h.api.Schema(ctx) + for _, index := range schema { + if idOrName.Name == index.Name { + return &vdsm_pb.GetVDSResponse{Vds: &vdsm_pb.VDS{Name: index.Name}}, nil + } + } + return nil, status.Error(codes.NotFound, fmt.Sprintf("VDS with name %s not found", idOrName.Name)) + default: + return nil, status.Error(codes.NotFound, "VDS not found") + } +} + +// GetVDSs returns a list of all VDSs +func (h *VDSMGRPCHandler) GetVDSs(ctx context.Context, req *vdsm_pb.GetVDSsRequest) (*vdsm_pb.GetVDSsResponse, error) { + schema := h.api.Schema(ctx) + vdss := make([]*vdsm_pb.VDS, len(schema)) + for i, index := range schema { + vdss[i] = &vdsm_pb.VDS{Name: index.Name} + } + return &vdsm_pb.GetVDSsResponse{Vdss: vdss}, nil +} + +// PostVDS creates a new VDS +func (*VDSMGRPCHandler) PostVDS(ctx context.Context, req *vdsm_pb.PostVDSRequest) (*vdsm_pb.PostVDSResponse, error) { + // Pilosa doesn't implement VDSD files, so this is unimplemented + return nil, status.Errorf(codes.Unimplemented, "method PostVDS not implemented") +} + +// DeleteVDS deletes a VDS +func (h *VDSMGRPCHandler) DeleteVDS(ctx context.Context, req *vdsm_pb.DeleteVDSRequest) (*vdsm_pb.DeleteVDSResponse, error) { + typedIdOrName := req.GetIdOrName() + switch idOrName := typedIdOrName.(type) { + case *vdsm_pb.DeleteVDSRequest_Id: + return nil, status.Error(codes.InvalidArgument, "VDS IDs are no longer supported") + case *vdsm_pb.DeleteVDSRequest_Name: + err := h.api.DeleteIndex(ctx, idOrName.Name) + if err != nil { + return nil, errToStatusError(err) + } + return &vdsm_pb.DeleteVDSResponse{}, nil + default: + return nil, status.Error(codes.NotFound, "") + } +} + +func (h *VDSMGRPCHandler) QuerySQL(req *pb.QuerySQLRequest, srv vdsm_pb.Molecula_QuerySQLServer) error { + return h.grpcHandler.QuerySQL(req, srv) +} + +func (h *VDSMGRPCHandler) QuerySQLUnary(ctx context.Context, req *pb.QuerySQLRequest) (*pb.TableResponse, error) { + return h.grpcHandler.QuerySQLUnary(ctx, req) +} + +func (h *VDSMGRPCHandler) QueryPQL(req *pb.QueryPQLRequest, srv vdsm_pb.Molecula_QueryPQLServer) error { + return h.grpcHandler.QueryPQL(req, srv) +} + +func (h *VDSMGRPCHandler) QueryPQLUnary(ctx context.Context, req *pb.QueryPQLRequest) (*pb.TableResponse, error) { + return h.grpcHandler.QueryPQLUnary(ctx, req) +} + +func (h *VDSMGRPCHandler) Inspect(req *pb.InspectRequest, srv vdsm_pb.Molecula_InspectServer) error { + return h.grpcHandler.Inspect(req, srv) +} + // ResultUint64 is a wrapper around a uint64 result type // so that we can implement the ToTabler and ToRowser // interfaces. @@ -1144,7 +1197,9 @@ func (s *grpcServer) Serve(tlsConfig *tls.Config) error { // create grpc server s.mu.Lock() s.grpcServer = grpc.NewServer(opts...) - pb.RegisterPilosaServer(s.grpcServer, NewGRPCHandler(s.api).WithLogger(s.logger).WithStats(s.stats)) + grpcHandler := NewGRPCHandler(s.api).WithLogger(s.logger).WithStats(s.stats) + pb.RegisterPilosaServer(s.grpcServer, grpcHandler) + vdsm_pb.RegisterMoleculaServer(s.grpcServer, NewVDSMGRPCHandler(grpcHandler, s.api).WithLogger(s.logger).WithStats(s.stats)) // register the server so its services are available to grpc_cli and others reflection.Register(s.grpcServer)