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

[to #45990438]fix bugs about trigger order

Browse Source
This commit is contained in:
seuwebber 2023-02-06 14:35:04 +08:00 committed by ob-robot
parent 3ba8909e40
commit 4c1209c6c7
4 changed files with 106 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/rootserver/ob_ddl_service.cpp
View File

@ -31744,13 +31744,19 @@ int ObDDLService::adjust_trigger_action_order(share::schema::ObSchemaGetterGuard
}
if (OB_FAIL(ret)) {
} else if (is_oracle_mode) {
if (NULL != ref_trg_info) {
uint64_t ref_db_id = OB_INVALID_ID;
OZ (schema_guard.get_database_id(tenant_id, trigger_info.get_ref_trg_db_name(), ref_db_id));
OZ (schema_guard.get_trigger_info(tenant_id, ref_db_id, trigger_info.get_ref_trg_name(), ref_trg_info));
if (OB_SUCC(ret) && trigger_info.is_order_follows()) {
action_order = ref_trg_info->get_action_order() + 1;
OZ (recursive_check_trigger_ref_cyclic(schema_guard, trigger_info, trg_list,
trigger_info.get_trigger_name(), trigger_info.get_ref_trg_name()));
if (OB_SUCC(ret)) {
if (NULL != ref_trg_info) {
uint64_t ref_db_id = OB_INVALID_ID;
OZ (schema_guard.get_database_id(tenant_id, trigger_info.get_ref_trg_db_name(), ref_db_id));
OZ (schema_guard.get_trigger_info(tenant_id, ref_db_id, trigger_info.get_ref_trg_name(), ref_trg_info));
if (OB_SUCC(ret) && trigger_info.is_order_follows()) {
action_order = ref_trg_info->get_action_order() + 1;
}
}
OZ (recursive_alter_ref_trigger(schema_guard, trans, ddl_operator, trigger_info,
trg_list, trigger_info.get_trigger_name(), action_order));
}
} else {
if (NULL == ref_trg_info) {
@ -31801,9 +31807,68 @@ int ObDDLService::adjust_trigger_action_order(share::schema::ObSchemaGetterGuard
}
}
}
#undef ALTER_OLD_TRIGGER
return ret;
}
int ObDDLService::recursive_alter_ref_trigger(share::schema::ObSchemaGetterGuard &schema_guard,
ObDDLSQLTransaction &trans,
ObDDLOperator &ddl_operator,
const ObTriggerInfo &ref_trigger_info,
const common::ObIArray<uint64_t> &trigger_list,
const ObString &trigger_name,
int64_t action_order)
{
int ret = OB_SUCCESS;
int64_t tenant_id = ref_trigger_info.get_tenant_id();
const ObTriggerInfo *trg_info = NULL;
int64_t new_action_order = 0;
for (int64_t i = 0; OB_SUCC(ret) && i < trigger_list.count(); i++) {
OZ (schema_guard.get_trigger_info(tenant_id, trigger_list.at(i), trg_info));
OV (OB_NOT_NULL(trg_info));
if (0 != trg_info->get_trigger_name().case_compare(trigger_name)) {
if (OB_SUCC(ret) && 0 == trg_info->get_ref_trg_name().case_compare(ref_trigger_info.get_trigger_name())) {
ObTriggerInfo copy_trg_info;
OX (new_action_order = action_order + 1);
OZ (copy_trg_info.assign(*trg_info));
OX (copy_trg_info.set_action_order(new_action_order));
OZ (ddl_operator.alter_trigger(copy_trg_info, trans, NULL, false/*is_update_table_schema_version*/));
OZ (SMART_CALL(recursive_alter_ref_trigger(schema_guard, trans, ddl_operator,
*trg_info, trigger_list, trigger_name, new_action_order)));
}
}
}
return ret;
}
int ObDDLService::recursive_check_trigger_ref_cyclic(share::schema::ObSchemaGetterGuard &schema_guard,
const ObTriggerInfo &ref_trigger_info,
const common::ObIArray<uint64_t> &trigger_list,
const ObString &create_trigger_name,
const ObString &generate_cyclic_name)
{
int ret = OB_SUCCESS;
const uint64_t tenant_id = ref_trigger_info.get_tenant_id();
const ObTriggerInfo *trg_info = NULL;
for (int64_t i = 0; OB_SUCC(ret) && i < trigger_list.count(); i++) {
OZ (schema_guard.get_trigger_info(tenant_id, trigger_list.at(i), trg_info));
OV (OB_NOT_NULL(trg_info));
if (OB_SUCC(ret)) {
if (0 != trg_info->get_trigger_name().case_compare(create_trigger_name)) {
if (0 == trg_info->get_ref_trg_name().case_compare(ref_trigger_info.get_trigger_name())) {
if (0 == trg_info->get_trigger_name().case_compare(generate_cyclic_name)) {
ret = OB_ERR_REF_CYCLIC_IN_TRG;
LOG_WARN("ORA-25023: cyclic trigger dependency is not allowed", K(ret),
K(generate_cyclic_name), KPC(trg_info));
}
OZ (SMART_CALL(recursive_check_trigger_ref_cyclic(schema_guard, *trg_info, trigger_list,
create_trigger_name, generate_cyclic_name)));
}
}
}
}
return ret;
}
int ObDDLService::handle_rls_policy_ddl(const obrpc::ObRlsPolicyDDLArg &arg)
{

12
src/rootserver/ob_ddl_service.h
View File

@ -959,6 +959,18 @@ public:
ObDDLOperator &ddl_operator,
ObTriggerInfo &trigger_info,
bool is_create_trigger);
int recursive_alter_ref_trigger(share::schema::ObSchemaGetterGuard &schema_guard,
ObDDLSQLTransaction &trans,
ObDDLOperator &ddl_operator,
const ObTriggerInfo &ref_trigger_info,
const common::ObIArray<uint64_t> &trigger_list,
const ObString &trigger_name,
int64_t action_order);
int recursive_check_trigger_ref_cyclic(share::schema::ObSchemaGetterGuard &schema_guard,
const ObTriggerInfo &ref_trigger_info,
const common::ObIArray<uint64_t> &trigger_list,
const ObString &create_trigger_name,
const ObString &generate_cyclic_name);
// only push schema version, and publish schema
int log_nop_operation(const obrpc::ObDDLNopOpreatorArg &arg);

4
src/share/schema/ob_trigger_info.h
View File

@ -403,8 +403,8 @@ public:
OB_INLINE uint64_t get_sql_mode() const { return sql_mode_; }
OB_INLINE OrderType get_order_type() const { return order_type_; }
OB_INLINE int64_t get_order_type_value() const { return static_cast<int64_t>(order_type_); }
OB_INLINE bool is_order_follows() { return OT_FOLLOWS == order_type_; }
OB_INLINE bool is_order_precedes() { return OT_PRECEDES == order_type_; }
OB_INLINE bool is_order_follows() const { return OT_FOLLOWS == order_type_; }
OB_INLINE bool is_order_precedes() const { return OT_PRECEDES == order_type_; }
OB_INLINE const common::ObString &get_ref_trg_db_name() const { return ref_trg_db_name_; }
OB_INLINE const common::ObString &get_ref_trg_name() const { return ref_trg_name_; }
OB_INLINE int64_t get_action_order() const { return action_order_; }

25
src/sql/code_generator/ob_dml_cg_service.cpp
View File

@ -1783,7 +1783,7 @@ int ObDmlCgService::convert_normal_triggers(ObLogDelUpd &log_op,
} else if (trigger_info->is_enable()) {
// if disable trigger, use the previous plan cache, whether trigger is enable ???
need_fire = trigger_info->has_event(dml_event);
if (OB_SUCC(ret) && need_fire && !trigger_info->get_ref_trg_name().empty()) {
if (OB_SUCC(ret) && need_fire && !trigger_info->get_ref_trg_name().empty() && lib::is_oracle_mode()) {
const ObTriggerInfo *ref_trigger_info = NULL;
uint64_t ref_db_id = OB_INVALID_ID;
OZ (schema_guard->get_database_id(tenant_id, trigger_info->get_ref_trg_db_name(), ref_db_id));
@ -1793,9 +1793,26 @@ int ObDmlCgService::convert_normal_triggers(ObLogDelUpd &log_op,
ret = OB_ERR_TRIGGER_NOT_EXIST;
LOG_WARN("ref_trigger_info is NULL", K(trigger_info->get_ref_trg_db_name()),
K(trigger_info->get_ref_trg_name()), K(ret));
if (lib::is_oracle_mode()) {
LOG_ORACLE_USER_ERROR(OB_ERR_TRIGGER_NOT_EXIST, trigger_info->get_ref_trg_name().length(),
trigger_info->get_ref_trg_name().ptr());
LOG_ORACLE_USER_ERROR(OB_ERR_TRIGGER_NOT_EXIST, trigger_info->get_ref_trg_name().length(),
trigger_info->get_ref_trg_name().ptr());
}
if (OB_SUCC(ret)) {
if (trigger_info->is_simple_dml_type() && !ref_trigger_info->is_compound_dml_type()) {
if (!(trigger_info->is_row_level_before_trigger() && ref_trigger_info->is_row_level_before_trigger())
&& !(trigger_info->is_row_level_after_trigger() && ref_trigger_info->is_row_level_after_trigger())
&& !(trigger_info->is_stmt_level_before_trigger() && ref_trigger_info->is_stmt_level_before_trigger())
&& !(trigger_info->is_stmt_level_after_trigger()
&& ref_trigger_info->is_stmt_level_after_trigger())) {
ret = OB_ERR_RECOMPILATION_OBJECT;
LOG_WARN("errors during recompilation/revalidation of trigger",
KPC(trigger_info), KPC(ref_trigger_info), K(ret));
// ref_trg_db_name and trigger_info's database_name are the same
LOG_ORACLE_USER_ERROR(OB_ERR_RECOMPILATION_OBJECT,
trigger_info->get_ref_trg_db_name().length(),
trigger_info->get_ref_trg_db_name().ptr(),
trigger_info->get_trigger_name().length(),
trigger_info->get_trigger_name().ptr());
}
}
}
}