MDEV-4682 - Include statistic fields to query cache and qc_info

config.h.cmake

@@ -591,6 +591,12 @@
 #define HAVE_QUERY_CACHE 1
 #define BIG_TABLES 1
 
+/* 
+  Query cache stats, should be used with qc_info plugin (MDEV-4682)
+  Should be turned off by default?
+*/
+#define HAVE_QUERY_CACHE_STATS 1
+
 /*
   Important storage engines (those that really need define 
   WITH_<ENGINE>_STORAGE_ENGINE for the whole server)

mysql-test/suite/plugins/r/qc_info.result

@@ -1,18 +1,28 @@
 set global query_cache_size=1355776;
-create table t1 (a int not null);
+create table t1 (a int not null) engine=myisam;
 insert into t1 values (1),(2),(3);
 select * from t1;
 a
 1
 2
 3
-select statement_schema, statement_text, result_blocks_count, result_blocks_size from information_schema.query_cache_info;
+select statement_schema, statement_text, result_blocks_count, result_blocks_size from information_schema.query_cache_queries;
 statement_schema	statement_text	result_blocks_count	result_blocks_size
 test	select * from t1	1	512
+select `schema`,`table` from information_schema.query_cache_queries_tables;
+schema	table
+test	t1
+select `table_schema`,`table_name` from information_schema.query_cache_tables;
+table_schema	table_name
+test	t1
 drop table t1;
-select statement_schema, statement_text, result_blocks_count, result_blocks_size from information_schema.query_cache_info;
+select statement_schema, statement_text, result_blocks_count, result_blocks_size from information_schema.query_cache_queries;
 statement_schema	statement_text	result_blocks_count	result_blocks_size
 set global query_cache_size = 0;
-select * from information_schema.query_cache_info;
-STATEMENT_SCHEMA	STATEMENT_TEXT	RESULT_BLOCKS_COUNT	RESULT_BLOCKS_SIZE	RESULT_BLOCKS_SIZE_USED
+select * from information_schema.query_cache_queries;
+QUERY_CACHE_ID	STATEMENT_SCHEMA	STATEMENT_TEXT	RESULT_FOUND_ROWS	QUERY_ROWS	SELECT_ROWS_READ	QUERY_HITS	QUERY_HITS_PERIOD_LOW	QUERY_HITS_PERIOD_HIGH	QUERY_HITS_PERIOD_OUTLIERS	QUERY_HITS_TOTAL_TIME_US	QUERY_HITS_MEAN_PERIOD_US	QUERY_HITS_MEAN_PERIOD_LOW_US	QUERY_HITS_MEAN_PERIOD_HIGH_US	QUERY_INSERT_TIME	QUERY_LAST_HIT_TIME	SELECT_EXPEND_TIME_US	SELECT_LOCK_TIME_US	TABLES_TYPE	RESULT_LENGTH	RESULT_BLOCKS_COUNT	RESULT_BLOCKS_SIZE	RESULT_BLOCKS_SIZE_USED	FLAGS_CLIENT_LONG_FLAG	FLAGS_CLIENT_PROTOCOL_41	FLAGS_PROTOCOL_TYPE	FLAGS_MORE_RESULTS_EXISTS	FLAGS_IN_TRANS	FLAGS_AUTOCOMMIT	FLAGS_PKT_NR	FLAGS_CHARACTER_SET_CLIENT	FLAGS_CHARACTER_SET_RESULTS	FLAGS_COLLATION_CONNECTION	FLAGS_LIMIT	FLAGS_TIME_ZONE	FLAGS_SQL_MODE	FLAGS_MAX_SORT_LENGTH	FLAGS_GROUP_CONCAT_MAX_LEN	FLAGS_DIV_PRECISION_INCREMENT	FLAGS_DEFAULT_WEEK_FORMAT	FLAGS_LC_TIME_NAMES
+select * from information_schema.query_cache_queries_tables;
+QUERY_CACHE_ID	SCHEMA	TABLE
+select * from information_schema.query_cache_tables;
+TABLE_SCHEMA	TABLE_NAME	TABLE_HASHED	TABLE_TYPE	QUERIES_IN_CACHE
 set global query_cache_size= default;

mysql-test/suite/plugins/r/qc_info_priv.result

@@ -1,21 +1,27 @@
 set global query_cache_size=1355776;
-create table t1 (a int not null);
+create table t1 (a int not null) engine=myisam;
 insert into t1 values (1),(2),(3);
 select * from t1;
 a
 1
 2
 3
-select statement_schema, statement_text, result_blocks_count, result_blocks_size from information_schema.query_cache_info;
+select statement_schema, statement_text, result_blocks_count, result_blocks_size from information_schema.query_cache_queries;
 statement_schema	statement_text	result_blocks_count	result_blocks_size
 test	select * from t1	1	512
+select `schema`,`table` from information_schema.query_cache_queries_tables;
+schema	table
+test	t1
+select `table_schema`,`table_name` from information_schema.query_cache_tables;
+table_schema	table_name
+test	t1
 create user mysqltest;
 select a from t1;
 a
 1
 2
 3
-select count(*) from information_schema.query_cache_info;
+select count(*) from information_schema.query_cache_queries;
 count(*)
 0
 drop user mysqltest;

mysql-test/suite/plugins/t/qc_info.test

@@ -2,10 +2,12 @@
 
 drop table t1;
 # the query was invalidated
-select statement_schema, statement_text, result_blocks_count, result_blocks_size from information_schema.query_cache_info;
+select statement_schema, statement_text, result_blocks_count, result_blocks_size from information_schema.query_cache_queries;
 
 set global query_cache_size = 0;
-select * from information_schema.query_cache_info;
+select * from information_schema.query_cache_queries;
+select * from information_schema.query_cache_queries_tables;
+select * from information_schema.query_cache_tables;
 
 set global query_cache_size= default;
 

mysql-test/suite/plugins/t/qc_info_init.inc

@@ -1,12 +1,22 @@
-if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'query_cache_info' and plugin_status='active'`)
+if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'query_cache_queries' and plugin_status='active'`)
 {
-  --skip QUERY_CACHE_INFO plugin is not active
+  --skip QUERY_CACHE_QUERIES plugin is not active
+}
+if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'query_cache_queries_tables' and plugin_status='active'`)
+{
+  --skip QUERY_CACHE_QUERIES_TABLES plugin is not active
+}
+if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'query_cache_tables' and plugin_status='active'`)
+{
+  --skip QUERY_CACHE_TABLES plugin is not active
 }
 
 set global query_cache_size=1355776;
 
-create table t1 (a int not null);
+create table t1 (a int not null) engine=myisam;
 insert into t1 values (1),(2),(3);
 select * from t1;
-select statement_schema, statement_text, result_blocks_count, result_blocks_size from information_schema.query_cache_info;
+select statement_schema, statement_text, result_blocks_count, result_blocks_size from information_schema.query_cache_queries;
+select `schema`,`table` from information_schema.query_cache_queries_tables;
+select `table_schema`,`table_name` from information_schema.query_cache_tables;
 

mysql-test/suite/plugins/t/qc_info_init.opt

@@ -1,2 +1,4 @@
---loose-query_cache_info
+--loose-query_cache_queries
+--loose-query_cache_queries_tables
+--loose-query_cache_tables
 --plugin-load-add=$QUERY_CACHE_INFO_SO

mysql-test/suite/plugins/t/qc_info_priv.test

@@ -6,7 +6,7 @@ create user mysqltest;
 connect (conn1,localhost,mysqltest,,);
 connection conn1;
 select a from t1;
-select count(*) from information_schema.query_cache_info;
+select count(*) from information_schema.query_cache_queries;
 connection default;
 drop user mysqltest;
 drop table t1;