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

@ -14,27 +14,23 @@
#include "lib/allocator/ob_allocator.h"
#include "sql/executor/ob_job.h"
#include "sql/executor/ob_job_conf.h"
#include "sql/executor/ob_task_spliter_factory.h"
#include "sql/executor/ob_local_identity_task_spliter.h"
#include "sql/executor/ob_remote_identity_task_spliter.h"
#include "sql/executor/ob_multiscan_task_spliter.h"
#include "sql/executor/ob_interm_task_spliter.h"
#include "sql/executor/ob_task_executor_ctx.h"
#include "sql/engine/ob_exec_context.h"
#include "sql/executor/ob_multiinsert_task_spliter.h"
#include "sql/executor/ob_determinate_task_spliter.h"
using namespace oceanbase::common;
using namespace oceanbase::sql;
ObTaskSpliterFactory::ObTaskSpliterFactory() : store_()
{}
{
}
ObTaskSpliterFactory::~ObTaskSpliterFactory()
{
for (int64_t i = 0; i < store_.count(); ++i) {
ObTaskSpliter* ts = store_.at(i);
ObTaskSpliter *ts = store_.at(i);
if (OB_LIKELY(NULL != ts)) {
ts->~ObTaskSpliter();
}
@ -44,7 +40,7 @@ ObTaskSpliterFactory::~ObTaskSpliterFactory()
void ObTaskSpliterFactory::reset()
{
for (int64_t i = 0; i < store_.count(); ++i) {
ObTaskSpliter* ts = store_.at(i);
ObTaskSpliter *ts = store_.at(i);
if (OB_LIKELY(NULL != ts)) {
ts->~ObTaskSpliter();
}
@ -52,26 +48,32 @@ void ObTaskSpliterFactory::reset()
store_.reset();
}
#define ALLOCATE_TASK_SPLITER(T) \
void* ptr = allocator.alloc(sizeof(T)); \
if (OB_ISNULL(ptr)) { \
ret = OB_ALLOCATE_MEMORY_FAILED; \
} else { \
T* s = new (ptr) T(); \
if (OB_FAIL(store_.push_back(s))) { \
s->~T(); \
LOG_WARN("fail to store spliter", K(ret)); \
} else if (OB_FAIL(s->init(exec_ctx.get_physical_plan_ctx(), &exec_ctx, job, exec_ctx.get_sche_allocator()))) { \
LOG_WARN("fail to init spliter", K(ret)); \
} else { \
spliter = s; \
} \
}
#define ALLOCATE_TASK_SPLITER(T) \
void *ptr = allocator.alloc(sizeof(T)); \
if (OB_ISNULL(ptr)) { \
ret = OB_ALLOCATE_MEMORY_FAILED; \
} else { \
T *s = new(ptr)T(); \
if (OB_FAIL(store_.push_back(s))) { \
s->~T(); \
LOG_WARN("fail to store spliter", K(ret)); \
} else if (OB_FAIL(s->init(exec_ctx.get_physical_plan_ctx(), \
&exec_ctx, \
job, \
exec_ctx.get_sche_allocator()))) { \
LOG_WARN("fail to init spliter", K(ret)); \
} else { \
spliter = s; \
}\
}
int ObTaskSpliterFactory::create(ObExecContext& exec_ctx, ObJob& job, int spliter_type, ObTaskSpliter*& spliter)
int ObTaskSpliterFactory::create(ObExecContext &exec_ctx,
ObJob &job,
int spliter_type,
ObTaskSpliter *&spliter)
{
int ret = OB_SUCCESS;
ObIAllocator& allocator = exec_ctx.get_sche_allocator();
ObIAllocator &allocator = exec_ctx.get_sche_allocator();
switch (spliter_type) {
case ObTaskSpliter::LOCAL_IDENTITY_SPLIT: {
ALLOCATE_TASK_SPLITER(ObLocalIdentityTaskSpliter);
@ -81,26 +83,6 @@ int ObTaskSpliterFactory::create(ObExecContext& exec_ctx, ObJob& job, int splite
ALLOCATE_TASK_SPLITER(ObRemoteIdentityTaskSpliter);
break;
}
case ObTaskSpliter::INTERM_SPLIT: {
ALLOCATE_TASK_SPLITER(ObIntermTaskSpliter);
break;
}
case ObTaskSpliter::INSERT_SPLIT: {
ALLOCATE_TASK_SPLITER(ObMultiInsertTaskSpliter);
break;
}
case ObTaskSpliter::INTRA_PARTITION_SPLIT: {
ALLOCATE_TASK_SPLITER(ObIntraPartitionTaskSpliter);
break;
}
case ObTaskSpliter::DISTRIBUTED_SPLIT: {
ALLOCATE_TASK_SPLITER(ObDistributedTaskSpliter);
break;
}
case ObTaskSpliter::DETERMINATE_TASK_SPLIT: {
ALLOCATE_TASK_SPLITER(ObDeterminateTaskSpliter);
break;
}
default: {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("unexpected spliter type", K(spliter_type));
@ -109,3 +91,4 @@ int ObTaskSpliterFactory::create(ObExecContext& exec_ctx, ObJob& job, int splite
}
return ret;
}