Skip to content

[enhancement](CSV-reader) enhance err log for CSV reading containing enclose or escape #25816

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

Merged
dataroaring merged 1 commit into from
Oct 24, 2023
Merged

[enhancement](CSV-reader) enhance err log for CSV reading containing enclose or escape #25816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions be/src/http/action/stream_load.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,9 +398,19 @@ Status StreamLoadAction::_process_put(HttpRequest* http_req,
request.__set_line_delimiter(http_req->header(HTTP_LINE_DELIMITER));
}
if (!http_req->header(HTTP_ENCLOSE).empty() && http_req->header(HTTP_ENCLOSE).size() > 0) {
const auto& enclose_str = http_req->header(HTTP_ENCLOSE);
if (enclose_str.length() != 1) {
return Status::InvalidArgument("enclose must be single-char, actually is {}",
enclose_str);
}
request.__set_enclose(http_req->header(HTTP_ENCLOSE)[0]);
}
if (!http_req->header(HTTP_ESCAPE).empty() && http_req->header(HTTP_ESCAPE).size() > 0) {
const auto& escape_str = http_req->header(HTTP_ESCAPE);
if (escape_str.length() != 1) {
return Status::InvalidArgument("escape must be single-char, actually is {}",
escape_str);
}
request.__set_escape(http_req->header(HTTP_ESCAPE)[0]);
}
if (!http_req->header(HTTP_PARTITIONS).empty()) {
Expand Down
20 changes: 15 additions & 5 deletions be/src/vec/exec/format/csv/csv_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,11 +738,21 @@ Status CsvReader::_line_split_to_values(const Slice& line, bool* success) {
fmt::format_to(error_msg, "{} {} {}",
"actual column number in csv file is ", cmp_str,
" schema column number.");
fmt::format_to(error_msg, "actual number: {}, column separator: [{}], ",
_split_values.size(), _value_separator);
fmt::format_to(error_msg,
"line delimiter: [{}], schema column number: {}; ",
_line_delimiter, _file_slot_descs.size());
fmt::format_to(error_msg, "actual number: {}, schema column number: {}; ",
_split_values.size(), _file_slot_descs.size());
fmt::format_to(error_msg, "line delimiter: [{}], column separator: [{}], ",
_line_delimiter, _value_separator);
if (_enclose != 0) {
fmt::format_to(error_msg, "enclose:[{}] ", _enclose);
}
if (_escape != 0) {
fmt::format_to(error_msg, "escape:[{}] ", _escape);
}
fmt::memory_buffer values;
for (const auto& value : _split_values) {
fmt::format_to(values, "{}, ", value.to_string());
}
fmt::format_to(error_msg, "result values:[{}]", fmt::to_string(values));
return fmt::to_string(error_msg);
},
&_line_reader_eof));
Expand Down