Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 79 additions & 79 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,115 +86,115 @@ set(source_files
src/app_version.hpp

# binlog event data structure files
src/binsrv/event/anonymous_gtid_log_body_impl_fwd.hpp
src/binsrv/event/anonymous_gtid_log_body_impl.hpp
src/binsrv/events/anonymous_gtid_log_body_impl_fwd.hpp
src/binsrv/events/anonymous_gtid_log_body_impl.hpp

src/binsrv/event/anonymous_gtid_log_post_header_impl_fwd.hpp
src/binsrv/event/anonymous_gtid_log_post_header_impl.hpp
src/binsrv/events/anonymous_gtid_log_post_header_impl_fwd.hpp
src/binsrv/events/anonymous_gtid_log_post_header_impl.hpp

src/binsrv/event/checksum_algorithm_type_fwd.hpp
src/binsrv/event/checksum_algorithm_type.hpp
src/binsrv/events/checksum_algorithm_type_fwd.hpp
src/binsrv/events/checksum_algorithm_type.hpp

src/binsrv/event/code_type_fwd.hpp
src/binsrv/event/code_type.hpp
src/binsrv/events/code_type_fwd.hpp
src/binsrv/events/code_type.hpp

src/binsrv/event/common_header_fwd.hpp
src/binsrv/event/common_header.hpp
src/binsrv/event/common_header.cpp
src/binsrv/events/common_header_fwd.hpp
src/binsrv/events/common_header.hpp
src/binsrv/events/common_header.cpp

src/binsrv/event/common_header_flag_type_fwd.hpp
src/binsrv/event/common_header_flag_type.hpp
src/binsrv/events/common_header_flag_type_fwd.hpp
src/binsrv/events/common_header_flag_type.hpp

src/binsrv/event/empty_body_fwd.hpp
src/binsrv/event/empty_body.hpp
src/binsrv/event/empty_body.cpp
src/binsrv/events/empty_body_fwd.hpp
src/binsrv/events/empty_body.hpp
src/binsrv/events/empty_body.cpp

src/binsrv/event/empty_post_header_fwd.hpp
src/binsrv/event/empty_post_header.hpp
src/binsrv/event/empty_post_header.cpp
src/binsrv/events/empty_post_header_fwd.hpp
src/binsrv/events/empty_post_header.hpp
src/binsrv/events/empty_post_header.cpp

src/binsrv/event/event_fwd.hpp
src/binsrv/event/event.hpp
src/binsrv/event/event.cpp
src/binsrv/events/event_fwd.hpp
src/binsrv/events/event.hpp
src/binsrv/events/event.cpp

src/binsrv/event/footer_fwd.hpp
src/binsrv/event/footer.hpp
src/binsrv/event/footer.cpp
src/binsrv/events/footer_fwd.hpp
src/binsrv/events/footer.hpp
src/binsrv/events/footer.cpp

src/binsrv/event/format_description_body_impl_fwd.hpp
src/binsrv/event/format_description_body_impl.hpp
src/binsrv/event/format_description_body_impl.cpp
src/binsrv/events/format_description_body_impl_fwd.hpp
src/binsrv/events/format_description_body_impl.hpp
src/binsrv/events/format_description_body_impl.cpp

src/binsrv/event/format_description_post_header_impl_fwd.hpp
src/binsrv/event/format_description_post_header_impl.hpp
src/binsrv/event/format_description_post_header_impl.cpp
src/binsrv/events/format_description_post_header_impl_fwd.hpp
src/binsrv/events/format_description_post_header_impl.hpp
src/binsrv/events/format_description_post_header_impl.cpp

src/binsrv/event/generic_body_fwd.hpp
src/binsrv/event/generic_body.hpp
src/binsrv/events/generic_body_fwd.hpp
src/binsrv/events/generic_body.hpp

src/binsrv/event/generic_post_header_fwd.hpp
src/binsrv/event/generic_post_header.hpp
src/binsrv/events/generic_post_header_fwd.hpp
src/binsrv/events/generic_post_header.hpp

src/binsrv/event/gtid_log_flag_type_fwd.hpp
src/binsrv/event/gtid_log_flag_type.hpp
src/binsrv/events/gtid_log_flag_type_fwd.hpp
src/binsrv/events/gtid_log_flag_type.hpp

src/binsrv/event/gtid_log_body_fwd.hpp
src/binsrv/event/gtid_log_body.hpp
src/binsrv/event/gtid_log_body.cpp
src/binsrv/events/gtid_log_body_fwd.hpp
src/binsrv/events/gtid_log_body.hpp
src/binsrv/events/gtid_log_body.cpp

src/binsrv/event/gtid_log_body_impl_fwd.hpp
src/binsrv/event/gtid_log_body_impl.hpp
src/binsrv/events/gtid_log_body_impl_fwd.hpp
src/binsrv/events/gtid_log_body_impl.hpp

src/binsrv/event/gtid_log_post_header_fwd.hpp
src/binsrv/event/gtid_log_post_header.hpp
src/binsrv/event/gtid_log_post_header.cpp
src/binsrv/events/gtid_log_post_header_fwd.hpp
src/binsrv/events/gtid_log_post_header.hpp
src/binsrv/events/gtid_log_post_header.cpp

src/binsrv/event/gtid_log_post_header_impl_fwd.hpp
src/binsrv/event/gtid_log_post_header_impl.hpp
src/binsrv/events/gtid_log_post_header_impl_fwd.hpp
src/binsrv/events/gtid_log_post_header_impl.hpp

src/binsrv/event/gtid_tagged_log_body_impl_fwd.hpp
src/binsrv/event/gtid_tagged_log_body_impl.hpp
src/binsrv/event/gtid_tagged_log_body_impl.cpp
src/binsrv/events/gtid_tagged_log_body_impl_fwd.hpp
src/binsrv/events/gtid_tagged_log_body_impl.hpp
src/binsrv/events/gtid_tagged_log_body_impl.cpp

src/binsrv/event/gtid_tagged_log_post_header_impl_fwd.hpp
src/binsrv/event/gtid_tagged_log_post_header_impl.hpp
src/binsrv/events/gtid_tagged_log_post_header_impl_fwd.hpp
src/binsrv/events/gtid_tagged_log_post_header_impl.hpp

src/binsrv/event/previous_gtids_log_body_impl_fwd.hpp
src/binsrv/event/previous_gtids_log_body_impl.hpp
src/binsrv/event/previous_gtids_log_body_impl.cpp
src/binsrv/events/previous_gtids_log_body_impl_fwd.hpp
src/binsrv/events/previous_gtids_log_body_impl.hpp
src/binsrv/events/previous_gtids_log_body_impl.cpp

src/binsrv/event/previous_gtids_log_post_header_impl_fwd.hpp
src/binsrv/event/previous_gtids_log_post_header_impl.hpp
src/binsrv/events/previous_gtids_log_post_header_impl_fwd.hpp
src/binsrv/events/previous_gtids_log_post_header_impl.hpp

src/binsrv/event/protocol_traits_fwd.hpp
src/binsrv/event/protocol_traits.hpp
src/binsrv/event/protocol_traits.cpp
src/binsrv/events/protocol_traits_fwd.hpp
src/binsrv/events/protocol_traits.hpp
src/binsrv/events/protocol_traits.cpp

src/binsrv/event/reader_context_fwd.hpp
src/binsrv/event/reader_context.hpp
src/binsrv/event/reader_context.cpp
src/binsrv/events/reader_context_fwd.hpp
src/binsrv/events/reader_context.hpp
src/binsrv/events/reader_context.cpp

src/binsrv/event/rotate_body_impl_fwd.hpp
src/binsrv/event/rotate_body_impl.hpp
src/binsrv/event/rotate_body_impl.cpp
src/binsrv/events/rotate_body_impl_fwd.hpp
src/binsrv/events/rotate_body_impl.hpp
src/binsrv/events/rotate_body_impl.cpp

src/binsrv/event/rotate_post_header_impl_fwd.hpp
src/binsrv/event/rotate_post_header_impl.hpp
src/binsrv/event/rotate_post_header_impl.cpp
src/binsrv/events/rotate_post_header_impl_fwd.hpp
src/binsrv/events/rotate_post_header_impl.hpp
src/binsrv/events/rotate_post_header_impl.cpp

src/binsrv/event/stop_body_impl_fwd.hpp
src/binsrv/event/stop_body_impl.hpp
src/binsrv/events/stop_body_impl_fwd.hpp
src/binsrv/events/stop_body_impl.hpp

src/binsrv/event/stop_post_header_impl_fwd.hpp
src/binsrv/event/stop_post_header_impl.hpp
src/binsrv/events/stop_post_header_impl_fwd.hpp
src/binsrv/events/stop_post_header_impl.hpp

src/binsrv/event/unknown_body_fwd.hpp
src/binsrv/event/unknown_body.hpp
src/binsrv/event/unknown_body.cpp
src/binsrv/events/unknown_body_fwd.hpp
src/binsrv/events/unknown_body.hpp
src/binsrv/events/unknown_body.cpp

src/binsrv/event/unknown_post_header_fwd.hpp
src/binsrv/event/unknown_post_header.hpp
src/binsrv/event/unknown_post_header.cpp
src/binsrv/events/unknown_post_header_fwd.hpp
src/binsrv/events/unknown_post_header.hpp
src/binsrv/events/unknown_post_header.cpp

# gtid data structure files
src/binsrv/gtids/common_types.hpp
Expand Down
34 changes: 17 additions & 17 deletions src/app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@
#include "binsrv/models/error_response.hpp"
#include "binsrv/models/search_response.hpp"

#include "binsrv/event/code_type.hpp"
#include "binsrv/event/common_header_flag_type.hpp"
#include "binsrv/event/event.hpp"
#include "binsrv/event/reader_context.hpp"
#include "binsrv/events/code_type.hpp"
#include "binsrv/events/common_header_flag_type.hpp"
#include "binsrv/events/event.hpp"
#include "binsrv/events/reader_context.hpp"

#include "easymysql/connection.hpp"
#include "easymysql/connection_config.hpp"
Expand Down Expand Up @@ -375,16 +375,16 @@ void log_span_dump(binsrv::basic_logger &logger,
}
}

void process_artificial_rotate_event(const binsrv::event::event &current_event,
void process_artificial_rotate_event(const binsrv::events::event &current_event,
binsrv::basic_logger &logger,
binsrv::storage &storage) {
assert(current_event.get_common_header().get_type_code() ==
binsrv::event::code_type::rotate);
binsrv::events::code_type::rotate);
assert(current_event.get_common_header().get_flags().has_element(
binsrv::event::common_header_flag_type::artificial));
binsrv::events::common_header_flag_type::artificial));

const auto &current_rotate_body =
current_event.get_body<binsrv::event::code_type::rotate>();
current_event.get_body<binsrv::events::code_type::rotate>();

bool binlog_opening_needed{true};

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

void process_binlog_event(const binsrv::event::event &current_event,
void process_binlog_event(const binsrv::events::event &current_event,
util::const_byte_span portion,
binsrv::basic_logger &logger,
binsrv::event::reader_context &context,
binsrv::events::reader_context &context,
binsrv::storage &storage) {
const auto &current_common_header = current_event.get_common_header();
const auto code = current_common_header.get_type_code();

const auto is_artificial{current_common_header.get_flags().has_element(
binsrv::event::common_header_flag_type::artificial)};
binsrv::events::common_header_flag_type::artificial)};

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

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

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

util::const_byte_span portion;

binsrv::event::reader_context context{
binsrv::events::reader_context context{
connection.get_server_version(), verify_checksum,
storage.get_replication_mode(), storage.get_current_binlog_name(),
static_cast<std::uint32_t>(storage.get_current_position())};
Expand All @@ -594,7 +594,7 @@ void receive_binlog_events(
// the ROTATE and FORMAT_DESCRIPTION events only, every other one
// can be just considered as a data portion (unless we want to do
// basic integrity checks like event sizes / position and CRC)
const binsrv::event::event current_event{context, portion};
const binsrv::events::event current_event{context, portion};
const auto &current_header{current_event.get_common_header()};
auto readable_flags{current_header.get_readable_flags()};
logger.log(
Expand Down
104 changes: 0 additions & 104 deletions src/binsrv/event/code_type.hpp

This file was deleted.

Loading