From a58c345232bbe5ad7c80e34c03a8e4f0ed940b9f Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Fri, 9 Oct 2020 12:05:03 -0500 Subject: [PATCH] Use copy of vdsm QueryPQLRequest for better compatibility --- proto/vdsm/vdsm.pb.go | 139 +++++++++++++++++++++++++++++------------- proto/vdsm/vdsm.proto | 8 ++- server/grpc.go | 5 +- 3 files changed, 105 insertions(+), 47 deletions(-) diff --git a/proto/vdsm/vdsm.pb.go b/proto/vdsm/vdsm.pb.go index 99f04cda2..8ed0afcd8 100644 --- a/proto/vdsm/vdsm.pb.go +++ b/proto/vdsm/vdsm.pb.go @@ -562,6 +562,54 @@ func (m *DeleteVDSResponse) XXX_DiscardUnknown() { var xxx_messageInfo_DeleteVDSResponse proto.InternalMessageInfo +// copied from pilosa.proto to use "vds" instead of "index" +type QueryPQLRequest struct { + Vds string `protobuf:"bytes,1,opt,name=vds,proto3" json:"vds,omitempty"` + Pql string `protobuf:"bytes,2,opt,name=pql,proto3" json:"pql,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +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_3849c3e549495f50, []int{10} +} + +func (m *QueryPQLRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_QueryPQLRequest.Unmarshal(m, b) +} +func (m *QueryPQLRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_QueryPQLRequest.Marshal(b, m, deterministic) +} +func (m *QueryPQLRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPQLRequest.Merge(m, src) +} +func (m *QueryPQLRequest) XXX_Size() int { + return xxx_messageInfo_QueryPQLRequest.Size(m) +} +func (m *QueryPQLRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPQLRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryPQLRequest proto.InternalMessageInfo + +func (m *QueryPQLRequest) GetVds() string { + if m != nil { + return m.Vds + } + return "" +} + +func (m *QueryPQLRequest) GetPql() string { + if m != nil { + return m.Pql + } + return "" +} + func init() { proto.RegisterType((*DataSource)(nil), "vdsm.DataSource") proto.RegisterMapType((map[string]string)(nil), "vdsm.DataSource.ConfigEntry") @@ -574,50 +622,53 @@ func init() { proto.RegisterType((*PostVDSResponse)(nil), "vdsm.PostVDSResponse") proto.RegisterType((*DeleteVDSRequest)(nil), "vdsm.DeleteVDSRequest") proto.RegisterType((*DeleteVDSResponse)(nil), "vdsm.DeleteVDSResponse") + proto.RegisterType((*QueryPQLRequest)(nil), "vdsm.QueryPQLRequest") } 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, + // 629 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xdb, 0x6e, 0xd3, 0x40, + 0x10, 0x8d, 0xe3, 0x34, 0x6d, 0x26, 0xb4, 0x09, 0xdb, 0xb4, 0xb5, 0xc2, 0x45, 0xc1, 0x0f, 0x28, + 0x2f, 0xa4, 0x55, 0x4a, 0xa5, 0x52, 0x21, 0x24, 0xda, 0x00, 0xad, 0x54, 0x20, 0x71, 0xa0, 0x0f, + 0xbc, 0xa0, 0xad, 0xbd, 0x2d, 0x2b, 0x1c, 0xdb, 0xf1, 0xae, 0x03, 0xf9, 0x1d, 0xfe, 0x80, 0x2f, + 0xe3, 0x17, 0x90, 0xf7, 0xe2, 0x38, 0x06, 0x54, 0xa4, 0xbe, 0x24, 0xb3, 0x67, 0x67, 0xe6, 0xcc, + 0x39, 0x63, 0x2d, 0x34, 0x66, 0x1e, 0x9b, 0xec, 0xa6, 0x3f, 0xbd, 0x28, 0x0e, 0x79, 0x88, 0x2a, + 0x69, 0xdc, 0xbe, 0x13, 0x51, 0x3f, 0x64, 0x58, 0x62, 0xf6, 0x2f, 0x03, 0x60, 0x80, 0x39, 0x1e, + 0x87, 0x49, 0xec, 0x12, 0xb4, 0x01, 0x65, 0xea, 0x59, 0x46, 0xc7, 0xe8, 0x9a, 0x4e, 0x99, 0x7a, + 0x08, 0x41, 0x25, 0xc0, 0x13, 0x62, 0x95, 0x3b, 0x46, 0xb7, 0xe6, 0x88, 0x18, 0x75, 0xa0, 0xee, + 0x11, 0xe6, 0xc6, 0x34, 0xe2, 0x34, 0x0c, 0x2c, 0x53, 0x5c, 0xe5, 0xa1, 0xb4, 0x8a, 0xcf, 0x23, + 0x62, 0x55, 0x64, 0x55, 0x1a, 0xa3, 0xa7, 0x50, 0x75, 0xc3, 0xe0, 0x8a, 0x5e, 0x5b, 0x2b, 0x1d, + 0xb3, 0x5b, 0xef, 0xdf, 0xef, 0x89, 0xc9, 0x16, 0xdc, 0xbd, 0x13, 0x71, 0xfd, 0x2a, 0xe0, 0xf1, + 0xdc, 0x51, 0xb9, 0x68, 0x1b, 0xaa, 0x8c, 0x63, 0x9e, 0x30, 0xab, 0x2a, 0x7a, 0xa9, 0x53, 0xfb, + 0x19, 0xd4, 0x73, 0xe9, 0xa8, 0x09, 0xe6, 0x57, 0x32, 0x17, 0x73, 0xd7, 0x9c, 0x34, 0x44, 0x2d, + 0x58, 0x99, 0x61, 0x3f, 0xd1, 0x93, 0xcb, 0xc3, 0x51, 0xf9, 0xd0, 0xb0, 0x7f, 0x18, 0x60, 0x5e, + 0x0c, 0xc6, 0x39, 0xa9, 0xb5, 0x5b, 0x48, 0x7d, 0x04, 0xca, 0xcf, 0xcf, 0x34, 0xf0, 0xc8, 0x77, + 0x25, 0xb9, 0x2e, 0xb1, 0xb3, 0x14, 0x42, 0x7d, 0xa8, 0x7b, 0x98, 0x63, 0x26, 0x54, 0x32, 0x25, + 0xbf, 0x59, 0x94, 0xef, 0xe4, 0x93, 0xec, 0x26, 0x6c, 0xbc, 0x21, 0xfc, 0x62, 0x30, 0x66, 0x0e, + 0x99, 0x26, 0x84, 0x71, 0x7b, 0x0f, 0x1a, 0x19, 0xc2, 0xa2, 0x30, 0x60, 0x04, 0x3d, 0x80, 0x74, + 0xa3, 0xcc, 0x32, 0x44, 0xc7, 0x9a, 0xec, 0x78, 0x31, 0x18, 0x3b, 0x02, 0xb6, 0x4f, 0x60, 0x5d, + 0x56, 0xa8, 0x16, 0xa8, 0xb9, 0x50, 0x7c, 0x5a, 0x12, 0x9a, 0x5b, 0x79, 0xcd, 0xa7, 0x25, 0xa9, + 0xfa, 0x18, 0x60, 0x8d, 0x7a, 0xef, 0xe3, 0x77, 0x78, 0x42, 0xec, 0x27, 0x7a, 0x90, 0x8c, 0xf5, + 0x1e, 0x98, 0x33, 0x8f, 0x89, 0x36, 0x4b, 0xa4, 0x29, 0x6a, 0xef, 0xc1, 0xc6, 0x30, 0x64, 0x79, + 0xd2, 0x87, 0x00, 0x1e, 0xb9, 0xa2, 0x01, 0x15, 0x0e, 0x4a, 0xbb, 0x73, 0x88, 0xbd, 0x0f, 0x8d, + 0xac, 0x42, 0x31, 0x14, 0x37, 0xd3, 0x04, 0x33, 0x89, 0xa9, 0x5a, 0x4c, 0x1a, 0xda, 0xaf, 0xa1, + 0x39, 0x20, 0x3e, 0xe1, 0xe4, 0x96, 0xea, 0x36, 0xe1, 0x6e, 0xae, 0x8f, 0xa4, 0xb7, 0x0f, 0xa0, + 0x31, 0x4a, 0x48, 0x3c, 0x1f, 0x8e, 0xce, 0x17, 0xbd, 0x33, 0xcd, 0x35, 0x21, 0x34, 0x45, 0xa2, + 0xa9, 0xaf, 0x67, 0x8a, 0xa6, 0x7e, 0xff, 0x67, 0x05, 0xd6, 0xde, 0x86, 0x3e, 0x71, 0x13, 0x1f, + 0xa3, 0x43, 0x58, 0x55, 0xdb, 0x42, 0x2d, 0x69, 0xd1, 0xf2, 0x3a, 0xdb, 0x5b, 0x05, 0x54, 0x71, + 0x97, 0xd0, 0x01, 0x54, 0x25, 0x88, 0x36, 0xf3, 0x29, 0xba, 0xae, 0xb5, 0x0c, 0x66, 0x65, 0x87, + 0xb0, 0xaa, 0x6c, 0xd4, 0x84, 0xcb, 0x7b, 0xd0, 0x84, 0x05, 0xaf, 0xed, 0x12, 0x7a, 0x01, 0xb5, + 0xcc, 0x03, 0xb4, 0xad, 0x3e, 0xcb, 0x82, 0xb9, 0xed, 0x9d, 0x3f, 0xf0, 0xac, 0xfe, 0x39, 0xac, + 0x09, 0xbb, 0xc6, 0xa3, 0x73, 0xb4, 0xd3, 0x53, 0x8f, 0x8b, 0x46, 0x74, 0xfd, 0xa6, 0xbe, 0x70, + 0xc2, 0x6f, 0x8b, 0xda, 0x3d, 0x03, 0xbd, 0x84, 0x75, 0x9d, 0xfb, 0x31, 0xc0, 0xf1, 0xfc, 0xdf, + 0x2d, 0xb6, 0xf4, 0xc5, 0x07, 0x7c, 0xe9, 0x93, 0xdc, 0x00, 0x47, 0x6a, 0x80, 0xe1, 0xe8, 0x1c, + 0x29, 0x95, 0x85, 0xfd, 0xdd, 0x4c, 0x3f, 0xfc, 0x3b, 0xfd, 0xf0, 0xbf, 0xe8, 0x57, 0xcf, 0x02, + 0x16, 0x11, 0x97, 0xa3, 0x6d, 0x9d, 0xa3, 0x80, 0x9b, 0xe8, 0x8f, 0xbb, 0x9f, 0x1e, 0x5f, 0x53, + 0xfe, 0x25, 0xb9, 0xec, 0xb9, 0xe1, 0x64, 0x57, 0x26, 0xe9, 0xbf, 0x59, 0x7f, 0x57, 0x3c, 0xd1, + 0xe2, 0x05, 0xbf, 0xac, 0x8a, 0x78, 0xff, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x14, 0xc9, + 0x0e, 0xd5, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -638,7 +689,7 @@ type MoleculaClient interface { 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) + QueryPQL(ctx context.Context, in *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) } @@ -728,7 +779,7 @@ func (c *moleculaClient) QuerySQLUnary(ctx context.Context, in *proto1.QuerySQLR return out, nil } -func (c *moleculaClient) QueryPQL(ctx context.Context, in *proto1.QueryPQLRequest, opts ...grpc.CallOption) (Molecula_QueryPQLClient, error) { +func (c *moleculaClient) QueryPQL(ctx context.Context, in *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 @@ -809,7 +860,7 @@ type MoleculaServer interface { 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 + QueryPQL(*QueryPQLRequest, Molecula_QueryPQLServer) error QueryPQLUnary(context.Context, *proto1.QueryPQLRequest) (*proto1.TableResponse, error) Inspect(*proto1.InspectRequest, Molecula_InspectServer) error } @@ -836,7 +887,7 @@ func (*UnimplementedMoleculaServer) QuerySQL(req *proto1.QuerySQLRequest, srv Mo 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 { +func (*UnimplementedMoleculaServer) QueryPQL(req *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) { @@ -962,7 +1013,7 @@ func _Molecula_QuerySQLUnary_Handler(srv interface{}, ctx context.Context, dec f } func _Molecula_QueryPQL_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(proto1.QueryPQLRequest) + m := new(QueryPQLRequest) if err := stream.RecvMsg(m); err != nil { return err } diff --git a/proto/vdsm/vdsm.proto b/proto/vdsm/vdsm.proto index b72622ac9..645cf8e21 100644 --- a/proto/vdsm/vdsm.proto +++ b/proto/vdsm/vdsm.proto @@ -60,6 +60,12 @@ message DeleteVDSRequest { message DeleteVDSResponse { } +// copied from pilosa.proto to use "vds" instead of "index" +message QueryPQLRequest { + string vds = 1; + string pql = 2; +} + service Molecula { rpc GetVDSs(GetVDSsRequest) returns (GetVDSsResponse) {}; rpc GetVDS(GetVDSRequest) returns (GetVDSResponse) {}; @@ -67,7 +73,7 @@ service Molecula { 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 QueryPQL(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 47dcf6a07..85d8afc84 100644 --- a/server/grpc.go +++ b/server/grpc.go @@ -333,8 +333,9 @@ func (h *VDSMGRPCHandler) QuerySQLUnary(ctx context.Context, req *pb.QuerySQLReq 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) QueryPQL(req *vdsm_pb.QueryPQLRequest, srv vdsm_pb.Molecula_QueryPQLServer) error { + preq := &pb.QueryPQLRequest{Index: req.Vds, Pql: req.Pql} + return h.grpcHandler.QueryPQL(preq, srv) } func (h *VDSMGRPCHandler) QueryPQLUnary(ctx context.Context, req *pb.QueryPQLRequest) (*pb.TableResponse, error) {