Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
e60bb166
提交
e60bb166
authored
3月 14, 2018
作者:
Evgenij Ryazanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove support of TCP protocol versions 6 and 7
上级
22a82287
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
7 行增加
和
31 行删除
+7
-31
Constants.java
h2/src/main/org/h2/engine/Constants.java
+1
-13
Transfer.java
h2/src/main/org/h2/value/Transfer.java
+6
-18
没有找到文件。
h2/src/main/org/h2/engine/Constants.java
浏览文件 @
e60bb166
...
@@ -45,18 +45,6 @@ public class Constants {
...
@@ -45,18 +45,6 @@ public class Constants {
*/
*/
public
static
final
String
BUILD_VENDOR_AND_VERSION
=
null
;
public
static
final
String
BUILD_VENDOR_AND_VERSION
=
null
;
/**
* The TCP protocol version number 6.
* @since 1.0.72 (2008-05-10)
*/
public
static
final
int
TCP_PROTOCOL_VERSION_6
=
6
;
/**
* The TCP protocol version number 7.
* @since 1.2.141 (2010-08-22)
*/
public
static
final
int
TCP_PROTOCOL_VERSION_7
=
7
;
/**
/**
* The TCP protocol version number 8.
* The TCP protocol version number 8.
* @since 1.2.143 (2010-09-18)
* @since 1.2.143 (2010-09-18)
...
@@ -120,7 +108,7 @@ public class Constants {
...
@@ -120,7 +108,7 @@ public class Constants {
/**
/**
* Minimum supported version of TCP protocol.
* Minimum supported version of TCP protocol.
*/
*/
public
static
final
int
TCP_PROTOCOL_VERSION_MIN_SUPPORTED
=
TCP_PROTOCOL_VERSION_
6
;
public
static
final
int
TCP_PROTOCOL_VERSION_MIN_SUPPORTED
=
TCP_PROTOCOL_VERSION_
8
;
/**
/**
* Maximum supported version of TCP protocol.
* Maximum supported version of TCP protocol.
...
...
h2/src/main/org/h2/value/Transfer.java
浏览文件 @
e60bb166
...
@@ -349,19 +349,15 @@ public class Transfer {
...
@@ -349,19 +349,15 @@ public class Transfer {
case
Value
.
TIME
:
case
Value
.
TIME
:
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_9
)
{
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_9
)
{
writeLong
(((
ValueTime
)
v
).
getNanos
());
writeLong
(((
ValueTime
)
v
).
getNanos
());
}
else
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_7
)
{
writeLong
(
DateTimeUtils
.
getTimeLocalWithoutDst
(
v
.
getTime
()));
}
else
{
}
else
{
writeLong
(
v
.
getTime
().
getTime
(
));
writeLong
(
DateTimeUtils
.
getTimeLocalWithoutDst
(
v
.
getTime
()
));
}
}
break
;
break
;
case
Value
.
DATE
:
case
Value
.
DATE
:
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_9
)
{
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_9
)
{
writeLong
(((
ValueDate
)
v
).
getDateValue
());
writeLong
(((
ValueDate
)
v
).
getDateValue
());
}
else
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_7
)
{
writeLong
(
DateTimeUtils
.
getTimeLocalWithoutDst
(
v
.
getDate
()));
}
else
{
}
else
{
writeLong
(
v
.
getDate
().
getTime
(
));
writeLong
(
DateTimeUtils
.
getTimeLocalWithoutDst
(
v
.
getDate
()
));
}
}
break
;
break
;
case
Value
.
TIMESTAMP
:
{
case
Value
.
TIMESTAMP
:
{
...
@@ -369,13 +365,9 @@ public class Transfer {
...
@@ -369,13 +365,9 @@ public class Transfer {
ValueTimestamp
ts
=
(
ValueTimestamp
)
v
;
ValueTimestamp
ts
=
(
ValueTimestamp
)
v
;
writeLong
(
ts
.
getDateValue
());
writeLong
(
ts
.
getDateValue
());
writeLong
(
ts
.
getTimeNanos
());
writeLong
(
ts
.
getTimeNanos
());
}
else
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_7
)
{
Timestamp
ts
=
v
.
getTimestamp
();
writeLong
(
DateTimeUtils
.
getTimeLocalWithoutDst
(
ts
));
writeInt
(
ts
.
getNanos
()
%
1_000_000
);
}
else
{
}
else
{
Timestamp
ts
=
v
.
getTimestamp
();
Timestamp
ts
=
v
.
getTimestamp
();
writeLong
(
ts
.
getTime
(
));
writeLong
(
DateTimeUtils
.
getTimeLocalWithoutDst
(
ts
));
writeInt
(
ts
.
getNanos
()
%
1_000_000
);
writeInt
(
ts
.
getNanos
()
%
1_000_000
);
}
}
break
;
break
;
...
@@ -555,28 +547,24 @@ public class Transfer {
...
@@ -555,28 +547,24 @@ public class Transfer {
case
Value
.
DATE
:
case
Value
.
DATE
:
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
{
return
ValueDate
.
fromMillis
(
DateTimeUtils
.
getTimeUTCWithoutDst
(
readLong
()));
return
ValueDate
.
fromMillis
(
DateTimeUtils
.
getTimeUTCWithoutDst
(
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
{
return
ValueTime
.
fromMillis
(
DateTimeUtils
.
getTimeUTCWithoutDst
(
readLong
()));
return
ValueTime
.
fromMillis
(
DateTimeUtils
.
getTimeUTCWithoutDst
(
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
(
return
ValueTimestamp
.
fromDateValueAndNanos
(
readLong
(),
readLong
());
readLong
(),
readLong
());
}
else
if
(
version
>=
Constants
.
TCP_PROTOCOL_VERSION_7
)
{
}
else
{
return
ValueTimestamp
.
fromMillisNanos
(
return
ValueTimestamp
.
fromMillisNanos
(
DateTimeUtils
.
getTimeUTCWithoutDst
(
readLong
()),
DateTimeUtils
.
getTimeUTCWithoutDst
(
readLong
()),
readInt
()
%
1_000_000
);
readInt
()
%
1_000_000
);
}
}
return
ValueTimestamp
.
fromMillisNanos
(
readLong
(),
readInt
()
%
1_000_000
);
}
}
case
Value
.
TIMESTAMP_TZ
:
{
case
Value
.
TIMESTAMP_TZ
:
{
return
ValueTimestampTimeZone
.
fromDateValueAndNanos
(
readLong
(),
return
ValueTimestampTimeZone
.
fromDateValueAndNanos
(
readLong
(),
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论