Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
不争之德
oceanbase
提交
f3f54ca0
O
oceanbase
项目概览
不争之德
/
oceanbase
与 Fork 源项目一致
Fork自
oceanbase / oceanbase
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oceanbase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f3f54ca0
编写于
7月 31, 2022
作者:
O
obdev
提交者:
wangzelin.wzl
7月 31, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[CP] adjust NLJ/NL connectby open
上级
edd206c0
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
17 addition
and
194 deletion
+17
-194
src/sql/engine/connect_by/ob_nl_cnnt_by_with_index_op.cpp
src/sql/engine/connect_by/ob_nl_cnnt_by_with_index_op.cpp
+1
-30
src/sql/engine/connect_by/ob_nl_cnnt_by_with_index_op.h
src/sql/engine/connect_by/ob_nl_cnnt_by_with_index_op.h
+1
-3
src/sql/engine/join/ob_basic_nested_loop_join.cpp
src/sql/engine/join/ob_basic_nested_loop_join.cpp
+3
-83
src/sql/engine/join/ob_basic_nested_loop_join.h
src/sql/engine/join/ob_basic_nested_loop_join.h
+5
-18
src/sql/engine/join/ob_basic_nested_loop_join_op.cpp
src/sql/engine/join/ob_basic_nested_loop_join_op.cpp
+4
-39
src/sql/engine/join/ob_basic_nested_loop_join_op.h
src/sql/engine/join/ob_basic_nested_loop_join_op.h
+1
-5
src/sql/engine/join/ob_block_based_nested_loop_join.cpp
src/sql/engine/join/ob_block_based_nested_loop_join.cpp
+0
-7
src/sql/engine/join/ob_nested_loop_join.cpp
src/sql/engine/join/ob_nested_loop_join.cpp
+0
-5
src/sql/engine/join/ob_nested_loop_join_op.cpp
src/sql/engine/join/ob_nested_loop_join_op.cpp
+0
-4
src/sql/engine/ob_operator.cpp
src/sql/engine/ob_operator.cpp
+1
-0
src/sql/engine/ob_phy_operator.cpp
src/sql/engine/ob_phy_operator.cpp
+1
-0
未找到文件。
src/sql/engine/connect_by/ob_nl_cnnt_by_with_index_op.cpp
浏览文件 @
f3f54ca0
...
@@ -31,7 +31,6 @@ ObNLConnectByWithIndexOp::ObNLConnectByWithIndexOp(ObExecContext& exec_ctx, cons
...
@@ -31,7 +31,6 @@ ObNLConnectByWithIndexOp::ObNLConnectByWithIndexOp(ObExecContext& exec_ctx, cons
is_match_
(
false
),
is_match_
(
false
),
is_cycle_
(
false
),
is_cycle_
(
false
),
is_inited_
(
false
),
is_inited_
(
false
),
open_right_child_
(
false
),
need_return_
(
false
)
need_return_
(
false
)
{
{
state_operation_func_
[
CNTB_STATE_JOIN_END
]
=
&
ObNLConnectByWithIndexOp
::
join_end_operate
;
state_operation_func_
[
CNTB_STATE_JOIN_END
]
=
&
ObNLConnectByWithIndexOp
::
join_end_operate
;
...
@@ -89,7 +88,6 @@ void ObNLConnectByWithIndexOp::reset()
...
@@ -89,7 +88,6 @@ void ObNLConnectByWithIndexOp::reset()
root_row_
=
NULL
;
root_row_
=
NULL
;
cur_output_row_
=
NULL
;
cur_output_row_
=
NULL
;
is_inited_
=
false
;
is_inited_
=
false
;
open_right_child_
=
false
;
sys_connect_by_path_id_
=
INT64_MAX
;
sys_connect_by_path_id_
=
INT64_MAX
;
need_return_
=
false
;
need_return_
=
false
;
}
}
...
@@ -99,8 +97,6 @@ int ObNLConnectByWithIndexOp::inner_open()
...
@@ -99,8 +97,6 @@ int ObNLConnectByWithIndexOp::inner_open()
int
ret
=
OB_SUCCESS
;
int
ret
=
OB_SUCCESS
;
if
(
OB_FAIL
(
ObOperator
::
inner_open
()))
{
if
(
OB_FAIL
(
ObOperator
::
inner_open
()))
{
LOG_WARN
(
"failed to open in base class"
,
K
(
ret
));
LOG_WARN
(
"failed to open in base class"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
left_
->
open
()))
{
LOG_WARN
(
"failed to open left child"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
init
()))
{
}
else
if
(
OB_FAIL
(
init
()))
{
LOG_WARN
(
"fail to init Connect by Ctx"
,
K
(
ret
));
LOG_WARN
(
"fail to init Connect by Ctx"
,
K
(
ret
));
}
else
if
(
MY_SPEC
.
left_prior_exprs_
.
count
()
!=
MY_SPEC
.
right_prior_exprs_
.
count
())
{
}
else
if
(
MY_SPEC
.
left_prior_exprs_
.
count
()
!=
MY_SPEC
.
right_prior_exprs_
.
count
())
{
...
@@ -118,22 +114,11 @@ int ObNLConnectByWithIndexOp::inner_open()
...
@@ -118,22 +114,11 @@ int ObNLConnectByWithIndexOp::inner_open()
return
ret
;
return
ret
;
}
}
int
ObNLConnectByWithIndexOp
::
open_right_child
()
{
int
ret
=
OB_SUCCESS
;
if
(
!
right_
->
is_opened
()
&&
OB_FAIL
(
right_
->
open
()))
{
LOG_WARN
(
"failed to open right child"
,
K
(
ret
));
}
return
ret
;
}
int
ObNLConnectByWithIndexOp
::
rescan
()
int
ObNLConnectByWithIndexOp
::
rescan
()
{
{
int
ret
=
OB_SUCCESS
;
int
ret
=
OB_SUCCESS
;
reset
();
reset
();
if
(
OB_FAIL
(
open_right_child
()))
{
if
(
OB_FAIL
(
ObOperator
::
rescan
()))
{
LOG_WARN
(
"failed to open right child"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
ObOperator
::
rescan
()))
{
LOG_WARN
(
"failed to rescan"
,
K
(
ret
));
LOG_WARN
(
"failed to rescan"
,
K
(
ret
));
}
}
return
ret
;
return
ret
;
...
@@ -143,15 +128,6 @@ int ObNLConnectByWithIndexOp::inner_close()
...
@@ -143,15 +128,6 @@ int ObNLConnectByWithIndexOp::inner_close()
{
{
int
ret
=
OB_SUCCESS
;
int
ret
=
OB_SUCCESS
;
reset
();
reset
();
int
left_ret
=
OB_SUCCESS
;
int
right_ret
=
OB_SUCCESS
;
if
(
OB_SUCCESS
!=
(
left_ret
=
left_
->
close
()))
{
LOG_WARN
(
"Close child operator failed"
,
K
(
left_ret
),
"op_type"
,
ob_phy_operator_type_str
(
get_spec
().
type_
));
}
if
(
OB_SUCCESS
!=
(
right_ret
=
right_
->
close
()))
{
LOG_WARN
(
"Close child operator failed"
,
K
(
right_ret
),
"op_type"
,
ob_phy_operator_type_str
(
get_spec
().
type_
));
}
ret
=
(
OB_SUCCESS
==
left_ret
)
?
right_ret
:
left_ret
;
return
ret
;
return
ret
;
}
}
...
@@ -291,11 +267,6 @@ int ObNLConnectByWithIndexOp::prepare_rescan_params()
...
@@ -291,11 +267,6 @@ int ObNLConnectByWithIndexOp::prepare_rescan_params()
LOG_WARN
(
"fail to set dynamic param"
,
K
(
ret
));
LOG_WARN
(
"fail to set dynamic param"
,
K
(
ret
));
}
}
}
}
if
(
OB_SUCC
(
ret
))
{
if
(
OB_FAIL
(
open_right_child
()))
{
LOG_WARN
(
"failed to open right child"
,
K
(
ret
));
}
}
return
ret
;
return
ret
;
}
}
...
...
src/sql/engine/connect_by/ob_nl_cnnt_by_with_index_op.h
浏览文件 @
f3f54ca0
...
@@ -44,7 +44,7 @@ public:
...
@@ -44,7 +44,7 @@ public:
virtual
OperatorOpenOrder
get_operator_open_order
()
const
override
final
virtual
OperatorOpenOrder
get_operator_open_order
()
const
override
final
{
{
return
OPEN_SELF_
ONLY
;
return
OPEN_SELF_
FIRST
;
}
}
int
prepare_rescan_params
();
int
prepare_rescan_params
();
...
@@ -97,7 +97,6 @@ private:
...
@@ -97,7 +97,6 @@ private:
int
add_pseudo_column
(
ObExpr
*
pseudo_expr
,
ObConnectByPseudoColumn
column_type
);
int
add_pseudo_column
(
ObExpr
*
pseudo_expr
,
ObConnectByPseudoColumn
column_type
);
int
init
();
int
init
();
int
open_right_child
();
public:
public:
ObConnectByOpBFSPump
connect_by_pump_
;
ObConnectByOpBFSPump
connect_by_pump_
;
...
@@ -115,7 +114,6 @@ private:
...
@@ -115,7 +114,6 @@ private:
bool
is_match_
;
// whether there is a child, for calc connect_by_isleaf
bool
is_match_
;
// whether there is a child, for calc connect_by_isleaf
bool
is_cycle_
;
// whether part of a cycle, for calc connect_by_iscycle
bool
is_cycle_
;
// whether part of a cycle, for calc connect_by_iscycle
bool
is_inited_
;
bool
is_inited_
;
bool
open_right_child_
;
bool
need_return_
;
bool
need_return_
;
};
};
...
...
src/sql/engine/join/ob_basic_nested_loop_join.cpp
浏览文件 @
f3f54ca0
...
@@ -90,13 +90,6 @@ int ObBasicNestedLoopJoin::prepare_rescan_params(ObBasicNestedLoopJoinCtx& join_
...
@@ -90,13 +90,6 @@ int ObBasicNestedLoopJoin::prepare_rescan_params(ObBasicNestedLoopJoinCtx& join_
}
}
}
}
// try to open the right child
if
(
OB_SUCC
(
ret
))
{
if
(
OB_FAIL
(
open_right_child
(
join_ctx
)))
{
LOG_WARN
(
"failed to open right child"
,
K
(
ret
));
}
}
return
ret
;
return
ret
;
}
}
...
@@ -123,99 +116,26 @@ int ObBasicNestedLoopJoin::get_next_left_row(ObJoinCtx& join_ctx) const
...
@@ -123,99 +116,26 @@ int ObBasicNestedLoopJoin::get_next_left_row(ObJoinCtx& join_ctx) const
return
OB_SUCCESS
!=
ret
?
ret
:
ObJoin
::
get_next_left_row
(
join_ctx
);
return
OB_SUCCESS
!=
ret
?
ret
:
ObJoin
::
get_next_left_row
(
join_ctx
);
}
}
int
ObBasicNestedLoopJoin
::
open_right_child
(
ObBasicNestedLoopJoinCtx
&
join_ctx
)
const
int
ObBasicNestedLoopJoin
::
inner_open
(
ObExecContext
&
ctx
)
const
{
int
ret
=
OB_SUCCESS
;
ObPhyOperator
*
child_ptr
=
nullptr
;
ObPhyOperatorCtx
*
child_op_ctx
=
nullptr
;
if
(
join_ctx
.
open_right_child
())
{
// do nothing
}
else
if
(
OB_ISNULL
(
child_ptr
=
get_child
(
SECOND_CHILD
)))
{
ret
=
OB_ERR_UNEXPECTED
;
LOG_WARN
(
"fail to get right child"
,
K
(
ret
));
}
else
if
(
OB_NOT_NULL
(
child_op_ctx
=
GET_PHY_OPERATOR_CTX
(
ObPhyOperatorCtx
,
join_ctx
.
exec_ctx_
,
child_ptr
->
get_id
())))
{
// the drain stage will open this operator, and no record in join_ctx.
join_ctx
.
set_open_right_child
();
}
else
if
(
OB_FAIL
(
open_child
(
join_ctx
.
exec_ctx_
,
SECOND_CHILD
)))
{
LOG_WARN
(
"fail to open right child"
,
K
(
ret
));
join_ctx
.
set_open_right_child
();
}
else
{
join_ctx
.
set_open_right_child
();
}
return
ret
;
}
int
ObBasicNestedLoopJoin
::
open_left_child
(
ObExecContext
&
ctx
)
const
{
int
ret
=
OB_SUCCESS
;
if
(
OB_FAIL
(
open_child
(
ctx
,
FIRST_CHILD
)))
{
LOG_WARN
(
"fail to open left child"
,
K
(
ret
));
}
return
ret
;
}
int
ObBasicNestedLoopJoin
::
inner_open
(
ObExecContext
&
ctx
)
const
{
{
int
ret
=
OB_SUCCESS
;
int
ret
=
OB_SUCCESS
;
if
(
OB_FAIL
(
ObJoin
::
inner_open
(
ctx
)))
{
if
(
OB_FAIL
(
ObJoin
::
inner_open
(
ctx
)))
{
LOG_WARN
(
"failed to inner open join"
,
K
(
ret
));
LOG_WARN
(
"failed to inner open join"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
open_left_child
(
ctx
)))
{
LOG_WARN
(
"failed to open left child"
,
K
(
ret
));
}
}
return
ret
;
return
ret
;
}
}
int
ObBasicNestedLoopJoin
::
inner_close
(
ObExecContext
&
ctx
)
const
int
ObBasicNestedLoopJoin
::
inner_close
(
ObExecContext
&
ctx
)
const
{
{
UNUSED
(
ctx
);
int
ret
=
OB_SUCCESS
;
int
ret
=
OB_SUCCESS
;
int
child_ret
=
OB_SUCCESS
;
// first call close of all children
ObPhyOperator
*
child_ptr
=
NULL
;
for
(
int32_t
i
=
0
;
i
<
get_child_num
();
++
i
)
{
if
(
OB_ISNULL
(
child_ptr
=
get_child
(
i
)))
{
ret
=
OB_NOT_INIT
;
LOG_WARN
(
"failed to get child"
,
K
(
i
),
K
(
child_ptr
),
K
(
get_child_num
()),
K
(
ret
),
"op_type"
,
ob_phy_operator_type_str
(
get_type
()));
}
else
{
int
tmp_ret
=
child_ptr
->
close
(
ctx
);
if
(
OB_SUCCESS
!=
tmp_ret
)
{
child_ret
=
tmp_ret
;
LOG_WARN
(
"Close child operator failed"
,
K
(
child_ret
),
"op_type"
,
ob_phy_operator_type_str
(
get_type
()));
}
}
}
// no matter what, must call operatoris close function, then close this operator
ObPhyOperatorCtx
*
op_ctx
=
NULL
;
if
(
OB_ISNULL
(
op_ctx
=
GET_PHY_OPERATOR_CTX
(
ObPhyOperatorCtx
,
ctx
,
get_id
())))
{
LOG_DEBUG
(
"get_phy_operator_ctx failed"
,
K
(
ret
),
K_
(
id
),
"op_type"
,
ob_phy_operator_type_str
(
get_type
()));
}
else
{
// op_ctx->op_monitor_info_.set_value(CLOSE_TIME, common::ObTimeUtility::current_time());
}
if
(
OB_SUCC
(
ret
))
{
// Can only preserve one error code
ret
=
child_ret
;
}
return
ret
;
return
ret
;
}
}
int
ObBasicNestedLoopJoin
::
rescan
(
ObExecContext
&
ctx
)
const
int
ObBasicNestedLoopJoin
::
rescan
(
ObExecContext
&
ctx
)
const
{
{
int
ret
=
OB_SUCCESS
;
int
ret
=
OB_SUCCESS
;
ObBasicNestedLoopJoinCtx
*
join_ctx
=
NULL
;
if
(
OB_FAIL
(
ObJoin
::
rescan
(
ctx
)))
{
if
(
OB_ISNULL
(
join_ctx
=
GET_PHY_OPERATOR_CTX
(
ObBasicNestedLoopJoinCtx
,
ctx
,
get_id
())))
{
ret
=
OB_ERR_UNEXPECTED
;
LOG_WARN
(
"failed to get join ctx"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
open_right_child
(
*
join_ctx
)))
{
LOG_WARN
(
"failed to open right child"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
ObJoin
::
rescan
(
ctx
)))
{
LOG_WARN
(
"failed to call parent rescan"
,
K
(
ret
));
LOG_WARN
(
"failed to call parent rescan"
,
K
(
ret
));
}
else
{
}
else
{
}
}
...
...
src/sql/engine/join/ob_basic_nested_loop_join.h
浏览文件 @
f3f54ca0
...
@@ -29,7 +29,7 @@ protected:
...
@@ -29,7 +29,7 @@ protected:
friend
class
ObBasicNestedLoopJoin
;
friend
class
ObBasicNestedLoopJoin
;
public:
public:
ObBasicNestedLoopJoinCtx
(
ObExecContext
&
ctx
)
:
ObJoinCtx
(
ctx
),
open_right_child_
(
false
)
ObBasicNestedLoopJoinCtx
(
ObExecContext
&
ctx
)
:
ObJoinCtx
(
ctx
)
{}
{}
virtual
~
ObBasicNestedLoopJoinCtx
()
virtual
~
ObBasicNestedLoopJoinCtx
()
{}
{}
...
@@ -38,18 +38,9 @@ protected:
...
@@ -38,18 +38,9 @@ protected:
{
{
ObJoinCtx
::
destroy
();
ObJoinCtx
::
destroy
();
}
}
bool
open_right_child
()
{
return
open_right_child_
;
}
void
set_open_right_child
()
{
open_right_child_
=
true
;
}
protected:
protected:
common
::
ObExprCtx
expr_ctx_
;
common
::
ObExprCtx
expr_ctx_
;
bool
open_right_child_
;
};
};
struct
RescanParam
{
struct
RescanParam
{
OB_UNIS_VERSION_V
(
1
);
OB_UNIS_VERSION_V
(
1
);
...
@@ -104,15 +95,11 @@ protected:
...
@@ -104,15 +95,11 @@ protected:
virtual
OperatorOpenOrder
get_operator_open_order
(
ObExecContext
&
ctx
)
const
override
virtual
OperatorOpenOrder
get_operator_open_order
(
ObExecContext
&
ctx
)
const
override
{
{
UNUSED
(
ctx
);
UNUSED
(
ctx
);
return
OPEN_SELF_
ONLY
;
return
OPEN_SELF_
FIRST
;
}
}
virtual
int
inner_open
(
ObExecContext
&
ctx
)
const
override
;
virtual
int
inner_open
(
ObExecContext
&
ctx
)
const
override
;
virtual
int
inner_close
(
ObExecContext
&
exec_ctx
)
const
override
;
virtual
int
inner_close
(
ObExecContext
&
exec_ctx
)
const
override
;
virtual
int
rescan
(
ObExecContext
&
exec_ctx
)
const
override
;
virtual
int
rescan
(
ObExecContext
&
exec_ctx
)
const
override
;
// open left child
int
open_left_child
(
ObExecContext
&
ctx
)
const
;
// open right child
int
open_right_child
(
ObBasicNestedLoopJoinCtx
&
join_ctx
)
const
;
protected:
protected:
common
::
ObFixedArray
<
RescanParam
,
common
::
ObIAllocator
>
rescan_params_
;
// @todo a better name
common
::
ObFixedArray
<
RescanParam
,
common
::
ObIAllocator
>
rescan_params_
;
// @todo a better name
...
...
src/sql/engine/join/ob_basic_nested_loop_join_op.cpp
浏览文件 @
f3f54ca0
...
@@ -22,8 +22,8 @@ namespace sql {
...
@@ -22,8 +22,8 @@ namespace sql {
OB_SERIALIZE_MEMBER
(
OB_SERIALIZE_MEMBER
(
(
ObBasicNestedLoopJoinSpec
,
ObJoinSpec
),
rescan_params_
,
gi_partition_id_expr_
,
enable_gi_partition_pruning_
);
(
ObBasicNestedLoopJoinSpec
,
ObJoinSpec
),
rescan_params_
,
gi_partition_id_expr_
,
enable_gi_partition_pruning_
);
ObBasicNestedLoopJoinOp
::
ObBasicNestedLoopJoinOp
(
ObExecContext
&
exec_ctx
,
const
ObOpSpec
&
spec
,
ObOpInput
*
input
)
ObBasicNestedLoopJoinOp
::
ObBasicNestedLoopJoinOp
(
ObExecContext
&
exec_ctx
,
const
ObOpSpec
&
spec
,
ObOpInput
*
input
)
:
ObJoinOp
(
exec_ctx
,
spec
,
input
)
,
open_right_child_
(
false
)
:
ObJoinOp
(
exec_ctx
,
spec
,
input
)
{}
{}
int
ObBasicNestedLoopJoinOp
::
inner_open
()
int
ObBasicNestedLoopJoinOp
::
inner_open
()
...
@@ -32,53 +32,23 @@ int ObBasicNestedLoopJoinOp::inner_open()
...
@@ -32,53 +32,23 @@ int ObBasicNestedLoopJoinOp::inner_open()
int64_t
left_output_cnt
=
spec_
.
get_left
()
->
output_
.
count
();
int64_t
left_output_cnt
=
spec_
.
get_left
()
->
output_
.
count
();
if
(
OB_FAIL
(
ObJoinOp
::
inner_open
()))
{
if
(
OB_FAIL
(
ObJoinOp
::
inner_open
()))
{
LOG_WARN
(
"failed to inner open join"
,
K
(
ret
));
LOG_WARN
(
"failed to inner open join"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
left_
->
open
()))
{
LOG_WARN
(
"failed to open left child"
,
K
(
ret
));
}
}
return
ret
;
return
ret
;
}
}
int
ObBasicNestedLoopJoinOp
::
rescan
()
int
ObBasicNestedLoopJoinOp
::
rescan
()
{
{
int
ret
=
OB_SUCCESS
;
int
ret
=
OB_SUCCESS
;
if
(
OB_FAIL
(
open_right_child
()))
{
if
(
OB_FAIL
(
ObJoinOp
::
rescan
()))
{
LOG_WARN
(
"failed to open right child"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
ObJoinOp
::
rescan
()))
{
LOG_WARN
(
"failed to call parent rescan"
,
K
(
ret
));
LOG_WARN
(
"failed to call parent rescan"
,
K
(
ret
));
}
}
return
ret
;
return
ret
;
}
}
int
ObBasicNestedLoopJoinOp
::
open_right_child
()
{
int
ret
=
OB_SUCCESS
;
if
(
!
right_
->
is_opened
()
&&
OB_FAIL
(
right_
->
open
()))
{
LOG_WARN
(
"failed to open right child"
,
K
(
ret
));
}
return
ret
;
}
int
ObBasicNestedLoopJoinOp
::
inner_close
()
int
ObBasicNestedLoopJoinOp
::
inner_close
()
{
{
int
ret
=
OB_SUCCESS
;
int
ret
=
OB_SUCCESS
;
int
left_ret
=
OB_SUCCESS
;
int
right_ret
=
OB_SUCCESS
;
if
(
OB_ISNULL
(
left_
))
{
left_ret
=
OB_NOT_INIT
;
LOG_WARN
(
"invalid argument"
,
K
(
left_
),
K
(
ret
));
}
else
if
(
OB_SUCCESS
!=
(
left_ret
=
left_
->
close
()))
{
LOG_WARN
(
"Close child operator failed"
,
K
(
left_ret
),
"op_type"
,
ob_phy_operator_type_str
(
get_spec
().
type_
));
}
if
(
OB_ISNULL
(
right_
))
{
right_ret
=
OB_NOT_INIT
;
LOG_WARN
(
"invalid argument"
,
K
(
right_
),
K
(
ret
));
}
else
if
(
OB_SUCCESS
!=
(
right_ret
=
right_
->
close
()))
{
LOG_WARN
(
"Close child operator failed"
,
K
(
right_ret
),
"op_type"
,
ob_phy_operator_type_str
(
get_spec
().
type_
));
}
ret
=
(
OB_SUCCESS
==
left_ret
)
?
right_ret
:
left_ret
;
return
ret
;
return
ret
;
}
}
...
@@ -103,6 +73,7 @@ int ObBasicNestedLoopJoinOp::get_next_left_row()
...
@@ -103,6 +73,7 @@ int ObBasicNestedLoopJoinOp::get_next_left_row()
int
ObBasicNestedLoopJoinOp
::
prepare_rescan_params
(
bool
is_group
)
int
ObBasicNestedLoopJoinOp
::
prepare_rescan_params
(
bool
is_group
)
{
{
int
ret
=
OB_SUCCESS
;
int
ret
=
OB_SUCCESS
;
UNUSED
(
is_group
);
int64_t
param_cnt
=
get_spec
().
rescan_params_
.
count
();
int64_t
param_cnt
=
get_spec
().
rescan_params_
.
count
();
for
(
int64_t
i
=
0
;
OB_SUCC
(
ret
)
&&
i
<
param_cnt
;
++
i
)
{
for
(
int64_t
i
=
0
;
OB_SUCC
(
ret
)
&&
i
<
param_cnt
;
++
i
)
{
const
ObDynamicParamSetter
&
rescan_param
=
get_spec
().
rescan_params_
.
at
(
i
);
const
ObDynamicParamSetter
&
rescan_param
=
get_spec
().
rescan_params_
.
at
(
i
);
...
@@ -121,12 +92,6 @@ int ObBasicNestedLoopJoinOp::prepare_rescan_params(bool is_group)
...
@@ -121,12 +92,6 @@ int ObBasicNestedLoopJoinOp::prepare_rescan_params(bool is_group)
}
}
}
}
if
(
OB_SUCC
(
ret
)
&&
!
is_group
)
{
if
(
OB_FAIL
(
open_right_child
()))
{
LOG_WARN
(
"failed to open right child"
,
K
(
ret
));
}
}
return
ret
;
return
ret
;
}
}
...
...
src/sql/engine/join/ob_basic_nested_loop_join_op.h
浏览文件 @
f3f54ca0
...
@@ -53,13 +53,12 @@ public:
...
@@ -53,13 +53,12 @@ public:
virtual
~
ObBasicNestedLoopJoinOp
(){};
virtual
~
ObBasicNestedLoopJoinOp
(){};
virtual
int
inner_open
()
override
;
virtual
int
inner_open
()
override
;
virtual
int
open_right_child
();
virtual
int
rescan
()
override
;
virtual
int
rescan
()
override
;
virtual
int
inner_close
()
final
;
virtual
int
inner_close
()
final
;
virtual
OperatorOpenOrder
get_operator_open_order
()
const
override
final
virtual
OperatorOpenOrder
get_operator_open_order
()
const
override
final
{
{
return
OPEN_SELF_
ONLY
;
return
OPEN_SELF_
FIRST
;
}
}
int
prepare_rescan_params
(
bool
is_group
=
false
);
int
prepare_rescan_params
(
bool
is_group
=
false
);
...
@@ -78,9 +77,6 @@ public:
...
@@ -78,9 +77,6 @@ public:
int
save_left_row
();
int
save_left_row
();
int
recover_left_row
();
int
recover_left_row
();
protected:
bool
open_right_child_
;
private:
private:
DISALLOW_COPY_AND_ASSIGN
(
ObBasicNestedLoopJoinOp
);
DISALLOW_COPY_AND_ASSIGN
(
ObBasicNestedLoopJoinOp
);
};
};
...
...
src/sql/engine/join/ob_block_based_nested_loop_join.cpp
浏览文件 @
f3f54ca0
...
@@ -304,13 +304,6 @@ int ObBLKNestedLoopJoin::join_left_func_going(ObBLKNestedLoopJoinCtx& join_ctx,
...
@@ -304,13 +304,6 @@ int ObBLKNestedLoopJoin::join_left_func_going(ObBLKNestedLoopJoinCtx& join_ctx,
}
}
}
}
// try to open the right child
if
(
OB_SUCC
(
ret
))
{
if
(
OB_FAIL
(
open_right_child
(
join_ctx
)))
{
LOG_WARN
(
"failed to open right child"
,
K
(
ret
));
}
}
if
(
OB_SUCCESS
==
ret
&&
JS_JOIN_RIGHT_JOIN
==
join_ctx
.
state_
)
{
if
(
OB_SUCCESS
==
ret
&&
JS_JOIN_RIGHT_JOIN
==
join_ctx
.
state_
)
{
if
(
OB_FAIL
(
save_left_row
(
join_ctx
)))
{
if
(
OB_FAIL
(
save_left_row
(
join_ctx
)))
{
LOG_WARN
(
"failed to save left row"
,
K
(
ret
));
LOG_WARN
(
"failed to save left row"
,
K
(
ret
));
...
...
src/sql/engine/join/ob_nested_loop_join.cpp
浏览文件 @
f3f54ca0
...
@@ -92,9 +92,6 @@ int ObNestedLoopJoin::inner_open(ObExecContext& exec_ctx) const
...
@@ -92,9 +92,6 @@ int ObNestedLoopJoin::inner_open(ObExecContext& exec_ctx) const
ret
=
OB_ERR_UNEXPECTED
;
ret
=
OB_ERR_UNEXPECTED
;
LOG_WARN
(
"NULL right table scan"
,
K
(
ret
));
LOG_WARN
(
"NULL right table scan"
,
K
(
ret
));
}
else
if
(
FALSE_IT
(
right_table_scan
->
set_batch_scan_flag
(
true
)))
{
}
else
if
(
FALSE_IT
(
right_table_scan
->
set_batch_scan_flag
(
true
)))
{
// never reach
}
else
if
(
OB_FAIL
(
open_right_child
(
*
join_ctx
)))
{
LOG_WARN
(
"failed to open right child"
,
K
(
ret
));
}
}
}
}
return
ret
;
return
ret
;
...
@@ -591,8 +588,6 @@ int ObNestedLoopJoin::bij_fill_left_rows(ObExecContext& exec_ctx) const
...
@@ -591,8 +588,6 @@ int ObNestedLoopJoin::bij_fill_left_rows(ObExecContext& exec_ctx) const
}
else
if
(
PHY_TABLE_SCAN
!=
right_op_
->
get_type
())
{
}
else
if
(
PHY_TABLE_SCAN
!=
right_op_
->
get_type
())
{
ret
=
OB_ERR_UNEXPECTED
;
ret
=
OB_ERR_UNEXPECTED
;
LOG_ERROR
(
"right op is not TABLE_SCAN type, plan is incorrect"
,
K
(
ret
),
K
(
right_op_
->
get_type
()));
LOG_ERROR
(
"right op is not TABLE_SCAN type, plan is incorrect"
,
K
(
ret
),
K
(
right_op_
->
get_type
()));
}
else
if
(
OB_FAIL
(
open_right_child
(
*
join_ctx
)))
{
LOG_WARN
(
"failed to open right child"
,
K
(
ret
));
}
else
{
}
else
{
ObTableScan
*
right_table_scan
=
static_cast
<
ObTableScan
*>
(
right_op_
);
ObTableScan
*
right_table_scan
=
static_cast
<
ObTableScan
*>
(
right_op_
);
if
(
OB_FAIL
(
right_table_scan
->
batch_rescan_init
(
exec_ctx
)))
{
if
(
OB_FAIL
(
right_table_scan
->
batch_rescan_init
(
exec_ctx
)))
{
...
...
src/sql/engine/join/ob_nested_loop_join_op.cpp
浏览文件 @
f3f54ca0
...
@@ -51,10 +51,6 @@ int ObNestedLoopJoinOp::inner_open()
...
@@ -51,10 +51,6 @@ int ObNestedLoopJoinOp::inner_open()
LOG_WARN
(
"nlp_op child is null"
,
KP
(
left_
),
KP
(
right_
),
K
(
ret
));
LOG_WARN
(
"nlp_op child is null"
,
KP
(
left_
),
KP
(
right_
),
K
(
ret
));
}
else
if
(
OB_FAIL
(
ObBasicNestedLoopJoinOp
::
inner_open
()))
{
}
else
if
(
OB_FAIL
(
ObBasicNestedLoopJoinOp
::
inner_open
()))
{
LOG_WARN
(
"failed to open in base class"
,
K
(
ret
));
LOG_WARN
(
"failed to open in base class"
,
K
(
ret
));
}
else
if
(
MY_SPEC
.
use_group_
)
{
if
(
OB_FAIL
(
open_right_child
()))
{
LOG_WARN
(
"failed to open right child"
,
K
(
ret
));
}
}
}
return
ret
;
return
ret
;
}
}
...
...
src/sql/engine/ob_operator.cpp
浏览文件 @
f3f54ca0
...
@@ -623,6 +623,7 @@ int ObOperator::get_next_row()
...
@@ -623,6 +623,7 @@ int ObOperator::get_next_row()
}
else
if
(
OB_ITER_END
==
ret
)
{
}
else
if
(
OB_ITER_END
==
ret
)
{
int
tmp_ret
=
drain_exch
();
int
tmp_ret
=
drain_exch
();
if
(
OB_SUCCESS
!=
tmp_ret
)
{
if
(
OB_SUCCESS
!=
tmp_ret
)
{
ret
=
tmp_ret
;
LOG_WARN
(
"drain exchange data failed"
,
K
(
tmp_ret
));
LOG_WARN
(
"drain exchange data failed"
,
K
(
tmp_ret
));
}
}
if
(
got_first_row_
)
{
if
(
got_first_row_
)
{
...
...
src/sql/engine/ob_phy_operator.cpp
浏览文件 @
f3f54ca0
...
@@ -486,6 +486,7 @@ int ObPhyOperator::get_next_row(ObExecContext& ctx, const ObNewRow*& row) const
...
@@ -486,6 +486,7 @@ int ObPhyOperator::get_next_row(ObExecContext& ctx, const ObNewRow*& row) const
if
(
OB_ITER_END
==
ret
&&
NULL
!=
op_ctx
)
{
if
(
OB_ITER_END
==
ret
&&
NULL
!=
op_ctx
)
{
int
tmp_ret
=
drain_exch
(
ctx
);
int
tmp_ret
=
drain_exch
(
ctx
);
if
(
OB_SUCCESS
!=
tmp_ret
)
{
if
(
OB_SUCCESS
!=
tmp_ret
)
{
ret
=
tmp_ret
;
LOG_WARN
(
"drain exchange data failed"
,
K
(
tmp_ret
));
LOG_WARN
(
"drain exchange data failed"
,
K
(
tmp_ret
));
}
}
if
(
op_ctx
->
got_first_row_
)
{
if
(
op_ctx
->
got_first_row_
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录