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

optimize: skip unneeded code in case BLOB streaming is not available

Browse Source
This commit is contained in:
Marc Delisle
2009-07-16 11:51:09 +00:00
parent 9b4ee154a3
commit 56defc1153
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tbl_replace.php
View File

@@ -54,6 +54,7 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) {
* Gets some core libraries * Gets some core libraries
*/ */
require_once './libraries/common.inc.php'; require_once './libraries/common.inc.php';
$blob_streaming_active = $_SESSION['PMA_Config']->get('BLOBSTREAMING_PLUGINS_EXIST');
// Check parameters // Check parameters
PMA_checkParameters(array('db', 'table', 'goto')); PMA_checkParameters(array('db', 'table', 'goto'));
@@ -94,6 +95,7 @@ if (isset($_REQUEST['after_insert'])
$meta = PMA_DBI_get_fields_meta($res); $meta = PMA_DBI_get_fields_meta($res);
// must find a unique condition based on unique key, // must find a unique condition based on unique key,
// not a combination of all fields // not a combination of all fields
// (the following is a real assignment)
if ($tmp = PMA_getUniqueCondition($res, count($meta), $meta, $row, true)) { if ($tmp = PMA_getUniqueCondition($res, count($meta), $meta, $row, true)) {
$_SESSION['edit_next'] = $tmp; $_SESSION['edit_next'] = $tmp;
} }
@@ -207,7 +209,9 @@ foreach ($loop_array as $rowcount => $primary_key) {
? $_REQUEST['auto_increment']['multi_edit'][$rowcount] ? $_REQUEST['auto_increment']['multi_edit'][$rowcount]
: null; : null;
if ($blob_streaming_active) {
$primary_field = PMA_BS_GetPrimaryField($GLOBALS['db'], $GLOBALS['table']); $primary_field = PMA_BS_GetPrimaryField($GLOBALS['db'], $GLOBALS['table']);
}
// Fetch the current values of a row to use in case we have a protected field // Fetch the current values of a row to use in case we have a protected field
// @todo possibly move to ./libraries/tbl_replace_fields.inc.php // @todo possibly move to ./libraries/tbl_replace_fields.inc.php
@@ -226,31 +230,29 @@ foreach ($loop_array as $rowcount => $primary_key) {
require './libraries/tbl_replace_fields.inc.php'; require './libraries/tbl_replace_fields.inc.php';
// rajk - for blobstreaming // rajk - for blobstreaming
if (NULL != $primary_field || strlen($primary_field) > 0) if ($blob_streaming_active && (NULL != $primary_field || strlen($primary_field) > 0)) {
{
$remove_blob_repo = isset($_REQUEST['remove_blob_repo_' . $key]) ? $_REQUEST['remove_blob_repo_' . $key] : NULL; $remove_blob_repo = isset($_REQUEST['remove_blob_repo_' . $key]) ? $_REQUEST['remove_blob_repo_' . $key] : NULL;
$upload_blob_repo = isset($_REQUEST['upload_blob_repo_' . $key]) ? $_REQUEST['upload_blob_repo_' . $key] : NULL; $upload_blob_repo = isset($_REQUEST['upload_blob_repo_' . $key]) ? $_REQUEST['upload_blob_repo_' . $key] : NULL;
// checks if an existing blob repository reference should be removed // checks if an existing blob repository reference should be removed
if (isset($remove_blob_repo) && !isset($upload_blob_repo)) if (isset($remove_blob_repo) && !isset($upload_blob_repo)) {
{
$remove_blob_reference = $_REQUEST['remove_blob_ref_' . $key]; $remove_blob_reference = $_REQUEST['remove_blob_ref_' . $key];
if (isset($remove_blob_reference)) {
if (isset($remove_blob_reference))
$val = "''"; $val = "''";
} }
// checks if this field requires a bs reference attached to it // checks if this field requires a bs reference attached to it
if (isset($upload_blob_repo)) if (isset($upload_blob_repo)) {
{
// get the most recent BLOB reference // get the most recent BLOB reference
$bs_reference = PMA_File::getRecentBLOBReference(); $bs_reference = PMA_File::getRecentBLOBReference();
// if the most recent BLOB reference exists, set it as a field value // if the most recent BLOB reference exists, set it as a field value
if (!is_null($bs_reference)) if (!is_null($bs_reference)) {
$val = "'" . PMA_sqlAddslashes($bs_reference) . "'"; $val = "'" . PMA_sqlAddslashes($bs_reference) . "'";
} }
} }
}
}
if (empty($me_funcs[$key])) { if (empty($me_funcs[$key])) {
$cur_value = $val; $cur_value = $val;
@@ -360,6 +362,7 @@ foreach ($query as $single_query) {
if (! $result) { if (! $result) {
$error_messages[] = PMA_DBI_getError(); $error_messages[] = PMA_DBI_getError();
} else { } else {
// the following is a real assignment:
if ($tmp = @PMA_DBI_affected_rows()) { if ($tmp = @PMA_DBI_affected_rows()) {
$total_affected_rows += $tmp; $total_affected_rows += $tmp;
} }