Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
1a30a9a7
提交
1a30a9a7
authored
7 年前
作者:
Evgenij Ryazanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support DISTINCT in Java aggregates
上级
048f834c
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
67 行增加
和
20 行删除
+67
-20
Parser.java
h2/src/main/org/h2/command/Parser.java
+2
-1
JavaAggregate.java
h2/src/main/org/h2/expression/JavaAggregate.java
+54
-19
TestFunctions.java
h2/src/test/org/h2/test/db/TestFunctions.java
+11
-0
没有找到文件。
h2/src/main/org/h2/command/Parser.java
浏览文件 @
1a30a9a7
...
...
@@ -2736,6 +2736,7 @@ public class Parser {
}
private
JavaAggregate
readJavaAggregate
(
UserAggregate
aggregate
)
{
boolean
distinct
=
readIf
(
"DISTINCT"
);
ArrayList
<
Expression
>
params
=
New
.
arrayList
();
do
{
params
.
add
(
readExpression
());
...
...
@@ -2750,7 +2751,7 @@ public class Parser {
filterCondition
=
null
;
}
Expression
[]
list
=
params
.
toArray
(
new
Expression
[
0
]);
JavaAggregate
agg
=
new
JavaAggregate
(
aggregate
,
list
,
currentSelect
,
filterCondition
);
JavaAggregate
agg
=
new
JavaAggregate
(
aggregate
,
list
,
currentSelect
,
distinct
,
filterCondition
);
currentSelect
.
setGroupQuery
();
return
agg
;
}
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/expression/JavaAggregate.java
浏览文件 @
1a30a9a7
...
...
@@ -20,6 +20,7 @@ import org.h2.table.TableFilter;
import
org.h2.util.StatementBuilder
;
import
org.h2.value.DataType
;
import
org.h2.value.Value
;
import
org.h2.value.ValueArray
;
import
org.h2.value.ValueNull
;
/**
...
...
@@ -31,16 +32,18 @@ public class JavaAggregate extends Expression {
private
final
Select
select
;
private
final
Expression
[]
args
;
private
int
[]
argTypes
;
private
final
boolean
distinct
;
private
Expression
filterCondition
;
private
int
dataType
;
private
Connection
userConnection
;
private
int
lastGroupRowId
;
public
JavaAggregate
(
UserAggregate
userAggregate
,
Expression
[]
args
,
Select
select
,
Expression
filterCondition
)
{
Select
select
,
boolean
distinct
,
Expression
filterCondition
)
{
this
.
userAggregate
=
userAggregate
;
this
.
args
=
args
;
this
.
select
=
select
;
this
.
distinct
=
distinct
;
this
.
filterCondition
=
filterCondition
;
}
...
...
@@ -169,9 +172,29 @@ public class JavaAggregate extends Expression {
throw
DbException
.
get
(
ErrorCode
.
INVALID_USE_OF_AGGREGATE_FUNCTION_1
,
getSQL
());
}
try
{
Aggregate
agg
=
(
Aggregate
)
group
.
get
(
this
)
;
if
(
agg
==
null
)
{
Aggregate
agg
;
if
(
distinct
)
{
agg
=
getInstance
();
AggregateDataCollecting
data
=
(
AggregateDataCollecting
)
group
.
get
(
this
);
if
(
data
!=
null
)
{
for
(
Value
value
:
data
.
values
)
{
if
(
args
.
length
==
1
)
{
agg
.
add
(
value
.
getObject
());
}
else
{
Value
[]
values
=
((
ValueArray
)
value
).
getList
();
Object
[]
argValues
=
new
Object
[
args
.
length
];
for
(
int
i
=
0
,
len
=
args
.
length
;
i
<
len
;
i
++)
{
argValues
[
i
]
=
values
[
i
].
getObject
();
}
agg
.
add
(
argValues
);
}
}
}
}
else
{
agg
=
(
Aggregate
)
group
.
get
(
this
);
if
(
agg
==
null
)
{
agg
=
getInstance
();
}
}
Object
obj
=
agg
.
getResult
();
if
(
obj
==
null
)
{
...
...
@@ -204,24 +227,36 @@ public class JavaAggregate extends Expression {
}
}
Aggregate
agg
=
(
Aggregate
)
group
.
get
(
this
);
try
{
if
(
agg
==
null
)
{
agg
=
getInstance
(
);
group
.
put
(
this
,
agg
);
}
Object
[]
argValues
=
new
Object
[
args
.
length
]
;
Object
arg
=
null
;
for
(
int
i
=
0
,
len
=
args
.
length
;
i
<
len
;
i
++)
{
Value
v
=
args
[
i
].
getValue
(
session
)
;
v
=
v
.
convertTo
(
argTypes
[
i
]);
arg
=
v
.
getObject
(
);
argValues
[
i
]
=
arg
;
}
if
(
args
.
length
==
1
)
{
agg
.
add
(
arg
);
if
(
distinct
)
{
AggregateDataCollecting
data
=
(
AggregateDataCollecting
)
group
.
get
(
this
);
if
(
data
==
null
)
{
data
=
new
AggregateDataCollecting
();
group
.
put
(
this
,
data
)
;
}
Value
[]
argValues
=
new
Value
[
args
.
length
];
Value
arg
=
null
;
for
(
int
i
=
0
,
len
=
args
.
length
;
i
<
len
;
i
++)
{
arg
=
args
[
i
].
getValue
(
session
);
arg
=
arg
.
convertTo
(
argTypes
[
i
])
;
argValues
[
i
]
=
arg
;
}
data
.
add
(
session
.
getDatabase
(),
dataType
,
true
,
args
.
length
==
1
?
arg
:
ValueArray
.
get
(
argValues
)
);
}
else
{
agg
.
add
(
argValues
);
Aggregate
agg
=
(
Aggregate
)
group
.
get
(
this
);
if
(
agg
==
null
)
{
agg
=
getInstance
();
group
.
put
(
this
,
agg
);
}
Object
[]
argValues
=
new
Object
[
args
.
length
];
Object
arg
=
null
;
for
(
int
i
=
0
,
len
=
args
.
length
;
i
<
len
;
i
++)
{
Value
v
=
args
[
i
].
getValue
(
session
);
v
=
v
.
convertTo
(
argTypes
[
i
]);
arg
=
v
.
getObject
();
argValues
[
i
]
=
arg
;
}
agg
.
add
(
args
.
length
==
1
?
arg
:
argValues
);
}
}
catch
(
SQLException
e
)
{
throw
DbException
.
convert
(
e
);
...
...
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/db/TestFunctions.java
浏览文件 @
1a30a9a7
...
...
@@ -32,6 +32,7 @@ import java.text.ParseException;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.Collections
;
import
java.util.Currency
;
import
java.util.Date
;
import
java.util.GregorianCalendar
;
...
...
@@ -694,6 +695,7 @@ public class TestFunctions extends TestBase implements AggregateFunction {
@Override
public
Object
getResult
()
{
Collections
.
sort
(
list
);
return
list
.
get
(
list
.
size
()
/
2
);
}
...
...
@@ -793,6 +795,15 @@ public class TestFunctions extends TestBase implements AggregateFunction {
"SELECT SIMPLE_MEDIAN(X) FROM SYSTEM_RANGE(1, 9)"
);
rs
.
next
();
assertEquals
(
"5"
,
rs
.
getString
(
1
));
stat
.
execute
(
"CREATE TABLE DATA(V INT)"
);
stat
.
execute
(
"INSERT INTO DATA VALUES (1), (3), (2), (1), (1), (2), (1), (1), (1), (1), (1)"
);
rs
=
stat
.
executeQuery
(
"SELECT SIMPLE_MEDIAN(V), SIMPLE_MEDIAN(DISTINCT V) FROM DATA"
);
rs
.
next
();
assertEquals
(
"1"
,
rs
.
getString
(
1
));
assertEquals
(
"2"
,
rs
.
getString
(
2
));
conn
.
close
();
if
(
config
.
memory
)
{
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论