diff --git a/Makefile b/Makefile index 667affb..d7a5dfb 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -.PHONY: all rust go go-deps +.PHONY: all rust go go-deps java BUILDER_CONTAINER=namely/protoc-all:1.51_1 -all: rust go +all: rust go java rust: cargo build @@ -14,3 +14,8 @@ go: go-deps go-deps: go mod download + +java: + docker run -t -w /greptime-proto \ + --entrypoint ./scripts/generate-java.sh \ + -v ${PWD}:/greptime-proto ${BUILDER_CONTAINER} diff --git a/README.md b/README.md index 6148d21..0f567ef 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,13 @@ GreptimeDB protobuf files. make go ``` - The compilation will use builder container `namely/protoc-all`. +- **Compile for Java** + + ```console + make java + ``` + + The compilation for Go and Java will use builder container `namely/protoc-all`. ## Usage diff --git a/go/greptime/v1/ddl.pb.go b/go/greptime/v1/ddl.pb.go index 5db7bd4..744442e 100644 --- a/go/greptime/v1/ddl.pb.go +++ b/go/greptime/v1/ddl.pb.go @@ -222,7 +222,7 @@ type CreateTableExpr struct { CreateIfNotExists bool `protobuf:"varint,8,opt,name=create_if_not_exists,json=createIfNotExists,proto3" json:"create_if_not_exists,omitempty"` TableOptions map[string]string `protobuf:"bytes,9,rep,name=table_options,json=tableOptions,proto3" json:"table_options,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` TableId *TableId `protobuf:"bytes,10,opt,name=table_id,json=tableId,proto3" json:"table_id,omitempty"` - RegionIds []uint32 `protobuf:"varint,11,rep,packed,name=region_ids,json=regionIds,proto3" json:"region_ids,omitempty"` + RegionNumbers []uint32 `protobuf:"varint,11,rep,packed,name=region_numbers,json=regionNumbers,proto3" json:"region_numbers,omitempty"` Engine string `protobuf:"bytes,12,opt,name=engine,proto3" json:"engine,omitempty"` } @@ -328,9 +328,9 @@ func (x *CreateTableExpr) GetTableId() *TableId { return nil } -func (x *CreateTableExpr) GetRegionIds() []uint32 { +func (x *CreateTableExpr) GetRegionNumbers() []uint32 { if x != nil { - return x.RegionIds + return x.RegionNumbers } return nil } @@ -529,10 +529,10 @@ type FlushTableExpr struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - CatalogName string `protobuf:"bytes,1,opt,name=catalog_name,json=catalogName,proto3" json:"catalog_name,omitempty"` - SchemaName string `protobuf:"bytes,2,opt,name=schema_name,json=schemaName,proto3" json:"schema_name,omitempty"` - TableName string `protobuf:"bytes,3,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"` - RegionId *uint32 `protobuf:"varint,4,opt,name=region_id,json=regionId,proto3,oneof" json:"region_id,omitempty"` + CatalogName string `protobuf:"bytes,1,opt,name=catalog_name,json=catalogName,proto3" json:"catalog_name,omitempty"` + SchemaName string `protobuf:"bytes,2,opt,name=schema_name,json=schemaName,proto3" json:"schema_name,omitempty"` + TableName string `protobuf:"bytes,3,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"` + RegionNumber *uint32 `protobuf:"varint,4,opt,name=region_number,json=regionNumber,proto3,oneof" json:"region_number,omitempty"` } func (x *FlushTableExpr) Reset() { @@ -588,9 +588,9 @@ func (x *FlushTableExpr) GetTableName() string { return "" } -func (x *FlushTableExpr) GetRegionId() uint32 { - if x != nil && x.RegionId != nil { - return *x.RegionId +func (x *FlushTableExpr) GetRegionNumber() uint32 { + if x != nil && x.RegionNumber != nil { + return *x.RegionNumber } return 0 } @@ -1032,7 +1032,7 @@ var file_greptime_v1_ddl_proto_rawDesc = []byte{ 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x78, 0x70, 0x72, 0x48, 0x00, 0x52, 0x0a, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x65, 0x78, 0x70, - 0x72, 0x22, 0xb2, 0x04, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, + 0x72, 0x22, 0xba, 0x04, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x78, 0x70, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x63, 0x68, 0x65, @@ -1059,101 +1059,102 @@ var file_greptime_v1_ddl_proto_rawDesc = []byte{ 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2f, 0x0a, 0x08, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, - 0x62, 0x6c, 0x65, 0x49, 0x64, 0x52, 0x07, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x1d, - 0x0a, 0x0a, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x0b, 0x20, 0x03, - 0x28, 0x0d, 0x52, 0x09, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x12, 0x16, 0x0a, - 0x06, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, - 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x1a, 0x3f, 0x0a, 0x11, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb0, 0x02, 0x0a, 0x09, 0x41, 0x6c, 0x74, 0x65, 0x72, - 0x45, 0x78, 0x70, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5f, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x61, 0x74, 0x61, - 0x6c, 0x6f, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x63, 0x68, 0x65, 0x6d, - 0x61, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x63, - 0x68, 0x65, 0x6d, 0x61, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x3a, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x5f, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, - 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x64, 0x64, 0x43, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x48, 0x00, 0x52, 0x0a, 0x61, 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x73, 0x12, 0x3d, 0x0a, 0x0c, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x67, 0x72, 0x65, 0x70, - 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x43, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x73, 0x48, 0x00, 0x52, 0x0b, 0x64, 0x72, 0x6f, 0x70, 0x43, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x73, 0x12, 0x3d, 0x0a, 0x0c, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, - 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x54, 0x61, 0x62, - 0x6c, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, - 0x65, 0x42, 0x06, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x22, 0x72, 0x0a, 0x0d, 0x44, 0x72, 0x6f, - 0x70, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x78, 0x70, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x61, - 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0b, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, - 0x0b, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1d, - 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xa3, 0x01, - 0x0a, 0x0e, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x78, 0x70, 0x72, - 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x4e, - 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, - 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, - 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x09, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x08, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, - 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, - 0x5f, 0x69, 0x64, 0x22, 0x6a, 0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x61, 0x74, - 0x61, 0x62, 0x61, 0x73, 0x65, 0x45, 0x78, 0x70, 0x72, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x61, 0x74, - 0x61, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0c, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2f, - 0x0a, 0x14, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x69, 0x66, 0x5f, 0x6e, 0x6f, 0x74, 0x5f, - 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x63, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x49, 0x66, 0x4e, 0x6f, 0x74, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x22, - 0x45, 0x0a, 0x0a, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x37, 0x0a, - 0x0b, 0x61, 0x64, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x52, 0x0a, 0x61, 0x64, 0x64, 0x43, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x49, 0x0a, 0x0b, 0x44, 0x72, 0x6f, 0x70, 0x43, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x3a, 0x0a, 0x0c, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, - 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x43, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x52, 0x0b, 0x64, 0x72, 0x6f, 0x70, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x73, 0x22, 0x33, 0x0a, 0x0b, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, - 0x12, 0x24, 0x0a, 0x0e, 0x6e, 0x65, 0x77, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6e, 0x65, 0x77, 0x54, 0x61, 0x62, - 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xc8, 0x02, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x43, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x35, 0x0a, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x64, - 0x65, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, - 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x44, 0x65, 0x66, - 0x52, 0x09, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x44, 0x65, 0x66, 0x12, 0x15, 0x0a, 0x06, 0x69, - 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x4b, - 0x65, 0x79, 0x12, 0x3b, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x4c, 0x6f, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, - 0xaf, 0x01, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x51, 0x0a, 0x0d, - 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x4c, 0x6f, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, - 0x65, 0x52, 0x0c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, - 0x2a, 0x0a, 0x11, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6c, 0x6f, 0x75, 0x6d, 0x6e, 0x5f, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x61, 0x66, 0x74, 0x65, - 0x72, 0x43, 0x6c, 0x6f, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x24, 0x0a, 0x0c, 0x4c, - 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x09, 0x0a, 0x05, 0x46, - 0x49, 0x52, 0x53, 0x54, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x46, 0x54, 0x45, 0x52, 0x10, - 0x01, 0x22, 0x20, 0x0a, 0x0a, 0x44, 0x72, 0x6f, 0x70, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, - 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x22, 0x19, 0x0a, 0x07, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x42, 0x4c, - 0x0a, 0x0e, 0x69, 0x6f, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, - 0x42, 0x03, 0x44, 0x64, 0x6c, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x47, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x2f, 0x67, - 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, - 0x2f, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x62, 0x6c, 0x65, 0x49, 0x64, 0x52, 0x07, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x25, + 0x0a, 0x0e, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73, + 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x0d, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x4e, 0x75, + 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x18, + 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x1a, 0x3f, 0x0a, + 0x11, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb0, + 0x02, 0x0a, 0x09, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x45, 0x78, 0x70, 0x72, 0x12, 0x21, 0x0a, 0x0c, + 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0b, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x12, + 0x1f, 0x0a, 0x0b, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4e, 0x61, 0x6d, 0x65, + 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, + 0x3a, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, + 0x76, 0x31, 0x2e, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x48, 0x00, 0x52, + 0x0a, 0x61, 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x3d, 0x0a, 0x0c, 0x64, + 0x72, 0x6f, 0x70, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x18, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x44, 0x72, 0x6f, 0x70, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x48, 0x00, 0x52, 0x0b, 0x64, + 0x72, 0x6f, 0x70, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x3d, 0x0a, 0x0c, 0x72, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x18, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, + 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x72, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x6b, 0x69, 0x6e, + 0x64, 0x22, 0x72, 0x0a, 0x0d, 0x44, 0x72, 0x6f, 0x70, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x78, + 0x70, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5f, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, + 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x63, 0x68, 0x65, + 0x6d, 0x61, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xaf, 0x01, 0x0a, 0x0e, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x54, + 0x61, 0x62, 0x6c, 0x65, 0x45, 0x78, 0x70, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x61, 0x74, 0x61, + 0x6c, 0x6f, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, + 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x73, + 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0a, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x0d, 0x72, + 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0c, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x4e, 0x75, 0x6d, 0x62, + 0x65, 0x72, 0x88, 0x01, 0x01, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, + 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x6a, 0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x45, 0x78, 0x70, 0x72, 0x12, 0x23, 0x0a, + 0x0d, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x4e, 0x61, + 0x6d, 0x65, 0x12, 0x2f, 0x0a, 0x14, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x69, 0x66, 0x5f, + 0x6e, 0x6f, 0x74, 0x5f, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x11, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x66, 0x4e, 0x6f, 0x74, 0x45, 0x78, 0x69, + 0x73, 0x74, 0x73, 0x22, 0x45, 0x0a, 0x0a, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x73, 0x12, 0x37, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x52, 0x0a, + 0x61, 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x49, 0x0a, 0x0b, 0x44, 0x72, + 0x6f, 0x70, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x3a, 0x0a, 0x0c, 0x64, 0x72, 0x6f, + 0x70, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x17, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x72, + 0x6f, 0x70, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x52, 0x0b, 0x64, 0x72, 0x6f, 0x70, 0x43, 0x6f, + 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x33, 0x0a, 0x0b, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x54, + 0x61, 0x62, 0x6c, 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x6e, 0x65, 0x77, 0x5f, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6e, 0x65, + 0x77, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xc8, 0x02, 0x0a, 0x09, 0x41, + 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x35, 0x0a, 0x0a, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x5f, 0x64, 0x65, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, + 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x44, 0x65, 0x66, 0x52, 0x09, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x44, 0x65, 0x66, 0x12, + 0x15, 0x0a, 0x06, 0x69, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x05, 0x69, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x3b, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, + 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x1a, 0xaf, 0x01, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x51, 0x0a, 0x0d, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, + 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, + 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, + 0x79, 0x70, 0x65, 0x12, 0x2a, 0x0a, 0x11, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6c, 0x6f, + 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, + 0x61, 0x66, 0x74, 0x65, 0x72, 0x43, 0x6c, 0x6f, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x22, + 0x24, 0x0a, 0x0c, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, + 0x09, 0x0a, 0x05, 0x46, 0x49, 0x52, 0x53, 0x54, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x46, + 0x54, 0x45, 0x52, 0x10, 0x01, 0x22, 0x20, 0x0a, 0x0a, 0x44, 0x72, 0x6f, 0x70, 0x43, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x19, 0x0a, 0x07, 0x54, 0x61, 0x62, 0x6c, 0x65, + 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, + 0x69, 0x64, 0x42, 0x4c, 0x0a, 0x0e, 0x69, 0x6f, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, + 0x65, 0x2e, 0x76, 0x31, 0x42, 0x03, 0x44, 0x64, 0x6c, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x47, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x54, 0x65, + 0x61, 0x6d, 0x2f, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2d, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x31, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/java/src/main/java/io/greptime/v1/Columns.java b/java/src/main/java/io/greptime/v1/Columns.java index 270c4a9..e1aff52 100644 --- a/java/src/main/java/io/greptime/v1/Columns.java +++ b/java/src/main/java/io/greptime/v1/Columns.java @@ -477,6 +477,8 @@ public final class Columns { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -1400,6 +1402,8 @@ public final class Columns { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -4876,7 +4880,7 @@ public final class Columns { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getColumnNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(columnName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, columnName_); } if (semanticType_ != io.greptime.v1.Columns.Column.SemanticType.TAG.getNumber()) { @@ -4900,7 +4904,7 @@ public final class Columns { if (size != -1) return size; size = 0; - if (!getColumnNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(columnName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, columnName_); } if (semanticType_ != io.greptime.v1.Columns.Column.SemanticType.TAG.getNumber()) { @@ -5889,6 +5893,8 @@ public final class Columns { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -6003,7 +6009,7 @@ public final class Columns { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } if (datatype_ != io.greptime.v1.Columns.ColumnDataType.BOOLEAN.getNumber()) { @@ -6024,7 +6030,7 @@ public final class Columns { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } if (datatype_ != io.greptime.v1.Columns.ColumnDataType.BOOLEAN.getNumber()) { diff --git a/java/src/main/java/io/greptime/v1/Database.java b/java/src/main/java/io/greptime/v1/Database.java index 99cd13f..7bff68a 100644 --- a/java/src/main/java/io/greptime/v1/Database.java +++ b/java/src/main/java/io/greptime/v1/Database.java @@ -220,6 +220,8 @@ public final class Database { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -1080,8 +1082,9 @@ public final class Database { } else { if (requestCase_ == 2) { insertBuilder_.mergeFrom(value); + } else { + insertBuilder_.setMessage(value); } - insertBuilder_.setMessage(value); } requestCase_ = 2; return this; @@ -1221,8 +1224,9 @@ public final class Database { } else { if (requestCase_ == 3) { queryBuilder_.mergeFrom(value); + } else { + queryBuilder_.setMessage(value); } - queryBuilder_.setMessage(value); } requestCase_ = 3; return this; @@ -1362,8 +1366,9 @@ public final class Database { } else { if (requestCase_ == 4) { ddlBuilder_.mergeFrom(value); + } else { + ddlBuilder_.setMessage(value); } - ddlBuilder_.setMessage(value); } requestCase_ = 4; return this; @@ -1503,8 +1508,9 @@ public final class Database { } else { if (requestCase_ == 5) { deleteBuilder_.mergeFrom(value); + } else { + deleteBuilder_.setMessage(value); } - deleteBuilder_.setMessage(value); } requestCase_ = 5; return this; @@ -1741,6 +1747,8 @@ public final class Database { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -2424,8 +2432,9 @@ public final class Database { } else { if (responseCase_ == 2) { affectedRowsBuilder_.mergeFrom(value); + } else { + affectedRowsBuilder_.setMessage(value); } - affectedRowsBuilder_.setMessage(value); } responseCase_ = 2; return this; @@ -2644,8 +2653,8 @@ public final class Database { break; } case 18: { - queryCase_ = 2; query_ = input.readBytes(); + queryCase_ = 2; break; } case 26: { @@ -2673,6 +2682,8 @@ public final class Database { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -3446,8 +3457,9 @@ public final class Database { } else { if (queryCase_ == 3) { promRangeQueryBuilder_.mergeFrom(value); + } else { + promRangeQueryBuilder_.setMessage(value); } - promRangeQueryBuilder_.setMessage(value); } queryCase_ = 3; return this; @@ -3730,6 +3742,8 @@ public final class Database { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -3897,7 +3911,7 @@ public final class Database { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, tableName_); } for (int i = 0; i < columns_.size(); i++) { @@ -3918,7 +3932,7 @@ public final class Database { if (size != -1) return size; size = 0; - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, tableName_); } for (int i = 0; i < columns_.size(); i++) { @@ -4979,6 +4993,8 @@ public final class Database { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -5155,7 +5171,7 @@ public final class Database { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, tableName_); } if (regionNumber_ != 0) { @@ -5176,7 +5192,7 @@ public final class Database { if (size != -1) return size; size = 0; - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, tableName_); } if (regionNumber_ != 0) { diff --git a/java/src/main/java/io/greptime/v1/Ddl.java b/java/src/main/java/io/greptime/v1/Ddl.java index 0b148b5..1addfb6 100644 --- a/java/src/main/java/io/greptime/v1/Ddl.java +++ b/java/src/main/java/io/greptime/v1/Ddl.java @@ -228,6 +228,8 @@ public final class Ddl { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -979,8 +981,9 @@ public final class Ddl { } else { if (exprCase_ == 1) { createDatabaseBuilder_.mergeFrom(value); + } else { + createDatabaseBuilder_.setMessage(value); } - createDatabaseBuilder_.setMessage(value); } exprCase_ = 1; return this; @@ -1120,8 +1123,9 @@ public final class Ddl { } else { if (exprCase_ == 2) { createTableBuilder_.mergeFrom(value); + } else { + createTableBuilder_.setMessage(value); } - createTableBuilder_.setMessage(value); } exprCase_ = 2; return this; @@ -1261,8 +1265,9 @@ public final class Ddl { } else { if (exprCase_ == 3) { alterBuilder_.mergeFrom(value); + } else { + alterBuilder_.setMessage(value); } - alterBuilder_.setMessage(value); } exprCase_ = 3; return this; @@ -1402,8 +1407,9 @@ public final class Ddl { } else { if (exprCase_ == 4) { dropTableBuilder_.mergeFrom(value); + } else { + dropTableBuilder_.setMessage(value); } - dropTableBuilder_.setMessage(value); } exprCase_ = 4; return this; @@ -1543,8 +1549,9 @@ public final class Ddl { } else { if (exprCase_ == 5) { flushTableBuilder_.mergeFrom(value); + } else { + flushTableBuilder_.setMessage(value); } - flushTableBuilder_.setMessage(value); } exprCase_ = 5; return this; @@ -1805,9 +1812,11 @@ public final class Ddl { * map<string, string> table_options = 9; */ - java.lang.String getTableOptionsOrDefault( + /* nullable */ +java.lang.String getTableOptionsOrDefault( java.lang.String key, - java.lang.String defaultValue); + /* nullable */ +java.lang.String defaultValue); /** * map<string, string> table_options = 9; */ @@ -1831,21 +1840,21 @@ public final class Ddl { io.greptime.v1.Ddl.TableIdOrBuilder getTableIdOrBuilder(); /** - * repeated uint32 region_ids = 11; - * @return A list containing the regionIds. + * repeated uint32 region_numbers = 11; + * @return A list containing the regionNumbers. */ - java.util.List getRegionIdsList(); + java.util.List getRegionNumbersList(); /** - * repeated uint32 region_ids = 11; - * @return The count of regionIds. + * repeated uint32 region_numbers = 11; + * @return The count of regionNumbers. */ - int getRegionIdsCount(); + int getRegionNumbersCount(); /** - * repeated uint32 region_ids = 11; + * repeated uint32 region_numbers = 11; * @param index The index of the element to return. - * @return The regionIds at the given index. + * @return The regionNumbers at the given index. */ - int getRegionIds(int index); + int getRegionNumbers(int index); /** * string engine = 12; @@ -1879,7 +1888,7 @@ public final class Ddl { columnDefs_ = java.util.Collections.emptyList(); timeIndex_ = ""; primaryKeys_ = com.google.protobuf.LazyStringArrayList.EMPTY; - regionIds_ = emptyIntList(); + regionNumbers_ = emptyIntList(); engine_ = ""; } @@ -1995,21 +2004,21 @@ public final class Ddl { } case 88: { if (!((mutable_bitField0_ & 0x00000008) != 0)) { - regionIds_ = newIntList(); + regionNumbers_ = newIntList(); mutable_bitField0_ |= 0x00000008; } - regionIds_.addInt(input.readUInt32()); + regionNumbers_.addInt(input.readUInt32()); break; } case 90: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) { - regionIds_ = newIntList(); + regionNumbers_ = newIntList(); mutable_bitField0_ |= 0x00000008; } while (input.getBytesUntilLimit() > 0) { - regionIds_.addInt(input.readUInt32()); + regionNumbers_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -2031,6 +2040,8 @@ public final class Ddl { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -2042,7 +2053,7 @@ public final class Ddl { primaryKeys_ = primaryKeys_.getUnmodifiableView(); } if (((mutable_bitField0_ & 0x00000008) != 0)) { - regionIds_.makeImmutable(); // C + regionNumbers_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -2382,7 +2393,7 @@ public final class Ddl { @java.lang.Override public boolean containsTableOptions( java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } + if (key == null) { throw new NullPointerException("map key"); } return internalGetTableOptions().getMap().containsKey(key); } /** @@ -2409,7 +2420,7 @@ public final class Ddl { public java.lang.String getTableOptionsOrDefault( java.lang.String key, java.lang.String defaultValue) { - if (key == null) { throw new java.lang.NullPointerException(); } + if (key == null) { throw new NullPointerException("map key"); } java.util.Map map = internalGetTableOptions().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -2421,7 +2432,7 @@ public final class Ddl { public java.lang.String getTableOptionsOrThrow( java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } + if (key == null) { throw new NullPointerException("map key"); } java.util.Map map = internalGetTableOptions().getMap(); if (!map.containsKey(key)) { @@ -2456,33 +2467,33 @@ public final class Ddl { return getTableId(); } - public static final int REGION_IDS_FIELD_NUMBER = 11; - private com.google.protobuf.Internal.IntList regionIds_; + public static final int REGION_NUMBERS_FIELD_NUMBER = 11; + private com.google.protobuf.Internal.IntList regionNumbers_; /** - * repeated uint32 region_ids = 11; - * @return A list containing the regionIds. + * repeated uint32 region_numbers = 11; + * @return A list containing the regionNumbers. */ @java.lang.Override public java.util.List - getRegionIdsList() { - return regionIds_; + getRegionNumbersList() { + return regionNumbers_; } /** - * repeated uint32 region_ids = 11; - * @return The count of regionIds. + * repeated uint32 region_numbers = 11; + * @return The count of regionNumbers. */ - public int getRegionIdsCount() { - return regionIds_.size(); + public int getRegionNumbersCount() { + return regionNumbers_.size(); } /** - * repeated uint32 region_ids = 11; + * repeated uint32 region_numbers = 11; * @param index The index of the element to return. - * @return The regionIds at the given index. + * @return The regionNumbers at the given index. */ - public int getRegionIds(int index) { - return regionIds_.getInt(index); + public int getRegionNumbers(int index) { + return regionNumbers_.getInt(index); } - private int regionIdsMemoizedSerializedSize = -1; + private int regionNumbersMemoizedSerializedSize = -1; public static final int ENGINE_FIELD_NUMBER = 12; private volatile java.lang.Object engine_; @@ -2537,22 +2548,22 @@ public final class Ddl { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (!getCatalogNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(catalogName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, catalogName_); } - if (!getSchemaNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schemaName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, schemaName_); } - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, tableName_); } - if (!getDescBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(desc_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, desc_); } for (int i = 0; i < columnDefs_.size(); i++) { output.writeMessage(5, columnDefs_.get(i)); } - if (!getTimeIndexBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(timeIndex_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 6, timeIndex_); } for (int i = 0; i < primaryKeys_.size(); i++) { @@ -2570,14 +2581,14 @@ public final class Ddl { if (tableId_ != null) { output.writeMessage(10, getTableId()); } - if (getRegionIdsList().size() > 0) { + if (getRegionNumbersList().size() > 0) { output.writeUInt32NoTag(90); - output.writeUInt32NoTag(regionIdsMemoizedSerializedSize); + output.writeUInt32NoTag(regionNumbersMemoizedSerializedSize); } - for (int i = 0; i < regionIds_.size(); i++) { - output.writeUInt32NoTag(regionIds_.getInt(i)); + for (int i = 0; i < regionNumbers_.size(); i++) { + output.writeUInt32NoTag(regionNumbers_.getInt(i)); } - if (!getEngineBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(engine_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 12, engine_); } unknownFields.writeTo(output); @@ -2589,23 +2600,23 @@ public final class Ddl { if (size != -1) return size; size = 0; - if (!getCatalogNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(catalogName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, catalogName_); } - if (!getSchemaNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schemaName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, schemaName_); } - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, tableName_); } - if (!getDescBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(desc_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, desc_); } for (int i = 0; i < columnDefs_.size(); i++) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(5, columnDefs_.get(i)); } - if (!getTimeIndexBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(timeIndex_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, timeIndex_); } { @@ -2636,19 +2647,19 @@ public final class Ddl { } { int dataSize = 0; - for (int i = 0; i < regionIds_.size(); i++) { + for (int i = 0; i < regionNumbers_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(regionIds_.getInt(i)); + .computeUInt32SizeNoTag(regionNumbers_.getInt(i)); } size += dataSize; - if (!getRegionIdsList().isEmpty()) { + if (!getRegionNumbersList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - regionIdsMemoizedSerializedSize = dataSize; + regionNumbersMemoizedSerializedSize = dataSize; } - if (!getEngineBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(engine_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, engine_); } size += unknownFields.getSerializedSize(); @@ -2689,8 +2700,8 @@ public final class Ddl { if (!getTableId() .equals(other.getTableId())) return false; } - if (!getRegionIdsList() - .equals(other.getRegionIdsList())) return false; + if (!getRegionNumbersList() + .equals(other.getRegionNumbersList())) return false; if (!getEngine() .equals(other.getEngine())) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -2733,9 +2744,9 @@ public final class Ddl { hash = (37 * hash) + TABLE_ID_FIELD_NUMBER; hash = (53 * hash) + getTableId().hashCode(); } - if (getRegionIdsCount() > 0) { - hash = (37 * hash) + REGION_IDS_FIELD_NUMBER; - hash = (53 * hash) + getRegionIdsList().hashCode(); + if (getRegionNumbersCount() > 0) { + hash = (37 * hash) + REGION_NUMBERS_FIELD_NUMBER; + hash = (53 * hash) + getRegionNumbersList().hashCode(); } hash = (37 * hash) + ENGINE_FIELD_NUMBER; hash = (53 * hash) + getEngine().hashCode(); @@ -2922,7 +2933,7 @@ public final class Ddl { tableId_ = null; tableIdBuilder_ = null; } - regionIds_ = emptyIntList(); + regionNumbers_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000008); engine_ = ""; @@ -2981,10 +2992,10 @@ public final class Ddl { result.tableId_ = tableIdBuilder_.build(); } if (((bitField0_ & 0x00000008) != 0)) { - regionIds_.makeImmutable(); + regionNumbers_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000008); } - result.regionIds_ = regionIds_; + result.regionNumbers_ = regionNumbers_; result.engine_ = engine_; onBuilt(); return result; @@ -3098,13 +3109,13 @@ public final class Ddl { if (other.hasTableId()) { mergeTableId(other.getTableId()); } - if (!other.regionIds_.isEmpty()) { - if (regionIds_.isEmpty()) { - regionIds_ = other.regionIds_; + if (!other.regionNumbers_.isEmpty()) { + if (regionNumbers_.isEmpty()) { + regionNumbers_ = other.regionNumbers_; bitField0_ = (bitField0_ & ~0x00000008); } else { - ensureRegionIdsIsMutable(); - regionIds_.addAll(other.regionIds_); + ensureRegionNumbersIsMutable(); + regionNumbers_.addAll(other.regionNumbers_); } onChanged(); } @@ -3936,7 +3947,7 @@ public final class Ddl { @java.lang.Override public boolean containsTableOptions( java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } + if (key == null) { throw new NullPointerException("map key"); } return internalGetTableOptions().getMap().containsKey(key); } /** @@ -3963,7 +3974,7 @@ public final class Ddl { public java.lang.String getTableOptionsOrDefault( java.lang.String key, java.lang.String defaultValue) { - if (key == null) { throw new java.lang.NullPointerException(); } + if (key == null) { throw new NullPointerException("map key"); } java.util.Map map = internalGetTableOptions().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -3975,7 +3986,7 @@ public final class Ddl { public java.lang.String getTableOptionsOrThrow( java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } + if (key == null) { throw new NullPointerException("map key"); } java.util.Map map = internalGetTableOptions().getMap(); if (!map.containsKey(key)) { @@ -3995,7 +4006,7 @@ public final class Ddl { public Builder removeTableOptions( java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } + if (key == null) { throw new NullPointerException("map key"); } internalGetMutableTableOptions().getMutableMap() .remove(key); return this; @@ -4014,8 +4025,11 @@ public final class Ddl { public Builder putTableOptions( java.lang.String key, java.lang.String value) { - if (key == null) { throw new java.lang.NullPointerException(); } - if (value == null) { throw new java.lang.NullPointerException(); } + if (key == null) { throw new NullPointerException("map key"); } + if (value == null) { + throw new NullPointerException("map value"); +} + internalGetMutableTableOptions().getMutableMap() .put(key, value); return this; @@ -4150,80 +4164,80 @@ public final class Ddl { return tableIdBuilder_; } - private com.google.protobuf.Internal.IntList regionIds_ = emptyIntList(); - private void ensureRegionIdsIsMutable() { + private com.google.protobuf.Internal.IntList regionNumbers_ = emptyIntList(); + private void ensureRegionNumbersIsMutable() { if (!((bitField0_ & 0x00000008) != 0)) { - regionIds_ = mutableCopy(regionIds_); + regionNumbers_ = mutableCopy(regionNumbers_); bitField0_ |= 0x00000008; } } /** - * repeated uint32 region_ids = 11; - * @return A list containing the regionIds. + * repeated uint32 region_numbers = 11; + * @return A list containing the regionNumbers. */ public java.util.List - getRegionIdsList() { + getRegionNumbersList() { return ((bitField0_ & 0x00000008) != 0) ? - java.util.Collections.unmodifiableList(regionIds_) : regionIds_; + java.util.Collections.unmodifiableList(regionNumbers_) : regionNumbers_; } /** - * repeated uint32 region_ids = 11; - * @return The count of regionIds. + * repeated uint32 region_numbers = 11; + * @return The count of regionNumbers. */ - public int getRegionIdsCount() { - return regionIds_.size(); + public int getRegionNumbersCount() { + return regionNumbers_.size(); } /** - * repeated uint32 region_ids = 11; + * repeated uint32 region_numbers = 11; * @param index The index of the element to return. - * @return The regionIds at the given index. + * @return The regionNumbers at the given index. */ - public int getRegionIds(int index) { - return regionIds_.getInt(index); + public int getRegionNumbers(int index) { + return regionNumbers_.getInt(index); } /** - * repeated uint32 region_ids = 11; + * repeated uint32 region_numbers = 11; * @param index The index to set the value at. - * @param value The regionIds to set. + * @param value The regionNumbers to set. * @return This builder for chaining. */ - public Builder setRegionIds( + public Builder setRegionNumbers( int index, int value) { - ensureRegionIdsIsMutable(); - regionIds_.setInt(index, value); + ensureRegionNumbersIsMutable(); + regionNumbers_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 region_ids = 11; - * @param value The regionIds to add. + * repeated uint32 region_numbers = 11; + * @param value The regionNumbers to add. * @return This builder for chaining. */ - public Builder addRegionIds(int value) { - ensureRegionIdsIsMutable(); - regionIds_.addInt(value); + public Builder addRegionNumbers(int value) { + ensureRegionNumbersIsMutable(); + regionNumbers_.addInt(value); onChanged(); return this; } /** - * repeated uint32 region_ids = 11; - * @param values The regionIds to add. + * repeated uint32 region_numbers = 11; + * @param values The regionNumbers to add. * @return This builder for chaining. */ - public Builder addAllRegionIds( + public Builder addAllRegionNumbers( java.lang.Iterable values) { - ensureRegionIdsIsMutable(); + ensureRegionNumbersIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, regionIds_); + values, regionNumbers_); onChanged(); return this; } /** - * repeated uint32 region_ids = 11; + * repeated uint32 region_numbers = 11; * @return This builder for chaining. */ - public Builder clearRegionIds() { - regionIds_ = emptyIntList(); + public Builder clearRegionNumbers() { + regionNumbers_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; @@ -4563,6 +4577,8 @@ public final class Ddl { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -4848,13 +4864,13 @@ public final class Ddl { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getCatalogNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(catalogName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, catalogName_); } - if (!getSchemaNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schemaName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, schemaName_); } - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, tableName_); } if (kindCase_ == 4) { @@ -4875,13 +4891,13 @@ public final class Ddl { if (size != -1) return size; size = 0; - if (!getCatalogNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(catalogName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, catalogName_); } - if (!getSchemaNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schemaName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, schemaName_); } - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, tableName_); } if (kindCase_ == 4) { @@ -5582,8 +5598,9 @@ public final class Ddl { } else { if (kindCase_ == 4) { addColumnsBuilder_.mergeFrom(value); + } else { + addColumnsBuilder_.setMessage(value); } - addColumnsBuilder_.setMessage(value); } kindCase_ = 4; return this; @@ -5723,8 +5740,9 @@ public final class Ddl { } else { if (kindCase_ == 5) { dropColumnsBuilder_.mergeFrom(value); + } else { + dropColumnsBuilder_.setMessage(value); } - dropColumnsBuilder_.setMessage(value); } kindCase_ = 5; return this; @@ -5864,8 +5882,9 @@ public final class Ddl { } else { if (kindCase_ == 6) { renameTableBuilder_.mergeFrom(value); + } else { + renameTableBuilder_.setMessage(value); } - renameTableBuilder_.setMessage(value); } kindCase_ = 6; return this; @@ -6100,6 +6119,8 @@ public final class Ddl { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -6249,13 +6270,13 @@ public final class Ddl { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getCatalogNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(catalogName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, catalogName_); } - if (!getSchemaNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schemaName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, schemaName_); } - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, tableName_); } unknownFields.writeTo(output); @@ -6267,13 +6288,13 @@ public final class Ddl { if (size != -1) return size; size = 0; - if (!getCatalogNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(catalogName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, catalogName_); } - if (!getSchemaNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schemaName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, schemaName_); } - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, tableName_); } size += unknownFields.getSerializedSize(); @@ -6892,15 +6913,15 @@ public final class Ddl { getTableNameBytes(); /** - * uint32 region_id = 4; - * @return Whether the regionId field is set. + * optional uint32 region_number = 4; + * @return Whether the regionNumber field is set. */ - boolean hasRegionId(); + boolean hasRegionNumber(); /** - * uint32 region_id = 4; - * @return The regionId. + * optional uint32 region_number = 4; + * @return The regionNumber. */ - int getRegionId(); + int getRegionNumber(); } /** * Protobuf type {@code greptime.v1.FlushTableExpr} @@ -6971,7 +6992,7 @@ public final class Ddl { } case 32: { bitField0_ |= 0x00000001; - regionId_ = input.readUInt32(); + regionNumber_ = input.readUInt32(); break; } default: { @@ -6985,6 +7006,8 @@ public final class Ddl { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -7121,23 +7144,23 @@ public final class Ddl { } } - public static final int REGION_ID_FIELD_NUMBER = 4; - private int regionId_; + public static final int REGION_NUMBER_FIELD_NUMBER = 4; + private int regionNumber_; /** - * uint32 region_id = 4; - * @return Whether the regionId field is set. + * optional uint32 region_number = 4; + * @return Whether the regionNumber field is set. */ @java.lang.Override - public boolean hasRegionId() { + public boolean hasRegionNumber() { return ((bitField0_ & 0x00000001) != 0); } /** - * uint32 region_id = 4; - * @return The regionId. + * optional uint32 region_number = 4; + * @return The regionNumber. */ @java.lang.Override - public int getRegionId() { - return regionId_; + public int getRegionNumber() { + return regionNumber_; } private byte memoizedIsInitialized = -1; @@ -7154,17 +7177,17 @@ public final class Ddl { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getCatalogNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(catalogName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, catalogName_); } - if (!getSchemaNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schemaName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, schemaName_); } - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, tableName_); } if (((bitField0_ & 0x00000001) != 0)) { - output.writeUInt32(4, regionId_); + output.writeUInt32(4, regionNumber_); } unknownFields.writeTo(output); } @@ -7175,18 +7198,18 @@ public final class Ddl { if (size != -1) return size; size = 0; - if (!getCatalogNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(catalogName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, catalogName_); } - if (!getSchemaNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schemaName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, schemaName_); } - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, tableName_); } if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, regionId_); + .computeUInt32Size(4, regionNumber_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -7209,10 +7232,10 @@ public final class Ddl { .equals(other.getSchemaName())) return false; if (!getTableName() .equals(other.getTableName())) return false; - if (hasRegionId() != other.hasRegionId()) return false; - if (hasRegionId()) { - if (getRegionId() - != other.getRegionId()) return false; + if (hasRegionNumber() != other.hasRegionNumber()) return false; + if (hasRegionNumber()) { + if (getRegionNumber() + != other.getRegionNumber()) return false; } if (!unknownFields.equals(other.unknownFields)) return false; return true; @@ -7231,9 +7254,9 @@ public final class Ddl { hash = (53 * hash) + getSchemaName().hashCode(); hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER; hash = (53 * hash) + getTableName().hashCode(); - if (hasRegionId()) { - hash = (37 * hash) + REGION_ID_FIELD_NUMBER; - hash = (53 * hash) + getRegionId(); + if (hasRegionNumber()) { + hash = (37 * hash) + REGION_NUMBER_FIELD_NUMBER; + hash = (53 * hash) + getRegionNumber(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -7374,7 +7397,7 @@ public final class Ddl { tableName_ = ""; - regionId_ = 0; + regionNumber_ = 0; bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -7408,7 +7431,7 @@ public final class Ddl { result.schemaName_ = schemaName_; result.tableName_ = tableName_; if (((from_bitField0_ & 0x00000001) != 0)) { - result.regionId_ = regionId_; + result.regionNumber_ = regionNumber_; to_bitField0_ |= 0x00000001; } result.bitField0_ = to_bitField0_; @@ -7472,8 +7495,8 @@ public final class Ddl { tableName_ = other.tableName_; onChanged(); } - if (other.hasRegionId()) { - setRegionId(other.getRegionId()); + if (other.hasRegionNumber()) { + setRegionNumber(other.getRegionNumber()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -7733,41 +7756,41 @@ public final class Ddl { return this; } - private int regionId_ ; + private int regionNumber_ ; /** - * uint32 region_id = 4; - * @return Whether the regionId field is set. + * optional uint32 region_number = 4; + * @return Whether the regionNumber field is set. */ @java.lang.Override - public boolean hasRegionId() { + public boolean hasRegionNumber() { return ((bitField0_ & 0x00000001) != 0); } /** - * uint32 region_id = 4; - * @return The regionId. + * optional uint32 region_number = 4; + * @return The regionNumber. */ @java.lang.Override - public int getRegionId() { - return regionId_; + public int getRegionNumber() { + return regionNumber_; } /** - * uint32 region_id = 4; - * @param value The regionId to set. + * optional uint32 region_number = 4; + * @param value The regionNumber to set. * @return This builder for chaining. */ - public Builder setRegionId(int value) { + public Builder setRegionNumber(int value) { bitField0_ |= 0x00000001; - regionId_ = value; + regionNumber_ = value; onChanged(); return this; } /** - * uint32 region_id = 4; + * optional uint32 region_number = 4; * @return This builder for chaining. */ - public Builder clearRegionId() { + public Builder clearRegionNumber() { bitField0_ = (bitField0_ & ~0x00000001); - regionId_ = 0; + regionNumber_ = 0; onChanged(); return this; } @@ -7922,6 +7945,8 @@ public final class Ddl { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -8014,7 +8039,7 @@ public final class Ddl { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getDatabaseNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, databaseName_); } if (createIfNotExists_ != false) { @@ -8029,7 +8054,7 @@ public final class Ddl { if (size != -1) return size; size = 0; - if (!getDatabaseNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, databaseName_); } if (createIfNotExists_ != false) { @@ -8594,6 +8619,8 @@ public final class Ddl { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -9387,6 +9414,8 @@ public final class Ddl { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -10164,6 +10193,8 @@ public final class Ddl { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -10237,7 +10268,7 @@ public final class Ddl { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNewTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(newTableName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, newTableName_); } unknownFields.writeTo(output); @@ -10249,7 +10280,7 @@ public final class Ddl { if (size != -1) return size; size = 0; - if (!getNewTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(newTableName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, newTableName_); } size += unknownFields.getSerializedSize(); @@ -10780,6 +10811,8 @@ public final class Ddl { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -10898,6 +10931,8 @@ public final class Ddl { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -11101,7 +11136,7 @@ public final class Ddl { if (locationType_ != io.greptime.v1.Ddl.AddColumn.Location.LocationType.FIRST.getNumber()) { output.writeEnum(1, locationType_); } - if (!getAfterCloumnNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(afterCloumnName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, afterCloumnName_); } unknownFields.writeTo(output); @@ -11117,7 +11152,7 @@ public final class Ddl { size += com.google.protobuf.CodedOutputStream .computeEnumSize(1, locationType_); } - if (!getAfterCloumnNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(afterCloumnName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, afterCloumnName_); } size += unknownFields.getSerializedSize(); @@ -12410,6 +12445,8 @@ public final class Ddl { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -12483,7 +12520,7 @@ public final class Ddl { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } unknownFields.writeTo(output); @@ -12495,7 +12532,7 @@ public final class Ddl { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } size += unknownFields.getSerializedSize(); @@ -12970,6 +13007,8 @@ public final class Ddl { } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); @@ -13474,7 +13513,7 @@ public final class Ddl { "\030\003 \001(\0132\026.greptime.v1.AlterExprH\000\0220\n\ndrop" + "_table\030\004 \001(\0132\032.greptime.v1.DropTableExpr" + "H\000\0222\n\013flush_table\030\005 \001(\0132\033.greptime.v1.Fl" + - "ushTableExprH\000B\006\n\004expr\"\233\003\n\017CreateTableEx" + + "ushTableExprH\000B\006\n\004expr\"\237\003\n\017CreateTableEx" + "pr\022\024\n\014catalog_name\030\001 \001(\t\022\023\n\013schema_name\030" + "\002 \001(\t\022\022\n\ntable_name\030\003 \001(\t\022\014\n\004desc\030\004 \001(\t\022" + "+\n\013column_defs\030\005 \003(\0132\026.greptime.v1.Colum" + @@ -13482,36 +13521,37 @@ public final class Ddl { "\030\007 \003(\t\022\034\n\024create_if_not_exists\030\010 \001(\010\022E\n\r" + "table_options\030\t \003(\0132..greptime.v1.Create" + "TableExpr.TableOptionsEntry\022&\n\010table_id\030" + - "\n \001(\0132\024.greptime.v1.TableId\022\022\n\nregion_id" + - "s\030\013 \003(\r\022\016\n\006engine\030\014 \001(\t\0323\n\021TableOptionsE" + - "ntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\346\001\n" + - "\tAlterExpr\022\024\n\014catalog_name\030\001 \001(\t\022\023\n\013sche" + - "ma_name\030\002 \001(\t\022\022\n\ntable_name\030\003 \001(\t\022.\n\013add" + - "_columns\030\004 \001(\0132\027.greptime.v1.AddColumnsH" + - "\000\0220\n\014drop_columns\030\005 \001(\0132\030.greptime.v1.Dr" + - "opColumnsH\000\0220\n\014rename_table\030\006 \001(\0132\030.grep" + - "time.v1.RenameTableH\000B\006\n\004kind\"N\n\rDropTab" + - "leExpr\022\024\n\014catalog_name\030\001 \001(\t\022\023\n\013schema_n" + - "ame\030\002 \001(\t\022\022\n\ntable_name\030\003 \001(\t\"u\n\016FlushTa" + - "bleExpr\022\024\n\014catalog_name\030\001 \001(\t\022\023\n\013schema_" + - "name\030\002 \001(\t\022\022\n\ntable_name\030\003 \001(\t\022\026\n\tregion" + - "_id\030\004 \001(\rH\000\210\001\001B\014\n\n_region_id\"I\n\022CreateDa" + - "tabaseExpr\022\025\n\rdatabase_name\030\001 \001(\t\022\034\n\024cre" + - "ate_if_not_exists\030\002 \001(\010\"9\n\nAddColumns\022+\n" + - "\013add_columns\030\001 \003(\0132\026.greptime.v1.AddColu" + - "mn\"<\n\013DropColumns\022-\n\014drop_columns\030\001 \003(\0132" + - "\027.greptime.v1.DropColumn\"%\n\013RenameTable\022" + - "\026\n\016new_table_name\030\001 \001(\t\"\215\002\n\tAddColumn\022*\n" + - "\ncolumn_def\030\001 \001(\0132\026.greptime.v1.ColumnDe" + - "f\022\016\n\006is_key\030\002 \001(\010\0221\n\010location\030\003 \001(\0132\037.gr" + - "eptime.v1.AddColumn.Location\032\220\001\n\010Locatio" + - "n\022C\n\rlocation_type\030\001 \001(\0162,.greptime.v1.A" + - "ddColumn.Location.LocationType\022\031\n\021after_" + - "cloumn_name\030\002 \001(\t\"$\n\014LocationType\022\t\n\005FIR" + - "ST\020\000\022\t\n\005AFTER\020\001\"\032\n\nDropColumn\022\014\n\004name\030\001 " + - "\001(\t\"\025\n\007TableId\022\n\n\002id\030\001 \001(\rBL\n\016io.greptim" + - "e.v1B\003DdlZ5github.com/GreptimeTeam/grept" + - "ime-proto/go/greptime/v1b\006proto3" + "\n \001(\0132\024.greptime.v1.TableId\022\026\n\016region_nu" + + "mbers\030\013 \003(\r\022\016\n\006engine\030\014 \001(\t\0323\n\021TableOpti" + + "onsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001" + + "\"\346\001\n\tAlterExpr\022\024\n\014catalog_name\030\001 \001(\t\022\023\n\013" + + "schema_name\030\002 \001(\t\022\022\n\ntable_name\030\003 \001(\t\022.\n" + + "\013add_columns\030\004 \001(\0132\027.greptime.v1.AddColu" + + "mnsH\000\0220\n\014drop_columns\030\005 \001(\0132\030.greptime.v" + + "1.DropColumnsH\000\0220\n\014rename_table\030\006 \001(\0132\030." + + "greptime.v1.RenameTableH\000B\006\n\004kind\"N\n\rDro" + + "pTableExpr\022\024\n\014catalog_name\030\001 \001(\t\022\023\n\013sche" + + "ma_name\030\002 \001(\t\022\022\n\ntable_name\030\003 \001(\t\"}\n\016Flu" + + "shTableExpr\022\024\n\014catalog_name\030\001 \001(\t\022\023\n\013sch" + + "ema_name\030\002 \001(\t\022\022\n\ntable_name\030\003 \001(\t\022\032\n\rre" + + "gion_number\030\004 \001(\rH\000\210\001\001B\020\n\016_region_number" + + "\"I\n\022CreateDatabaseExpr\022\025\n\rdatabase_name\030" + + "\001 \001(\t\022\034\n\024create_if_not_exists\030\002 \001(\010\"9\n\nA" + + "ddColumns\022+\n\013add_columns\030\001 \003(\0132\026.greptim" + + "e.v1.AddColumn\"<\n\013DropColumns\022-\n\014drop_co" + + "lumns\030\001 \003(\0132\027.greptime.v1.DropColumn\"%\n\013" + + "RenameTable\022\026\n\016new_table_name\030\001 \001(\t\"\215\002\n\t" + + "AddColumn\022*\n\ncolumn_def\030\001 \001(\0132\026.greptime" + + ".v1.ColumnDef\022\016\n\006is_key\030\002 \001(\010\0221\n\010locatio" + + "n\030\003 \001(\0132\037.greptime.v1.AddColumn.Location" + + "\032\220\001\n\010Location\022C\n\rlocation_type\030\001 \001(\0162,.g" + + "reptime.v1.AddColumn.Location.LocationTy" + + "pe\022\031\n\021after_cloumn_name\030\002 \001(\t\"$\n\014Locatio" + + "nType\022\t\n\005FIRST\020\000\022\t\n\005AFTER\020\001\"\032\n\nDropColum" + + "n\022\014\n\004name\030\001 \001(\t\"\025\n\007TableId\022\n\n\002id\030\001 \001(\rBL" + + "\n\016io.greptime.v1B\003DdlZ5github.com/Grepti" + + "meTeam/greptime-proto/go/greptime/v1b\006pr" + + "oto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -13529,7 +13569,7 @@ public final class Ddl { internal_static_greptime_v1_CreateTableExpr_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_greptime_v1_CreateTableExpr_descriptor, - new java.lang.String[] { "CatalogName", "SchemaName", "TableName", "Desc", "ColumnDefs", "TimeIndex", "PrimaryKeys", "CreateIfNotExists", "TableOptions", "TableId", "RegionIds", "Engine", }); + new java.lang.String[] { "CatalogName", "SchemaName", "TableName", "Desc", "ColumnDefs", "TimeIndex", "PrimaryKeys", "CreateIfNotExists", "TableOptions", "TableId", "RegionNumbers", "Engine", }); internal_static_greptime_v1_CreateTableExpr_TableOptionsEntry_descriptor = internal_static_greptime_v1_CreateTableExpr_descriptor.getNestedTypes().get(0); internal_static_greptime_v1_CreateTableExpr_TableOptionsEntry_fieldAccessorTable = new @@ -13553,7 +13593,7 @@ public final class Ddl { internal_static_greptime_v1_FlushTableExpr_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_greptime_v1_FlushTableExpr_descriptor, - new java.lang.String[] { "CatalogName", "SchemaName", "TableName", "RegionId", "RegionId", }); + new java.lang.String[] { "CatalogName", "SchemaName", "TableName", "RegionNumber", "RegionNumber", }); internal_static_greptime_v1_CreateDatabaseExpr_descriptor = getDescriptor().getMessageTypes().get(5); internal_static_greptime_v1_CreateDatabaseExpr_fieldAccessorTable = new diff --git a/proto/greptime/v1/ddl.proto b/proto/greptime/v1/ddl.proto index 2acd65f..2b06370 100644 --- a/proto/greptime/v1/ddl.proto +++ b/proto/greptime/v1/ddl.proto @@ -47,7 +47,7 @@ message CreateTableExpr { bool create_if_not_exists = 8; map table_options = 9; TableId table_id = 10; - repeated uint32 region_ids = 11; + repeated uint32 region_numbers = 11; string engine = 12; } @@ -72,7 +72,7 @@ message FlushTableExpr { string catalog_name = 1; string schema_name = 2; string table_name = 3; - optional uint32 region_id = 4; + optional uint32 region_number = 4; } message CreateDatabaseExpr { diff --git a/java/src/main/resources/gen.sh b/scripts/generate-java.sh similarity index 50% rename from java/src/main/resources/gen.sh rename to scripts/generate-java.sh index c472b13..5889e55 100755 --- a/java/src/main/resources/gen.sh +++ b/scripts/generate-java.sh @@ -1,8 +1,9 @@ -#!/bin/bash +#! /usr/bin/env bash -PROTO_ROOT=../../../../proto +PROTO_ROOT=./proto +JAVA_OUTPUT=./java/src/main/java/ -protoc -I=${PROTO_ROOT} --java_out=../java/ \ +protoc -I=${PROTO_ROOT} --java_out=${JAVA_OUTPUT} \ ${PROTO_ROOT}/greptime/v1/column.proto \ ${PROTO_ROOT}/greptime/v1/ddl.proto \ ${PROTO_ROOT}/greptime/v1/database.proto