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

Cherry commit from 3.1 to 3.1 opensource

Browse Source
This commit is contained in:
stdliu
2021-07-26 11:51:13 +08:00
committed by wangzelin.wzl
parent f2b3572e34
commit a24b0eb4e7
7 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sql/executor/ob_distributed_transmit.cpp
View File

@ -160,11 +160,11 @@ int ObDistributedTransmit::inner_open(ObExecContext& exec_ctx) const
ObIArray<ObSliceEvent>* slice_events = NULL;
uint64_t slice_table_id = repartition_table_id_;
ObSchemaGetterGuard schema_guard;
const ObTableSchema* table_schema = NULL;
ObSchemaGetterGuard *schema_guard = exec_ctx.get_sql_ctx()->schema_guard_;
const ObTableSchema *table_schema = NULL;
int64_t interm_result_buf_len = get_split_task_count() * sizeof(ObIntermResult*);
if (OB_ISNULL(child_op_)) {
int64_t interm_result_buf_len = get_split_task_count() * sizeof(ObIntermResult *);
if (OB_ISNULL(child_op_) || OB_ISNULL(schema_guard)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("child op is NULL", K(ret));
} else if (OB_UNLIKELY(get_split_task_count() <= 0)) {
@ -212,9 +212,7 @@ int ObDistributedTransmit::inner_open(ObExecContext& exec_ctx) const
}
if (OB_SUCC(ret) && OB_INVALID_ID != slice_table_id) {
if (OB_FAIL(GCTX.schema_service_->get_tenant_schema_guard(session->get_effective_tenant_id(), schema_guard))) {
LOG_WARN("faile to get schema guard", K(ret));
} else if (OB_FAIL(schema_guard.get_table_schema(slice_table_id, table_schema))) {
if (OB_FAIL(schema_guard->get_table_schema(slice_table_id, table_schema))) {
LOG_WARN("faile to get table schema", K(ret), K(slice_table_id));
} else if (OB_ISNULL(table_schema)) {
ret = OB_ERR_UNEXPECTED;

7
src/sql/executor/ob_remote_executor_processor.cpp
View File

@ -295,7 +295,9 @@ int ObRemoteBaseExecuteP<T>::sync_send_result(ObExecContext& exec_ctx, const ObP
bool need_flush = false;
if (is_static_engine) {
bool added = false;
if (OB_FAIL(scanner.try_add_row(se_op->get_spec().output_, exec_ctx.get_eval_ctx(), added))) {
if (OB_FAIL(scanner.try_add_row(se_op->get_spec().output_,
exec_ctx.get_eval_ctx(),
added))) {
LOG_WARN("fail add row to scanner", K(ret));
} else if (!added) {
need_flush = true;
@ -1178,7 +1180,8 @@ int ObRpcRemoteASyncExecuteP::send_result_to_controller(ObExecContext& exec_ctx,
if (OB_UNLIKELY(OB_ITER_END != ret)) {
LOG_WARN("failed to get next row", K(ret));
}
} else if (OB_FAIL(scanner.try_add_row(se_op->get_spec().output_, exec_ctx.get_eval_ctx(), added))) {
} else if (OB_FAIL(scanner.try_add_row(se_op->get_spec().output_,
exec_ctx.get_eval_ctx(), added))) {
LOG_WARN("fail add row to scanner", K(ret));
} else if (!added) {
buffer_enough = true;