Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
大炮V587
oceanbase
提交
4bca2395
O
oceanbase
项目概览
大炮V587
/
oceanbase
与 Fork 源项目一致
Fork自
oceanbase / oceanbase
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oceanbase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4bca2395
编写于
2月 06, 2023
作者:
O
obdev
提交者:
ob-robot
2月 06, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix shared hj hang because one of workers is already exited
上级
4c1209c6
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
32 addition
and
0 deletion
+32
-0
src/sql/engine/join/ob_hash_join_op.cpp
src/sql/engine/join/ob_hash_join_op.cpp
+22
-0
src/sql/engine/join/ob_hash_join_op.h
src/sql/engine/join/ob_hash_join_op.h
+10
-0
未找到文件。
src/sql/engine/join/ob_hash_join_op.cpp
浏览文件 @
4bca2395
...
...
@@ -390,6 +390,9 @@ int ObHashJoinOp::inner_open()
ObSQLSessionInfo
*
session
=
NULL
;
if
(
OB_FAIL
(
set_shared_info
()))
{
LOG_WARN
(
"failed to set shared info"
,
K
(
ret
));
}
else
if
(
is_shared_
&&
OB_FAIL
(
sync_wait_open
()))
{
is_shared_
=
false
;
LOG_WARN
(
"failed to sync open for shared hj"
,
K
(
ret
));
}
else
if
((
OB_UNLIKELY
(
MY_SPEC
.
all_join_keys_
.
count
()
<=
0
||
MY_SPEC
.
all_join_keys_
.
count
()
!=
MY_SPEC
.
all_hash_funcs_
.
count
()
||
OB_ISNULL
(
left_
))))
{
...
...
@@ -2392,6 +2395,25 @@ int ObHashJoinOp::sync_wait_close()
return
ret
;
}
int
ObHashJoinOp
::
sync_wait_open
()
{
int
ret
=
OB_SUCCESS
;
ObHashJoinInput
*
hj_input
=
static_cast
<
ObHashJoinInput
*>
(
input_
);
if
(
OB_ISNULL
(
hj_input
))
{
ret
=
OB_ERR_UNEXPECTED
;
LOG_WARN
(
"unexpected status: shared hash join info is null"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
hj_input
->
sync_wait
(
ctx_
,
hj_input
->
get_open_cnt
(),
[
&
](
int64_t
n_times
)
{
UNUSED
(
n_times
);
})))
{
LOG_WARN
(
"failed to sync open"
,
K
(
ret
),
K
(
spec_
.
id_
));
}
else
{
LOG_TRACE
(
"debug sync sync open"
,
K
(
ret
),
K
(
spec_
.
id_
));
}
return
ret
;
}
// dump partition that has only little data
int
ObHashJoinOp
::
dump_remain_partition
()
{
...
...
src/sql/engine/join/ob_hash_join_op.h
浏览文件 @
4bca2395
...
...
@@ -45,6 +45,7 @@ struct ObHashTableSharedTableInfo
int64_t
total_memory_row_count_
;
int64_t
total_memory_size_
;
int64_t
open_cnt_
;
};
class
ObHashJoinInput
:
public
ObOpInput
...
...
@@ -144,6 +145,13 @@ public:
ObHashTableSharedTableInfo
*
shared_hj_info
=
reinterpret_cast
<
ObHashTableSharedTableInfo
*>
(
shared_hj_info_
);
return
shared_hj_info
->
close_cnt_
;
}
int64_t
&
get_open_cnt
()
{
ObHashTableSharedTableInfo
*
shared_hj_info
=
reinterpret_cast
<
ObHashTableSharedTableInfo
*>
(
shared_hj_info_
);
return
shared_hj_info
->
open_cnt_
;
}
ObHashTableSharedTableInfo
*
get_shared_hj_info
()
{
return
reinterpret_cast
<
ObHashTableSharedTableInfo
*>
(
shared_hj_info_
);
...
...
@@ -175,6 +183,7 @@ public:
shared_hj_info
->
process_cnt_
=
0
;
shared_hj_info
->
close_cnt_
=
0
;
shared_hj_info
->
open_cnt_
=
0
;
shared_hj_info
->
ret_
=
OB_SUCCESS
;
shared_hj_info
->
read_null_in_naaj_
=
false
;
new
(
&
shared_hj_info
->
cond_
)
common
::
SimpleCond
(
common
::
ObWaitEventIds
::
SQL_SHARED_HJ_COND_WAIT
);
...
...
@@ -946,6 +955,7 @@ private:
int
sync_set_early_exit
();
int
do_sync_wait_all
();
int
sync_wait_close
();
int
sync_wait_open
();
/********** end for shared hash table hash join *******/
private:
using
PredFunc
=
std
::
function
<
bool
(
int64_t
)
>
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录