Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
05737678
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
05737678
编写于
5月 30, 2019
作者:
A
Alexey Milovidov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove debug logging from MySQL protocol
上级
c269dd2c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
22 deletion
+5
-22
dbms/programs/server/MySQLHandler.cpp
dbms/programs/server/MySQLHandler.cpp
+2
-2
dbms/src/Core/MySQLProtocol.h
dbms/src/Core/MySQLProtocol.h
+2
-19
dbms/src/Formats/MySQLWireBlockOutputStream.cpp
dbms/src/Formats/MySQLWireBlockOutputStream.cpp
+1
-1
未找到文件。
dbms/programs/server/MySQLHandler.cpp
浏览文件 @
05737678
...
...
@@ -52,7 +52,7 @@ void MySQLHandler::run()
in
=
std
::
make_shared
<
ReadBufferFromPocoSocket
>
(
socket
());
out
=
std
::
make_shared
<
WriteBufferFromPocoSocket
>
(
socket
());
packet_sender
=
std
::
make_shared
<
PacketSender
>
(
*
in
,
*
out
,
connection_context
.
sequence_id
,
"MySQLHandler"
);
packet_sender
=
std
::
make_shared
<
PacketSender
>
(
*
in
,
*
out
,
connection_context
.
sequence_id
);
try
{
...
...
@@ -188,7 +188,7 @@ MySQLProtocol::HandshakeResponse MySQLHandler::finishHandshake()
in
=
std
::
make_shared
<
ReadBufferFromPocoSocket
>
(
*
ss
);
out
=
std
::
make_shared
<
WriteBufferFromPocoSocket
>
(
*
ss
);
connection_context
.
sequence_id
=
2
;
packet_sender
=
std
::
make_shared
<
PacketSender
>
(
*
in
,
*
out
,
connection_context
.
sequence_id
,
"MySQLHandler"
);
packet_sender
=
std
::
make_shared
<
PacketSender
>
(
*
in
,
*
out
,
connection_context
.
sequence_id
);
packet_sender
->
max_packet_size
=
connection_context
.
max_packet_size
;
packet_sender
->
receivePacket
(
packet
);
/// Reading HandshakeResponse from secure socket.
}
...
...
dbms/src/Core/MySQLProtocol.h
浏览文件 @
05737678
...
...
@@ -7,10 +7,8 @@
#include <IO/WriteBuffer.h>
#include <IO/WriteBufferFromPocoSocket.h>
#include <IO/WriteBufferFromString.h>
#include <Poco/Logger.h>
#include <Poco/Net/StreamSocket.h>
#include <Poco/RandomStream.h>
#include <common/logger_useful.h>
#include <random>
#include <sstream>
...
...
@@ -157,20 +155,18 @@ public:
size_t
max_packet_size
=
MAX_PACKET_LENGTH
;
/// For reading and writing.
PacketSender
(
ReadBuffer
&
in
,
WriteBuffer
&
out
,
size_t
&
sequence_id
,
const
String
logger_name
)
PacketSender
(
ReadBuffer
&
in
,
WriteBuffer
&
out
,
size_t
&
sequence_id
)
:
sequence_id
(
sequence_id
)
,
in
(
&
in
)
,
out
(
&
out
)
,
log
(
&
Poco
::
Logger
::
get
(
logger_name
))
{
}
/// For writing.
PacketSender
(
WriteBuffer
&
out
,
size_t
&
sequence_id
,
const
String
logger_name
)
PacketSender
(
WriteBuffer
&
out
,
size_t
&
sequence_id
)
:
sequence_id
(
sequence_id
)
,
in
(
nullptr
)
,
out
(
&
out
)
,
log
(
&
Poco
::
Logger
::
get
(
logger_name
))
{
}
...
...
@@ -184,8 +180,6 @@ public:
// packets which are larger than or equal to 16MB are splitted
do
{
LOG_TRACE
(
log
,
"Reading from buffer"
);
in
->
readStrict
(
reinterpret_cast
<
char
*>
(
&
payload_length
),
3
);
if
(
payload_length
>
max_packet_size
)
...
...
@@ -205,8 +199,6 @@ public:
}
sequence_id
++
;
LOG_TRACE
(
log
,
"Received packet. Sequence-id: "
<<
packet_sequence_id
<<
", payload length: "
<<
payload_length
);
copyData
(
*
in
,
static_cast
<
WriteBuffer
&>
(
buf
),
payload_length
);
}
while
(
payload_length
==
max_packet_size
);
...
...
@@ -228,9 +220,6 @@ public:
{
size_t
payload_length
=
std
::
min
(
payload
.
length
()
-
pos
,
max_packet_size
);
LOG_TRACE
(
log
,
"Writing packet of size "
<<
payload_length
<<
" with sequence-id "
<<
static_cast
<
int
>
(
sequence_id
));
LOG_TRACE
(
log
,
packetToText
(
payload
));
out
->
write
(
reinterpret_cast
<
const
char
*>
(
&
payload_length
),
3
);
out
->
write
(
reinterpret_cast
<
const
char
*>
(
&
sequence_id
),
1
);
out
->
write
(
payload
.
data
()
+
pos
,
payload_length
);
...
...
@@ -239,12 +228,8 @@ public:
sequence_id
++
;
}
while
(
pos
<
payload
.
length
());
LOG_TRACE
(
log
,
"Packet was sent."
);
if
(
flush
)
{
out
->
next
();
}
}
/// Sets sequence-id to 0. Must be called before each command phase.
...
...
@@ -253,8 +238,6 @@ public:
private:
/// Converts packet to text. Is used for debug output.
static
String
packetToText
(
String
payload
);
Poco
::
Logger
*
log
;
};
...
...
dbms/src/Formats/MySQLWireBlockOutputStream.cpp
浏览文件 @
05737678
...
...
@@ -12,7 +12,7 @@ using namespace MySQLProtocol;
MySQLWireBlockOutputStream
::
MySQLWireBlockOutputStream
(
WriteBuffer
&
buf
,
const
Block
&
header
,
Context
&
context
)
:
header
(
header
)
,
context
(
context
)
,
packet_sender
(
new
PacketSender
(
buf
,
context
.
sequence_id
,
"MySQLWireBlockOutputStream"
))
,
packet_sender
(
std
::
make_shared
<
PacketSender
>
(
buf
,
context
.
sequence_id
))
{
packet_sender
->
max_packet_size
=
context
.
max_packet_size
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录