mirror of
https://github.com/featurebasedb/featurebase.git
synced 2026-09-07 17:15:56 +00:00
Use shared types from pilosa proto file and enable generic proxying of query calls
This commit is contained in:
Cody Soyland
parent
83704e7973
commit
fdce92eb40
7 changed files with 211 additions and 1126 deletions
11
Makefile
11
Makefile
|
|
@ -166,10 +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
|
||||
|
|
@ -387,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
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package pilosa
|
||||
package proto
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||
// source: pilosa.proto
|
||||
|
||||
package pilosa
|
||||
package proto
|
||||
|
||||
import (
|
||||
context "context"
|
||||
|
|
@ -841,52 +841,54 @@ func init() {
|
|||
func init() { proto.RegisterFile("pilosa.proto", fileDescriptor_ef0691a44d1e275c) }
|
||||
|
||||
var fileDescriptor_ef0691a44d1e275c = []byte{
|
||||
// 718 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xdd, 0x52, 0xd3, 0x4e,
|
||||
0x14, 0x6f, 0x48, 0x68, 0x9b, 0x53, 0xbe, 0xfe, 0xcb, 0x5f, 0xcc, 0x30, 0x8e, 0xc6, 0x78, 0x61,
|
||||
0x1c, 0x1d, 0x06, 0x51, 0x74, 0x54, 0xbc, 0x00, 0xd4, 0x29, 0xa3, 0x8e, 0x65, 0x11, 0xee, 0xb7,
|
||||
0xcd, 0x16, 0x33, 0x6e, 0xb3, 0x6d, 0x36, 0x05, 0xfb, 0x02, 0xbe, 0x81, 0x6f, 0xe0, 0x5b, 0x78,
|
||||
0xef, 0x73, 0x39, 0xbb, 0x9b, 0x4d, 0x13, 0xb4, 0x0e, 0x72, 0xb7, 0xe7, 0xfc, 0x7e, 0xe7, 0x2b,
|
||||
0xe7, 0x23, 0xb0, 0x30, 0x8c, 0x19, 0x17, 0x64, 0x63, 0x98, 0xf2, 0x8c, 0xa3, 0xba, 0x96, 0x82,
|
||||
0x67, 0xb0, 0x7c, 0x38, 0xa6, 0xe9, 0xa4, 0x73, 0xf8, 0x0e, 0xd3, 0xd1, 0x98, 0x8a, 0x0c, 0xfd,
|
||||
0x0f, 0xf3, 0x71, 0x12, 0xd1, 0x2f, 0x9e, 0xe5, 0x5b, 0xa1, 0x8b, 0xb5, 0x80, 0x56, 0xc0, 0x1e,
|
||||
0x8e, 0x98, 0x37, 0xa7, 0x74, 0xf2, 0x19, 0xdc, 0xc9, 0x4d, 0x8f, 0xa6, 0xa6, 0x2b, 0x60, 0x8b,
|
||||
0x11, 0xcb, 0x0d, 0xe5, 0x33, 0x78, 0x01, 0xad, 0xa3, 0x8c, 0x64, 0x63, 0xf1, 0x3a, 0x4d, 0x79,
|
||||
0x8a, 0x10, 0x38, 0xfb, 0x3c, 0xa2, 0x8a, 0xb1, 0x88, 0xd5, 0x1b, 0x79, 0xd0, 0x78, 0x4f, 0x85,
|
||||
0x20, 0xa7, 0x34, 0xf7, 0x6e, 0xc4, 0xe0, 0xbb, 0x05, 0x2d, 0xcc, 0xcf, 0x31, 0x15, 0x43, 0x9e,
|
||||
0x08, 0x8a, 0x1e, 0x40, 0xe3, 0x13, 0x25, 0x11, 0x4d, 0x85, 0x67, 0xf9, 0x76, 0xd8, 0xda, 0x42,
|
||||
0x1b, 0x79, 0x51, 0xfb, 0x9c, 0x8d, 0x07, 0xc9, 0x41, 0xd2, 0xe7, 0xd8, 0x50, 0xd0, 0x26, 0x34,
|
||||
0x7a, 0x4a, 0x2d, 0xbc, 0x39, 0xc5, 0x5e, 0xab, 0xb2, 0x8d, 0x5b, 0x6c, 0x68, 0x68, 0xbb, 0x92,
|
||||
0xac, 0x67, 0xfb, 0x56, 0xd8, 0xda, 0x5a, 0x35, 0x56, 0x25, 0x08, 0x97, 0x79, 0xc1, 0x53, 0xb0,
|
||||
0x31, 0x3f, 0x2f, 0xc7, 0xb3, 0x2e, 0x15, 0x2f, 0xf8, 0x66, 0xc1, 0xe2, 0x47, 0xd2, 0x65, 0xf4,
|
||||
0x8a, 0x15, 0xde, 0x02, 0x27, 0xe5, 0xe7, 0xa6, 0xbc, 0x96, 0xa1, 0xca, 0x4f, 0xa6, 0x80, 0xab,
|
||||
0x16, 0xb4, 0x03, 0x30, 0x0d, 0x27, 0x7b, 0x96, 0x90, 0x01, 0xcd, 0xbb, 0xaa, 0xde, 0x68, 0x1d,
|
||||
0x9a, 0x11, 0xc9, 0x48, 0x36, 0x19, 0x9a, 0xa6, 0x15, 0x72, 0xf0, 0xd5, 0x86, 0xa5, 0x6a, 0xc5,
|
||||
0xe8, 0x26, 0xb8, 0x22, 0x4b, 0xe3, 0xe4, 0xf4, 0x84, 0xe4, 0xd3, 0xd1, 0xae, 0xe1, 0xa9, 0x4a,
|
||||
0xe2, 0xe3, 0x38, 0xc9, 0x9e, 0x3c, 0x96, 0xb8, 0xf4, 0xe7, 0x48, 0xbc, 0x50, 0xa1, 0x1b, 0xd0,
|
||||
0x2c, 0x60, 0x59, 0x84, 0xdd, 0xae, 0xe1, 0x42, 0x83, 0xd6, 0xa1, 0xd1, 0xe5, 0x9c, 0x49, 0xd0,
|
||||
0xf1, 0xad, 0xb0, 0xd9, 0xae, 0x61, 0xa3, 0x50, 0x18, 0xe3, 0x5d, 0x89, 0xcd, 0xfb, 0x56, 0xb8,
|
||||
0xa0, 0x30, 0xad, 0x40, 0x2f, 0x61, 0x49, 0x87, 0xd8, 0x4d, 0x53, 0x32, 0x91, 0x94, 0x7a, 0xf5,
|
||||
0x03, 0x1d, 0x4f, 0xd1, 0x76, 0x0d, 0x5f, 0x20, 0x4b, 0x73, 0x5d, 0x41, 0x61, 0xde, 0xb8, 0xf8,
|
||||
0x7d, 0x0b, 0x54, 0x9a, 0x57, 0xc9, 0xc8, 0x07, 0xe8, 0x33, 0x4e, 0xf2, 0xaa, 0x9a, 0xbe, 0x15,
|
||||
0x5a, 0xed, 0x1a, 0x2e, 0xe9, 0xd0, 0x43, 0x80, 0x88, 0xf6, 0xe2, 0x01, 0x51, 0xa5, 0xb9, 0xca,
|
||||
0xf9, 0xb2, 0x71, 0xfe, 0x4a, 0x23, 0xd2, 0x64, 0x4a, 0xda, 0x6b, 0x81, 0xab, 0x87, 0xeb, 0x84,
|
||||
0xb0, 0x60, 0x1b, 0x1a, 0x39, 0x4b, 0xee, 0xf4, 0x19, 0x61, 0x63, 0xdd, 0x44, 0x1b, 0x6b, 0x41,
|
||||
0x6a, 0x45, 0x8f, 0x30, 0xdd, 0x42, 0x1b, 0x6b, 0x21, 0xf8, 0x61, 0xc1, 0xd2, 0x41, 0x22, 0x86,
|
||||
0xb4, 0x97, 0xfd, 0xfd, 0x24, 0xdc, 0x2f, 0x2f, 0x98, 0x4c, 0xee, 0x3f, 0x93, 0xdc, 0x41, 0x24,
|
||||
0x3e, 0xa4, 0x6f, 0xe9, 0x44, 0x4c, 0x77, 0x2b, 0x80, 0x85, 0x7e, 0xcc, 0x32, 0x9a, 0xbe, 0x89,
|
||||
0x29, 0x8b, 0x84, 0x67, 0xfb, 0x76, 0xe8, 0xe2, 0x8a, 0x4e, 0x86, 0x61, 0xf1, 0x20, 0xce, 0x54,
|
||||
0x1b, 0x1d, 0xac, 0x05, 0xb4, 0x06, 0x75, 0xde, 0xef, 0x0b, 0x9a, 0xa9, 0x0e, 0x3a, 0x38, 0x97,
|
||||
0x24, 0x7b, 0x24, 0xef, 0x8f, 0xea, 0x9a, 0x8b, 0xb5, 0x10, 0xdc, 0x86, 0x56, 0xa9, 0x6d, 0x72,
|
||||
0x78, 0xcf, 0x08, 0xd3, 0xdb, 0xe4, 0x60, 0xf5, 0x96, 0x94, 0x52, 0x6b, 0x2a, 0x14, 0x37, 0xa7,
|
||||
0x9c, 0x82, 0x5b, 0xd4, 0x80, 0xee, 0x82, 0x1d, 0x47, 0x42, 0xd5, 0x3e, 0x73, 0x38, 0x24, 0x03,
|
||||
0xdd, 0x03, 0xe7, 0x33, 0x9d, 0x98, 0xaf, 0x31, 0x63, 0x0e, 0x14, 0x65, 0xaf, 0x0e, 0x8e, 0x5c,
|
||||
0x96, 0xad, 0x9f, 0x73, 0x50, 0xef, 0x28, 0x1a, 0xda, 0x81, 0xa6, 0xb9, 0xa7, 0xe8, 0xba, 0xb1,
|
||||
0xbd, 0x70, 0x61, 0xd7, 0x57, 0xcb, 0x4b, 0x9e, 0xaf, 0x57, 0x50, 0xdb, 0xb4, 0xd0, 0x2e, 0x2c,
|
||||
0x1a, 0xee, 0x71, 0x42, 0xd2, 0xc9, 0x6c, 0x17, 0xd7, 0x0c, 0x50, 0x39, 0x3d, 0x41, 0xad, 0x48,
|
||||
0xa0, 0xf3, 0x5b, 0x02, 0x9d, 0x7f, 0x48, 0xa0, 0xf3, 0xe7, 0x04, 0x3a, 0x97, 0x48, 0xe0, 0x39,
|
||||
0x34, 0xf2, 0xc1, 0x43, 0xc5, 0xed, 0xac, 0x4e, 0xe2, 0xcc, 0xf0, 0xdd, 0xba, 0xfa, 0xaf, 0x3d,
|
||||
0xfa, 0x15, 0x00, 0x00, 0xff, 0xff, 0x7e, 0x8d, 0x53, 0x0b, 0xe7, 0x06, 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.
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ package pilosa;
|
|||
|
||||
//import "public.proto";
|
||||
|
||||
option go_package = "github.com/pilosa/pilosa/v2/proto";
|
||||
|
||||
message QueryPQLRequest {
|
||||
string index = 1;
|
||||
string pql = 2;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,10 @@
|
|||
syntax = "proto3";
|
||||
package vdsm;
|
||||
|
||||
option go_package = "github.com/pilosa/pilosa/v2/proto/vdsm";
|
||||
|
||||
import "pilosa.proto";
|
||||
|
||||
// deprecated
|
||||
message DataSource {
|
||||
int64 id = 1;
|
||||
|
|
@ -56,92 +60,14 @@ message DeleteVDSRequest {
|
|||
message DeleteVDSResponse {
|
||||
}
|
||||
|
||||
message QueryPQLRequest {
|
||||
string index = 1;
|
||||
string pql = 2;
|
||||
}
|
||||
|
||||
message QuerySQLRequest {
|
||||
string sql = 1;
|
||||
}
|
||||
|
||||
message StatusError{
|
||||
uint32 Code = 1;
|
||||
string Message = 2;
|
||||
}
|
||||
|
||||
message RowResponse{
|
||||
repeated ColumnInfo headers = 1;
|
||||
repeated ColumnResponse columns = 2;
|
||||
StatusError StatusError = 3;
|
||||
}
|
||||
|
||||
message Row {
|
||||
repeated ColumnResponse columns = 1;
|
||||
}
|
||||
|
||||
message TableResponse{
|
||||
repeated ColumnInfo headers = 1;
|
||||
repeated Row rows = 2;
|
||||
StatusError StatusError = 3;
|
||||
}
|
||||
|
||||
message ColumnInfo {
|
||||
string name = 1;
|
||||
string datatype = 2;
|
||||
}
|
||||
|
||||
message ColumnResponse{
|
||||
oneof columnVal {
|
||||
string stringVal = 1;
|
||||
uint64 uint64Val = 2;
|
||||
int64 int64Val = 3;
|
||||
bool boolVal = 4;
|
||||
bytes blobVal = 5;
|
||||
Uint64Array uint64ArrayVal = 6;
|
||||
StringArray stringArrayVal = 7;
|
||||
double float64Val = 8;
|
||||
Decimal decimalVal = 9;
|
||||
}
|
||||
}
|
||||
|
||||
message Decimal {
|
||||
int64 value = 1;
|
||||
int64 scale = 2;
|
||||
}
|
||||
|
||||
message InspectRequest {
|
||||
string vds = 1;
|
||||
IdsOrKeys records = 2;
|
||||
repeated string filterFields = 3;
|
||||
uint64 limit = 4;
|
||||
uint64 offset = 5;
|
||||
string query = 6;
|
||||
}
|
||||
|
||||
message Uint64Array {
|
||||
repeated uint64 vals = 1;
|
||||
}
|
||||
|
||||
message StringArray {
|
||||
repeated string vals = 1;
|
||||
}
|
||||
|
||||
message IdsOrKeys {
|
||||
oneof type {
|
||||
Uint64Array ids = 1;
|
||||
StringArray keys = 2;
|
||||
}
|
||||
}
|
||||
|
||||
service Molecula {
|
||||
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 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) {};
|
||||
}
|
||||
|
|
|
|||
126
server/grpc.go
126
server/grpc.go
|
|
@ -325,36 +325,24 @@ func (h *VDSMGRPCHandler) DeleteVDS(ctx context.Context, req *vdsm_pb.DeleteVDSR
|
|||
}
|
||||
}
|
||||
|
||||
func (*VDSMGRPCHandler) QuerySQL(req *vdsm_pb.QuerySQLRequest, srv vdsm_pb.Molecula_QuerySQLServer) error {
|
||||
return status.Errorf(codes.Unimplemented, "method QuerySQL not implemented")
|
||||
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 *vdsm_pb.QuerySQLRequest) (*vdsm_pb.TableResponse, error) {
|
||||
pReq := pb.QuerySQLRequest(*req)
|
||||
resp, err := h.grpcHandler.QuerySQLUnary(ctx, &pReq)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
pResp, err := tableToTable(resp)
|
||||
return pResp, err
|
||||
func (h *VDSMGRPCHandler) QuerySQLUnary(ctx context.Context, req *pb.QuerySQLRequest) (*pb.TableResponse, error) {
|
||||
return h.grpcHandler.QuerySQLUnary(ctx, req)
|
||||
}
|
||||
|
||||
func (*VDSMGRPCHandler) QueryPQL(req *vdsm_pb.QueryPQLRequest, srv vdsm_pb.Molecula_QueryPQLServer) error {
|
||||
return status.Errorf(codes.Unimplemented, "method QueryPQL not implemented")
|
||||
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 *vdsm_pb.QueryPQLRequest) (*vdsm_pb.TableResponse, error) {
|
||||
pReq := pb.QueryPQLRequest(*req)
|
||||
resp, err := h.grpcHandler.QueryPQLUnary(ctx, &pReq)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
pResp, err := tableToTable(resp)
|
||||
return pResp, err
|
||||
func (h *VDSMGRPCHandler) QueryPQLUnary(ctx context.Context, req *pb.QueryPQLRequest) (*pb.TableResponse, error) {
|
||||
return h.grpcHandler.QueryPQLUnary(ctx, req)
|
||||
}
|
||||
|
||||
func (*VDSMGRPCHandler) Inspect(req *vdsm_pb.InspectRequest, srv vdsm_pb.Molecula_InspectServer) error {
|
||||
return status.Errorf(codes.Unimplemented, "method Inspect not implemented")
|
||||
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
|
||||
|
|
@ -1247,50 +1235,50 @@ func NewGRPCServer(opts ...grpcServerOption) (*grpcServer, error) {
|
|||
return server, nil
|
||||
}
|
||||
|
||||
// tableToTable is a helper function used by QueryPQLUnary
|
||||
// to convert a pb.TableResponse into a vdsm_pb.TableResponse.
|
||||
func tableToTable(ptbl *pb.TableResponse) (*vdsm_pb.TableResponse, error) {
|
||||
vtbl := &vdsm_pb.TableResponse{
|
||||
Headers: make([]*vdsm_pb.ColumnInfo, len(ptbl.Headers)),
|
||||
Rows: make([]*vdsm_pb.Row, len(ptbl.Rows)),
|
||||
}
|
||||
|
||||
// Headers
|
||||
for i, info := range ptbl.Headers {
|
||||
vtbl.Headers[i] = &vdsm_pb.ColumnInfo{Name: info.Name, Datatype: info.Datatype}
|
||||
}
|
||||
|
||||
// Rows
|
||||
for r := range ptbl.Rows {
|
||||
columns := make([]*vdsm_pb.ColumnResponse, len(ptbl.Rows[r].Columns))
|
||||
for i, col := range ptbl.Rows[r].Columns {
|
||||
switch v := col.GetColumnVal().(type) {
|
||||
case *pb.ColumnResponse_StringVal:
|
||||
columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_StringVal{StringVal: v.StringVal}}
|
||||
case *pb.ColumnResponse_Uint64Val:
|
||||
columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_Uint64Val{Uint64Val: v.Uint64Val}}
|
||||
case *pb.ColumnResponse_Int64Val:
|
||||
columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_Int64Val{Int64Val: v.Int64Val}}
|
||||
case *pb.ColumnResponse_BoolVal:
|
||||
columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_BoolVal{BoolVal: v.BoolVal}}
|
||||
case *pb.ColumnResponse_BlobVal:
|
||||
columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_BlobVal{BlobVal: v.BlobVal}}
|
||||
case *pb.ColumnResponse_Uint64ArrayVal:
|
||||
columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_Uint64ArrayVal{Uint64ArrayVal: &vdsm_pb.Uint64Array{Vals: v.Uint64ArrayVal.Vals}}}
|
||||
case *pb.ColumnResponse_StringArrayVal:
|
||||
columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_StringArrayVal{StringArrayVal: &vdsm_pb.StringArray{Vals: v.StringArrayVal.Vals}}}
|
||||
case *pb.ColumnResponse_Float64Val:
|
||||
columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_Float64Val{Float64Val: v.Float64Val}}
|
||||
case *pb.ColumnResponse_DecimalVal:
|
||||
columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_DecimalVal{DecimalVal: &vdsm_pb.Decimal{Value: v.DecimalVal.Value, Scale: v.DecimalVal.Scale}}}
|
||||
case nil:
|
||||
columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: nil}
|
||||
default:
|
||||
return nil, errors.Errorf("unhandled columnval type: %T", col.GetColumnVal())
|
||||
}
|
||||
}
|
||||
vtbl.Rows[r] = &vdsm_pb.Row{Columns: columns}
|
||||
}
|
||||
|
||||
return vtbl, nil
|
||||
}
|
||||
//// tableToTable is a helper function used by QueryPQLUnary
|
||||
//// to convert a pb.TableResponse into a vdsm_pb.TableResponse.
|
||||
//func tableToTable(ptbl *pb.TableResponse) (*vdsm_pb.TableResponse, error) {
|
||||
// vtbl := &vdsm_pb.TableResponse{
|
||||
// Headers: make([]*vdsm_pb.ColumnInfo, len(ptbl.Headers)),
|
||||
// Rows: make([]*vdsm_pb.Row, len(ptbl.Rows)),
|
||||
// }
|
||||
//
|
||||
// // Headers
|
||||
// for i, info := range ptbl.Headers {
|
||||
// vtbl.Headers[i] = &vdsm_pb.ColumnInfo{Name: info.Name, Datatype: info.Datatype}
|
||||
// }
|
||||
//
|
||||
// // Rows
|
||||
// for r := range ptbl.Rows {
|
||||
// columns := make([]*vdsm_pb.ColumnResponse, len(ptbl.Rows[r].Columns))
|
||||
// for i, col := range ptbl.Rows[r].Columns {
|
||||
// switch v := col.GetColumnVal().(type) {
|
||||
// case *pb.ColumnResponse_StringVal:
|
||||
// columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_StringVal{StringVal: v.StringVal}}
|
||||
// case *pb.ColumnResponse_Uint64Val:
|
||||
// columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_Uint64Val{Uint64Val: v.Uint64Val}}
|
||||
// case *pb.ColumnResponse_Int64Val:
|
||||
// columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_Int64Val{Int64Val: v.Int64Val}}
|
||||
// case *pb.ColumnResponse_BoolVal:
|
||||
// columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_BoolVal{BoolVal: v.BoolVal}}
|
||||
// case *pb.ColumnResponse_BlobVal:
|
||||
// columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_BlobVal{BlobVal: v.BlobVal}}
|
||||
// case *pb.ColumnResponse_Uint64ArrayVal:
|
||||
// columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_Uint64ArrayVal{Uint64ArrayVal: &vdsm_pb.Uint64Array{Vals: v.Uint64ArrayVal.Vals}}}
|
||||
// case *pb.ColumnResponse_StringArrayVal:
|
||||
// columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_StringArrayVal{StringArrayVal: &vdsm_pb.StringArray{Vals: v.StringArrayVal.Vals}}}
|
||||
// case *pb.ColumnResponse_Float64Val:
|
||||
// columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_Float64Val{Float64Val: v.Float64Val}}
|
||||
// case *pb.ColumnResponse_DecimalVal:
|
||||
// columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: &vdsm_pb.ColumnResponse_DecimalVal{DecimalVal: &vdsm_pb.Decimal{Value: v.DecimalVal.Value, Scale: v.DecimalVal.Scale}}}
|
||||
// case nil:
|
||||
// columns[i] = &vdsm_pb.ColumnResponse{ColumnVal: nil}
|
||||
// default:
|
||||
// return nil, errors.Errorf("unhandled columnval type: %T", col.GetColumnVal())
|
||||
// }
|
||||
// }
|
||||
// vtbl.Rows[r] = &vdsm_pb.Row{Columns: columns}
|
||||
// }
|
||||
//
|
||||
// return vtbl, nil
|
||||
//}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue