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

Merge pull request #113 from tyronx/master

Browse Source 
Fix for profiling chart not showing in the query analyzer dialog
This commit is contained in:
Atul Pratap Singh 2012-12-03 23:44:50 -08:00
commit b91275b016
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/server_status_monitor.js
View File

@ -2015,15 +2015,31 @@ AJAX.registerOnload('server_status_monitor.js', function() {
var chartData = [];
var numberTable = '<table class="queryNums"><thead><tr><th>' + PMA_messages['strStatus'] + '</th><th>' + PMA_messages['strTime'] + '</th></tr></thead><tbody>';
var duration;
var otherTime = 0;
for (var i = 0, l = data.profiling.length; i < l; i++) {
duration = parseFloat(data.profiling[i].duration);
chartData.push([data.profiling[i].state, duration]);
totalTime += duration;
numberTable += '<tr><td>' + data.profiling[i].state + ' </td><td> ' + PMA_prettyProfilingNum(duration, 2) + '</td></tr>';
}
// Only put those values in the pie which are > 2%
for (var i = 0, l = data.profiling.length; i < l; i++) {
duration = parseFloat(data.profiling[i].duration);
if (duration / totalTime > 0.02) {
chartData.push([PMA_prettyProfilingNum(duration, 2) + ' ' + data.profiling[i].state, duration]);
} else {
otherTime += duration;
}
}
if (otherTime > 0) {
chartData.push([PMA_prettyProfilingNum(otherTime, 2) + ' ' + PMA_messages['strOther'], otherTime]);
}
numberTable += '<tr><td><b>' + PMA_messages['strTotalTime'] + '</b></td><td>' + PMA_prettyProfilingNum(totalTime, 2) + '</td></tr>';
numberTable += '</tbody></table>';
@ -2049,7 +2065,7 @@ AJAX.registerOnload('server_status_monitor.js', function() {
chartData
);
$('div#queryProfiling').resizable();
//$('div#queryProfiling').resizable();
}
});
}

2
server_status.php
View File

@ -405,7 +405,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
PMA_DBI_select_db($_REQUEST['database']);
}
if ($profiling == PMA_Util::profilingSupported()) {
if ($profiling = PMA_Util::profilingSupported()) {
PMA_DBI_query('SET PROFILING=1;');
}

2
themes/pmahomme/css/common.css.php
View File

@ -1357,7 +1357,7 @@ div#queryAnalyzerDialog div.CodeMirror-scroll {
}
div#queryAnalyzerDialog div#queryProfiling {
height: 250px;
height: 300px;
}
div#queryAnalyzerDialog td.explain {