mirror of
https://github.com/miniflux/v2.git
synced 2025-09-15 18:57:04 +00:00
perf(storage): speed up feed deletion
This commit is contained in:
parent
e674dad355
commit
41f8348419
1 changed files with 3 additions and 24 deletions
|
@ -7,7 +7,6 @@ import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
|
||||||
"sort"
|
"sort"
|
||||||
|
|
||||||
"miniflux.app/v2/internal/config"
|
"miniflux.app/v2/internal/config"
|
||||||
|
@ -458,29 +457,9 @@ func (s *Storage) UpdateFeedError(feed *model.Feed) (err error) {
|
||||||
// RemoveFeed removes a feed and all entries.
|
// RemoveFeed removes a feed and all entries.
|
||||||
// This operation can takes time if the feed has lot of entries.
|
// This operation can takes time if the feed has lot of entries.
|
||||||
func (s *Storage) RemoveFeed(userID, feedID int64) error {
|
func (s *Storage) RemoveFeed(userID, feedID int64) error {
|
||||||
rows, err := s.db.Query(`SELECT id FROM entries WHERE user_id=$1 AND feed_id=$2`, userID, feedID)
|
// Since entries have a `references` on `feeds(id)` with an `on delete cascade`,
|
||||||
if err != nil {
|
// we can simply remove the correct `feeds(id)` and postgresql will take care of deleting the
|
||||||
return fmt.Errorf(`store: unable to get user feed entries: %v`, err)
|
// corresponding entries.
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
for rows.Next() {
|
|
||||||
var entryID int64
|
|
||||||
if err := rows.Scan(&entryID); err != nil {
|
|
||||||
return fmt.Errorf(`store: unable to read user feed entry ID: %v`, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Debug("Deleting entry",
|
|
||||||
slog.Int64("user_id", userID),
|
|
||||||
slog.Int64("feed_id", feedID),
|
|
||||||
slog.Int64("entry_id", entryID),
|
|
||||||
)
|
|
||||||
|
|
||||||
if _, err := s.db.Exec(`DELETE FROM entries WHERE id=$1 AND user_id=$2`, entryID, userID); err != nil {
|
|
||||||
return fmt.Errorf(`store: unable to delete user feed entries #%d: %v`, entryID, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := s.db.Exec(`DELETE FROM feeds WHERE id=$1 AND user_id=$2`, feedID, userID); err != nil {
|
if _, err := s.db.Exec(`DELETE FROM feeds WHERE id=$1 AND user_id=$2`, feedID, userID); err != nil {
|
||||||
return fmt.Errorf(`store: unable to delete feed #%d: %v`, feedID, err)
|
return fmt.Errorf(`store: unable to delete feed #%d: %v`, feedID, err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue