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

Performance improvements: Avoid expensive PMA_Table::analyzeStructure() call

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-06-05 20:20:02 +05:30
parent 739b142580
commit 758ec7b5ae
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/Util.class.php
View File

@ -3839,7 +3839,7 @@ class PMA_Util
* @todo Except for $cfg, no longer use globals but pass as parameters
* from higher levels
*/
global $cfg, $analyzed_sql, $data;
global $cfg, $data;
$default_function = '';
@ -3852,8 +3852,6 @@ class PMA_Util
}
}
$analyzed_sql_field_array = $analyzed_sql[0]['create_table_fields']
[$field['Field']];
// what function defined as default?
// for the first timestamp we don't set the default function
// if there is a default value for the timestamp
@ -3864,9 +3862,8 @@ class PMA_Util
&& $field['first_timestamp']
&& empty($field['Default'])
&& empty($data)
&& ! isset($analyzed_sql_field_array['on_update_current_timestamp'])
&& ! (isset($analyzed_sql_field_array['default_value'])
&& $analyzed_sql_field_array['default_value'] == 'NULL')
&& $field['Extra'] != 'on update CURRENT_TIMESTAMP'
&& $field['Null'] == 'NO'
) {
$default_function = $cfg['DefaultFunctions']['first_timestamp'];
}

12
libraries/insert_edit.lib.php
View File

@ -2632,7 +2632,6 @@ function PMA_getHtmlForInsertEditFormHeader($has_blob_field, $is_upload)
*
* @param array $table_columns table columns
* @param int $i row counter
* @param array $column column
* @param array $comments_map comments map
* @param bool $timestamp_seen whether timestamp seen
* @param array $current_result current result
@ -2664,7 +2663,7 @@ function PMA_getHtmlForInsertEditFormHeader($has_blob_field, $is_upload)
*
* @return string
*/
function PMA_getHtmlForInsertEditFormColumn($table_columns, $i, $column,
function PMA_getHtmlForInsertEditFormColumn($table_columns, $i,
$comments_map, $timestamp_seen, $current_result, $chg_evt_handler,
$jsvkey, $vkey, $insert_mode, $current_row, $odd_row, &$o_rows,
&$tabindex, $columns_cnt, $is_upload, $tabindex_for_function,
@ -2672,8 +2671,8 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $i, $column,
$row_id, $titles, $biggest_max_file_size, $default_char_editing,
$text_dir, $repopulate, $column_mime, $where_clause
) {
if (! isset($table_columns[$i]['processed'])) {
$column = $table_columns[$i];
$column = $table_columns[$i];
if (! isset($column['processed'])) {
$column = PMA_analyzeTableColumnsArray(
$column, $comments_map, $timestamp_seen
);
@ -2860,7 +2859,6 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $i, $column,
*
* @param array $url_params url parameters
* @param array $table_columns table columns
* @param array $column column
* @param array $comments_map comments map
* @param bool $timestamp_seen whether timestamp seen
* @param array $current_result current result
@ -2889,7 +2887,7 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $i, $column,
* @return string
*/
function PMA_getHtmlForInsertEditRow($url_params, $table_columns,
$column, $comments_map, $timestamp_seen, $current_result, $chg_evt_handler,
$comments_map, $timestamp_seen, $current_result, $chg_evt_handler,
$jsvkey, $vkey, $insert_mode, $current_row, &$o_rows, &$tabindex, $columns_cnt,
$is_upload, $tabindex_for_function, $foreigners, $tabindex_for_null,
$tabindex_for_value, $table, $db, $row_id, $titles,
@ -2912,7 +2910,7 @@ function PMA_getHtmlForInsertEditRow($url_params, $table_columns,
$column_mime = $mime_map[$table_columns[$i]['Field']];
}
$html_output .= PMA_getHtmlForInsertEditFormColumn(
$table_columns, $i, $column, $comments_map, $timestamp_seen,
$table_columns, $i, $comments_map, $timestamp_seen,
$current_result, $chg_evt_handler, $jsvkey, $vkey, $insert_mode,
$current_row, $odd_row, $o_rows, $tabindex, $columns_cnt, $is_upload,
$tabindex_for_function, $foreigners, $tabindex_for_null,

5
tbl_change.php
View File

@ -93,9 +93,6 @@ if (! empty($disp_message)) {
$response->addHTML(PMA_Util::getMessage($disp_message, null));
}
// used as a global by PMA_Util::getDefaultFunctionForField()
$analyzed_sql = PMA_Table::analyzeStructure($db, $table);
$table_columns = PMA_getTableColumns($db, $table);
// retrieve keys into foreign fields, if any
@ -194,7 +191,7 @@ foreach ($rows as $row_id => $current_row) {
}
$html_output .= PMA_getHtmlForInsertEditRow(
$url_params, $table_columns, $column, $comments_map, $timestamp_seen,
$url_params, $table_columns, $comments_map, $timestamp_seen,
$current_result, $chg_evt_handler, $jsvkey, $vkey, $insert_mode,
$current_row, $o_rows, $tabindex, $columns_cnt,
$is_upload, $tabindex_for_function, $foreigners, $tabindex_for_null,