修改group by

client/client_query_request.go

@@ -19,7 +19,7 @@ type CommonQueryRequest struct {
 	Where                 *Clause
 	OrderBy               string
 	Or                    *Clause
-	GroupBy               []string
+	GroupBy               string
 	Joins                 *Clause
 	Having                *Clause
 	PageNo                int
@@ -46,7 +46,7 @@ type CommonCountRequest struct {
 	Version               string
 	Where                 *Clause
 	Or                    *Clause
-	GroupBy               []string
+	GroupBy               string
 	Joins                 *Clause
 	Having                *Clause
 }

pb/v1/request/query.pb.go

@@ -137,19 +137,19 @@ type CommonQueryRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	DatabaseID            string   `protobuf:"bytes,1,opt,name=DatabaseID,proto3" json:"DatabaseID,omitempty"`
-	TablePrefixWithSchema string   `protobuf:"bytes,2,opt,name=TablePrefixWithSchema,proto3" json:"TablePrefixWithSchema,omitempty"`
-	Version               string   `protobuf:"bytes,3,opt,name=Version,proto3" json:"Version,omitempty"`
-	Table                 string   `protobuf:"bytes,4,opt,name=Table,proto3" json:"Table,omitempty"`
-	Select                []byte   `protobuf:"bytes,5,opt,name=Select,proto3" json:"Select,omitempty"`
-	Where                 []byte   `protobuf:"bytes,6,opt,name=Where,proto3" json:"Where,omitempty"`
-	OrderBy               string   `protobuf:"bytes,7,opt,name=OrderBy,proto3" json:"OrderBy,omitempty"`
-	Or                    []byte   `protobuf:"bytes,8,opt,name=Or,proto3" json:"Or,omitempty"`
-	GroupBy               []string `protobuf:"bytes,9,rep,name=GroupBy,proto3" json:"GroupBy,omitempty"`
-	Joins                 []byte   `protobuf:"bytes,10,opt,name=Joins,proto3" json:"Joins,omitempty"`
-	Having                []byte   `protobuf:"bytes,11,opt,name=Having,proto3" json:"Having,omitempty"`
-	PageNo                int32    `protobuf:"varint,12,opt,name=PageNo,proto3" json:"PageNo,omitempty"`
-	PageSize              int32    `protobuf:"varint,13,opt,name=PageSize,proto3" json:"PageSize,omitempty"`
+	DatabaseID            string `protobuf:"bytes,1,opt,name=DatabaseID,proto3" json:"DatabaseID,omitempty"`
+	TablePrefixWithSchema string `protobuf:"bytes,2,opt,name=TablePrefixWithSchema,proto3" json:"TablePrefixWithSchema,omitempty"`
+	Version               string `protobuf:"bytes,3,opt,name=Version,proto3" json:"Version,omitempty"`
+	Table                 string `protobuf:"bytes,4,opt,name=Table,proto3" json:"Table,omitempty"`
+	Select                []byte `protobuf:"bytes,5,opt,name=Select,proto3" json:"Select,omitempty"`
+	Where                 []byte `protobuf:"bytes,6,opt,name=Where,proto3" json:"Where,omitempty"`
+	OrderBy               string `protobuf:"bytes,7,opt,name=OrderBy,proto3" json:"OrderBy,omitempty"`
+	Or                    []byte `protobuf:"bytes,8,opt,name=Or,proto3" json:"Or,omitempty"`
+	GroupBy               string `protobuf:"bytes,9,opt,name=GroupBy,proto3" json:"GroupBy,omitempty"`
+	Joins                 []byte `protobuf:"bytes,10,opt,name=Joins,proto3" json:"Joins,omitempty"`
+	Having                []byte `protobuf:"bytes,11,opt,name=Having,proto3" json:"Having,omitempty"`
+	PageNo                int32  `protobuf:"varint,12,opt,name=PageNo,proto3" json:"PageNo,omitempty"`
+	PageSize              int32  `protobuf:"varint,13,opt,name=PageSize,proto3" json:"PageSize,omitempty"`
 }
 
 func (x *CommonQueryRequest) Reset() {
@@ -240,11 +240,11 @@ func (x *CommonQueryRequest) GetOr() []byte {
 	return nil
 }
 
-func (x *CommonQueryRequest) GetGroupBy() []string {
+func (x *CommonQueryRequest) GetGroupBy() string {
 	if x != nil {
 		return x.GroupBy
 	}
-	return nil
+	return ""
 }
 
 func (x *CommonQueryRequest) GetJoins() []byte {
@@ -446,15 +446,15 @@ type CommonCountRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	DatabaseID            string   `protobuf:"bytes,1,opt,name=DatabaseID,proto3" json:"DatabaseID,omitempty"`
-	TablePrefixWithSchema string   `protobuf:"bytes,2,opt,name=TablePrefixWithSchema,proto3" json:"TablePrefixWithSchema,omitempty"`
-	Version               string   `protobuf:"bytes,3,opt,name=Version,proto3" json:"Version,omitempty"`
-	Table                 string   `protobuf:"bytes,4,opt,name=Table,proto3" json:"Table,omitempty"`
-	Where                 []byte   `protobuf:"bytes,5,opt,name=Where,proto3" json:"Where,omitempty"`
-	Or                    []byte   `protobuf:"bytes,6,opt,name=Or,proto3" json:"Or,omitempty"`
-	GroupBy               []string `protobuf:"bytes,7,rep,name=GroupBy,proto3" json:"GroupBy,omitempty"`
-	Joins                 []byte   `protobuf:"bytes,8,opt,name=Joins,proto3" json:"Joins,omitempty"`
-	Having                []byte   `protobuf:"bytes,9,opt,name=Having,proto3" json:"Having,omitempty"`
+	DatabaseID            string `protobuf:"bytes,1,opt,name=DatabaseID,proto3" json:"DatabaseID,omitempty"`
+	TablePrefixWithSchema string `protobuf:"bytes,2,opt,name=TablePrefixWithSchema,proto3" json:"TablePrefixWithSchema,omitempty"`
+	Version               string `protobuf:"bytes,3,opt,name=Version,proto3" json:"Version,omitempty"`
+	Table                 string `protobuf:"bytes,4,opt,name=Table,proto3" json:"Table,omitempty"`
+	Where                 []byte `protobuf:"bytes,5,opt,name=Where,proto3" json:"Where,omitempty"`
+	Or                    []byte `protobuf:"bytes,6,opt,name=Or,proto3" json:"Or,omitempty"`
+	GroupBy               string `protobuf:"bytes,7,opt,name=GroupBy,proto3" json:"GroupBy,omitempty"`
+	Joins                 []byte `protobuf:"bytes,8,opt,name=Joins,proto3" json:"Joins,omitempty"`
+	Having                []byte `protobuf:"bytes,9,opt,name=Having,proto3" json:"Having,omitempty"`
 }
 
 func (x *CommonCountRequest) Reset() {
@@ -531,11 +531,11 @@ func (x *CommonCountRequest) GetOr() []byte {
 	return nil
 }
 
-func (x *CommonCountRequest) GetGroupBy() []string {
+func (x *CommonCountRequest) GetGroupBy() string {
 	if x != nil {
 		return x.GroupBy
 	}
-	return nil
+	return ""
 }
 
 func (x *CommonCountRequest) GetJoins() []byte {
@@ -596,7 +596,7 @@ var file_v1_request_query_proto_rawDesc = []byte{
 	0x72, 0x42, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72,
 	0x42, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x4f, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x02,
 	0x4f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x18, 0x09, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x07, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x12, 0x14, 0x0a, 0x05,
 	0x4a, 0x6f, 0x69, 0x6e, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x4a, 0x6f, 0x69,
 	0x6e, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x48, 0x61, 0x76, 0x69, 0x6e, 0x67, 0x18, 0x0b, 0x20, 0x01,
 	0x28, 0x0c, 0x52, 0x06, 0x48, 0x61, 0x76, 0x69, 0x6e, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x61,
@@ -644,7 +644,7 @@ var file_v1_request_query_proto_rawDesc = []byte{
 	0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x57, 0x68, 0x65, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
 	0x0c, 0x52, 0x05, 0x57, 0x68, 0x65, 0x72, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x4f, 0x72, 0x18, 0x06,
 	0x20, 0x01, 0x28, 0x0c, 0x52, 0x02, 0x4f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x72, 0x6f, 0x75,
-	0x70, 0x42, 0x79, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x47, 0x72, 0x6f, 0x75, 0x70,
+	0x70, 0x42, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x72, 0x6f, 0x75, 0x70,
 	0x42, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x4a, 0x6f, 0x69, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28,
 	0x0c, 0x52, 0x05, 0x4a, 0x6f, 0x69, 0x6e, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x48, 0x61, 0x76, 0x69,
 	0x6e, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x48, 0x61, 0x76, 0x69, 0x6e, 0x67,