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

Replace session command implementation

Browse Source 
The schemarouter now uses the new session commands. It uses a standard
library container to manage the execution and storage of session commands.

The session command history is disabled until a more complete refactoring
can be done.
This commit is contained in:
Markus Mäkelä
2017-03-26 11:42:33 +03:00
parent 1ba399a62a
commit bda0fd2db0
4 changed files with 149 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/modules/routing/schemarouter/session_command.cc
View File

@ -13,6 +13,7 @@
#include "session_command.hh"
#include <maxscale/modutil.h>
#include <maxscale/protocol/mysql.h>
void SessionCommand::mark_reply_received()
{
@ -24,15 +25,31 @@ bool SessionCommand::is_reply_received() const
return m_replySent;
}
uint8_t SessionCommand::get_command() const
{
return m_command;
}
uint64_t SessionCommand::get_position() const
{
return m_pos;
}
Buffer SessionCommand::copy_buffer() const
{
return m_buffer;
}
SessionCommand::SessionCommand(GWBUF *buffer):
SessionCommand::SessionCommand(GWBUF *buffer, uint64_t id):
m_buffer(buffer),
m_command(0),
m_pos(id),
m_replySent(false)
{
if (buffer)
{
gwbuf_copy_data(buffer, MYSQL_HEADER_LEN, 1, &m_command);
}
}
SessionCommand::~SessionCommand()
@ -42,15 +59,18 @@ SessionCommand::~SessionCommand()
std::string SessionCommand::to_string()
{
std::string str;
GWBUF **buf = &m_buffer;
char *sql;
int sql_len;
if (modutil_extract_SQL(*buf, &sql, &sql_len))
/** TODO: Create C++ versions of modutil functions */
GWBUF *buf = m_buffer.release();
if (modutil_extract_SQL(buf, &sql, &sql_len))
{
str.append(sql, sql_len);
}
m_buffer.reset(buf);
return str;
}