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

executor: handle \N as NULL in load data statement #6962

Merged
merged 5 commits into from
Jul 3, 2018
Merged

executor: handle \N as NULL in load data statement #6962

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ede4f90
executor: handle \N as NULL in load data statement (#6873)
jackysp Jun 29, 2018
26960d2
fix compile
jackysp Jul 3, 2018
0242a5e
fix ci
jackysp Jul 3, 2018
fc35165
Merge branch 'release-2.0' into asnull
zz-jason Jul 3, 2018
dbf07b9
Merge branch 'release-2.0' into asnull
zz-jason Jul 3, 2018
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
Prev Previous commit
Next Next commit
fix ci
  • Loading branch information
@jackysp
jackysp committed Jul 3, 2018
commit 0242a5ef057187f5d71ece1090bbf71b1935779d
20 changes: 10 additions & 10 deletions executor/write.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ func (e *LoadDataInfo) InsertData(prevData, curData []byte) ([]byte, bool, error
curData = nil
}

cols, err := getFieldsFromLine(line, e.FieldsInfo)
cols, err := e.getFieldsFromLine(line)
if err != nil {
return nil, false, errors.Trace(err)
}
Expand Down Expand Up @@ -620,19 +620,19 @@ type field struct {
}

// getFieldsFromLine splits line according to fieldsInfo.
func getFieldsFromLine(line []byte, fieldsInfo *ast.FieldsClause) ([]field, error) {
func (e *LoadDataInfo) getFieldsFromLine(line []byte) ([]field, error) {
var sep []byte
if fieldsInfo.Enclosed != 0 {
if line[0] != fieldsInfo.Enclosed || line[len(line)-1] != fieldsInfo.Enclosed {
return nil, errors.Errorf("line %s should begin and end with %c", string(line), fieldsInfo.Enclosed)
if e.FieldsInfo.Enclosed != 0 {
if line[0] != e.FieldsInfo.Enclosed || line[len(line)-1] != e.FieldsInfo.Enclosed {
return nil, errors.Errorf("line %s should begin and end with %c", string(line), e.FieldsInfo.Enclosed)
}
line = line[1 : len(line)-1]
sep = make([]byte, 0, len(fieldsInfo.Terminated)+2)
sep = append(sep, fieldsInfo.Enclosed)
sep = append(sep, fieldsInfo.Terminated...)
sep = append(sep, fieldsInfo.Enclosed)
sep = make([]byte, 0, len(e.FieldsInfo.Terminated)+2)
sep = append(sep, e.FieldsInfo.Enclosed)
sep = append(sep, e.FieldsInfo.Terminated...)
sep = append(sep, e.FieldsInfo.Enclosed)
} else {
sep = []byte(fieldsInfo.Terminated)
sep = []byte(e.FieldsInfo.Terminated)
}
rawCols := bytes.Split(line, sep)
fields := make([]field, 0, len(rawCols))
Expand Down