From 5a0e23d81af0e62b1176b1acd11b7c0d1a918bfc Mon Sep 17 00:00:00 2001 From: Enwei Jiao Date: Thu, 13 Apr 2023 14:33:18 +0800 Subject: [PATCH] Add array and json support Signed-off-by: Enwei Jiao --- go-api/schemapb/schema.pb.go | 277 +++++++++++++++++++++++++---------- proto/schema.proto | 11 +- 2 files changed, 206 insertions(+), 82 deletions(-) diff --git a/go-api/schemapb/schema.pb.go b/go-api/schemapb/schema.pb.go index c449af8..5dc584d 100644 --- a/go-api/schemapb/schema.pb.go +++ b/go-api/schemapb/schema.pb.go @@ -6,6 +6,7 @@ package schemapb import ( fmt "fmt" proto "github.com/golang/protobuf/proto" + _struct "github.com/golang/protobuf/ptypes/struct" commonpb "github.com/milvus-io/milvus-proto/go-api/commonpb" math "math" ) @@ -36,8 +37,8 @@ const ( DataType_Double DataType = 11 DataType_String DataType = 20 DataType_VarChar DataType = 21 - DataType_List DataType = 22 - DataType_Json DataType = 23 + DataType_Array DataType = 22 + DataType_JSON DataType = 23 DataType_BinaryVector DataType = 100 DataType_FloatVector DataType = 101 ) @@ -53,8 +54,8 @@ var DataType_name = map[int32]string{ 11: "Double", 20: "String", 21: "VarChar", - 22: "List", - 23: "Json", + 22: "Array", + 23: "JSON", 100: "BinaryVector", 101: "FloatVector", } @@ -70,8 +71,8 @@ var DataType_value = map[string]int32{ "Double": 11, "String": 20, "VarChar": 21, - "List": 22, - "Json": 23, + "Array": 22, + "JSON": 23, "BinaryVector": 100, "FloatVector": 101, } @@ -559,6 +560,84 @@ func (m *StringArray) GetData() []string { return nil } +type ArrayArray struct { + Data []*_struct.ListValue `protobuf:"bytes,1,rep,name=data,proto3" json:"data,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ArrayArray) Reset() { *m = ArrayArray{} } +func (m *ArrayArray) String() string { return proto.CompactTextString(m) } +func (*ArrayArray) ProtoMessage() {} +func (*ArrayArray) Descriptor() ([]byte, []int) { + return fileDescriptor_1c5fb4d8cc22d66a, []int{9} +} + +func (m *ArrayArray) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ArrayArray.Unmarshal(m, b) +} +func (m *ArrayArray) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ArrayArray.Marshal(b, m, deterministic) +} +func (m *ArrayArray) XXX_Merge(src proto.Message) { + xxx_messageInfo_ArrayArray.Merge(m, src) +} +func (m *ArrayArray) XXX_Size() int { + return xxx_messageInfo_ArrayArray.Size(m) +} +func (m *ArrayArray) XXX_DiscardUnknown() { + xxx_messageInfo_ArrayArray.DiscardUnknown(m) +} + +var xxx_messageInfo_ArrayArray proto.InternalMessageInfo + +func (m *ArrayArray) GetData() []*_struct.ListValue { + if m != nil { + return m.Data + } + return nil +} + +type JSONArray struct { + Data []*_struct.Struct `protobuf:"bytes,1,rep,name=data,proto3" json:"data,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *JSONArray) Reset() { *m = JSONArray{} } +func (m *JSONArray) String() string { return proto.CompactTextString(m) } +func (*JSONArray) ProtoMessage() {} +func (*JSONArray) Descriptor() ([]byte, []int) { + return fileDescriptor_1c5fb4d8cc22d66a, []int{10} +} + +func (m *JSONArray) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_JSONArray.Unmarshal(m, b) +} +func (m *JSONArray) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_JSONArray.Marshal(b, m, deterministic) +} +func (m *JSONArray) XXX_Merge(src proto.Message) { + xxx_messageInfo_JSONArray.Merge(m, src) +} +func (m *JSONArray) XXX_Size() int { + return xxx_messageInfo_JSONArray.Size(m) +} +func (m *JSONArray) XXX_DiscardUnknown() { + xxx_messageInfo_JSONArray.DiscardUnknown(m) +} + +var xxx_messageInfo_JSONArray proto.InternalMessageInfo + +func (m *JSONArray) GetData() []*_struct.Struct { + if m != nil { + return m.Data + } + return nil +} + type ScalarField struct { // Types that are valid to be assigned to Data: // @@ -569,6 +648,8 @@ type ScalarField struct { // *ScalarField_DoubleData // *ScalarField_StringData // *ScalarField_BytesData + // *ScalarField_ArrayData + // *ScalarField_JsonData Data isScalarField_Data `protobuf_oneof:"data"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -579,7 +660,7 @@ func (m *ScalarField) Reset() { *m = ScalarField{} } func (m *ScalarField) String() string { return proto.CompactTextString(m) } func (*ScalarField) ProtoMessage() {} func (*ScalarField) Descriptor() ([]byte, []int) { - return fileDescriptor_1c5fb4d8cc22d66a, []int{9} + return fileDescriptor_1c5fb4d8cc22d66a, []int{11} } func (m *ScalarField) XXX_Unmarshal(b []byte) error { @@ -632,6 +713,14 @@ type ScalarField_BytesData struct { BytesData *BytesArray `protobuf:"bytes,7,opt,name=bytes_data,json=bytesData,proto3,oneof"` } +type ScalarField_ArrayData struct { + ArrayData *ArrayArray `protobuf:"bytes,8,opt,name=array_data,json=arrayData,proto3,oneof"` +} + +type ScalarField_JsonData struct { + JsonData *JSONArray `protobuf:"bytes,9,opt,name=json_data,json=jsonData,proto3,oneof"` +} + func (*ScalarField_BoolData) isScalarField_Data() {} func (*ScalarField_IntData) isScalarField_Data() {} @@ -646,6 +735,10 @@ func (*ScalarField_StringData) isScalarField_Data() {} func (*ScalarField_BytesData) isScalarField_Data() {} +func (*ScalarField_ArrayData) isScalarField_Data() {} + +func (*ScalarField_JsonData) isScalarField_Data() {} + func (m *ScalarField) GetData() isScalarField_Data { if m != nil { return m.Data @@ -702,6 +795,20 @@ func (m *ScalarField) GetBytesData() *BytesArray { return nil } +func (m *ScalarField) GetArrayData() *ArrayArray { + if x, ok := m.GetData().(*ScalarField_ArrayData); ok { + return x.ArrayData + } + return nil +} + +func (m *ScalarField) GetJsonData() *JSONArray { + if x, ok := m.GetData().(*ScalarField_JsonData); ok { + return x.JsonData + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*ScalarField) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -712,6 +819,8 @@ func (*ScalarField) XXX_OneofWrappers() []interface{} { (*ScalarField_DoubleData)(nil), (*ScalarField_StringData)(nil), (*ScalarField_BytesData)(nil), + (*ScalarField_ArrayData)(nil), + (*ScalarField_JsonData)(nil), } } @@ -731,7 +840,7 @@ func (m *VectorField) Reset() { *m = VectorField{} } func (m *VectorField) String() string { return proto.CompactTextString(m) } func (*VectorField) ProtoMessage() {} func (*VectorField) Descriptor() ([]byte, []int) { - return fileDescriptor_1c5fb4d8cc22d66a, []int{10} + return fileDescriptor_1c5fb4d8cc22d66a, []int{12} } func (m *VectorField) XXX_Unmarshal(b []byte) error { @@ -822,7 +931,7 @@ func (m *FieldData) Reset() { *m = FieldData{} } func (m *FieldData) String() string { return proto.CompactTextString(m) } func (*FieldData) ProtoMessage() {} func (*FieldData) Descriptor() ([]byte, []int) { - return fileDescriptor_1c5fb4d8cc22d66a, []int{11} + return fileDescriptor_1c5fb4d8cc22d66a, []int{13} } func (m *FieldData) XXX_Unmarshal(b []byte) error { @@ -924,7 +1033,7 @@ func (m *IDs) Reset() { *m = IDs{} } func (m *IDs) String() string { return proto.CompactTextString(m) } func (*IDs) ProtoMessage() {} func (*IDs) Descriptor() ([]byte, []int) { - return fileDescriptor_1c5fb4d8cc22d66a, []int{12} + return fileDescriptor_1c5fb4d8cc22d66a, []int{14} } func (m *IDs) XXX_Unmarshal(b []byte) error { @@ -1006,7 +1115,7 @@ func (m *SearchResultData) Reset() { *m = SearchResultData{} } func (m *SearchResultData) String() string { return proto.CompactTextString(m) } func (*SearchResultData) ProtoMessage() {} func (*SearchResultData) Descriptor() ([]byte, []int) { - return fileDescriptor_1c5fb4d8cc22d66a, []int{13} + return fileDescriptor_1c5fb4d8cc22d66a, []int{15} } func (m *SearchResultData) XXX_Unmarshal(b []byte) error { @@ -1081,6 +1190,8 @@ func init() { proto.RegisterType((*DoubleArray)(nil), "milvus.proto.schema.DoubleArray") proto.RegisterType((*BytesArray)(nil), "milvus.proto.schema.BytesArray") proto.RegisterType((*StringArray)(nil), "milvus.proto.schema.StringArray") + proto.RegisterType((*ArrayArray)(nil), "milvus.proto.schema.ArrayArray") + proto.RegisterType((*JSONArray)(nil), "milvus.proto.schema.JSONArray") proto.RegisterType((*ScalarField)(nil), "milvus.proto.schema.ScalarField") proto.RegisterType((*VectorField)(nil), "milvus.proto.schema.VectorField") proto.RegisterType((*FieldData)(nil), "milvus.proto.schema.FieldData") @@ -1091,73 +1202,79 @@ func init() { func init() { proto.RegisterFile("schema.proto", fileDescriptor_1c5fb4d8cc22d66a) } var fileDescriptor_1c5fb4d8cc22d66a = []byte{ - // 1078 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x5f, 0x6f, 0x1b, 0x45, - 0x10, 0xf7, 0xf9, 0xfc, 0xe7, 0x6e, 0xce, 0x0d, 0xc7, 0xb6, 0x94, 0x03, 0xa9, 0x8d, 0x6b, 0x81, - 0x64, 0x45, 0x6a, 0xa2, 0xa4, 0x50, 0x4a, 0x45, 0x05, 0x38, 0x56, 0x88, 0x49, 0x29, 0xe1, 0x82, - 0xf2, 0xc0, 0x8b, 0xb5, 0xf6, 0x6d, 0x92, 0x55, 0xce, 0xb7, 0xc7, 0xee, 0xba, 0xc2, 0x1f, 0x80, - 0x6f, 0xc0, 0x03, 0xe2, 0x89, 0x67, 0x9e, 0xf8, 0x42, 0x3c, 0xf1, 0x39, 0x90, 0xd0, 0xce, 0xae, - 0xff, 0xb4, 0x71, 0xa2, 0xbc, 0xcd, 0xce, 0xcd, 0xef, 0x77, 0x33, 0xbf, 0x99, 0x9d, 0x3b, 0x68, - 0xa9, 0xf1, 0x05, 0x9b, 0xd0, 0xed, 0x52, 0x0a, 0x2d, 0xc8, 0xdd, 0x09, 0xcf, 0x5f, 0x4f, 0x95, - 0x3d, 0x6d, 0xdb, 0x47, 0x1f, 0xb6, 0xc6, 0x62, 0x32, 0x11, 0x85, 0x75, 0x76, 0x7e, 0xf7, 0x21, - 0x3a, 0xe0, 0x2c, 0xcf, 0x4e, 0xf0, 0x29, 0x49, 0xa0, 0x79, 0x66, 0x8e, 0x83, 0x7e, 0xe2, 0xb5, - 0xbd, 0xae, 0x9f, 0xce, 0x8f, 0x84, 0x40, 0xad, 0xa0, 0x13, 0x96, 0x54, 0xdb, 0x5e, 0x37, 0x4c, - 0xd1, 0x26, 0x1f, 0xc1, 0x06, 0x57, 0xc3, 0x52, 0xf2, 0x09, 0x95, 0xb3, 0xe1, 0x25, 0x9b, 0x25, - 0x7e, 0xdb, 0xeb, 0x06, 0x69, 0x8b, 0xab, 0x63, 0xeb, 0x3c, 0x62, 0x33, 0xd2, 0x86, 0x28, 0x63, - 0x6a, 0x2c, 0x79, 0xa9, 0xb9, 0x28, 0x92, 0x1a, 0x12, 0xac, 0xba, 0xc8, 0x73, 0x08, 0x33, 0xaa, - 0xe9, 0x50, 0xcf, 0x4a, 0x96, 0xd4, 0xdb, 0x5e, 0x77, 0x63, 0xef, 0xc1, 0xf6, 0x9a, 0xe4, 0xb7, - 0xfb, 0x54, 0xd3, 0x1f, 0x67, 0x25, 0x4b, 0x83, 0xcc, 0x59, 0xa4, 0x07, 0x91, 0x81, 0x0d, 0x4b, - 0x2a, 0xe9, 0x44, 0x25, 0x8d, 0xb6, 0xdf, 0x8d, 0xf6, 0x1e, 0xbd, 0x89, 0x76, 0x25, 0x1f, 0xb1, - 0xd9, 0x29, 0xcd, 0xa7, 0xec, 0x98, 0x72, 0x99, 0x82, 0x41, 0x1d, 0x23, 0x88, 0xf4, 0xa1, 0xc5, - 0x8b, 0x8c, 0xfd, 0x32, 0x27, 0x69, 0xde, 0x96, 0x24, 0x42, 0x98, 0x63, 0xb9, 0x0f, 0x0d, 0x3a, - 0xd5, 0x62, 0xd0, 0x4f, 0x02, 0x54, 0xc1, 0x9d, 0xc8, 0xa7, 0x50, 0x57, 0x9a, 0x6a, 0x96, 0x84, - 0x58, 0xd9, 0xe6, 0xda, 0xca, 0x6c, 0x13, 0x4c, 0x58, 0x6a, 0xa3, 0x3b, 0x7f, 0x78, 0x10, 0xef, - 0x8b, 0x3c, 0x67, 0x63, 0xa3, 0x91, 0xeb, 0xcf, 0xbc, 0x0b, 0xde, 0x4a, 0x17, 0xde, 0xd2, 0xb7, - 0x7a, 0x55, 0xdf, 0x65, 0x66, 0xfe, 0x1b, 0x99, 0x3d, 0x83, 0x06, 0xb6, 0x57, 0x25, 0x35, 0xac, - 0xb8, 0x7d, 0x43, 0x6a, 0x68, 0xa7, 0x2e, 0xbe, 0xb3, 0x09, 0x61, 0x4f, 0x88, 0xfc, 0x6b, 0x29, - 0xe9, 0xcc, 0x24, 0x65, 0xda, 0x91, 0x78, 0x6d, 0xbf, 0x1b, 0xa4, 0x68, 0x77, 0x1e, 0x42, 0x30, - 0x28, 0xf4, 0xd5, 0xe7, 0x75, 0xf7, 0x7c, 0x13, 0xc2, 0x97, 0xa2, 0x38, 0xbf, 0x1a, 0xe0, 0xbb, - 0x80, 0x36, 0xc0, 0x41, 0x2e, 0xe8, 0x1a, 0x8a, 0xaa, 0x8b, 0x78, 0x04, 0x51, 0x5f, 0x4c, 0x47, - 0x39, 0xbb, 0x1a, 0xe2, 0x2d, 0x49, 0x7a, 0x33, 0xcd, 0xd4, 0xd5, 0x88, 0xd6, 0x92, 0xe4, 0x44, - 0x4b, 0xbe, 0x2e, 0x93, 0xd0, 0x85, 0xfc, 0xe3, 0x43, 0x74, 0x32, 0xa6, 0x39, 0x95, 0xa8, 0x04, - 0x79, 0x01, 0xe1, 0x48, 0x88, 0x7c, 0xe8, 0x02, 0xbd, 0x6e, 0xb4, 0xf7, 0x70, 0xad, 0x70, 0x0b, - 0x85, 0x0e, 0x2b, 0x69, 0x60, 0x20, 0x66, 0x7c, 0xc9, 0x73, 0x08, 0x78, 0xa1, 0x2d, 0xba, 0x8a, - 0xe8, 0xf5, 0xb3, 0x3e, 0x97, 0xef, 0xb0, 0x92, 0x36, 0x79, 0xa1, 0x11, 0xfb, 0x02, 0xc2, 0x5c, - 0x14, 0xe7, 0x16, 0xec, 0xdf, 0xf0, 0xea, 0x85, 0xb6, 0xe6, 0xd5, 0x06, 0x82, 0xf0, 0xaf, 0x00, - 0xce, 0x8c, 0xa6, 0x16, 0x5f, 0x43, 0xfc, 0x35, 0xe3, 0xb8, 0x90, 0xfe, 0xb0, 0x92, 0x86, 0x08, - 0x42, 0x86, 0x7d, 0x88, 0x32, 0xd4, 0xdc, 0x52, 0xd4, 0x91, 0x62, 0xfd, 0xd8, 0xac, 0xf4, 0xe6, - 0xb0, 0x92, 0x82, 0x85, 0xcd, 0x49, 0x14, 0x6a, 0x6e, 0x49, 0x1a, 0x37, 0x90, 0xac, 0xf4, 0xc6, - 0x90, 0x58, 0xd8, 0xbc, 0x96, 0x91, 0x69, 0xad, 0xe5, 0x68, 0xde, 0x50, 0xcb, 0x72, 0x02, 0x4c, - 0x2d, 0x08, 0x32, 0x0c, 0xbd, 0x86, 0xed, 0x75, 0xe7, 0x37, 0x0f, 0xa2, 0x53, 0x36, 0xd6, 0xc2, - 0xf5, 0x37, 0x06, 0x3f, 0xe3, 0x13, 0xb7, 0xff, 0x8c, 0x69, 0xf6, 0x83, 0xd5, 0xed, 0x35, 0x86, - 0xb9, 0xb6, 0xdd, 0x42, 0xb9, 0x08, 0x61, 0x96, 0x9c, 0x7c, 0x0c, 0x77, 0x46, 0xbc, 0x30, 0x9b, - 0xd2, 0xd1, 0x98, 0x06, 0xb6, 0x0e, 0x2b, 0x69, 0xcb, 0xba, 0x6d, 0xd8, 0x22, 0xad, 0xff, 0x3c, - 0x08, 0x31, 0x21, 0x2c, 0x77, 0x17, 0x6a, 0xb8, 0x1d, 0xbd, 0xdb, 0x6c, 0x47, 0x0c, 0x25, 0x0f, - 0x00, 0xf0, 0xb6, 0x0e, 0x57, 0xf6, 0x76, 0x88, 0x9e, 0x57, 0x66, 0x6d, 0x7c, 0x01, 0x4d, 0x85, - 0x53, 0xad, 0xdc, 0x24, 0x5d, 0xd3, 0x81, 0xe5, 0xe4, 0x9b, 0x49, 0x74, 0x10, 0x83, 0xb6, 0x55, - 0x28, 0x37, 0x47, 0xeb, 0xd1, 0x2b, 0xba, 0x1a, 0xb4, 0x83, 0x90, 0x0f, 0x20, 0xb0, 0xa9, 0xf1, - 0x0c, 0x67, 0x68, 0xf1, 0x9d, 0xc9, 0x7a, 0x4d, 0xa8, 0xa3, 0xd9, 0xf9, 0xd5, 0x03, 0x7f, 0xd0, - 0x57, 0xe4, 0x33, 0x68, 0x98, 0xfb, 0xc2, 0xb3, 0x1b, 0xef, 0xda, 0xea, 0xc0, 0xd7, 0x79, 0xa1, - 0x07, 0x19, 0xf9, 0x1c, 0x1a, 0x4a, 0x4b, 0x03, 0xac, 0xde, 0x7a, 0xc2, 0xea, 0x4a, 0xcb, 0x41, - 0xd6, 0x03, 0x08, 0x78, 0x36, 0xb4, 0x79, 0xfc, 0xeb, 0x41, 0x7c, 0xc2, 0xa8, 0x1c, 0x5f, 0xa4, - 0x4c, 0x4d, 0x73, 0x7b, 0x0f, 0x36, 0x21, 0x2a, 0xa6, 0x93, 0xe1, 0xcf, 0x53, 0x26, 0x39, 0x53, - 0x6e, 0x56, 0xa0, 0x98, 0x4e, 0x7e, 0xb0, 0x1e, 0x72, 0x17, 0xea, 0x5a, 0x94, 0xc3, 0x4b, 0x7c, - 0xb7, 0x9f, 0xd6, 0xb4, 0x28, 0x8f, 0xc8, 0x97, 0x10, 0xd9, 0xfd, 0x39, 0xbf, 0xc0, 0xfe, 0xb5, - 0xf5, 0x2c, 0x3a, 0x9f, 0xda, 0x26, 0xe2, 0xc8, 0x9a, 0x45, 0xae, 0xc6, 0x42, 0x32, 0xbb, 0xb0, - 0xab, 0xa9, 0x3b, 0x91, 0x2d, 0xf0, 0x79, 0xa6, 0xdc, 0x75, 0x4c, 0xd6, 0xaf, 0x93, 0xbe, 0x4a, - 0x4d, 0x10, 0xb9, 0x87, 0x99, 0x5d, 0xda, 0x4f, 0xa5, 0x9f, 0xda, 0xc3, 0xd6, 0xdf, 0x1e, 0x04, - 0xf3, 0xf9, 0x21, 0x01, 0xd4, 0x5e, 0x89, 0x82, 0xc5, 0x15, 0x63, 0x99, 0x2d, 0x16, 0x7b, 0xc6, - 0x1a, 0x14, 0xfa, 0x59, 0x5c, 0x25, 0x21, 0xd4, 0x07, 0x85, 0xde, 0x7d, 0x1a, 0xfb, 0xce, 0x7c, - 0xb2, 0x17, 0xd7, 0x9c, 0xf9, 0xf4, 0x93, 0xb8, 0x6e, 0x4c, 0xbc, 0x05, 0x31, 0x10, 0x80, 0x86, - 0xdd, 0x03, 0x71, 0x64, 0x6c, 0x2b, 0x76, 0x7c, 0x8f, 0x44, 0xd0, 0x3c, 0xa5, 0x72, 0xff, 0x82, - 0xca, 0xf8, 0x3d, 0x43, 0xfd, 0x92, 0x2b, 0x1d, 0xdf, 0x37, 0xd6, 0xb7, 0x4a, 0x14, 0xf1, 0xfb, - 0x24, 0x86, 0x56, 0x6f, 0xe5, 0x56, 0xc4, 0x19, 0x79, 0x07, 0xa2, 0x83, 0xe5, 0x6d, 0x8a, 0xd9, - 0xd6, 0x29, 0xc0, 0xf2, 0xab, 0x69, 0x00, 0x78, 0xda, 0x97, 0x8c, 0x6a, 0x96, 0xc5, 0x15, 0xf2, - 0x2e, 0xdc, 0x59, 0x7a, 0xcc, 0x6b, 0xbd, 0x85, 0xab, 0x2f, 0x45, 0x59, 0x1a, 0x57, 0x75, 0x81, - 0x43, 0x17, 0xcb, 0x62, 0xbf, 0x77, 0x06, 0x1b, 0x5c, 0xcc, 0x35, 0x3c, 0x97, 0xe5, 0xb8, 0x17, - 0xd9, 0xaf, 0xdf, 0xb1, 0xd1, 0xf3, 0xd8, 0xfb, 0x69, 0xf7, 0x9c, 0xeb, 0x8b, 0xe9, 0xc8, 0xfc, - 0x11, 0xec, 0xd8, 0xb0, 0xc7, 0x5c, 0xcc, 0x2d, 0x14, 0x7d, 0xe7, 0x5c, 0x3c, 0xa6, 0x25, 0xdf, - 0xb1, 0xda, 0x97, 0xa3, 0x3f, 0x3d, 0xef, 0xaf, 0xea, 0xc6, 0xe0, 0xfb, 0xed, 0xef, 0x2c, 0xeb, - 0x37, 0xb2, 0x1c, 0x8f, 0x1a, 0x18, 0xfa, 0xe4, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, 0xee, - 0x5b, 0x10, 0xb5, 0x09, 0x00, 0x00, + // 1173 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x5f, 0x8f, 0xdb, 0x44, + 0x10, 0x8f, 0xe3, 0xfc, 0xb1, 0xc7, 0xe9, 0x61, 0xb6, 0xa5, 0x35, 0x15, 0xed, 0xa5, 0x11, 0x48, + 0x51, 0x51, 0x73, 0xea, 0x15, 0x4a, 0xa9, 0x5a, 0x01, 0xb9, 0xa8, 0x5c, 0xb8, 0x72, 0x3d, 0x1c, + 0x74, 0x0f, 0xbc, 0x44, 0x4e, 0xbc, 0x97, 0x5b, 0xce, 0xf1, 0x1a, 0xef, 0xa6, 0x22, 0x1f, 0x80, + 0x6f, 0xc0, 0x03, 0xe2, 0x89, 0x67, 0xde, 0xf8, 0x42, 0xbc, 0xf0, 0x39, 0x90, 0xd0, 0xce, 0xae, + 0x93, 0x1c, 0xc9, 0x45, 0xf7, 0x36, 0x3b, 0x9e, 0xdf, 0x6f, 0x77, 0xe6, 0x37, 0xb3, 0x6b, 0x68, + 0x88, 0xf1, 0x39, 0x9d, 0x46, 0x9d, 0x2c, 0xe7, 0x92, 0x93, 0x9b, 0x53, 0x96, 0xbc, 0x9d, 0x09, + 0xbd, 0xea, 0xe8, 0x4f, 0x77, 0x1b, 0x63, 0x3e, 0x9d, 0xf2, 0x54, 0x3b, 0xef, 0x7e, 0x30, 0xe1, + 0x7c, 0x92, 0xd0, 0x3d, 0x5c, 0x8d, 0x66, 0x67, 0x7b, 0x42, 0xe6, 0xb3, 0xb1, 0xd4, 0x5f, 0x5b, + 0xbf, 0xd9, 0xe0, 0xbd, 0x62, 0x34, 0x89, 0x07, 0x88, 0x25, 0x01, 0xd4, 0xcf, 0xd4, 0xb2, 0xdf, + 0x0b, 0xac, 0xa6, 0xd5, 0xb6, 0xc3, 0x62, 0x49, 0x08, 0x54, 0xd2, 0x68, 0x4a, 0x83, 0x72, 0xd3, + 0x6a, 0xbb, 0x21, 0xda, 0xe4, 0x43, 0xd8, 0x61, 0x62, 0x98, 0xe5, 0x6c, 0x1a, 0xe5, 0xf3, 0xe1, + 0x05, 0x9d, 0x07, 0x76, 0xd3, 0x6a, 0x3b, 0x61, 0x83, 0x89, 0x13, 0xed, 0x3c, 0xa2, 0x73, 0xd2, + 0x04, 0x2f, 0xa6, 0x62, 0x9c, 0xb3, 0x4c, 0x32, 0x9e, 0x06, 0x15, 0x24, 0x58, 0x75, 0x91, 0xe7, + 0xe0, 0xc6, 0x91, 0x8c, 0x86, 0x72, 0x9e, 0xd1, 0xa0, 0xda, 0xb4, 0xda, 0x3b, 0xfb, 0xf7, 0x3a, + 0x1b, 0x52, 0xeb, 0xf4, 0x22, 0x19, 0x7d, 0x3f, 0xcf, 0x68, 0xe8, 0xc4, 0xc6, 0x22, 0x5d, 0xf0, + 0x14, 0x6c, 0x98, 0x45, 0x79, 0x34, 0x15, 0x41, 0xad, 0x69, 0xb7, 0xbd, 0xfd, 0x07, 0x97, 0xd1, + 0xa6, 0x20, 0x47, 0x74, 0x7e, 0x1a, 0x25, 0x33, 0x7a, 0x12, 0xb1, 0x3c, 0x04, 0x85, 0x3a, 0x41, + 0x10, 0xe9, 0x41, 0x83, 0xa5, 0x31, 0xfd, 0xb9, 0x20, 0xa9, 0x5f, 0x97, 0xc4, 0x43, 0x98, 0x61, + 0xb9, 0x0d, 0xb5, 0x68, 0x26, 0x79, 0xbf, 0x17, 0x38, 0x58, 0x05, 0xb3, 0x22, 0x9f, 0x42, 0x55, + 0xc8, 0x48, 0xd2, 0xc0, 0xc5, 0xcc, 0x76, 0x37, 0x66, 0xa6, 0x45, 0x50, 0x61, 0xa1, 0x8e, 0x6e, + 0xfd, 0x6e, 0x81, 0x7f, 0xc0, 0x93, 0x84, 0x8e, 0x55, 0x8d, 0x8c, 0x3e, 0x85, 0x0a, 0xd6, 0x8a, + 0x0a, 0xff, 0xab, 0x6f, 0x79, 0xbd, 0xbe, 0xcb, 0x93, 0xd9, 0x97, 0x4e, 0xf6, 0x0c, 0x6a, 0x28, + 0xaf, 0x08, 0x2a, 0x98, 0x71, 0x73, 0xcb, 0xd1, 0xd0, 0x0e, 0x4d, 0x7c, 0x6b, 0x17, 0xdc, 0x2e, + 0xe7, 0xc9, 0x57, 0x79, 0x1e, 0xcd, 0xd5, 0xa1, 0x94, 0x1c, 0x81, 0xd5, 0xb4, 0xdb, 0x4e, 0x88, + 0x76, 0xeb, 0x3e, 0x38, 0xfd, 0x54, 0xae, 0x7f, 0xaf, 0x9a, 0xef, 0xbb, 0xe0, 0xbe, 0xe6, 0xe9, + 0x64, 0x3d, 0xc0, 0x36, 0x01, 0x4d, 0x80, 0x57, 0x09, 0x8f, 0x36, 0x50, 0x94, 0x4d, 0xc4, 0x03, + 0xf0, 0x7a, 0x7c, 0x36, 0x4a, 0xe8, 0x7a, 0x88, 0xb5, 0x24, 0xe9, 0xce, 0x25, 0x15, 0xeb, 0x11, + 0x8d, 0x25, 0xc9, 0x40, 0xe6, 0x6c, 0xd3, 0x49, 0x5c, 0x13, 0xf2, 0x02, 0x00, 0x3f, 0xea, 0x88, + 0xce, 0x4a, 0x84, 0xb7, 0x7f, 0xb7, 0xa3, 0xc7, 0xab, 0x53, 0x8c, 0x57, 0xe7, 0x35, 0x13, 0x12, + 0x1b, 0xc4, 0xa0, 0x9f, 0x81, 0xfb, 0xcd, 0xe0, 0xcd, 0xb1, 0x06, 0x7f, 0x7c, 0x09, 0x7c, 0x67, + 0x0d, 0x3c, 0xc0, 0xd9, 0x34, 0xc8, 0xbf, 0x2b, 0xe0, 0x0d, 0xc6, 0x51, 0x12, 0xe5, 0xa8, 0x00, + 0x79, 0x09, 0xee, 0x88, 0xf3, 0x64, 0x68, 0x18, 0xac, 0xb6, 0xb7, 0x7f, 0x7f, 0xa3, 0x60, 0x0b, + 0x65, 0x0e, 0x4b, 0xa1, 0xa3, 0x20, 0x6a, 0x6c, 0xc8, 0x73, 0x70, 0x58, 0x2a, 0x35, 0xba, 0x8c, + 0xe8, 0xcd, 0x33, 0x56, 0xc8, 0x76, 0x58, 0x0a, 0xeb, 0x2c, 0x95, 0x88, 0x7d, 0x09, 0x6e, 0xc2, + 0xd3, 0x89, 0x06, 0xdb, 0x5b, 0xb6, 0x5e, 0x68, 0xaa, 0xb6, 0x56, 0x10, 0x84, 0x7f, 0x09, 0x70, + 0xa6, 0xb4, 0xd4, 0xf8, 0x0a, 0xe2, 0xaf, 0x18, 0x83, 0x85, 0xe4, 0x87, 0xa5, 0xd0, 0x45, 0x10, + 0x32, 0x1c, 0x80, 0x17, 0xa3, 0xd6, 0x9a, 0xa2, 0x8a, 0x14, 0x9b, 0xdb, 0x75, 0xa5, 0x27, 0x0e, + 0x4b, 0x21, 0x68, 0x58, 0x41, 0x22, 0x50, 0x6b, 0x4d, 0x52, 0xdb, 0x42, 0xb2, 0xd2, 0x13, 0x8a, + 0x44, 0xc3, 0x8a, 0x5c, 0x46, 0xaa, 0xa5, 0x34, 0x47, 0x7d, 0x4b, 0x2e, 0xcb, 0xce, 0x53, 0xb9, + 0x20, 0xa8, 0x60, 0x88, 0x94, 0x57, 0x33, 0x38, 0x5b, 0x18, 0x96, 0x6d, 0xa7, 0x18, 0x10, 0x54, + 0xc8, 0xf1, 0xa3, 0xe0, 0xa9, 0x26, 0x70, 0xb7, 0xc8, 0xb1, 0xe8, 0x3c, 0x25, 0x87, 0x82, 0x28, + 0x78, 0xb7, 0xa6, 0xbb, 0xb0, 0xf5, 0xab, 0x05, 0xde, 0x29, 0x1d, 0x4b, 0x6e, 0x1a, 0xcc, 0x07, + 0x3b, 0x66, 0x53, 0x73, 0xf1, 0x2b, 0x53, 0x5d, 0x8c, 0x5a, 0xb8, 0xb7, 0x18, 0x66, 0xfa, 0xe6, + 0x1a, 0xd2, 0x79, 0x08, 0xd3, 0xe4, 0xe4, 0x23, 0xb8, 0x31, 0x62, 0xa9, 0x7a, 0x22, 0x0c, 0x8d, + 0xea, 0xa0, 0xc6, 0x61, 0x29, 0x6c, 0x68, 0xb7, 0x0e, 0x5b, 0x1c, 0xeb, 0x5f, 0x0b, 0x5c, 0x3c, + 0x10, 0xe6, 0xfa, 0x18, 0x2a, 0xf8, 0x2c, 0x58, 0xd7, 0x79, 0x16, 0x30, 0x94, 0xdc, 0x03, 0xc0, + 0x6b, 0x6a, 0xb8, 0xf2, 0x60, 0xb9, 0xe8, 0x39, 0x56, 0xf7, 0xe5, 0x0b, 0xa8, 0x0b, 0x1c, 0x2b, + 0x61, 0x5a, 0xf9, 0x8a, 0x16, 0x58, 0x8e, 0x9e, 0x1a, 0x05, 0x03, 0x51, 0x68, 0x9d, 0x85, 0x30, + 0x8d, 0xbc, 0x19, 0xbd, 0x52, 0x57, 0x85, 0x36, 0x10, 0xf2, 0x3e, 0x38, 0xfa, 0x68, 0x2c, 0xc6, + 0x26, 0x5e, 0x3c, 0xb0, 0x71, 0xb7, 0x0e, 0x55, 0x34, 0x5b, 0xbf, 0x58, 0x60, 0xf7, 0x7b, 0x82, + 0x7c, 0x06, 0x35, 0x35, 0xb0, 0x2c, 0xde, 0x3a, 0xec, 0xab, 0x13, 0x57, 0x65, 0xa9, 0xec, 0xc7, + 0xe4, 0x73, 0xa8, 0x09, 0x99, 0x2b, 0x60, 0xf9, 0xda, 0x2d, 0x5e, 0x15, 0x32, 0xef, 0xc7, 0x5d, + 0x00, 0x87, 0xc5, 0x43, 0x7d, 0x8e, 0x7f, 0x2c, 0xf0, 0x07, 0x34, 0xca, 0xc7, 0xe7, 0x21, 0x15, + 0xb3, 0x44, 0x0f, 0xe2, 0x2e, 0x78, 0xe9, 0x6c, 0x3a, 0xfc, 0x69, 0x46, 0x73, 0x46, 0x85, 0xe9, + 0x15, 0x48, 0x67, 0xd3, 0xef, 0xb4, 0x87, 0xdc, 0x84, 0xaa, 0xe4, 0xd9, 0xf0, 0x02, 0xf7, 0xb6, + 0xc3, 0x8a, 0xe4, 0xd9, 0x11, 0xf9, 0x02, 0x3c, 0xfd, 0x70, 0x14, 0x37, 0x88, 0x7d, 0x65, 0x3e, + 0x0b, 0xe5, 0x43, 0x2d, 0xa2, 0x9e, 0x99, 0xdb, 0x50, 0x13, 0x63, 0x9e, 0x53, 0xfd, 0x52, 0x95, + 0x43, 0xb3, 0x22, 0x0f, 0xc1, 0x66, 0xb1, 0x30, 0xf7, 0x41, 0xb0, 0xf9, 0x3e, 0xeb, 0x89, 0x50, + 0x05, 0x91, 0x5b, 0x78, 0xb2, 0x0b, 0xfd, 0x8f, 0x60, 0x87, 0x7a, 0xf1, 0xf0, 0x2f, 0x0b, 0x9c, + 0xa2, 0x7f, 0x88, 0x03, 0x95, 0x63, 0x9e, 0x52, 0xbf, 0xa4, 0x2c, 0x75, 0x8d, 0xfa, 0x96, 0xb2, + 0xfa, 0xa9, 0x7c, 0xe6, 0x97, 0x89, 0x0b, 0xd5, 0x7e, 0x2a, 0x1f, 0x3f, 0xf5, 0x6d, 0x63, 0x3e, + 0xd9, 0xf7, 0x2b, 0xc6, 0x7c, 0xfa, 0x89, 0x5f, 0x55, 0x26, 0x4e, 0x81, 0x0f, 0x04, 0xa0, 0xa6, + 0x2f, 0x22, 0xdf, 0x53, 0xb6, 0x2e, 0xb6, 0x7f, 0x8b, 0x78, 0x50, 0x3f, 0x8d, 0xf2, 0x83, 0xf3, + 0x28, 0xf7, 0xdf, 0x53, 0xf1, 0x58, 0x7f, 0xff, 0xb6, 0xda, 0x45, 0x0d, 0xab, 0x7f, 0x87, 0xf8, + 0xd0, 0xe8, 0xae, 0x8c, 0x85, 0x1f, 0x93, 0x77, 0xc0, 0x7b, 0xb5, 0x1c, 0x27, 0x9f, 0x3e, 0x3c, + 0x05, 0x58, 0xfe, 0x2f, 0x28, 0x00, 0xae, 0x0e, 0x72, 0x1a, 0x49, 0x1a, 0xfb, 0x25, 0xf2, 0x2e, + 0xdc, 0x58, 0x7a, 0xd4, 0xbe, 0xd6, 0xc2, 0xd5, 0xcb, 0x79, 0x96, 0x29, 0x57, 0x79, 0x81, 0x43, + 0x17, 0x8d, 0x7d, 0xbb, 0x7b, 0x06, 0x3b, 0x8c, 0x17, 0x45, 0x9c, 0xe4, 0xd9, 0xb8, 0xeb, 0xe9, + 0x77, 0xff, 0x44, 0x15, 0xf4, 0xc4, 0xfa, 0xe1, 0xf1, 0x84, 0xc9, 0xf3, 0xd9, 0x48, 0xfd, 0x0b, + 0xed, 0xe9, 0xb0, 0x47, 0x8c, 0x17, 0x16, 0x56, 0x7d, 0x6f, 0xc2, 0x1f, 0x45, 0x19, 0xdb, 0xd3, + 0xc5, 0xcf, 0x46, 0x7f, 0x58, 0xd6, 0x9f, 0xe5, 0x9d, 0xfe, 0x9b, 0xce, 0xb7, 0x9a, 0xf5, 0xeb, + 0x3c, 0x1b, 0x8f, 0x6a, 0x18, 0xfa, 0xe4, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfc, 0x22, 0xbc, + 0x75, 0xcd, 0x0a, 0x00, 0x00, } diff --git a/proto/schema.proto b/proto/schema.proto index 07769bb..07f48fd 100644 --- a/proto/schema.proto +++ b/proto/schema.proto @@ -11,6 +11,7 @@ option java_generate_equals_and_hash = true; option csharp_namespace = "IO.Milvus.Grpc"; import "common.proto"; +import "google/protobuf/struct.proto"; /** * @brief Field data type @@ -28,8 +29,8 @@ enum DataType { String = 20; VarChar = 21; // variable-length strings with a specified maximum length - List = 22; - Json = 23; + Array = 22; + JSON = 23; BinaryVector = 100; FloatVector = 101; @@ -83,6 +84,10 @@ message BytesArray { repeated bytes data = 1; } message StringArray { repeated string data = 1; } +message ArrayArray { repeated google.protobuf.ListValue data = 1; } + +message JSONArray { repeated google.protobuf.Struct data = 1; } + message ScalarField { oneof data { BoolArray bool_data = 1; @@ -92,6 +97,8 @@ message ScalarField { DoubleArray double_data = 5; StringArray string_data = 6; BytesArray bytes_data = 7; + ArrayArray array_data = 8; + JSONArray json_data = 9; } }