gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor server_status_queries.php: 1. move functions to lib file

Browse Source
This commit is contained in:
xmujay 2013-07-29 20:32:45 +08:00
parent 1d2f4a5ad3
commit 71fcb2fe2c
2 changed files with 148 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
libraries/server_status_queries.lib.php Normal file
View File

@ -0,0 +1,145 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* functions for displaying query statistics for the server
*
* @usedby server_status_queries.php
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
exit;
}
/**
* Returns the html content for the query statistics
*
* @param object $ServerStatusData An instance of the PMA_ServerStatusData class
*
* @return string
*/
function PMA_getHtmlForQueryStatistics($ServerStatusData)
{
$retval = '';
$hour_factor = 3600 / $ServerStatusData->status['Uptime'];
$used_queries = $ServerStatusData->used_queries;
$total_queries = array_sum($used_queries);
$retval .= '<h3 id="serverstatusqueries">';
/* l10n: Questions is the name of a MySQL Status variable */
$retval .= sprintf(
__('Questions since startup: %s'),
PMA_Util::formatNumber($total_queries, 0)
);
$retval .= ' ';
$retval .= PMA_Util::showMySQLDocu(
'server-status-variables',
'server-status-variables',
false,
'statvar_Questions'
);
$retval .= '<br />';
$retval .= '<span>';
$retval .= '&oslash; ' . __('per hour:') . ' ';
$retval .= PMA_Util::formatNumber($total_queries * $hour_factor, 0);
$retval .= '<br />';
$retval .= '&oslash; ' . __('per minute:') . ' ';
$retval .= PMA_Util::formatNumber($total_queries * 60 / $ServerStatusData->status['Uptime'], 0);
$retval .= '<br />';
if ($total_queries / $ServerStatusData->status['Uptime'] >= 1) {
$retval .= '&oslash; ' . __('per second:') . ' ';
$retval .= PMA_Util::formatNumber($total_queries / $ServerStatusData->status['Uptime'], 0);
}
$retval .= '</span>';
$retval .= '</h3>';
$retval .= PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData);
return $retval;
}
/**
* Returns the html content for the query details
*
* @param object $ServerStatusData An instance of the PMA_ServerStatusData class
*
* @return string
*/
function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
{
$hour_factor = 3600 / $ServerStatusData->status['Uptime'];
$used_queries = $ServerStatusData->used_queries;
$total_queries = array_sum($used_queries);
// reverse sort by value to show most used statements first
arsort($used_queries);
$odd_row = true;
$perc_factor = 100 / $total_queries; //(- $ServerStatusData->status['Connections']);
$retval = '<table id="serverstatusqueriesdetails" class="data sortable noclick">';
$retval .= '<col class="namecol" />';
$retval .= '<col class="valuecol" span="3" />';
$retval .= '<thead>';
$retval .= '<tr><th>' . __('Statements') . '</th>';
$retval .= '<th>';
/* l10n: # = Amount of queries */
$retval .= __('#');
$retval .= '</th>';
$retval .= '<th>&oslash; ' . __('per hour') . '</th>';
$retval .= '<th>%</th>';
$retval .= '</tr>';
$retval .= '</thead>';
$retval .= '<tbody>';
$chart_json = array();
$query_sum = array_sum($used_queries);
$other_sum = 0;
foreach ($used_queries as $name => $value) {
$odd_row = !$odd_row;
// For the percentage column, use Questions - Connections, because
// the number of connections is not an item of the Query types
// but is included in Questions. Then the total of the percentages is 100.
$name = str_replace(array('Com_', '_'), array('', ' '), $name);
// Group together values that make out less than 2% into "Other", but only
// if we have more than 6 fractions already
if ($value < $query_sum * 0.02 && count($chart_json)>6) {
$other_sum += $value;
} else {
$chart_json[$name] = $value;
}
$retval .= '<tr class="';
$retval .= $odd_row ? 'odd' : 'even';
$retval .= '">';
$retval .= '<th class="name">' . htmlspecialchars($name) . '</th>';
$retval .= '<td class="value">';
$retval .= htmlspecialchars(PMA_Util::formatNumber($value, 5, 0, true));
$retval .= '</td>';
$retval .= '<td class="value">';
$retval .= htmlspecialchars(
PMA_Util::formatNumber($value * $hour_factor, 4, 1, true)
);
$retval .= '</td>';
$retval .= '<td class="value">';
$retval .= htmlspecialchars(
PMA_Util::formatNumber($value * $perc_factor, 0, 2)
);
$retval .= '</td>';
$retval .= '</tr>';
}
$retval .= '</tbody>';
$retval .= '</table>';
$retval .= '<div id="serverstatusquerieschart"></div>';
$retval .= '<div id="serverstatusquerieschart_data" style="display:none;">';
if ($other_sum > 0) {
$chart_json[__('Other')] = $other_sum;
}
$retval .= htmlspecialchars(json_encode($chart_json));
$retval .= '</div>';
return $retval;
}
?>

134
server_status_queries.php
View File

@ -9,6 +9,8 @@
require_once 'libraries/common.inc.php';
require_once 'libraries/server_common.inc.php';
require_once 'libraries/ServerStatusData.class.php';
require_once 'libraries/server_status_queries.lib.php';
if (PMA_DRIZZLE) {
$server_master_status = false;
$server_slave_status = false;
@ -42,138 +44,8 @@ $scripts->addFile('server_status_sorter.js');
// Add the html content to the response
$response->addHTML('<div>');
$response->addHTML($ServerStatusData->getMenuHtml());
$response->addHTML(PMA_getQueryStatisticsHtml($ServerStatusData));
$response->addHTML(PMA_getHtmlForQueryStatistics($ServerStatusData));
$response->addHTML('</div>');
exit;
/**
* Returns the html content for the query statistics
*
* @param object $ServerStatusData An instance of the PMA_ServerStatusData class
*
* @return string
*/
function PMA_getQueryStatisticsHtml($ServerStatusData)
{
$retval = '';
$hour_factor = 3600 / $ServerStatusData->status['Uptime'];
$used_queries = $ServerStatusData->used_queries;
$total_queries = array_sum($used_queries);
$retval .= '<h3 id="serverstatusqueries">';
/* l10n: Questions is the name of a MySQL Status variable */
$retval .= sprintf(
__('Questions since startup: %s'),
PMA_Util::formatNumber($total_queries, 0)
);
$retval .= ' ';
$retval .= PMA_Util::showMySQLDocu(
'server-status-variables',
'server-status-variables',
false,
'statvar_Questions'
);
$retval .= '<br />';
$retval .= '<span>';
$retval .= '&oslash; ' . __('per hour:') . ' ';
$retval .= PMA_Util::formatNumber($total_queries * $hour_factor, 0);
$retval .= '<br />';
$retval .= '&oslash; ' . __('per minute:') . ' ';
$retval .= PMA_Util::formatNumber($total_queries * 60 / $ServerStatusData->status['Uptime'], 0);
$retval .= '<br />';
if ($total_queries / $ServerStatusData->status['Uptime'] >= 1) {
$retval .= '&oslash; ' . __('per second:') . ' ';
$retval .= PMA_Util::formatNumber($total_queries / $ServerStatusData->status['Uptime'], 0);
}
$retval .= '</span>';
$retval .= '</h3>';
$retval .= PMA_getServerStatusQueriesDetailsHtml($ServerStatusData);
return $retval;
}
/**
* Returns the html content for the query details
*
* @param object $ServerStatusData An instance of the PMA_ServerStatusData class
*
* @return string
*/
function PMA_getServerStatusQueriesDetailsHtml($ServerStatusData)
{
$hour_factor = 3600 / $ServerStatusData->status['Uptime'];
$used_queries = $ServerStatusData->used_queries;
$total_queries = array_sum($used_queries);
// reverse sort by value to show most used statements first
arsort($used_queries);
$odd_row = true;
$perc_factor = 100 / $total_queries; //(- $ServerStatusData->status['Connections']);
$retval = '<table id="serverstatusqueriesdetails" class="data sortable noclick">';
$retval .= '<col class="namecol" />';
$retval .= '<col class="valuecol" span="3" />';
$retval .= '<thead>';
$retval .= '<tr><th>' . __('Statements') . '</th>';
$retval .= '<th>';
/* l10n: # = Amount of queries */
$retval .= __('#');
$retval .= '</th>';
$retval .= '<th>&oslash; ' . __('per hour') . '</th>';
$retval .= '<th>%</th>';
$retval .= '</tr>';
$retval .= '</thead>';
$retval .= '<tbody>';
$chart_json = array();
$query_sum = array_sum($used_queries);
$other_sum = 0;
foreach ($used_queries as $name => $value) {
$odd_row = !$odd_row;
// For the percentage column, use Questions - Connections, because
// the number of connections is not an item of the Query types
// but is included in Questions. Then the total of the percentages is 100.
$name = str_replace(array('Com_', '_'), array('', ' '), $name);
// Group together values that make out less than 2% into "Other", but only
// if we have more than 6 fractions already
if ($value < $query_sum * 0.02 && count($chart_json)>6) {
$other_sum += $value;
} else {
$chart_json[$name] = $value;
}
$retval .= '<tr class="';
$retval .= $odd_row ? 'odd' : 'even';
$retval .= '">';
$retval .= '<th class="name">' . htmlspecialchars($name) . '</th>';
$retval .= '<td class="value">';
$retval .= htmlspecialchars(PMA_Util::formatNumber($value, 5, 0, true));
$retval .= '</td>';
$retval .= '<td class="value">';
$retval .= htmlspecialchars(
PMA_Util::formatNumber($value * $hour_factor, 4, 1, true)
);
$retval .= '</td>';
$retval .= '<td class="value">';
$retval .= htmlspecialchars(
PMA_Util::formatNumber($value * $perc_factor, 0, 2)
);
$retval .= '</td>';
$retval .= '</tr>';
}
$retval .= '</tbody>';
$retval .= '</table>';
$retval .= '<div id="serverstatusquerieschart"></div>';
$retval .= '<div id="serverstatusquerieschart_data" style="display:none;">';
if ($other_sum > 0) {
$chart_json[__('Other')] = $other_sum;
}
$retval .= htmlspecialchars(json_encode($chart_json));
$retval .= '</div>';
return $retval;
}
?>