diff --git a/proto/vdsm/vdsm.pb.go b/proto/vdsm/vdsm.pb.go index 8ed0afcd8..f2285f560 100644 --- a/proto/vdsm/vdsm.pb.go +++ b/proto/vdsm/vdsm.pb.go @@ -610,6 +610,86 @@ func (m *QueryPQLRequest) GetPql() string { return "" } +// copied from pilosa.proto to use "vds" instead of "index" and "records" instead of "columns" +type InspectRequest struct { + Vds string `protobuf:"bytes,1,opt,name=vds,proto3" json:"vds,omitempty"` + Records *proto1.IdsOrKeys `protobuf:"bytes,2,opt,name=records,proto3" json:"records,omitempty"` + FilterFields []string `protobuf:"bytes,3,rep,name=filterFields,proto3" json:"filterFields,omitempty"` + Limit uint64 `protobuf:"varint,4,opt,name=limit,proto3" json:"limit,omitempty"` + Offset uint64 `protobuf:"varint,5,opt,name=offset,proto3" json:"offset,omitempty"` + Query string `protobuf:"bytes,6,opt,name=query,proto3" json:"query,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +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_3849c3e549495f50, []int{11} +} + +func (m *InspectRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_InspectRequest.Unmarshal(m, b) +} +func (m *InspectRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_InspectRequest.Marshal(b, m, deterministic) +} +func (m *InspectRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_InspectRequest.Merge(m, src) +} +func (m *InspectRequest) XXX_Size() int { + return xxx_messageInfo_InspectRequest.Size(m) +} +func (m *InspectRequest) XXX_DiscardUnknown() { + xxx_messageInfo_InspectRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_InspectRequest proto.InternalMessageInfo + +func (m *InspectRequest) GetVds() string { + if m != nil { + return m.Vds + } + return "" +} + +func (m *InspectRequest) GetRecords() *proto1.IdsOrKeys { + if m != nil { + return m.Records + } + return nil +} + +func (m *InspectRequest) GetFilterFields() []string { + if m != nil { + return m.FilterFields + } + return nil +} + +func (m *InspectRequest) GetLimit() uint64 { + if m != nil { + return m.Limit + } + return 0 +} + +func (m *InspectRequest) GetOffset() uint64 { + if m != nil { + return m.Offset + } + return 0 +} + +func (m *InspectRequest) GetQuery() string { + if m != nil { + return m.Query + } + return "" +} + func init() { proto.RegisterType((*DataSource)(nil), "vdsm.DataSource") proto.RegisterMapType((map[string]string)(nil), "vdsm.DataSource.ConfigEntry") @@ -623,52 +703,58 @@ func init() { proto.RegisterType((*DeleteVDSRequest)(nil), "vdsm.DeleteVDSRequest") proto.RegisterType((*DeleteVDSResponse)(nil), "vdsm.DeleteVDSResponse") proto.RegisterType((*QueryPQLRequest)(nil), "vdsm.QueryPQLRequest") + proto.RegisterType((*InspectRequest)(nil), "vdsm.InspectRequest") } func init() { proto.RegisterFile("vdsm/vdsm.proto", fileDescriptor_3849c3e549495f50) } var fileDescriptor_3849c3e549495f50 = []byte{ - // 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, + // 718 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x5d, 0x6f, 0x12, 0x4d, + 0x14, 0x66, 0x59, 0x0a, 0xe5, 0xd0, 0x02, 0x9d, 0xd2, 0x76, 0xc3, 0xfb, 0x11, 0xde, 0xbd, 0x78, + 0x43, 0x62, 0xa4, 0x0d, 0xb5, 0x09, 0x36, 0xc6, 0xc4, 0x16, 0x6b, 0x1b, 0xab, 0x85, 0x45, 0x7b, + 0xe1, 0x8d, 0xd9, 0xb2, 0x43, 0x9d, 0xb8, 0xec, 0x2e, 0x3b, 0xb3, 0x28, 0x7f, 0xc7, 0x3f, 0xe0, + 0xa5, 0x3f, 0xcb, 0xbf, 0x60, 0xe6, 0x0b, 0x16, 0xb4, 0xd1, 0xa4, 0x37, 0x30, 0xf3, 0xcc, 0x39, + 0xe7, 0x39, 0xcf, 0x9c, 0x67, 0xb2, 0x50, 0x99, 0x7a, 0x74, 0xbc, 0xcf, 0x7f, 0x5a, 0x51, 0x1c, + 0xb2, 0x10, 0xe5, 0xf8, 0xba, 0xbe, 0x11, 0x11, 0x3f, 0xa4, 0xae, 0xc4, 0xec, 0xef, 0x06, 0x40, + 0xd7, 0x65, 0xee, 0x20, 0x4c, 0xe2, 0x21, 0x46, 0x65, 0xc8, 0x12, 0xcf, 0x32, 0x1a, 0x46, 0xd3, + 0x74, 0xb2, 0xc4, 0x43, 0x08, 0x72, 0x81, 0x3b, 0xc6, 0x56, 0xb6, 0x61, 0x34, 0x8b, 0x8e, 0x58, + 0xa3, 0x06, 0x94, 0x3c, 0x4c, 0x87, 0x31, 0x89, 0x18, 0x09, 0x03, 0xcb, 0x14, 0x47, 0x69, 0x88, + 0x67, 0xb1, 0x59, 0x84, 0xad, 0x9c, 0xcc, 0xe2, 0x6b, 0xf4, 0x08, 0xf2, 0xc3, 0x30, 0x18, 0x91, + 0x5b, 0x6b, 0xad, 0x61, 0x36, 0x4b, 0xed, 0xbf, 0x5b, 0xa2, 0xb3, 0x05, 0x77, 0xeb, 0x54, 0x1c, + 0x3f, 0x0f, 0x58, 0x3c, 0x73, 0x54, 0x2c, 0xda, 0x85, 0x3c, 0x65, 0x2e, 0x4b, 0xa8, 0x95, 0x17, + 0xb5, 0xd4, 0xae, 0xfe, 0x18, 0x4a, 0xa9, 0x70, 0x54, 0x05, 0xf3, 0x23, 0x9e, 0x89, 0xbe, 0x8b, + 0x0e, 0x5f, 0xa2, 0x1a, 0xac, 0x4d, 0x5d, 0x3f, 0xd1, 0x9d, 0xcb, 0xcd, 0x71, 0xb6, 0x63, 0xd8, + 0x5f, 0x0c, 0x30, 0xaf, 0xbb, 0x83, 0x94, 0xd4, 0xe2, 0x3d, 0xa4, 0xfe, 0x07, 0xea, 0x3e, 0xdf, + 0x93, 0xc0, 0xc3, 0x9f, 0x95, 0xe4, 0x92, 0xc4, 0x2e, 0x38, 0x84, 0xda, 0x50, 0xf2, 0x5c, 0xe6, + 0x52, 0xa1, 0x92, 0x2a, 0xf9, 0xd5, 0x55, 0xf9, 0x4e, 0x3a, 0xc8, 0xae, 0x42, 0xf9, 0x05, 0x66, + 0xd7, 0xdd, 0x01, 0x75, 0xf0, 0x24, 0xc1, 0x94, 0xd9, 0x07, 0x50, 0x99, 0x23, 0x34, 0x0a, 0x03, + 0x8a, 0xd1, 0x3f, 0xc0, 0x27, 0x4a, 0x2d, 0x43, 0x54, 0x2c, 0xca, 0x8a, 0xd7, 0xdd, 0x81, 0x23, + 0x60, 0xfb, 0x14, 0x36, 0x65, 0x86, 0x2a, 0x81, 0xaa, 0x0b, 0xc5, 0xe7, 0x19, 0xa1, 0xb9, 0x96, + 0xd6, 0x7c, 0x9e, 0x91, 0xaa, 0x4f, 0x00, 0xd6, 0x89, 0x77, 0x15, 0xbf, 0x76, 0xc7, 0xd8, 0x7e, + 0xa8, 0x1b, 0x99, 0xb3, 0xfe, 0x05, 0xe6, 0xd4, 0xa3, 0xa2, 0xcc, 0x12, 0x29, 0x47, 0xed, 0x03, + 0x28, 0xf7, 0x42, 0x9a, 0x26, 0xfd, 0x17, 0xc0, 0xc3, 0x23, 0x12, 0x10, 0x71, 0x83, 0xf2, 0xba, + 0x53, 0x88, 0x7d, 0x08, 0x95, 0x79, 0x86, 0x62, 0x58, 0x9d, 0x4c, 0x15, 0xcc, 0x24, 0x26, 0x6a, + 0x30, 0x7c, 0x69, 0x9f, 0x41, 0xb5, 0x8b, 0x7d, 0xcc, 0xf0, 0x3d, 0xd5, 0x6d, 0xc3, 0x56, 0xaa, + 0x8e, 0xa4, 0xb7, 0x8f, 0xa0, 0xd2, 0x4f, 0x70, 0x3c, 0xeb, 0xf5, 0x2f, 0x17, 0xb5, 0xe7, 0x9a, + 0x8b, 0x42, 0x28, 0x47, 0xa2, 0x89, 0xaf, 0x7b, 0x8a, 0x26, 0xbe, 0xfd, 0xcd, 0x80, 0xf2, 0x45, + 0x40, 0x23, 0x3c, 0x64, 0x77, 0xa7, 0x3d, 0x80, 0x42, 0x8c, 0x87, 0x61, 0xec, 0x51, 0x91, 0x5a, + 0x6a, 0x6f, 0xb5, 0xd4, 0x73, 0xbc, 0xf0, 0xe8, 0x55, 0xfc, 0x12, 0xcf, 0xa8, 0xa3, 0x23, 0x90, + 0x0d, 0x1b, 0x23, 0xe2, 0x33, 0x1c, 0x9f, 0x11, 0xec, 0x7b, 0xd4, 0x32, 0x1b, 0x66, 0xb3, 0xe8, + 0x2c, 0x61, 0xdc, 0xe7, 0x3e, 0x19, 0x13, 0x26, 0x8c, 0x97, 0x73, 0xe4, 0x86, 0x3f, 0x9b, 0x70, + 0x34, 0xa2, 0x98, 0x59, 0x6b, 0x02, 0x56, 0x3b, 0x1e, 0x3d, 0xe1, 0xd2, 0xd4, 0x6b, 0x92, 0x9b, + 0xf6, 0xd7, 0x1c, 0xac, 0xbf, 0x0a, 0x7d, 0x3c, 0x4c, 0x7c, 0x17, 0x75, 0xa0, 0xa0, 0x7c, 0x86, + 0x6a, 0x72, 0xb8, 0xcb, 0x46, 0xac, 0xef, 0xac, 0xa0, 0xea, 0xd6, 0x32, 0xe8, 0x08, 0xf2, 0x12, + 0x44, 0xdb, 0xe9, 0x10, 0x9d, 0x57, 0x5b, 0x06, 0xe7, 0x69, 0x1d, 0x28, 0x28, 0x03, 0x68, 0xc2, + 0x65, 0x07, 0x69, 0xc2, 0x15, 0x97, 0xd8, 0x19, 0xf4, 0x14, 0x8a, 0xf3, 0xe9, 0xa1, 0x5d, 0xf5, + 0xa0, 0x56, 0x6c, 0x51, 0xdf, 0xfb, 0x09, 0x9f, 0xe7, 0x3f, 0x81, 0x75, 0x31, 0xe8, 0x41, 0xff, + 0x12, 0xed, 0xe9, 0x39, 0x68, 0x44, 0xe7, 0x6f, 0xeb, 0x03, 0x27, 0xfc, 0xb4, 0xc8, 0x3d, 0x30, + 0xd0, 0x33, 0xd8, 0xd4, 0xb1, 0x6f, 0x03, 0x37, 0x9e, 0xdd, 0x5d, 0x62, 0x47, 0x1f, 0xbc, 0x71, + 0x6f, 0x7c, 0x9c, 0x6a, 0xe0, 0x58, 0x35, 0xd0, 0xeb, 0x5f, 0x22, 0xa5, 0x72, 0xc5, 0x79, 0xbf, + 0xa7, 0xef, 0xfd, 0x9a, 0xbe, 0xf7, 0x07, 0xf4, 0x1d, 0x28, 0x28, 0xc3, 0xea, 0x9b, 0x5f, 0xf6, + 0xef, 0x9d, 0xe4, 0x27, 0xcd, 0x77, 0xff, 0xdf, 0x12, 0xf6, 0x21, 0xb9, 0x69, 0x0d, 0xc3, 0xf1, + 0xbe, 0x0c, 0xd2, 0x7f, 0xd3, 0xf6, 0xbe, 0xf8, 0xb4, 0x88, 0x2f, 0xcf, 0x4d, 0x5e, 0xac, 0x0f, + 0x7f, 0x04, 0x00, 0x00, 0xff, 0xff, 0xff, 0x97, 0x0c, 0xf4, 0x8d, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -691,7 +777,7 @@ type MoleculaClient interface { QuerySQLUnary(ctx context.Context, in *proto1.QuerySQLRequest, opts ...grpc.CallOption) (*proto1.TableResponse, 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) + Inspect(ctx context.Context, in *InspectRequest, opts ...grpc.CallOption) (Molecula_InspectClient, error) } type moleculaClient struct { @@ -820,7 +906,7 @@ func (c *moleculaClient) QueryPQLUnary(ctx context.Context, in *proto1.QueryPQLR return out, nil } -func (c *moleculaClient) Inspect(ctx context.Context, in *proto1.InspectRequest, opts ...grpc.CallOption) (Molecula_InspectClient, error) { +func (c *moleculaClient) Inspect(ctx context.Context, in *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 @@ -862,7 +948,7 @@ type MoleculaServer interface { QuerySQLUnary(context.Context, *proto1.QuerySQLRequest) (*proto1.TableResponse, error) QueryPQL(*QueryPQLRequest, Molecula_QueryPQLServer) error QueryPQLUnary(context.Context, *proto1.QueryPQLRequest) (*proto1.TableResponse, error) - Inspect(*proto1.InspectRequest, Molecula_InspectServer) error + Inspect(*InspectRequest, Molecula_InspectServer) error } // UnimplementedMoleculaServer can be embedded to have forward compatible implementations. @@ -893,7 +979,7 @@ func (*UnimplementedMoleculaServer) QueryPQL(req *QueryPQLRequest, srv Molecula_ 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 { +func (*UnimplementedMoleculaServer) Inspect(req *InspectRequest, srv Molecula_InspectServer) error { return status.Errorf(codes.Unimplemented, "method Inspect not implemented") } @@ -1052,7 +1138,7 @@ func _Molecula_QueryPQLUnary_Handler(srv interface{}, ctx context.Context, dec f } func _Molecula_Inspect_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(proto1.InspectRequest) + m := new(InspectRequest) if err := stream.RecvMsg(m); err != nil { return err } diff --git a/proto/vdsm/vdsm.proto b/proto/vdsm/vdsm.proto index 645cf8e21..0755fd8ee 100644 --- a/proto/vdsm/vdsm.proto +++ b/proto/vdsm/vdsm.proto @@ -66,6 +66,16 @@ message QueryPQLRequest { string pql = 2; } +// copied from pilosa.proto to use "vds" instead of "index" and "records" instead of "columns" +message InspectRequest { + string vds = 1; + pilosa.IdsOrKeys records = 2; + repeated string filterFields = 3; + uint64 limit = 4; + uint64 offset = 5; + string query = 6; +} + service Molecula { rpc GetVDSs(GetVDSsRequest) returns (GetVDSsResponse) {}; rpc GetVDS(GetVDSRequest) returns (GetVDSResponse) {}; @@ -75,5 +85,5 @@ service Molecula { rpc QuerySQLUnary(pilosa.QuerySQLRequest) returns (pilosa.TableResponse) {}; rpc QueryPQL(QueryPQLRequest) returns (stream pilosa.RowResponse) {}; rpc QueryPQLUnary(pilosa.QueryPQLRequest) returns (pilosa.TableResponse) {}; - rpc Inspect(pilosa.InspectRequest) returns (stream pilosa.RowResponse) {}; + rpc Inspect(InspectRequest) returns (stream pilosa.RowResponse) {}; } diff --git a/server/grpc.go b/server/grpc.go index 85d8afc84..649d29b86 100644 --- a/server/grpc.go +++ b/server/grpc.go @@ -342,8 +342,9 @@ func (h *VDSMGRPCHandler) QueryPQLUnary(ctx context.Context, req *pb.QueryPQLReq 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) +func (h *VDSMGRPCHandler) Inspect(req *vdsm_pb.InspectRequest, srv vdsm_pb.Molecula_InspectServer) error { + preq := &pb.InspectRequest{Index: req.Vds, Columns: req.Records, FilterFields: req.FilterFields, Limit: req.Limit, Offset: req.Offset, Query: req.Query} + return h.grpcHandler.Inspect(preq, srv) } // ResultUint64 is a wrapper around a uint64 result type