Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Metz
oceanbase
提交
68cc172f
O
oceanbase
项目概览
Metz
/
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,发现更多精彩内容 >>
提交
68cc172f
编写于
6月 21, 2022
作者:
O
obdev
提交者:
wangzelin.wzl
6月 21, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[CP] fix spj bug when select exprs contain enum type
上级
19b1ebd0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
3 deletion
+15
-3
src/sql/resolver/expr/ob_raw_expr_wrap_enum_set.cpp
src/sql/resolver/expr/ob_raw_expr_wrap_enum_set.cpp
+2
-0
src/sql/rewrite/ob_transformer_impl.cpp
src/sql/rewrite/ob_transformer_impl.cpp
+9
-1
src/sql/rewrite/ob_transformer_impl.h
src/sql/rewrite/ob_transformer_impl.h
+4
-2
未找到文件。
src/sql/resolver/expr/ob_raw_expr_wrap_enum_set.cpp
浏览文件 @
68cc172f
...
@@ -865,6 +865,8 @@ int ObRawExprWrapEnumSet::visit_query_ref_expr(
...
@@ -865,6 +865,8 @@ int ObRawExprWrapEnumSet::visit_query_ref_expr(
}
else
if
(
NULL
!=
new_expr
)
{
}
else
if
(
NULL
!=
new_expr
)
{
// replace with new wrapped expr
// replace with new wrapped expr
ref_stmt
->
get_select_item
(
0
).
expr_
=
new_expr
;
ref_stmt
->
get_select_item
(
0
).
expr_
=
new_expr
;
expr
.
get_column_types
().
at
(
0
)
=
new_expr
->
get_result_type
();
LOG_TRACE
(
"succeed to wrap enum to str"
,
K
(
dest_type
),
K
(
*
new_expr
),
K
(
expr
));
}
else
{
/*do nothing*/
}
else
{
/*do nothing*/
}
}
}
}
...
...
src/sql/rewrite/ob_transformer_impl.cpp
浏览文件 @
68cc172f
...
@@ -313,7 +313,7 @@ int ObTransformerImpl::choose_rewrite_rules(ObDMLStmt* stmt, uint64_t& need_type
...
@@ -313,7 +313,7 @@ int ObTransformerImpl::choose_rewrite_rules(ObDMLStmt* stmt, uint64_t& need_type
LOG_WARN
(
"failed to check stmt functions"
,
K
(
ret
));
LOG_WARN
(
"failed to check stmt functions"
,
K
(
ret
));
}
else
{
}
else
{
// TODO::unpivot open
// TODO::unpivot open
if
(
func
.
contain_unpivot_query_
)
{
if
(
func
.
contain_unpivot_query_
||
func
.
contain_enum_set_values_
)
{
disable_list
=
ObTransformRule
::
ALL_TRANSFORM_RULES
;
disable_list
=
ObTransformRule
::
ALL_TRANSFORM_RULES
;
}
}
if
(
func
.
contain_sequence_
)
{
if
(
func
.
contain_sequence_
)
{
...
@@ -345,6 +345,14 @@ int ObTransformerImpl::check_stmt_functions(ObDMLStmt* stmt, StmtFunc& func)
...
@@ -345,6 +345,14 @@ int ObTransformerImpl::check_stmt_functions(ObDMLStmt* stmt, StmtFunc& func)
func
.
contain_for_update_
=
func
.
contain_for_update_
||
has_for_update
;
func
.
contain_for_update_
=
func
.
contain_for_update_
||
has_for_update
;
func
.
contain_unpivot_query_
=
func
.
contain_unpivot_query_
||
stmt
->
is_unpivot_select
();
func
.
contain_unpivot_query_
=
func
.
contain_unpivot_query_
||
stmt
->
is_unpivot_select
();
}
}
for
(
int64_t
i
=
0
;
OB_SUCC
(
ret
)
&&
!
func
.
contain_enum_set_values_
&&
i
<
stmt
->
get_column_items
().
count
();
++
i
)
{
const
ColumnItem
&
col
=
stmt
->
get_column_items
().
at
(
i
);
if
(
OB_ISNULL
(
col
.
get_expr
()))
{
ret
=
OB_ERR_UNEXPECTED
;
}
else
if
(
ob_is_enumset_tc
(
col
.
get_expr
()
->
get_data_type
()))
{
func
.
contain_enum_set_values_
=
true
;
}
}
if
(
OB_SUCC
(
ret
)
&&
if
(
OB_SUCC
(
ret
)
&&
(
stmt
->
is_delete_stmt
()
||
stmt
->
is_update_stmt
()
||
stmt
->
is_merge_stmt
()
||
stmt
->
is_insert_stmt
()))
{
(
stmt
->
is_delete_stmt
()
||
stmt
->
is_update_stmt
()
||
stmt
->
is_merge_stmt
()
||
stmt
->
is_insert_stmt
()))
{
ObDelUpdStmt
*
del_upd_stmt
=
static_cast
<
ObDelUpdStmt
*>
(
stmt
);
ObDelUpdStmt
*
del_upd_stmt
=
static_cast
<
ObDelUpdStmt
*>
(
stmt
);
...
...
src/sql/rewrite/ob_transformer_impl.h
浏览文件 @
68cc172f
...
@@ -110,13 +110,14 @@ public:
...
@@ -110,13 +110,14 @@ public:
contain_for_update_
(
false
),
contain_for_update_
(
false
),
contain_domain_index_
(
false
),
contain_domain_index_
(
false
),
update_global_index_
(
false
),
update_global_index_
(
false
),
contain_unpivot_query_
(
false
)
contain_unpivot_query_
(
false
),
contain_enum_set_values_
(
false
)
{}
{}
bool
all_found
()
const
bool
all_found
()
const
{
{
return
contain_hie_query_
&&
contain_sequence_
&&
contain_for_update_
&&
contain_domain_index_
&&
return
contain_hie_query_
&&
contain_sequence_
&&
contain_for_update_
&&
contain_domain_index_
&&
update_global_index_
&&
contain_unpivot_query_
;
update_global_index_
&&
contain_unpivot_query_
&&
contain_enum_set_values_
;
}
}
bool
contain_hie_query_
;
bool
contain_hie_query_
;
...
@@ -125,6 +126,7 @@ public:
...
@@ -125,6 +126,7 @@ public:
bool
contain_domain_index_
;
bool
contain_domain_index_
;
bool
update_global_index_
;
bool
update_global_index_
;
bool
contain_unpivot_query_
;
bool
contain_unpivot_query_
;
bool
contain_enum_set_values_
;
};
};
int
check_stmt_functions
(
ObDMLStmt
*
stmt
,
StmtFunc
&
func
);
int
check_stmt_functions
(
ObDMLStmt
*
stmt
,
StmtFunc
&
func
);
inline
ObTransformerCtx
*
get_trans_ctx
()
inline
ObTransformerCtx
*
get_trans_ctx
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录