mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
This is based on the userstatv2 patch from Percona and OurDelta.
The original code comes, as far as I know, from Google (Mark Callaghan's team) with additional work from Percona, Ourdelta and Weldon Whipple. This code provides the same functionallity, but with a lot of changes to make it faster and better fit the MariaDB infrastucture. Added new status variables: - Com_show_client_statistics, Com_show_index_statistics, Com_show_table_statistics, Com_show_user_statistics - Access_denied_errors, Busy_time (clock time), Binlog_bytes_written, Cpu_time, Empty_queries, Rows_sent, Rows_read Added new variable / startup option 'userstat' to control if user statistics should be enabled or not Added my_getcputime(); Returns cpu time used by this thread. New FLUSH commands: - FLUSH SLOW QUERY LOG - FLUSH TABLE_STATISTICS - FLUSH INDEX_STATISTICS - FLUSH USER_STATISTICS - FLUSH CLIENT_STATISTICS New SHOW commands: - SHOW CLIENT_STATISTICS - SHOW USER_STATISTICS - SHOW TABLE_STATISTICS - SHOW INDEX_STATISTICS New Information schemas: - CLIENT_STATISTICS - USER_STATISTICS - INDEX_STATISTICS - TABLE_STATISTICS Added support for all new flush commands to mysqladmin Added handler::ha_... wrappers for all handler read calls to do statistics counting - Changed all code to use new ha_... calls - Count number of read rows, changed rows and rows read trough an index Added counting of number of bytes sent to binary log (status variable Binlog_bytes_written) Added counting of access denied errors (status variable Access_denied_erors) Bugs fixed: - Fixed bug in add_to_status() and add_diff_to_status() where longlong variables where threated as long - CLOCK_GETTIME was not propely working on Linuxm client/mysqladmin.cc: Added support for all new flush commmands and some common combinations: flush-slow-log flush-table-statistics flush-index-statistics flush-user-statistics flush-client-statistics flush-all-status flush-all-statistics configure.in: Added checking if clock_gettime needs the librt. (Fixes Bug #37639 clock_gettime is never used/enabled in Linux/Unix) include/my_sys.h: Added my_getcputime() include/mysql_com.h: Added LIST_PROCESS_HOST_LEN & new REFRESH target defines mysql-test/r/information_schema.result: New information schema tables added mysql-test/r/information_schema_all_engines.result: New information schema tables added mysql-test/r/information_schema_db.result: New information schema tables added mysql-test/r/log_slow.result: Added testing that flosh slow query logs is accepted mysql-test/r/status_user.result: Basic testing of user, client, table and index statistics mysql-test/t/log_slow.test: Added testing that flosh slow query logs is accepted mysql-test/t/status_user-master.opt: Ensure that we get a fresh restart before running status_user.test mysql-test/t/status_user.test: Basic testing of user, client, table and index statistics mysys/my_getsystime.c: Added my_getcputime() Returns cpu time used by this thread. sql/authors.h: Updated authors to have core and original MySQL developers first. sql/event_data_objects.cc: Updated call to mysql_reset_thd_for_next_command() sql/event_db_repository.cc: Changed to use new ha_... calls sql/filesort.cc: Changed to use new ha_... calls sql/ha_partition.cc: Changed to use new ha_... calls Fixed comment syntax sql/handler.cc: Changed to use new ha_... calls Reset table statistics Added code to update global table and index status Added counting of rows changed sql/handler.h: Added table and index statistics variables Added function reset_statistics() Added handler::ha_... wrappers for all handler read calls to do statistics counting Protected all normal read calls to ensure we use the new calls in the server. Made ha_partition a friend class so that partition code can call the old read functions sql/item_subselect.cc: Changed to use new ha_... calls sql/lex.h: Added keywords for new information schema tables and flush commands sql/log.cc: Added flush_slow_log() Added counting of number of bytes sent to binary log Removed not needed test of thd (It's used before, so it's safe to use) Added THD object to MYSQL_BIN_LOG::write_cache() to simplify statistics counting sql/log.h: Added new parameter to write_cache() Added flush_slow_log() functions. sql/log_event.cc: Updated call to mysql_reset_thd_for_next_command() Changed to use new ha_... calls sql/log_event_old.cc: Updated call to mysql_reset_thd_for_next_command() Changed to use new ha_... calls sql/mysql_priv.h: Updated call to mysql_reset_thd_for_next_command() Added new statistics functions and variables needed by these. sql/mysqld.cc: Added new statistics variables and structures to handle these Added new status variables: - Com_show_client_statistics, Com_show_index_statistics, Com_show_table_statistics, Com_show_user_statistics - Access_denied_errors, Busy_time (clock time), Binlog_bytes_written, Cpu_time, Empty_queries, Rows_set, Rows_read Added new option 'userstat' to control if user statistics should be enabled or not sql/opt_range.cc: Changed to use new ha_... calls sql/opt_range.h: Changed to use new ha_... calls sql/opt_sum.cc: Changed to use new ha_... calls sql/records.cc: Changed to use new ha_... calls sql/set_var.cc: Added variable 'userstat' sql/sp.cc: Changed to use new ha_... calls sql/sql_acl.cc: Changed to use new ha_... calls Added counting of access_denied_errors sql/sql_base.cc: Added call to statistics functions sql/sql_class.cc: Added usage of org_status_var, to store status variables at start of command Added functions THD::update_stats(), THD::update_all_stats() Fixed bug in add_to_status() and add_diff_to_status() where longlong variables where threated as long sql/sql_class.h: Added new status variables to status_var Moved variables that was not ulong in status_var last. Added variables to THD for storing temporary values during statistics counting sql/sql_connect.cc: Variables and functions to calculate user and client statistics Added counting of access_denied_errors and lost_connections sql/sql_cursor.cc: Changed to use new ha_... calls sql/sql_handler.cc: Changed to use new ha_... calls sql/sql_help.cc: Changed to use new ha_... calls sql/sql_insert.cc: Changed to use new ha_... calls sql/sql_lex.h: Added SQLCOM_SHOW_USER_STATS, SQLCOM_SHOW_TABLE_STATS, SQLCOM_SHOW_INDEX_STATS, SQLCOM_SHOW_CLIENT_STATS sql/sql_parse.cc: Added handling of: - SHOW CLIENT_STATISTICS - SHOW USER_STATISTICS - SHOW TABLE_STATISTICS - SHOW INDEX_STATISTICS Added handling of new FLUSH commands: - FLUSH SLOW QUERY LOGS - FLUSH TABLE_STATISTICS - FLUSH INDEX_STATISTICS - FLUSH USER_STATISTICS - FLUSH CLIENT_STATISTICS Added THD parameter to mysql_reset_thd_for_next_command() Added initialization and calls to user statistics functions Added increment of statistics variables empty_queries, rows_sent and access_denied_errors. Added counting of cpu time per query sql/sql_plugin.cc: Changed to use new ha_... calls sql/sql_prepare.cc: Updated call to mysql_reset_thd_for_next_command() sql/sql_select.cc: Changed to use new ha_... calls Indentation changes sql/sql_servers.cc: Changed to use new ha_... calls sql/sql_show.cc: Added counting of access denied errors Added function for new information schema tables: - CLIENT_STATISTICS - USER_STATISTICS - INDEX_STATISTICS - TABLE_STATISTICS Changed to use new ha_... calls sql/sql_table.cc: Changed to use new ha_... calls sql/sql_udf.cc: Changed to use new ha_... calls sql/sql_update.cc: Changed to use new ha_... calls sql/sql_yacc.yy: Add new show and flush commands sql/structs.h: Add name_length to KEY to avoid some strlen Added cache_name to KEY for fast storage of keyvalue in cache Added structs USER_STATS, TABLE_STATS, INDEX_STATS Added function prototypes for statistics functions sql/table.cc: Store db+table+index name into keyinfo->cache_name sql/table.h: Added new information schema tables sql/tztime.cc: Changed to use new ha_... calls
This commit is contained in:
Michael Widenius
108
sql/structs.h
108
sql/structs.h
@ -76,6 +76,7 @@ typedef struct st_key {
|
||||
uint extra_length;
|
||||
uint usable_key_parts; /* Should normally be = key_parts */
|
||||
uint block_size;
|
||||
uint name_length;
|
||||
enum ha_key_alg algorithm;
|
||||
/*
|
||||
Note that parser is used when the table is opened for use, and
|
||||
@ -88,6 +89,8 @@ typedef struct st_key {
|
||||
};
|
||||
KEY_PART_INFO *key_part;
|
||||
char *name; /* Name of key */
|
||||
/* Unique name for cache; db + \0 + table_name + \0 + key_name + \0 */
|
||||
uchar *cache_name;
|
||||
/*
|
||||
Array of AVG(#records with the same field value) for 1st ... Nth key part.
|
||||
0 means 'not known'.
|
||||
@ -231,6 +234,111 @@ typedef struct user_conn {
|
||||
USER_RESOURCES user_resources;
|
||||
} USER_CONN;
|
||||
|
||||
typedef struct st_user_stats
|
||||
{
|
||||
char user[max(USERNAME_LENGTH, LIST_PROCESS_HOST_LEN) + 1];
|
||||
// Account name the user is mapped to when this is a user from mapped_user.
|
||||
// Otherwise, the same value as user.
|
||||
char priv_user[max(USERNAME_LENGTH, LIST_PROCESS_HOST_LEN) + 1];
|
||||
uint user_name_length;
|
||||
uint total_connections;
|
||||
uint concurrent_connections;
|
||||
time_t connected_time; // in seconds
|
||||
double busy_time; // in seconds
|
||||
double cpu_time; // in seconds
|
||||
ulonglong bytes_received;
|
||||
ulonglong bytes_sent;
|
||||
ulonglong binlog_bytes_written;
|
||||
ha_rows rows_read, rows_sent;
|
||||
ha_rows rows_updated, rows_deleted, rows_inserted;
|
||||
ulonglong select_commands, update_commands, other_commands;
|
||||
ulonglong commit_trans, rollback_trans;
|
||||
ulonglong denied_connections, lost_connections;
|
||||
ulonglong access_denied_errors;
|
||||
ulonglong empty_queries;
|
||||
} USER_STATS;
|
||||
|
||||
/* Lookup function for hash tables with USER_STATS entries */
|
||||
extern "C" uchar *get_key_user_stats(USER_STATS *user_stats, size_t *length,
|
||||
my_bool not_used __attribute__((unused)));
|
||||
|
||||
/* Free all memory for a hash table with USER_STATS entries */
|
||||
extern void free_user_stats(USER_STATS* user_stats);
|
||||
|
||||
/* Intialize an instance of USER_STATS */
|
||||
extern void
|
||||
init_user_stats(USER_STATS *user_stats,
|
||||
const char *user,
|
||||
size_t user_length,
|
||||
const char *priv_user,
|
||||
uint total_connections,
|
||||
uint concurrent_connections,
|
||||
time_t connected_time,
|
||||
double busy_time,
|
||||
double cpu_time,
|
||||
ulonglong bytes_received,
|
||||
ulonglong bytes_sent,
|
||||
ulonglong binlog_bytes_written,
|
||||
ha_rows rows_sent,
|
||||
ha_rows rows_read,
|
||||
ha_rows rows_inserted,
|
||||
ha_rows rows_deleted,
|
||||
ha_rows rows_updated,
|
||||
ulonglong select_commands,
|
||||
ulonglong update_commands,
|
||||
ulonglong other_commands,
|
||||
ulonglong commit_trans,
|
||||
ulonglong rollback_trans,
|
||||
ulonglong denied_connections,
|
||||
ulonglong lost_connections,
|
||||
ulonglong access_denied_errors,
|
||||
ulonglong empty_queries);
|
||||
|
||||
/* Increment values of an instance of USER_STATS */
|
||||
extern void
|
||||
add_user_stats(USER_STATS *user_stats,
|
||||
uint total_connections,
|
||||
uint concurrent_connections,
|
||||
time_t connected_time,
|
||||
double busy_time,
|
||||
double cpu_time,
|
||||
ulonglong bytes_received,
|
||||
ulonglong bytes_sent,
|
||||
ulonglong binlog_bytes_written,
|
||||
ha_rows rows_sent,
|
||||
ha_rows rows_read,
|
||||
ha_rows rows_inserted,
|
||||
ha_rows rows_deleted,
|
||||
ha_rows rows_updated,
|
||||
ulonglong select_commands,
|
||||
ulonglong update_commands,
|
||||
ulonglong other_commands,
|
||||
ulonglong commit_trans,
|
||||
ulonglong rollback_trans,
|
||||
ulonglong denied_connections,
|
||||
ulonglong lost_connections,
|
||||
ulonglong access_denied_errors,
|
||||
ulonglong empty_queries);
|
||||
|
||||
typedef struct st_table_stats
|
||||
{
|
||||
char table[NAME_LEN * 2 + 2]; // [db] + '\0' + [table] + '\0'
|
||||
uint table_name_length;
|
||||
ulonglong rows_read, rows_changed;
|
||||
ulonglong rows_changed_x_indexes;
|
||||
/* Stores enum db_type, but forward declarations cannot be done */
|
||||
int engine_type;
|
||||
} TABLE_STATS;
|
||||
|
||||
typedef struct st_index_stats
|
||||
{
|
||||
// [db] + '\0' + [table] + '\0' + [index] + '\0'
|
||||
char index[NAME_LEN * 3 + 3];
|
||||
uint index_name_length; /* Length of 'index' */
|
||||
ulonglong rows_read;
|
||||
} INDEX_STATS;
|
||||
|
||||
|
||||
/* Bits in form->update */
|
||||
#define REG_MAKE_DUPP 1 /* Make a copy of record when read */
|
||||
#define REG_NEW_RECORD 2 /* Write a new record if not found */
|
||||
|
||||
Reference in New Issue
Block a user