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

Jump to bottom

fix(bigquery): address possible panic due to offset checking in handleInsertErrors #3524

Merged
merged 8 commits into from Jan 12, 2021
Merged

fix(bigquery): address possible panic due to offset checking in handleInsertErrors #3524

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e94c9a
fix: address possible panic due to offset checking in handleInsertErrors
shollyman Jan 11, 2021
5730953
refine error testing
shollyman Jan 11, 2021
2eea074
simplify type assertion
shollyman Jan 11, 2021
a95b72c
simplify test cases
shollyman Jan 11, 2021
f2f92c5
Merge branch 'master' into issue-3519-inserterrors
shollyman Jan 12, 2021
1d1a456
Merge branch 'master' into issue-3519-inserterrors
shollyman Jan 12, 2021
bc1b6b9
Merge branch 'master' into issue-3519-inserterrors
shollyman Jan 12, 2021
1cc75fc
Merge branch 'master' into issue-3519-inserterrors
shollyman Jan 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion bigquery/inserter.go
View file
Open in desktop
Expand Up @@ -229,7 +229,7 @@ func handleInsertErrors(ierrs []*bq.TableDataInsertAllResponseInsertErrors, rows
}
var errs PutMultiError
for _, e := range ierrs {
if int(e.Index) > len(rows) {
if int(e.Index) >= len(rows) {
return fmt.Errorf("internal error: unexpected row index: %v", e.Index)
}
rie := RowInsertionError{
Expand Down
43 changes: 33 additions & 10 deletions bigquery/inserter_test.go
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ package bigquery

import (
"errors"
"fmt"
"strconv"
"testing"

Expand Down Expand Up @@ -113,22 +114,27 @@ func TestHandleInsertErrors(t *testing.T) {
{InsertId: "b"},
}
for _, test := range []struct {
in []*bq.TableDataInsertAllResponseInsertErrors
want error
description string
in []*bq.TableDataInsertAllResponseInsertErrors
want error
}{
{
in: nil,
want: nil,
description: "nil error",
in: nil,
want: nil,
},
{
in: []*bq.TableDataInsertAllResponseInsertErrors{{Index: 1}},
want: PutMultiError{RowInsertionError{InsertID: "b", RowIndex: 1}},
description: "single error last row",
in: []*bq.TableDataInsertAllResponseInsertErrors{{Index: 1}},
want: PutMultiError{RowInsertionError{InsertID: "b", RowIndex: 1}},
},
{
in: []*bq.TableDataInsertAllResponseInsertErrors{{Index: 1}},
want: PutMultiError{RowInsertionError{InsertID: "b", RowIndex: 1}},
description: "single error first row",
in: []*bq.TableDataInsertAllResponseInsertErrors{{Index: 0}},
want: PutMultiError{RowInsertionError{InsertID: "a", RowIndex: 0}},
},
{
description: "errors with extended message",
in: []*bq.TableDataInsertAllResponseInsertErrors{
{Errors: []*bq.ErrorProto{{Message: "m0"}}, Index: 0},
{Errors: []*bq.ErrorProto{{Message: "m1"}}, Index: 1},
Expand All @@ -138,11 +144,28 @@ func TestHandleInsertErrors(t *testing.T) {
RowInsertionError{InsertID: "b", RowIndex: 1, Errors: []error{&Error{Message: "m1"}}},
},
},
{
description: "invalid index",
in: []*bq.TableDataInsertAllResponseInsertErrors{
{Errors: []*bq.ErrorProto{{Message: "m0"}}, Index: 2},
},
want: fmt.Errorf("internal error: unexpected row index: 2"),
},
} {
got := handleInsertErrors(test.in, rows)
if !testutil.Equal(got, test.want) {
t.Errorf("%#v:\ngot\n%#v\nwant\n%#v", test.in, got, test.want)
if _, ok := got.(PutMultiError); ok {
// compare structure of the PutMultiError
if !testutil.Equal(got, test.want) {
t.Errorf("(case: %s)\nin %#v\ngot\n%#v\nwant\n%#v", test.description, test.in, got, test.want)
}
continue
}

if got != nil && test.want != nil && got.Error() != test.want.Error() {
// check matching error messages
t.Errorf("(case: %s)\nin %#v:\ngot\n%#v\nwant\n%#v", test.description, test.in, got, test.want)
}

}
}

Expand Down