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

fix shallow copy of string in restore table arg.

Browse Source
This commit is contained in:
obdev
2023-11-08 08:39:19 +00:00
committed by ob-robot
parent e78091d50f
commit b8fce5f170
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/rootserver/restore/ob_import_table_job_scheduler.cpp
View File

@ -706,12 +706,15 @@ int ObImportTableTaskScheduler::construct_import_table_arg_(obrpc::ObRecoverRest
LOG_WARN("fail to get tenant system variable", K(ret)); LOG_WARN("fail to get tenant system variable", K(ret));
} else if (OB_ISNULL(data_format_schema) || OB_ISNULL(nls_timestamp_format) || OB_ISNULL(nls_timestamp_tz_format)) { } else if (OB_ISNULL(data_format_schema) || OB_ISNULL(nls_timestamp_format) || OB_ISNULL(nls_timestamp_tz_format)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("var schema must not be null", K(ret)); LOG_WARN("var schema must not be null", K(ret), KP(data_format_schema), KP(nls_timestamp_format), KP(nls_timestamp_tz_format));
} else if (OB_FAIL(ob_write_string(arg.allocator_, data_format_schema->get_value(), arg.nls_formats_[ObNLSFormatEnum::NLS_DATE]))) {
LOG_WARN("deep copy failed", K(ret), K(data_format_schema->get_value()));
} else if (OB_FAIL(ob_write_string(arg.allocator_, nls_timestamp_format->get_value(), arg.nls_formats_[ObNLSFormatEnum::NLS_TIMESTAMP]))) {
LOG_WARN("deep copy failed", K(ret), K(nls_timestamp_format->get_value()));
} else if (OB_FAIL(ob_write_string(arg.allocator_, nls_timestamp_tz_format->get_value(), arg.nls_formats_[ObNLSFormatEnum::NLS_TIMESTAMP_TZ]))) {
LOG_WARN("deep copy failed", K(ret), K(nls_timestamp_tz_format->get_value()));
} else { } else {
arg.tz_info_ = arg.tz_info_wrap_.get_tz_info_offset(); arg.tz_info_ = arg.tz_info_wrap_.get_tz_info_offset();
arg.nls_formats_[ObNLSFormatEnum::NLS_DATE] = data_format_schema->get_value();
arg.nls_formats_[ObNLSFormatEnum::NLS_TIMESTAMP] = nls_timestamp_format->get_value();
arg.nls_formats_[ObNLSFormatEnum::NLS_TIMESTAMP_TZ] = nls_timestamp_tz_format->get_value();
} }
} }
return ret; return ret;