Skip to content

Commit 6eb73d1

Browse files
authored
fix: Fix import failed due to 0 row num (#39903)
pr: #39886 issue: #39885 Signed-off-by: zhenshan.cao <[email protected]>
1 parent ed1783c commit 6eb73d1

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

internal/datanode/importv2/task_import.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,12 @@ func (t *ImportTask) importFile(reader importutilv2.Reader) error {
185185
}
186186
return err
187187
}
188-
err = AppendSystemFieldsData(t, data)
188+
rowNum := GetInsertDataRowCount(data, t.GetSchema())
189+
if rowNum == 0 {
190+
log.Info("0 row was imported, the data may have been deleted", WrapLogFields(t)...)
191+
continue
192+
}
193+
err = AppendSystemFieldsData(t, data, rowNum)
189194
if err != nil {
190195
return err
191196
}

internal/datanode/importv2/util.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,12 @@ func CheckRowsEqual(schema *schemapb.CollectionSchema, data *storage.InsertData)
164164
return nil
165165
}
166166

167-
func AppendSystemFieldsData(task *ImportTask, data *storage.InsertData) error {
167+
func AppendSystemFieldsData(task *ImportTask, data *storage.InsertData, rowNum int) error {
168168
idRange := task.req.GetIDRange()
169169
pkField, err := typeutil.GetPrimaryFieldSchema(task.GetSchema())
170170
if err != nil {
171171
return err
172172
}
173-
rowNum := GetInsertDataRowCount(data, task.GetSchema())
174173
ids := make([]int64, rowNum)
175174
for i := 0; i < rowNum; i++ {
176175
ids[i] = idRange.GetBegin() + int64(i)

internal/datanode/importv2/util_test.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ func Test_AppendSystemFieldsData(t *testing.T) {
7373
assert.Equal(t, 0, insertData.Data[pkField.GetFieldID()].RowNum())
7474
assert.Nil(t, insertData.Data[common.RowIDField])
7575
assert.Nil(t, insertData.Data[common.TimeStampField])
76-
err = AppendSystemFieldsData(task, insertData)
76+
rowNum := GetInsertDataRowCount(insertData, task.GetSchema())
77+
err = AppendSystemFieldsData(task, insertData, rowNum)
7778
assert.NoError(t, err)
7879
assert.Equal(t, count, insertData.Data[pkField.GetFieldID()].RowNum())
7980
assert.Equal(t, count, insertData.Data[common.RowIDField].RowNum())
@@ -86,7 +87,8 @@ func Test_AppendSystemFieldsData(t *testing.T) {
8687
assert.Equal(t, 0, insertData.Data[pkField.GetFieldID()].RowNum())
8788
assert.Nil(t, insertData.Data[common.RowIDField])
8889
assert.Nil(t, insertData.Data[common.TimeStampField])
89-
err = AppendSystemFieldsData(task, insertData)
90+
rowNum = GetInsertDataRowCount(insertData, task.GetSchema())
91+
err = AppendSystemFieldsData(task, insertData, rowNum)
9092
assert.NoError(t, err)
9193
assert.Equal(t, count, insertData.Data[pkField.GetFieldID()].RowNum())
9294
assert.Equal(t, count, insertData.Data[common.RowIDField].RowNum())

0 commit comments

Comments
 (0)