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

Remove MySQL version caching

Browse Source 
In my testing the session/cache access is slower than fetching single
value from MySQL and calculating the values.

Also the caching would need some logic for invalidation as the server
can be upgraded or configuration changed.

Fixes #11924

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-02-08 10:55:54 +01:00
parent f3cd949738
commit 42d54a938a
2 changed files with 25 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
libraries/DatabaseInterface.php
View File

@ -1417,80 +1417,37 @@ class DatabaseInterface
public function postConnect($link)
{
if (! defined('PMA_MYSQL_INT_VERSION')) {
if (Util::cacheExists('PMA_MYSQL_INT_VERSION')) {
$version = $this->fetchSingleRow(
'SELECT @@version, @@version_comment',
'ASSOC',
$link
);
if ($version) {
$match = explode('.', $version['@@version']);
define('PMA_MYSQL_MAJOR_VERSION', (int)$match[0]);
define(
'PMA_MYSQL_INT_VERSION',
Util::cacheGet('PMA_MYSQL_INT_VERSION')
);
define(
'PMA_MYSQL_MAJOR_VERSION',
Util::cacheGet('PMA_MYSQL_MAJOR_VERSION')
);
define(
'PMA_MYSQL_STR_VERSION',
Util::cacheGet('PMA_MYSQL_STR_VERSION')
(int) sprintf(
'%d%02d%02d', $match[0], $match[1], intval($match[2])
)
);
define('PMA_MYSQL_STR_VERSION', $version['@@version']);
define(
'PMA_MYSQL_VERSION_COMMENT',
Util::cacheGet('PMA_MYSQL_VERSION_COMMENT')
);
define(
'PMA_MARIADB',
Util::cacheGet('PMA_MARIADB')
$version['@@version_comment']
);
} else {
$version = $this->fetchSingleRow(
'SELECT @@version, @@version_comment',
'ASSOC',
$link
);
if ($version) {
$match = explode('.', $version['@@version']);
define('PMA_MYSQL_MAJOR_VERSION', (int)$match[0]);
define(
'PMA_MYSQL_INT_VERSION',
(int) sprintf(
'%d%02d%02d', $match[0], $match[1], intval($match[2])
)
);
define('PMA_MYSQL_STR_VERSION', $version['@@version']);
define(
'PMA_MYSQL_VERSION_COMMENT',
$version['@@version_comment']
);
} else {
define('PMA_MYSQL_INT_VERSION', 50501);
define('PMA_MYSQL_MAJOR_VERSION', 5);
define('PMA_MYSQL_STR_VERSION', '5.05.01');
define('PMA_MYSQL_VERSION_COMMENT', '');
}
Util::cacheSet(
'PMA_MYSQL_INT_VERSION',
PMA_MYSQL_INT_VERSION
);
Util::cacheSet(
'PMA_MYSQL_MAJOR_VERSION',
PMA_MYSQL_MAJOR_VERSION
);
Util::cacheSet(
'PMA_MYSQL_STR_VERSION',
PMA_MYSQL_STR_VERSION
);
Util::cacheSet(
'PMA_MYSQL_VERSION_COMMENT',
PMA_MYSQL_VERSION_COMMENT
);
/* Detect MariaDB */
if (mb_strpos(PMA_MYSQL_STR_VERSION, 'MariaDB') !== false) {
define('PMA_MARIADB', true);
} else {
define('PMA_MARIADB', false);
}
Util::cacheSet(
'PMA_MARIADB',
PMA_MARIADB
);
define('PMA_MYSQL_INT_VERSION', 50501);
define('PMA_MYSQL_MAJOR_VERSION', 5);
define('PMA_MYSQL_STR_VERSION', '5.05.01');
define('PMA_MYSQL_VERSION_COMMENT', '');
}
/* Detect MariaDB */
if (mb_strpos(PMA_MYSQL_STR_VERSION, 'MariaDB') !== false) {
define('PMA_MARIADB', true);
} else {
define('PMA_MARIADB', false);
}
}

2
libraries/VersionInformation.php
View File

@ -269,6 +269,6 @@ class VersionInformation
*/
protected function getMySQLVersion()
{
return Util::cacheGet('PMA_MYSQL_STR_VERSION');
return PMA_MYSQL_STR_VERSION;
}
}