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

make use of new functionality in PMA_getTableList() and PMA_DBI_get_tables_full(): reduce db server traffic (MySQL >=5.0)

Browse Source
This commit is contained in:
Sebastian Mendel
2006-01-14 18:19:39 +00:00
parent 062b408d0e
commit 747846fa2b
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -11,6 +11,8 @@ $Source$
now also accepts an array of database names not only a single name now also accepts an array of database names not only a single name
* libraries/common.lib.php: PMA_getTableList(): * libraries/common.lib.php: PMA_getTableList():
added second parameter to pass tables (if already fetched from db) added second parameter to pass tables (if already fetched from db)
* left.php: make use of new functionality in PMA_getTableList() and
PMA_DBI_get_tables_full(): reduce db server traffic (MySQL >=5.0)
2006-01-12 Marc Delisle <lem9@users.sourceforge.net> 2006-01-12 Marc Delisle <lem9@users.sourceforge.net>
* Documentation.html: typo, thanks to Cédric Corazza * Documentation.html: typo, thanks to Cédric Corazza

34
left.php
View File

@@ -58,7 +58,7 @@ require_once('./libraries/header_http.inc.php');
* Displays the frame * Displays the frame
*/ */
// remove vertical scroll bar bug in ie // remove vertical scroll bar bug in ie
echo "<?xml version=\"1.0\" encoding=\"" . $GLOBALS['charset'] . "\"?".">"; echo '<?xml version="1.0" encoding="' . $GLOBALS['charset'] . '"?>';
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -133,6 +133,11 @@ if ( $num_dbs === 0 ) {
} elseif ( $GLOBALS['cfg']['LeftFrameLight'] && $num_dbs > 1 ) { } elseif ( $GLOBALS['cfg']['LeftFrameLight'] && $num_dbs > 1 ) {
// more than one database available and LeftFrameLight is true // more than one database available and LeftFrameLight is true
// display db selectbox // display db selectbox
//
// Light mode -> beginning of the select combo for databases
// Note: When javascript is active, the frameset will be changed from
// within left.php. With no JS (<noscript>) the whole frameset will
// be rebuilt with the new target frame.
?> ?>
<div id="databaseList"> <div id="databaseList">
@@ -160,11 +165,6 @@ if ( $num_dbs === 0 ) {
// or $GLOBALS['cfg']['Servers']['only_db'] is defined and is not an array) // or $GLOBALS['cfg']['Servers']['only_db'] is defined and is not an array)
// In this case, the database should not be collapsible/expandable // In this case, the database should not be collapsible/expandable
// Light mode -> beginning of the select combo for databases
// Note: When javascript is active, the frameset will be changed from
// within left.php. With no JS (<noscript>) the whole frameset will
// be rebuilt with the new target frame.
$img_plus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_plus.png"' $img_plus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_plus.png"'
.' width="9" height="9" alt="+" />'; .' width="9" height="9" alt="+" />';
$img_minus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_minus.png"' $img_minus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_minus.png"'
@@ -176,6 +176,8 @@ $href_left = '<a onclick="if ( toggle(\'%d\') ) return false;"'
$element_counter = 0; $element_counter = 0;
if ( $GLOBALS['cfg']['LeftFrameLight'] && ! empty( $db ) ) { if ( $GLOBALS['cfg']['LeftFrameLight'] && ! empty( $db ) ) {
// show selected databasename as link to DefaultTabDatabase-page
// with table count in ()
$common_url_query = PMA_generate_common_url( $db ); $common_url_query = PMA_generate_common_url( $db );
$db_tooltip = ''; $db_tooltip = '';
@@ -219,7 +221,7 @@ if ( $GLOBALS['cfg']['LeftFrameLight'] && ! empty( $db ) ) {
echo '<p>' . $GLOBALS['strSelectADb'] . '</p>' . "\n"; echo '<p>' . $GLOBALS['strSelectADb'] . '</p>' . "\n";
} else { } else {
$common_url_query = PMA_generate_common_url(); $common_url_query = PMA_generate_common_url();
PMA_displayDbList( PMA_getDbList() ); PMA_displayDbList(PMA_getDbList());
} }
/** /**
@@ -248,6 +250,10 @@ function PMA_displayDbList( $ext_dblist ) {
global $element_counter, $img_minus, $img_plus, $href_left, $num_dbs, global $element_counter, $img_minus, $img_plus, $href_left, $num_dbs,
$db_start, $common_url_query; $db_start, $common_url_query;
// get table list, for all databases
// doing this in one step takes advantage of a single query with information_schema!
$tables_full = PMA_DBI_get_tables_full($GLOBALS['dblist']);
$url_dbgroup = ''; $url_dbgroup = '';
echo '<ul id="leftdatabaselist">'; echo '<ul id="leftdatabaselist">';
$close_db_group = false; $close_db_group = false;
@@ -350,10 +356,14 @@ function PMA_displayDbList( $ext_dblist ) {
<?php <?php
} }
if ( $db['num_tables'] ) { if ( $db['num_tables'] ) {
$tables = PMA_getTableList( $db['name'] ); if ( isset( $tables_full[$db['name']] ) ) {
$tables = PMA_getTableList($db['name'], $tables_full[$db['name']]);
} else {
$tables = PMA_getTableList($db['name']);
}
$child_visible = $child_visible =
(bool) ($num_dbs === 1 || $db_start == $db['name']); (bool) ($num_dbs === 1 || $db_start == $db['name']);
PMA_displayTableList( $tables, $child_visible, '', $db['name'] ); PMA_displayTableList($tables, $child_visible, '', $db['name']);
} elseif ( $GLOBALS['cfg']['LeftFrameLight'] ) { } elseif ( $GLOBALS['cfg']['LeftFrameLight'] ) {
// no tables and LeftFrameLight: // no tables and LeftFrameLight:
// display message no tables in selected db // display message no tables in selected db
@@ -405,9 +415,9 @@ function PMA_displayDbList( $ext_dblist ) {
* @param string $tab_group_full full tab group name * @param string $tab_group_full full tab group name
* @param string $table_db db of this table * @param string $table_db db of this table
*/ */
function PMA_displayTableList( $tables, $visible = false, function PMA_displayTableList($tables, $visible = false,
$tab_group_full = '', $table_db = '' ) { $tab_group_full = '', $table_db = '')
{
if ( ! is_array( $tables ) || count( $tables ) === 0 ) { if ( ! is_array( $tables ) || count( $tables ) === 0 ) {
return; return;
} }