Skip to content

Commit 660c32c

Browse files
percona-ysorokinpercona-ysorokin
authored
PS-10246 feature: Implement fixing next_event_position fields / checksums in the event common_header / footer in case of reconnecting to another node (part 1) (#96)
https://perconadev.atlassian.net/browse/PS-10246 "binsrv::event" namespace renamed to "binsrv::events". File layout, include directives, header guards and references changed accordingly.
1 parent 7908df3 commit 660c32c

83 files changed

Lines changed: 725 additions & 725 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -86,115 +86,115 @@ set(source_files
8686
src/app_version.hpp
8787

8888
# binlog event data structure files
89-
src/binsrv/event/anonymous_gtid_log_body_impl_fwd.hpp
90-
src/binsrv/event/anonymous_gtid_log_body_impl.hpp
89+
src/binsrv/events/anonymous_gtid_log_body_impl_fwd.hpp
90+
src/binsrv/events/anonymous_gtid_log_body_impl.hpp
9191

92-
src/binsrv/event/anonymous_gtid_log_post_header_impl_fwd.hpp
93-
src/binsrv/event/anonymous_gtid_log_post_header_impl.hpp
92+
src/binsrv/events/anonymous_gtid_log_post_header_impl_fwd.hpp
93+
src/binsrv/events/anonymous_gtid_log_post_header_impl.hpp
9494

95-
src/binsrv/event/checksum_algorithm_type_fwd.hpp
96-
src/binsrv/event/checksum_algorithm_type.hpp
95+
src/binsrv/events/checksum_algorithm_type_fwd.hpp
96+
src/binsrv/events/checksum_algorithm_type.hpp
9797

98-
src/binsrv/event/code_type_fwd.hpp
99-
src/binsrv/event/code_type.hpp
98+
src/binsrv/events/code_type_fwd.hpp
99+
src/binsrv/events/code_type.hpp
100100

101-
src/binsrv/event/common_header_fwd.hpp
102-
src/binsrv/event/common_header.hpp
103-
src/binsrv/event/common_header.cpp
101+
src/binsrv/events/common_header_fwd.hpp
102+
src/binsrv/events/common_header.hpp
103+
src/binsrv/events/common_header.cpp
104104

105-
src/binsrv/event/common_header_flag_type_fwd.hpp
106-
src/binsrv/event/common_header_flag_type.hpp
105+
src/binsrv/events/common_header_flag_type_fwd.hpp
106+
src/binsrv/events/common_header_flag_type.hpp
107107

108-
src/binsrv/event/empty_body_fwd.hpp
109-
src/binsrv/event/empty_body.hpp
110-
src/binsrv/event/empty_body.cpp
108+
src/binsrv/events/empty_body_fwd.hpp
109+
src/binsrv/events/empty_body.hpp
110+
src/binsrv/events/empty_body.cpp
111111

112-
src/binsrv/event/empty_post_header_fwd.hpp
113-
src/binsrv/event/empty_post_header.hpp
114-
src/binsrv/event/empty_post_header.cpp
112+
src/binsrv/events/empty_post_header_fwd.hpp
113+
src/binsrv/events/empty_post_header.hpp
114+
src/binsrv/events/empty_post_header.cpp
115115

116-
src/binsrv/event/event_fwd.hpp
117-
src/binsrv/event/event.hpp
118-
src/binsrv/event/event.cpp
116+
src/binsrv/events/event_fwd.hpp
117+
src/binsrv/events/event.hpp
118+
src/binsrv/events/event.cpp
119119

120-
src/binsrv/event/footer_fwd.hpp
121-
src/binsrv/event/footer.hpp
122-
src/binsrv/event/footer.cpp
120+
src/binsrv/events/footer_fwd.hpp
121+
src/binsrv/events/footer.hpp
122+
src/binsrv/events/footer.cpp
123123

124-
src/binsrv/event/format_description_body_impl_fwd.hpp
125-
src/binsrv/event/format_description_body_impl.hpp
126-
src/binsrv/event/format_description_body_impl.cpp
124+
src/binsrv/events/format_description_body_impl_fwd.hpp
125+
src/binsrv/events/format_description_body_impl.hpp
126+
src/binsrv/events/format_description_body_impl.cpp
127127

128-
src/binsrv/event/format_description_post_header_impl_fwd.hpp
129-
src/binsrv/event/format_description_post_header_impl.hpp
130-
src/binsrv/event/format_description_post_header_impl.cpp
128+
src/binsrv/events/format_description_post_header_impl_fwd.hpp
129+
src/binsrv/events/format_description_post_header_impl.hpp
130+
src/binsrv/events/format_description_post_header_impl.cpp
131131

132-
src/binsrv/event/generic_body_fwd.hpp
133-
src/binsrv/event/generic_body.hpp
132+
src/binsrv/events/generic_body_fwd.hpp
133+
src/binsrv/events/generic_body.hpp
134134

135-
src/binsrv/event/generic_post_header_fwd.hpp
136-
src/binsrv/event/generic_post_header.hpp
135+
src/binsrv/events/generic_post_header_fwd.hpp
136+
src/binsrv/events/generic_post_header.hpp
137137

138-
src/binsrv/event/gtid_log_flag_type_fwd.hpp
139-
src/binsrv/event/gtid_log_flag_type.hpp
138+
src/binsrv/events/gtid_log_flag_type_fwd.hpp
139+
src/binsrv/events/gtid_log_flag_type.hpp
140140

141-
src/binsrv/event/gtid_log_body_fwd.hpp
142-
src/binsrv/event/gtid_log_body.hpp
143-
src/binsrv/event/gtid_log_body.cpp
141+
src/binsrv/events/gtid_log_body_fwd.hpp
142+
src/binsrv/events/gtid_log_body.hpp
143+
src/binsrv/events/gtid_log_body.cpp
144144

145-
src/binsrv/event/gtid_log_body_impl_fwd.hpp
146-
src/binsrv/event/gtid_log_body_impl.hpp
145+
src/binsrv/events/gtid_log_body_impl_fwd.hpp
146+
src/binsrv/events/gtid_log_body_impl.hpp
147147

148-
src/binsrv/event/gtid_log_post_header_fwd.hpp
149-
src/binsrv/event/gtid_log_post_header.hpp
150-
src/binsrv/event/gtid_log_post_header.cpp
148+
src/binsrv/events/gtid_log_post_header_fwd.hpp
149+
src/binsrv/events/gtid_log_post_header.hpp
150+
src/binsrv/events/gtid_log_post_header.cpp
151151

152-
src/binsrv/event/gtid_log_post_header_impl_fwd.hpp
153-
src/binsrv/event/gtid_log_post_header_impl.hpp
152+
src/binsrv/events/gtid_log_post_header_impl_fwd.hpp
153+
src/binsrv/events/gtid_log_post_header_impl.hpp
154154

155-
src/binsrv/event/gtid_tagged_log_body_impl_fwd.hpp
156-
src/binsrv/event/gtid_tagged_log_body_impl.hpp
157-
src/binsrv/event/gtid_tagged_log_body_impl.cpp
155+
src/binsrv/events/gtid_tagged_log_body_impl_fwd.hpp
156+
src/binsrv/events/gtid_tagged_log_body_impl.hpp
157+
src/binsrv/events/gtid_tagged_log_body_impl.cpp
158158

159-
src/binsrv/event/gtid_tagged_log_post_header_impl_fwd.hpp
160-
src/binsrv/event/gtid_tagged_log_post_header_impl.hpp
159+
src/binsrv/events/gtid_tagged_log_post_header_impl_fwd.hpp
160+
src/binsrv/events/gtid_tagged_log_post_header_impl.hpp
161161

162-
src/binsrv/event/previous_gtids_log_body_impl_fwd.hpp
163-
src/binsrv/event/previous_gtids_log_body_impl.hpp
164-
src/binsrv/event/previous_gtids_log_body_impl.cpp
162+
src/binsrv/events/previous_gtids_log_body_impl_fwd.hpp
163+
src/binsrv/events/previous_gtids_log_body_impl.hpp
164+
src/binsrv/events/previous_gtids_log_body_impl.cpp
165165

166-
src/binsrv/event/previous_gtids_log_post_header_impl_fwd.hpp
167-
src/binsrv/event/previous_gtids_log_post_header_impl.hpp
166+
src/binsrv/events/previous_gtids_log_post_header_impl_fwd.hpp
167+
src/binsrv/events/previous_gtids_log_post_header_impl.hpp
168168

169-
src/binsrv/event/protocol_traits_fwd.hpp
170-
src/binsrv/event/protocol_traits.hpp
171-
src/binsrv/event/protocol_traits.cpp
169+
src/binsrv/events/protocol_traits_fwd.hpp
170+
src/binsrv/events/protocol_traits.hpp
171+
src/binsrv/events/protocol_traits.cpp
172172

173-
src/binsrv/event/reader_context_fwd.hpp
174-
src/binsrv/event/reader_context.hpp
175-
src/binsrv/event/reader_context.cpp
173+
src/binsrv/events/reader_context_fwd.hpp
174+
src/binsrv/events/reader_context.hpp
175+
src/binsrv/events/reader_context.cpp
176176

177-
src/binsrv/event/rotate_body_impl_fwd.hpp
178-
src/binsrv/event/rotate_body_impl.hpp
179-
src/binsrv/event/rotate_body_impl.cpp
177+
src/binsrv/events/rotate_body_impl_fwd.hpp
178+
src/binsrv/events/rotate_body_impl.hpp
179+
src/binsrv/events/rotate_body_impl.cpp
180180

181-
src/binsrv/event/rotate_post_header_impl_fwd.hpp
182-
src/binsrv/event/rotate_post_header_impl.hpp
183-
src/binsrv/event/rotate_post_header_impl.cpp
181+
src/binsrv/events/rotate_post_header_impl_fwd.hpp
182+
src/binsrv/events/rotate_post_header_impl.hpp
183+
src/binsrv/events/rotate_post_header_impl.cpp
184184

185-
src/binsrv/event/stop_body_impl_fwd.hpp
186-
src/binsrv/event/stop_body_impl.hpp
185+
src/binsrv/events/stop_body_impl_fwd.hpp
186+
src/binsrv/events/stop_body_impl.hpp
187187

188-
src/binsrv/event/stop_post_header_impl_fwd.hpp
189-
src/binsrv/event/stop_post_header_impl.hpp
188+
src/binsrv/events/stop_post_header_impl_fwd.hpp
189+
src/binsrv/events/stop_post_header_impl.hpp
190190

191-
src/binsrv/event/unknown_body_fwd.hpp
192-
src/binsrv/event/unknown_body.hpp
193-
src/binsrv/event/unknown_body.cpp
191+
src/binsrv/events/unknown_body_fwd.hpp
192+
src/binsrv/events/unknown_body.hpp
193+
src/binsrv/events/unknown_body.cpp
194194

195-
src/binsrv/event/unknown_post_header_fwd.hpp
196-
src/binsrv/event/unknown_post_header.hpp
197-
src/binsrv/event/unknown_post_header.cpp
195+
src/binsrv/events/unknown_post_header_fwd.hpp
196+
src/binsrv/events/unknown_post_header.hpp
197+
src/binsrv/events/unknown_post_header.cpp
198198

199199
# gtid data structure files
200200
src/binsrv/gtids/common_types.hpp

‎src/app.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
#include "binsrv/models/error_response.hpp"
6060
#include "binsrv/models/search_response.hpp"
6161

62-
#include "binsrv/event/code_type.hpp"
63-
#include "binsrv/event/common_header_flag_type.hpp"
64-
#include "binsrv/event/event.hpp"
65-
#include "binsrv/event/reader_context.hpp"
62+
#include "binsrv/events/code_type.hpp"
63+
#include "binsrv/events/common_header_flag_type.hpp"
64+
#include "binsrv/events/event.hpp"
65+
#include "binsrv/events/reader_context.hpp"
6666

6767
#include "easymysql/connection.hpp"
6868
#include "easymysql/connection_config.hpp"
@@ -375,16 +375,16 @@ void log_span_dump(binsrv::basic_logger &logger,
375375
}
376376
}
377377

378-
void process_artificial_rotate_event(const binsrv::event::event &current_event,
378+
void process_artificial_rotate_event(const binsrv::events::event &current_event,
379379
binsrv::basic_logger &logger,
380380
binsrv::storage &storage) {
381381
assert(current_event.get_common_header().get_type_code() ==
382-
binsrv::event::code_type::rotate);
382+
binsrv::events::code_type::rotate);
383383
assert(current_event.get_common_header().get_flags().has_element(
384-
binsrv::event::common_header_flag_type::artificial));
384+
binsrv::events::common_header_flag_type::artificial));
385385

386386
const auto &current_rotate_body =
387-
current_event.get_body<binsrv::event::code_type::rotate>();
387+
current_event.get_body<binsrv::events::code_type::rotate>();
388388

389389
bool binlog_opening_needed{true};
390390

@@ -405,7 +405,7 @@ void process_artificial_rotate_event(const binsrv::event::event &current_event,
405405
// in addition, in position-based replication mode we also need to check
406406
// the position
407407
const auto &current_rotate_post_header =
408-
current_event.get_post_header<binsrv::event::code_type::rotate>();
408+
current_event.get_post_header<binsrv::events::code_type::rotate>();
409409
if (current_rotate_post_header.get_position_raw() !=
410410
storage.get_current_position()) {
411411
util::exception_location().raise<std::logic_error>(
@@ -461,19 +461,19 @@ void process_rotate_or_stop_event(binsrv::basic_logger &logger,
461461
"storage: closed binlog file: " + old_binlog_name);
462462
}
463463

464-
void process_binlog_event(const binsrv::event::event &current_event,
464+
void process_binlog_event(const binsrv::events::event &current_event,
465465
util::const_byte_span portion,
466466
binsrv::basic_logger &logger,
467-
binsrv::event::reader_context &context,
467+
binsrv::events::reader_context &context,
468468
binsrv::storage &storage) {
469469
const auto &current_common_header = current_event.get_common_header();
470470
const auto code = current_common_header.get_type_code();
471471

472472
const auto is_artificial{current_common_header.get_flags().has_element(
473-
binsrv::event::common_header_flag_type::artificial)};
473+
binsrv::events::common_header_flag_type::artificial)};
474474

475475
// processing the very first event in the sequence - artificial ROTATE event
476-
if (code == binsrv::event::code_type::rotate && is_artificial) {
476+
if (code == binsrv::events::code_type::rotate && is_artificial) {
477477
process_artificial_rotate_event(current_event, logger, storage);
478478
}
479479

@@ -486,8 +486,8 @@ void process_binlog_event(const binsrv::event::event &current_event,
486486

487487
// processing the very last event in the sequence - either a non-artificial
488488
// ROTATE event or a STOP event
489-
if ((code == binsrv::event::code_type::rotate && !is_artificial) ||
490-
code == binsrv::event::code_type::stop) {
489+
if ((code == binsrv::events::code_type::rotate && !is_artificial) ||
490+
code == binsrv::events::code_type::stop) {
491491
process_rotate_or_stop_event(logger, storage);
492492
}
493493
}
@@ -573,7 +573,7 @@ void receive_binlog_events(
573573

574574
util::const_byte_span portion;
575575

576-
binsrv::event::reader_context context{
576+
binsrv::events::reader_context context{
577577
connection.get_server_version(), verify_checksum,
578578
storage.get_replication_mode(), storage.get_current_binlog_name(),
579579
static_cast<std::uint32_t>(storage.get_current_position())};
@@ -594,7 +594,7 @@ void receive_binlog_events(
594594
// the ROTATE and FORMAT_DESCRIPTION events only, every other one
595595
// can be just considered as a data portion (unless we want to do
596596
// basic integrity checks like event sizes / position and CRC)
597-
const binsrv::event::event current_event{context, portion};
597+
const binsrv::events::event current_event{context, portion};
598598
const auto &current_header{current_event.get_common_header()};
599599
auto readable_flags{current_header.get_readable_flags()};
600600
logger.log(

‎src/binsrv/event/code_type.hpp‎

Lines changed: 0 additions & 104 deletions
This file was deleted.

0 commit comments

Comments
 (0)