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

[FEAT MERGE]patch sql compat feature to 431

Browse Source
This commit is contained in:
SevenJ-swj
2024-04-15 16:07:24 +00:00
committed by ob-robot
parent 71c32f94b0
commit 6423e587c1
177 changed files with 16669 additions and 1854 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
src/sql/engine/cmd/ob_user_cmd_executor.cpp
View File

@ -54,6 +54,35 @@ int ObCreateUserExecutor::encrypt_passwd(const common::ObString& pwd,
return ret;
}
int ObCreateUserExecutor::check_user_valid(ObSchemaGetterGuard& schema_guard,
uint64_t priv_set,
int64_t tenant_id,
const ObString &user_name,
const ObString &host_name,
const ObString &opreation_name)
{
int ret = OB_SUCCESS;
ObSqlString full_user_name;
bool existed = false;
if (!ObSchemaChecker::enable_mysql_pl_priv_check(tenant_id, schema_guard)) {
} else if (OB_FAIL(full_user_name.append_fmt("%.*s@%.*s", user_name.length(), user_name.ptr(),
host_name.length(), host_name.ptr()))) {
LOG_WARN("append fmt failed", K(ret));
} else if (OB_FAIL(schema_guard.check_routine_definer_existed(tenant_id, full_user_name.string(), existed))) {
LOG_WARN("check routine definer existed failed", K(ret));
} else if (existed) {
if ((priv_set & OB_PRIV_SUPER) != 0) {
LOG_USER_WARN(OB_ERR_USER_REFFERD_AS_DEFINER, user_name.length(), user_name.ptr(), host_name.length(), host_name.ptr());
} else {
ret = OB_ERR_OPERATION_ON_USER_REFERRED_AS_DEFINER;
LOG_WARN("create user has definer", K(ret));
LOG_USER_ERROR(OB_ERR_OPERATION_ON_USER_REFERRED_AS_DEFINER, opreation_name.length(), opreation_name.ptr(),
user_name.length(), user_name.ptr(), host_name.length(), host_name.ptr());
}
}
LOG_DEBUG("check user valid status", K(priv_set), K(ret));
return ret;
}
int ObCreateUserExecutor::userinfo_extract_user_name(
const common::ObIArray<share::schema::ObUserInfo> &user_infos,
@ -87,7 +116,13 @@ int ObCreateUserExecutor::execute(ObExecContext &ctx, ObCreateUserStmt &stmt)
const ObStrings &users = stmt.get_users();
const bool if_not_exist = stmt.get_if_not_exists();
const int64_t FIX_MEMBER_CNT = 4;
if (OB_ISNULL(task_exec_ctx = GET_TASK_EXECUTOR_CTX(ctx))) {
if (OB_ISNULL(GCTX.schema_service_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("schema service is null", K(ret));
} else if (OB_ISNULL(ctx.get_my_session())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error", K(ret));
} else if (OB_ISNULL(task_exec_ctx = GET_TASK_EXECUTOR_CTX(ctx))) {
ret = OB_NOT_INIT;
LOG_WARN("get task executor context failed");
} else if (OB_ISNULL(common_rpc_proxy = task_exec_ctx->get_common_rpc())) {
@ -157,7 +192,13 @@ int ObCreateUserExecutor::execute(ObExecContext &ctx, ObCreateUserStmt &stmt)
}
if (OB_SUCC(ret)) {
if (OB_FAIL(user_info.set_user_name(user_name))) {
ObSchemaGetterGuard schema_guard;
if (OB_FAIL(GCTX.schema_service_->get_tenant_schema_guard(tenant_id, schema_guard))) {
LOG_WARN("get tenant schema guard failed", K(ret));
} else if (OB_FAIL(ObCreateUserExecutor::check_user_valid(schema_guard, ctx.get_my_session()->get_user_priv_set(), tenant_id,
user_name, host_name, "CREATE USER"))) {
LOG_WARN("check user valid failed", K(ret));
} else if (OB_FAIL(user_info.set_user_name(user_name))) {
LOG_WARN("set user name failed", K(ret));
} else if (OB_FAIL(user_info.set_host(host_name))) {
LOG_WARN("set host name failed", K(ret));
@ -243,17 +284,10 @@ int ObDropUserExecutor::build_fail_msg(const common::ObIArray<common::ObString>
if (OB_SUCC(ret)) {
const ObString &user = users.at(i);
const ObString &host = hosts.at(i);
if (OB_UNLIKELY(user.empty()) || OB_UNLIKELY(host.empty())) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("Username is invalid", K(ret), K(user), K(host));
} else {
if (OB_FAIL(msg.append_fmt("'%.*s'@'%.*s'",
user.length(), user.ptr(),
host.length(), host.ptr()))) {
LOG_WARN("Build msg fail", K(user), K(host), K(ret));
} else {
//do nothing
}
if (OB_FAIL(msg.append_fmt("'%.*s'@'%.*s'",
user.length(), user.ptr(),
host.length(), host.ptr()))) {
LOG_WARN("Build msg fail", K(user), K(host), K(ret));
}
}
}
@ -291,7 +325,14 @@ int ObDropUserExecutor::execute(ObExecContext &ctx, ObDropUserStmt &stmt)
obrpc::ObCommonRpcProxy *common_rpc_proxy = NULL;
const uint64_t tenant_id = stmt.get_tenant_id();
const ObStrings *user_names = NULL;
if (OB_INVALID_ID == tenant_id) {
if (OB_ISNULL(GCTX.schema_service_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("schema service is null", K(ret));
} else if (OB_ISNULL(ctx.get_my_session())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error", K(ret));
} else if (OB_INVALID_ID == tenant_id) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("tenant is invalid", K(ret));
} else if (OB_ISNULL(user_names = stmt.get_users())) {
@ -311,17 +352,24 @@ int ObDropUserExecutor::execute(ObExecContext &ctx, ObDropUserStmt &stmt)
ObString host_name;
ObDropUserArg &arg = static_cast<ObDropUserArg &>(stmt.get_ddl_arg());
arg.tenant_id_ = tenant_id;
for (int64_t i = 0; OB_SUCC(ret) && i < user_names->count(); i += 2) {
if (OB_FAIL(user_names->get_string(i, user_name))) {
LOG_WARN("Get user name failed", K(ret));
} else if (OB_FAIL(user_names->get_string(i + 1, host_name))) {
LOG_WARN("Get host name failed", K(ret));
} else if (OB_FAIL(arg.users_.push_back(user_name))) {
LOG_WARN("Add user name failed", K(ret));
} else if (OB_FAIL(arg.hosts_.push_back(host_name))) {
LOG_WARN("Add host name failed", K(ret));
} else {
//do nothing
{
ObSchemaGetterGuard schema_guard;
if (OB_FAIL(GCTX.schema_service_->get_tenant_schema_guard(tenant_id, schema_guard))) {
LOG_WARN("get schema guard failed", K(ret));
}
for (int64_t i = 0; OB_SUCC(ret) && i < user_names->count(); i += 2) {
if (OB_FAIL(user_names->get_string(i, user_name))) {
LOG_WARN("Get user name failed", K(ret));
} else if (OB_FAIL(user_names->get_string(i + 1, host_name))) {
LOG_WARN("Get host name failed", K(ret));
} else if (OB_FAIL(arg.users_.push_back(user_name))) {
LOG_WARN("Add user name failed", K(ret));
} else if (OB_FAIL(arg.hosts_.push_back(host_name))) {
LOG_WARN("Add host name failed", K(ret));
} else if (OB_FAIL(ObCreateUserExecutor::check_user_valid(schema_guard, ctx.get_my_session()->get_user_priv_set(), tenant_id,
user_name, host_name, "DROP USER"))) {
LOG_WARN("check user valid failed", K(ret));
}
}
}
if (OB_SUCC(ret)) {
@ -353,13 +401,8 @@ int ObDropUserExecutor::drop_user(obrpc::ObCommonRpcProxy *rpc_proxy,
ObSqlString fail_msg;
if (OB_FAIL(rpc_proxy->drop_user(arg, failed_index))) {
LOG_WARN("Lock user failed", K(ret));
if (OB_FAIL(ObDropUserExecutor::build_fail_msg(arg.users_, arg.hosts_, fail_msg))) {
LOG_WARN("Build fail msg error", K(arg), K(ret));
} else {
ret = OB_CANNOT_USER;
LOG_USER_ERROR(OB_CANNOT_USER, (int)strlen("DROP USER"), "DROP USER", (int)fail_msg.length(), fail_msg.ptr());
}
} else if (0 != failed_index.count()) {
}
if (0 != failed_index.count()) {
ObSArray<ObString> failed_users;
ObSArray<ObString> failed_hosts;
if (OB_FAIL(ObDropUserExecutor::string_array_index_extract(arg.users_, arg.hosts_,
@ -369,11 +412,10 @@ int ObDropUserExecutor::drop_user(obrpc::ObCommonRpcProxy *rpc_proxy,
} else if (OB_FAIL(ObDropUserExecutor::build_fail_msg(failed_users, failed_hosts, fail_msg))) {
LOG_WARN("Build fail msg error", K(arg), K(ret));
} else {
const char *ERR_CMD = (arg.is_role_ && lib::is_mysql_mode()) ? "DROP ROLE" : "DROP USER";
ret = OB_CANNOT_USER;
LOG_USER_ERROR(OB_CANNOT_USER, (int)strlen("DROP USER"), "DROP USER", (int)fail_msg.length(), fail_msg.ptr());
LOG_USER_ERROR(OB_CANNOT_USER, (int)strlen(ERR_CMD), ERR_CMD, (int)fail_msg.length(), fail_msg.ptr());
}
} else {
//do nothing
}
}
return ret;
@ -481,12 +523,13 @@ int ObAlterUserProfileExecutor::set_role_exec(ObExecContext &ctx, ObAlterUserPro
int ret = OB_SUCCESS;
ObSQLSessionInfo *session = NULL;
uint64_t role_id = OB_INVALID_ID;
CK (1 == stmt.get_set_role_flag());
CK (ObAlterUserProfileStmt::SET_ROLE == stmt.get_set_role_flag());
if (OB_ISNULL(session = ctx.get_my_session())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("session is NULL", K(ret));
} else {
const uint64_t tenant_id = session->get_effective_tenant_id();
const uint64_t user_id = lib::is_mysql_mode() ? session->get_priv_user_id() : session->get_user_id();
const ObUserInfo * user_info = NULL;
common::ObIArray<uint64_t> &enable_role_id_array =
session->get_enable_role_array();
@ -496,7 +539,7 @@ int ObAlterUserProfileExecutor::set_role_exec(ObExecContext &ctx, ObAlterUserPro
OZ (GCTX.schema_service_->get_tenant_schema_guard(
tenant_id,
schema_guard));
OZ (schema_guard.get_user_info(tenant_id, session->get_user_id(), user_info));
OZ (schema_guard.get_user_info(tenant_id, user_id, user_info));
if (OB_SUCC(ret) && NULL == user_info) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("user info is null", K(ret));
@ -527,8 +570,18 @@ int ObAlterUserProfileExecutor::set_role_exec(ObExecContext &ctx, ObAlterUserPro
}
}
break;
case OB_DEFAULT_ROLE_DEFAULT:
OX (enable_role_id_array.reset());
for (int i = 0; OB_SUCC(ret) && i < user_info->get_role_id_array().count(); i++) {
if (user_info->get_disable_option(user_info->get_role_id_option_array().at(i)) == 0) {
OZ (enable_role_id_array.push_back(user_info->get_role_id_array().at(i)));
}
}
break;
}
if (lib::is_oracle_mode()) {
OZ (enable_role_id_array.push_back(OB_ORA_PUBLIC_ROLE_ID));
}
OZ (enable_role_id_array.push_back(OB_ORA_PUBLIC_ROLE_ID));
}
}
return ret;
@ -543,7 +596,7 @@ int ObAlterUserProfileExecutor::execute(ObExecContext &ctx, ObAlterUserProfileSt
if (OB_ISNULL(task_exec_ctx = GET_TASK_EXECUTOR_CTX(ctx))) {
ret = OB_NOT_INIT;
LOG_WARN("get task executor context failed", K(ret));
} else if (1 == stmt.get_set_role_flag()) {
} else if (ObAlterUserProfileStmt::SET_ROLE == stmt.get_set_role_flag()) {
OZ (set_role_exec(ctx, stmt));
} else if (OB_ISNULL(common_rpc_proxy = task_exec_ctx->get_common_rpc())) {
ret = OB_NOT_INIT;
@ -561,7 +614,13 @@ int ObRenameUserExecutor::execute(ObExecContext &ctx, ObRenameUserStmt &stmt)
obrpc::ObCommonRpcProxy *common_rpc_proxy = NULL;
const uint64_t tenant_id = stmt.get_tenant_id();
const ObStrings *rename_infos = NULL;
if (OB_INVALID_ID == tenant_id) {
if (OB_ISNULL(GCTX.schema_service_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("schema service is null", K(ret));
} else if (OB_ISNULL(ctx.get_my_session())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error", K(ret));
} else if (OB_INVALID_ID == tenant_id) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("tenant is invalid", K(ret));
} else if (OB_ISNULL(rename_infos = stmt.get_rename_infos())) {
@ -586,24 +645,36 @@ int ObRenameUserExecutor::execute(ObExecContext &ctx, ObRenameUserStmt &stmt)
ObString new_hostname;
ObRenameUserArg &arg = static_cast<ObRenameUserArg &>(stmt.get_ddl_arg());
arg.tenant_id_ = tenant_id;
//rename_infos arr contains old names and new names in pairs, so step is 2
for (int64_t i = 0; OB_SUCC(ret) && i < rename_infos->count(); i += 4) {
if (OB_FAIL(rename_infos->get_string(i, old_username))) {
LOG_WARN("Get origin name failed", K(ret));
} else if (OB_FAIL(rename_infos->get_string(i + 1, old_hostname))) {
LOG_WARN("Get to name failed", K(ret));
} else if (OB_FAIL(rename_infos->get_string(i + 2, new_username))) {
LOG_WARN("Get to name failed", K(ret));
} else if (OB_FAIL(rename_infos->get_string(i + 3, new_hostname))) {
LOG_WARN("Get to name failed", K(ret));
} else if (OB_FAIL(arg.old_users_.push_back(old_username))) {
LOG_WARN("Add origin user name failed", K(ret));
} else if (OB_FAIL(arg.old_hosts_.push_back(old_hostname))) {
LOG_WARN("Add origin host name failed", K(ret));
} else if (OB_FAIL(arg.new_users_.push_back(new_username))) {
LOG_WARN("Add new user name failed", K(ret));
} else if (OB_FAIL(arg.new_hosts_.push_back(new_hostname))) {
LOG_WARN("Add new host name failed", K(ret));
{
ObSchemaGetterGuard schema_guard;
if (OB_FAIL(GCTX.schema_service_->get_tenant_schema_guard(tenant_id, schema_guard))) {
LOG_WARN("get schema guard failed", K(ret));
}
//rename_infos arr contains old names and new names in pairs, so step is 2
for (int64_t i = 0; OB_SUCC(ret) && i < rename_infos->count(); i += 4) {
if (OB_FAIL(rename_infos->get_string(i, old_username))) {
LOG_WARN("Get origin name failed", K(ret));
} else if (OB_FAIL(rename_infos->get_string(i + 1, old_hostname))) {
LOG_WARN("Get to name failed", K(ret));
} else if (OB_FAIL(rename_infos->get_string(i + 2, new_username))) {
LOG_WARN("Get to name failed", K(ret));
} else if (OB_FAIL(rename_infos->get_string(i + 3, new_hostname))) {
LOG_WARN("Get to name failed", K(ret));
} else if (OB_FAIL(arg.old_users_.push_back(old_username))) {
LOG_WARN("Add origin user name failed", K(ret));
} else if (OB_FAIL(arg.old_hosts_.push_back(old_hostname))) {
LOG_WARN("Add origin host name failed", K(ret));
} else if (OB_FAIL(arg.new_users_.push_back(new_username))) {
LOG_WARN("Add new user name failed", K(ret));
} else if (OB_FAIL(arg.new_hosts_.push_back(new_hostname))) {
LOG_WARN("Add new host name failed", K(ret));
} else if (OB_FAIL(ObCreateUserExecutor::check_user_valid(schema_guard, ctx.get_my_session()->get_user_priv_set(), tenant_id,
old_username, old_hostname, "RENAME USER"))) {
LOG_WARN("check user valid failed", K(ret));
} else if (OB_FAIL(ObCreateUserExecutor::check_user_valid(schema_guard, ctx.get_my_session()->get_user_priv_set(), tenant_id,
new_username, new_hostname, "RENAME USER"))) {
LOG_WARN("check user valid failed", K(ret));
}
}
}
if (OB_SUCC(ret)) {