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

[CP] skip modify view status for unnecessary alter table stmt

Browse Source
This commit is contained in:
obdev
2024-02-06 22:42:13 +00:00
committed by ob-robot
parent b5d6cb393f
commit 20c83158e0
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/rootserver/ob_ddl_service.cpp
View File

@ -10865,8 +10865,10 @@ int ObDDLService::alter_table_in_trans(obrpc::ObAlterTableArg &alter_table_arg,
} else if (OB_FAIL(trans.start(sql_proxy_, tenant_id, refreshed_schema_version))) { } else if (OB_FAIL(trans.start(sql_proxy_, tenant_id, refreshed_schema_version))) {
LOG_WARN("start transaction failed", KR(ret), K(tenant_id), K(refreshed_schema_version)); LOG_WARN("start transaction failed", KR(ret), K(tenant_id), K(refreshed_schema_version));
// All alter table behaviors will cause the status to change, which is not as fine as oracle // All alter table behaviors will cause the status to change, which is not as fine as oracle
} else if (OB_FAIL(ObDependencyInfo::modify_dep_obj_status(trans, tenant_id, orig_table_schema->get_table_id(), } else if (need_modify_dep_obj_status(alter_table_arg)
ddl_operator, *schema_service_))) { && OB_FAIL(ObDependencyInfo::modify_dep_obj_status(trans, tenant_id,
orig_table_schema->get_table_id(),
ddl_operator, *schema_service_))) {
LOG_WARN("failed to modify obj status", K(ret)); LOG_WARN("failed to modify obj status", K(ret));
} else { } else {
ObArray<ObTableSchema> global_idx_schema_array; ObArray<ObTableSchema> global_idx_schema_array;
@ -11774,7 +11776,8 @@ int ObDDLService::do_offline_ddl_in_trans(obrpc::ObAlterTableArg &alter_table_ar
} }
// TODO yiren, refactor it, create user hidden table after alter index/column/part/cst... // TODO yiren, refactor it, create user hidden table after alter index/column/part/cst...
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
} else if (OB_FAIL(ObDependencyInfo::modify_dep_obj_status(trans, tenant_id, orig_table_schema->get_table_id(), } else if (need_modify_dep_obj_status(alter_table_arg)
&& OB_FAIL(ObDependencyInfo::modify_dep_obj_status(trans, tenant_id, orig_table_schema->get_table_id(),
ddl_operator, *schema_service_))) { ddl_operator, *schema_service_))) {
LOG_WARN("failed to modify obj status", K(ret)); LOG_WARN("failed to modify obj status", K(ret));
} else if (OB_FAIL(check_ddl_with_primary_key_operation(alter_table_arg, } else if (OB_FAIL(check_ddl_with_primary_key_operation(alter_table_arg,
@ -36085,5 +36088,13 @@ int ObDDLService::check_same_subpartition_(const bool is_oracle_mode, const ObSu
return ret; return ret;
} }
bool ObDDLService::need_modify_dep_obj_status(const obrpc::ObAlterTableArg &alter_table_arg) const
{
const AlterTableSchema &alter_table_schema = alter_table_arg.alter_table_schema_;
return (alter_table_arg.is_alter_columns_
|| (alter_table_arg.is_alter_options_
&& alter_table_schema.alter_option_bitset_.has_member(ObAlterTableArg::TABLE_NAME)));
}
} // end namespace rootserver } // end namespace rootserver
} // end namespace oceanbase } // end namespace oceanbase

2
src/rootserver/ob_ddl_service.h
View File

@ -2595,6 +2595,8 @@ private:
return !(orig_key == (new_key)); return !(orig_key == (new_key));
} }
bool need_modify_dep_obj_status(const obrpc::ObAlterTableArg &alter_table_arg) const;
private: private:
bool inited_; bool inited_;
volatile bool stopped_; volatile bool stopped_;

1
src/share/schema/ob_dependency_info.cpp
View File

@ -541,6 +541,7 @@ int ObDependencyInfo::modify_all_obj_status(const ObIArray<std::pair<uint64_t, s
} else if (!view_schema.is_view_table()) { } else if (!view_schema.is_view_table()) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("get wrong schema", K(ret), K(view_schema)); LOG_WARN("get wrong schema", K(ret), K(view_schema));
} else if (new_status == view_schema.get_object_status()) {
} else if (OB_FAIL(schema_service.gen_new_schema_version(tenant_id, refresh_schema_version))) { } else if (OB_FAIL(schema_service.gen_new_schema_version(tenant_id, refresh_schema_version))) {
LOG_WARN("fail to gen new schema_version", K(ret), K(tenant_id)); LOG_WARN("fail to gen new schema_version", K(ret), K(tenant_id));
} else if (OB_FAIL(ddl_operator.update_table_status(view_schema, refresh_schema_version, } else if (OB_FAIL(ddl_operator.update_table_status(view_schema, refresh_schema_version,