From 15855fb0761c4dbe85efa1709adc752b5e2922e1 Mon Sep 17 00:00:00 2001 From: Brian Fraser Date: Tue, 4 Dec 2012 13:17:58 -0300 Subject: [PATCH] Change feat_on_renamed() per Daniel's feedback --- bin/pt-mysql-summary | 22 ++++++++++------------ lib/bash/report_mysql_info.sh | 22 ++++++++++------------ 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/bin/pt-mysql-summary b/bin/pt-mysql-summary index 854b8724..4cf5b4ce 100755 --- a/bin/pt-mysql-summary +++ b/bin/pt-mysql-summary @@ -1034,12 +1034,10 @@ feat_on() { feat_on_renamed () { local file="$1" - local varnames="$2" - local opt1="${3:-""}" - local opt2="${4:-""}" + shift; - for var in $(echo "$varnames" | sed -e 's/,/ /g'); do - local feat_on="$( feat_on $file $var $opt1 $opt2 )" + for varname in "$@"; do + local feat_on="$( feat_on "$file" $varname )" if [ "${feat_on:-"Not Supported"}" != "Not Supported" ]; then echo $feat_on return @@ -1759,21 +1757,21 @@ section_percona_server_features () { [ -e "$file" ] || return name_val "Table & Index Stats" \ - "$(feat_on_renamed "$file" "userstat_running,userstat")" + "$(feat_on_renamed "$file" userstat_running userstat)" name_val "Multiple I/O Threads" \ "$(feat_on "$file" innodb_read_io_threads gt 1)" name_val "Corruption Resilient" \ - "$(feat_on_renamed "$file" "innodb_pass_corrupt_table,innodb_corrupt_table_action")" + "$(feat_on_renamed "$file" innodb_pass_corrupt_table innodb_corrupt_table_action)" name_val "Durable Replication" \ - "$(feat_on_renamed "$file" "innodb_overwrite_relay_log_info,innodb_recovery_update_relay_log")" + "$(feat_on_renamed "$file" innodb_overwrite_relay_log_info innodb_recovery_update_relay_log)" name_val "Import InnoDB Tables" \ - "$(feat_on_renamed "$file" "innodb_expand_import,innodb_import_table_from_xtrabackup")" + "$(feat_on_renamed "$file" innodb_expand_import innodb_import_table_from_xtrabackup)" name_val "Fast Server Restarts" \ - "$(feat_on_renamed "$file" "innodb_auto_lru_dump,innodb_buffer_pool_restore_at_startup")" + "$(feat_on_renamed "$file" innodb_auto_lru_dump innodb_buffer_pool_restore_at_startup)" name_val "Enhanced Logging" \ "$(feat_on "$file" log_slow_verbosity ne microtime)" @@ -1781,9 +1779,9 @@ section_percona_server_features () { "$(feat_on "$file" log_slow_slave_statements)" name_val "Response Time Hist." \ - "$(feat_on_renamed "$file" "enable_query_response_time_stats,query_response_time_stats")" + "$(feat_on_renamed "$file" enable_query_response_time_stats query_response_time_stats)" - local smooth_flushing="$(feat_on_renamed "$file" "innodb_adaptive_checkpoint,innodb_adaptive_flushing_method")" + local smooth_flushing="$(feat_on_renamed "$file" innodb_adaptive_checkpoint innodb_adaptive_flushing_method)" if [ "${smooth_flushing:-""}" != "Not Supported" ]; then if [ -n "$(get_var innodb_adaptive_checkpoint "$file")" ]; then smooth_flushing="$(feat_on "$file" "innodb_adaptive_checkpoint" ne none)" diff --git a/lib/bash/report_mysql_info.sh b/lib/bash/report_mysql_info.sh index af604360..270155c2 100644 --- a/lib/bash/report_mysql_info.sh +++ b/lib/bash/report_mysql_info.sh @@ -70,12 +70,10 @@ feat_on() { feat_on_renamed () { local file="$1" - local varnames="$2" - local opt1="${3:-""}" - local opt2="${4:-""}" + shift; - for var in $(echo "$varnames" | sed -e 's/,/ /g'); do - local feat_on="$( feat_on $file $var $opt1 $opt2 )" + for varname in "$@"; do + local feat_on="$( feat_on "$file" $varname )" if [ "${feat_on:-"Not Supported"}" != "Not Supported" ]; then echo $feat_on return @@ -848,25 +846,25 @@ section_percona_server_features () { # Renamed to userstat in 5.5.10-20.1 name_val "Table & Index Stats" \ - "$(feat_on_renamed "$file" "userstat_running,userstat")" + "$(feat_on_renamed "$file" userstat_running userstat)" name_val "Multiple I/O Threads" \ "$(feat_on "$file" innodb_read_io_threads gt 1)" # Renamed to innodb_corrupt_table_action in 5.5.10-20.1 name_val "Corruption Resilient" \ - "$(feat_on_renamed "$file" "innodb_pass_corrupt_table,innodb_corrupt_table_action")" + "$(feat_on_renamed "$file" innodb_pass_corrupt_table innodb_corrupt_table_action)" # Renamed to innodb_recovery_update_relay_log in 5.5.10-20.1 name_val "Durable Replication" \ - "$(feat_on_renamed "$file" "innodb_overwrite_relay_log_info,innodb_recovery_update_relay_log")" + "$(feat_on_renamed "$file" innodb_overwrite_relay_log_info innodb_recovery_update_relay_log)" # Renamed to innodb_import_table_from_xtrabackup in 5.5.10-20.1 name_val "Import InnoDB Tables" \ - "$(feat_on_renamed "$file" "innodb_expand_import,innodb_import_table_from_xtrabackup")" + "$(feat_on_renamed "$file" innodb_expand_import innodb_import_table_from_xtrabackup)" # Renamed to innodb_buffer_pool_restore_at_startup in 5.5.10-20.1 name_val "Fast Server Restarts" \ - "$(feat_on_renamed "$file" "innodb_auto_lru_dump,innodb_buffer_pool_restore_at_startup")" + "$(feat_on_renamed "$file" innodb_auto_lru_dump innodb_buffer_pool_restore_at_startup)" name_val "Enhanced Logging" \ "$(feat_on "$file" log_slow_verbosity ne microtime)" @@ -875,12 +873,12 @@ section_percona_server_features () { # Renamed to query_response_time_stats in 5.5 name_val "Response Time Hist." \ - "$(feat_on_renamed "$file" "enable_query_response_time_stats,query_response_time_stats")" + "$(feat_on_renamed "$file" enable_query_response_time_stats query_response_time_stats)" # Renamed to innodb_adaptive_flushing_method in 5.5 # This one is a bit more convulted than the rest because not only did it # change names, but also default values: none in 5.1, native in 5.5 - local smooth_flushing="$(feat_on_renamed "$file" "innodb_adaptive_checkpoint,innodb_adaptive_flushing_method")" + local smooth_flushing="$(feat_on_renamed "$file" innodb_adaptive_checkpoint innodb_adaptive_flushing_method)" if [ "${smooth_flushing:-""}" != "Not Supported" ]; then if [ -n "$(get_var innodb_adaptive_checkpoint "$file")" ]; then smooth_flushing="$(feat_on "$file" "innodb_adaptive_checkpoint" ne none)"