hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2264: Add support for ALTER TABLE RENAME

Browse Source 
This adds preliminary support for renaming tables. There is still a
problem where the table version will always be set to 1 on a rename. This
should not be done and the version should be set to the largest value that
ever was for that table.
This commit is contained in:
Markus Mäkelä
2019-09-30 08:03:52 +03:00
parent a444484310
commit 2eb6a25534
3 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/modules/routing/avrorouter/avro_rbr.cc
View File

@ -841,6 +841,27 @@ bool Rpl::save_and_replace_table_create(STableCreateEvent created)
return m_handler->create_table(created);
}
bool Rpl::rename_table_create(STableCreateEvent created, const std::string& old_id)
{
auto it = m_created_tables.find(old_id);
if (it != m_created_tables.end())
{
auto tm_it = m_table_maps.find(old_id);
if (tm_it != m_table_maps.end())
{
m_active_maps.erase(tm_it->second->id);
m_table_maps.erase(tm_it);
}
}
m_created_tables.erase(old_id);
m_created_tables[created->id()] = created;
mxb_assert(created->columns.size() > 0);
return m_handler->create_table(created);
}
void unify_whitespace(char* sql, int len)
{
for (int i = 0; i < len; i++)

32
server/modules/routing/avrorouter/rpl.cc
View File

@ -1381,6 +1381,38 @@ bool Rpl::table_create_alter(STableCreateEvent create, const char* sql, const ch
}
}
tok = get_next_def(tok, end);
len = 0;
}
else if (tok_eq(ptok, "rename", plen))
{
if (tok_eq(tok, "to", len))
{
// Skip the optional TO keyword
tok = get_tok(tok + len, &len, end);
}
char new_name[len + 1];
make_avro_token(new_name, tok, len);
auto old_id = create->id();
if (char* p = strchr(new_name, '.'))
{
*p++ = '\0';
create->database = new_name;
create->table = p;
}
else
{
create->table = new_name;
}
create->version = 1;
create->was_used = false;
rename_table_create(create, old_id);
tok = get_next_def(tok, end);
len = 0;
}

1
server/modules/routing/avrorouter/rpl.hh
View File

@ -290,6 +290,7 @@ private:
bool handle_row_event(REP_HEADER* hdr, uint8_t* ptr);
STableCreateEvent table_create_copy(const char* sql, size_t len, const char* db);
bool save_and_replace_table_create(STableCreateEvent created);
bool rename_table_create(STableCreateEvent created, const std::string& old_id);
bool table_create_alter(STableCreateEvent create, const char* sql, const char* end);
bool table_matches(const std::string& ident);
};