Validate file header for LOAD and COPY #2210
Merged
Conversation
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
acquamarin
approved these changes
Oct 13, 2023
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #2210 +/- ##
==========================================
+ Coverage 89.46% 89.58% +0.12%
==========================================
Files 1007 1007
Lines 36241 36249 +8
==========================================
+ Hits 32422 32475 +53
+ Misses 3819 3774 -45
☔ View full report in Codecov by Sentry. |
Riolku
reviewed
Oct 13, 2023
Comment on lines
211
to
240
| void Binder::sniffFiles(const common::ReaderConfig& readerConfig, | ||
| std::vector<std::string>& columnNames, | ||
| std::vector<std::unique_ptr<common::LogicalType>>& columnTypes) { | ||
| assert(readerConfig.getNumFiles() > 0); | ||
| sniffFile(readerConfig, 0, columnNames, columnTypes); | ||
| for (auto i = 1; i < readerConfig.getNumFiles(); ++i) { | ||
| std::vector<std::string> tmpColumnNames; | ||
| std::vector<std::unique_ptr<LogicalType>> tmpColumnTypes; | ||
| sniffFile(readerConfig, i, tmpColumnNames, tmpColumnTypes); | ||
| switch (readerConfig.fileType) { | ||
| case FileType::CSV: { | ||
| validateNumColumns(columnTypes.size(), tmpColumnTypes.size()); | ||
| } | ||
| case FileType::PARQUET: { | ||
| validateNumColumns(columnTypes.size(), tmpColumnTypes.size()); | ||
| validateColumnTypes(columnNames, columnTypes, tmpColumnTypes); | ||
| } break; | ||
| case FileType::NPY: { | ||
| validateNumColumns(1, tmpColumnTypes.size()); | ||
| columnNames.push_back(tmpColumnNames[0]); | ||
| columnTypes.push_back(tmpColumnTypes[0]->copy()); | ||
| } break; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
We have some duplication here, right? Either we should validate the number of columns here, or in each bind step, but not both.
I think it'd be best to move the validation entirely to a separate function to consolidate the shared logic.
reader/csv: skip empty lines when sniffing On CSVs without headers, we should skip any leading empty lines, and return zero if all lines are empty. Co-authored-by: Keenan G <41458184+Riolku@users.noreply.github.com>
andyfengHKU
force-pushed
the
issue-2139
branch
from
37e51ea
to
80e9905
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR partially solves issue #2139.
We add several validation to COPY and LOAD FROM