From 092726df1603daefb347c66e50e270fc1e6581cc Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 22 May 2009 07:02:09 +0000 Subject: [PATCH] - Patch #212233 by lilou, catch: remove SQL report. --- modules/system/system.admin.inc | 64 --------------------------------- modules/system/system.module | 6 ---- 2 files changed, 70 deletions(-) diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index a9f040f9632c..3fffeab84d9e 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1808,70 +1808,6 @@ function system_php() { exit(); } -/** - * Theme a SQL result table. - * - * @param $data - * The actual table data. - * @param $keys - * Data keys and descriptions. - * @return - * The output HTML. - */ -function _system_sql($data, $keys) { - $rows = array(); - foreach ($keys as $key => $explanation) { - if (isset($data[$key])) { - $rows[] = array(check_plain($key), check_plain($data[$key]), $explanation); - } - } - - return theme('table', array(t('Variable'), t('Value'), t('Description')), $rows); -} - -/** - * Menu callback: return information about the database. - */ -function system_sql() { - - $result = db_query("SHOW STATUS"); - foreach ($result as $entry) { - // 'SHOW STATUS' returns fields named 'Variable_name' and 'Value', - // case is important. - $data[$entry->Variable_name] = $entry->Value; - } - - $output = '

' . t('Command counters') . '

'; - $output .= _system_sql($data, array( - 'Com_select' => t('The number of !sql statements.', array('!sql' => 'SELECT')), - 'Com_insert' => t('The number of !sql statements.', array('!sql' => 'INSERT')), - 'Com_update' => t('The number of !sql statements.', array('!sql' => 'UPDATE')), - 'Com_delete' => t('The number of !sql statements.', array('!sql' => 'DELETE')), - 'Com_lock_tables' => t('The number of table locks.'), - 'Com_unlock_tables' => t('The number of table unlocks.') - )); - - $output .= '

' . t('Query performance') . '

'; - $output .= _system_sql($data, array( - 'Select_full_join' => t('The number of joins without an index; should be zero.'), - 'Select_range_check' => t('The number of joins without keys that check for key usage after each row; should be zero.'), - 'Sort_scan' => t('The number of sorts done without using an index; should be zero.'), - 'Table_locks_immediate' => t('The number of times a lock could be acquired immediately.'), - 'Table_locks_waited' => t('The number of times the server had to wait for a lock.') - )); - - $output .= '

' . t('Query cache information') . '

'; - $output .= '

' . t('The MySQL query cache can improve performance of your site by storing the result of queries. Then, if an identical query is received later, the MySQL server retrieves the result from the query cache rather than parsing and executing the statement again.') . '

'; - $output .= _system_sql($data, array( - 'Qcache_queries_in_cache' => t('The number of queries in the query cache.'), - 'Qcache_hits' => t('The number of times MySQL found previous results in the cache.'), - 'Qcache_inserts' => t('The number of times MySQL added a query to the cache (misses).'), - 'Qcache_lowmem_prunes' => t('The number of times MySQL had to remove queries from the cache because it ran out of memory. Ideally should be zero.') - )); - - return $output; -} - /** * Default page callback for batches. */ diff --git a/modules/system/system.module b/modules/system/system.module index 40538d104592..8f4a986256fc 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -749,12 +749,6 @@ function system_menu() { 'access arguments' => array('administer site configuration'), 'type' => MENU_CALLBACK, ); - $items['admin/reports/status/sql'] = array( - 'title' => 'SQL', - 'page callback' => 'system_sql', - 'access arguments' => array('administer site configuration'), - 'type' => MENU_CALLBACK, - ); // Default page for batch operations $items['batch'] = array( 'page callback' => 'system_batch_page',