diff --git a/src/objit/include/objit/common/ob_item_type.h b/src/objit/include/objit/common/ob_item_type.h index 962933b060..fd5f78dc81 100755 --- a/src/objit/include/objit/common/ob_item_type.h +++ b/src/objit/include/objit/common/ob_item_type.h @@ -1650,6 +1650,7 @@ typedef enum ObItemType T_RANDOM, T_TABLEGROUP_ID, T_TABLEGROUP_BINDING, + T_TABLEGROUP_SHARDING, T_MAX_USED_PART_ID, T_TENANT_ID, diff --git a/src/sql/engine/cmd/ob_table_executor.cpp b/src/sql/engine/cmd/ob_table_executor.cpp index f29004f668..3068d6be17 100644 --- a/src/sql/engine/cmd/ob_table_executor.cpp +++ b/src/sql/engine/cmd/ob_table_executor.cpp @@ -1720,7 +1720,7 @@ int ObTruncateTableExecutor::execute(ObExecContext &ctx, ObTruncateTableStmt &st while (OB_SUCC(ret)) { if (OB_FAIL(common_rpc_proxy->truncate_table_v2(truncate_table_arg, res))) { LOG_WARN("rpc proxy truncate table failed", K(ret)); - if ((OB_TRY_LOCK_ROW_CONFLICT == ret || OB_TIMEOUT == ret) && ctx.get_timeout() > 0) { + if ((OB_TRY_LOCK_ROW_CONFLICT == ret || OB_TIMEOUT == ret || OB_NOT_MASTER == ret || OB_RS_NOT_MASTER == ret) && ctx.get_timeout() > 0) { ob_usleep(1 * 1000 * 1000); // retry ret = OB_SUCCESS;