Skip to content

MDEV-6631 / MDEV-7132 #7

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

Closed
rspadim wants to merge 5 commits into from
Closed

MDEV-6631 / MDEV-7132 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a5f8ce9
Only check query cache queries with SQL_CACHE when using DEMAND query…
Sep 22, 2014
612621c
Remove last parameter from has_cache function
Sep 22, 2014
e4f8c14
check SQL_CACHE when using query_cache_type=DEMAND_PRUNE
Sep 24, 2014
d02181f
Instead of DEMAND_PRUNE, leave DEMAND as default, and create a DEMAND…
Sep 27, 2014
b9fa878
Better explain what DEMAND_NO_PRUNE do
Sep 27, 2014
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
2 changes: 1 addition & 1 deletion sql/share/errmsg-utf8.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6231,7 +6231,7 @@ ER_SLAVE_IGNORE_SERVER_IDS
eng "The requested server id %d clashes with the slave startup option --replicate-same-server-id"
ger "Die angeforderte Server-ID %d steht im Konflikt mit der Startoption --replicate-same-server-id für den Slave"
ER_QUERY_CACHE_DISABLED
eng "Query cache is disabled; set query_cache_type to ON or DEMAND to enable it"
eng "Query cache is disabled; set query_cache_type to ON or DEMAND or DEMAND_NO_PRUNE to enable it"
ER_SAME_NAME_PARTITION_FIELD
eng "Duplicate partition field name '%-.192s'"
ger "Partitionsfeld '%-.192s' ist ein Duplikat"
Expand Down
63 changes: 54 additions & 9 deletions sql/sql_cache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,36 @@ void Query_cache::unlock(void)
DBUG_VOID_RETURN;
}

/**
Helper function for determine if a SELECT statement has a SQL_CACHE
directive.

@param sql A pointer to the first white space character after SELECT

@return
@retval TRUE The character string contains SQL_CACHE
@retval FALSE No directive found.
*/

static bool has_cache_directive(const char *sql)
{
while (is_white_space(*sql))
sql++;

if (my_toupper(system_charset_info, sql[0]) == 'S' &&
my_toupper(system_charset_info, sql[1]) == 'Q' &&
my_toupper(system_charset_info, sql[2]) == 'L' &&
my_toupper(system_charset_info, sql[3]) == '_' &&
my_toupper(system_charset_info, sql[4]) == 'C' &&
my_toupper(system_charset_info, sql[5]) == 'A' &&
my_toupper(system_charset_info, sql[6]) == 'C' &&
my_toupper(system_charset_info, sql[7]) == 'H' &&
my_toupper(system_charset_info, sql[8]) == 'E' &&
my_isspace(system_charset_info, sql[9]))
return TRUE;

return FALSE;
}

/**
Helper function for determine if a SELECT statement has a SQL_NO_CACHE
Expand Down Expand Up @@ -1817,14 +1847,28 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length)
goto err;
}

if ((sql_end - sql) > 20 && has_no_cache_directive(sql+6))
if ((sql_end - sql) > 20)
{
/*
We do not increase 'refused' statistics here since it will be done
later when the query is parsed.
*/
DBUG_PRINT("qcache", ("The statement has a SQL_NO_CACHE directive"));
goto err;
if (has_no_cache_directive(sql+6))
{
/*
We do not increase 'refused' statistics here since it will be done
later when the query is parsed.
*/
DBUG_PRINT("qcache", ("The statement has a SQL_NO_CACHE directive"));
goto err;
}
/* DEMAND, use DEMAND_NO_PUNE to avoid this check */
if (thd->variables.query_cache_type==2 && !has_cache_directive(sql+6))
{
/*
We do not increase 'refused' statistics here since it will be done
later when the query is parsed.
*/
DBUG_PRINT("qcache",
("The statement don't have a SQL_CACHE directive when query_cache_type=DEMAND"));
goto err;
}

@rspadim rspadim Sep 4, 2015

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check that query_cache_type==3 (demand_no_prune) execute the old query_cache_type==2 code

}
{
/*
Expand Down Expand Up @@ -4083,8 +4127,9 @@ Query_cache::is_cacheable(THD *thd, LEX *lex,

if (thd->lex->safe_to_cache_query &&
(thd->variables.query_cache_type == 1 ||
(thd->variables.query_cache_type == 2 && (lex->select_lex.options &
OPTION_TO_QUERY_CACHE))) &&
((thd->variables.query_cache_type == 2 || /* DEMAND */
thd->variables.query_cache_type == 3) && /* DEMAND_NO_PRUNE */
(lex->select_lex.options & OPTION_TO_QUERY_CACHE))) &&
qc_is_able_to_intercept_result(thd))
{
DBUG_PRINT("qcache", ("options: %lx %lx type: %u",
Expand Down
5 changes: 3 additions & 2 deletions sql/sys_vars.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2600,7 +2600,7 @@ static Sys_var_ulong Sys_query_cache_min_res_unit(
BLOCK_SIZE(8), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_qcache_min_res_unit));

static const char *query_cache_type_names[]= { "OFF", "ON", "DEMAND", 0 };
static const char *query_cache_type_names[]= { "OFF", "ON", "DEMAND", "DEMAND_NO_PRUNE", 0 };
static bool check_query_cache_type(sys_var *self, THD *thd, set_var *var)
{
if (query_cache.is_disable_in_progress())
Expand Down Expand Up @@ -2639,7 +2639,8 @@ static Sys_var_enum Sys_query_cache_type(
"query_cache_type",
"OFF = Don't cache or retrieve results. ON = Cache all results "
"except SELECT SQL_NO_CACHE ... queries. DEMAND = Cache only "
"SELECT SQL_CACHE ... queries",
"SELECT SQL_CACHE ... queries. DEMAND_NO_PRUNE = DEMAND , but allow "
"fetch query from cache previous inserted without SQL_CACHE",
SESSION_VAR(query_cache_type), CMD_LINE(REQUIRED_ARG),
query_cache_type_names, DEFAULT(1), NO_MUTEX_GUARD, NOT_IN_BINLOG,
ON_CHECK(check_query_cache_type),
Expand Down