Skip to content

PS-10679 fix: cannot parse GTID set with multiple UUIDs if no space after a coma before start of next UUID #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
percona-ysorokin merged 1 commit into from
Mar 11, 2026
Merged

PS-10679 fix: cannot parse GTID set with multiple UUIDs if no space after a coma before start of next UUID #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions src/binsrv/gtids/gtid_set.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class gtid_set_parser {
<optionally_tagged_interval> ::= (<tag> ':')? <gno> ('-' <gno>)?
<tag> ::= [a-zA-Z_][a-zA-Z0-9_]{0,31}
<gno> ::= [0-9]+
<space> ::= [ \t\r\n\f\v]+
<space> ::= [ \t\r\n\f\v]*
*/

gtid_set *result_gtids_;
Expand Down Expand Up @@ -252,10 +252,8 @@ class gtid_set_parser {
parse_optionally_tagged_intervals(remainder);
}

// <space> ::= [ \t\r\n\f\v]+
// <space> ::= [ \t\r\n\f\v]*
static void parse_space(std::string_view &remainder) {
util::parse_character_predicate(remainder, space_predicate);

char character{};
while (util::parse_character_predicate_ex(remainder, space_predicate,
character)) {
Expand Down
56 changes: 56 additions & 0 deletions tests/gtid_set_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,3 +665,59 @@ BOOST_AUTO_TEST_CASE(GtidSetStreamOperatorMixed) {
boost::lexical_cast<binsrv::gtids::gtid_set>(gtids_str)};
BOOST_CHECK_EQUAL(gtids, restored_gtids);
}

BOOST_AUTO_TEST_CASE(GtidSetWhitespaces) {
const binsrv::gtids::uuid first_uuid{first_uuid_sv};
const binsrv::gtids::uuid second_uuid{second_uuid_sv};

const binsrv::gtids::tag first_tag{first_tag_sv};
const binsrv::gtids::tag second_tag{second_tag_sv};

binsrv::gtids::gtid_set gtids{};
// NOLINTBEGIN(cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers)
gtids += binsrv::gtids::gtid{first_uuid, 101ULL};
gtids += binsrv::gtids::gtid{first_uuid, 102ULL};
gtids += binsrv::gtids::gtid{first_uuid, 103ULL};
gtids += binsrv::gtids::gtid{first_uuid, 105ULL};

gtids += binsrv::gtids::gtid{first_uuid, first_tag, 111ULL};
gtids += binsrv::gtids::gtid{first_uuid, first_tag, 112ULL};
gtids += binsrv::gtids::gtid{first_uuid, first_tag, 113ULL};
gtids += binsrv::gtids::gtid{first_uuid, first_tag, 115ULL};

gtids += binsrv::gtids::gtid{first_uuid, second_tag, 121ULL};
gtids += binsrv::gtids::gtid{first_uuid, second_tag, 122ULL};
gtids += binsrv::gtids::gtid{first_uuid, second_tag, 123ULL};
gtids += binsrv::gtids::gtid{first_uuid, second_tag, 125ULL};

gtids += binsrv::gtids::gtid{second_uuid, 201ULL};
gtids += binsrv::gtids::gtid{second_uuid, 202ULL};
gtids += binsrv::gtids::gtid{second_uuid, 203ULL};
gtids += binsrv::gtids::gtid{second_uuid, 205ULL};

gtids += binsrv::gtids::gtid{second_uuid, first_tag, 211ULL};
gtids += binsrv::gtids::gtid{second_uuid, first_tag, 212ULL};
gtids += binsrv::gtids::gtid{second_uuid, first_tag, 213ULL};
gtids += binsrv::gtids::gtid{second_uuid, first_tag, 215ULL};

gtids += binsrv::gtids::gtid{second_uuid, second_tag, 221ULL};
gtids += binsrv::gtids::gtid{second_uuid, second_tag, 222ULL};
gtids += binsrv::gtids::gtid{second_uuid, second_tag, 223ULL};
gtids += binsrv::gtids::gtid{second_uuid, second_tag, 225ULL};
// NOLINTEND(cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers)

auto gtids_str{boost::lexical_cast<std::string>(gtids)};
// erasing all space characters from the GTIDs string

// looks like a misconfiguration in clang-tyidy-19 that doesn't know that
// std::erase() for std::string is located in the <string> system header

// TODO: re-check this when switching to clang-20

// NOLINTNEXTLINE(misc-include-cleaner)
std::erase(gtids_str, ' ');
BOOST_CHECK(gtids_str.find(' ') == std::string::npos);
const auto restored_gtids{
boost::lexical_cast<binsrv::gtids::gtid_set>(gtids_str)};
BOOST_CHECK_EQUAL(gtids, restored_gtids);
}
Loading