Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
b79444bd
Unverified
提交
b79444bd
authored
9月 21, 2018
作者:
Evgenij Ryazanov
提交者:
GitHub
9月 21, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1463 from katzyn/aggregate
Fix some window aggregates and reduce amount of collecting implementations
上级
f49d2b6a
92596a70
隐藏空白字符变更
内嵌
并排
正在显示
14 个修改的文件
包含
216 行增加
和
116 行删除
+216
-116
Aggregate.java
h2/src/main/org/h2/expression/aggregate/Aggregate.java
+41
-5
AggregateData.java
h2/src/main/org/h2/expression/aggregate/AggregateData.java
+35
-15
AggregateDataCollecting.java
.../org/h2/expression/aggregate/AggregateDataCollecting.java
+35
-7
AggregateDataCount.java
.../main/org/h2/expression/aggregate/AggregateDataCount.java
+4
-20
AggregateDataCountAll.java
...in/org/h2/expression/aggregate/AggregateDataCountAll.java
+3
-9
AggregateDataDefault.java
...ain/org/h2/expression/aggregate/AggregateDataDefault.java
+3
-25
AggregateDataEnvelope.java
...in/org/h2/expression/aggregate/AggregateDataEnvelope.java
+2
-2
AggregateDataHistogram.java
...n/org/h2/expression/aggregate/AggregateDataHistogram.java
+13
-2
AggregateDataMode.java
...c/main/org/h2/expression/aggregate/AggregateDataMode.java
+2
-2
AggregateDataSelectivity.java
...org/h2/expression/aggregate/AggregateDataSelectivity.java
+15
-2
AggregateMedian.java
h2/src/main/org/h2/expression/aggregate/AggregateMedian.java
+33
-25
JavaAggregate.java
h2/src/main/org/h2/expression/aggregate/JavaAggregate.java
+2
-2
count.sql
...rc/test/org/h2/test/scripts/functions/aggregate/count.sql
+14
-0
sum.sql
h2/src/test/org/h2/test/scripts/functions/aggregate/sum.sql
+14
-0
没有找到文件。
h2/src/main/org/h2/expression/aggregate/Aggregate.java
浏览文件 @
b79444bd
...
...
@@ -12,6 +12,7 @@ import java.util.HashMap;
import
org.h2.api.ErrorCode
;
import
org.h2.command.dml.Select
;
import
org.h2.command.dml.SelectOrderBy
;
import
org.h2.engine.Database
;
import
org.h2.engine.Session
;
import
org.h2.expression.Expression
;
import
org.h2.expression.ExpressionColumn
;
...
...
@@ -191,6 +192,9 @@ public class Aggregate extends AbstractAggregate {
*/
public
Aggregate
(
AggregateType
type
,
Expression
on
,
Select
select
,
boolean
distinct
)
{
super
(
select
,
distinct
);
if
(
distinct
&&
type
==
AggregateType
.
COUNT_ALL
)
{
throw
DbException
.
throwInternalError
();
}
this
.
type
=
type
;
this
.
on
=
on
;
}
...
...
@@ -302,7 +306,7 @@ public class Aggregate extends AbstractAggregate {
v
=
updateCollecting
(
session
,
v
,
remembered
);
}
}
data
.
add
(
session
.
getDatabase
(),
dataType
,
distinct
,
v
);
data
.
add
(
session
.
getDatabase
(),
dataType
,
v
);
}
@Override
...
...
@@ -369,7 +373,7 @@ public class Aggregate extends AbstractAggregate {
@Override
protected
Object
createAggregateData
()
{
return
AggregateData
.
create
(
type
);
return
AggregateData
.
create
(
type
,
distinct
);
}
@Override
...
...
@@ -402,7 +406,7 @@ public class Aggregate extends AbstractAggregate {
return
v
;
}
case
MEDIAN:
return
Aggregate
DataMedian
.
getResult
FromIndex
(
session
,
on
,
dataType
);
return
Aggregate
Median
.
median
FromIndex
(
session
,
on
,
dataType
);
case
ENVELOPE:
return
((
MVSpatialIndex
)
AggregateDataEnvelope
.
getGeometryColumnIndex
(
on
)).
getBounds
(
session
);
default
:
...
...
@@ -417,6 +421,30 @@ public class Aggregate extends AbstractAggregate {
data
=
(
AggregateData
)
createAggregateData
();
}
switch
(
type
)
{
case
COUNT:
if
(
distinct
)
{
return
ValueLong
.
get
(((
AggregateDataCollecting
)
data
).
getCount
());
}
break
;
case
SUM:
case
AVG:
case
STDDEV_POP:
case
STDDEV_SAMP:
case
VAR_POP:
case
VAR_SAMP:
if
(
distinct
)
{
AggregateDataCollecting
c
=
((
AggregateDataCollecting
)
data
);
if
(
c
.
getCount
()
==
0
)
{
return
ValueNull
.
INSTANCE
;
}
AggregateDataDefault
d
=
new
AggregateDataDefault
(
type
);
Database
db
=
session
.
getDatabase
();
for
(
Value
v
:
c
)
{
d
.
add
(
db
,
dataType
,
v
);
}
return
d
.
getValue
(
db
,
dataType
);
}
break
;
case
GROUP_CONCAT:
{
Value
[]
array
=
((
AggregateDataCollecting
)
data
).
getArray
();
if
(
array
==
null
)
{
...
...
@@ -459,6 +487,13 @@ public class Aggregate extends AbstractAggregate {
}
return
ValueArray
.
get
(
array
);
}
case
MEDIAN:
{
Value
[]
array
=
((
AggregateDataCollecting
)
data
).
getArray
();
if
(
array
==
null
)
{
return
ValueNull
.
INSTANCE
;
}
return
AggregateMedian
.
median
(
session
.
getDatabase
(),
array
,
dataType
);
}
case
MODE:
if
(
orderByList
!=
null
)
{
return
((
AggregateDataMode
)
data
).
getOrderedValue
(
session
.
getDatabase
(),
dataType
,
...
...
@@ -466,8 +501,9 @@ public class Aggregate extends AbstractAggregate {
}
//$FALL-THROUGH$
default
:
return
data
.
getValue
(
session
.
getDatabase
(),
dataType
,
distinct
);
// Avoid compiler warning
}
return
data
.
getValue
(
session
.
getDatabase
(),
dataType
);
}
@Override
...
...
@@ -762,7 +798,7 @@ public class Aggregate extends AbstractAggregate {
if
(
distinct
)
{
return
false
;
}
return
Aggregate
Data
Median
.
getMedianColumnIndex
(
on
)
!=
null
;
return
AggregateMedian
.
getMedianColumnIndex
(
on
)
!=
null
;
case
ENVELOPE:
return
AggregateDataEnvelope
.
getGeometryColumnIndex
(
on
)
!=
null
;
default
:
...
...
h2/src/main/org/h2/expression/aggregate/AggregateData.java
浏览文件 @
b79444bd
...
...
@@ -7,6 +7,7 @@ package org.h2.expression.aggregate;
import
org.h2.engine.Database
;
import
org.h2.expression.aggregate.Aggregate.AggregateType
;
import
org.h2.message.DbException
;
import
org.h2.value.Value
;
/**
...
...
@@ -18,30 +19,51 @@ abstract class AggregateData {
* Create an AggregateData object of the correct sub-type.
*
* @param aggregateType the type of the aggregate operation
* @param distinct if the calculation should be distinct
* @return the aggregate data object of the specified type
*/
static
AggregateData
create
(
AggregateType
aggregateType
)
{
static
AggregateData
create
(
AggregateType
aggregateType
,
boolean
distinct
)
{
switch
(
aggregateType
)
{
case
SELECTIVITY:
return
new
AggregateDataSelectivity
();
case
GROUP_CONCAT:
case
ARRAY_AGG:
return
new
AggregateDataCollecting
();
case
COUNT_ALL:
return
new
AggregateDataCountAll
();
case
COUNT:
return
new
AggregateDataCount
();
case
HISTOGRAM:
return
new
AggregateDataHistogram
();
if
(!
distinct
)
{
return
new
AggregateDataCount
();
}
break
;
case
GROUP_CONCAT:
case
ARRAY_AGG:
case
MEDIAN:
return
new
AggregateDataMedian
();
break
;
case
MIN:
case
MAX:
case
BIT_OR:
case
BIT_AND:
case
BOOL_OR:
case
BOOL_AND:
return
new
AggregateDataDefault
(
aggregateType
);
case
SUM:
case
AVG:
case
STDDEV_POP:
case
STDDEV_SAMP:
case
VAR_POP:
case
VAR_SAMP:
if
(!
distinct
)
{
return
new
AggregateDataDefault
(
aggregateType
);
}
break
;
case
SELECTIVITY:
return
new
AggregateDataSelectivity
(
distinct
);
case
HISTOGRAM:
return
new
AggregateDataHistogram
(
distinct
);
case
MODE:
return
new
AggregateDataMode
();
case
ENVELOPE:
return
new
AggregateDataEnvelope
();
default
:
return
new
AggregateDataDefault
(
aggregateType
);
throw
DbException
.
throwInternalError
(
"type="
+
aggregateType
);
}
return
new
AggregateDataCollecting
(
distinct
);
}
/**
...
...
@@ -49,18 +71,16 @@ abstract class AggregateData {
*
* @param database the database
* @param dataType the datatype of the computed result
* @param distinct if the calculation should be distinct
* @param v the value
*/
abstract
void
add
(
Database
database
,
int
dataType
,
boolean
distinct
,
Value
v
);
abstract
void
add
(
Database
database
,
int
dataType
,
Value
v
);
/**
* Get the aggregate result.
*
* @param database the database
* @param dataType the datatype of the computed result
* @param distinct if distinct is used
* @return the value
*/
abstract
Value
getValue
(
Database
database
,
int
dataType
,
boolean
distinct
);
abstract
Value
getValue
(
Database
database
,
int
dataType
);
}
h2/src/main/org/h2/expression/aggregate/AggregateDataCollecting.java
浏览文件 @
b79444bd
...
...
@@ -7,7 +7,9 @@ package org.h2.expression.aggregate;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.HashSet
;
import
java.util.Iterator
;
import
org.h2.engine.Database
;
import
org.h2.value.Value
;
...
...
@@ -15,20 +17,31 @@ import org.h2.value.ValueNull;
/**
* Data stored while calculating an aggregate that needs collecting of all
* values.
* values
or a distinct aggregate
.
*
* <p>
* NULL values are not collected. {@link #getValue(Database, int
, boolean
)}
* NULL values are not collected. {@link #getValue(Database, int)}
* method returns {@code null}. Use {@link #getArray()} for instances of this
* class instead. Notice that subclasses like {@link AggregateDataMedian} may
* override {@link #getValue(Database, int, boolean)} to return useful result.
* class instead.
* </p>
*/
class
AggregateDataCollecting
extends
AggregateData
{
class
AggregateDataCollecting
extends
AggregateData
implements
Iterable
<
Value
>
{
private
final
boolean
distinct
;
Collection
<
Value
>
values
;
/**
* Creates new instance of data for collecting aggregates.
*
* @param distinct if distinct is used
*/
AggregateDataCollecting
(
boolean
distinct
)
{
this
.
distinct
=
distinct
;
}
@Override
void
add
(
Database
database
,
int
dataType
,
boolean
distinct
,
Value
v
)
{
void
add
(
Database
database
,
int
dataType
,
Value
v
)
{
if
(
v
==
ValueNull
.
INSTANCE
)
{
return
;
}
...
...
@@ -40,10 +53,19 @@ class AggregateDataCollecting extends AggregateData {
}
@Override
Value
getValue
(
Database
database
,
int
dataType
,
boolean
distinct
)
{
Value
getValue
(
Database
database
,
int
dataType
)
{
return
null
;
}
/**
* Returns the count of values.
*
* @return the count of values
*/
int
getCount
()
{
return
values
!=
null
?
values
.
size
()
:
0
;
}
/**
* Returns array with values or {@code null}.
*
...
...
@@ -56,4 +78,10 @@ class AggregateDataCollecting extends AggregateData {
}
return
values
.
toArray
(
new
Value
[
0
]);
}
@Override
public
Iterator
<
Value
>
iterator
()
{
return
values
!=
null
?
values
.
iterator
()
:
Collections
.<
Value
>
emptyIterator
();
}
}
h2/src/main/org/h2/expression/aggregate/AggregateDataCount.java
浏览文件 @
b79444bd
...
...
@@ -6,7 +6,6 @@
package
org
.
h2
.
expression
.
aggregate
;
import
org.h2.engine.Database
;
import
org.h2.util.ValueHashMap
;
import
org.h2.value.Value
;
import
org.h2.value.ValueLong
;
import
org.h2.value.ValueNull
;
...
...
@@ -16,31 +15,16 @@ import org.h2.value.ValueNull;
*/
class
AggregateDataCount
extends
AggregateData
{
private
long
count
;
private
ValueHashMap
<
AggregateDataCount
>
distinctValues
;
@Override
void
add
(
Database
database
,
int
dataType
,
boolean
distinct
,
Value
v
)
{
if
(
v
==
ValueNull
.
INSTANCE
)
{
return
;
}
count
++;
if
(
distinct
)
{
if
(
distinctValues
==
null
)
{
distinctValues
=
ValueHashMap
.
newInstance
();
}
distinctValues
.
put
(
v
,
this
);
void
add
(
Database
database
,
int
dataType
,
Value
v
)
{
if
(
v
!=
ValueNull
.
INSTANCE
)
{
count
++;
}
}
@Override
Value
getValue
(
Database
database
,
int
dataType
,
boolean
distinct
)
{
if
(
distinct
)
{
if
(
distinctValues
!=
null
)
{
count
=
distinctValues
.
size
();
}
else
{
count
=
0
;
}
}
Value
getValue
(
Database
database
,
int
dataType
)
{
return
ValueLong
.
get
(
count
).
convertTo
(
dataType
);
}
...
...
h2/src/main/org/h2/expression/aggregate/AggregateDataCountAll.java
浏览文件 @
b79444bd
...
...
@@ -6,7 +6,6 @@
package
org
.
h2
.
expression
.
aggregate
;
import
org.h2.engine.Database
;
import
org.h2.message.DbException
;
import
org.h2.value.Value
;
import
org.h2.value.ValueLong
;
...
...
@@ -14,21 +13,16 @@ import org.h2.value.ValueLong;
* Data stored while calculating a COUNT(*) aggregate.
*/
class
AggregateDataCountAll
extends
AggregateData
{
private
long
count
;
@Override
void
add
(
Database
database
,
int
dataType
,
boolean
distinct
,
Value
v
)
{
if
(
distinct
)
{
throw
DbException
.
throwInternalError
();
}
void
add
(
Database
database
,
int
dataType
,
Value
v
)
{
count
++;
}
@Override
Value
getValue
(
Database
database
,
int
dataType
,
boolean
distinct
)
{
if
(
distinct
)
{
throw
DbException
.
throwInternalError
();
}
Value
getValue
(
Database
database
,
int
dataType
)
{
return
ValueLong
.
get
(
count
).
convertTo
(
dataType
);
}
...
...
h2/src/main/org/h2/expression/aggregate/AggregateDataDefault.java
浏览文件 @
b79444bd
...
...
@@ -8,7 +8,6 @@ package org.h2.expression.aggregate;
import
org.h2.engine.Database
;
import
org.h2.expression.aggregate.Aggregate.AggregateType
;
import
org.h2.message.DbException
;
import
org.h2.util.ValueHashMap
;
import
org.h2.value.DataType
;
import
org.h2.value.Value
;
import
org.h2.value.ValueBoolean
;
...
...
@@ -20,9 +19,9 @@ import org.h2.value.ValueNull;
* Data stored while calculating an aggregate.
*/
class
AggregateDataDefault
extends
AggregateData
{
private
final
AggregateType
aggregateType
;
private
long
count
;
private
ValueHashMap
<
AggregateDataDefault
>
distinctValues
;
private
Value
value
;
private
double
m2
,
mean
;
...
...
@@ -34,18 +33,11 @@ class AggregateDataDefault extends AggregateData {
}
@Override
void
add
(
Database
database
,
int
dataType
,
boolean
distinct
,
Value
v
)
{
void
add
(
Database
database
,
int
dataType
,
Value
v
)
{
if
(
v
==
ValueNull
.
INSTANCE
)
{
return
;
}
count
++;
if
(
distinct
)
{
if
(
distinctValues
==
null
)
{
distinctValues
=
ValueHashMap
.
newInstance
();
}
distinctValues
.
put
(
v
,
this
);
return
;
}
switch
(
aggregateType
)
{
case
SUM:
if
(
value
==
null
)
{
...
...
@@ -127,11 +119,7 @@ class AggregateDataDefault extends AggregateData {
}
@Override
Value
getValue
(
Database
database
,
int
dataType
,
boolean
distinct
)
{
if
(
distinct
)
{
count
=
0
;
groupDistinct
(
database
,
dataType
);
}
Value
getValue
(
Database
database
,
int
dataType
)
{
Value
v
=
null
;
switch
(
aggregateType
)
{
case
SUM:
...
...
@@ -192,14 +180,4 @@ class AggregateDataDefault extends AggregateData {
return
a
;
}
private
void
groupDistinct
(
Database
database
,
int
dataType
)
{
if
(
distinctValues
==
null
)
{
return
;
}
count
=
0
;
for
(
Value
v
:
distinctValues
.
keys
())
{
add
(
database
,
dataType
,
false
,
v
);
}
}
}
h2/src/main/org/h2/expression/aggregate/AggregateDataEnvelope.java
浏览文件 @
b79444bd
...
...
@@ -57,7 +57,7 @@ class AggregateDataEnvelope extends AggregateData {
}
@Override
void
add
(
Database
database
,
int
dataType
,
boolean
distinct
,
Value
v
)
{
void
add
(
Database
database
,
int
dataType
,
Value
v
)
{
if
(
v
==
ValueNull
.
INSTANCE
)
{
return
;
}
...
...
@@ -65,7 +65,7 @@ class AggregateDataEnvelope extends AggregateData {
}
@Override
Value
getValue
(
Database
database
,
int
dataType
,
boolean
distinct
)
{
Value
getValue
(
Database
database
,
int
dataType
)
{
return
ValueGeometry
.
fromEnvelope
(
envelope
);
}
...
...
h2/src/main/org/h2/expression/aggregate/AggregateDataHistogram.java
浏览文件 @
b79444bd
...
...
@@ -22,10 +22,21 @@ import org.h2.value.ValueLong;
*/
class
AggregateDataHistogram
extends
AggregateData
{
private
final
boolean
distinct
;
private
ValueHashMap
<
LongDataCounter
>
distinctValues
;
/**
* Creates new instance of data for HISTOGRAM aggregate.
*
* @param distinct if distinct is used
*/
AggregateDataHistogram
(
boolean
distinct
)
{
this
.
distinct
=
distinct
;
}
@Override
void
add
(
Database
database
,
int
dataType
,
boolean
distinct
,
Value
v
)
{
void
add
(
Database
database
,
int
dataType
,
Value
v
)
{
if
(
distinctValues
==
null
)
{
distinctValues
=
ValueHashMap
.
newInstance
();
}
...
...
@@ -41,7 +52,7 @@ class AggregateDataHistogram extends AggregateData {
}
@Override
Value
getValue
(
Database
database
,
int
dataType
,
boolean
distinct
)
{
Value
getValue
(
Database
database
,
int
dataType
)
{
if
(
distinctValues
==
null
)
{
return
ValueArray
.
get
(
new
Value
[
0
]).
convertTo
(
dataType
);
}
...
...
h2/src/main/org/h2/expression/aggregate/AggregateDataMode.java
浏览文件 @
b79444bd
...
...
@@ -20,7 +20,7 @@ class AggregateDataMode extends AggregateData {
private
ValueHashMap
<
LongDataCounter
>
distinctValues
;
@Override
void
add
(
Database
database
,
int
dataType
,
boolean
distinct
,
Value
v
)
{
void
add
(
Database
database
,
int
dataType
,
Value
v
)
{
if
(
v
==
ValueNull
.
INSTANCE
)
{
return
;
}
...
...
@@ -36,7 +36,7 @@ class AggregateDataMode extends AggregateData {
}
@Override
Value
getValue
(
Database
database
,
int
dataType
,
boolean
distinct
)
{
Value
getValue
(
Database
database
,
int
dataType
)
{
Value
v
=
ValueNull
.
INSTANCE
;
if
(
distinctValues
!=
null
)
{
long
count
=
0L
;
...
...
h2/src/main/org/h2/expression/aggregate/AggregateDataSelectivity.java
浏览文件 @
b79444bd
...
...
@@ -15,12 +15,24 @@ import org.h2.value.ValueInt;
* Data stored while calculating a SELECTIVITY aggregate.
*/
class
AggregateDataSelectivity
extends
AggregateData
{
private
final
boolean
distinct
;
private
long
count
;
private
IntIntHashMap
distinctHashes
;
private
double
m2
;
/**
* Creates new instance of data for SELECTIVITY aggregate.
*
* @param distinct if distinct is used
*/
AggregateDataSelectivity
(
boolean
distinct
)
{
this
.
distinct
=
distinct
;
}
@Override
void
add
(
Database
database
,
int
dataType
,
boolean
distinct
,
Value
v
)
{
void
add
(
Database
database
,
int
dataType
,
Value
v
)
{
count
++;
if
(
distinctHashes
==
null
)
{
distinctHashes
=
new
IntIntHashMap
();
...
...
@@ -36,7 +48,7 @@ class AggregateDataSelectivity extends AggregateData {
}
@Override
Value
getValue
(
Database
database
,
int
dataType
,
boolean
distinct
)
{
Value
getValue
(
Database
database
,
int
dataType
)
{
if
(
distinct
)
{
count
=
0
;
}
...
...
@@ -53,4 +65,5 @@ class AggregateDataSelectivity extends AggregateData {
v
=
ValueInt
.
get
(
s
);
return
v
.
convertTo
(
dataType
);
}
}
h2/src/main/org/h2/expression/aggregate/Aggregate
Data
Median.java
→
h2/src/main/org/h2/expression/aggregate/AggregateMedian.java
浏览文件 @
b79444bd
...
...
@@ -41,9 +41,10 @@ import org.h2.value.ValueTimestamp;
import
org.h2.value.ValueTimestampTimeZone
;
/**
*
Data stored while calculating a
MEDIAN aggregate.
* MEDIAN aggregate.
*/
class
AggregateDataMedian
extends
AggregateDataCollecting
{
final
class
AggregateMedian
{
private
static
boolean
isNullsLast
(
Index
index
)
{
IndexColumn
ic
=
index
.
getIndexColumns
()[
0
];
int
sortType
=
ic
.
sortType
;
...
...
@@ -91,14 +92,34 @@ class AggregateDataMedian extends AggregateDataCollecting {
}
/**
* Get the result from the index.
* Get the median from the array of values.
*
* @param database the database
* @param array array with values
* @param dataType the data type
* @return the result
*/
static
Value
median
(
Database
database
,
Value
[]
array
,
int
dataType
)
{
final
CompareMode
compareMode
=
database
.
getCompareMode
();
Arrays
.
sort
(
array
,
compareMode
);
int
len
=
array
.
length
;
int
idx
=
len
/
2
;
Value
v1
=
array
[
idx
];
if
((
len
&
1
)
==
1
)
{
return
v1
.
convertTo
(
dataType
);
}
return
getMedian
(
array
[
idx
-
1
],
v1
,
dataType
,
database
.
getMode
(),
compareMode
);
}
/**
* Get the median from the index.
*
* @param session the session
* @param on the expression
* @param dataType the data type
* @return the result
*/
static
Value
getResult
FromIndex
(
Session
session
,
Expression
on
,
int
dataType
)
{
static
Value
median
FromIndex
(
Session
session
,
Expression
on
,
int
dataType
)
{
Index
index
=
getMedianColumnIndex
(
on
);
long
count
=
index
.
getRowCount
(
session
);
if
(
count
==
0
)
{
...
...
@@ -172,25 +193,9 @@ class AggregateDataMedian extends AggregateDataCollecting {
return
v
;
}
@Override
Value
getValue
(
Database
database
,
int
dataType
,
boolean
distinct
)
{
Value
[]
a
=
getArray
();
if
(
a
==
null
)
{
return
ValueNull
.
INSTANCE
;
}
final
CompareMode
compareMode
=
database
.
getCompareMode
();
Arrays
.
sort
(
a
,
compareMode
);
int
len
=
a
.
length
;
int
idx
=
len
/
2
;
Value
v1
=
a
[
idx
];
if
((
len
&
1
)
==
1
)
{
return
v1
.
convertTo
(
dataType
);
}
return
getMedian
(
a
[
idx
-
1
],
v1
,
dataType
,
database
.
getMode
(),
compareMode
);
}
private
static
Value
getMedian
(
Value
v0
,
Value
v1
,
int
dataType
,
Mode
databaseMode
,
CompareMode
compareMode
)
{
if
(
v0
.
compareTo
(
v1
,
databaseMode
,
compareMode
)
==
0
)
{
int
cmp
=
v0
.
compareTo
(
v1
,
databaseMode
,
compareMode
);
if
(
cmp
==
0
)
{
return
v0
.
convertTo
(
dataType
);
}
switch
(
dataType
)
{
...
...
@@ -266,11 +271,14 @@ class AggregateDataMedian extends AggregateDataCollecting {
case
Value
.
INTERVAL_MINUTE_TO_SECOND
:
return
IntervalUtils
.
intervalFromAbsolute
(
IntervalQualifier
.
valueOf
(
dataType
-
Value
.
INTERVAL_YEAR
),
IntervalUtils
.
intervalToAbsolute
((
ValueInterval
)
v0
)
.
add
(
IntervalUtils
.
intervalToAbsolute
((
ValueInterval
)
v1
)).
shiftRight
(
1
));
.
add
(
IntervalUtils
.
intervalToAbsolute
((
ValueInterval
)
v1
)).
shiftRight
(
1
));
default
:
// Just return
first
return
v0
.
convertTo
(
dataType
);
// Just return
smaller
return
(
cmp
<
0
?
v0
:
v1
)
.
convertTo
(
dataType
);
}
}
private
AggregateMedian
()
{
}
}
h2/src/main/org/h2/expression/aggregate/JavaAggregate.java
浏览文件 @
b79444bd
...
...
@@ -209,7 +209,7 @@ public class JavaAggregate extends AbstractAggregate {
arg
=
arg
.
convertTo
(
argTypes
[
i
]);
argValues
[
i
]
=
arg
;
}
data
.
add
(
session
.
getDatabase
(),
dataType
,
true
,
args
.
length
==
1
?
arg
:
ValueArray
.
get
(
argValues
));
data
.
add
(
session
.
getDatabase
(),
dataType
,
args
.
length
==
1
?
arg
:
ValueArray
.
get
(
argValues
));
}
else
{
Aggregate
agg
=
(
Aggregate
)
aggregateData
;
Object
[]
argValues
=
new
Object
[
args
.
length
];
...
...
@@ -254,7 +254,7 @@ public class JavaAggregate extends AbstractAggregate {
@Override
protected
Object
createAggregateData
()
{
return
distinct
?
new
AggregateDataCollecting
()
:
getInstance
();
return
distinct
?
new
AggregateDataCollecting
(
true
)
:
getInstance
();
}
}
h2/src/test/org/h2/test/scripts/functions/aggregate/count.sql
浏览文件 @
b79444bd
...
...
@@ -69,3 +69,17 @@ SELECT NR FROM (SELECT COUNT(ID) OVER (ORDER BY NAME) AS NR,
DROP
TABLE
TEST
;
>
ok
SELECT
I
,
V
,
COUNT
(
V
)
OVER
W
C
,
COUNT
(
DISTINCT
V
)
OVER
W
D
FROM
VALUES
(
1
,
1
),
(
2
,
1
),
(
3
,
1
),
(
4
,
1
),
(
5
,
2
),
(
6
,
2
),
(
7
,
3
)
T
(
I
,
V
)
WINDOW
W
AS
(
ORDER
BY
I
);
>
I
V
C
D
>
-
-
-
-
>
1
1
1
1
>
2
1
2
1
>
3
1
3
1
>
4
1
4
1
>
5
2
5
2
>
6
2
6
2
>
7
3
7
3
>
rows
(
ordered
):
7
h2/src/test/org/h2/test/scripts/functions/aggregate/sum.sql
浏览文件 @
b79444bd
...
...
@@ -81,3 +81,17 @@ SELECT
>
7
28
28
15
36
>
8
36
36
8
36
>
rows
(
ordered
):
8
SELECT
I
,
V
,
SUM
(
V
)
OVER
W
S
,
SUM
(
DISTINCT
V
)
OVER
W
D
FROM
VALUES
(
1
,
1
),
(
2
,
1
),
(
3
,
1
),
(
4
,
1
),
(
5
,
2
),
(
6
,
2
),
(
7
,
3
)
T
(
I
,
V
)
WINDOW
W
AS
(
ORDER
BY
I
);
>
I
V
S
D
>
-
-
-- -
>
1
1
1
1
>
2
1
2
1
>
3
1
3
1
>
4
1
4
1
>
5
2
6
3
>
6
2
8
3
>
7
3
11
6
>
rows
(
ordered
):
7
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论