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

MXS-1340 is_sequence_related... functions moved to QcSqliteInfo

Browse Source
This commit is contained in:
Johan Wikman
2017-08-03 11:24:50 +03:00
parent c29e8b2b9e
commit a438ff7c86
1 changed files with 81 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
query_classifier/qc_sqlite/qc_sqlite.cc
View File

@ -11,6 +11,11 @@
* Public License. * Public License.
*/ */
// NOTE: qc_sqlite used to be C. So as to be able to use STL collections,
// NOTE: it has been ported to C++. However, the porting is only partial,
// NOTE: which is the reason why there is a mix of C-style and C++-style
// NOTE: approaches.
#define MXS_MODULE_NAME "qc_sqlite" #define MXS_MODULE_NAME "qc_sqlite"
#include <sqliteInt.h> #include <sqliteInt.h>
@ -153,11 +158,6 @@ typedef enum qc_token_position
static void buffer_object_free(void* data); static void buffer_object_free(void* data);
static void enlarge_string_array(size_t n, size_t len, char*** ppzStrings, size_t* pCapacity); static void enlarge_string_array(size_t n, size_t len, char*** ppzStrings, size_t* pCapacity);
static bool ensure_query_is_parsed(GWBUF* query, uint32_t collect); static bool ensure_query_is_parsed(GWBUF* query, uint32_t collect);
static bool is_sequence_related_field(QcSqliteInfo* info,
const char* database,
const char* table,
const char* column);
static bool is_sequence_related_function(QcSqliteInfo* info, const char* func_name);
static void log_invalid_data(GWBUF* query, const char* message); static void log_invalid_data(GWBUF* query, const char* message);
static const char* map_function_name(QC_NAME_MAPPING* function_name_mappings, const char* name); static const char* map_function_name(QC_NAME_MAPPING* function_name_mappings, const char* name);
static bool parse_query(GWBUF* query, uint32_t collect); static bool parse_query(GWBUF* query, uint32_t collect);
@ -454,15 +454,67 @@ public:
} }
// PUBLIC for now at least. // PUBLIC for now at least.
void update_field_info(const char* database,
const char* table, /**
const char* column, * Returns whether a field is sequence related.
*
* @param zDatabase The database/schema or NULL.
* @param zTable The table or NULL.
* @param zColumn The column.
*
* @return True, if the field is sequence related, false otherwise.
*/
bool is_sequence_related_field(const char* zDatabase,
const char* zTable,
const char* zColumn) const
{
return is_sequence_related_function(zColumn);
}
/**
* Returns whether a function is sequence related.
*
* @param zFunc_name A function name.
*
* @return True, if the function is sequence related, false otherwise.
*/
bool is_sequence_related_function(const char* zFunc_name) const
{
bool rv = false;
if (m_sql_mode == QC_SQL_MODE_ORACLE)
{
// In Oracle mode we ignore the pseudocolumns "currval" and "nextval".
// We also exclude "lastval", the 10.3 equivalent of "currval".
if ((strcasecmp(zFunc_name, "currval") == 0) ||
(strcasecmp(zFunc_name, "nextval") == 0) ||
(strcasecmp(zFunc_name, "lastval") == 0))
{
rv = true;
}
}
if (!rv && (this_unit.parse_as == QC_PARSE_AS_103))
{
if ((strcasecmp(zFunc_name, "lastval") == 0) ||
(strcasecmp(zFunc_name, "nextval") == 0))
{
rv = true;
}
}
return rv;
}
void update_field_info(const char* zDatabase,
const char* zTable,
const char* zColumn,
uint32_t usage, uint32_t usage,
const ExprList* pExclude) const ExprList* pExclude)
{ {
ss_dassert(column); ss_dassert(zColumn);
if (is_sequence_related_field(this, database, table, column)) if (is_sequence_related_field(zDatabase, zTable, zColumn))
{ {
m_type_mask |= QUERY_TYPE_WRITE; m_type_mask |= QUERY_TYPE_WRITE;
return; return;
@ -475,29 +527,29 @@ public:
return; return;
} }
QC_FIELD_INFO item = { (char*)database, (char*)table, (char*)column, usage }; QC_FIELD_INFO item = { (char*)zDatabase, (char*)zTable, (char*)zColumn, usage };
size_t i; size_t i;
for (i = 0; i < m_field_infos_len; ++i) for (i = 0; i < m_field_infos_len; ++i)
{ {
QC_FIELD_INFO* field_info = m_pField_infos + i; QC_FIELD_INFO* pField_info = m_pField_infos + i;
if (strcasecmp(item.column, field_info->column) == 0) if (strcasecmp(item.column, pField_info->column) == 0)
{ {
if (!item.table && !field_info->table) if (!item.table && !pField_info->table)
{ {
ss_dassert(!item.database && !field_info->database); ss_dassert(!item.database && !pField_info->database);
break; break;
} }
else if (item.table && field_info->table && (strcmp(item.table, field_info->table) == 0)) else if (item.table && pField_info->table && (strcmp(item.table, pField_info->table) == 0))
{ {
if (!item.database && !field_info->database) if (!item.database && !pField_info->database)
{ {
break; break;
} }
else if (item.database && else if (item.database &&
field_info->database && pField_info->database &&
(strcmp(item.database, field_info->database) == 0)) (strcmp(item.database, pField_info->database) == 0))
{ {
break; break;
} }
@ -505,7 +557,7 @@ public:
} }
} }
QC_FIELD_INFO* field_infos = NULL; QC_FIELD_INFO* pField_infos = NULL;
if (i == m_field_infos_len) // If true, the field was not present already. if (i == m_field_infos_len) // If true, the field was not present already.
{ {
@ -513,21 +565,21 @@ public:
// have a list of expressions that should be excluded, we check if the column // have a list of expressions that should be excluded, we check if the column
// value is present in that list. This is in order to exclude the second "d" in // value is present in that list. This is in order to exclude the second "d" in
// a statement like "select a as d from x where d = 2". // a statement like "select a as d from x where d = 2".
if (!(column && !table && !database && pExclude && should_exclude(column, pExclude))) if (!(zColumn && !zTable && !zDatabase && pExclude && should_exclude(zColumn, pExclude)))
{ {
if (m_field_infos_len < m_field_infos_capacity) if (m_field_infos_len < m_field_infos_capacity)
{ {
field_infos = m_pField_infos; pField_infos = m_pField_infos;
} }
else else
{ {
size_t capacity = m_field_infos_capacity ? 2 * m_field_infos_capacity : 8; size_t capacity = m_field_infos_capacity ? 2 * m_field_infos_capacity : 8;
field_infos = (QC_FIELD_INFO*)MXS_REALLOC(m_pField_infos, pField_infos = (QC_FIELD_INFO*)MXS_REALLOC(m_pField_infos,
capacity * sizeof(QC_FIELD_INFO)); capacity * sizeof(QC_FIELD_INFO));
if (field_infos) if (pField_infos)
{ {
m_pField_infos = field_infos; m_pField_infos = pField_infos;
m_field_infos_capacity = capacity; m_field_infos_capacity = capacity;
} }
} }
@ -539,7 +591,7 @@ public:
} }
// If field_infos is NULL, then the field was found and has already been noted. // If field_infos is NULL, then the field was found and has already been noted.
if (field_infos) if (pField_infos)
{ {
item.database = item.database ? MXS_STRDUP(item.database) : NULL; item.database = item.database ? MXS_STRDUP(item.database) : NULL;
item.table = item.table ? MXS_STRDUP(item.table) : NULL; item.table = item.table ? MXS_STRDUP(item.table) : NULL;
@ -550,7 +602,7 @@ public:
if (item.column) if (item.column)
{ {
field_infos[m_field_infos_len++] = item; pField_infos[m_field_infos_len++] = item;
} }
} }
} }
@ -1176,60 +1228,6 @@ static bool query_is_parsed(GWBUF* query, uint32_t collect)
return rc; return rc;
} }
/**
* Returns whether a field is sequence related.
*
* @param info Current info object
* @param database The database/schema or NULL.
* @param table The table or NULL.
* @param column The column.
*
* @return True, if the field is sequence related, false otherwise.
*/
static bool is_sequence_related_field(QcSqliteInfo* info,
const char* database,
const char* table,
const char* column)
{
return is_sequence_related_function(info, column);
}
/**
* Returns whether a function is sequence related.
*
* @param info Current info object
* @param func_name A function name.
*
* @return True, if the function is sequence related, false otherwise.
*/
static bool is_sequence_related_function(QcSqliteInfo* info, const char* func_name)
{
bool rv = false;
if (info->m_sql_mode == QC_SQL_MODE_ORACLE)
{
// In Oracle mode we ignore the pseudocolumns "currval" and "nextval".
// We also exclude "lastval", the 10.3 equivalent of "currval".
if ((strcasecmp(func_name, "currval") == 0) ||
(strcasecmp(func_name, "nextval") == 0) ||
(strcasecmp(func_name, "lastval") == 0))
{
rv = true;
}
}
if (!rv && (this_unit.parse_as == QC_PARSE_AS_103))
{
if ((strcasecmp(func_name, "lastval") == 0) ||
(strcasecmp(func_name, "nextval") == 0))
{
rv = true;
}
}
return rv;
}
/** /**
* Logs information about invalid data. * Logs information about invalid data.
* *
@ -1717,7 +1715,7 @@ static void update_field_infos(QcSqliteInfo* info,
{ {
info->m_type_mask |= (QUERY_TYPE_READ | QUERY_TYPE_MASTER_READ); info->m_type_mask |= (QUERY_TYPE_READ | QUERY_TYPE_MASTER_READ);
} }
else if (is_sequence_related_function(info, zToken)) else if (info->is_sequence_related_function(zToken))
{ {
info->m_type_mask |= QUERY_TYPE_WRITE; info->m_type_mask |= QUERY_TYPE_WRITE;
ignore_exprlist = true; ignore_exprlist = true;