From 63b7da3b60ae2874fb908b094f23d4ca826b229c Mon Sep 17 00:00:00 2001
From: Alfredo Ramos <alfredo.ramos.sanchez@gmail.com>
Date: Fri, 15 Jan 2021 13:48:59 -0600
Subject: [PATCH] [ticket/16686] Simplify get_database_size() SQL query for
PostgreSQL
Reduce number of queries to get database size and add it to the cache
for 2 hours, like it is being done for other RDBMS.
PHPBB3-16686
---
phpBB/includes/functions_admin.php | 37 ++++++++----------------------
1 file changed, 9 insertions(+), 28 deletions(-)
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 6774d8dc8d..629c025aa5 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2900,37 +2900,18 @@ function get_database_size()
break;
case 'postgres':
- $sql = "SELECT proname
- FROM pg_proc
- WHERE proname = 'pg_database_size'";
- $result = $db->sql_query($sql);
- $row = $db->sql_fetchrow($result);
- $db->sql_freeresult($result);
+ $database = $db->get_db_name();
- if ($row['proname'] == 'pg_database_size')
+ if (strpos($database, '.') !== false)
{
- $database = $db->get_db_name();
- if (strpos($database, '.') !== false)
- {
- list($database, ) = explode('.', $database);
- }
-
- $sql = "SELECT oid
- FROM pg_database
- WHERE datname = '$database'";
- $result = $db->sql_query($sql);
- $row = $db->sql_fetchrow($result);
- $db->sql_freeresult($result);
-
- $oid = $row['oid'];
-
- $sql = 'SELECT pg_database_size(' . $oid . ') as size';
- $result = $db->sql_query($sql);
- $row = $db->sql_fetchrow($result);
- $db->sql_freeresult($result);
-
- $database_size = $row['size'];
+ $database = explode('.', $database)[0];
}
+
+ $sql = "SELECT pg_database_size('" . $database . "') AS dbsize";
+ $result = $db->sql_query($sql, 7200);
+ $row = $db->sql_fetchrow($result);
+ $database_size = !empty($row['dbsize']) ? $row['dbsize'] : false;
+ $db->sql_freeresult($result);
break;
case 'oracle':