mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-25 00:37:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change SQL update query (#6957)

Browse Source 
* Change SQL update query for MariaDB / MySQL
fix https://github.com/FreshRSS/FreshRSS/issues/5707

* No change for SQLite

* Fix merge error

* Update MySQL version on the model of PostgreSQL
Performance to be tested

* Fix LEFT JOIN, also for PostgreSQL / SQLite

* Fix alias

* Reduce MySQL deadlock

* Fix compatibility with SQLite

* Back to identical SQL for all databases
This commit is contained in:
Alexandre Alapetite
2025-11-17 13:48:48 +01:00
committed by GitHub
parent 419a1978b6
commit deb7633c49
3 changed files with 37 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/EntryDAO.php
View File

@@ -1679,7 +1679,13 @@ SQL;
}
return $affected;
}
$sql = 'UPDATE `_entry` SET `lastSeen`=? WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1) . '?)';
// Reduce MySQL deadlock probability by ensuring consistent lock ordering
$orderBy = $this->pdo->dbType() === 'mysql' ? ' ORDER BY id DESC' : '';
$sql = 'UPDATE `_entry` ' .
'SET `lastSeen`=? WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1) . '?)' .
$orderBy;
$stm = $this->pdo->prepare($sql);
if ($mtime <= 0) {
$mtime = time();

39
app/Models/FeedDAO.php
View File

@@ -479,17 +479,38 @@ SQL;
* Update cached values for selected feeds, or all feeds if no feed ID is provided.
*/
public function updateCachedValues(int ...$feedIds): int|false {
//2 sub-requests with FOREIGN KEY(e.id_feed), INDEX(e.is_read) faster than 1 request with GROUP BY or CASE
$sql = <<<SQL
UPDATE `_feed`
SET `cache_nbEntries`=(SELECT COUNT(e1.id) FROM `_entry` e1 WHERE e1.id_feed=`_feed`.id),
`cache_nbUnreads`=(SELECT COUNT(e2.id) FROM `_entry` e2 WHERE e2.id_feed=`_feed`.id AND e2.is_read=0)
SQL;
if (count($feedIds) > 0) {
$sql .= ' WHERE id IN (' . str_repeat('?,', count($feedIds) - 1) . '?)';
if (empty($feedIds)) {
$whereFeedIds = 'true';
$whereEntryIdFeeds = 'true';
} else {
$whereFeedIds = 'id IN (' . str_repeat('?,', count($feedIds) - 1) . '?)';
$whereEntryIdFeeds = 'id_feed IN (' . str_repeat('?,', count($feedIds) - 1) . '?)';
}
$sql = <<<SQL
WITH entry_counts AS (
SELECT
id_feed,
COUNT(*) AS total_entries,
SUM(CASE WHEN is_read = 0 THEN 1 ELSE 0 END) AS unread_entries
FROM `_entry`
WHERE $whereEntryIdFeeds
GROUP BY id_feed
)
UPDATE `_feed`
SET `cache_nbEntries` = COALESCE((
SELECT c.total_entries
FROM entry_counts AS c
WHERE c.id_feed = `_feed`.id
), 0),
`cache_nbUnreads` = COALESCE((
SELECT c.unread_entries
FROM entry_counts AS c
WHERE c.id_feed = `_feed`.id
), 0)
WHERE $whereFeedIds
SQL;
$stm = $this->pdo->prepare($sql);
if ($stm !== false && $stm->execute($feedIds)) {
if ($stm !== false && $stm->execute(array_merge($feedIds, $feedIds))) {
return $stm->rowCount();
} else {
$info = $stm === false ? $this->pdo->errorInfo() : $stm->errorInfo();

36
app/Models/FeedDAOPGSQL.php
View File

@@ -10,40 +10,4 @@ SELECT setval('`_feed_id_seq`', COALESCE(MAX(id), 0) + 1, false) FROM `_feed`
SQL;
return $this->pdo->exec($sql) !== false;
}
#[\Override]
public function updateCachedValues(int ...$feedIds): int|false {
// Faster than the MySQL version
if (empty($feedIds)) {
$whereFeedIds = 'true';
$whereEntryIdFeeds = 'true';
} else {
$whereFeedIds = 'id IN (' . str_repeat('?,', count($feedIds) - 1) . '?)';
$whereEntryIdFeeds = 'id_feed IN (' . str_repeat('?,', count($feedIds) - 1) . '?)';
}
$sql = <<<SQL
WITH entry_counts AS (
SELECT
id_feed,
COUNT(*) AS total_entries,
SUM(CASE WHEN is_read = 0 THEN 1 ELSE 0 END) AS unread_entries
FROM `_entry`
WHERE $whereEntryIdFeeds
GROUP BY id_feed
)
UPDATE `_feed`
SET `cache_nbEntries` = COALESCE(c.total_entries, 0),
`cache_nbUnreads` = COALESCE(c.unread_entries, 0)
FROM entry_counts c
WHERE id = c.id_feed AND $whereFeedIds
SQL;
$stm = $this->pdo->prepare($sql);
if ($stm !== false && $stm->execute(array_merge($feedIds, $feedIds))) {
return $stm->rowCount();
} else {
$info = $stm === false ? $this->pdo->errorInfo() : $stm->errorInfo();
Minz_Log::error('SQL error ' . __METHOD__ . json_encode($info));
return false;
}
}
}