Skip to content

Commit 60f2cf6

Browse files
author
Sven Sandberg
committed
BUG#36381815 step 4: Move concat.h and nodiscard.h to libs/mysql/utils
Part of: Bug#36381815: Factor out generic functionality from the mysql_binlog_event library Move the following generic utilities from mysql_binlog_event to mysql_utils: - libs/mysql/binlog/event/string/concat.h - libs/mysql/binlog/event/nodiscard.h This commit was produced using: ./libs/scripts/move directory-contents binlog/event/string utils ./libs/scripts/move header binlog/event/nodiscard.h utils And then auto-reformatting. Change-Id: Ie6cf331192af4ae03539416526facfece4112be4
1 parent 2cfedb1 commit 60f2cf6

27 files changed

+34
-34
lines changed

‎libs/mysql/binlog/event/compression/buffer/buffer_sequence_view.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include "mysql/binlog/event/compression/buffer/buffer_view.h" // buffer::Buffer_view
4242
#include "mysql/binlog/event/compression/buffer/grow_calculator.h" // buffer::Grow_calculator
4343
#include "mysql/binlog/event/compression/buffer/grow_status.h" // buffer::Grow_status
44-
#include "mysql/binlog/event/nodiscard.h" // NODISCARD
44+
#include "mysql/utils/nodiscard.h" // NODISCARD
4545

4646
#include "mysql/binlog/event/wrapper_functions.h" // BAPI_TRACE
4747

‎libs/mysql/binlog/event/compression/buffer/grow_constraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#ifndef MYSQL_BINLOG_EVENT_COMPRESSION_BUFFER_GROW_CONSTRAINT_H
2525
#define MYSQL_BINLOG_EVENT_COMPRESSION_BUFFER_GROW_CONSTRAINT_H
2626

27-
#include "mysql/binlog/event/nodiscard.h" // NODISCARD
27+
#include "mysql/utils/nodiscard.h" // NODISCARD
2828

2929
#include <algorithm> // std::min
3030
#include <limits> // std::numeric_limits

‎libs/mysql/binlog/event/compression/buffer/managed_buffer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "grow_status.h" // buffer::Grow_status
3838
#include "mysql/allocators/allocator.h" // Allocator
3939
#include "mysql/allocators/memory_resource.h" // Memory_resource
40-
#include "mysql/binlog/event/nodiscard.h" // NODISCARD
40+
#include "mysql/utils/nodiscard.h" // NODISCARD
4141
#include "rw_buffer.h" // buffer::Rw_buffer
4242

4343
#include "mysql/binlog/event/wrapper_functions.h" // BAPI_TRACE

‎libs/mysql/binlog/event/compression/buffer/managed_buffer_sequence.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include "mysql/binlog/event/compression/buffer/grow_calculator.h" // buffer::Grow_calculator
4242
#include "mysql/binlog/event/compression/buffer/grow_status.h" // buffer::Grow_status
4343
#include "mysql/binlog/event/compression/buffer/rw_buffer_sequence.h" // buffer::Rw_buffer_sequence
44-
#include "mysql/binlog/event/nodiscard.h" // NODISCARD
44+
#include "mysql/utils/nodiscard.h" // NODISCARD
4545

4646
#include "mysql/binlog/event/wrapper_functions.h" // BAPI_TRACE
4747

‎libs/mysql/binlog/event/compression/buffer/rw_buffer_sequence.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#include "mysql/binlog/event/compression/buffer/buffer_view.h" // buffer::Buffer_view
4545
#include "mysql/binlog/event/compression/buffer/grow_calculator.h" // buffer::Grow_calculator
4646
#include "mysql/binlog/event/compression/buffer/grow_status.h" // buffer::Grow_status
47-
#include "mysql/binlog/event/nodiscard.h" // NODISCARD
47+
#include "mysql/utils/nodiscard.h" // NODISCARD
4848

4949
#include "mysql/binlog/event/wrapper_functions.h" // BAPI_TRACE
5050

‎libs/mysql/binlog/event/compression/compressor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "mysql/binlog/event/compression/base.h" // type
3030
#include "mysql/binlog/event/compression/buffer/grow_constraint.h" // Grow_constraint
3131
#include "mysql/binlog/event/compression/buffer/managed_buffer_sequence.h" // Managed_buffer_sequence
32-
#include "mysql/binlog/event/nodiscard.h" // NODISCARD
32+
#include "mysql/utils/nodiscard.h" // NODISCARD
3333

3434
#include <limits> // std::numeric_limits
3535

‎libs/mysql/binlog/event/compression/decompressor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "mysql/binlog/event/compression/buffer/grow_constraint.h" // Grow_constraint
2929
#include "mysql/binlog/event/compression/buffer/managed_buffer.h" // Managed_buffer
3030
#include "mysql/binlog/event/compression/decompress_status.h" // Decompress_status
31-
#include "mysql/binlog/event/nodiscard.h" // NODISCARD
31+
#include "mysql/utils/nodiscard.h" // NODISCARD
3232

3333
namespace mysql::binlog::event::compression {
3434

‎libs/mysql/binlog/event/compression/none_comp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define MYSQL_BINLOG_EVENT_COMPRESSION_NONE_COMP_H
2626

2727
#include "compressor.h"
28-
#include "mysql/binlog/event/nodiscard.h"
28+
#include "mysql/utils/nodiscard.h"
2929

3030
namespace mysql::binlog::event::compression {
3131

‎libs/mysql/binlog/event/compression/none_dec.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define MYSQL_BINLOG_EVENT_COMPRESSION_NONE_DEC_H
2626

2727
#include "mysql/binlog/event/compression/decompressor.h"
28-
#include "mysql/binlog/event/nodiscard.h"
28+
#include "mysql/utils/nodiscard.h"
2929

3030
namespace mysql::binlog::event::compression {
3131

‎libs/mysql/binlog/event/compression/payload_event_buffer_istream.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
#include "mysql/binlog/event/compression/payload_event_buffer_istream.h"
2525

2626
#include "mysql/binlog/event/byteorder.h"
27-
#include "mysql/binlog/event/string/concat.h"
2827
#include "mysql/binlog/event/wrapper_functions.h"
28+
#include "mysql/utils/concat.h"
2929

30-
using mysql::binlog::event::string::concat;
30+
using mysql::utils::concat;
3131

3232
namespace mysql::binlog::event::compression {
3333

‎libs/mysql/binlog/event/compression/payload_event_buffer_istream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "mysql/binlog/event/compression/factory.h" // mysqlns::compression::Factory
3333
#include "mysql/binlog/event/control_events.h" // Transaction_payload_event
3434
#include "mysql/binlog/event/event_reader.h" // Event_reader
35-
#include "mysql/binlog/event/nodiscard.h" // NODISCARD
35+
#include "mysql/utils/nodiscard.h" // NODISCARD
3636

3737
/// @addtogroup GroupLibsMysqlBinlogEvent
3838
/// @{

‎libs/mysql/binlog/event/compression/zstd_comp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "mysql/allocators/memory_resource.h" // Memory_resource
3131
#include "mysql/binlog/event/compression/buffer/buffer_sequence_view.h"
3232
#include "mysql/binlog/event/compression/compressor.h"
33-
#include "mysql/binlog/event/nodiscard.h"
33+
#include "mysql/utils/nodiscard.h"
3434

3535
struct ZSTD_outBuffer_s;
3636

‎libs/mysql/binlog/event/compression/zstd_dec.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include "mysql/allocators/memory_resource.h" // Memory_resource
3131
#include "mysql/binlog/event/compression/decompressor.h"
32-
#include "mysql/binlog/event/nodiscard.h"
32+
#include "mysql/utils/nodiscard.h"
3333

3434
namespace mysql::binlog::event::compression {
3535

‎libs/mysql/gtid/gtid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
#include <set>
2828
#include <sstream>
2929

30-
#include "mysql/binlog/event/nodiscard.h"
3130
#include "mysql/gtid/global.h"
3231
#include "mysql/gtid/tsid.h"
3332
#include "mysql/serialization/archive_binary.h"
33+
#include "mysql/utils/nodiscard.h"
3434

3535
/// @addtogroup GroupLibsMysqlGtid
3636
/// @{

‎libs/mysql/gtid/gtidset.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
#include <set>
3030
#include <sstream>
3131

32-
#include "mysql/binlog/event/nodiscard.h"
3332
#include "mysql/gtid/global.h"
3433
#include "mysql/gtid/gtid.h"
3534
#include "mysql/gtid/tag.h"
3635
#include "mysql/gtid/tsid.h"
36+
#include "mysql/utils/nodiscard.h"
3737

3838
/// @addtogroup GroupLibsMysqlGtid
3939
/// @{

‎libs/mysql/gtid/tag.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
#include <memory>
3030
#include <string>
3131

32-
#include "mysql/binlog/event/nodiscard.h"
3332
#include "mysql/gtid/gtid_constants.h"
3433
#include "mysql/gtid/gtid_format.h"
3534
#include "mysql/gtid/tag_plain.h"
35+
#include "mysql/utils/nodiscard.h"
3636

3737
/// @addtogroup GroupLibsMysqlGtid
3838
/// @{

‎libs/mysql/binlog/event/string/concat.h renamed to ‎libs/mysql/utils/concat.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
#include <sstream> // std::ostringstream
3333
#include <string> // std::string
3434

35-
/// @addtogroup GroupLibsMysqlBinlogEvent
35+
/// @addtogroup GroupLibsMysqlUtils
3636
/// @{
3737

38-
namespace mysql::binlog::event::string {
38+
namespace mysql::utils {
3939

4040
namespace internal {
4141

@@ -67,7 +67,7 @@ std::string concat(Args... args) {
6767
return out.str();
6868
}
6969

70-
} // namespace mysql::binlog::event::string
70+
} // namespace mysql::utils
7171

7272
/// @}
7373

‎libs/mysql/binlog/event/nodiscard.h renamed to ‎libs/mysql/utils/nodiscard.h

File renamed without changes.

‎plugin/group_replication/include/member_info.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
#include "my_inttypes.h"
4545
#include "my_sys.h"
46-
#include "mysql/binlog/event/nodiscard.h"
46+
#include "mysql/utils/nodiscard.h"
4747
#include "plugin/group_replication/include/gcs_plugin_messages.h"
4848
#include "plugin/group_replication/include/member_version.h"
4949
#include "plugin/group_replication/include/plugin_constants.h"

‎sql/basic_ostream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "my_inttypes.h"
2828
#include "my_sys.h"
2929
#include "mysql/binlog/event/compression/compressor.h"
30-
#include "mysql/binlog/event/nodiscard.h"
30+
#include "mysql/utils/nodiscard.h"
3131
#include "sql_string.h"
3232

3333
/**

‎sql/binlog/decompressing_event_object_istream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include "mysql/allocators/memory_resource.h" // Memory_resource
3030
#include "mysql/binlog/event/compression/payload_event_buffer_istream.h"
31-
#include "mysql/binlog/event/nodiscard.h"
31+
#include "mysql/utils/nodiscard.h"
3232
#include "sql/binlog_reader.h"
3333
#include "sql/raii/targeted_stringstream.h"
3434

‎sql/rpl_context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include "my_inttypes.h" // IWYU pragma: keep
3131
#include "mysql/binlog/event/compression/compressor.h" // mysql::binlog::event::compression::Compressor
32-
#include "mysql/binlog/event/nodiscard.h"
32+
#include "mysql/utils/nodiscard.h"
3333

3434
#include "mysql/binlog/event/compression/factory.h"
3535
#include "sql/binlog/group_commit/bgc_ticket.h"

‎unittest/gunit/binlogevents/managed_buffer-t.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include <iterator> // std::distance
3131

3232
#include "mysql/binlog/event/math/math.h"
33-
#include "mysql/binlog/event/string/concat.h"
33+
#include "mysql/utils/concat.h"
3434

35-
using mysql::binlog::event::string::concat;
35+
using mysql::utils::concat;
3636

3737
namespace mysql::binlog::event::compression::buffer {
3838
namespace managed_buffer::unittest {

‎unittest/gunit/binlogevents/managed_buffer_sequence-t.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include <iterator> // std::distance
3131

3232
#include "mysql/binlog/event/math/math.h"
33-
#include "mysql/binlog/event/string/concat.h"
33+
#include "mysql/utils/concat.h"
3434

35-
using mysql::binlog::event::string::concat;
35+
using mysql::utils::concat;
3636

3737
namespace mysql::binlog::event::compression::buffer {
3838
namespace managed_buffer_sequence::unittest {

‎unittest/gunit/binlogevents/payload_event_buffer_istream-t.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
#include "mysql/binlog/event/compression/none_comp.h"
3535
#include "mysql/binlog/event/compression/payload_event_buffer_istream.h"
3636
#include "mysql/binlog/event/compression/zstd_comp.h"
37-
#include "mysql/binlog/event/string/concat.h"
37+
#include "mysql/utils/concat.h"
3838

39-
using mysql::binlog::event::string::concat;
39+
using mysql::utils::concat;
4040

4141
namespace mysql::binlog::event::unittests {
4242

‎unittest/gunit/binlogevents/rw_buffer_sequence-t.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
#include <gmock/gmock.h>
2828
#include <gtest/gtest.h>
2929

30-
#include "mysql/binlog/event/string/concat.h"
30+
#include "mysql/utils/concat.h"
3131

32-
using mysql::binlog::event::string::concat;
32+
using mysql::utils::concat;
3333

3434
namespace mysql::binlog::event::compression::buffer {
3535
namespace rw_buffer_sequence::unittest {

‎unittest/gunit/binlogevents/transaction_compression-t.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include "mysql/binlog/event/compression/none_dec.h"
3131
#include "mysql/binlog/event/compression/zstd_comp.h"
3232
#include "mysql/binlog/event/compression/zstd_dec.h"
33-
#include "mysql/binlog/event/string/concat.h"
33+
#include "mysql/utils/concat.h"
3434

35-
using mysql::binlog::event::string::concat;
35+
using mysql::utils::concat;
3636

3737
namespace mysql::binlog::event::compression::unittests {
3838

0 commit comments

Comments
 (0)