Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
18769b71
提交
18769b71
authored
3月 14, 2018
作者:
Evgenij Ryazanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add and use incrementDateValue() and decrementDateValue()
上级
850bee14
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
73 行增加
和
15 行删除
+73
-15
DateTimeUtils.java
h2/src/main/org/h2/util/DateTimeUtils.java
+59
-4
ValueTimestamp.java
h2/src/main/org/h2/value/ValueTimestamp.java
+2
-2
ValueTimestampTimeZone.java
h2/src/main/org/h2/value/ValueTimestampTimeZone.java
+9
-9
TestDate.java
h2/src/test/org/h2/test/unit/TestDate.java
+3
-0
没有找到文件。
h2/src/main/org/h2/util/DateTimeUtils.java
浏览文件 @
18769b71
...
...
@@ -1221,12 +1221,10 @@ public class DateTimeUtils {
timeNanos
-=
correction
;
if
(
timeNanos
<
0
)
{
timeNanos
+=
NANOS_PER_DAY
;
dateValue
=
DateTimeUtils
.
dateValueFromAbsoluteDay
(
absoluteDayFromDateValue
(
dateValue
)
-
1
);
dateValue
=
decrementDateValue
(
dateValue
);
}
else
if
(
timeNanos
>=
NANOS_PER_DAY
)
{
timeNanos
-=
NANOS_PER_DAY
;
dateValue
=
DateTimeUtils
.
dateValueFromAbsoluteDay
(
absoluteDayFromDateValue
(
dateValue
)
+
1
);
dateValue
=
incrementDateValue
(
dateValue
);
}
}
return
ValueTimestampTimeZone
.
fromDateValueAndNanos
(
dateValue
,
timeNanos
,
(
short
)
offsetMins
);
...
...
@@ -1320,6 +1318,63 @@ public class DateTimeUtils {
return
dateValue
(
y
,
m
+
3
,
(
int
)
d
);
}
/**
* Return the next date value.
*
* @param dateValue
* the date value
* @return the next date value
*/
public
static
long
incrementDateValue
(
long
dateValue
)
{
int
year
=
yearFromDateValue
(
dateValue
);
if
(
year
==
1582
)
{
// Use slow way instead of rarely needed large custom code.
return
dateValueFromAbsoluteDay
(
absoluteDayFromDateValue
(
dateValue
)
+
1
);
}
int
day
=
dayFromDateValue
(
dateValue
);
if
(
day
<
28
)
{
return
dateValue
+
1
;
}
int
month
=
monthFromDateValue
(
dateValue
);
if
(
day
<
getDaysInMonth
(
year
,
month
))
{
return
dateValue
+
1
;
}
day
=
1
;
if
(
month
<
12
)
{
month
++;
}
else
{
month
=
1
;
year
++;
}
return
dateValue
(
year
,
month
,
day
);
}
/**
* Return the previous date value.
*
* @param dateValue
* the date value
* @return the previous date value
*/
public
static
long
decrementDateValue
(
long
dateValue
)
{
int
year
=
yearFromDateValue
(
dateValue
);
if
(
year
==
1582
)
{
// Use slow way instead of rarely needed large custom code.
return
dateValueFromAbsoluteDay
(
absoluteDayFromDateValue
(
dateValue
)
-
1
);
}
if
(
dayFromDateValue
(
dateValue
)
>
1
)
{
return
dateValue
-
1
;
}
int
month
=
monthFromDateValue
(
dateValue
);
if
(
month
>
1
)
{
month
--;
}
else
{
month
=
12
;
year
--;
}
return
dateValue
(
year
,
month
,
getDaysInMonth
(
year
,
month
));
}
/**
* Append a date to the string builder.
*
...
...
h2/src/main/org/h2/value/ValueTimestamp.java
浏览文件 @
18769b71
...
...
@@ -62,7 +62,7 @@ public class ValueTimestamp extends Value {
private
ValueTimestamp
(
long
dateValue
,
long
timeNanos
)
{
this
.
dateValue
=
dateValue
;
if
(
timeNanos
<
0
||
timeNanos
>=
24L
*
60
*
60
*
1000
*
1000
*
1000
)
{
if
(
timeNanos
<
0
||
timeNanos
>=
DateTimeUtils
.
NANOS_PER_DAY
)
{
throw
new
IllegalArgumentException
(
"timeNanos out of range "
+
timeNanos
);
}
this
.
timeNanos
=
timeNanos
;
...
...
@@ -229,7 +229,7 @@ public class ValueTimestamp extends Value {
long
dv
=
dateValue
;
if
(
n2
>=
DateTimeUtils
.
NANOS_PER_DAY
)
{
n2
-=
DateTimeUtils
.
NANOS_PER_DAY
;
dv
=
DateTimeUtils
.
dateValueFromAbsoluteDay
(
DateTimeUtils
.
absoluteDayFromDateValue
(
dateValue
)
+
1
);
dv
=
DateTimeUtils
.
incrementDateValue
(
dv
);
}
return
fromDateValueAndNanos
(
dv
,
n2
);
}
...
...
h2/src/main/org/h2/value/ValueTimestampTimeZone.java
浏览文件 @
18769b71
...
...
@@ -70,7 +70,7 @@ public class ValueTimestampTimeZone extends Value {
private
ValueTimestampTimeZone
(
long
dateValue
,
long
timeNanos
,
short
timeZoneOffsetMins
)
{
if
(
timeNanos
<
0
||
timeNanos
>=
24L
*
60
*
60
*
1000
*
1000
*
1000
)
{
if
(
timeNanos
<
0
||
timeNanos
>=
DateTimeUtils
.
NANOS_PER_DAY
)
{
throw
new
IllegalArgumentException
(
"timeNanos out of range "
+
timeNanos
);
}
...
...
@@ -218,7 +218,7 @@ public class ValueTimestampTimeZone extends Value {
long
dv
=
dateValue
;
if
(
n2
>=
DateTimeUtils
.
NANOS_PER_DAY
)
{
n2
-=
DateTimeUtils
.
NANOS_PER_DAY
;
dv
=
DateTimeUtils
.
dateValueFromAbsoluteDay
(
DateTimeUtils
.
absoluteDayFromDateValue
(
dateValue
)
+
1
);
dv
=
DateTimeUtils
.
incrementDateValue
(
dv
);
}
return
fromDateValueAndNanos
(
dv
,
n2
,
timeZoneOffsetMins
);
}
...
...
@@ -228,25 +228,25 @@ public class ValueTimestampTimeZone extends Value {
ValueTimestampTimeZone
t
=
(
ValueTimestampTimeZone
)
o
;
// Maximum time zone offset is +/-18 hours so difference in days between local
// and UTC cannot be more than one day
long
da
ysA
=
DateTimeUtils
.
absoluteDayFromDateValue
(
dateValue
)
;
long
da
teValueA
=
dateValue
;
long
timeA
=
timeNanos
-
timeZoneOffsetMins
*
60_000_000_000L
;
if
(
timeA
<
0
)
{
timeA
+=
DateTimeUtils
.
NANOS_PER_DAY
;
da
ysA
--
;
da
teValueA
=
DateTimeUtils
.
decrementDateValue
(
dateValueA
)
;
}
else
if
(
timeA
>=
DateTimeUtils
.
NANOS_PER_DAY
)
{
timeA
-=
DateTimeUtils
.
NANOS_PER_DAY
;
da
ysA
++
;
da
teValueA
=
DateTimeUtils
.
incrementDateValue
(
dateValueA
)
;
}
long
da
ysB
=
DateTimeUtils
.
absoluteDayFromDateValue
(
t
.
dateValue
)
;
long
da
teValueB
=
t
.
dateValue
;
long
timeB
=
t
.
timeNanos
-
t
.
timeZoneOffsetMins
*
60_000_000_000L
;
if
(
timeB
<
0
)
{
timeB
+=
DateTimeUtils
.
NANOS_PER_DAY
;
da
ysB
--
;
da
teValueB
=
DateTimeUtils
.
decrementDateValue
(
dateValueB
)
;
}
else
if
(
timeB
>=
DateTimeUtils
.
NANOS_PER_DAY
)
{
timeB
-=
DateTimeUtils
.
NANOS_PER_DAY
;
da
ysB
++
;
da
teValueB
=
DateTimeUtils
.
incrementDateValue
(
dateValueB
)
;
}
int
cmp
=
Long
.
compare
(
da
ysA
,
days
B
);
int
cmp
=
Long
.
compare
(
da
teValueA
,
dateValue
B
);
if
(
cmp
!=
0
)
{
return
cmp
;
}
...
...
h2/src/test/org/h2/test/unit/TestDate.java
浏览文件 @
18769b71
...
...
@@ -377,6 +377,9 @@ public class TestDate extends TestBase {
assertEquals
(
y
,
DateTimeUtils
.
yearFromDateValue
(
date
));
assertEquals
(
m
,
DateTimeUtils
.
monthFromDateValue
(
date
));
assertEquals
(
d
,
DateTimeUtils
.
dayFromDateValue
(
date
));
long
nextDateValue
=
DateTimeUtils
.
dateValueFromAbsoluteDay
(
next
);
assertEquals
(
nextDateValue
,
DateTimeUtils
.
incrementDateValue
(
date
));
assertEquals
(
date
,
DateTimeUtils
.
decrementDateValue
(
nextDateValue
));
}
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论