From ce55e4acd1595b025daeccbc605dae781eafe703 Mon Sep 17 00:00:00 2001
From: Nisarg Jhaveri <nisargjhaveri@gmail.com>
Date: Fri, 19 Jun 2015 12:07:09 +0530
Subject: [PATCH] Show percentage of time taken in console SQL debug

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
---
 js/console.js               | 19 ++++++++++---------
 libraries/Console.class.php |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/js/console.js b/js/console.js
index d32e7c1039..ec32f252df 100644
--- a/js/console.js
+++ b/js/console.js
@@ -1260,23 +1260,23 @@ var PMA_consoleDebug = {
         }
         return $traceElem;
     },
-    _formatQueryOrGroup: function(queryInfo) {
-        var grouped, queryText, totalTime, count, i;
+    _formatQueryOrGroup: function(queryInfo, totalTime) {
+        var grouped, queryText, queryTime, count, i;
         if (Array.isArray(queryInfo)) {
             // It is grouped
             grouped = true;
 
             queryText = queryInfo[0].query;
 
-            totalTime = 0;
+            queryTime = 0;
             for (i in queryInfo) {
-                totalTime += queryInfo[i].time;
+                queryTime += queryInfo[i].time;
             }
 
             count = queryInfo.length;
         } else {
             queryText = queryInfo.query;
-            totalTime = queryInfo.time;
+            queryTime = queryInfo.time;
         }
 
         var $query = $('<div class="message collapsed hide_trace">')
@@ -1291,7 +1291,7 @@ var PMA_consoleDebug = {
             $query.find('.text.count').removeClass('hide');
             $query.find('.text.count span').text(count);
         }
-        $query.find('.text.time span').text(totalTime);
+        $query.find('.text.time span').text(queryTime + 's (' + ((queryTime * 100) / totalTime).toFixed(3) + '%)');
 
         if (grouped) {
             var $singleQuery;
@@ -1301,7 +1301,8 @@ var PMA_consoleDebug = {
                     .append(
                         $('<span class="time">').text(
                             PMA_messages.strConsoleDebugTimeTaken +
-                            ' ' + queryInfo[i].time + 's'
+                            ' ' + queryInfo[i].time + 's' +
+                            ' (' + ((queryInfo[i].time * 100) / totalTime).toFixed(3) + '%)'
                         )
                     );
                 this._appendQueryExtraInfo(queryInfo[i], $singleQuery);
@@ -1390,11 +1391,11 @@ var PMA_consoleDebug = {
 
         if (this.configParam('groupQueries')) {
             for (i in uniqueQueries) {
-                $('#debug_console .debugLog').append(this._formatQueryOrGroup(uniqueQueries[i]));
+                $('#debug_console .debugLog').append(this._formatQueryOrGroup(uniqueQueries[i], totalTime));
             }
         } else {
             for (i = 0; i < totalExec; ++i) {
-                $('#debug_console .debugLog').append(this._formatQueryOrGroup(allQueries[i]));
+                $('#debug_console .debugLog').append(this._formatQueryOrGroup(allQueries[i], totalTime));
             }
         }
 
diff --git a/libraries/Console.class.php b/libraries/Console.class.php
index 18c69f1556..ccd3bb0828 100644
--- a/libraries/Console.class.php
+++ b/libraries/Console.class.php
@@ -294,7 +294,7 @@ class PMA_Console
                     . '<span class="action dbg_show_trace">' . __('Show trace') . '</span> '
                     . '<span class="action dbg_hide_trace">' . __('Hide trace') . '</span> '
                     . '<span class="text count hide">' . __('Count:') . ' <span></span></span>'
-                    . '<span class="text time">' . __('Time taken:') . ' <span></span>s</span>'
+                    . '<span class="text time">' . __('Time taken:') . ' <span></span></span>'
                 . '</div>'
                 . '</div>'; // Template
             $output .= '</div>'; // Debug SQL card