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

Fix load and select into outfile oss params bug

Browse Source
This commit is contained in:
wjhh2008
2022-11-24 03:08:22 +00:00
committed by wangzelin.wzl
parent 972d94f0b7
commit 7952fa9f29
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/engine/basic/ob_select_into_op.cpp
View File

@ -72,9 +72,14 @@ int ObSelectIntoOp::inner_open()
ObString path = file_name_.get_varchar().trim(); ObString path = file_name_.get_varchar().trim();
if (path.prefix_match_ci(OB_OSS_PREFIX)) { if (path.prefix_match_ci(OB_OSS_PREFIX)) {
file_location_ = IntoFileLocation::REMOTE_OSS; file_location_ = IntoFileLocation::REMOTE_OSS;
url_ = path.split_on('?'); ObString temp_url = path.split_on('?');
url_.trim(); temp_url.trim();
if (OB_FAIL(access_info_.set(url_.ptr(), path.ptr()))) { ObString storage_info;
if (OB_FAIL(ob_write_string(ctx_.get_allocator(), temp_url, url_, true))) {
LOG_WARN("fail to append string", K(ret));
} else if (OB_FAIL(ob_write_string(ctx_.get_allocator(), path, storage_info, true))) {
LOG_WARN("fail to append string", K(ret));
} else if (OB_FAIL(access_info_.set(url_.ptr(), storage_info.ptr()))) {
LOG_WARN("fail to set access info", K(ret), K(path)); LOG_WARN("fail to set access info", K(ret), K(path));
} }

17
src/sql/resolver/cmd/ob_load_data_resolver.cpp
View File

@ -116,10 +116,11 @@ int ObLoadDataResolver::resolve(const ParseNode &parse_tree)
} else { } else {
ObString file_name(file_name_node->str_len_, file_name_node->str_value_); ObString file_name(file_name_node->str_len_, file_name_node->str_value_);
if (ObLoadFileLocation::OSS != load_args.load_file_storage_) { if (ObLoadFileLocation::OSS != load_args.load_file_storage_) {
load_args.file_name_ = file_name;
char *full_path_buf = nullptr; char *full_path_buf = nullptr;
char *actual_path = nullptr; char *actual_path = nullptr;
if (OB_ISNULL(full_path_buf = static_cast<char*>(allocator_->alloc(DEFAULT_BUF_LENGTH)))) { if (OB_FAIL(ob_write_string(*allocator_, file_name, load_args.file_name_, true))) {
LOG_WARN("fail to write string", K(ret));
} else if (OB_ISNULL(full_path_buf = static_cast<char*>(allocator_->alloc(DEFAULT_BUF_LENGTH)))) {
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("fail to allocate memory", K(ret)); LOG_WARN("fail to allocate memory", K(ret));
} else if (OB_ISNULL(actual_path = realpath(file_name_node->str_value_, full_path_buf))) { } else if (OB_ISNULL(actual_path = realpath(file_name_node->str_value_, full_path_buf))) {
@ -138,12 +139,16 @@ int ObLoadDataResolver::resolve(const ParseNode &parse_tree)
} }
} }
} else { } else {
load_args.file_name_ = file_name.split_on('?'); ObString temp_file_name = file_name.split_on('?');
if (load_args.file_name_.length() <= 0 ObString storage_info;
|| file_name <= 0) { if (OB_FAIL(ob_write_string(*allocator_, temp_file_name, load_args.file_name_, true))) {
LOG_WARN("fail to copy string", K(ret));
} else if (OB_FAIL(ob_write_string(*allocator_, file_name, storage_info, true))) {
LOG_WARN("fail to copy string", K(ret));
} else if (temp_file_name.length() <= 0 || storage_info.length() <= 0) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_USER_ERROR(OB_INVALID_ARGUMENT, "file name or access key"); LOG_USER_ERROR(OB_INVALID_ARGUMENT, "file name or access key");
} else if (OB_FAIL(load_args.access_info_.set(load_args.file_name_.ptr(), file_name.ptr()))) { } else if (OB_FAIL(load_args.access_info_.set(load_args.file_name_.ptr(), storage_info.ptr()))) {
LOG_WARN("failed to set access info", K(ret)); LOG_WARN("failed to set access info", K(ret));
} }
} }