Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
12f5bf71
Unverified
提交
12f5bf71
authored
7月 25, 2018
作者:
Evgenij Ryazanov
提交者:
GitHub
7月 25, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1325 from katzyn/misc
Optimize WITH TIES in some queries and specify data types for KEY_COLUMN_USAGE
上级
47ee04dc
5d14674d
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
45 行增加
和
6 行删除
+45
-6
Insert.java
h2/src/main/org/h2/command/dml/Insert.java
+5
-0
Select.java
h2/src/main/org/h2/command/dml/Select.java
+18
-2
LocalResult.java
h2/src/main/org/h2/result/LocalResult.java
+13
-2
ResultTarget.java
h2/src/main/org/h2/result/ResultTarget.java
+7
-0
MetaTable.java
h2/src/main/org/h2/table/MetaTable.java
+2
-2
没有找到文件。
h2/src/main/org/h2/command/dml/Insert.java
浏览文件 @
12f5bf71
...
...
@@ -267,6 +267,11 @@ public class Insert extends Prepared implements ResultTarget {
return
rowNumber
;
}
@Override
public
void
limitsWereApplied
()
{
// Nothing to do
}
@Override
public
String
getPlanSQL
()
{
StatementBuilder
buff
=
new
StatementBuilder
(
"INSERT INTO "
);
...
...
h2/src/main/org/h2/command/dml/Select.java
浏览文件 @
12f5bf71
...
...
@@ -654,14 +654,30 @@ public class Select extends Query {
if
(
result
==
null
)
{
return
lazyResult
;
}
if
(
sort
!=
null
&&
!
sortUsingIndex
||
limitRows
<
0
||
withTies
)
{
if
(
limitRows
<
0
||
sort
!=
null
&&
!
sortUsingIndex
||
withTies
&&
!
quickOffset
)
{
limitRows
=
Long
.
MAX_VALUE
;
}
Value
[]
row
=
null
;
while
(
result
.
getRowCount
()
<
limitRows
&&
lazyResult
.
next
())
{
if
(
forUpdateRows
!=
null
)
{
topTableFilter
.
lockRowAdd
(
forUpdateRows
);
}
result
.
addRow
(
lazyResult
.
currentRow
());
row
=
lazyResult
.
currentRow
();
result
.
addRow
(
row
);
}
if
(
limitRows
!=
Long
.
MAX_VALUE
&&
withTies
&&
sort
!=
null
&&
row
!=
null
)
{
Value
[]
expected
=
row
;
while
(
lazyResult
.
next
())
{
row
=
lazyResult
.
currentRow
();
if
(
sort
.
compare
(
expected
,
row
)
!=
0
)
{
break
;
}
if
(
forUpdateRows
!=
null
)
{
topTableFilter
.
lockRowAdd
(
forUpdateRows
);
}
result
.
addRow
(
row
);
}
result
.
limitsWereApplied
();
}
if
(
forUpdateRows
!=
null
)
{
topTableFilter
.
lockRows
(
forUpdateRows
);
...
...
h2/src/main/org/h2/result/LocalResult.java
浏览文件 @
12f5bf71
...
...
@@ -42,6 +42,7 @@ public class LocalResult implements ResultInterface, ResultTarget {
private
int
offset
;
private
int
limit
=
-
1
;
private
boolean
withTies
;
private
boolean
limitsWereApplied
;
private
ResultExternal
external
;
private
boolean
distinct
;
private
int
[]
distinctIndexes
;
...
...
@@ -381,6 +382,9 @@ public class LocalResult implements ResultInterface, ResultTarget {
}
private
void
applyOffsetAndLimit
()
{
if
(
limitsWereApplied
)
{
return
;
}
int
offset
=
Math
.
max
(
this
.
offset
,
0
);
int
limit
=
this
.
limit
;
if
(
offset
==
0
&&
limit
<
0
||
rowCount
==
0
)
{
...
...
@@ -411,8 +415,10 @@ public class LocalResult implements ResultInterface, ResultTarget {
rowCount
++;
}
}
// avoid copying the whole array for each row
rows
=
new
ArrayList
<>(
rows
.
subList
(
offset
,
to
));
if
(
offset
!=
0
||
to
!=
rows
.
size
())
{
// avoid copying the whole array for each row
rows
=
new
ArrayList
<>(
rows
.
subList
(
offset
,
to
));
}
}
else
{
if
(
clearAll
)
{
external
.
close
();
...
...
@@ -459,6 +465,11 @@ public class LocalResult implements ResultInterface, ResultTarget {
return
rowCount
;
}
@Override
public
void
limitsWereApplied
()
{
this
.
limitsWereApplied
=
true
;
}
@Override
public
boolean
hasNext
()
{
return
!
closed
&&
rowId
<
rowCount
-
1
;
...
...
h2/src/main/org/h2/result/ResultTarget.java
浏览文件 @
12f5bf71
...
...
@@ -26,4 +26,11 @@ public interface ResultTarget {
*/
int
getRowCount
();
/**
* A hint that offset and limit may be ignored by this result because they
* were applied during the query. This is useful for WITH TIES clause
* because result may contain tied rows above limit.
*/
void
limitsWereApplied
();
}
h2/src/main/org/h2/table/MetaTable.java
浏览文件 @
12f5bf71
...
...
@@ -590,8 +590,8 @@ public class MetaTable extends Table {
"TABLE_SCHEMA"
,
"TABLE_NAME"
,
"COLUMN_NAME"
,
"ORDINAL_POSITION"
,
"POSITION_IN_UNIQUE_CONSTRAINT"
"ORDINAL_POSITION
INT
"
,
"POSITION_IN_UNIQUE_CONSTRAINT
INT
"
);
indexColumnName
=
"TABLE_NAME"
;
break
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论