hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[CP] fix csv external table bug

Browse Source
This commit is contained in:
wjhh2008
2024-08-19 08:39:30 +00:00
committed by ob-robot
parent 654605f440
commit a4b79b6ac7
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sql/das/ob_das_scan_op.cpp
View File

@ -313,6 +313,7 @@ int ObDASScanOp::init_scan_param()
} }
} }
scan_param_.external_file_format_.csv_format_.file_column_nums_ = static_cast<int64_t>(max_idx); scan_param_.external_file_format_.csv_format_.file_column_nums_ = static_cast<int64_t>(max_idx);
scan_param_.external_file_format_.csv_format_.ignore_extra_fields_ = true;
} }
} }
LOG_DEBUG("init scan param", K(ret), K(scan_param_)); LOG_DEBUG("init scan param", K(ret), K(scan_param_));

5
src/sql/engine/cmd/ob_load_data_parser.h
View File

@ -40,6 +40,7 @@ struct ObCSVGeneralFormat {
cs_type_(common::CHARSET_INVALID), cs_type_(common::CHARSET_INVALID),
skip_header_lines_(0), skip_header_lines_(0),
skip_blank_lines_(false), skip_blank_lines_(false),
ignore_extra_fields_(false),
trim_space_(false), trim_space_(false),
null_if_(), null_if_(),
empty_field_as_null_(false), empty_field_as_null_(false),
@ -65,6 +66,7 @@ struct ObCSVGeneralFormat {
common::ObCharsetType cs_type_; // charset type of format strings common::ObCharsetType cs_type_; // charset type of format strings
int64_t skip_header_lines_; int64_t skip_header_lines_;
bool skip_blank_lines_; bool skip_blank_lines_;
bool ignore_extra_fields_;
bool trim_space_; bool trim_space_;
common::ObArrayWrap<common::ObString> null_if_; common::ObArrayWrap<common::ObString> null_if_;
bool empty_field_as_null_; bool empty_field_as_null_;
@ -442,7 +444,8 @@ int ObCSVGeneralParser::scan_proto(const char *&str,
} }
if (OB_LIKELY(find_new_line) || is_end_file) { if (OB_LIKELY(find_new_line) || is_end_file) {
if (!format_.skip_blank_lines_ || field_idx > 0) { if (!format_.skip_blank_lines_ || field_idx > 0) {
if (field_idx != format_.file_column_nums_) { if (field_idx < format_.file_column_nums_
|| (field_idx > format_.file_column_nums_ && !format_.ignore_extra_fields_)) {
ret = handle_irregular_line(field_idx, line_no, errors); ret = handle_irregular_line(field_idx, line_no, errors);
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {