diff --git a/src/rootserver/ob_ddl_service.cpp b/src/rootserver/ob_ddl_service.cpp index f9806af4b5..766469b6d6 100755 --- a/src/rootserver/ob_ddl_service.cpp +++ b/src/rootserver/ob_ddl_service.cpp @@ -8389,7 +8389,6 @@ int ObDDLService::get_index_schema_by_name( ObArenaAllocator allocator(ObModIds::OB_SCHEMA); const ObString &index_name = drop_index_arg.index_name_; const bool is_mlog = (obrpc::ObIndexArg::DROP_MLOG == drop_index_arg.index_action_type_); - index_table_schema = nullptr; //build index name and get index schema if (is_mlog) { @@ -8413,12 +8412,6 @@ int ObDDLService::get_index_schema_by_name( LOG_USER_ERROR(OB_ERR_CANT_DROP_FIELD_OR_KEY, index_name.length(), index_name.ptr()); LOG_WARN("get index table schema failed", K(tenant_id), K(database_id), K(index_table_name), K(ret)); - } else if (is_index && data_table_id != index_table_schema->get_data_table_id()) { - ret = OB_ERR_CANT_DROP_FIELD_OR_KEY; - LOG_USER_ERROR(OB_ERR_CANT_DROP_FIELD_OR_KEY, index_name.length(), index_name.ptr()); - LOG_WARN("get index table schema failed", K(tenant_id), - K(database_id), K(index_table_name), K(index_table_schema->get_table_id()), K(ret)); - index_table_schema = nullptr; } else if (index_table_schema->is_in_recyclebin()) { ret = OB_ERR_OPERATION_ON_RECYCLE_OBJECT; LOG_WARN("index table is in recyclebin", K(ret)); diff --git a/src/storage/ddl/ob_ddl_lock.cpp b/src/storage/ddl/ob_ddl_lock.cpp index 01b1d0cd3d..31f3e4ef84 100644 --- a/src/storage/ddl/ob_ddl_lock.cpp +++ b/src/storage/ddl/ob_ddl_lock.cpp @@ -92,9 +92,9 @@ int ObDDLLock::lock_for_add_drop_index( const int64_t timeout_us = DEFAULT_TIMEOUT; ObSEArray data_tablet_ids; ObInnerSQLConnection *iconn = nullptr; - if (OB_UNLIKELY(data_table_schema.is_user_hidden_table() || data_table_id != index_schema.get_data_table_id())) { + if (data_table_schema.is_user_hidden_table()) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("lock for rebuild hidden table index", K(ret), K(tenant_id), K(data_table_id), K(index_table_id), K(index_schema.get_data_table_id())); + LOG_WARN("lock for rebuild hidden table index", K(ret)); } else if (!need_lock(data_table_schema)) { LOG_INFO("skip ddl lock", K(data_table_id)); } else {