diff --git a/src/sql/parser/sql_parser_mysql_mode.y b/src/sql/parser/sql_parser_mysql_mode.y index 2fdf10f4f8..9e08777717 100644 --- a/src/sql/parser/sql_parser_mysql_mode.y +++ b/src/sql/parser/sql_parser_mysql_mode.y @@ -461,7 +461,7 @@ END_P SET_VAR DELIMITER %type drop_index_stmt hint_options opt_expr_as_list expr_as_list expr_with_opt_alias substr_params opt_comma substr_or_substring %type /*frozen_type*/ opt_binary %type ip_port -%type create_view_stmt view_name opt_column_list opt_table_id opt_tablet_id view_select_stmt opt_check_option +%type create_view_stmt view_name opt_column_list opt_table_id opt_tablet_id view_select_stmt opt_check_option opt_tablet_id_no_empty %type name_list %type partition_role ls_role zone_desc opt_zone_desc server_or_zone opt_server_or_zone opt_partitions opt_subpartitions add_or_alter_zone_options alter_or_change_or_modify %type ls opt_tenant_list_or_ls_or_tablet_id ls_server_or_server_or_zone_or_tenant add_or_alter_zone_option @@ -7852,6 +7852,13 @@ TABLET_ID COMP_EQ INTNUM } | /*EMPTY*/ { $$ = NULL; } ; + +opt_tablet_id_no_empty: +TABLET_ID COMP_EQ INTNUM +{ + malloc_non_terminal_node($$, result->malloc_pool_, T_TABLET_ID, 1, $3); +} +; /***************************************************************************** * * create index @@ -16872,6 +16879,10 @@ tenant_list_tuple opt_tablet_id { malloc_non_terminal_node($$, result->malloc_pool_, T_TENANT_LS_TABLET, 3, $1, $2, $3); } +| opt_tablet_id_no_empty +{ + malloc_non_terminal_node($$, result->malloc_pool_, T_TABLET_ID, 1, $1); +} | /*EMPTY*/ { $$ = NULL; diff --git a/src/sql/resolver/cmd/ob_alter_system_resolver.cpp b/src/sql/resolver/cmd/ob_alter_system_resolver.cpp index 87dff292c9..5b71fd51f7 100644 --- a/src/sql/resolver/cmd/ob_alter_system_resolver.cpp +++ b/src/sql/resolver/cmd/ob_alter_system_resolver.cpp @@ -406,6 +406,10 @@ int ObAlterSystemResolverUtil::resolve_tenant( affect_all_meta = true; } else if (OB_FAIL(schema_guard.get_tenant_id(tenant_name, tmp_tenant_id))) { LOG_WARN("tenant not exist", K(tenant_name), KR(ret)); + if (OB_ERR_INVALID_TENANT_NAME == ret && OB_SYS_TENANT_ID != tenant_id) { + ret = OB_ERR_NO_PRIVILEGE; + LOG_WARN("change error code, existence of tenant is only accessible to sys tenant", KR(ret)); + } } else { int hash_ret = tenant_id_set.exist_refactored(tmp_tenant_id); if (OB_HASH_EXIST == hash_ret) { @@ -514,28 +518,35 @@ int ObFreezeResolver::resolve(const ParseNode &parse_tree) return ret; } -int ObFreezeResolver::resolve_major_freeze_(ObFreezeStmt *freeze_stmt, ParseNode *opt_tenant_list_v2, const ParseNode *opt_rebuild_column_group) +int ObFreezeResolver::resolve_major_freeze_(ObFreezeStmt *freeze_stmt, ParseNode *opt_tenant_list_or_tablet_id, const ParseNode *opt_rebuild_column_group) { int ret = OB_SUCCESS; const uint64_t cur_tenant_id = session_info_->get_effective_tenant_id(); - if (NULL == opt_tenant_list_v2) { - // if opt_tenant_list_v2 == NULL, add owned tenant_id + if (NULL == opt_tenant_list_or_tablet_id) { + // if opt_tenant_list_or_tablet_id == NULL, add owned tenant_id if (OB_FAIL(freeze_stmt->get_tenant_ids().push_back(cur_tenant_id))) { LOG_WARN("fail to push owned tenant id ", KR(ret), "owned tenant_id", cur_tenant_id); } - } else if (OB_UNLIKELY(nullptr == opt_tenant_list_v2->children_ || 0 == opt_tenant_list_v2->num_child_)) { + } else if (OB_UNLIKELY(nullptr == opt_tenant_list_or_tablet_id->children_ || 0 == opt_tenant_list_or_tablet_id->num_child_)) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("children of tenant should not be null", KR(ret), KP(opt_tenant_list_v2)); - } else if (OB_FAIL(resolve_tenant_ls_tablet_(freeze_stmt, opt_tenant_list_v2))) { + LOG_WARN("children of tenant should not be null", KR(ret), KP(opt_tenant_list_or_tablet_id)); + } else if (OB_FAIL(resolve_tenant_ls_tablet_(freeze_stmt, opt_tenant_list_or_tablet_id))) { LOG_WARN("fail to resolve tenant or tablet", KR(ret)); } else if (OB_UNLIKELY(share::ObLSID::INVALID_LS_ID != freeze_stmt->get_ls_id())) { ret = OB_NOT_SUPPORTED; LOG_WARN("not support to specify ls to major freeze", K(ret), "ls_id", freeze_stmt->get_ls_id()); } else if (freeze_stmt->get_tablet_id().is_valid()) { // tablet major freeze - if (OB_SYS_TENANT_ID != cur_tenant_id) { + if (T_TABLET_ID == opt_tenant_list_or_tablet_id->type_) { + if (OB_UNLIKELY(0 != freeze_stmt->get_tenant_ids().count())) { + ret = OB_ERR_UNEXPECTED; + LOG_WARN("tenant ids should be empty for type T_TABLET_ID", K(ret)); + } else if (OB_FAIL(freeze_stmt->get_tenant_ids().push_back(cur_tenant_id))) { // if tenant is not explicitly specified, add owned tenant_id + LOG_WARN("fail to push owned tenant id ", KR(ret), "owned tenant_id", cur_tenant_id); + } + } else if (OB_SYS_TENANT_ID != cur_tenant_id) { ret = OB_ERR_NO_PRIVILEGE; - LOG_WARN("Only sys tenant can add suffix opt of tablet_id", KR(ret), K(cur_tenant_id)); + LOG_WARN("Only sys tenant can add suffix opt of tablet_id after tenant name", KR(ret), K(cur_tenant_id)); } else if (1 != freeze_stmt->get_tenant_ids().count()) { ret = OB_NOT_SUPPORTED; LOG_WARN("not suppport to specify several tenant ids or no tenant_id for tablet major freeze", K(ret), @@ -628,6 +639,18 @@ int ObFreezeResolver::resolve_tenant_ls_tablet_(ObFreezeStmt *freeze_stmt, } } break; + case T_TABLET_ID: + if (opt_tenant_list_or_ls_or_tablet_id->num_child_ != 1) { + ret = OB_ERR_UNEXPECTED; + LOG_WARN("invalid child num", K(ret), K(opt_tenant_list_or_ls_or_tablet_id->num_child_)); + } else { + opt_tablet_id = opt_tenant_list_or_ls_or_tablet_id->children_[0]; + if (OB_ISNULL(opt_tablet_id)) { + ret = OB_ERR_UNEXPECTED; + LOG_WARN("tenant_list or ls_id is nullptr", KR(ret), KP(opt_tablet_id)); + } + } + break; default: ret = OB_ERR_UNEXPECTED; LOG_WARN("invalid parse node type",