Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
7617a13d
提交
7617a13d
authored
5月 16, 2014
作者:
noelgrandin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
reduce unnecessary object allocation of date/time types
上级
d2117a53
显示空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
36 行增加
和
16 行删除
+36
-16
Function.java
h2/src/main/org/h2/expression/Function.java
+4
-4
TraceSystem.java
h2/src/main/org/h2/message/TraceSystem.java
+1
-1
WebServer.java
h2/src/main/org/h2/server/web/WebServer.java
+1
-1
Data.java
h2/src/main/org/h2/store/Data.java
+3
-4
Column.java
h2/src/main/org/h2/table/Column.java
+1
-2
Transfer.java
h2/src/main/org/h2/value/Transfer.java
+4
-4
ValueDate.java
h2/src/main/org/h2/value/ValueDate.java
+11
-0
ValueTime.java
h2/src/main/org/h2/value/ValueTime.java
+11
-0
没有找到文件。
h2/src/main/org/h2/expression/Function.java
浏览文件 @
7617a13d
...
@@ -872,14 +872,14 @@ public class Function extends Expression implements FunctionCall {
...
@@ -872,14 +872,14 @@ public class Function extends Expression implements FunctionCall {
case
CURRENT_DATE:
{
case
CURRENT_DATE:
{
long
now
=
session
.
getTransactionStart
();
long
now
=
session
.
getTransactionStart
();
// need to normalize
// need to normalize
result
=
ValueDate
.
get
(
new
Date
(
now
)
);
result
=
ValueDate
.
fromMillis
(
now
);
break
;
break
;
}
}
case
CURTIME:
case
CURTIME:
case
CURRENT_TIME:
{
case
CURRENT_TIME:
{
long
now
=
session
.
getTransactionStart
();
long
now
=
session
.
getTransactionStart
();
// need to normalize
// need to normalize
result
=
ValueTime
.
get
(
new
Time
(
now
)
);
result
=
ValueTime
.
fromMillis
(
now
);
break
;
break
;
}
}
case
NOW:
case
NOW:
...
@@ -1769,10 +1769,10 @@ public class Function extends Expression implements FunctionCall {
...
@@ -1769,10 +1769,10 @@ public class Function extends Expression implements FunctionCall {
default
:
default
:
break
;
break
;
}
}
calendar
.
setTime
(
new
Timestamp
(
t1
)
);
calendar
.
setTime
InMillis
(
t1
);
int
year1
=
calendar
.
get
(
Calendar
.
YEAR
);
int
year1
=
calendar
.
get
(
Calendar
.
YEAR
);
int
month1
=
calendar
.
get
(
Calendar
.
MONTH
);
int
month1
=
calendar
.
get
(
Calendar
.
MONTH
);
calendar
.
setTime
(
new
Timestamp
(
t2
)
);
calendar
.
setTime
InMillis
(
t2
);
int
year2
=
calendar
.
get
(
Calendar
.
YEAR
);
int
year2
=
calendar
.
get
(
Calendar
.
YEAR
);
int
month2
=
calendar
.
get
(
Calendar
.
MONTH
);
int
month2
=
calendar
.
get
(
Calendar
.
MONTH
);
int
result
=
year2
-
year1
;
int
result
=
year2
-
year1
;
...
...
h2/src/main/org/h2/message/TraceSystem.java
浏览文件 @
7617a13d
...
@@ -226,7 +226,7 @@ public class TraceSystem implements TraceWriter {
...
@@ -226,7 +226,7 @@ public class TraceSystem implements TraceWriter {
if
(
dateFormat
==
null
)
{
if
(
dateFormat
==
null
)
{
dateFormat
=
new
SimpleDateFormat
(
"MM-dd HH:mm:ss "
);
dateFormat
=
new
SimpleDateFormat
(
"MM-dd HH:mm:ss "
);
}
}
return
dateFormat
.
format
(
new
Date
())
+
module
+
": "
+
s
;
return
dateFormat
.
format
(
System
.
currentTimeMillis
())
+
module
+
": "
+
s
;
}
}
@Override
@Override
...
...
h2/src/main/org/h2/server/web/WebServer.java
浏览文件 @
7617a13d
...
@@ -273,7 +273,7 @@ public class WebServer implements Service {
...
@@ -273,7 +273,7 @@ public class WebServer implements Service {
SimpleDateFormat
format
=
new
SimpleDateFormat
(
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"EEE, d MMM yyyy HH:mm:ss z"
,
new
Locale
(
"en"
,
""
));
"EEE, d MMM yyyy HH:mm:ss z"
,
new
Locale
(
"en"
,
""
));
format
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"GMT"
));
format
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"GMT"
));
startDateTime
=
format
.
format
(
new
Date
());
startDateTime
=
format
.
format
(
System
.
currentTimeMillis
());
}
}
return
startDateTime
;
return
startDateTime
;
}
}
...
...
h2/src/main/org/h2/store/Data.java
浏览文件 @
7617a13d
...
@@ -746,8 +746,7 @@ public class Data {
...
@@ -746,8 +746,7 @@ public class Data {
}
}
case
Value
.
DATE
:
{
case
Value
.
DATE
:
{
long
x
=
readVarLong
()
*
MILLIS_PER_MINUTE
;
long
x
=
readVarLong
()
*
MILLIS_PER_MINUTE
;
return
ValueDate
.
get
(
new
Date
(
return
ValueDate
.
fromMillis
(
DateTimeUtils
.
getTimeUTCWithoutDst
(
x
));
DateTimeUtils
.
getTimeUTCWithoutDst
(
x
)));
}
}
case
LOCAL_TIME:
{
case
LOCAL_TIME:
{
long
nanos
=
readVarLong
()
*
1000000
+
readVarLong
();
long
nanos
=
readVarLong
()
*
1000000
+
readVarLong
();
...
@@ -755,8 +754,8 @@ public class Data {
...
@@ -755,8 +754,8 @@ public class Data {
}
}
case
Value
.
TIME
:
case
Value
.
TIME
:
// need to normalize the year, month and day
// need to normalize the year, month and day
return
ValueTime
.
get
(
new
Time
(
return
ValueTime
.
fromMillis
(
DateTimeUtils
.
getTimeUTCWithoutDst
(
readVarLong
()))
)
;
DateTimeUtils
.
getTimeUTCWithoutDst
(
readVarLong
()));
case
LOCAL_TIMESTAMP:
{
case
LOCAL_TIMESTAMP:
{
long
dateValue
=
readVarLong
();
long
dateValue
=
readVarLong
();
long
nanos
=
readVarLong
()
*
1000000
+
readVarLong
();
long
nanos
=
readVarLong
()
*
1000000
+
readVarLong
();
...
...
h2/src/main/org/h2/table/Column.java
浏览文件 @
7617a13d
...
@@ -298,8 +298,7 @@ public class Column {
...
@@ -298,8 +298,7 @@ public class Column {
}
else
if
(
dt
.
type
==
Value
.
TIME
)
{
}
else
if
(
dt
.
type
==
Value
.
TIME
)
{
value
=
ValueTime
.
fromNanos
(
0
);
value
=
ValueTime
.
fromNanos
(
0
);
}
else
if
(
dt
.
type
==
Value
.
DATE
)
{
}
else
if
(
dt
.
type
==
Value
.
DATE
)
{
value
=
ValueDate
.
get
(
new
Date
(
value
=
ValueDate
.
fromMillis
(
session
.
getTransactionStart
());
session
.
getTransactionStart
()));
}
else
{
}
else
{
value
=
ValueString
.
get
(
""
).
convertTo
(
type
);
value
=
ValueString
.
get
(
""
).
convertTo
(
type
);
}
}
...
...
h2/src/main/org/h2/value/Transfer.java
浏览文件 @
7617a13d
...
@@ -551,16 +551,16 @@ public class Transfer {
...
@@ -551,16 +551,16 @@ public class Transfer {
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_9
)
{
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_9
)
{
return
ValueDate
.
fromDateValue
(
readLong
());
return
ValueDate
.
fromDateValue
(
readLong
());
}
else
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_7
)
{
}
else
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_7
)
{
return
ValueDate
.
get
(
new
Date
(
DateTimeUtils
.
getTimeUTCWithoutDst
(
readLong
()
)));
return
ValueDate
.
fromMillis
(
DateTimeUtils
.
getTimeUTCWithoutDst
(
readLong
(
)));
}
}
return
ValueDate
.
get
(
new
Date
(
readLong
()
));
return
ValueDate
.
fromMillis
(
readLong
(
));
case
Value
.
TIME
:
case
Value
.
TIME
:
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_9
)
{
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_9
)
{
return
ValueTime
.
fromNanos
(
readLong
());
return
ValueTime
.
fromNanos
(
readLong
());
}
else
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_7
)
{
}
else
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_7
)
{
return
ValueTime
.
get
(
new
Time
(
DateTimeUtils
.
getTimeUTCWithoutDst
(
readLong
()
)));
return
ValueTime
.
fromMillis
(
DateTimeUtils
.
getTimeUTCWithoutDst
(
readLong
(
)));
}
}
return
ValueTime
.
get
(
new
Time
(
readLong
()
));
return
ValueTime
.
fromMillis
(
readLong
(
));
case
Value
.
TIMESTAMP
:
{
case
Value
.
TIMESTAMP
:
{
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_9
)
{
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_9
)
{
return
ValueTimestamp
.
fromDateValueAndNanos
(
readLong
(),
readLong
());
return
ValueTimestamp
.
fromDateValueAndNanos
(
readLong
(),
readLong
());
...
...
h2/src/main/org/h2/value/ValueDate.java
浏览文件 @
7617a13d
...
@@ -58,6 +58,17 @@ public class ValueDate extends Value {
...
@@ -58,6 +58,17 @@ public class ValueDate extends Value {
return
fromDateValue
(
DateTimeUtils
.
dateValueFromDate
(
date
.
getTime
()));
return
fromDateValue
(
DateTimeUtils
.
dateValueFromDate
(
date
.
getTime
()));
}
}
/**
* Calculate the date value (in the default timezone) from a given time in
* milliseconds in UTC.
*
* @param ms the milliseconds
* @return the value
*/
public
static
ValueDate
fromMillis
(
long
ms
)
{
return
fromDateValue
(
DateTimeUtils
.
dateValueFromDate
(
ms
));
}
/**
/**
* Parse a string to a ValueDate.
* Parse a string to a ValueDate.
*
*
...
...
h2/src/main/org/h2/value/ValueTime.java
浏览文件 @
7617a13d
...
@@ -58,6 +58,17 @@ public class ValueTime extends Value {
...
@@ -58,6 +58,17 @@ public class ValueTime extends Value {
return
fromNanos
(
DateTimeUtils
.
nanosFromDate
(
time
.
getTime
()));
return
fromNanos
(
DateTimeUtils
.
nanosFromDate
(
time
.
getTime
()));
}
}
/**
* Calculate the time value from a given time in
* milliseconds in UTC.
*
* @param ms the milliseconds
* @return the value
*/
public
static
ValueTime
fromMillis
(
long
ms
)
{
return
fromNanos
(
DateTimeUtils
.
nanosFromDate
(
ms
));
}
/**
/**
* Parse a string to a ValueTime.
* Parse a string to a ValueTime.
*
*
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论