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

[FEAT MERGE] tablelock_42

Browse Source 
Co-authored-by: YangEfei <yangyifei96@outlook.com>
Co-authored-by: joseph12138 <17862707376@163.com>
This commit is contained in:
obdev
2023-05-12 03:11:22 +00:00
committed by ob-robot
parent 3ed0e51931
commit a9b068daa1
23 changed files with 1324 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/sql/engine/cmd/ob_lock_table_executor.cpp
View File

@ -12,7 +12,6 @@
#define USING_LOG_PREFIX SQL_ENG
#include "sql/engine/cmd/ob_lock_table_executor.h"
#include "sql/resolver/ddl/ob_lock_table_stmt.h"
#include "sql/engine/ob_exec_context.h"
@ -35,10 +34,38 @@ int ObLockTableExecutor::execute(ObExecContext &ctx,
} else if (is_mysql_mode()) {
LOG_DEBUG("mysql mode do nothing");
} else {
if (OB_FAIL(ObSqlTransControl::lock_table(ctx,
stmt.get_table_id(),
stmt.get_lock_mode()))) {
LOG_WARN("fail lock table", K(ret), K(stmt.get_lock_mode()), K(stmt.get_table_id()));
const common::ObIArray<TableItem *> &table_items = stmt.get_table_items();
if (OB_UNLIKELY(table_items.empty())) {
ret = OB_INVALID_ARGUMENT;
LOG_ERROR("there's no table in the stmt", K(ret));
}
for (int64_t i = 0; OB_SUCC(ret) && i < table_items.count(); ++i) {
TableItem *table_item = table_items.at(i);
// handle compatibility
// If the version of cluster is updated than 4.1, it can use
// 'wait n' or 'no wait' grammar. Otherwise, it should follow
// the previous logic (i.e. try lock until trx / sql timeout)
int64_t wait_lock_seconds;
if (GET_MIN_CLUSTER_VERSION() > CLUSTER_VERSION_4_1_0_0) {
wait_lock_seconds = stmt.get_wait_lock_seconds();
} else {
wait_lock_seconds = -1;
}
if (OB_FAIL(ObSqlTransControl::lock_table(
ctx, table_item->ref_id_, table_item->part_ids_,
stmt.get_lock_mode(), wait_lock_seconds))) {
if ((OB_TRY_LOCK_ROW_CONFLICT == ret ||
OB_ERR_EXCLUSIVE_LOCK_CONFLICT == ret ||
OB_ERR_SHARED_LOCK_CONFLICT == ret) &&
wait_lock_seconds >= 0) {
ret = OB_ERR_EXCLUSIVE_LOCK_CONFLICT_NOWAIT;
}
LOG_WARN("fail lock table", K(ret), K(stmt.get_lock_mode()),
K(wait_lock_seconds), K(table_item->ref_id_),
K(table_item->part_ids_));
}
}
bool explicit_trans = session->has_explicit_start_trans();
bool ac = false;
@ -57,6 +84,5 @@ int ObLockTableExecutor::execute(ObExecContext &ctx,
return ret;
}
} // sql
} // oceanbase
} // namespace sql
} // namespace oceanbase