Skip to content

Commit 476c7a1

Browse files
authored
fix: Partial update panic with TIMESTAMPTZ (#45741)
issue: #45729 pr: #45740 Signed-off-by: zhenshan.cao <[email protected]>
1 parent 9a34fb6 commit 476c7a1

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

pkg/util/typeutil/schema.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,6 +1120,8 @@ func DeleteFieldData(dst []*schemapb.FieldData) {
11201120
dstScalar.GetIntData().Data = dstScalar.GetIntData().Data[:len(dstScalar.GetIntData().Data)-1]
11211121
case *schemapb.ScalarField_LongData:
11221122
dstScalar.GetLongData().Data = dstScalar.GetLongData().Data[:len(dstScalar.GetLongData().Data)-1]
1123+
case *schemapb.ScalarField_TimestamptzData:
1124+
dstScalar.GetTimestamptzData().Data = dstScalar.GetTimestamptzData().Data[:len(dstScalar.GetTimestamptzData().Data)-1]
11231125
case *schemapb.ScalarField_FloatData:
11241126
dstScalar.GetFloatData().Data = dstScalar.GetFloatData().Data[:len(dstScalar.GetFloatData().Data)-1]
11251127
case *schemapb.ScalarField_DoubleData:
@@ -1439,6 +1441,16 @@ func MergeFieldData(dst []*schemapb.FieldData, src []*schemapb.FieldData) error
14391441
} else {
14401442
dstScalar.GetLongData().Data = append(dstScalar.GetLongData().Data, srcScalar.LongData.Data...)
14411443
}
1444+
case *schemapb.ScalarField_TimestamptzData:
1445+
if dstScalar.GetTimestamptzData() == nil {
1446+
dstScalar.Data = &schemapb.ScalarField_TimestamptzData{
1447+
TimestamptzData: &schemapb.TimestamptzArray{
1448+
Data: srcScalar.TimestamptzData.Data,
1449+
},
1450+
}
1451+
} else {
1452+
dstScalar.GetTimestamptzData().Data = append(dstScalar.GetTimestamptzData().Data, srcScalar.TimestamptzData.Data...)
1453+
}
14421454
case *schemapb.ScalarField_FloatData:
14431455
if dstScalar.GetFloatData() == nil {
14441456
dstScalar.Data = &schemapb.ScalarField_FloatData{

0 commit comments

Comments
 (0)