From 5de5d0cfb1c1d17c9e227cf1ae629afa681be1bd Mon Sep 17 00:00:00 2001 From: "cai.zhang" Date: Wed, 6 Nov 2024 16:32:18 +0800 Subject: [PATCH] Update the template expression proto to improve transmission efficiency (#341) Signed-off-by: Cai Zhang --- go-api/schemapb/schema.pb.go | 417 ++++++++++++++++++++++++----------- proto/schema.proto | 26 ++- 2 files changed, 304 insertions(+), 139 deletions(-) diff --git a/go-api/schemapb/schema.pb.go b/go-api/schemapb/schema.pb.go index 527cb47..30107da 100644 --- a/go-api/schemapb/schema.pb.go +++ b/go-api/schemapb/schema.pb.go @@ -2099,7 +2099,6 @@ type TemplateValue struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Type DataType `protobuf:"varint,1,opt,name=type,proto3,enum=milvus.proto.schema.DataType" json:"type,omitempty"` // Types that are assignable to Val: // // *TemplateValue_BoolVal @@ -2142,13 +2141,6 @@ func (*TemplateValue) Descriptor() ([]byte, []int) { return file_schema_proto_rawDescGZIP(), []int{23} } -func (x *TemplateValue) GetType() DataType { - if x != nil { - return x.Type - } - return DataType_None -} - func (m *TemplateValue) GetVal() isTemplateValue_Val { if m != nil { return m.Val @@ -2196,23 +2188,23 @@ type isTemplateValue_Val interface { } type TemplateValue_BoolVal struct { - BoolVal bool `protobuf:"varint,2,opt,name=bool_val,json=boolVal,proto3,oneof"` + BoolVal bool `protobuf:"varint,1,opt,name=bool_val,json=boolVal,proto3,oneof"` } type TemplateValue_Int64Val struct { - Int64Val int64 `protobuf:"varint,3,opt,name=int64_val,json=int64Val,proto3,oneof"` + Int64Val int64 `protobuf:"varint,2,opt,name=int64_val,json=int64Val,proto3,oneof"` } type TemplateValue_FloatVal struct { - FloatVal float64 `protobuf:"fixed64,4,opt,name=float_val,json=floatVal,proto3,oneof"` + FloatVal float64 `protobuf:"fixed64,3,opt,name=float_val,json=floatVal,proto3,oneof"` } type TemplateValue_StringVal struct { - StringVal string `protobuf:"bytes,5,opt,name=string_val,json=stringVal,proto3,oneof"` + StringVal string `protobuf:"bytes,4,opt,name=string_val,json=stringVal,proto3,oneof"` } type TemplateValue_ArrayVal struct { - ArrayVal *TemplateArrayValue `protobuf:"bytes,6,opt,name=array_val,json=arrayVal,proto3,oneof"` + ArrayVal *TemplateArrayValue `protobuf:"bytes,5,opt,name=array_val,json=arrayVal,proto3,oneof"` } func (*TemplateValue_BoolVal) isTemplateValue_Val() {} @@ -2230,9 +2222,15 @@ type TemplateArrayValue struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Array []*TemplateValue `protobuf:"bytes,1,rep,name=array,proto3" json:"array,omitempty"` - SameType bool `protobuf:"varint,2,opt,name=same_type,json=sameType,proto3" json:"same_type,omitempty"` - ElementType DataType `protobuf:"varint,3,opt,name=element_type,json=elementType,proto3,enum=milvus.proto.schema.DataType" json:"element_type,omitempty"` + // Types that are assignable to Data: + // + // *TemplateArrayValue_BoolData + // *TemplateArrayValue_LongData + // *TemplateArrayValue_DoubleData + // *TemplateArrayValue_StringData + // *TemplateArrayValue_ArrayData + // *TemplateArrayValue_JsonData + Data isTemplateArrayValue_Data `protobuf_oneof:"data"` } func (x *TemplateArrayValue) Reset() { @@ -2267,25 +2265,140 @@ func (*TemplateArrayValue) Descriptor() ([]byte, []int) { return file_schema_proto_rawDescGZIP(), []int{24} } -func (x *TemplateArrayValue) GetArray() []*TemplateValue { - if x != nil { - return x.Array +func (m *TemplateArrayValue) GetData() isTemplateArrayValue_Data { + if m != nil { + return m.Data } return nil } -func (x *TemplateArrayValue) GetSameType() bool { - if x != nil { - return x.SameType +func (x *TemplateArrayValue) GetBoolData() *BoolArray { + if x, ok := x.GetData().(*TemplateArrayValue_BoolData); ok { + return x.BoolData } - return false + return nil +} + +func (x *TemplateArrayValue) GetLongData() *LongArray { + if x, ok := x.GetData().(*TemplateArrayValue_LongData); ok { + return x.LongData + } + return nil +} + +func (x *TemplateArrayValue) GetDoubleData() *DoubleArray { + if x, ok := x.GetData().(*TemplateArrayValue_DoubleData); ok { + return x.DoubleData + } + return nil +} + +func (x *TemplateArrayValue) GetStringData() *StringArray { + if x, ok := x.GetData().(*TemplateArrayValue_StringData); ok { + return x.StringData + } + return nil +} + +func (x *TemplateArrayValue) GetArrayData() *TemplateArrayValueArray { + if x, ok := x.GetData().(*TemplateArrayValue_ArrayData); ok { + return x.ArrayData + } + return nil +} + +func (x *TemplateArrayValue) GetJsonData() *JSONArray { + if x, ok := x.GetData().(*TemplateArrayValue_JsonData); ok { + return x.JsonData + } + return nil +} + +type isTemplateArrayValue_Data interface { + isTemplateArrayValue_Data() +} + +type TemplateArrayValue_BoolData struct { + BoolData *BoolArray `protobuf:"bytes,1,opt,name=bool_data,json=boolData,proto3,oneof"` +} + +type TemplateArrayValue_LongData struct { + LongData *LongArray `protobuf:"bytes,2,opt,name=long_data,json=longData,proto3,oneof"` +} + +type TemplateArrayValue_DoubleData struct { + DoubleData *DoubleArray `protobuf:"bytes,3,opt,name=double_data,json=doubleData,proto3,oneof"` +} + +type TemplateArrayValue_StringData struct { + StringData *StringArray `protobuf:"bytes,4,opt,name=string_data,json=stringData,proto3,oneof"` +} + +type TemplateArrayValue_ArrayData struct { + ArrayData *TemplateArrayValueArray `protobuf:"bytes,5,opt,name=array_data,json=arrayData,proto3,oneof"` +} + +type TemplateArrayValue_JsonData struct { + JsonData *JSONArray `protobuf:"bytes,6,opt,name=json_data,json=jsonData,proto3,oneof"` +} + +func (*TemplateArrayValue_BoolData) isTemplateArrayValue_Data() {} + +func (*TemplateArrayValue_LongData) isTemplateArrayValue_Data() {} + +func (*TemplateArrayValue_DoubleData) isTemplateArrayValue_Data() {} + +func (*TemplateArrayValue_StringData) isTemplateArrayValue_Data() {} + +func (*TemplateArrayValue_ArrayData) isTemplateArrayValue_Data() {} + +func (*TemplateArrayValue_JsonData) isTemplateArrayValue_Data() {} + +type TemplateArrayValueArray struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data []*TemplateArrayValue `protobuf:"bytes,1,rep,name=data,proto3" json:"data,omitempty"` +} + +func (x *TemplateArrayValueArray) Reset() { + *x = TemplateArrayValueArray{} + if protoimpl.UnsafeEnabled { + mi := &file_schema_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TemplateArrayValueArray) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TemplateArrayValueArray) ProtoMessage() {} + +func (x *TemplateArrayValueArray) ProtoReflect() protoreflect.Message { + mi := &file_schema_proto_msgTypes[25] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) } -func (x *TemplateArrayValue) GetElementType() DataType { +// Deprecated: Use TemplateArrayValueArray.ProtoReflect.Descriptor instead. +func (*TemplateArrayValueArray) Descriptor() ([]byte, []int) { + return file_schema_proto_rawDescGZIP(), []int{25} +} + +func (x *TemplateArrayValueArray) GetData() []*TemplateArrayValue { if x != nil { - return x.ElementType + return x.Data } - return DataType_None + return nil } var File_schema_proto protoreflect.FileDescriptor @@ -2575,67 +2688,86 @@ var file_schema_proto_rawDesc = []byte{ 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x53, 0x63, 0x61, 0x6c, 0x61, 0x72, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x15, 0x73, 0x63, 0x61, 0x6c, 0x61, 0x72, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x69, - 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x22, 0x8d, 0x02, 0x0a, 0x0d, 0x54, 0x65, 0x6d, 0x70, - 0x6c, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x31, 0x0a, 0x04, 0x74, 0x79, 0x70, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1d, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x44, 0x61, - 0x74, 0x61, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1b, 0x0a, 0x08, - 0x62, 0x6f, 0x6f, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, - 0x52, 0x07, 0x62, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x09, 0x69, 0x6e, 0x74, - 0x36, 0x34, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, 0x52, 0x08, - 0x69, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x09, 0x66, 0x6c, 0x6f, 0x61, - 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x08, 0x66, - 0x6c, 0x6f, 0x61, 0x74, 0x56, 0x61, 0x6c, 0x12, 0x1f, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x69, 0x6e, - 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x09, 0x73, - 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x12, 0x46, 0x0a, 0x09, 0x61, 0x72, 0x72, 0x61, - 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x69, - 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x73, 0x63, 0x68, 0x65, 0x6d, - 0x61, 0x2e, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x41, 0x72, 0x72, 0x61, 0x79, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x08, 0x61, 0x72, 0x72, 0x61, 0x79, 0x56, 0x61, 0x6c, - 0x42, 0x05, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x22, 0xad, 0x01, 0x0a, 0x12, 0x54, 0x65, 0x6d, 0x70, - 0x6c, 0x61, 0x74, 0x65, 0x41, 0x72, 0x72, 0x61, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x38, - 0x0a, 0x05, 0x61, 0x72, 0x72, 0x61, 0x79, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, + 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x22, 0xda, 0x01, 0x0a, 0x0d, 0x54, 0x65, 0x6d, 0x70, + 0x6c, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1b, 0x0a, 0x08, 0x62, 0x6f, 0x6f, + 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x07, 0x62, + 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f, + 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, 0x52, 0x08, 0x69, 0x6e, 0x74, + 0x36, 0x34, 0x56, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x09, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x5f, 0x76, + 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x08, 0x66, 0x6c, 0x6f, 0x61, + 0x74, 0x56, 0x61, 0x6c, 0x12, 0x1f, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, + 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x09, 0x73, 0x74, 0x72, 0x69, + 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x12, 0x46, 0x0a, 0x09, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5f, 0x76, + 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, + 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x54, + 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x41, 0x72, 0x72, 0x61, 0x79, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x48, 0x00, 0x52, 0x08, 0x61, 0x72, 0x72, 0x61, 0x79, 0x56, 0x61, 0x6c, 0x42, 0x05, 0x0a, + 0x03, 0x76, 0x61, 0x6c, 0x22, 0xb2, 0x03, 0x0a, 0x12, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, + 0x65, 0x41, 0x72, 0x72, 0x61, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x3d, 0x0a, 0x09, 0x62, + 0x6f, 0x6f, 0x6c, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, + 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x73, 0x63, + 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x41, 0x72, 0x72, 0x61, 0x79, 0x48, 0x00, + 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x3d, 0x0a, 0x09, 0x6c, 0x6f, + 0x6e, 0x67, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x73, 0x63, 0x68, - 0x65, 0x6d, 0x61, 0x2e, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x52, 0x05, 0x61, 0x72, 0x72, 0x61, 0x79, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x61, 0x6d, 0x65, - 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x73, 0x61, 0x6d, - 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x40, 0x0a, 0x0c, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1d, 0x2e, 0x6d, 0x69, - 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x73, 0x63, 0x68, 0x65, 0x6d, - 0x61, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0b, 0x65, 0x6c, 0x65, 0x6d, - 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x2a, 0xfd, 0x01, 0x0a, 0x08, 0x44, 0x61, 0x74, 0x61, - 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x6f, 0x6e, 0x65, 0x10, 0x00, 0x12, 0x08, - 0x0a, 0x04, 0x42, 0x6f, 0x6f, 0x6c, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x6e, 0x74, 0x38, - 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x31, 0x36, 0x10, 0x03, 0x12, 0x09, 0x0a, - 0x05, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x36, - 0x34, 0x10, 0x05, 0x12, 0x09, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x10, 0x0a, 0x12, 0x0a, - 0x0a, 0x06, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x10, 0x0b, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x74, - 0x72, 0x69, 0x6e, 0x67, 0x10, 0x14, 0x12, 0x0b, 0x0a, 0x07, 0x56, 0x61, 0x72, 0x43, 0x68, 0x61, - 0x72, 0x10, 0x15, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x72, 0x72, 0x61, 0x79, 0x10, 0x16, 0x12, 0x08, - 0x0a, 0x04, 0x4a, 0x53, 0x4f, 0x4e, 0x10, 0x17, 0x12, 0x0c, 0x0a, 0x08, 0x47, 0x65, 0x6f, 0x6d, - 0x65, 0x74, 0x72, 0x79, 0x10, 0x18, 0x12, 0x10, 0x0a, 0x0c, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, - 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x10, 0x64, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x6c, 0x6f, 0x61, - 0x74, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x10, 0x65, 0x12, 0x11, 0x0a, 0x0d, 0x46, 0x6c, 0x6f, - 0x61, 0x74, 0x31, 0x36, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x10, 0x66, 0x12, 0x12, 0x0a, 0x0e, - 0x42, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x31, 0x36, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x10, 0x67, - 0x12, 0x15, 0x0a, 0x11, 0x53, 0x70, 0x61, 0x72, 0x73, 0x65, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x56, - 0x65, 0x63, 0x74, 0x6f, 0x72, 0x10, 0x68, 0x2a, 0x38, 0x0a, 0x0c, 0x46, 0x75, 0x6e, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, - 0x77, 0x6e, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x42, 0x4d, 0x32, 0x35, 0x10, 0x01, 0x12, 0x11, - 0x0a, 0x0d, 0x54, 0x65, 0x78, 0x74, 0x45, 0x6d, 0x62, 0x65, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x10, - 0x02, 0x2a, 0x56, 0x0a, 0x0a, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, - 0x10, 0x0a, 0x0c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x10, - 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, - 0x6e, 0x67, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x72, 0x6f, - 0x70, 0x70, 0x69, 0x6e, 0x67, 0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x46, 0x69, 0x65, 0x6c, 0x64, - 0x44, 0x72, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x10, 0x03, 0x42, 0x6d, 0x0a, 0x0e, 0x69, 0x6f, 0x2e, - 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x42, 0x0b, 0x53, 0x63, 0x68, - 0x65, 0x6d, 0x61, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, - 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, - 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x70, 0x62, - 0xa0, 0x01, 0x01, 0xaa, 0x02, 0x12, 0x4d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x43, 0x6c, 0x69, - 0x65, 0x6e, 0x74, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x6d, 0x61, 0x2e, 0x4c, 0x6f, 0x6e, 0x67, 0x41, 0x72, 0x72, 0x61, 0x79, 0x48, 0x00, 0x52, + 0x08, 0x6c, 0x6f, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x12, 0x43, 0x0a, 0x0b, 0x64, 0x6f, 0x75, + 0x62, 0x6c, 0x65, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, + 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x73, 0x63, + 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x41, 0x72, 0x72, 0x61, 0x79, + 0x48, 0x00, 0x52, 0x0a, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x43, + 0x0a, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2e, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, + 0x41, 0x72, 0x72, 0x61, 0x79, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x44, + 0x61, 0x74, 0x61, 0x12, 0x4d, 0x0a, 0x0a, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5f, 0x64, 0x61, 0x74, + 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x54, 0x65, + 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x41, 0x72, 0x72, 0x61, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, + 0x41, 0x72, 0x72, 0x61, 0x79, 0x48, 0x00, 0x52, 0x09, 0x61, 0x72, 0x72, 0x61, 0x79, 0x44, 0x61, + 0x74, 0x61, 0x12, 0x3d, 0x0a, 0x09, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4a, 0x53, 0x4f, 0x4e, + 0x41, 0x72, 0x72, 0x61, 0x79, 0x48, 0x00, 0x52, 0x08, 0x6a, 0x73, 0x6f, 0x6e, 0x44, 0x61, 0x74, + 0x61, 0x42, 0x06, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x56, 0x0a, 0x17, 0x54, 0x65, 0x6d, + 0x70, 0x6c, 0x61, 0x74, 0x65, 0x41, 0x72, 0x72, 0x61, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x41, + 0x72, 0x72, 0x61, 0x79, 0x12, 0x3b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2e, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, + 0x65, 0x41, 0x72, 0x72, 0x61, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x2a, 0xfd, 0x01, 0x0a, 0x08, 0x44, 0x61, 0x74, 0x61, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, + 0x0a, 0x04, 0x4e, 0x6f, 0x6e, 0x65, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x42, 0x6f, 0x6f, 0x6c, + 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x6e, 0x74, 0x38, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, + 0x49, 0x6e, 0x74, 0x31, 0x36, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x33, 0x32, + 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x10, 0x05, 0x12, 0x09, 0x0a, + 0x05, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x10, 0x0a, 0x12, 0x0a, 0x0a, 0x06, 0x44, 0x6f, 0x75, 0x62, + 0x6c, 0x65, 0x10, 0x0b, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x10, 0x14, + 0x12, 0x0b, 0x0a, 0x07, 0x56, 0x61, 0x72, 0x43, 0x68, 0x61, 0x72, 0x10, 0x15, 0x12, 0x09, 0x0a, + 0x05, 0x41, 0x72, 0x72, 0x61, 0x79, 0x10, 0x16, 0x12, 0x08, 0x0a, 0x04, 0x4a, 0x53, 0x4f, 0x4e, + 0x10, 0x17, 0x12, 0x0c, 0x0a, 0x08, 0x47, 0x65, 0x6f, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x10, 0x18, + 0x12, 0x10, 0x0a, 0x0c, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, + 0x10, 0x64, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x56, 0x65, 0x63, 0x74, 0x6f, + 0x72, 0x10, 0x65, 0x12, 0x11, 0x0a, 0x0d, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x31, 0x36, 0x56, 0x65, + 0x63, 0x74, 0x6f, 0x72, 0x10, 0x66, 0x12, 0x12, 0x0a, 0x0e, 0x42, 0x46, 0x6c, 0x6f, 0x61, 0x74, + 0x31, 0x36, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x10, 0x67, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x70, + 0x61, 0x72, 0x73, 0x65, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x10, + 0x68, 0x2a, 0x38, 0x0a, 0x0c, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, + 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x10, 0x00, 0x12, 0x08, + 0x0a, 0x04, 0x42, 0x4d, 0x32, 0x35, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x65, 0x78, 0x74, + 0x45, 0x6d, 0x62, 0x65, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x10, 0x02, 0x2a, 0x56, 0x0a, 0x0a, 0x46, + 0x69, 0x65, 0x6c, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x0c, 0x46, 0x69, 0x65, + 0x6c, 0x64, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x46, + 0x69, 0x65, 0x6c, 0x64, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, 0x11, + 0x0a, 0x0d, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x10, + 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x72, 0x6f, 0x70, 0x70, 0x65, + 0x64, 0x10, 0x03, 0x42, 0x6d, 0x0a, 0x0e, 0x69, 0x6f, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, + 0x2e, 0x67, 0x72, 0x70, 0x63, 0x42, 0x0b, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, + 0x73, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x76, + 0x32, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x70, 0x62, 0xa0, 0x01, 0x01, 0xaa, 0x02, 0x12, + 0x4d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2e, 0x47, 0x72, + 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2651,49 +2783,50 @@ func file_schema_proto_rawDescGZIP() []byte { } var file_schema_proto_enumTypes = make([]protoimpl.EnumInfo, 3) -var file_schema_proto_msgTypes = make([]protoimpl.MessageInfo, 25) +var file_schema_proto_msgTypes = make([]protoimpl.MessageInfo, 26) var file_schema_proto_goTypes = []interface{}{ - (DataType)(0), // 0: milvus.proto.schema.DataType - (FunctionType)(0), // 1: milvus.proto.schema.FunctionType - (FieldState)(0), // 2: milvus.proto.schema.FieldState - (*FieldSchema)(nil), // 3: milvus.proto.schema.FieldSchema - (*FunctionSchema)(nil), // 4: milvus.proto.schema.FunctionSchema - (*CollectionSchema)(nil), // 5: milvus.proto.schema.CollectionSchema - (*BoolArray)(nil), // 6: milvus.proto.schema.BoolArray - (*IntArray)(nil), // 7: milvus.proto.schema.IntArray - (*LongArray)(nil), // 8: milvus.proto.schema.LongArray - (*FloatArray)(nil), // 9: milvus.proto.schema.FloatArray - (*DoubleArray)(nil), // 10: milvus.proto.schema.DoubleArray - (*BytesArray)(nil), // 11: milvus.proto.schema.BytesArray - (*StringArray)(nil), // 12: milvus.proto.schema.StringArray - (*ArrayArray)(nil), // 13: milvus.proto.schema.ArrayArray - (*JSONArray)(nil), // 14: milvus.proto.schema.JSONArray - (*GeometryArray)(nil), // 15: milvus.proto.schema.GeometryArray - (*ValueField)(nil), // 16: milvus.proto.schema.ValueField - (*ScalarField)(nil), // 17: milvus.proto.schema.ScalarField - (*SparseFloatArray)(nil), // 18: milvus.proto.schema.SparseFloatArray - (*VectorField)(nil), // 19: milvus.proto.schema.VectorField - (*FieldData)(nil), // 20: milvus.proto.schema.FieldData - (*IDs)(nil), // 21: milvus.proto.schema.IDs - (*SearchResultData)(nil), // 22: milvus.proto.schema.SearchResultData - (*VectorClusteringInfo)(nil), // 23: milvus.proto.schema.VectorClusteringInfo - (*ScalarClusteringInfo)(nil), // 24: milvus.proto.schema.ScalarClusteringInfo - (*ClusteringInfo)(nil), // 25: milvus.proto.schema.ClusteringInfo - (*TemplateValue)(nil), // 26: milvus.proto.schema.TemplateValue - (*TemplateArrayValue)(nil), // 27: milvus.proto.schema.TemplateArrayValue - (*commonpb.KeyValuePair)(nil), // 28: milvus.proto.common.KeyValuePair + (DataType)(0), // 0: milvus.proto.schema.DataType + (FunctionType)(0), // 1: milvus.proto.schema.FunctionType + (FieldState)(0), // 2: milvus.proto.schema.FieldState + (*FieldSchema)(nil), // 3: milvus.proto.schema.FieldSchema + (*FunctionSchema)(nil), // 4: milvus.proto.schema.FunctionSchema + (*CollectionSchema)(nil), // 5: milvus.proto.schema.CollectionSchema + (*BoolArray)(nil), // 6: milvus.proto.schema.BoolArray + (*IntArray)(nil), // 7: milvus.proto.schema.IntArray + (*LongArray)(nil), // 8: milvus.proto.schema.LongArray + (*FloatArray)(nil), // 9: milvus.proto.schema.FloatArray + (*DoubleArray)(nil), // 10: milvus.proto.schema.DoubleArray + (*BytesArray)(nil), // 11: milvus.proto.schema.BytesArray + (*StringArray)(nil), // 12: milvus.proto.schema.StringArray + (*ArrayArray)(nil), // 13: milvus.proto.schema.ArrayArray + (*JSONArray)(nil), // 14: milvus.proto.schema.JSONArray + (*GeometryArray)(nil), // 15: milvus.proto.schema.GeometryArray + (*ValueField)(nil), // 16: milvus.proto.schema.ValueField + (*ScalarField)(nil), // 17: milvus.proto.schema.ScalarField + (*SparseFloatArray)(nil), // 18: milvus.proto.schema.SparseFloatArray + (*VectorField)(nil), // 19: milvus.proto.schema.VectorField + (*FieldData)(nil), // 20: milvus.proto.schema.FieldData + (*IDs)(nil), // 21: milvus.proto.schema.IDs + (*SearchResultData)(nil), // 22: milvus.proto.schema.SearchResultData + (*VectorClusteringInfo)(nil), // 23: milvus.proto.schema.VectorClusteringInfo + (*ScalarClusteringInfo)(nil), // 24: milvus.proto.schema.ScalarClusteringInfo + (*ClusteringInfo)(nil), // 25: milvus.proto.schema.ClusteringInfo + (*TemplateValue)(nil), // 26: milvus.proto.schema.TemplateValue + (*TemplateArrayValue)(nil), // 27: milvus.proto.schema.TemplateArrayValue + (*TemplateArrayValueArray)(nil), // 28: milvus.proto.schema.TemplateArrayValueArray + (*commonpb.KeyValuePair)(nil), // 29: milvus.proto.common.KeyValuePair } var file_schema_proto_depIdxs = []int32{ 0, // 0: milvus.proto.schema.FieldSchema.data_type:type_name -> milvus.proto.schema.DataType - 28, // 1: milvus.proto.schema.FieldSchema.type_params:type_name -> milvus.proto.common.KeyValuePair - 28, // 2: milvus.proto.schema.FieldSchema.index_params:type_name -> milvus.proto.common.KeyValuePair + 29, // 1: milvus.proto.schema.FieldSchema.type_params:type_name -> milvus.proto.common.KeyValuePair + 29, // 2: milvus.proto.schema.FieldSchema.index_params:type_name -> milvus.proto.common.KeyValuePair 2, // 3: milvus.proto.schema.FieldSchema.state:type_name -> milvus.proto.schema.FieldState 0, // 4: milvus.proto.schema.FieldSchema.element_type:type_name -> milvus.proto.schema.DataType 16, // 5: milvus.proto.schema.FieldSchema.default_value:type_name -> milvus.proto.schema.ValueField 1, // 6: milvus.proto.schema.FunctionSchema.type:type_name -> milvus.proto.schema.FunctionType - 28, // 7: milvus.proto.schema.FunctionSchema.params:type_name -> milvus.proto.common.KeyValuePair + 29, // 7: milvus.proto.schema.FunctionSchema.params:type_name -> milvus.proto.common.KeyValuePair 3, // 8: milvus.proto.schema.CollectionSchema.fields:type_name -> milvus.proto.schema.FieldSchema - 28, // 9: milvus.proto.schema.CollectionSchema.properties:type_name -> milvus.proto.common.KeyValuePair + 29, // 9: milvus.proto.schema.CollectionSchema.properties:type_name -> milvus.proto.common.KeyValuePair 4, // 10: milvus.proto.schema.CollectionSchema.functions:type_name -> milvus.proto.schema.FunctionSchema 17, // 11: milvus.proto.schema.ArrayArray.data:type_name -> milvus.proto.schema.ScalarField 0, // 12: milvus.proto.schema.ArrayArray.element_type:type_name -> milvus.proto.schema.DataType @@ -2720,15 +2853,19 @@ var file_schema_proto_depIdxs = []int32{ 19, // 33: milvus.proto.schema.VectorClusteringInfo.centroid:type_name -> milvus.proto.schema.VectorField 23, // 34: milvus.proto.schema.ClusteringInfo.vector_clustering_infos:type_name -> milvus.proto.schema.VectorClusteringInfo 24, // 35: milvus.proto.schema.ClusteringInfo.scalar_clustering_infos:type_name -> milvus.proto.schema.ScalarClusteringInfo - 0, // 36: milvus.proto.schema.TemplateValue.type:type_name -> milvus.proto.schema.DataType - 27, // 37: milvus.proto.schema.TemplateValue.array_val:type_name -> milvus.proto.schema.TemplateArrayValue - 26, // 38: milvus.proto.schema.TemplateArrayValue.array:type_name -> milvus.proto.schema.TemplateValue - 0, // 39: milvus.proto.schema.TemplateArrayValue.element_type:type_name -> milvus.proto.schema.DataType - 40, // [40:40] is the sub-list for method output_type - 40, // [40:40] is the sub-list for method input_type - 40, // [40:40] is the sub-list for extension type_name - 40, // [40:40] is the sub-list for extension extendee - 0, // [0:40] is the sub-list for field type_name + 27, // 36: milvus.proto.schema.TemplateValue.array_val:type_name -> milvus.proto.schema.TemplateArrayValue + 6, // 37: milvus.proto.schema.TemplateArrayValue.bool_data:type_name -> milvus.proto.schema.BoolArray + 8, // 38: milvus.proto.schema.TemplateArrayValue.long_data:type_name -> milvus.proto.schema.LongArray + 10, // 39: milvus.proto.schema.TemplateArrayValue.double_data:type_name -> milvus.proto.schema.DoubleArray + 12, // 40: milvus.proto.schema.TemplateArrayValue.string_data:type_name -> milvus.proto.schema.StringArray + 28, // 41: milvus.proto.schema.TemplateArrayValue.array_data:type_name -> milvus.proto.schema.TemplateArrayValueArray + 14, // 42: milvus.proto.schema.TemplateArrayValue.json_data:type_name -> milvus.proto.schema.JSONArray + 27, // 43: milvus.proto.schema.TemplateArrayValueArray.data:type_name -> milvus.proto.schema.TemplateArrayValue + 44, // [44:44] is the sub-list for method output_type + 44, // [44:44] is the sub-list for method input_type + 44, // [44:44] is the sub-list for extension type_name + 44, // [44:44] is the sub-list for extension extendee + 0, // [0:44] is the sub-list for field type_name } func init() { file_schema_proto_init() } @@ -3037,6 +3174,18 @@ func file_schema_proto_init() { return nil } } + file_schema_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TemplateArrayValueArray); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } file_schema_proto_msgTypes[13].OneofWrappers = []interface{}{ (*ValueField_BoolData)(nil), @@ -3081,13 +3230,21 @@ func file_schema_proto_init() { (*TemplateValue_StringVal)(nil), (*TemplateValue_ArrayVal)(nil), } + file_schema_proto_msgTypes[24].OneofWrappers = []interface{}{ + (*TemplateArrayValue_BoolData)(nil), + (*TemplateArrayValue_LongData)(nil), + (*TemplateArrayValue_DoubleData)(nil), + (*TemplateArrayValue_StringData)(nil), + (*TemplateArrayValue_ArrayData)(nil), + (*TemplateArrayValue_JsonData)(nil), + } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_schema_proto_rawDesc, NumEnums: 3, - NumMessages: 25, + NumMessages: 26, NumExtensions: 0, NumServices: 0, }, diff --git a/proto/schema.proto b/proto/schema.proto index 8adddd9..5c867b4 100644 --- a/proto/schema.proto +++ b/proto/schema.proto @@ -223,18 +223,26 @@ message ClusteringInfo { } message TemplateValue { - DataType type = 1; oneof val { - bool bool_val = 2; - int64 int64_val = 3; - double float_val = 4; - string string_val = 5; - TemplateArrayValue array_val = 6; + bool bool_val = 1; + int64 int64_val = 2; + double float_val = 3; + string string_val = 4; + TemplateArrayValue array_val = 5; }; } message TemplateArrayValue { - repeated TemplateValue array = 1; - bool same_type = 2; - schema.DataType element_type = 3; + oneof data { + BoolArray bool_data = 1; + LongArray long_data = 2; + DoubleArray double_data = 3; + StringArray string_data = 4; + TemplateArrayValueArray array_data = 5; + JSONArray json_data = 6; + } +} + +message TemplateArrayValueArray { + repeated TemplateArrayValue data = 1; }