merge devleop into master 20231212

This commit is contained in:
hnwyllmm
2023-12-19 07:45:22 +00:00
committed by ob-robot
parent bf90efb0a8
commit 021e5571bb
44 changed files with 100 additions and 88 deletions

View File

@ -365,7 +365,7 @@ int ObDelUpdLogPlan::calculate_table_location_and_sharding(const ObDelUpdStmt &s
table_partition_info = new(table_partition_info) ObTablePartitionInfo(allocator_);
ObTableLocationType location_type = OB_TBL_LOCATION_UNINITIALIZED;
ObAddr &server = get_optimizer_context().get_local_server_addr();
table_partition_info->get_table_location().set_check_no_partiton(stmt.is_merge_stmt());
table_partition_info->get_table_location().set_check_no_partition(stmt.is_merge_stmt());
if (OB_FAIL(calculate_table_location(stmt,
filters,
table_id,