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

[bugfix]: fix schema_version_hint bug.

Browse Source
This commit is contained in:
Monk-Liu
2023-07-19 06:48:33 +00:00
committed by ob-robot
parent 2e8d3edd50
commit 94faa4ef42
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/share/ob_ddl_common.cpp
View File

@ -725,7 +725,6 @@ int ObDDLUtil::generate_build_replica_sql(
ObString new_dest_table_name; ObString new_dest_table_name;
ObString new_source_table_name; ObString new_source_table_name;
ObString new_source_database_name; ObString new_source_database_name;
ObString new_table_schema_version_hint;
if (OB_FAIL(sql::ObSQLUtils::generate_new_name_with_escape_character( if (OB_FAIL(sql::ObSQLUtils::generate_new_name_with_escape_character(
allocator, allocator,
@ -760,7 +759,6 @@ int ObDDLUtil::generate_build_replica_sql(
LOG_WARN("failed to generated ddl schema hint", K(ret)); LOG_WARN("failed to generated ddl schema hint", K(ret));
} }
} }
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
} else if (oracle_mode) { } else if (oracle_mode) {
if (OB_FAIL(sql_string.assign_fmt("INSERT /*+ monitor enable_parallel_dml parallel(%ld) opt_param('ddl_execution_id', %ld) opt_param('ddl_task_id', %ld) opt_param('enable_newsort', 'false') use_px */INTO \"%.*s\".\"%.*s\"(%.*s) SELECT /*+ index(\"%.*s\" primary) %.*s */ %.*s from \"%.*s\".\"%.*s\" as of scn %ld %.*s", if (OB_FAIL(sql_string.assign_fmt("INSERT /*+ monitor enable_parallel_dml parallel(%ld) opt_param('ddl_execution_id', %ld) opt_param('ddl_task_id', %ld) opt_param('enable_newsort', 'false') use_px */INTO \"%.*s\".\"%.*s\"(%.*s) SELECT /*+ index(\"%.*s\" primary) %.*s */ %.*s from \"%.*s\".\"%.*s\" as of scn %ld %.*s",
@ -768,7 +766,7 @@ int ObDDLUtil::generate_build_replica_sql(
static_cast<int>(new_dest_database_name.length()), new_dest_database_name.ptr(), static_cast<int>(new_dest_table_name.length()), new_dest_table_name.ptr(), static_cast<int>(new_dest_database_name.length()), new_dest_database_name.ptr(), static_cast<int>(new_dest_table_name.length()), new_dest_table_name.ptr(),
static_cast<int>(insert_column_sql_string.length()), insert_column_sql_string.ptr(), static_cast<int>(insert_column_sql_string.length()), insert_column_sql_string.ptr(),
static_cast<int>(new_source_table_name.length()), new_source_table_name.ptr(), static_cast<int>(new_source_table_name.length()), new_source_table_name.ptr(),
static_cast<int>(new_table_schema_version_hint.length()), new_table_schema_version_hint.ptr(), static_cast<int>(src_table_schema_version_hint_sql_string.length()), src_table_schema_version_hint_sql_string.ptr(),
static_cast<int>(query_column_sql_string.length()), query_column_sql_string.ptr(), static_cast<int>(query_column_sql_string.length()), query_column_sql_string.ptr(),
static_cast<int>(new_source_database_name.length()), new_source_database_name.ptr(), static_cast<int>(new_source_table_name.length()), new_source_table_name.ptr(), static_cast<int>(new_source_database_name.length()), new_source_database_name.ptr(), static_cast<int>(new_source_table_name.length()), new_source_table_name.ptr(),
snapshot_version, static_cast<int>(rowkey_column_sql_string.length()), rowkey_column_sql_string.ptr()))) { snapshot_version, static_cast<int>(rowkey_column_sql_string.length()), rowkey_column_sql_string.ptr()))) {
@ -780,7 +778,7 @@ int ObDDLUtil::generate_build_replica_sql(
static_cast<int>(new_dest_database_name.length()), new_dest_database_name.ptr(), static_cast<int>(new_dest_table_name.length()), new_dest_table_name.ptr(), static_cast<int>(new_dest_database_name.length()), new_dest_database_name.ptr(), static_cast<int>(new_dest_table_name.length()), new_dest_table_name.ptr(),
static_cast<int>(insert_column_sql_string.length()), insert_column_sql_string.ptr(), static_cast<int>(insert_column_sql_string.length()), insert_column_sql_string.ptr(),
static_cast<int>(new_source_table_name.length()), new_source_table_name.ptr(), static_cast<int>(new_source_table_name.length()), new_source_table_name.ptr(),
static_cast<int>(new_table_schema_version_hint.length()), new_table_schema_version_hint.ptr(), static_cast<int>(src_table_schema_version_hint_sql_string.length()), src_table_schema_version_hint_sql_string.ptr(),
static_cast<int>(query_column_sql_string.length()), query_column_sql_string.ptr(), static_cast<int>(query_column_sql_string.length()), query_column_sql_string.ptr(),
static_cast<int>(new_source_database_name.length()), new_source_database_name.ptr(), static_cast<int>(new_source_table_name.length()), new_source_table_name.ptr(), static_cast<int>(new_source_database_name.length()), new_source_database_name.ptr(), static_cast<int>(new_source_table_name.length()), new_source_table_name.ptr(),
snapshot_version, static_cast<int>(rowkey_column_sql_string.length()), rowkey_column_sql_string.ptr()))) { snapshot_version, static_cast<int>(rowkey_column_sql_string.length()), rowkey_column_sql_string.ptr()))) {