thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-28 20:50:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup clang tidy errors

Browse Source
This commit is contained in:
BohuTANG 2020-04-25 12:56:47 +08:00 committed by zhang2014
parent ef4126d533
commit 99402fac85
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/Core/MySQLClient.cpp
View File

@ -73,46 +73,6 @@ bool MySQLClient::handshake()
return (packet_response.getType() != PACKET_ERR);
}
bool MySQLClient::ping()
{
return writeCommand(Command::COM_PING, "");
}
bool MySQLClient::register_slave(UInt32 slave_id)
{
RegisterSlave register_slave(slave_id);
packet_sender->sendPacket<RegisterSlave>(register_slave, true);
PacketResponse packet_response(client_capability_flags);
packet_sender->receivePacket(packet_response);
packet_sender->resetSequenceId();
if (packet_response.getType() == PACKET_ERR)
{
last_error = packet_response.err.error_message;
}
return (packet_response.getType() != PACKET_ERR);
}
bool MySQLClient::binlog_dump(UInt32 slave_id, String binlog_file_name, UInt64 binlog_pos)
{
BinlogDump binlog_dump(binlog_pos, binlog_file_name, slave_id);
packet_sender->sendPacket<BinlogDump>(binlog_dump, true);
PacketResponse packet_response(client_capability_flags);
packet_sender->receivePacket(packet_response);
packet_sender->resetSequenceId();
if (packet_response.getType() == PACKET_ERR)
{
last_error = packet_response.err.error_message;
}
return (packet_response.getType() != PACKET_ERR);
}
String MySQLClient::error()
{
return last_error;
}
bool MySQLClient::writeCommand(char command, String query)
{
bool ret = false;
@ -136,4 +96,44 @@ bool MySQLClient::writeCommand(char command, String query)
packet_sender->resetSequenceId();
return ret;
}
bool MySQLClient::ping()
{
return writeCommand(Command::COM_PING, "");
}
bool MySQLClient::registerSlave(UInt32 slave_id)
{
RegisterSlave register_slave(slave_id);
packet_sender->sendPacket<RegisterSlave>(register_slave, true);
PacketResponse packet_response(client_capability_flags);
packet_sender->receivePacket(packet_response);
packet_sender->resetSequenceId();
if (packet_response.getType() == PACKET_ERR)
{
last_error = packet_response.err.error_message;
}
return (packet_response.getType() != PACKET_ERR);
}
bool MySQLClient::binlogDump(UInt32 slave_id, String binlog_file_name, UInt64 binlog_pos)
{
BinlogDump binlog_dump(binlog_pos, binlog_file_name, slave_id);
packet_sender->sendPacket<BinlogDump>(binlog_dump, true);
PacketResponse packet_response(client_capability_flags);
packet_sender->receivePacket(packet_response);
packet_sender->resetSequenceId();
if (packet_response.getType() == PACKET_ERR)
{
last_error = packet_response.err.error_message;
}
return (packet_response.getType() != PACKET_ERR);
}
String MySQLClient::error()
{
return last_error;
}
}

4
src/Core/MySQLClient.h
View File

@ -23,8 +23,8 @@ public:
bool connect();
void disconnect();
bool ping();
bool register_slave(UInt32 slave_id);
bool binlog_dump(UInt32 slave_id, String binlog_file_name, UInt64 binlog_pos);
bool registerSlave(UInt32 slave_id);
bool binlogDump(UInt32 slave_id, String binlog_file_name, UInt64 binlog_pos);
String error();
private:

2
src/Core/tests/mysql_protocol.cpp
View File

@ -176,7 +176,7 @@ int main(int, char **)
return 1;
}
if (!client1.binlog_dump(slave_id, "", 0))
if (!client1.binlogDump(slave_id, "", 0))
{
std::cerr << "Connect Error: " << client1.error() << std::endl;
assert(0);