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

[bugfix]: fix bug in online_ddl.(fail to replace sort key in inner_sql);

Browse Source
This commit is contained in:
Monk-Liu
2023-02-07 16:11:14 +08:00
committed by ob-robot
parent 2a1917b23b
commit de66a8b416
2 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/optimizer/ob_del_upd_log_plan.cpp
View File

@ -536,7 +536,7 @@ int ObDelUpdLogPlan::compute_exchange_info_for_pdml_insert(const ObShardingInfo
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpected error", K(get_stmt()), K(ret));
} else if (OB_FAIL(static_cast<const ObInsertStmt*>(get_stmt())->get_ddl_sort_keys(exch_info.sort_keys_))) {
LOG_WARN("failed to get sort ddl sort keys", K(ret));
LOG_WARN("fail to get ddl sort key", K(ret));
} else if (exch_info.dist_method_ == ObPQDistributeMethod::PARTITION_RANGE &&
OB_FAIL(exch_info.repart_all_tablet_ids_.assign(target_sharding.get_all_tablet_ids()))) {
LOG_WARN("failed to get all partition ids", K(ret));
@ -1121,10 +1121,11 @@ int ObDelUpdLogPlan::get_ddl_sort_keys_with_part_expr(ObExchangeInfo &exch_info,
int ret = OB_SUCCESS;
sort_keys.reset();
ObArray<OrderItem> tmp_sort_keys;
if (2 != get_stmt()->get_table_size()) {
const ObInsertStmt *ins_stmt = static_cast<const ObInsertStmt *>(get_stmt());
if (2 != ins_stmt->get_table_size()) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("error unexpected, table item size is not as expected", K(ret), "table_item_size", get_stmt()->get_table_size());
} else if (OB_FAIL(static_cast<const ObInsertStmt *>(get_stmt())->get_ddl_sort_keys(tmp_sort_keys))) {
LOG_WARN("error unexpected, table item size is not as expected", K(ret), "table_item_size", ins_stmt->get_table_size());
} else if (OB_FAIL(ins_stmt->get_ddl_sort_keys(tmp_sort_keys))) {
LOG_WARN("get ddl sort keys failed", K(ret));
} else if (OB_NOT_NULL(exch_info.calc_part_id_expr_)) {
OrderItem item;