Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
2bc541a0
提交
2bc541a0
authored
2月 13, 2018
作者:
Evgenij Ryazanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix long lines and whitespace
上级
905e5fb6
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
39 行增加
和
35 行删除
+39
-35
Function.java
h2/src/main/org/h2/expression/Function.java
+23
-20
MetaTable.java
h2/src/main/org/h2/table/MetaTable.java
+1
-1
ChangeFileEncryption.java
h2/src/main/org/h2/tools/ChangeFileEncryption.java
+2
-1
DateTimeUtils.java
h2/src/main/org/h2/util/DateTimeUtils.java
+1
-1
TestBase.java
h2/src/test/org/h2/test/TestBase.java
+10
-10
TestScript.java
h2/src/test/org/h2/test/scripts/TestScript.java
+1
-1
TestFuzzOptimizations.java
h2/src/test/org/h2/test/synth/TestFuzzOptimizations.java
+1
-1
没有找到文件。
h2/src/main/org/h2/expression/Function.java
浏览文件 @
2bc541a0
...
@@ -1504,7 +1504,7 @@ public class Function extends Expression implements FunctionCall {
...
@@ -1504,7 +1504,7 @@ public class Function extends Expression implements FunctionCall {
if
(
field
!=
EPOCH
)
{
if
(
field
!=
EPOCH
)
{
result
=
ValueInt
.
get
(
getIntDatePart
(
v1
,
field
));
result
=
ValueInt
.
get
(
getIntDatePart
(
v1
,
field
));
}
else
{
}
else
{
// Case where we retrieve the EPOCH time.
// Case where we retrieve the EPOCH time.
// First we retrieve the dateValue and his time in nanoseconds.
// First we retrieve the dateValue and his time in nanoseconds.
long
[]
a
=
DateTimeUtils
.
dateAndTimeFromValue
(
v1
);
long
[]
a
=
DateTimeUtils
.
dateAndTimeFromValue
(
v1
);
...
@@ -1515,37 +1515,40 @@ public class Function extends Expression implements FunctionCall {
...
@@ -1515,37 +1515,40 @@ public class Function extends Expression implements FunctionCall {
BigDecimal
numberOfDays
=
new
BigDecimal
(
DateTimeUtils
.
absoluteDayFromDateValue
(
dateValue
));
BigDecimal
numberOfDays
=
new
BigDecimal
(
DateTimeUtils
.
absoluteDayFromDateValue
(
dateValue
));
BigDecimal
nanosSeconds
=
new
BigDecimal
(
1_000_000_000
);
BigDecimal
nanosSeconds
=
new
BigDecimal
(
1_000_000_000
);
BigDecimal
secondsPerDay
=
new
BigDecimal
(
DateTimeUtils
.
SECONDS_PER_DAY
);
BigDecimal
secondsPerDay
=
new
BigDecimal
(
DateTimeUtils
.
SECONDS_PER_DAY
);
// Case where the value is of type time e.g. '10:00:00'
// Case where the value is of type time e.g. '10:00:00'
if
(
v1
instanceof
ValueTime
)
{
if
(
v1
instanceof
ValueTime
)
{
// In order to retrieve the EPOCH time we only have to convert the time
// In order to retrieve the EPOCH time we only have to convert the time
// in nanoseconds (previously retrieved) in seconds.
// in nanoseconds (previously retrieved) in seconds.
result
=
ValueDecimal
.
get
(
timeNanosBigDecimal
.
divide
(
nanosSeconds
));
result
=
ValueDecimal
.
get
(
timeNanosBigDecimal
.
divide
(
nanosSeconds
));
}
else
if
(
v1
instanceof
ValueDate
)
{
}
else
if
(
v1
instanceof
ValueDate
)
{
// Case where the value is of type date '2000:01:01', we have to retrieve the
total
// Case where the value is of type date '2000:01:01', we have to retrieve the
// number of days and multiply it by the number of seconds in a day.
//
total
number of days and multiply it by the number of seconds in a day.
result
=
ValueDecimal
.
get
(
numberOfDays
.
multiply
(
secondsPerDay
));
result
=
ValueDecimal
.
get
(
numberOfDays
.
multiply
(
secondsPerDay
));
}
else
if
(
v1
instanceof
ValueTimestampTimeZone
)
{
}
else
if
(
v1
instanceof
ValueTimestampTimeZone
)
{
// Case where the value is a of type ValueTimestampTimeZone ('2000:01:01 10:00:00+05).
// Case where the value is a of type ValueTimestampTimeZone
// We retrieve the time zone offset in minute
// ('2000:01:01 10:00:00+05').
// We retrieve the time zone offset in minutes
ValueTimestampTimeZone
v
=
(
ValueTimestampTimeZone
)
v1
;
ValueTimestampTimeZone
v
=
(
ValueTimestampTimeZone
)
v1
;
BigDecimal
timeZoneOffsetSeconds
=
new
BigDecimal
(
v
.
getTimeZoneOffsetMins
()
*
60
);
BigDecimal
timeZoneOffsetSeconds
=
new
BigDecimal
(
v
.
getTimeZoneOffsetMins
()
*
60
);
// Sum the time in nanoseconds and the total number of days in seconds
// Sum the time in nanoseconds and the total number of days in seconds
// and adding the timeZone offset in seconds.
// and adding the timeZone offset in seconds.
result
=
ValueDecimal
.
get
(
timeNanosBigDecimal
.
divide
(
nanosSeconds
)
result
=
ValueDecimal
.
get
(
timeNanosBigDecimal
.
divide
(
nanosSeconds
)
.
add
(
numberOfDays
.
multiply
(
secondsPerDay
))
.
add
(
numberOfDays
.
multiply
(
secondsPerDay
)).
subtract
(
timeZoneOffsetSeconds
));
.
subtract
(
timeZoneOffsetSeconds
));
}
else
{
}
else
{
// By default, we have the date and the time ('2000:01:01 10:00:00) if no type is given.
// By default, we have the date and the time ('2000:01:01 10:00:00') if no type
// We just have to sum the time in nanoseconds and the total number of days in seconds.
// is given.
result
=
ValueDecimal
.
get
(
timeNanosBigDecimal
.
divide
(
nanosSeconds
).
add
(
numberOfDays
.
multiply
(
secondsPerDay
)));
// We just have to sum the time in nanoseconds and the total number of days in
// seconds.
result
=
ValueDecimal
.
get
(
timeNanosBigDecimal
.
divide
(
nanosSeconds
).
add
(
numberOfDays
.
multiply
(
secondsPerDay
)));
}
}
}
}
break
;
break
;
...
...
h2/src/main/org/h2/table/MetaTable.java
浏览文件 @
2bc541a0
...
@@ -1615,7 +1615,7 @@ public class MetaTable extends Table {
...
@@ -1615,7 +1615,7 @@ public class MetaTable extends Table {
if
(
constraintType
==
Constraint
.
Type
.
CHECK
)
{
if
(
constraintType
==
Constraint
.
Type
.
CHECK
)
{
checkExpression
=
((
ConstraintCheck
)
constraint
).
getExpression
().
getSQL
();
checkExpression
=
((
ConstraintCheck
)
constraint
).
getExpression
().
getSQL
();
}
else
if
(
constraintType
==
Constraint
.
Type
.
UNIQUE
||
}
else
if
(
constraintType
==
Constraint
.
Type
.
UNIQUE
||
constraintType
==
Constraint
.
Type
.
PRIMARY_KEY
)
{
constraintType
==
Constraint
.
Type
.
PRIMARY_KEY
)
{
indexColumns
=
((
ConstraintUnique
)
constraint
).
getColumns
();
indexColumns
=
((
ConstraintUnique
)
constraint
).
getColumns
();
}
else
if
(
constraintType
==
Constraint
.
Type
.
REFERENTIAL
)
{
}
else
if
(
constraintType
==
Constraint
.
Type
.
REFERENTIAL
)
{
indexColumns
=
((
ConstraintReferential
)
constraint
).
getColumns
();
indexColumns
=
((
ConstraintReferential
)
constraint
).
getColumns
();
...
...
h2/src/main/org/h2/tools/ChangeFileEncryption.java
浏览文件 @
2bc541a0
...
@@ -224,7 +224,8 @@ public class ChangeFileEncryption extends Tool {
...
@@ -224,7 +224,8 @@ public class ChangeFileEncryption extends Tool {
try
(
FileChannel
fileIn
=
getFileChannel
(
fileName
,
"r"
,
decryptKey
)){
try
(
FileChannel
fileIn
=
getFileChannel
(
fileName
,
"r"
,
decryptKey
)){
try
(
InputStream
inStream
=
new
FileChannelInputStream
(
fileIn
,
true
))
{
try
(
InputStream
inStream
=
new
FileChannelInputStream
(
fileIn
,
true
))
{
FileUtils
.
delete
(
temp
);
FileUtils
.
delete
(
temp
);
try
(
OutputStream
outStream
=
new
FileChannelOutputStream
(
getFileChannel
(
temp
,
"rw"
,
encryptKey
),
true
))
{
try
(
OutputStream
outStream
=
new
FileChannelOutputStream
(
getFileChannel
(
temp
,
"rw"
,
encryptKey
),
true
))
{
byte
[]
buffer
=
new
byte
[
4
*
1024
];
byte
[]
buffer
=
new
byte
[
4
*
1024
];
long
remaining
=
fileIn
.
size
();
long
remaining
=
fileIn
.
size
();
long
total
=
remaining
;
long
total
=
remaining
;
...
...
h2/src/main/org/h2/util/DateTimeUtils.java
浏览文件 @
2bc541a0
...
@@ -36,7 +36,7 @@ public class DateTimeUtils {
...
@@ -36,7 +36,7 @@ public class DateTimeUtils {
* The number of milliseconds per day.
* The number of milliseconds per day.
*/
*/
public
static
final
long
MILLIS_PER_DAY
=
24
*
60
*
60
*
1000L
;
public
static
final
long
MILLIS_PER_DAY
=
24
*
60
*
60
*
1000L
;
/**
/**
* The number of seconds per day.
* The number of seconds per day.
*/
*/
...
...
h2/src/test/org/h2/test/TestBase.java
浏览文件 @
2bc541a0
...
@@ -466,16 +466,16 @@ public abstract class TestBase {
...
@@ -466,16 +466,16 @@ public abstract class TestBase {
throw
new
AssertionError
(
string
);
throw
new
AssertionError
(
string
);
}
}
/**
/**
* Log an error message.
* Log an error message.
*
*
* @param s the message
* @param s the message
*/
*/
public
static
void
logErrorMessage
(
String
s
)
{
public
static
void
logErrorMessage
(
String
s
)
{
System
.
out
.
flush
();
System
.
out
.
flush
();
System
.
err
.
println
(
"ERROR: "
+
s
+
"------------------------------"
);
System
.
err
.
println
(
"ERROR: "
+
s
+
"------------------------------"
);
logThrowable
(
s
,
null
);
logThrowable
(
s
,
null
);
}
}
/**
/**
* Log an error message.
* Log an error message.
...
...
h2/src/test/org/h2/test/scripts/TestScript.java
浏览文件 @
2bc541a0
...
@@ -92,7 +92,7 @@ public class TestScript extends TestBase {
...
@@ -92,7 +92,7 @@ public class TestScript extends TestBase {
}
else
{
}
else
{
decimal2
=
"decimal_numeric"
;
decimal2
=
"decimal_numeric"
;
}
}
for
(
String
s
:
new
String
[]
{
"array"
,
"bigint"
,
"binary"
,
"blob"
,
for
(
String
s
:
new
String
[]
{
"array"
,
"bigint"
,
"binary"
,
"blob"
,
"boolean"
,
"char"
,
"clob"
,
"date"
,
"decimal"
,
decimal2
,
"double"
,
"enum"
,
"boolean"
,
"char"
,
"clob"
,
"date"
,
"decimal"
,
decimal2
,
"double"
,
"enum"
,
"geometry"
,
"identity"
,
"int"
,
"other"
,
"real"
,
"smallint"
,
"geometry"
,
"identity"
,
"int"
,
"other"
,
"real"
,
"smallint"
,
...
...
h2/src/test/org/h2/test/synth/TestFuzzOptimizations.java
浏览文件 @
2bc541a0
...
@@ -119,7 +119,7 @@ public class TestFuzzOptimizations extends TestBase {
...
@@ -119,7 +119,7 @@ public class TestFuzzOptimizations extends TestBase {
}
}
}
}
executeAndCompare
(
"a >=0 and b in(?, 2) and a in(1, ?, null)"
,
Arrays
.
asList
(
"10"
,
"2"
),
executeAndCompare
(
"a >=0 and b in(?, 2) and a in(1, ?, null)"
,
Arrays
.
asList
(
"10"
,
"2"
),
"seed=-6191135606105920350L"
);
"seed=-6191135606105920350L"
);
db
.
execute
(
"drop table test0, test1"
);
db
.
execute
(
"drop table test0, test1"
);
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论