Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
4546124a
Shardingsphere
项目概览
apache
/
Shardingsphere
通知
56
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Shardingsphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
4546124a
编写于
7月 24, 2018
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove BackendHandler.isHasMoreResultValueFlag()
上级
559c96b9
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
18 addition
and
17 deletion
+18
-17
sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/BackendHandler.java
...o/shardingsphere/proxy/backend/common/BackendHandler.java
+0
-3
sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/JDBCBackendHandler.java
...gsphere/proxy/backend/common/jdbc/JDBCBackendHandler.java
+2
-9
sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/mysql/MySQLFrontendHandler.java
...dingsphere/proxy/frontend/mysql/MySQLFrontendHandler.java
+5
-1
sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/common/packet/DatabasePacket.java
...gsphere/proxy/transport/common/packet/DatabasePacket.java
+6
-0
sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/statement/close/DummyPacket.java
...ort/mysql/packet/command/statement/close/DummyPacket.java
+5
-0
sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java
...sql/packet/command/text/fieldlist/ComFieldListPacket.java
+0
-4
未找到文件。
sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/BackendHandler.java
浏览文件 @
4546124a
...
...
@@ -50,7 +50,4 @@ public interface BackendHandler {
* @return database packet
*/
DatabasePacket
getResultValue
();
@Deprecated
boolean
isHasMoreResultValueFlag
();
}
sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/JDBCBackendHandler.java
浏览文件 @
4546124a
...
...
@@ -38,7 +38,6 @@ import io.shardingsphere.proxy.transport.common.packet.DatabasePacket;
import
io.shardingsphere.proxy.transport.mysql.constant.ServerErrorCode
;
import
io.shardingsphere.proxy.transport.mysql.packet.command.reponse.CommandResponsePackets
;
import
io.shardingsphere.proxy.transport.mysql.packet.command.reponse.QueryResponsePackets
;
import
io.shardingsphere.proxy.transport.mysql.packet.generic.EofPacket
;
import
io.shardingsphere.proxy.transport.mysql.packet.generic.ErrPacket
;
import
io.shardingsphere.proxy.transport.mysql.packet.generic.OKPacket
;
import
io.shardingsphere.transaction.xa.AtomikosUserTransaction
;
...
...
@@ -147,21 +146,15 @@ public final class JDBCBackendHandler implements BackendHandler {
@Override
public
boolean
hasMoreResultValue
()
throws
SQLException
{
if
(
null
==
mergedResult
||
!
hasMoreResultValueFlag
)
{
if
(
null
==
mergedResult
||
!
mergedResult
.
next
()
)
{
backendConnection
.
close
();
return
false
;
}
if
(!
mergedResult
.
next
())
{
hasMoreResultValueFlag
=
false
;
}
return
true
;
}
@Override
public
DatabasePacket
getResultValue
()
{
if
(!
hasMoreResultValueFlag
)
{
return
new
EofPacket
(++
currentSequenceId
);
}
QueryResponsePackets
queryResponsePackets
=
((
ExecuteQueryResponse
)
executeResponse
).
getQueryResponsePackets
();
try
{
List
<
Object
>
data
=
new
ArrayList
<>(
queryResponsePackets
.
getColumnCount
());
...
...
@@ -171,7 +164,7 @@ public final class JDBCBackendHandler implements BackendHandler {
return
executeEngine
.
getJdbcExecutorWrapper
().
createResultSetPacket
(
++
currentSequenceId
,
data
,
queryResponsePackets
.
getColumnCount
(),
queryResponsePackets
.
getColumnTypes
(),
DatabaseType
.
MySQL
);
}
catch
(
final
SQLException
ex
)
{
return
new
ErrPacket
(
1
,
ex
);
return
new
ErrPacket
(
++
currentSequenceId
,
ex
);
}
}
}
sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/mysql/MySQLFrontendHandler.java
浏览文件 @
4546124a
...
...
@@ -26,6 +26,7 @@ import io.shardingsphere.proxy.transport.mysql.constant.ServerErrorCode;
import
io.shardingsphere.proxy.transport.mysql.packet.MySQLPacketPayload
;
import
io.shardingsphere.proxy.transport.mysql.packet.command.CommandPacket
;
import
io.shardingsphere.proxy.transport.mysql.packet.command.CommandPacketFactory
;
import
io.shardingsphere.proxy.transport.mysql.packet.generic.EofPacket
;
import
io.shardingsphere.proxy.transport.mysql.packet.generic.ErrPacket
;
import
io.shardingsphere.proxy.transport.mysql.packet.generic.OKPacket
;
import
io.shardingsphere.proxy.transport.mysql.packet.handshake.AuthorityHandler
;
...
...
@@ -86,8 +87,11 @@ public final class MySQLFrontendHandler extends FrontendHandler {
while
(!
context
.
channel
().
isWritable
())
{
continue
;
}
context
.
writeAndFlush
(
commandPacket
.
getResultValue
());
DatabasePacket
resultValue
=
commandPacket
.
getResultValue
();
sequenceId
=
resultValue
.
getSequenceId
();
context
.
writeAndFlush
(
resultValue
);
}
context
.
writeAndFlush
(
new
EofPacket
(++
sequenceId
));
}
}
});
...
...
sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/common/packet/DatabasePacket.java
浏览文件 @
4546124a
...
...
@@ -23,4 +23,10 @@ package io.shardingsphere.proxy.transport.common.packet;
* @author zhangliang
*/
public
interface
DatabasePacket
{
/**
* Get sequence ID.
* @return sequence ID
*/
int
getSequenceId
();
}
sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/statement/close/DummyPacket.java
浏览文件 @
4546124a
...
...
@@ -25,4 +25,9 @@ import io.shardingsphere.proxy.transport.common.packet.DatabasePacket;
* @author zhangyonglun
*/
public
final
class
DummyPacket
implements
DatabasePacket
{
@Override
public
int
getSequenceId
()
{
return
1
;
}
}
sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java
浏览文件 @
4546124a
...
...
@@ -36,7 +36,6 @@ import io.shardingsphere.proxy.transport.mysql.packet.command.statement.close.Du
import
io.shardingsphere.proxy.transport.mysql.packet.command.text.query.ColumnDefinition41Packet
;
import
io.shardingsphere.proxy.transport.mysql.packet.command.text.query.ComQueryPacket
;
import
io.shardingsphere.proxy.transport.mysql.packet.command.text.query.TextResultSetRowPacket
;
import
io.shardingsphere.proxy.transport.mysql.packet.generic.EofPacket
;
import
io.shardingsphere.proxy.transport.mysql.packet.generic.ErrPacket
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -112,9 +111,6 @@ public final class ComFieldListPacket extends CommandPacket implements CommandPa
@Override
public
DatabasePacket
getResultValue
()
{
DatabasePacket
resultValue
=
backendHandler
.
getResultValue
();
if
(!
backendHandler
.
isHasMoreResultValueFlag
())
{
return
new
EofPacket
(++
currentSequenceId
);
}
if
(
resultValue
instanceof
TextResultSetRowPacket
)
{
TextResultSetRowPacket
fieldListResponse
=
(
TextResultSetRowPacket
)
resultValue
;
String
columnName
=
(
String
)
fieldListResponse
.
getData
().
get
(
0
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录