--- qc_info.old.cc 2013-05-25 04:17:46.360703435 -0300 +++ qc_info.cc 2013-05-25 04:14:47.700688573 -0300 @@ -55,18 +55,58 @@ #define MAX_STATEMENT_TEXT_LENGTH 32767 #define COLUMN_STATEMENT_SCHEMA 0 #define COLUMN_STATEMENT_TEXT 1 -#define COLUMN_RESULT_BLOCKS_COUNT 2 -#define COLUMN_RESULT_BLOCKS_SIZE 3 -#define COLUMN_RESULT_BLOCKS_SIZE_USED 4 +#define COLUMN_RESULT_FOUND_ROWS 2 +#define COLUMN_RESULT_BLOCKS_COUNT 3 +#define COLUMN_RESULT_BLOCKS_SIZE 4 +#define COLUMN_RESULT_BLOCKS_SIZE_USED 5 +#define COLUMN_FLAGS_CLIENT_LONG_FLAG 6 +#define COLUMN_FLAGS_CLIENT_PROTOCOL_41 7 +#define COLUMN_FLAGS_PROTOCOL_TYPE 8 +#define COLUMN_FLAGS_MORE_RESULTS_EXISTS 9 +#define COLUMN_FLAGS_IN_TRANS 10 +#define COLUMN_FLAGS_AUTOCOMMIT 11 +#define COLUMN_FLAGS_PKT_NR 12 +#define COLUMN_FLAGS_CHARACTER_SET_CLIENT_NUM 13 +#define COLUMN_FLAGS_CHARACTER_SET_RESULTS_NUM 14 +#define COLUMN_FLAGS_COLLATION_CONNECTION_NUM 15 +#define COLUMN_FLAGS_LIMIT 16 +/*#define COLUMN_FLAGS_TIME_ZONE 17*/ +#define COLUMN_FLAGS_SQL_MODE 17 +#define COLUMN_FLAGS_MAX_SORT_LENGTH 18 +#define COLUMN_FLAGS_GROUP_CONCAT_MAX_LEN 19 +#define COLUMN_FLAGS_DIV_PRECISION_INCREMENT 20 +#define COLUMN_FLAGS_DEFAULT_WEEK_FORMAT 21 +/*#define COLUMN_FLAGS_LC_TIME_NAMES 22*/ /* ST_FIELD_INFO is defined in table.h */ static ST_FIELD_INFO qc_info_fields[]= { {"STATEMENT_SCHEMA", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, 0, 0}, {"STATEMENT_TEXT", MAX_STATEMENT_TEXT_LENGTH, MYSQL_TYPE_STRING, 0, 0, 0, 0}, + {"RESULT_FOUND_ROWS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0, 0, 0, 0}, {"RESULT_BLOCKS_COUNT", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, - {"RESULT_BLOCKS_SIZE", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0, 0, 0, 0}, - {"RESULT_BLOCKS_SIZE_USED", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0, 0, 0, 0}, + {"RESULT_BLOCKS_SIZE", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0, 0, 0, 0}, + {"RESULT_BLOCKS_SIZE_USED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0, 0, 0, 0}, + + {"FLAGS_CLIENT_LONG_FLAG", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, + {"FLAGS_CLIENT_PROTOCOL_41", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, + {"FLAGS_PROTOCOL_TYPE", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, + {"FLAGS_MORE_RESULTS_EXISTS", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, + {"FLAGS_IN_TRANS", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, + {"FLAGS_AUTOCOMMIT", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, + {"FLAGS_PKT_NR", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, + {"FLAGS_CHARACTER_SET_CLIENT_NUM", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, + {"FLAGS_CHARACTER_SET_RESULTS_NUM", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, + {"FLAGS_COLLATION_CONNECTION_NUM", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, + {"FLAGS_LIMIT", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, +/* {"FLAGS_TIME_ZONE", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, */ + {"FLAGS_SQL_MODE", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0, 0, 0, 0}, + {"FLAGS_MAX_SORT_LENGTH", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, + {"FLAGS_GROUP_CONCAT_MAX_LEN", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, + {"FLAGS_DIV_PRECISION_INCREMENT", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, + {"FLAGS_DEFAULT_WEEK_FORMAT", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, +/* {"FLAGS_LC_TIME_NAMES", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, 0, 0}, */ + {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, 0} }; @@ -82,9 +122,12 @@ if (check_global_access(thd, PROCESS_ACL, true)) return 0; + if (qc->query_cache_size==0 || thd->variables.query_cache_type==0) + return 0; + if (qc->try_lock(thd)) return status; - + /* loop through all queries in the query cache */ for (uint i= 0; i < queries->records; i++) { @@ -98,8 +141,9 @@ Query_cache_block *result_block; const char *statement_text; size_t statement_text_length; - const char *key, *db; + char *key, *db; size_t key_length, db_length; + Query_cache_query_flags flags; query_cache_block_raw = my_hash_element(queries, i); query_cache_block = (Query_cache_block*)query_cache_block_raw; @@ -108,6 +152,11 @@ query_cache_query = query_cache_block->query(); + + /* rows */ + table->field[COLUMN_RESULT_FOUND_ROWS]->store(query_cache_query->found_rows(), 0); + + /* Key is query + database + flag */ /* Get the actual SQL statement for this query cache query */ statement_text = (const char*)query_cache_query->query(); statement_text_length = strlen(statement_text); @@ -116,8 +165,32 @@ min(statement_text_length, MAX_STATEMENT_TEXT_LENGTH), scs); /* get the entire key that identifies this query cache query */ - key = (const char*)query_cache_query_get_key(query_cache_block_raw, + key = (char*)query_cache_query_get_key(query_cache_block_raw, &key_length, 0); + + /* Flags */ + key_length-= QUERY_CACHE_FLAGS_SIZE; // Point at flags + memcpy( &flags, key+key_length, QUERY_CACHE_FLAGS_SIZE); + table->field[COLUMN_FLAGS_CLIENT_LONG_FLAG]->store(flags.client_long_flag, 0); + table->field[COLUMN_FLAGS_CLIENT_PROTOCOL_41]->store(flags.client_protocol_41, 0); + table->field[COLUMN_FLAGS_PROTOCOL_TYPE]->store(flags.protocol_type, 0); + table->field[COLUMN_FLAGS_MORE_RESULTS_EXISTS]->store(flags.more_results_exists, 0); + table->field[COLUMN_FLAGS_IN_TRANS]->store(flags.in_trans, 0); + table->field[COLUMN_FLAGS_AUTOCOMMIT]->store(flags.autocommit, 0); + table->field[COLUMN_FLAGS_PKT_NR]->store(flags.pkt_nr, 0); + table->field[COLUMN_FLAGS_CHARACTER_SET_CLIENT_NUM]->store(flags.character_set_client_num, 0); + table->field[COLUMN_FLAGS_CHARACTER_SET_RESULTS_NUM]->store(flags.character_set_results_num, 0); + table->field[COLUMN_FLAGS_COLLATION_CONNECTION_NUM]->store(flags.collation_connection_num, 0); + table->field[COLUMN_FLAGS_LIMIT]->store(flags.limit, 0); +/* table->field[COLUMN_FLAGS_TIME_ZONE]->store(flags.time_zone, 0);*/ + table->field[COLUMN_FLAGS_SQL_MODE]->store(flags.sql_mode, 0); + table->field[COLUMN_FLAGS_MAX_SORT_LENGTH]->store(flags.max_sort_length, 0); + table->field[COLUMN_FLAGS_GROUP_CONCAT_MAX_LEN]->store(flags.group_concat_max_len, 0); + table->field[COLUMN_FLAGS_DIV_PRECISION_INCREMENT]->store(flags.div_precision_increment, 0); + table->field[COLUMN_FLAGS_DEFAULT_WEEK_FORMAT]->store(flags.default_week_format, 0); +/* table->field[COLUMN_FLAGS_LC_TIME_NAMES]->store(flags.lc_time_names, 0);*/ + memcpy(key + key_length, &flags, QUERY_CACHE_FLAGS_SIZE); // restore flags + /* The database against which the statement is executed is part of the query cache query key */ @@ -154,6 +227,8 @@ result_blocks_size = 0; result_blocks_size_used = 0; } + + table->field[COLUMN_RESULT_BLOCKS_COUNT]->store(result_blocks_count, 0); table->field[COLUMN_RESULT_BLOCKS_SIZE]->store(result_blocks_size, 0); table->field[COLUMN_RESULT_BLOCKS_SIZE_USED]->store(result_blocks_size_used, 0);