From 644667adff10bbf7e3eb51d76b303928c843a8c9 Mon Sep 17 00:00:00 2001 From: BohuTANG Date: Tue, 12 May 2020 22:12:43 +0800 Subject: [PATCH] Change the method print() to dump() --- src/Core/MySQLReplication.cpp | 38 +++++++++++++++---------------- src/Core/MySQLReplication.h | 18 +++++++-------- src/Core/tests/mysql_protocol.cpp | 8 +++---- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/Core/MySQLReplication.cpp b/src/Core/MySQLReplication.cpp index 642bc037081..db749fec170 100644 --- a/src/Core/MySQLReplication.cpp +++ b/src/Core/MySQLReplication.cpp @@ -26,7 +26,7 @@ namespace MySQLReplication payload.readStrict(reinterpret_cast(&flags), 2); } - void EventHeader::print() const + void EventHeader::dump() const { std::cerr << "\n=== " << to_string(this->type) << " ===" << std::endl; std::cerr << "Timestamp: " << this->timestamp << std::endl; @@ -52,9 +52,9 @@ namespace MySQLReplication payload.readStrict(reinterpret_cast(event_type_header_length.data()), len); } - void FormatDescriptionEvent::print() const + void FormatDescriptionEvent::dump() const { - header.print(); + header.dump(); std::cerr << "Binlog Version: " << this->binlog_version << std::endl; std::cerr << "Server Version: " << this->server_version << std::endl; std::cerr << "Create Timestamp: " << this->create_timestamp << std::endl; @@ -70,9 +70,9 @@ namespace MySQLReplication payload.readStrict(reinterpret_cast(next_binlog.data()), len); } - void RotateEvent::print() const + void RotateEvent::dump() const { - header.print(); + header.dump(); std::cerr << "Position: " << this->position << std::endl; std::cerr << "Next Binlog: " << this->next_binlog << std::endl; } @@ -108,9 +108,9 @@ namespace MySQLReplication } } - void QueryEvent::print() const + void QueryEvent::dump() const { - header.print(); + header.dump(); std::cerr << "Thread ID: " << this->thread_id << std::endl; std::cerr << "Execution Time: " << this->exec_time << std::endl; std::cerr << "Schema Len: " << this->schema_len << std::endl; @@ -123,9 +123,9 @@ namespace MySQLReplication void XIDEvent::parseImpl(ReadBuffer & payload) { payload.readStrict(reinterpret_cast(&xid), 8); } - void XIDEvent::print() const + void XIDEvent::dump() const { - header.print(); + header.dump(); std::cerr << "XID: " << this->xid << std::endl; } @@ -224,9 +224,9 @@ namespace MySQLReplication } } - void TableMapEvent::print() const + void TableMapEvent::dump() const { - header.print(); + header.dump(); std::cerr << "Table ID: " << this->table_id << std::endl; std::cerr << "Flags: " << this->flags << std::endl; std::cerr << "Schema Len: " << this->schema_len << std::endl; @@ -530,19 +530,19 @@ namespace MySQLReplication if (compressed_integers != 0) { Int64 val = 0; - UInt32 to_read = compressed_byte_map[compressed_integers]; + UInt8 to_read = compressed_byte_map[compressed_integers]; readBigEndianStrict(reader, reinterpret_cast(&val), to_read); format += std::to_string(val); } - for (auto k = 0; k < uncompressed_integers; k++) + for (auto k = 0U; k < uncompressed_integers; k++) { UInt32 val = 0; readBigEndianStrict(reader, reinterpret_cast(&val), 4); format += std::to_string(val); } format += "."; - for (auto k = 0; k < uncompressed_decimals; k++) + for (auto k = 0U; k < uncompressed_decimals; k++) { UInt32 val = 0; reader.readStrict(reinterpret_cast(&val), 4); @@ -554,7 +554,7 @@ namespace MySQLReplication { Int64 val = 0; String compressed_buff; - UInt32 to_read = compressed_byte_map[compressed_decimals]; + UInt8 to_read = compressed_byte_map[compressed_decimals]; switch (to_read) { case 1: { @@ -686,11 +686,11 @@ namespace MySQLReplication rows.push_back(row); } - void RowsEvent::print() const + void RowsEvent::dump() const { FieldVisitorToString to_string; - header.print(); + header.dump(); std::cerr << "Schema: " << this->schema << std::endl; std::cerr << "Table: " << this->table << std::endl; for (auto i = 0U; i < rows.size(); i++) @@ -706,9 +706,9 @@ namespace MySQLReplication } } - void DryRunEvent::print() const + void DryRunEvent::dump() const { - header.print(); + header.dump(); std::cerr << "[DryRun Event]" << std::endl; } diff --git a/src/Core/MySQLReplication.h b/src/Core/MySQLReplication.h index f61670621c4..544f44bbcaf 100644 --- a/src/Core/MySQLReplication.h +++ b/src/Core/MySQLReplication.h @@ -289,7 +289,7 @@ namespace MySQLReplication UInt32 log_pos; UInt16 flags; - void print() const; + void dump() const; void parse(ReadBuffer & payload); }; @@ -299,7 +299,7 @@ namespace MySQLReplication EventHeader header; virtual ~EventBase() = default; - virtual void print() const = 0; + virtual void dump() const = 0; virtual void parseHeader(ReadBuffer & payload) { header.parse(payload); } virtual void parseEvent(ReadBuffer & payload) { parseImpl(payload); } virtual MySQLEventType type() const { return MYSQL_UNHANDLED_EVENT; } @@ -317,7 +317,7 @@ namespace MySQLReplication UInt8 event_header_length; String event_type_header_length; - void print() const override; + void dump() const override; void parseImpl(ReadBuffer & payload) override; private: @@ -330,7 +330,7 @@ namespace MySQLReplication UInt64 position; String next_binlog; - void print() const override; + void dump() const override; protected: void parseImpl(ReadBuffer & payload) override; @@ -356,7 +356,7 @@ namespace MySQLReplication String query; QueryType typ = DDL; - void print() const override; + void dump() const override; MySQLEventType type() const override { return MYSQL_QUERY_EVENT; } protected: @@ -368,7 +368,7 @@ namespace MySQLReplication protected: UInt64 xid; - void print() const override; + void dump() const override; void parseImpl(ReadBuffer & payload) override; }; @@ -386,7 +386,7 @@ namespace MySQLReplication std::vector column_meta; String null_bitmap; - void print() const override; + void dump() const override; protected: void parseImpl(ReadBuffer & payload) override; @@ -408,7 +408,7 @@ namespace MySQLReplication table = table_map->table; } - void print() const override; + void dump() const override; protected: UInt64 table_id; @@ -447,7 +447,7 @@ namespace MySQLReplication class DryRunEvent : public EventBase { - void print() const override; + void dump() const override; protected: void parseImpl(ReadBuffer & payload) override; diff --git a/src/Core/tests/mysql_protocol.cpp b/src/Core/tests/mysql_protocol.cpp index 51b067041ef..96de2c5ce1d 100644 --- a/src/Core/tests/mysql_protocol.cpp +++ b/src/Core/tests/mysql_protocol.cpp @@ -181,7 +181,7 @@ int main(int, char **) { case MYSQL_QUERY_EVENT: { auto binlogEvent = std::static_pointer_cast(event); - binlogEvent->print(); + binlogEvent->dump(); Position pos = slave.getPosition(); std::cerr << "Binlog Name: " << pos.binlog_name << ", Pos: " << pos.binlog_pos << std::endl; @@ -189,7 +189,7 @@ int main(int, char **) } case MYSQL_WRITE_ROWS_EVENT: { auto binlogEvent = std::static_pointer_cast(event); - binlogEvent->print(); + binlogEvent->dump(); Position pos = slave.getPosition(); std::cerr << "Binlog Name: " << pos.binlog_name << ", Pos: " << pos.binlog_pos << std::endl; @@ -197,7 +197,7 @@ int main(int, char **) } case MYSQL_UPDATE_ROWS_EVENT: { auto binlogEvent = std::static_pointer_cast(event); - binlogEvent->print(); + binlogEvent->dump(); Position pos = slave.getPosition(); std::cerr << "Binlog Name: " << pos.binlog_name << ", Pos: " << pos.binlog_pos << std::endl; @@ -205,7 +205,7 @@ int main(int, char **) } case MYSQL_DELETE_ROWS_EVENT: { auto binlogEvent = std::static_pointer_cast(event); - binlogEvent->print(); + binlogEvent->dump(); Position pos = slave.getPosition(); std::cerr << "Binlog Name: " << pos.binlog_name << ", Pos: " << pos.binlog_pos << std::endl;