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

Regex accept WITH CONSISTENT SNAPSHOT

Browse Source
This commit is contained in:
Johan Wikman
2017-03-11 18:03:33 +02:00
parent 212be78ece
commit f8a0ca25a4
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/core/trxboundarymatcher.cc
View File

@ -40,15 +40,23 @@ REGEX_DATA this_unit_regexes[] =
QUERY_TYPE_ROLLBACK QUERY_TYPE_ROLLBACK
}, },
{ {
"^\\s*START\\s+TRANSACTION\\s+READ\\s+ONLY\\s*;?\\s*$", "^\\s*START\\s+TRANSACTION\\s+("
"READ\\s+ONLY|"
"READ\\s+ONLY\\s*,\\s*WITH\\s+CONSISTENT\\s+SNAPSHOT|"
"WITH\\s+CONSISTENT\\s+SNAPSHOT\\s*,\\s*READ\\s+ONLY"
")\\s*;?\\s*$",
QUERY_TYPE_BEGIN_TRX | QUERY_TYPE_READ QUERY_TYPE_BEGIN_TRX | QUERY_TYPE_READ
}, },
{ {
"^\\s*START\\s+TRANSACTION\\s+READ\\s+WRITE\\s*;?\\s*$", "^\\s*START\\s+TRANSACTION\\s+("
"READ\\s+WRITE|"
"READ\\s+WRITE\\s*,\\s*WITH\\s+CONSISTENT\\s+SNAPSHOT|"
"WITH\\s+CONSISTENT\\s+SNAPSHOT\\s*,\\s*READ\\s+WRITE"
")\\s*;?\\s*$",
QUERY_TYPE_BEGIN_TRX | QUERY_TYPE_WRITE QUERY_TYPE_BEGIN_TRX | QUERY_TYPE_WRITE
}, },
{ {
"^\\s*START\\s+TRANSACTION(\\s*;?\\s*|(\\s+.*))$", "^\\s*START\\s+TRANSACTION(\\s+WITH\\s+CONSISTENT\\s+SNAPSHOT)?\\s*;?\\s*$",
QUERY_TYPE_BEGIN_TRX QUERY_TYPE_BEGIN_TRX
}, },
{ {
@ -93,8 +101,8 @@ void log_pcre2_error(const char* zMatch, int errcode, int erroffset)
PCRE2_UCHAR errbuf[512]; PCRE2_UCHAR errbuf[512];
pcre2_get_error_message(errcode, errbuf, sizeof(errbuf)); pcre2_get_error_message(errcode, errbuf, sizeof(errbuf));
MXS_ERROR("Regex compilation failed at %d for regex '%s': %s.", MXS_ERROR("Regex compilation failed at %d for regex '%s', i.e. '%s': %s.",
erroffset, zMatch, errbuf); erroffset, zMatch, zMatch + erroffset, errbuf);
} }
bool compile_regexes() bool compile_regexes()