mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-27 05:28:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix PostgreSQL and SQLite DB size estimation (#2562)

Browse Source
This commit is contained in:
Alexandre Alapetite authored and GitHub committed 2019-10-06 22:17:28 +02:00
1 parent be4c942cb3
commit 3b65f2e586
3 files changed
+29 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Models/DatabaseDAOPGSQL.php
+17 -6
View File
@@ -49,12 +49,23 @@ class FreshRSS_DatabaseDAOPGSQL extends FreshRSS_DatabaseDAOSQLite {
);
}
public function size($all = true) {
$db = FreshRSS_Context::$system_conf->db;
$sql = 'SELECT pg_size_pretty(pg_database_size(?))';
$values = array($db['base']);
$stm = $this->pdo->prepare($sql);
$stm->execute($values);
public function size($all = false) {
if ($all) {
$db = FreshRSS_Context::$system_conf->db;
$sql = 'SELECT pg_database_size(:base)';
$stm = $this->pdo->prepare($sql);
$stm->bindParam(':base', $db['base']);
$stm->execute();
} else {
$sql = "SELECT "
. "pg_total_relation_size('{$this->pdo->prefix()}category') + "
. "pg_total_relation_size('{$this->pdo->prefix()}feed') + "
. "pg_total_relation_size('{$this->pdo->prefix()}entry') + "
. "pg_total_relation_size('{$this->pdo->prefix()}entrytmp') + "
. "pg_total_relation_size('{$this->pdo->prefix()}tag') + "
. "pg_total_relation_size('{$this->pdo->prefix()}entrytag')";
$stm = $this->pdo->query($sql);
}
$res = $stm->fetchAll(PDO::FETCH_COLUMN, 0);
return $res[0];
}
app/Models/DatabaseDAOSQLite.php
+9 -1
View File
@@ -54,7 +54,15 @@ class FreshRSS_DatabaseDAOSQLite extends FreshRSS_DatabaseDAO {
}
public function size($all = false) {
return @filesize(join_path(DATA_PATH, 'users', $this->current_user, 'db.sqlite'));
$sum = 0;
if ($all) {
foreach (glob(DATA_PATH . '/users/*/db.sqlite') as $filename) {
$sum += @filesize($filename);
}
} else {
$sum = @filesize(DATA_PATH . '/users/' . $this->current_user . '/db.sqlite');
}
return $sum;
}
public function optimize() {
app/Models/EntryDAO.php
+3
View File
@@ -951,6 +951,9 @@ SQL;
$sql .= ' WHERE f.priority > ' . intval($minPriority);
}
$stm = $this->pdo->query($sql);
if ($stm == false) {
return false;
}
$res = $stm->fetchAll(PDO::FETCH_COLUMN, 0);
return isset($res[0]) ? $res[0] : 0;
}