Add timeout ts for search and query (#12890)

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>

internal/msgstream/msg.go

@@ -274,6 +274,11 @@ func (st *SearchMsg) TravelTs() Timestamp {
 	return st.GetTravelTimestamp()
 }
 
+// TimeoutTs returns the timestamp of timeout
+func (st *SearchMsg) TimeoutTs() Timestamp {
+	return st.GetTimeoutTimestamp()
+}
+
 // Marshal is used to serializing a message pack to byte array
 func (st *SearchMsg) Marshal(input TsMsg) (MarshalType, error) {
 	searchTask := input.(*SearchMsg)
@@ -396,6 +401,11 @@ func (rm *RetrieveMsg) TravelTs() Timestamp {
 	return rm.GetTravelTimestamp()
 }
 
+// TimeoutTs returns the timestamp of timeout
+func (rm *RetrieveMsg) TimeoutTs() Timestamp {
+	return rm.GetTimeoutTimestamp()
+}
+
 // Marshal is used to serializing a message pack to byte array
 func (rm *RetrieveMsg) Marshal(input TsMsg) (MarshalType, error) {
 	retrieveTask := input.(*RetrieveMsg)

internal/msgstream/msg_test.go

@@ -205,6 +205,7 @@ func TestSearchMsg(t *testing.T) {
 			OutputFieldsId:     []int64{},
 			TravelTimestamp:    6,
 			GuaranteeTimestamp: 7,
+			TimeoutTimestamp:   8,
 		},
 	}
 
@@ -219,6 +220,7 @@ func TestSearchMsg(t *testing.T) {
 	assert.Equal(t, int64(3), searchMsg.SourceID())
 	assert.Equal(t, uint64(7), searchMsg.GuaranteeTs())
 	assert.Equal(t, uint64(6), searchMsg.TravelTs())
+	assert.Equal(t, uint64(8), searchMsg.TimeoutTs())
 
 	bytes, err := searchMsg.Marshal(searchMsg)
 	assert.Nil(t, err)
@@ -310,6 +312,7 @@ func TestRetrieveMsg(t *testing.T) {
 			OutputFieldsId:     []int64{8, 9},
 			TravelTimestamp:    10,
 			GuaranteeTimestamp: 11,
+			TimeoutTimestamp:   12,
 		},
 	}
 
@@ -324,6 +327,7 @@ func TestRetrieveMsg(t *testing.T) {
 	assert.Equal(t, int64(3), retrieveMsg.SourceID())
 	assert.Equal(t, uint64(11), retrieveMsg.GuaranteeTs())
 	assert.Equal(t, uint64(10), retrieveMsg.TravelTs())
+	assert.Equal(t, uint64(12), retrieveMsg.TimeoutTs())
 
 	bytes, err := retrieveMsg.Marshal(retrieveMsg)
 	assert.Nil(t, err)

internal/proto/internal.proto

@@ -157,6 +157,7 @@ message SearchRequest {
   repeated int64 output_fields_id = 10;
   uint64 travel_timestamp = 11;
   uint64 guarantee_timestamp = 12;
+  uint64 timeout_timestamp = 13;
 }
 
 message SearchResults {
@@ -185,6 +186,7 @@ message RetrieveRequest {
   repeated int64 output_fields_id = 7;
   uint64 travel_timestamp = 8;
   uint64 guarantee_timestamp = 9;
+  uint64 timeout_timestamp = 10;
 }
 
 message RetrieveResults {

internal/proto/internalpb/internal.pb.go

@@ -1246,6 +1246,7 @@ type SearchRequest struct {
 	OutputFieldsId       []int64          `protobuf:"varint,10,rep,packed,name=output_fields_id,json=outputFieldsId,proto3" json:"output_fields_id,omitempty"`
 	TravelTimestamp      uint64           `protobuf:"varint,11,opt,name=travel_timestamp,json=travelTimestamp,proto3" json:"travel_timestamp,omitempty"`
 	GuaranteeTimestamp   uint64           `protobuf:"varint,12,opt,name=guarantee_timestamp,json=guaranteeTimestamp,proto3" json:"guarantee_timestamp,omitempty"`
+	TimeoutTimestamp     uint64           `protobuf:"varint,13,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
 	XXX_unrecognized     []byte           `json:"-"`
 	XXX_sizecache        int32            `json:"-"`
@@ -1360,6 +1361,13 @@ func (m *SearchRequest) GetGuaranteeTimestamp() uint64 {
 	return 0
 }
 
+func (m *SearchRequest) GetTimeoutTimestamp() uint64 {
+	if m != nil {
+		return m.TimeoutTimestamp
+	}
+	return 0
+}
+
 type SearchResults struct {
 	Base                     *commonpb.MsgBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"`
 	Status                   *commonpb.Status  `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"`
@@ -1498,6 +1506,7 @@ type RetrieveRequest struct {
 	OutputFieldsId       []int64           `protobuf:"varint,7,rep,packed,name=output_fields_id,json=outputFieldsId,proto3" json:"output_fields_id,omitempty"`
 	TravelTimestamp      uint64            `protobuf:"varint,8,opt,name=travel_timestamp,json=travelTimestamp,proto3" json:"travel_timestamp,omitempty"`
 	GuaranteeTimestamp   uint64            `protobuf:"varint,9,opt,name=guarantee_timestamp,json=guaranteeTimestamp,proto3" json:"guarantee_timestamp,omitempty"`
+	TimeoutTimestamp     uint64            `protobuf:"varint,10,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
@@ -1591,6 +1600,13 @@ func (m *RetrieveRequest) GetGuaranteeTimestamp() uint64 {
 	return 0
 }
 
+func (m *RetrieveRequest) GetTimeoutTimestamp() uint64 {
+	if m != nil {
+		return m.TimeoutTimestamp
+	}
+	return 0
+}
+
 type RetrieveResults struct {
 	Base                      *commonpb.MsgBase     `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"`
 	Status                    *commonpb.Status      `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"`
@@ -2396,130 +2412,132 @@ func init() {
 func init() { proto.RegisterFile("internal.proto", fileDescriptor_41f4a519b878ee3b) }
 
 var fileDescriptor_41f4a519b878ee3b = []byte{
-	// 1998 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xdd, 0x72, 0x1c, 0x47,
-	0xf5, 0xff, 0xcf, 0xce, 0xae, 0x76, 0xf7, 0xcc, 0x4a, 0x5e, 0xb5, 0x64, 0x67, 0x64, 0x3b, 0xb1,
-	0x32, 0xc9, 0x1f, 0x44, 0x5c, 0x58, 0x46, 0x01, 0x92, 0xa2, 0x28, 0x1c, 0x5b, 0x1b, 0xcc, 0x96,
-	0x23, 0x21, 0x46, 0x4e, 0xaa, 0xe0, 0x66, 0xaa, 0x77, 0xa7, 0xb5, 0x1a, 0x3c, 0x5f, 0x99, 0xee,
-	0x91, 0xbd, 0xb9, 0xa2, 0x28, 0xae, 0xa0, 0xa0, 0x0a, 0xaa, 0xb8, 0x84, 0x47, 0xe0, 0x96, 0x2b,
-	0x3e, 0x8a, 0x2b, 0x5e, 0x81, 0x07, 0xe0, 0x1d, 0x28, 0xae, 0xa8, 0x3e, 0xdd, 0xf3, 0xb1, 0xab,
-	0x95, 0x2c, 0x2b, 0x15, 0x62, 0xaa, 0x72, 0x37, 0x7d, 0xce, 0xe9, 0x8f, 0xf3, 0x3b, 0xbf, 0x73,
-	0xfa, 0x6c, 0x2f, 0xac, 0x04, 0xb1, 0x60, 0x59, 0x4c, 0xc3, 0x3b, 0x69, 0x96, 0x88, 0x84, 0x5c,
-	0x8d, 0x82, 0xf0, 0x24, 0xe7, 0x6a, 0x74, 0xa7, 0x50, 0x5e, 0xef, 0x8d, 0x93, 0x28, 0x4a, 0x62,
-	0x25, 0xbe, 0xde, 0xe3, 0xe3, 0x63, 0x16, 0x51, 0x35, 0x72, 0xfe, 0x6c, 0xc0, 0xf2, 0x6e, 0x12,
-	0xa5, 0x49, 0xcc, 0x62, 0x31, 0x8c, 0x8f, 0x12, 0x72, 0x0d, 0x96, 0xe2, 0xc4, 0x67, 0xc3, 0x81,
-	0x6d, 0x6c, 0x1a, 0x5b, 0xa6, 0xab, 0x47, 0x84, 0x40, 0x33, 0x4b, 0x42, 0x66, 0x37, 0x36, 0x8d,
-	0xad, 0xae, 0x8b, 0xdf, 0xe4, 0x1e, 0x00, 0x17, 0x54, 0x30, 0x6f, 0x9c, 0xf8, 0xcc, 0x36, 0x37,
-	0x8d, 0xad, 0x95, 0x9d, 0xcd, 0x3b, 0x0b, 0x4f, 0x71, 0xe7, 0x50, 0x1a, 0xee, 0x26, 0x3e, 0x73,
-	0xbb, 0xbc, 0xf8, 0x24, 0xef, 0x01, 0xb0, 0x67, 0x22, 0xa3, 0x5e, 0x10, 0x1f, 0x25, 0x76, 0x73,
-	0xd3, 0xdc, 0xb2, 0x76, 0x5e, 0x9f, 0x5d, 0x40, 0x1f, 0xfe, 0x11, 0x9b, 0x7e, 0x44, 0xc3, 0x9c,
-	0x1d, 0xd0, 0x20, 0x73, 0xbb, 0x38, 0x49, 0x1e, 0xd7, 0xf9, 0x87, 0x01, 0x57, 0x4a, 0x07, 0x70,
-	0x0f, 0x4e, 0xbe, 0x05, 0x2d, 0xdc, 0x02, 0x3d, 0xb0, 0x76, 0xde, 0x3c, 0xe3, 0x44, 0x33, 0x7e,
-	0xbb, 0x6a, 0x0a, 0xf9, 0x10, 0xd6, 0x78, 0x3e, 0x1a, 0x17, 0x2a, 0x0f, 0xa5, 0xdc, 0x6e, 0xe0,
-	0xd1, 0x2e, 0xb6, 0x12, 0xa9, 0x2f, 0xa0, 0x8f, 0xf4, 0x36, 0x2c, 0xc9, 0x95, 0x72, 0x8e, 0x28,
-	0x59, 0x3b, 0x37, 0x16, 0x3a, 0x79, 0x88, 0x26, 0xae, 0x36, 0x75, 0x6e, 0xc0, 0xc6, 0x43, 0x26,
-	0xe6, 0xbc, 0x73, 0xd9, 0xc7, 0x39, 0xe3, 0x42, 0x2b, 0x1f, 0x07, 0x11, 0x7b, 0x1c, 0x8c, 0x9f,
-	0xec, 0x1e, 0xd3, 0x38, 0x66, 0x61, 0xa1, 0x7c, 0x15, 0x6e, 0x3c, 0x64, 0x38, 0x21, 0xe0, 0x22,
-	0x18, 0xf3, 0x39, 0xf5, 0x55, 0x58, 0x7b, 0xc8, 0xc4, 0xc0, 0x9f, 0x13, 0x7f, 0x04, 0x9d, 0x7d,
-	0x19, 0x6c, 0x49, 0x83, 0x6f, 0x42, 0x9b, 0xfa, 0x7e, 0xc6, 0x38, 0xd7, 0x28, 0xde, 0x5c, 0x78,
-	0xe2, 0xfb, 0xca, 0xc6, 0x2d, 0x8c, 0x17, 0xd1, 0xc4, 0xf9, 0x31, 0xc0, 0x30, 0x0e, 0xc4, 0x01,
-	0xcd, 0x68, 0xc4, 0xcf, 0x24, 0xd8, 0x00, 0x7a, 0x5c, 0xd0, 0x4c, 0x78, 0x29, 0xda, 0x69, 0xc8,
-	0x2f, 0xc0, 0x06, 0x0b, 0xa7, 0xa9, 0xd5, 0x9d, 0x1f, 0x02, 0x1c, 0x8a, 0x2c, 0x88, 0x27, 0x1f,
-	0x04, 0x5c, 0xc8, 0xbd, 0x4e, 0xa4, 0x9d, 0x74, 0xc2, 0xdc, 0xea, 0xba, 0x7a, 0x54, 0x0b, 0x47,
-	0xe3, 0xe2, 0xe1, 0xb8, 0x07, 0x56, 0x01, 0xf7, 0x1e, 0x9f, 0x90, 0xbb, 0xd0, 0x1c, 0x51, 0xce,
-	0xce, 0x85, 0x67, 0x8f, 0x4f, 0x1e, 0x50, 0xce, 0x5c, 0xb4, 0x74, 0x7e, 0x6e, 0xc2, 0x2b, 0xbb,
-	0x19, 0x43, 0xf2, 0x87, 0x21, 0x1b, 0x8b, 0x20, 0x89, 0x35, 0xf6, 0x2f, 0xbe, 0x1a, 0x79, 0x05,
-	0xda, 0xfe, 0xc8, 0x8b, 0x69, 0x54, 0x80, 0xbd, 0xe4, 0x8f, 0xf6, 0x69, 0xc4, 0xc8, 0x97, 0x60,
-	0x65, 0x5c, 0xae, 0x2f, 0x25, 0xc8, 0xb9, 0xae, 0x3b, 0x27, 0x25, 0x6f, 0xc2, 0x72, 0x4a, 0x33,
-	0x11, 0x94, 0x66, 0x4d, 0x34, 0x9b, 0x15, 0xca, 0x80, 0xfa, 0xa3, 0xe1, 0xc0, 0x6e, 0x61, 0xb0,
-	0xf0, 0x9b, 0x38, 0xd0, 0xab, 0xd6, 0x1a, 0x0e, 0xec, 0x25, 0xd4, 0xcd, 0xc8, 0xc8, 0x26, 0x58,
-	0xe5, 0x42, 0xc3, 0x81, 0xdd, 0x46, 0x93, 0xba, 0x48, 0x06, 0x47, 0xd5, 0x22, 0xbb, 0xb3, 0x69,
-	0x6c, 0xf5, 0x5c, 0x3d, 0x22, 0x77, 0x61, 0xed, 0x24, 0xc8, 0x44, 0x4e, 0x43, 0xcd, 0x4f, 0x79,
-	0x0e, 0x6e, 0x77, 0x31, 0x82, 0x8b, 0x54, 0x64, 0x07, 0xd6, 0xd3, 0xe3, 0x29, 0x0f, 0xc6, 0x73,
-	0x53, 0x00, 0xa7, 0x2c, 0xd4, 0x39, 0x7f, 0x33, 0xe0, 0xea, 0x20, 0x4b, 0xd2, 0x97, 0x22, 0x14,
-	0x05, 0xc8, 0xcd, 0x73, 0x40, 0x6e, 0x9d, 0x06, 0xd9, 0xf9, 0x65, 0x03, 0xae, 0x29, 0x46, 0x1d,
-	0x14, 0xc0, 0x7e, 0x06, 0x5e, 0x7c, 0x19, 0xae, 0x54, 0xbb, 0x2a, 0x83, 0xc5, 0x6e, 0xfc, 0x3f,
-	0xac, 0x94, 0x01, 0x56, 0x76, 0xff, 0x5d, 0x4a, 0x39, 0xbf, 0x68, 0xc0, 0xba, 0x0c, 0xea, 0x17,
-	0x68, 0x48, 0x34, 0x7e, 0x6f, 0x00, 0x51, 0xec, 0xb8, 0x1f, 0x06, 0x94, 0x7f, 0x9e, 0x58, 0xac,
-	0x43, 0x8b, 0xca, 0x33, 0x68, 0x08, 0xd4, 0xc0, 0xe1, 0xd0, 0x97, 0xd1, 0xfa, 0xac, 0x4e, 0x57,
-	0x6e, 0x6a, 0xd6, 0x37, 0xfd, 0x9d, 0x01, 0xab, 0xf7, 0x43, 0xc1, 0xb2, 0x97, 0x14, 0x94, 0xbf,
-	0x34, 0x8a, 0xa8, 0x0d, 0x63, 0x9f, 0x3d, 0xfb, 0x3c, 0x0f, 0xf8, 0x2a, 0xc0, 0x51, 0xc0, 0x42,
+	// 2017 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcf, 0x73, 0x1c, 0x47,
+	0xf5, 0xff, 0xce, 0xce, 0xae, 0x76, 0xf7, 0xcd, 0x4a, 0x5e, 0xb5, 0x65, 0x67, 0x64, 0x3b, 0xb1,
+	0x32, 0xc9, 0x17, 0x44, 0x5c, 0x58, 0x46, 0x01, 0x92, 0xa2, 0x28, 0x1c, 0x5b, 0x1b, 0xcc, 0x96,
+	0x23, 0x21, 0x46, 0x4e, 0xaa, 0xe0, 0x32, 0xd5, 0xbb, 0xd3, 0x5a, 0x0d, 0x9e, 0x5f, 0x99, 0xee,
+	0x91, 0xbd, 0x39, 0x71, 0xe0, 0x04, 0x05, 0x55, 0x50, 0xc5, 0x11, 0x6e, 0x5c, 0xe1, 0xc8, 0x89,
+	0x1f, 0xc5, 0x89, 0x7f, 0x81, 0x3f, 0x80, 0x7f, 0x82, 0x13, 0xd5, 0xaf, 0x7b, 0x7e, 0xec, 0x6a,
+	0x25, 0x4b, 0x4a, 0x85, 0x98, 0xaa, 0xdc, 0xa6, 0xdf, 0x7b, 0xfd, 0xe3, 0x7d, 0xde, 0xe7, 0xbd,
+	0x7e, 0xdb, 0x0b, 0x2b, 0x41, 0x2c, 0x58, 0x16, 0xd3, 0xf0, 0x6e, 0x9a, 0x25, 0x22, 0x21, 0xd7,
+	0xa2, 0x20, 0x3c, 0xce, 0xb9, 0x1a, 0xdd, 0x2d, 0x94, 0x37, 0x7a, 0xe3, 0x24, 0x8a, 0x92, 0x58,
+	0x89, 0x6f, 0xf4, 0xf8, 0xf8, 0x88, 0x45, 0x54, 0x8d, 0x9c, 0xbf, 0x18, 0xb0, 0xbc, 0x93, 0x44,
+	0x69, 0x12, 0xb3, 0x58, 0x0c, 0xe3, 0xc3, 0x84, 0x5c, 0x87, 0xa5, 0x38, 0xf1, 0xd9, 0x70, 0x60,
+	0x1b, 0x1b, 0xc6, 0xa6, 0xe9, 0xea, 0x11, 0x21, 0xd0, 0xcc, 0x92, 0x90, 0xd9, 0x8d, 0x0d, 0x63,
+	0xb3, 0xeb, 0xe2, 0x37, 0xb9, 0x0f, 0xc0, 0x05, 0x15, 0xcc, 0x1b, 0x27, 0x3e, 0xb3, 0xcd, 0x0d,
+	0x63, 0x73, 0x65, 0x7b, 0xe3, 0xee, 0xc2, 0x53, 0xdc, 0x3d, 0x90, 0x86, 0x3b, 0x89, 0xcf, 0xdc,
+	0x2e, 0x2f, 0x3e, 0xc9, 0x7b, 0x00, 0xec, 0xb9, 0xc8, 0xa8, 0x17, 0xc4, 0x87, 0x89, 0xdd, 0xdc,
+	0x30, 0x37, 0xad, 0xed, 0xd7, 0x67, 0x17, 0xd0, 0x87, 0x7f, 0xcc, 0xa6, 0x1f, 0xd1, 0x30, 0x67,
+	0xfb, 0x34, 0xc8, 0xdc, 0x2e, 0x4e, 0x92, 0xc7, 0x75, 0xfe, 0x69, 0xc0, 0x95, 0xd2, 0x01, 0xdc,
+	0x83, 0x93, 0x6f, 0x41, 0x0b, 0xb7, 0x40, 0x0f, 0xac, 0xed, 0x37, 0x4f, 0x39, 0xd1, 0x8c, 0xdf,
+	0xae, 0x9a, 0x42, 0x3e, 0x84, 0xab, 0x3c, 0x1f, 0x8d, 0x0b, 0x95, 0x87, 0x52, 0x6e, 0x37, 0xf0,
+	0x68, 0xe7, 0x5b, 0x89, 0xd4, 0x17, 0xd0, 0x47, 0x7a, 0x1b, 0x96, 0xe4, 0x4a, 0x39, 0x47, 0x94,
+	0xac, 0xed, 0x9b, 0x0b, 0x9d, 0x3c, 0x40, 0x13, 0x57, 0x9b, 0x3a, 0x37, 0x61, 0xfd, 0x11, 0x13,
+	0x73, 0xde, 0xb9, 0xec, 0xe3, 0x9c, 0x71, 0xa1, 0x95, 0x4f, 0x82, 0x88, 0x3d, 0x09, 0xc6, 0x4f,
+	0x77, 0x8e, 0x68, 0x1c, 0xb3, 0xb0, 0x50, 0xbe, 0x0a, 0x37, 0x1f, 0x31, 0x9c, 0x10, 0x70, 0x11,
+	0x8c, 0xf9, 0x9c, 0xfa, 0x1a, 0x5c, 0x7d, 0xc4, 0xc4, 0xc0, 0x9f, 0x13, 0x7f, 0x04, 0x9d, 0x3d,
+	0x19, 0x6c, 0x49, 0x83, 0x6f, 0x42, 0x9b, 0xfa, 0x7e, 0xc6, 0x38, 0xd7, 0x28, 0xde, 0x5a, 0x78,
+	0xe2, 0x07, 0xca, 0xc6, 0x2d, 0x8c, 0x17, 0xd1, 0xc4, 0xf9, 0x31, 0xc0, 0x30, 0x0e, 0xc4, 0x3e,
+	0xcd, 0x68, 0xc4, 0x4f, 0x25, 0xd8, 0x00, 0x7a, 0x5c, 0xd0, 0x4c, 0x78, 0x29, 0xda, 0x69, 0xc8,
+	0xcf, 0xc1, 0x06, 0x0b, 0xa7, 0xa9, 0xd5, 0x9d, 0x1f, 0x02, 0x1c, 0x88, 0x2c, 0x88, 0x27, 0x1f,
+	0x04, 0x5c, 0xc8, 0xbd, 0x8e, 0xa5, 0x9d, 0x74, 0xc2, 0xdc, 0xec, 0xba, 0x7a, 0x54, 0x0b, 0x47,
+	0xe3, 0xfc, 0xe1, 0xb8, 0x0f, 0x56, 0x01, 0xf7, 0x2e, 0x9f, 0x90, 0x7b, 0xd0, 0x1c, 0x51, 0xce,
+	0xce, 0x84, 0x67, 0x97, 0x4f, 0x1e, 0x52, 0xce, 0x5c, 0xb4, 0x74, 0x7e, 0x66, 0xc2, 0x2b, 0x3b,
+	0x19, 0x43, 0xf2, 0x87, 0x21, 0x1b, 0x8b, 0x20, 0x89, 0x35, 0xf6, 0x17, 0x5f, 0x8d, 0xbc, 0x02,
+	0x6d, 0x7f, 0xe4, 0xc5, 0x34, 0x2a, 0xc0, 0x5e, 0xf2, 0x47, 0x7b, 0x34, 0x62, 0xe4, 0x4b, 0xb0,
+	0x32, 0x2e, 0xd7, 0x97, 0x12, 0xe4, 0x5c, 0xd7, 0x9d, 0x93, 0x92, 0x37, 0x61, 0x39, 0xa5, 0x99,
+	0x08, 0x4a, 0xb3, 0x26, 0x9a, 0xcd, 0x0a, 0x65, 0x40, 0xfd, 0xd1, 0x70, 0x60, 0xb7, 0x30, 0x58,
+	0xf8, 0x4d, 0x1c, 0xe8, 0x55, 0x6b, 0x0d, 0x07, 0xf6, 0x12, 0xea, 0x66, 0x64, 0x64, 0x03, 0xac,
+	0x72, 0xa1, 0xe1, 0xc0, 0x6e, 0xa3, 0x49, 0x5d, 0x24, 0x83, 0xa3, 0x6a, 0x91, 0xdd, 0xd9, 0x30,
+	0x36, 0x7b, 0xae, 0x1e, 0x91, 0x7b, 0x70, 0xf5, 0x38, 0xc8, 0x44, 0x4e, 0x43, 0xcd, 0x4f, 0x79,
+	0x0e, 0x6e, 0x77, 0x31, 0x82, 0x8b, 0x54, 0x64, 0x1b, 0xd6, 0xd2, 0xa3, 0x29, 0x0f, 0xc6, 0x73,
+	0x53, 0x00, 0xa7, 0x2c, 0xd4, 0x39, 0x7f, 0x37, 0xe0, 0xda, 0x20, 0x4b, 0xd2, 0x97, 0x22, 0x14,
+	0x05, 0xc8, 0xcd, 0x33, 0x40, 0x6e, 0x9d, 0x04, 0xd9, 0xf9, 0x45, 0x03, 0xae, 0x2b, 0x46, 0xed,
+	0x17, 0xc0, 0x7e, 0x06, 0x5e, 0x7c, 0x19, 0xae, 0x54, 0xbb, 0x2a, 0x83, 0xc5, 0x6e, 0xfc, 0x3f,
+	0xac, 0x94, 0x01, 0x56, 0x76, 0xff, 0x5d, 0x4a, 0x39, 0x3f, 0x6f, 0xc0, 0x9a, 0x0c, 0xea, 0x17,
+	0x68, 0x48, 0x34, 0x7e, 0x67, 0x00, 0x51, 0xec, 0x78, 0x10, 0x06, 0x94, 0x7f, 0x9e, 0x58, 0xac,
+	0x41, 0x8b, 0xca, 0x33, 0x68, 0x08, 0xd4, 0xc0, 0xe1, 0xd0, 0x97, 0xd1, 0xfa, 0xac, 0x4e, 0x57,
+	0x6e, 0x6a, 0xd6, 0x37, 0xfd, 0xad, 0x01, 0xab, 0x0f, 0x42, 0xc1, 0xb2, 0x97, 0x14, 0x94, 0xbf,
+	0x36, 0x8a, 0xa8, 0x0d, 0x63, 0x9f, 0x3d, 0xff, 0x3c, 0x0f, 0xf8, 0x2a, 0xc0, 0x61, 0xc0, 0x42,
 	0xbf, 0xce, 0xde, 0x2e, 0x4a, 0x3e, 0x15, 0x73, 0x6d, 0x68, 0xe3, 0x22, 0x25, 0x6b, 0x8b, 0xa1,
-	0xec, 0x01, 0x54, 0x3f, 0xa8, 0x7b, 0x80, 0xce, 0x85, 0x7b, 0x00, 0x9c, 0xa6, 0x7b, 0x80, 0x3f,
-	0x98, 0xb0, 0x3c, 0x8c, 0x39, 0xcb, 0xc4, 0xe5, 0xc1, 0xbb, 0x09, 0x5d, 0x7e, 0x4c, 0x33, 0x74,
-	0x54, 0xc3, 0x57, 0x09, 0xea, 0xd0, 0x9a, 0xcf, 0x83, 0xb6, 0x79, 0xc1, 0xe2, 0xd0, 0x3a, 0xaf,
-	0x38, 0x2c, 0x9d, 0x03, 0x71, 0xfb, 0xf9, 0xc5, 0xa1, 0x73, 0xfa, 0xf6, 0x95, 0x0e, 0xb2, 0x49,
+	0xec, 0x01, 0x54, 0x3f, 0xa8, 0x7b, 0x80, 0xce, 0xb9, 0x7b, 0x00, 0x9c, 0xa6, 0x7b, 0x80, 0x3f,
+	0x98, 0xb0, 0x3c, 0x8c, 0x39, 0xcb, 0xc4, 0xe5, 0xc1, 0xbb, 0x05, 0x5d, 0x7e, 0x44, 0x33, 0x74,
+	0x54, 0xc3, 0x57, 0x09, 0xea, 0xd0, 0x9a, 0x2f, 0x82, 0xb6, 0x79, 0xce, 0xe2, 0xd0, 0x3a, 0xab,
+	0x38, 0x2c, 0x9d, 0x01, 0x71, 0xfb, 0xc5, 0xc5, 0xa1, 0x73, 0xf2, 0xf6, 0x95, 0x0e, 0xb2, 0x49,
 	0x24, 0x9b, 0xd6, 0x81, 0xdd, 0x45, 0x7d, 0x25, 0x20, 0xaf, 0x01, 0x88, 0x20, 0x62, 0x5c, 0xd0,
-	0x28, 0x55, 0xf7, 0x68, 0xd3, 0xad, 0x49, 0xe4, 0xdd, 0x9d, 0x25, 0x4f, 0x87, 0x03, 0x6e, 0x5b,
-	0x9b, 0xa6, 0x6c, 0xe2, 0xd4, 0x88, 0x7c, 0x1d, 0x3a, 0x59, 0xf2, 0xd4, 0xf3, 0xa9, 0xa0, 0x76,
-	0x0f, 0x83, 0xb7, 0xb1, 0x10, 0xec, 0x07, 0x61, 0x32, 0x72, 0xdb, 0x59, 0xf2, 0x74, 0x40, 0x05,
-	0x75, 0xfe, 0x65, 0xc2, 0xf2, 0x21, 0xa3, 0xd9, 0xf8, 0xf8, 0xf2, 0x01, 0xfb, 0x0a, 0xf4, 0x33,
-	0xc6, 0xf3, 0x50, 0x78, 0x63, 0x75, 0xcd, 0x0f, 0x07, 0x3a, 0x6e, 0x57, 0x94, 0x7c, 0xb7, 0x10,
-	0x97, 0xa0, 0x9a, 0xe7, 0x80, 0xda, 0x5c, 0x00, 0xaa, 0x03, 0xbd, 0x1a, 0x82, 0xdc, 0x6e, 0xa1,
-	0xeb, 0x33, 0x32, 0xd2, 0x07, 0xd3, 0xe7, 0x21, 0xc6, 0xab, 0xeb, 0xca, 0x4f, 0x72, 0x1b, 0x56,
-	0xd3, 0x90, 0x8e, 0xd9, 0x71, 0x12, 0xfa, 0x2c, 0xf3, 0x26, 0x59, 0x92, 0xa7, 0x18, 0xb3, 0x9e,
-	0xdb, 0xaf, 0x29, 0x1e, 0x4a, 0x39, 0x79, 0x07, 0x3a, 0x3e, 0x0f, 0x3d, 0x31, 0x4d, 0x19, 0x06,
-	0x6d, 0xe5, 0x0c, 0xdf, 0x07, 0x3c, 0x7c, 0x3c, 0x4d, 0x99, 0xdb, 0xf6, 0xd5, 0x07, 0xb9, 0x0b,
-	0xeb, 0x9c, 0x65, 0x01, 0x0d, 0x83, 0x4f, 0x98, 0xef, 0xb1, 0x67, 0x69, 0xe6, 0xa5, 0x21, 0x8d,
-	0x31, 0xb2, 0x3d, 0x97, 0x54, 0xba, 0xf7, 0x9f, 0xa5, 0xd9, 0x41, 0x48, 0x63, 0xb2, 0x05, 0xfd,
-	0x24, 0x17, 0x69, 0x2e, 0x3c, 0xcc, 0x3e, 0xee, 0x05, 0x3e, 0x06, 0xda, 0x74, 0x57, 0x94, 0xfc,
-	0xbb, 0x28, 0x1e, 0xfa, 0x12, 0x5a, 0x91, 0xd1, 0x13, 0x16, 0x7a, 0x25, 0x03, 0x6c, 0x6b, 0xd3,
-	0xd8, 0x6a, 0xba, 0x57, 0x94, 0xfc, 0x71, 0x21, 0x26, 0xdb, 0xb0, 0x36, 0xc9, 0x69, 0x46, 0x63,
-	0xc1, 0x58, 0xcd, 0xba, 0x87, 0xd6, 0xa4, 0x54, 0x95, 0x13, 0x9c, 0x5f, 0x37, 0xab, 0xd0, 0xcb,
-	0x28, 0xf1, 0x4b, 0x84, 0xfe, 0x32, 0xdd, 0xfc, 0x42, 0xbe, 0x98, 0x8b, 0xf9, 0x72, 0x0b, 0xac,
-	0x88, 0x89, 0x2c, 0x18, 0xab, 0xb8, 0xa8, 0x84, 0x06, 0x25, 0x42, 0xf0, 0x6f, 0x81, 0x15, 0xe7,
-	0x91, 0xf7, 0x71, 0xce, 0xb2, 0x80, 0x71, 0x5d, 0x0f, 0x21, 0xce, 0xa3, 0x1f, 0x28, 0x09, 0x59,
-	0x83, 0x96, 0x48, 0x52, 0xef, 0x49, 0x91, 0xc7, 0x22, 0x49, 0x1f, 0x91, 0x6f, 0xc3, 0x75, 0xce,
-	0x68, 0xc8, 0x7c, 0xaf, 0xcc, 0x3b, 0xee, 0x71, 0xc4, 0x82, 0xf9, 0x76, 0x1b, 0x43, 0x61, 0x2b,
-	0x8b, 0xc3, 0xd2, 0xe0, 0x50, 0xeb, 0x25, 0xd2, 0xe5, 0xc1, 0x6b, 0xd3, 0x3a, 0xd8, 0xf2, 0x92,
-	0x4a, 0x55, 0x4e, 0x78, 0x17, 0xec, 0x49, 0x98, 0x8c, 0x68, 0xe8, 0x9d, 0xda, 0x15, 0x7b, 0x6b,
-	0xd3, 0xbd, 0xa6, 0xf4, 0x87, 0x73, 0x5b, 0x4a, 0xf7, 0x78, 0x18, 0x8c, 0x99, 0xef, 0x8d, 0xc2,
-	0x64, 0x64, 0x03, 0x52, 0x0a, 0x94, 0x48, 0x26, 0xb2, 0xa4, 0x92, 0x36, 0x90, 0x30, 0x8c, 0x93,
-	0x3c, 0x16, 0x48, 0x10, 0xd3, 0x5d, 0x51, 0xf2, 0xfd, 0x3c, 0xda, 0x95, 0x52, 0xf2, 0x06, 0x2c,
-	0x6b, 0xcb, 0xe4, 0xe8, 0x88, 0x33, 0x81, 0xcc, 0x30, 0xdd, 0x9e, 0x12, 0x7e, 0x1f, 0x65, 0xce,
-	0x4f, 0x4d, 0xb8, 0xe2, 0x4a, 0x74, 0xd9, 0x09, 0xfb, 0x9f, 0x2f, 0x08, 0x67, 0x25, 0xe6, 0xd2,
-	0x0b, 0x25, 0x66, 0xfb, 0xc2, 0x89, 0xd9, 0x79, 0xa1, 0xc4, 0xec, 0x9e, 0x99, 0x98, 0x7f, 0x9a,
-	0x09, 0xc2, 0xcb, 0x9a, 0x9a, 0x6f, 0x81, 0x19, 0xf8, 0xaa, 0x81, 0xb2, 0x76, 0xec, 0xd9, 0xc5,
-	0xf5, 0x43, 0xd7, 0x70, 0xc0, 0x5d, 0x69, 0x44, 0xee, 0x81, 0xa5, 0x01, 0xc5, 0xeb, 0xa9, 0x85,
-	0xd7, 0xd3, 0x6b, 0x0b, 0xe7, 0x20, 0xc2, 0xf2, 0x6a, 0x72, 0x55, 0x03, 0xc4, 0xe5, 0x37, 0xf9,
-	0x0e, 0xdc, 0x38, 0x9d, 0xb0, 0x99, 0xc6, 0xc8, 0xb7, 0x97, 0x30, 0x46, 0x1b, 0xf3, 0x19, 0x5b,
-	0x80, 0xe8, 0x93, 0xaf, 0xc1, 0x7a, 0x2d, 0x65, 0xab, 0x89, 0x6d, 0xf5, 0xcb, 0xb6, 0xd2, 0x55,
-	0x53, 0xce, 0x4b, 0xda, 0xce, 0x79, 0x49, 0xeb, 0xfc, 0xb3, 0x01, 0xcb, 0x03, 0x16, 0x32, 0xc1,
-	0xbe, 0x68, 0x82, 0xce, 0x6c, 0x82, 0x5e, 0x87, 0x5e, 0x9a, 0x05, 0x11, 0xcd, 0xa6, 0xde, 0x13,
-	0x36, 0x2d, 0xea, 0xa0, 0xa5, 0x65, 0x8f, 0xd8, 0x94, 0x3f, 0xaf, 0x13, 0x72, 0xfe, 0x6d, 0x40,
-	0xf7, 0x83, 0x84, 0xfa, 0xd8, 0xac, 0x5f, 0x12, 0xe3, 0xb2, 0x0f, 0x6b, 0xcc, 0xf7, 0x61, 0x37,
-	0xa1, 0xea, 0xb7, 0x35, 0xca, 0xb5, 0x06, 0xbc, 0xd6, 0x48, 0x37, 0x67, 0x1b, 0xe9, 0x5b, 0x60,
-	0x05, 0xf2, 0x40, 0x5e, 0x4a, 0xc5, 0xb1, 0x2a, 0x4c, 0x5d, 0x17, 0x50, 0x74, 0x20, 0x25, 0xb2,
-	0xd3, 0x2e, 0x0c, 0xb0, 0xd3, 0x5e, 0xba, 0x70, 0xa7, 0xad, 0x17, 0xc1, 0x4e, 0xfb, 0xaf, 0x0d,
-	0xb0, 0x35, 0xe7, 0xaa, 0xc7, 0xc6, 0x0f, 0x53, 0x1f, 0xdf, 0x3c, 0x6f, 0x42, 0xb7, 0xe4, 0xa3,
-	0x7e, 0xeb, 0xab, 0x04, 0x12, 0xd7, 0x3d, 0x16, 0x25, 0xd9, 0xf4, 0x30, 0xf8, 0x84, 0x69, 0xc7,
-	0x6b, 0x12, 0xe9, 0xdb, 0x7e, 0x1e, 0xb9, 0xc9, 0x53, 0xae, 0xcb, 0x72, 0x31, 0x94, 0xbe, 0x8d,
-	0xf1, 0xf7, 0x11, 0xd6, 0x31, 0xf4, 0xbc, 0xe9, 0x82, 0x12, 0xc9, 0xfa, 0x45, 0x36, 0xa0, 0xc3,
-	0x62, 0x5f, 0x69, 0x5b, 0xa8, 0x6d, 0xb3, 0xd8, 0x47, 0xd5, 0x10, 0x56, 0xf4, 0x23, 0x63, 0xc2,
-	0x91, 0x04, 0x48, 0x2a, 0x6b, 0xc7, 0x39, 0xe3, 0x65, 0x77, 0x8f, 0x4f, 0x0e, 0xb4, 0xa5, 0xbb,
-	0xac, 0xde, 0x19, 0xf5, 0x90, 0xbc, 0x0f, 0x3d, 0xb9, 0x4b, 0xb9, 0x50, 0xfb, 0xc2, 0x0b, 0x59,
-	0x2c, 0xf6, 0x8b, 0x81, 0xf3, 0x1b, 0x03, 0x56, 0x4f, 0x41, 0x78, 0x09, 0x1e, 0x3d, 0x82, 0xce,
-	0x21, 0x9b, 0xc8, 0x25, 0x8a, 0xa7, 0xd3, 0xed, 0xb3, 0x5e, 0xe2, 0xcf, 0x08, 0x98, 0x5b, 0x2e,
-	0xe0, 0xfc, 0xcc, 0x00, 0x40, 0x42, 0xe3, 0xf0, 0x14, 0x59, 0x8c, 0xcb, 0x90, 0x45, 0xde, 0x84,
-	0xb2, 0x3d, 0xc8, 0x58, 0x48, 0x45, 0x55, 0xc9, 0xb8, 0x8e, 0x3d, 0x89, 0xf3, 0xc8, 0x55, 0x2a,
-	0x7d, 0x40, 0xee, 0xfc, 0xca, 0x00, 0xc0, 0x52, 0xac, 0x8e, 0x31, 0x9f, 0xf3, 0xc6, 0xf9, 0xbf,
-	0x2d, 0x1b, 0xb3, 0x29, 0xf1, 0xa0, 0x48, 0x09, 0x8e, 0x18, 0x99, 0x8b, 0x7c, 0x28, 0x31, 0xaa,
-	0x9c, 0xd7, 0x59, 0xa3, 0x70, 0xf9, 0xad, 0x01, 0xbd, 0x1a, 0x7c, 0x7c, 0x36, 0x7b, 0x8d, 0xf9,
-	0xec, 0xc5, 0xc6, 0x51, 0x32, 0xda, 0xe3, 0x35, 0x92, 0x47, 0x15, 0xc9, 0x37, 0xa0, 0x83, 0x90,
-	0xd4, 0x58, 0x1e, 0x6b, 0x96, 0xdf, 0x86, 0xd5, 0x8c, 0x8d, 0x59, 0x2c, 0xc2, 0xa9, 0x17, 0x25,
-	0x7e, 0x70, 0x14, 0x30, 0x1f, 0xb9, 0xde, 0x71, 0xfb, 0x85, 0x62, 0x4f, 0xcb, 0x9d, 0xbf, 0x1b,
-	0xb0, 0x22, 0x7b, 0xcd, 0xe9, 0x7e, 0xe2, 0x33, 0x75, 0xb2, 0x17, 0x67, 0xd0, 0x7b, 0xe8, 0x8b,
-	0x86, 0x47, 0x51, 0xe8, 0x8d, 0xe7, 0x53, 0x88, 0xbb, 0x1d, 0xae, 0x69, 0x23, 0x21, 0x56, 0xef,
-	0x05, 0x17, 0x81, 0xb8, 0x0a, 0xac, 0xbe, 0x64, 0x15, 0xc4, 0x3f, 0x31, 0xc0, 0xaa, 0x25, 0x8b,
-	0x2c, 0xd1, 0xfa, 0x62, 0x54, 0x37, 0x84, 0x81, 0x45, 0xd0, 0x1a, 0x57, 0x6f, 0xb9, 0x64, 0x1d,
-	0x5a, 0x11, 0x9f, 0xe8, 0x88, 0xf7, 0x5c, 0x35, 0x20, 0xd7, 0xa1, 0x13, 0xf1, 0x09, 0xfe, 0xac,
-	0xd2, 0x95, 0xb3, 0x1c, 0xcb, 0xb0, 0x55, 0x3d, 0x90, 0x2a, 0x20, 0x95, 0xc0, 0xf9, 0xa3, 0x01,
-	0x44, 0xb7, 0x18, 0x9f, 0xea, 0xc1, 0x1f, 0x09, 0x5b, 0x7f, 0x8f, 0x6e, 0x60, 0x19, 0x9e, 0x91,
-	0xcd, 0xdd, 0x2f, 0xe6, 0xa9, 0x5f, 0xda, 0xb7, 0x61, 0xd5, 0x67, 0x47, 0x54, 0x76, 0x43, 0xf3,
-	0x47, 0xee, 0x6b, 0x45, 0xd9, 0xb4, 0xbd, 0xf5, 0x2e, 0x74, 0xcb, 0xff, 0xd9, 0x48, 0x1f, 0x7a,
-	0xc3, 0x38, 0x10, 0xd8, 0x5e, 0x06, 0xf1, 0xa4, 0xff, 0x7f, 0xc4, 0x82, 0xf6, 0xf7, 0x18, 0x0d,
-	0xc5, 0xf1, 0xb4, 0x6f, 0x90, 0x1e, 0x74, 0xee, 0x8f, 0xe2, 0x24, 0x8b, 0x68, 0xd8, 0x6f, 0x3c,
-	0x78, 0xe7, 0x47, 0xdf, 0x98, 0x04, 0xe2, 0x38, 0x1f, 0x49, 0x4f, 0xb6, 0x95, 0x6b, 0x5f, 0x0d,
-	0x12, 0xfd, 0xb5, 0x5d, 0x44, 0x6d, 0x1b, 0xbd, 0x2d, 0x87, 0xe9, 0x68, 0xb4, 0x84, 0x92, 0xb7,
-	0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0x62, 0xb9, 0xd2, 0xdf, 0x8d, 0x1c, 0x00, 0x00,
+	0x28, 0x55, 0xf7, 0x68, 0xd3, 0xad, 0x49, 0xe4, 0xdd, 0x9d, 0x25, 0xcf, 0x86, 0x03, 0x6e, 0x5b,
+	0x1b, 0xa6, 0x6c, 0xe2, 0xd4, 0x88, 0x7c, 0x1d, 0x3a, 0x59, 0xf2, 0xcc, 0xf3, 0xa9, 0xa0, 0x76,
+	0x0f, 0x83, 0xb7, 0xbe, 0x10, 0xec, 0x87, 0x61, 0x32, 0x72, 0xdb, 0x59, 0xf2, 0x6c, 0x40, 0x05,
+	0x75, 0x7e, 0xdf, 0x84, 0xe5, 0x03, 0x46, 0xb3, 0xf1, 0xd1, 0xe5, 0x03, 0xf6, 0x15, 0xe8, 0x67,
+	0x8c, 0xe7, 0xa1, 0xf0, 0xc6, 0xea, 0x9a, 0x1f, 0x0e, 0x74, 0xdc, 0xae, 0x28, 0xf9, 0x4e, 0x21,
+	0x2e, 0x41, 0x35, 0xcf, 0x00, 0xb5, 0xb9, 0x00, 0x54, 0x07, 0x7a, 0x35, 0x04, 0xb9, 0xdd, 0x42,
+	0xd7, 0x67, 0x64, 0xa4, 0x0f, 0xa6, 0xcf, 0x43, 0x8c, 0x57, 0xd7, 0x95, 0x9f, 0xe4, 0x0e, 0xac,
+	0xa6, 0x21, 0x1d, 0xb3, 0xa3, 0x24, 0xf4, 0x59, 0xe6, 0x4d, 0xb2, 0x24, 0x4f, 0x31, 0x66, 0x3d,
+	0xb7, 0x5f, 0x53, 0x3c, 0x92, 0x72, 0xf2, 0x0e, 0x74, 0x7c, 0x1e, 0x7a, 0x62, 0x9a, 0x32, 0x0c,
+	0xda, 0xca, 0x29, 0xbe, 0x0f, 0x78, 0xf8, 0x64, 0x9a, 0x32, 0xb7, 0xed, 0xab, 0x0f, 0x72, 0x0f,
+	0xd6, 0x38, 0xcb, 0x02, 0x1a, 0x06, 0x9f, 0x30, 0xdf, 0x63, 0xcf, 0xd3, 0xcc, 0x4b, 0x43, 0x1a,
+	0x63, 0x64, 0x7b, 0x2e, 0xa9, 0x74, 0xef, 0x3f, 0x4f, 0xb3, 0xfd, 0x90, 0xc6, 0x64, 0x13, 0xfa,
+	0x49, 0x2e, 0xd2, 0x5c, 0x78, 0x98, 0x7d, 0xdc, 0x0b, 0x7c, 0x0c, 0xb4, 0xe9, 0xae, 0x28, 0xf9,
+	0x77, 0x51, 0x3c, 0xf4, 0x25, 0xb4, 0x22, 0xa3, 0xc7, 0x2c, 0xf4, 0x4a, 0x06, 0xd8, 0xd6, 0x86,
+	0xb1, 0xd9, 0x74, 0xaf, 0x28, 0xf9, 0x93, 0x42, 0x4c, 0xb6, 0xe0, 0xea, 0x24, 0xa7, 0x19, 0x8d,
+	0x05, 0x63, 0x35, 0xeb, 0x1e, 0x5a, 0x93, 0x52, 0x55, 0x4d, 0xb8, 0x03, 0xab, 0xd2, 0x2c, 0xc9,
+	0x45, 0xcd, 0x7c, 0x19, 0xcd, 0xfb, 0x5a, 0x51, 0x1a, 0x3b, 0xbf, 0xaa, 0xf1, 0x44, 0x86, 0x94,
+	0x5f, 0x82, 0x27, 0x97, 0x69, 0xfd, 0x17, 0x92, 0xcb, 0x5c, 0x4c, 0xae, 0xdb, 0x60, 0x45, 0x4c,
+	0x64, 0xc1, 0x58, 0x05, 0x51, 0x65, 0x3f, 0x28, 0x11, 0x46, 0xea, 0x36, 0x58, 0x71, 0x1e, 0x79,
+	0x1f, 0xe7, 0x2c, 0x0b, 0x18, 0xd7, 0xc5, 0x13, 0xe2, 0x3c, 0xfa, 0x81, 0x92, 0x90, 0xab, 0xd0,
+	0x12, 0x49, 0xea, 0x3d, 0x2d, 0x92, 0x5e, 0x24, 0xe9, 0x63, 0xf2, 0x6d, 0xb8, 0xc1, 0x19, 0x0d,
+	0x99, 0xef, 0x95, 0x49, 0xca, 0x3d, 0x8e, 0x58, 0x30, 0xdf, 0x6e, 0x63, 0xdc, 0x6c, 0x65, 0x71,
+	0x50, 0x1a, 0x1c, 0x68, 0xbd, 0x0c, 0x4b, 0x79, 0xf0, 0xda, 0xb4, 0x0e, 0xf6, 0xc7, 0xa4, 0x52,
+	0x95, 0x13, 0xde, 0x05, 0x7b, 0x12, 0x26, 0x23, 0x1a, 0x7a, 0x27, 0x76, 0xc5, 0x46, 0xdc, 0x74,
+	0xaf, 0x2b, 0xfd, 0xc1, 0xdc, 0x96, 0xd2, 0x3d, 0x1e, 0x06, 0x63, 0xe6, 0x7b, 0xa3, 0x30, 0x19,
+	0xd9, 0x80, 0xfc, 0x03, 0x25, 0x92, 0x59, 0x2f, 0x79, 0xa7, 0x0d, 0x24, 0x0c, 0xe3, 0x24, 0x8f,
+	0x05, 0xb2, 0xc9, 0x74, 0x57, 0x94, 0x7c, 0x2f, 0x8f, 0x76, 0xa4, 0x94, 0xbc, 0x01, 0xcb, 0xda,
+	0x32, 0x39, 0x3c, 0xe4, 0x4c, 0x20, 0x8d, 0x4c, 0xb7, 0xa7, 0x84, 0xdf, 0x47, 0x99, 0xf3, 0x47,
+	0x13, 0xae, 0xb8, 0x12, 0x5d, 0x76, 0xcc, 0xfe, 0xe7, 0xab, 0xc7, 0x69, 0x59, 0xbc, 0x74, 0xa1,
+	0x2c, 0x6e, 0x9f, 0x3b, 0x8b, 0x3b, 0x17, 0xca, 0xe2, 0xee, 0xc5, 0xb2, 0x18, 0x4e, 0xc9, 0xe2,
+	0x3f, 0xcf, 0x44, 0xec, 0x65, 0xcd, 0xe3, 0xb7, 0xc0, 0x0c, 0x7c, 0xd5, 0x9a, 0x59, 0xdb, 0xf6,
+	0xec, 0xe2, 0xfa, 0x09, 0x6d, 0x38, 0xe0, 0xae, 0x34, 0x22, 0xf7, 0xc1, 0xd2, 0xe8, 0xe3, 0xc5,
+	0xd7, 0xc2, 0x8b, 0xef, 0xb5, 0x85, 0x73, 0x30, 0x1c, 0xf2, 0xd2, 0x73, 0x55, 0x6b, 0xc5, 0xe5,
+	0x37, 0xf9, 0x0e, 0xdc, 0x3c, 0x99, 0xdd, 0x99, 0xc6, 0xc8, 0xb7, 0x97, 0x30, 0xa0, 0xeb, 0xf3,
+	0xe9, 0x5d, 0x80, 0xe8, 0x93, 0xaf, 0xc1, 0x5a, 0x2d, 0xbf, 0xab, 0x89, 0x6d, 0xf5, 0x9b, 0xb9,
+	0xd2, 0x55, 0x53, 0xce, 0xca, 0xf0, 0xce, 0x59, 0x19, 0xee, 0xfc, 0xab, 0x01, 0xcb, 0x03, 0x16,
+	0x32, 0xc1, 0xbe, 0x68, 0xaf, 0x4e, 0x6d, 0xaf, 0x5e, 0x87, 0x5e, 0x9a, 0x05, 0x11, 0xcd, 0xa6,
+	0xde, 0x53, 0x36, 0x2d, 0x8a, 0xa6, 0xa5, 0x65, 0x8f, 0xd9, 0x94, 0xbf, 0xa8, 0xc7, 0x72, 0xfe,
+	0x6d, 0x40, 0xf7, 0x83, 0x84, 0xfa, 0xf8, 0x33, 0xe0, 0x92, 0x18, 0x97, 0x1d, 0x5e, 0x63, 0xbe,
+	0xc3, 0xbb, 0x05, 0x55, 0x27, 0xaf, 0x51, 0xae, 0xb5, 0xf6, 0xb5, 0x16, 0xbd, 0x39, 0xdb, 0xa2,
+	0xdf, 0x06, 0x2b, 0x90, 0x07, 0xf2, 0x52, 0x2a, 0x8e, 0x54, 0x15, 0xeb, 0xba, 0x80, 0xa2, 0x7d,
+	0x29, 0x91, 0x3d, 0x7c, 0x61, 0x80, 0x3d, 0xfc, 0xd2, 0xb9, 0x7b, 0x78, 0xbd, 0x08, 0xf6, 0xf0,
+	0x7f, 0x6b, 0x80, 0xad, 0x39, 0x57, 0x3d, 0x63, 0x7e, 0x98, 0xfa, 0xf8, 0x9a, 0x7a, 0x0b, 0xba,
+	0x25, 0x1f, 0xf5, 0x2b, 0x62, 0x25, 0x90, 0xb8, 0xee, 0xb2, 0x28, 0xc9, 0xa6, 0x07, 0xc1, 0x27,
+	0x4c, 0x3b, 0x5e, 0x93, 0x48, 0xdf, 0xf6, 0xf2, 0xc8, 0x4d, 0x9e, 0x71, 0x5d, 0xc3, 0x8b, 0xa1,
+	0xf4, 0x6d, 0x8c, 0xbf, 0xbc, 0xb0, 0x8a, 0xa1, 0xe7, 0x4d, 0x17, 0x94, 0x48, 0xd6, 0x2f, 0xb2,
+	0x0e, 0x1d, 0x16, 0xfb, 0x4a, 0xdb, 0x42, 0x6d, 0x9b, 0xc5, 0x3e, 0xaa, 0x86, 0xb0, 0xa2, 0x9f,
+	0x2f, 0x13, 0x8e, 0x24, 0x40, 0x52, 0x59, 0xdb, 0xce, 0x29, 0x6f, 0xc6, 0xbb, 0x7c, 0xb2, 0xaf,
+	0x2d, 0xdd, 0x65, 0xf5, 0x82, 0xa9, 0x87, 0xe4, 0x7d, 0xe8, 0xc9, 0x5d, 0xca, 0x85, 0xda, 0xe7,
+	0x5e, 0xc8, 0x62, 0xb1, 0x5f, 0x0c, 0x9c, 0x5f, 0x1b, 0xb0, 0x7a, 0x02, 0xc2, 0x4b, 0xf0, 0xe8,
+	0x31, 0x74, 0x0e, 0xd8, 0x44, 0x2e, 0x51, 0x3c, 0xca, 0x6e, 0x9d, 0xf6, 0xc6, 0x7f, 0x4a, 0xc0,
+	0xdc, 0x72, 0x01, 0xe7, 0xa7, 0x06, 0x00, 0x12, 0x1a, 0x87, 0x27, 0xc8, 0x62, 0x5c, 0x86, 0x2c,
+	0xf2, 0xda, 0x94, 0xbd, 0x44, 0xc6, 0x42, 0x2a, 0xaa, 0x4a, 0xc6, 0x75, 0xec, 0x49, 0x9c, 0x47,
+	0xae, 0x52, 0xe9, 0x03, 0x72, 0xe7, 0x97, 0x06, 0x00, 0x96, 0x62, 0x75, 0x8c, 0xf9, 0x9c, 0x37,
+	0xce, 0xfe, 0xd5, 0xda, 0x98, 0x4d, 0x89, 0x87, 0x45, 0x4a, 0x70, 0xc4, 0xc8, 0x5c, 0xe4, 0x43,
+	0x89, 0x51, 0xe5, 0xbc, 0xce, 0x1a, 0x85, 0xcb, 0x6f, 0x0c, 0xe8, 0xd5, 0xe0, 0xe3, 0xb3, 0xd9,
+	0x6b, 0xcc, 0x67, 0x2f, 0x76, 0x99, 0x92, 0xd1, 0x1e, 0xaf, 0x91, 0x3c, 0xaa, 0x48, 0xbe, 0x0e,
+	0x1d, 0x84, 0xa4, 0xc6, 0xf2, 0x58, 0xb3, 0xfc, 0x0e, 0xac, 0x66, 0x6c, 0xcc, 0x62, 0x11, 0x4e,
+	0xbd, 0x28, 0xf1, 0x83, 0xc3, 0x80, 0xf9, 0xc8, 0xf5, 0x8e, 0xdb, 0x2f, 0x14, 0xbb, 0x5a, 0xee,
+	0xfc, 0xc3, 0x80, 0x15, 0xd9, 0x98, 0x4e, 0xf7, 0x12, 0x9f, 0xa9, 0x93, 0x5d, 0x9c, 0x41, 0xef,
+	0xa1, 0x2f, 0x1a, 0x1e, 0x45, 0xa1, 0x37, 0x5e, 0x4c, 0x21, 0xee, 0x76, 0xb8, 0xa6, 0x8d, 0x84,
+	0x58, 0xbd, 0x44, 0x9c, 0x07, 0xe2, 0x2a, 0xb0, 0xfa, 0x92, 0x55, 0x10, 0xff, 0xc4, 0x00, 0xab,
+	0x96, 0x2c, 0xb2, 0x44, 0xeb, 0x8b, 0x51, 0xdd, 0x10, 0x06, 0x16, 0x41, 0x6b, 0x5c, 0xbd, 0x12,
+	0x93, 0x35, 0x68, 0x45, 0x7c, 0xa2, 0x23, 0xde, 0x73, 0xd5, 0x80, 0xdc, 0x80, 0x4e, 0xc4, 0x27,
+	0xf8, 0x83, 0x4d, 0x57, 0xce, 0x72, 0x2c, 0xc3, 0x56, 0x75, 0x40, 0xaa, 0x80, 0x54, 0x02, 0xe7,
+	0x4f, 0x06, 0x10, 0xdd, 0x62, 0x7c, 0xaa, 0xbf, 0x12, 0x90, 0xb0, 0xf5, 0x97, 0xee, 0x06, 0x96,
+	0xe1, 0x19, 0xd9, 0xdc, 0xfd, 0x62, 0x9e, 0xf8, 0x0d, 0x7f, 0x07, 0x56, 0x7d, 0x76, 0x48, 0x65,
+	0x37, 0x34, 0x7f, 0xe4, 0xbe, 0x56, 0x94, 0x4d, 0xdb, 0x5b, 0xef, 0x42, 0xb7, 0xfc, 0x07, 0x8f,
+	0xf4, 0xa1, 0x37, 0x8c, 0x03, 0x81, 0xbd, 0x68, 0x10, 0x4f, 0xfa, 0xff, 0x47, 0x2c, 0x68, 0x7f,
+	0x8f, 0xd1, 0x50, 0x1c, 0x4d, 0xfb, 0x06, 0xe9, 0x41, 0xe7, 0xc1, 0x28, 0x4e, 0xb2, 0x88, 0x86,
+	0xfd, 0xc6, 0xc3, 0x77, 0x7e, 0xf4, 0x8d, 0x49, 0x20, 0x8e, 0xf2, 0x91, 0xf4, 0x64, 0x4b, 0xb9,
+	0xf6, 0xd5, 0x20, 0xd1, 0x5f, 0x5b, 0x45, 0xd4, 0xb6, 0xd0, 0xdb, 0x72, 0x98, 0x8e, 0x46, 0x4b,
+	0x28, 0x79, 0xfb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x60, 0x9d, 0x07, 0x94, 0xe7, 0x1c, 0x00,
+	0x00,
 }

internal/proxy/task.go

@@ -30,9 +30,9 @@ import (
 	"strings"
 	"unsafe"
 
+	"github.com/golang/protobuf/proto"
 	"go.uber.org/zap"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/milvus-io/milvus/internal/allocator"
 	"github.com/milvus-io/milvus/internal/common"
 	"github.com/milvus-io/milvus/internal/log"
@@ -51,6 +51,7 @@ import (
 	"github.com/milvus-io/milvus/internal/util/indexparamcheck"
 	"github.com/milvus-io/milvus/internal/util/timerecord"
 	"github.com/milvus-io/milvus/internal/util/trace"
+	"github.com/milvus-io/milvus/internal/util/tsoutil"
 	"github.com/milvus-io/milvus/internal/util/typeutil"
 )
 
@@ -1575,6 +1576,10 @@ func (st *searchTask) PreExecute(ctx context.Context) error {
 	}
 	st.SearchRequest.TravelTimestamp = travelTimestamp
 	st.SearchRequest.GuaranteeTimestamp = guaranteeTimestamp
+	deadline, ok := st.TraceCtx().Deadline()
+	if ok {
+		st.SearchRequest.TimeoutTimestamp = tsoutil.ComposeTSByTime(deadline, 0)
+	}
 
 	st.SearchRequest.ResultChannelID = Params.SearchResultChannelNames[0]
 	st.SearchRequest.DbID = 0 // todo
@@ -1671,6 +1676,7 @@ func (st *searchTask) Execute(ctx context.Context) error {
 		zap.Any("collectionID", st.CollectionID),
 		zap.Any("msgID", tsMsg.ID()),
 		zap.Int("length of search msg", len(msgPack.Msgs)),
+		zap.Any("timeoutTs", st.SearchRequest.TimeoutTimestamp),
 	)
 	return err
 }
@@ -2175,6 +2181,10 @@ func (qt *queryTask) PreExecute(ctx context.Context) error {
 	}
 	qt.TravelTimestamp = travelTimestamp
 	qt.GuaranteeTimestamp = guaranteeTimestamp
+	deadline, ok := qt.TraceCtx().Deadline()
+	if ok {
+		qt.RetrieveRequest.TimeoutTimestamp = tsoutil.ComposeTSByTime(deadline, 0)
+	}
 
 	qt.ResultChannelID = Params.RetrieveResultChannelNames[0]
 	qt.DbID = 0 // todo(yukun)
@@ -2255,7 +2265,12 @@ func (qt *queryTask) Execute(ctx context.Context) error {
 		}
 	}
 	err = stream.Produce(&msgPack)
-	log.Debug("proxy", zap.Int("length of retrieveMsg", len(msgPack.Msgs)))
+	log.Debug("proxy sent one retrieveMsg",
+		zap.Any("collectionID", qt.CollectionID),
+		zap.Any("msgID", tsMsg.ID()),
+		zap.Int("length of search msg", len(msgPack.Msgs)),
+		zap.Any("timeoutTs", qt.RetrieveRequest.TimeoutTimestamp),
+	)
 	if err != nil {
 		log.Debug("Failed to send retrieve request.",
 			zap.Any("requestID", qt.Base.MsgID), zap.Any("requestType", "query"))

internal/proxy/task_test.go

@@ -29,9 +29,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/milvus-io/milvus/internal/allocator"
-
 	"github.com/golang/protobuf/proto"
+	"github.com/stretchr/testify/assert"
+
+	"github.com/milvus-io/milvus/internal/allocator"
 	"github.com/milvus-io/milvus/internal/common"
 	"github.com/milvus-io/milvus/internal/log"
 	"github.com/milvus-io/milvus/internal/msgstream"
@@ -42,8 +43,8 @@ import (
 	"github.com/milvus-io/milvus/internal/proto/schemapb"
 	"github.com/milvus-io/milvus/internal/util/distance"
 	"github.com/milvus-io/milvus/internal/util/funcutil"
+	"github.com/milvus-io/milvus/internal/util/typeutil"
 	"github.com/milvus-io/milvus/internal/util/uniquegenerator"
-	"github.com/stretchr/testify/assert"
 )
 
 // TODO(dragondriver): add more test cases
@@ -3010,6 +3011,16 @@ func TestSearchTask_PreExecute(t *testing.T) {
 		},
 	}
 
+	// search task with timeout
+	ctx1, cancel := context.WithTimeout(ctx, time.Second)
+	defer cancel()
+	// before preExecute
+	assert.Equal(t, typeutil.ZeroTimestamp, task.TimeoutTimestamp)
+	task.ctx = ctx1
+	assert.NoError(t, task.PreExecute(ctx))
+	// after preExecute
+	assert.Greater(t, task.TimeoutTimestamp, typeutil.ZeroTimestamp)
+
 	// field not exist
 	task.query.OutputFields = []string{int64Field + funcutil.GenRandomStr()}
 	assert.Error(t, task.PreExecute(ctx))
@@ -3467,7 +3478,18 @@ func TestQueryTask_all(t *testing.T) {
 	}()
 
 	assert.NoError(t, task.OnEnqueue())
+
+	// test query task with timeout
+	ctx1, cancel1 := context.WithTimeout(ctx, 10*time.Second)
+	defer cancel1()
+	// before preExecute
+	assert.Equal(t, typeutil.ZeroTimestamp, task.TimeoutTimestamp)
+	task.ctx = ctx1
 	assert.NoError(t, task.PreExecute(ctx))
+	// after preExecute
+	assert.Greater(t, task.TimeoutTimestamp, typeutil.ZeroTimestamp)
+	task.ctx = ctx
+
 	assert.NoError(t, task.Execute(ctx))
 	assert.NoError(t, task.PostExecute(ctx))
 

internal/querynode/query_collection.go

@@ -44,6 +44,7 @@ type queryMsg interface {
 	msgstream.TsMsg
 	GuaranteeTs() Timestamp
 	TravelTs() Timestamp
+	TimeoutTs() Timestamp
 }
 
 type queryCollection struct {
@@ -299,6 +300,21 @@ func (q *queryCollection) setServiceableTime(t Timestamp) {
 	q.serviceableTime = t
 }
 
+func (q *queryCollection) checkTimeout(msg queryMsg) bool {
+	curTime := tsoutil.GetCurrentTime()
+	//curTimePhysical, _ := tsoutil.ParseTS(curTime)
+	//timeoutTsPhysical, _ := tsoutil.ParseTS(msg.TimeoutTs())
+	//log.Debug("check if query timeout",
+	//	zap.Any("collectionID", q.collectionID),
+	//	zap.Any("msgID", msg.ID()),
+	//	zap.Any("TimeoutTs", msg.TimeoutTs()),
+	//	zap.Any("curTime", curTime),
+	//	zap.Any("timeoutTsPhysical", timeoutTsPhysical),
+	//	zap.Any("curTimePhysical", curTimePhysical),
+	//)
+	return msg.TimeoutTs() > typeutil.ZeroTimestamp && curTime >= msg.TimeoutTs()
+}
+
 func (q *queryCollection) consumeQuery() {
 	for {
 		select {
@@ -427,6 +443,17 @@ func (q *queryCollection) receiveQueryMsg(msg queryMsg) error {
 	msg.SetTraceCtx(ctx)
 	tr := timerecord.NewTimeRecorder(fmt.Sprintf("receiveQueryMsg %d", msg.ID()))
 
+	if q.checkTimeout(msg) {
+		err := errors.New(fmt.Sprintln("do query failed in receiveQueryMsg because timeout"+
+			", collectionID = ", collectionID,
+			", msgID = ", msg.ID()))
+		publishErr := q.publishFailedQueryResult(msg, err.Error())
+		if publishErr != nil {
+			return fmt.Errorf("first err = %s, second err = %s", err, publishErr)
+		}
+		return err
+	}
+
 	// check if collection has been released
 	collection, err := q.historical.replica.getCollectionByID(collectionID)
 	if err != nil {
@@ -561,6 +588,19 @@ func (q *queryCollection) doUnsolvedQueryMsg() {
 					zap.Any("guaranteeTime_l", guaranteeTs),
 					zap.Any("serviceTime_l", serviceTime),
 				)
+
+				if q.checkTimeout(m) {
+					err := errors.New(fmt.Sprintln("do query failed in doUnsolvedQueryMsg because timeout"+
+						", collectionID = ", q.collectionID,
+						", msgID = ", m.ID()))
+					log.Warn(err.Error())
+					publishErr := q.publishFailedQueryResult(m, err.Error())
+					if publishErr != nil {
+						log.Error(publishErr.Error())
+					}
+					continue
+				}
+
 				if guaranteeTs <= q.getServiceableTime() {
 					unSolvedMsg = append(unSolvedMsg, m)
 					continue
@@ -1370,10 +1410,5 @@ func (q *queryCollection) publishFailedQueryResult(msg msgstream.TsMsg, errMsg s
 		return fmt.Errorf("publish invalid msgType %d", msgType)
 	}
 
-	err := q.queryResultMsgStream.Produce(&msgPack)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return q.queryResultMsgStream.Produce(&msgPack)
 }

internal/querynode/query_collection_test.go

@@ -308,6 +308,13 @@ func TestQueryCollection_consumeQuery(t *testing.T) {
 		msg.Base.MsgType = commonpb.MsgType_CreateCollection
 		runConsumeQuery(msg)
 	})
+
+	t.Run("consume timeout msg", func(t *testing.T) {
+		msg, err := genSimpleRetrieveMsg()
+		assert.NoError(t, err)
+		msg.TimeoutTimestamp = tsoutil.GetCurrentTime() - Timestamp(time.Second<<18)
+		runConsumeQuery(msg)
+	})
 }
 
 func TestQueryCollection_TranslateHits(t *testing.T) {
@@ -557,19 +564,38 @@ func TestQueryCollection_mergeRetrieveResults(t *testing.T) {
 func TestQueryCollection_doUnsolvedQueryMsg(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 
-	queryCollection, err := genSimpleQueryCollection(ctx, cancel)
-	assert.NoError(t, err)
+	t.Run("test doUnsolvedQueryMsg", func(t *testing.T) {
+		queryCollection, err := genSimpleQueryCollection(ctx, cancel)
+		assert.NoError(t, err)
 
-	timestamp := Timestamp(1000)
-	updateTSafe(queryCollection, timestamp)
+		timestamp := Timestamp(1000)
+		updateTSafe(queryCollection, timestamp)
 
-	go queryCollection.doUnsolvedQueryMsg()
+		go queryCollection.doUnsolvedQueryMsg()
 
-	msg, err := genSimpleSearchMsg()
-	assert.NoError(t, err)
-	queryCollection.addToUnsolvedMsg(msg)
+		msg, err := genSimpleSearchMsg()
+		assert.NoError(t, err)
+		queryCollection.addToUnsolvedMsg(msg)
 
-	time.Sleep(200 * time.Millisecond)
+		time.Sleep(200 * time.Millisecond)
+	})
+
+	t.Run("test doUnsolvedQueryMsg timeout", func(t *testing.T) {
+		queryCollection, err := genSimpleQueryCollection(ctx, cancel)
+		assert.NoError(t, err)
+
+		timestamp := Timestamp(1000)
+		updateTSafe(queryCollection, timestamp)
+
+		go queryCollection.doUnsolvedQueryMsg()
+
+		msg, err := genSimpleSearchMsg()
+		assert.NoError(t, err)
+		msg.TimeoutTimestamp = tsoutil.GetCurrentTime() - Timestamp(time.Second<<18)
+		queryCollection.addToUnsolvedMsg(msg)
+
+		time.Sleep(2000 * time.Millisecond)
+	})
 }
 
 func TestQueryCollection_search(t *testing.T) {

internal/util/tsoutil/tso.go

@@ -16,6 +16,8 @@ import (
 	"time"
 
 	etcdkv "github.com/milvus-io/milvus/internal/kv/etcd"
+
+	"github.com/milvus-io/milvus/internal/util/typeutil"
 )
 
 const (
@@ -28,6 +30,16 @@ func ComposeTS(physical, logical int64) uint64 {
 	return uint64((physical << logicalBits) + logical)
 }
 
+// ComposeTSByTime returns a timestamp composed of physical time.Time and logical time
+func ComposeTSByTime(physical time.Time, logical int64) uint64 {
+	return ComposeTS(physical.UnixNano()/int64(time.Millisecond), logical)
+}
+
+// GetCurrentTime returns the current timestamp
+func GetCurrentTime() typeutil.Timestamp {
+	return ComposeTSByTime(time.Now(), 0)
+}
+
 // ParseTS parses the ts to (physical,logical).
 func ParseTS(ts uint64) (time.Time, uint64) {
 	logical := ts & logicalBitsMask

internal/util/tsoutil/tso_test.go

@@ -15,8 +15,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/milvus-io/milvus/internal/log"
+	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
+
+	"github.com/milvus-io/milvus/internal/log"
+	"github.com/milvus-io/milvus/internal/util/typeutil"
 )
 
 func TestParseHybridTs(t *testing.T) {
@@ -28,3 +31,22 @@ func TestParseHybridTs(t *testing.T) {
 		zap.Int64("logical", logical),
 		zap.Any("physical time", physicalTime))
 }
+
+func Test_Tso(t *testing.T) {
+	t.Run("test ComposeTSByTime", func(t *testing.T) {
+		physical := time.Now()
+		logical := int64(1000)
+		timestamp := ComposeTSByTime(physical, logical)
+		pRes, lRes := ParseTS(timestamp)
+		assert.Equal(t, physical.Unix(), pRes.Unix())
+		assert.Equal(t, uint64(logical), lRes)
+	})
+
+	t.Run("test GetCurrentTime", func(t *testing.T) {
+		curTime := GetCurrentTime()
+		p, l := ParseTS(curTime)
+		subTime := time.Since(p)
+		assert.Less(t, subTime, time.Millisecond)
+		assert.Equal(t, typeutil.ZeroTimestamp, l)
+	})
+}