Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix import failed due to 0 row num #39886

Merged
merged 2 commits into from
Feb 14, 2025
Merged

fix: Fix import failed due to 0 row num #39886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad03474
fix: Fix import failed due to 0 row num
bigsheeper Feb 14, 2025
a21078b
fix
bigsheeper Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion internal/datanode/importv2/task_import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,12 @@
}
return err
}
err = AppendSystemFieldsData(t, data)
rowNum := GetInsertDataRowCount(data, t.GetSchema())
if rowNum == 0 {
log.Info("0 row was imported, the data may have been deleted", WrapLogFields(t)...)
continue

Check warning on line 197 in internal/datanode/importv2/task_import.go

View check run for this annotation

Codecov / codecov/patch

internal/datanode/importv2/task_import.go#L196-L197 

Added lines #L196 - L197 were not covered by tests
}
err = AppendSystemFieldsData(t, data, rowNum)
if err != nil {
return err
}
Expand Down
3 changes: 1 addition & 2 deletions internal/datanode/importv2/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,11 @@ func CheckRowsEqual(schema *schemapb.CollectionSchema, data *storage.InsertData)
return nil
}

func AppendSystemFieldsData(task *ImportTask, data *storage.InsertData) error {
func AppendSystemFieldsData(task *ImportTask, data *storage.InsertData, rowNum int) error {
pkField, err := typeutil.GetPrimaryFieldSchema(task.GetSchema())
if err != nil {
return err
}
rowNum := GetInsertDataRowCount(data, task.GetSchema())
ids := make([]int64, rowNum)
start, _, err := task.allocator.Alloc(uint32(rowNum))
if err != nil {
Expand Down
6 changes: 4 additions & 2 deletions internal/datanode/importv2/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ func Test_AppendSystemFieldsData(t *testing.T) {
assert.Equal(t, 0, insertData.Data[pkField.GetFieldID()].RowNum())
assert.Nil(t, insertData.Data[common.RowIDField])
assert.Nil(t, insertData.Data[common.TimeStampField])
err = AppendSystemFieldsData(task, insertData)
rowNum := GetInsertDataRowCount(insertData, task.GetSchema())
err = AppendSystemFieldsData(task, insertData, rowNum)
assert.NoError(t, err)
assert.Equal(t, count, insertData.Data[pkField.GetFieldID()].RowNum())
assert.Equal(t, count, insertData.Data[common.RowIDField].RowNum())
Expand All @@ -84,7 +85,8 @@ func Test_AppendSystemFieldsData(t *testing.T) {
assert.Equal(t, 0, insertData.Data[pkField.GetFieldID()].RowNum())
assert.Nil(t, insertData.Data[common.RowIDField])
assert.Nil(t, insertData.Data[common.TimeStampField])
err = AppendSystemFieldsData(task, insertData)
rowNum = GetInsertDataRowCount(insertData, task.GetSchema())
err = AppendSystemFieldsData(task, insertData, rowNum)
assert.NoError(t, err)
assert.Equal(t, count, insertData.Data[pkField.GetFieldID()].RowNum())
assert.Equal(t, count, insertData.Data[common.RowIDField].RowNum())
Expand Down
Loading