-
Notifications
You must be signed in to change notification settings - Fork 5.9k
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.
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
lightning: introduce param to skip CSV header parsing #41128
Merged
Merged
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
ff6630a
lightning: introduce param to skip CSV header parsing
dsdashun f0a5e08
Merge branch 'master' into fix-40839
dsdashun 9e3e936
Merge branch 'master' into fix-40839
dsdashun 990b69f
change the parameter for a better name
dsdashun 29c66b4
Merge remote-tracking branch 'origin/master' into csv_skip_header
dsdashun 4d73b03
Merge branch 'master' into fix-40839
dsdashun 7a086d1
Merge branch 'master' into fix-40839
dsdashun File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
br/tests/lightning_config_skip_csv_header/data/mytest.testtbl-schema.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
CREATE TABLE testtbl ( | ||
id INTEGER PRIMARY KEY, | ||
val1 VARCHAR(40) NOT NULL, | ||
INDEX `idx_val1` (`val1`) | ||
); |
6 changes: 6 additions & 0 deletions
6
br/tests/lightning_config_skip_csv_header/data/mytest.testtbl.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
aaa,bbb | ||
1,"aaa01" | ||
2,"aaa01" | ||
3,"aaa02" | ||
4,"aaa02" | ||
5,"aaa05" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
[lightning] | ||
check-requirements=true | ||
|
||
[mydumper.csv] | ||
header = true | ||
skip-header = false | ||
|
||
[tikv-importer] | ||
duplicate-resolution = 'remove' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
[lightning] | ||
check-requirements=true | ||
|
||
[mydumper.csv] | ||
header = true | ||
skip-header = true | ||
|
||
[tikv-importer] | ||
duplicate-resolution = 'remove' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
#!/bin/bash | ||
# | ||
# Copyright 2023 PingCAP, Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
set -eux | ||
|
||
mydir=$(dirname "${BASH_SOURCE[0]}") | ||
|
||
data_file="${mydir}/data/mytest.testtbl.csv" | ||
|
||
total_row_count=$( sed '1d' "${data_file}" | wc -l | xargs echo ) | ||
|
||
run_sql 'DROP TABLE IF EXISTS mytest.testtbl' | ||
|
||
console_output_file="/tmp/${TEST_NAME}.out" | ||
|
||
run_lightning --backend tidb --config "${mydir}/err_config.toml" 2>&1 | tee "${console_output_file}" | ||
if [[ ${PIPESTATUS[0]} -eq 0 ]]; then | ||
echo "The lightning import doesn't fail as expected" >&2 | ||
exit 1 | ||
fi | ||
|
||
grep -q "Lightning:Restore:ErrUnknownColumns" "${console_output_file}" | ||
|
||
# import a second time | ||
|
||
run_sql 'DROP TABLE IF EXISTS mytest.testtbl' | ||
|
||
run_lightning --backend tidb --config "${mydir}/normal_config.toml" | ||
|
||
run_sql 'SELECT * FROM mytest.testtbl' | ||
run_sql 'SELECT COUNT(*) FROM mytest.testtbl' | ||
check_contains "COUNT(*): ${total_row_count}" | ||
run_sql 'SELECT COUNT(*) FROM mytest.testtbl WHERE id > 0' | ||
check_contains "COUNT(*): ${total_row_count}" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we move it earlier in case the first line contains bad CSV syntax? and use ReadUntilTernimator instead to skip one line
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we still need to parse the whole record, rather than stop at the terminator. Suppose the header record covers several lines, if we just stop at the first line and count it as the header to skip. Then the parsing will face syntax error problem. But actually the CSV file is valid.