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

white scan bugfix

Browse Source
This commit is contained in:
obdev
2021-07-10 15:15:12 +08:00
committed by wangzelin.wzl
parent 4fdec18c61
commit eb4dc36332
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -84,3 +84,4 @@ deps/3rd
compile_commands.json compile_commands.json
test/tmp test/tmp
test/var test/var
*.ccls-cache/

8
src/sql/privilege_check/ob_privilege_check.cpp
View File

@ -425,14 +425,14 @@ int get_merge_stmt_ora_need_privs(uint64_t user_id, const ObSqlCtx& ctx, const O
OX(source_table = merge_stmt->get_table_item_by_id(merge_stmt->get_source_table_id())); OX(source_table = merge_stmt->get_table_item_by_id(merge_stmt->get_source_table_id()));
CK(target_table != NULL && source_table != NULL); CK(target_table != NULL && source_table != NULL);
/* first add target table */ /* first add target table */
if (TableItem::BASE_TABLE == target_table->type_ || TableItem::ALIAS_TABLE == target_table->type_ || if (OB_SUCC(ret) && (TableItem::BASE_TABLE == target_table->type_ || TableItem::ALIAS_TABLE == target_table->type_ ||
target_table->is_view_table_) { target_table->is_view_table_)) {
OZ(set_privs_by_table_item_recursively(user_id, ctx, target_table, packed_privs, need_privs, check_flag)); OZ(set_privs_by_table_item_recursively(user_id, ctx, target_table, packed_privs, need_privs, check_flag));
} }
/* then add source table */ /* then add source table */
OZ(ObPrivPacker::pack_raw_obj_priv(NO_OPTION, OBJ_PRIV_ID_SELECT, packed_privs)); OZ(ObPrivPacker::pack_raw_obj_priv(NO_OPTION, OBJ_PRIV_ID_SELECT, packed_privs));
if (TableItem::BASE_TABLE == source_table->type_ || TableItem::ALIAS_TABLE == source_table->type_ || if (OB_SUCC(ret) && (TableItem::BASE_TABLE == source_table->type_ || TableItem::ALIAS_TABLE == source_table->type_ ||
source_table->is_view_table_) { source_table->is_view_table_)) {
OZ(set_privs_by_table_item_recursively(user_id, ctx, source_table, packed_privs, need_privs, check_flag)); OZ(set_privs_by_table_item_recursively(user_id, ctx, source_table, packed_privs, need_privs, check_flag));
} }
return ret; return ret;

6
src/sql/resolver/dcl/ob_grant_stmt.h
View File

@ -114,15 +114,15 @@ public:
{ {
object_id_ = object_id; object_id_ = object_id;
} }
int set_ins_col_ids(ObSEArray<uint64_t, 4> col_ids) int set_ins_col_ids(ObSEArray<uint64_t, 4> &col_ids)
{ {
return ins_col_ids_.assign(col_ids); return ins_col_ids_.assign(col_ids);
} }
int set_upd_col_ids(ObSEArray<uint64_t, 4> col_ids) int set_upd_col_ids(ObSEArray<uint64_t, 4> &col_ids)
{ {
return upd_col_ids_.assign(col_ids); return upd_col_ids_.assign(col_ids);
} }
int set_ref_col_ids(ObSEArray<uint64_t, 4> col_ids) int set_ref_col_ids(ObSEArray<uint64_t, 4> &col_ids)
{ {
return ref_col_ids_.assign(col_ids); return ref_col_ids_.assign(col_ids);
} }