Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
1c21cded
提交
1c21cded
authored
2月 25, 2018
作者:
Evgenij Ryazanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add a separate addNestedJoin() method
上级
47fba497
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
24 行增加
和
29 行删除
+24
-29
Parser.java
h2/src/main/org/h2/command/Parser.java
+8
-8
Optimizer.java
h2/src/main/org/h2/command/dml/Optimizer.java
+1
-1
TableFilter.java
h2/src/main/org/h2/table/TableFilter.java
+15
-20
没有找到文件。
h2/src/main/org/h2/command/Parser.java
浏览文件 @
1c21cded
...
...
@@ -1733,7 +1733,7 @@ public class Parser {
on
=
readExpression
();
}
top
=
getNested
(
top
);
join
.
addJoin
(
top
,
true
,
false
,
on
);
join
.
addJoin
(
top
,
true
,
on
);
top
=
join
;
}
else
if
(
readIf
(
"LEFT"
))
{
readIf
(
"OUTER"
);
...
...
@@ -1744,7 +1744,7 @@ public class Parser {
if
(
readIf
(
"ON"
))
{
on
=
readExpression
();
}
top
.
addJoin
(
join
,
true
,
false
,
on
);
top
.
addJoin
(
join
,
true
,
on
);
}
else
if
(
readIf
(
"FULL"
))
{
throw
getSyntaxError
();
}
else
if
(
readIf
(
"INNER"
))
{
...
...
@@ -1755,7 +1755,7 @@ public class Parser {
if
(
readIf
(
"ON"
))
{
on
=
readExpression
();
}
top
.
addJoin
(
join
,
false
,
false
,
on
);
top
.
addJoin
(
join
,
false
,
on
);
}
else
if
(
readIf
(
"JOIN"
))
{
join
=
readTableFilter
();
top
=
readJoin
(
top
,
false
);
...
...
@@ -1763,11 +1763,11 @@ public class Parser {
if
(
readIf
(
"ON"
))
{
on
=
readExpression
();
}
top
.
addJoin
(
join
,
false
,
false
,
on
);
top
.
addJoin
(
join
,
false
,
on
);
}
else
if
(
readIf
(
"CROSS"
))
{
read
(
"JOIN"
);
join
=
readTableFilter
();
top
.
addJoin
(
join
,
false
,
false
,
null
);
top
.
addJoin
(
join
,
false
,
null
);
}
else
if
(
readIf
(
"NATURAL"
))
{
read
(
"JOIN"
);
join
=
readTableFilter
();
...
...
@@ -1799,7 +1799,7 @@ public class Parser {
}
}
}
top
.
addJoin
(
join
,
false
,
false
,
on
);
top
.
addJoin
(
join
,
false
,
on
);
}
else
{
break
;
}
...
...
@@ -1817,7 +1817,7 @@ public class Parser {
TableFilter
top
=
new
TableFilter
(
session
,
getDualTable
(
true
),
joinTable
,
rightsChecked
,
currentSelect
,
n
.
getOrderInFrom
(),
null
);
top
.
add
Join
(
n
,
false
,
true
,
null
);
top
.
add
NestedJoin
(
n
);
return
top
;
}
...
...
@@ -2490,7 +2490,7 @@ public class Parser {
int
idx
=
filters
.
indexOf
(
rightFilter
);
if
(
idx
>=
0
)
{
filters
.
remove
(
idx
);
leftFilter
.
addJoin
(
rightFilter
,
true
,
false
,
r
);
leftFilter
.
addJoin
(
rightFilter
,
true
,
r
);
}
else
{
rightFilter
.
mapAndAddFilter
(
r
);
}
...
...
h2/src/main/org/h2/command/dml/Optimizer.java
浏览文件 @
1c21cded
...
...
@@ -247,7 +247,7 @@ class Optimizer {
TableFilter
[]
f2
=
bestPlan
.
getFilters
();
topFilter
=
f2
[
0
];
for
(
int
i
=
0
;
i
<
f2
.
length
-
1
;
i
++)
{
f2
[
i
].
addJoin
(
f2
[
i
+
1
],
false
,
false
,
null
);
f2
[
i
].
addJoin
(
f2
[
i
+
1
],
false
,
null
);
}
if
(
parse
)
{
return
;
...
...
h2/src/main/org/h2/table/TableFilter.java
浏览文件 @
1c21cded
...
...
@@ -637,44 +637,39 @@ public class TableFilter implements ColumnResolver {
*
* @param filter the joined table filter
* @param outer if this is an outer join
* @param nested if this is a nested join
* @param on the join condition
*/
public
void
addJoin
(
TableFilter
filter
,
boolean
outer
,
boolean
nested
,
Expression
on
)
{
public
void
addJoin
(
TableFilter
filter
,
boolean
outer
,
Expression
on
)
{
if
(
on
!=
null
)
{
on
.
mapColumns
(
this
,
0
);
TableFilterVisitor
visitor
=
new
MapColumnsVisitor
(
on
);
visit
(
visitor
);
filter
.
visit
(
visitor
);
}
if
(
nested
)
{
if
(
nestedJoin
!=
null
)
{
throw
DbException
.
throwInternalError
();
}
nestedJoin
=
filter
;
if
(
join
==
null
)
{
join
=
filter
;
filter
.
joinOuter
=
outer
;
if
(
outer
)
{
visit
(
new
JOIVisitor
());
filter
.
visit
(
new
JOIVisitor
());
}
if
(
on
!=
null
)
{
filter
.
mapAndAddFilter
(
on
);
}
}
else
{
if
(
join
==
null
)
{
join
=
filter
;
filter
.
joinOuter
=
outer
;
if
(
outer
)
{
filter
.
visit
(
new
JOIVisitor
());
}
if
(
on
!=
null
)
{
filter
.
mapAndAddFilter
(
on
);
}
}
else
{
join
.
addJoin
(
filter
,
outer
,
false
,
on
);
}
join
.
addJoin
(
filter
,
outer
,
on
);
}
}
/**
* Add a nested joined table.
*
* @param filter the joined table filter
*/
public
void
addNestedJoin
(
TableFilter
filter
)
{
nestedJoin
=
filter
;
filter
.
joinOuter
=
false
;
}
/**
* Map the columns and add the join condition.
*
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论