patch 4.0

This commit is contained in:
wangzelin.wzl
2022-10-24 10:34:53 +08:00
parent 4ad6e00ec3
commit 93a1074b0c
10533 changed files with 2588271 additions and 2299373 deletions

View File

@ -19,44 +19,49 @@
#include "sql/executor/ob_local_job_executor.h"
#include "lib/utility/ob_tracepoint.h"
#include "lib/profile/ob_perf_event.h"
namespace oceanbase {
namespace sql {
namespace oceanbase
{
namespace sql
{
using namespace oceanbase::common;
ObLocalJobExecutor::ObLocalJobExecutor() : job_(NULL), executor_(NULL)
{}
ObLocalJobExecutor::ObLocalJobExecutor()
: job_(NULL),
executor_(NULL)
{
}
ObLocalJobExecutor::~ObLocalJobExecutor()
{}
{
}
int ObLocalJobExecutor::execute(ObExecContext& query_ctx)
int ObLocalJobExecutor::execute(ObExecContext &query_ctx)
{
int ret = OB_SUCCESS;
ObTaskInfo* task_info = NULL;
ObTaskInfo *task_info = NULL;
if (OB_I(t1)(OB_ISNULL(job_) || OB_ISNULL(executor_))) {
if (OB_I(t1) (OB_ISNULL(job_) || OB_ISNULL(executor_))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("job_ or executor_ is NULL", K(ret), K(job_), K(executor_));
} else if (OB_FAIL(OB_I(t2) get_executable_task(query_ctx, task_info))) {
} else if (OB_FAIL(OB_I(t2) get_executable_task(query_ctx, task_info))) { //获得一个task
LOG_WARN("fail get a executable task.", K(ret));
} else if (OB_ISNULL(task_info)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("task info is NULL", K(ret));
} else if (OB_FAIL(OB_I(t3) executor_->execute(query_ctx, job_, task_info))) {
LOG_WARN("fail execute task.", K(ret), K(*task_info));
} else {
}
} else {}
return ret;
}
int ObLocalJobExecutor::get_executable_task(ObExecContext& ctx, ObTaskInfo*& task_info)
int ObLocalJobExecutor::get_executable_task(ObExecContext &ctx, ObTaskInfo *&task_info)
{
int ret = OB_SUCCESS;
ObTaskControl* tq = NULL;
ObSEArray<ObTaskInfo*, 1> ready_tasks;
ObTaskControl *tq = NULL;
ObSEArray<ObTaskInfo *, 1> ready_tasks;
if (OB_I(t1)(OB_ISNULL(job_) || OB_ISNULL(executor_))) {
if (OB_I(t1) (OB_ISNULL(job_) || OB_ISNULL(executor_))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("job_ or executor_ is NULL", K(ret), K(job_), K(executor_));
} else if (OB_FAIL(OB_I(t1) job_->get_task_control(ctx, tq))) {
@ -71,10 +76,9 @@ int ObLocalJobExecutor::get_executable_task(ObExecContext& ctx, ObTaskInfo*& tas
LOG_WARN("unexpected ready task count", "ready_tasks_count", ready_tasks.count());
} else if (OB_FAIL(OB_I(t4) ready_tasks.at(0, task_info))) {
LOG_WARN("fail get task from array", K(ret));
} else {
}
} else {}
return ret;
}
} // namespace sql
} // namespace oceanbase
} /* ns sql */
} /* ns oceanbase */