rickub
nandi/gleanpublic⑂ Fork 0
⑂ b16eb14
Branches
claude/modal-container-min-76527a main View all branches → View all tags →
Commits
⬇ Clone ▾
git clone https://git.rickub.com/nandi/glean.git
git clone ssh://git@rickub.com/nandi/glean.git

Host key fingerprint (ed25519): SHA256:iycHnxEyq0Q7uyVpB7JlznP0G7JrTPXLYRcAU5CSLhc — verify it before your first connect.

Recalculate subscriber counts instead of incremental updatesUnverified

Julien Robert committed 2026-05-02T23:55:52+02:00 Browse files
b16eb14 parent: 7cfd6ab
modified internal/atproto/lexicon_external.go +7 -7
@@ -91,13 +91,13 @@ func (r MarginNoteRecord) ToAnnotation() (articleURL, quote, note string, tags [
9191 }
9292
9393 type StandardPublicationRecord struct {
94- BasicTheme json.RawMessage `json:"basicTheme,omitempty"`
95- Name string `json:"name"`
96- URL string `json:"url"`
97- Description string `json:"description"`
98- Icon json.RawMessage `json:"icon,omitempty"`
99- Labels json.RawMessage `json:"labels,omitempty"`
100- Preferences json.RawMessage `json:"preferences,omitempty"`
94+ BasicTheme json.RawMessage `json:"basicTheme,omitempty"`
95+ Name string `json:"name"`
96+ URL string `json:"url"`
97+ Description string `json:"description"`
98+ Icon json.RawMessage `json:"icon,omitempty"`
99+ Labels json.RawMessage `json:"labels,omitempty"`
100+ Preferences json.RawMessage `json:"preferences,omitempty"`
101101 }
102102
103103 type StandardDocumentRecord struct {
@@ -91,13 +91,13 @@ func (r MarginNoteRecord) ToAnnotation() (articleURL, quote, note string, tags [
91 }91 }
92 92
93 type StandardPublicationRecord struct {93 type StandardPublicationRecord struct {
94- BasicTheme json.RawMessage `json:"basicTheme,omitempty"`94+ BasicTheme json.RawMessage `json:"basicTheme,omitempty"`
95- Name string `json:"name"`95+ Name string `json:"name"`
96- URL string `json:"url"`96+ URL string `json:"url"`
97- Description string `json:"description"`97+ Description string `json:"description"`
98- Icon json.RawMessage `json:"icon,omitempty"`98+ Icon json.RawMessage `json:"icon,omitempty"`
99- Labels json.RawMessage `json:"labels,omitempty"`99+ Labels json.RawMessage `json:"labels,omitempty"`
100- Preferences json.RawMessage `json:"preferences,omitempty"`100+ Preferences json.RawMessage `json:"preferences,omitempty"`
101 }101 }
102 102
103 type StandardDocumentRecord struct {103 type StandardDocumentRecord struct {
modified internal/atproto/sync.go +6 -0
@@ -36,6 +36,12 @@ func (s *Sync) Run(ctx context.Context, userDID string) error {
3636 if err := s.syncSubscriptions(ctx, userDID); err != nil {
3737 s.logger.Error("sync subscriptions failed", "error", err, "did", userDID)
3838 }
39+ // Recompute subscriber_count from subscriptions table rather than
40+ // maintaining it incrementally (done here to avoid drift from race conditions
41+ // between stream handler events and sync operations).
42+ if err := s.articles.RecountSubscriberCounts(ctx); err != nil {
43+ s.logger.Error("recount subscriber counts failed", "error", err, "did", userDID)
44+ }
3945 if err := s.syncLikes(ctx, userDID); err != nil {
4046 s.logger.Error("sync likes failed", "error", err, "did", userDID)
4147 }
@@ -36,6 +36,12 @@ func (s *Sync) Run(ctx context.Context, userDID string) error {
36 if err := s.syncSubscriptions(ctx, userDID); err != nil {36 if err := s.syncSubscriptions(ctx, userDID); err != nil {
37 s.logger.Error("sync subscriptions failed", "error", err, "did", userDID)37 s.logger.Error("sync subscriptions failed", "error", err, "did", userDID)
38 }38 }
39+ // Recompute subscriber_count from subscriptions table rather than
40+ // maintaining it incrementally (done here to avoid drift from race conditions
41+ // between stream handler events and sync operations).
42+ if err := s.articles.RecountSubscriberCounts(ctx); err != nil {
43+ s.logger.Error("recount subscriber counts failed", "error", err, "did", userDID)
44+ }
39 if err := s.syncLikes(ctx, userDID); err != nil {45 if err := s.syncLikes(ctx, userDID); err != nil {
40 s.logger.Error("sync likes failed", "error", err, "did", userDID)46 s.logger.Error("sync likes failed", "error", err, "did", userDID)
41 }47 }
modified internal/cluster/jaccard_test.go +1 -6
@@ -455,12 +455,7 @@ func TestColdStartRecommendations(t *testing.T) {
455455 engine := newTestEngine(dbs)
456456 assert.NilError(t, engine.ComputeFollowDistances(ctx))
457457
458- _, err := dbs.SQLDB().ExecContext(ctx, `UPDATE articles.feeds SET subscriber_count = 2 WHERE feed_url = 'https://a.com/feed'`)
459- assert.NilError(t, err)
460- _, err = dbs.SQLDB().ExecContext(ctx, `UPDATE articles.feeds SET subscriber_count = 2 WHERE feed_url = 'https://b.com/feed'`)
461- assert.NilError(t, err)
462-
463- _, err = dbs.SQLDB().ExecContext(ctx, `INSERT INTO users (did) VALUES (?)`, "did:test:newuser")
458+ _, err := dbs.SQLDB().ExecContext(ctx, `INSERT INTO users (did) VALUES (?)`, "did:test:newuser")
464459 assert.NilError(t, err)
465460
466461 recs, err := engine.ColdStartRecommendations(ctx, "did:test:newuser", 10)
@@ -455,12 +455,7 @@ func TestColdStartRecommendations(t *testing.T) {
455 engine := newTestEngine(dbs)455 engine := newTestEngine(dbs)
456 assert.NilError(t, engine.ComputeFollowDistances(ctx))456 assert.NilError(t, engine.ComputeFollowDistances(ctx))
457 457
458- _, err := dbs.SQLDB().ExecContext(ctx, `UPDATE articles.feeds SET subscriber_count = 2 WHERE feed_url = 'https://a.com/feed'`)458+ _, err := dbs.SQLDB().ExecContext(ctx, `INSERT INTO users (did) VALUES (?)`, "did:test:newuser")
459- assert.NilError(t, err)
460- _, err = dbs.SQLDB().ExecContext(ctx, `UPDATE articles.feeds SET subscriber_count = 2 WHERE feed_url = 'https://b.com/feed'`)
461- assert.NilError(t, err)
462-
463- _, err = dbs.SQLDB().ExecContext(ctx, `INSERT INTO users (did) VALUES (?)`, "did:test:newuser")
464 assert.NilError(t, err)459 assert.NilError(t, err)
465 460
466 recs, err := engine.ColdStartRecommendations(ctx, "did:test:newuser", 10)461 recs, err := engine.ColdStartRecommendations(ctx, "did:test:newuser", 10)
modified internal/db/batch_test.go +46 -0
@@ -107,6 +107,7 @@ func TestBatchReconcileSubscriptions_CreatesNew(t *testing.T) {
107107 }
108108 err := dbs.Articles.BatchReconcileSubscriptions(ctx, userDID, subs)
109109 assert.NilError(t, err)
110+ assert.NilError(t, dbs.Articles.RecountSubscriberCounts(ctx))
110111
111112 subs2, err := dbs.Articles.ListSubscriptions(ctx, userDID, "", 10, 0)
112113 assert.NilError(t, err)
@@ -132,6 +133,7 @@ func TestBatchReconcileSubscriptions_BackfillsURI(t *testing.T) {
132133 }
133134 err = dbs.Articles.BatchReconcileSubscriptions(ctx, userDID, subs)
134135 assert.NilError(t, err)
136+ assert.NilError(t, dbs.Articles.RecountSubscriberCounts(ctx))
135137
136138 s, err := dbs.Articles.GetSubscription(ctx, userDID, "https://a.com/feed.xml")
137139 assert.NilError(t, err)
@@ -176,6 +178,7 @@ func TestBatchReconcileSubscriptions_UpdatesCategoryAndTitle(t *testing.T) {
176178 }
177179 err = dbs.Articles.BatchReconcileSubscriptions(ctx, userDID, subs)
178180 assert.NilError(t, err)
181+ assert.NilError(t, dbs.Articles.RecountSubscriberCounts(ctx))
179182
180183 s, err := dbs.Articles.GetSubscription(ctx, userDID, "https://a.com/feed.xml")
181184 assert.NilError(t, err)
@@ -315,6 +318,7 @@ func TestBatchReconcileSubscriptions_DeletesOrphaned(t *testing.T) {
315318 "https://c.com/feed.xml": true,
316319 })
317320 assert.NilError(t, err)
321+ assert.NilError(t, dbs.Articles.RecountSubscriberCounts(ctx))
318322
319323 list, err := dbs.Articles.ListSubscriptions(ctx, userDID, "", 10, 0)
320324 assert.NilError(t, err)
@@ -488,6 +492,48 @@ func TestDeleteOrphanedLikes_RemovesOrphaned(t *testing.T) {
488492 assert.Equal(t, exists, false)
489493 }
490494
495+func TestDeleteSubscription_NoDecrementWhenNotFound(t *testing.T) {
496+ ctx := context.Background()
497+ dbs := setupTestDB(t)
498+ userDID := seedSubscriptionData(t, ctx, dbs)
499+
500+ _ = dbs.Articles.UpsertFeed(ctx, &Feed{FeedURL: "https://a.com/feed.xml"})
501+ assert.NilError(t, dbs.Articles.CreateSubscription(ctx, userDID, "https://a.com/feed.xml", "A", "", "at://uri", "cid"))
502+
503+ assert.NilError(t, dbs.Articles.DeleteSubscription(ctx, userDID, "https://a.com/feed.xml"))
504+
505+ assert.NilError(t, dbs.Articles.DeleteSubscription(ctx, userDID, "https://a.com/feed.xml"))
506+}
507+
508+func TestRecountSubscriberCounts(t *testing.T) {
509+ ctx := context.Background()
510+ dbs := setupTestDB(t)
511+ user1 := seedSubscriptionData(t, ctx, dbs)
512+
513+ _, err := dbs.SQLDB().ExecContext(ctx, `INSERT INTO users (did) VALUES (?)`, "did:test:u2")
514+ assert.NilError(t, err)
515+
516+ _ = dbs.Articles.UpsertFeed(ctx, &Feed{FeedURL: "https://a.com/feed.xml"})
517+ _ = dbs.Articles.UpsertFeed(ctx, &Feed{FeedURL: "https://b.com/feed.xml"})
518+
519+ assert.NilError(t, dbs.Articles.CreateSubscription(ctx, user1, "https://a.com/feed.xml", "A", "", "", ""))
520+ assert.NilError(t, dbs.Articles.CreateSubscription(ctx, user1, "https://b.com/feed.xml", "B", "", "", ""))
521+ assert.NilError(t, dbs.Articles.CreateSubscription(ctx, "did:test:u2", "https://a.com/feed.xml", "A", "", "", ""))
522+
523+ _, err = dbs.SQLDB().ExecContext(ctx, `UPDATE articles.feeds SET subscriber_count = 99 WHERE feed_url = 'https://a.com/feed.xml'`)
524+ assert.NilError(t, err)
525+
526+ assert.NilError(t, dbs.Articles.RecountSubscriberCounts(ctx))
527+
528+ f, err := dbs.Articles.GetFeed(ctx, "https://a.com/feed.xml")
529+ assert.NilError(t, err)
530+ assert.Equal(t, f.SubscriberCount, 2)
531+
532+ f, err = dbs.Articles.GetFeed(ctx, "https://b.com/feed.xml")
533+ assert.NilError(t, err)
534+ assert.Equal(t, f.SubscriberCount, 1)
535+}
536+
491537 func TestDeleteOrphanedAnnotations_RemovesOrphaned(t *testing.T) {
492538 ctx := context.Background()
493539 dbs := setupTestDB(t)
@@ -107,6 +107,7 @@ func TestBatchReconcileSubscriptions_CreatesNew(t *testing.T) {
107 }107 }
108 err := dbs.Articles.BatchReconcileSubscriptions(ctx, userDID, subs)108 err := dbs.Articles.BatchReconcileSubscriptions(ctx, userDID, subs)
109 assert.NilError(t, err)109 assert.NilError(t, err)
110+ assert.NilError(t, dbs.Articles.RecountSubscriberCounts(ctx))
110 111
111 subs2, err := dbs.Articles.ListSubscriptions(ctx, userDID, "", 10, 0)112 subs2, err := dbs.Articles.ListSubscriptions(ctx, userDID, "", 10, 0)
112 assert.NilError(t, err)113 assert.NilError(t, err)
@@ -132,6 +133,7 @@ func TestBatchReconcileSubscriptions_BackfillsURI(t *testing.T) {
132 }133 }
133 err = dbs.Articles.BatchReconcileSubscriptions(ctx, userDID, subs)134 err = dbs.Articles.BatchReconcileSubscriptions(ctx, userDID, subs)
134 assert.NilError(t, err)135 assert.NilError(t, err)
136+ assert.NilError(t, dbs.Articles.RecountSubscriberCounts(ctx))
135 137
136 s, err := dbs.Articles.GetSubscription(ctx, userDID, "https://a.com/feed.xml")138 s, err := dbs.Articles.GetSubscription(ctx, userDID, "https://a.com/feed.xml")
137 assert.NilError(t, err)139 assert.NilError(t, err)
@@ -176,6 +178,7 @@ func TestBatchReconcileSubscriptions_UpdatesCategoryAndTitle(t *testing.T) {
176 }178 }
177 err = dbs.Articles.BatchReconcileSubscriptions(ctx, userDID, subs)179 err = dbs.Articles.BatchReconcileSubscriptions(ctx, userDID, subs)
178 assert.NilError(t, err)180 assert.NilError(t, err)
181+ assert.NilError(t, dbs.Articles.RecountSubscriberCounts(ctx))
179 182
180 s, err := dbs.Articles.GetSubscription(ctx, userDID, "https://a.com/feed.xml")183 s, err := dbs.Articles.GetSubscription(ctx, userDID, "https://a.com/feed.xml")
181 assert.NilError(t, err)184 assert.NilError(t, err)
@@ -315,6 +318,7 @@ func TestBatchReconcileSubscriptions_DeletesOrphaned(t *testing.T) {
315 "https://c.com/feed.xml": true,318 "https://c.com/feed.xml": true,
316 })319 })
317 assert.NilError(t, err)320 assert.NilError(t, err)
321+ assert.NilError(t, dbs.Articles.RecountSubscriberCounts(ctx))
318 322
319 list, err := dbs.Articles.ListSubscriptions(ctx, userDID, "", 10, 0)323 list, err := dbs.Articles.ListSubscriptions(ctx, userDID, "", 10, 0)
320 assert.NilError(t, err)324 assert.NilError(t, err)
@@ -488,6 +492,48 @@ func TestDeleteOrphanedLikes_RemovesOrphaned(t *testing.T) {
488 assert.Equal(t, exists, false)492 assert.Equal(t, exists, false)
489 }493 }
490 494
495+func TestDeleteSubscription_NoDecrementWhenNotFound(t *testing.T) {
496+ ctx := context.Background()
497+ dbs := setupTestDB(t)
498+ userDID := seedSubscriptionData(t, ctx, dbs)
499+
500+ _ = dbs.Articles.UpsertFeed(ctx, &Feed{FeedURL: "https://a.com/feed.xml"})
501+ assert.NilError(t, dbs.Articles.CreateSubscription(ctx, userDID, "https://a.com/feed.xml", "A", "", "at://uri", "cid"))
502+
503+ assert.NilError(t, dbs.Articles.DeleteSubscription(ctx, userDID, "https://a.com/feed.xml"))
504+
505+ assert.NilError(t, dbs.Articles.DeleteSubscription(ctx, userDID, "https://a.com/feed.xml"))
506+}
507+
508+func TestRecountSubscriberCounts(t *testing.T) {
509+ ctx := context.Background()
510+ dbs := setupTestDB(t)
511+ user1 := seedSubscriptionData(t, ctx, dbs)
512+
513+ _, err := dbs.SQLDB().ExecContext(ctx, `INSERT INTO users (did) VALUES (?)`, "did:test:u2")
514+ assert.NilError(t, err)
515+
516+ _ = dbs.Articles.UpsertFeed(ctx, &Feed{FeedURL: "https://a.com/feed.xml"})
517+ _ = dbs.Articles.UpsertFeed(ctx, &Feed{FeedURL: "https://b.com/feed.xml"})
518+
519+ assert.NilError(t, dbs.Articles.CreateSubscription(ctx, user1, "https://a.com/feed.xml", "A", "", "", ""))
520+ assert.NilError(t, dbs.Articles.CreateSubscription(ctx, user1, "https://b.com/feed.xml", "B", "", "", ""))
521+ assert.NilError(t, dbs.Articles.CreateSubscription(ctx, "did:test:u2", "https://a.com/feed.xml", "A", "", "", ""))
522+
523+ _, err = dbs.SQLDB().ExecContext(ctx, `UPDATE articles.feeds SET subscriber_count = 99 WHERE feed_url = 'https://a.com/feed.xml'`)
524+ assert.NilError(t, err)
525+
526+ assert.NilError(t, dbs.Articles.RecountSubscriberCounts(ctx))
527+
528+ f, err := dbs.Articles.GetFeed(ctx, "https://a.com/feed.xml")
529+ assert.NilError(t, err)
530+ assert.Equal(t, f.SubscriberCount, 2)
531+
532+ f, err = dbs.Articles.GetFeed(ctx, "https://b.com/feed.xml")
533+ assert.NilError(t, err)
534+ assert.Equal(t, f.SubscriberCount, 1)
535+}
536+
491 func TestDeleteOrphanedAnnotations_RemovesOrphaned(t *testing.T) {537 func TestDeleteOrphanedAnnotations_RemovesOrphaned(t *testing.T) {
492 ctx := context.Background()538 ctx := context.Background()
493 dbs := setupTestDB(t)539 dbs := setupTestDB(t)
modified internal/db/feed.go +15 -87
@@ -4,7 +4,6 @@ import (
44 "context"
55 "database/sql"
66 "errors"
7- "strings"
87 "time"
98
109 "pkg.rbrt.fr/glean/internal/feed"
@@ -112,34 +111,14 @@ func (s *ArticleStore) MarkFeedFetchError(ctx context.Context, feedURL, lastErro
112111 return err
113112 }
114113
115-func (s *ArticleStore) decrementSubscriberCount(ctx context.Context, feedURL string) error {
116- _, err := s.db.ExecContext(ctx, `
117- UPDATE articles.feeds SET subscriber_count = MAX(subscriber_count - 1, 0) WHERE feed_url = ?
118- `, feedURL)
119- return err
120-}
121-
122-func (s *ArticleStore) incrementSubscriberCount(ctx context.Context, feedURL string) error {
123- _, err := s.db.ExecContext(ctx, `
124- UPDATE articles.feeds SET subscriber_count = subscriber_count + 1 WHERE feed_url = ?
125- `, feedURL)
126- return err
127-}
128-
129114 func (s *ArticleStore) CreateSubscription(ctx context.Context, userDID, feedURL, title, category, uri, cid string) error {
130115 existing, err := s.GetSubscription(ctx, userDID, feedURL)
131116 if err != nil || existing == nil {
132- result, err := s.db.ExecContext(ctx, `
117+ _, err := s.db.ExecContext(ctx, `
133118 INSERT OR IGNORE INTO articles.subscriptions (user_did, feed_url, title, category, uri, cid)
134119 VALUES (?, ?, ?, ?, ?, ?)
135120 `, userDID, feedURL, nilIfEmpty(title), nilIfEmpty(category), nilIfEmpty(uri), nilIfEmpty(cid))
136- if err != nil {
137- return err
138- }
139- if n, _ := result.RowsAffected(); n > 0 {
140- return s.incrementSubscriberCount(ctx, feedURL)
141- }
142- return nil
121+ return err
143122 }
144123
145124 unchanged := existing.FeedTitle == title && existing.Category.String == category && existing.CID.String == cid
@@ -170,56 +149,12 @@ func (s *ArticleStore) DeleteSubscription(ctx context.Context, userDID, feedURL
170149 _, err := s.db.ExecContext(ctx, `
171150 DELETE FROM articles.subscriptions WHERE user_did = ? AND feed_url = ?
172151 `, userDID, feedURL)
173- if err != nil {
174- return err
175- }
176- return s.decrementSubscriberCount(ctx, feedURL)
152+ return err
177153 }
178154
179155 func (s *ArticleStore) DeleteAllSubscriptions(ctx context.Context, userDID string) error {
180- tx, err := s.db.BeginTx(ctx, nil)
181- if err != nil {
182- return err
183- }
184- defer tx.Rollback()
185-
186- rows, err := tx.QueryContext(ctx, `SELECT feed_url FROM articles.subscriptions WHERE user_did = ?`, userDID)
187- if err != nil {
188- return err
189- }
190- var feedURLs []string
191- for rows.Next() {
192- var u string
193- if err := rows.Scan(&u); err != nil {
194- rows.Close()
195- return err
196- }
197- feedURLs = append(feedURLs, u)
198- }
199- rows.Close()
200-
201- _, err = tx.ExecContext(ctx, `DELETE FROM articles.subscriptions WHERE user_did = ?`, userDID)
202- if err != nil {
203- return err
204- }
205-
206- if len(feedURLs) > 0 {
207- ph := make([]string, len(feedURLs))
208- args := make([]any, len(feedURLs))
209- for i, u := range feedURLs {
210- ph[i] = "?"
211- args[i] = u
212- }
213- _, err = tx.ExecContext(ctx, `
214- UPDATE articles.feeds SET subscriber_count = MAX(subscriber_count - 1, 0)
215- WHERE feed_url IN (`+strings.Join(ph, ",")+`)
216- `, args...)
217- if err != nil {
218- return err
219- }
220- }
221-
222- return tx.Commit()
156+ _, err := s.db.ExecContext(ctx, `DELETE FROM articles.subscriptions WHERE user_did = ?`, userDID)
157+ return err
223158 }
224159
225160 func (s *ArticleStore) GetSubscriptionByURI(ctx context.Context, userDID, uri string) (*Subscription, error) {
@@ -293,6 +228,15 @@ func (s *ArticleStore) GetSubscriptionCount(ctx context.Context, userDID string)
293228 return count, err
294229 }
295230
231+func (s *ArticleStore) RecountSubscriberCounts(ctx context.Context) error {
232+ _, err := s.db.ExecContext(ctx, `
233+ UPDATE articles.feeds SET subscriber_count = (
234+ SELECT COUNT(*) FROM articles.subscriptions sub WHERE sub.feed_url = articles.feeds.feed_url
235+ )
236+ `)
237+ return err
238+}
239+
296240 func (s *ArticleStore) GetCategories(ctx context.Context, userDID string) ([]string, error) {
297241 rows, err := s.db.QueryContext(ctx, `
298242 SELECT DISTINCT category FROM articles.subscriptions
@@ -449,12 +393,6 @@ func (s *ArticleStore) BatchReconcileSubscriptions(ctx context.Context, userDID
449393 }
450394 defer updateStmt.Close()
451395
452- incrStmt, err := tx.PrepareContext(ctx, `UPDATE articles.feeds SET subscriber_count = subscriber_count + 1 WHERE feed_url = ?`)
453- if err != nil {
454- return err
455- }
456- defer incrStmt.Close()
457-
458396 for _, sub := range subs {
459397 if existingURI, ok := existing[sub.FeedURL]; ok {
460398 if existingURI == "" && sub.URI != "" {
@@ -468,16 +406,9 @@ func (s *ArticleStore) BatchReconcileSubscriptions(ctx context.Context, userDID
468406 }
469407 continue
470408 }
471- result, err := insertStmt.ExecContext(ctx, userDID, sub.FeedURL, nilIfEmpty(sub.Title), sub.Category, nilIfEmpty(sub.URI), nilIfEmpty(sub.CID))
472- if err != nil {
409+ if _, err := insertStmt.ExecContext(ctx, userDID, sub.FeedURL, nilIfEmpty(sub.Title), sub.Category, nilIfEmpty(sub.URI), nilIfEmpty(sub.CID)); err != nil {
473410 return err
474411 }
475- n, _ := result.RowsAffected()
476- if n > 0 {
477- if _, err := incrStmt.ExecContext(ctx, sub.FeedURL); err != nil {
478- return err
479- }
480- }
481412 }
482413 return tx.Commit()
483414 }
@@ -543,9 +474,6 @@ func (s *ArticleStore) DeleteOrphanedSubscriptions(ctx context.Context, userDID
543474 if _, err := tx.ExecContext(ctx, `DELETE FROM articles.subscriptions WHERE user_did = ? AND feed_url = ?`, userDID, feedURL); err != nil {
544475 return err
545476 }
546- if _, err := tx.ExecContext(ctx, `UPDATE articles.feeds SET subscriber_count = MAX(subscriber_count - 1, 0) WHERE feed_url = ?`, feedURL); err != nil {
547- return err
548- }
549477 }
550478
551479 return tx.Commit()
@@ -4,7 +4,6 @@ import (
4 "context"4 "context"
5 "database/sql"5 "database/sql"
6 "errors"6 "errors"
7- "strings"
8 "time"7 "time"
9 8
10 "pkg.rbrt.fr/glean/internal/feed"9 "pkg.rbrt.fr/glean/internal/feed"
@@ -112,34 +111,14 @@ func (s *ArticleStore) MarkFeedFetchError(ctx context.Context, feedURL, lastErro
112 return err111 return err
113 }112 }
114 113
115-func (s *ArticleStore) decrementSubscriberCount(ctx context.Context, feedURL string) error {
116- _, err := s.db.ExecContext(ctx, `
117- UPDATE articles.feeds SET subscriber_count = MAX(subscriber_count - 1, 0) WHERE feed_url = ?
118- `, feedURL)
119- return err
120-}
121-
122-func (s *ArticleStore) incrementSubscriberCount(ctx context.Context, feedURL string) error {
123- _, err := s.db.ExecContext(ctx, `
124- UPDATE articles.feeds SET subscriber_count = subscriber_count + 1 WHERE feed_url = ?
125- `, feedURL)
126- return err
127-}
128-
129 func (s *ArticleStore) CreateSubscription(ctx context.Context, userDID, feedURL, title, category, uri, cid string) error {114 func (s *ArticleStore) CreateSubscription(ctx context.Context, userDID, feedURL, title, category, uri, cid string) error {
130 existing, err := s.GetSubscription(ctx, userDID, feedURL)115 existing, err := s.GetSubscription(ctx, userDID, feedURL)
131 if err != nil || existing == nil {116 if err != nil || existing == nil {
132- result, err := s.db.ExecContext(ctx, `117+ _, err := s.db.ExecContext(ctx, `
133 INSERT OR IGNORE INTO articles.subscriptions (user_did, feed_url, title, category, uri, cid)118 INSERT OR IGNORE INTO articles.subscriptions (user_did, feed_url, title, category, uri, cid)
134 VALUES (?, ?, ?, ?, ?, ?)119 VALUES (?, ?, ?, ?, ?, ?)
135 `, userDID, feedURL, nilIfEmpty(title), nilIfEmpty(category), nilIfEmpty(uri), nilIfEmpty(cid))120 `, userDID, feedURL, nilIfEmpty(title), nilIfEmpty(category), nilIfEmpty(uri), nilIfEmpty(cid))
136- if err != nil {121+ return err
137- return err
138- }
139- if n, _ := result.RowsAffected(); n > 0 {
140- return s.incrementSubscriberCount(ctx, feedURL)
141- }
142- return nil
143 }122 }
144 123
145 unchanged := existing.FeedTitle == title && existing.Category.String == category && existing.CID.String == cid124 unchanged := existing.FeedTitle == title && existing.Category.String == category && existing.CID.String == cid
@@ -170,56 +149,12 @@ func (s *ArticleStore) DeleteSubscription(ctx context.Context, userDID, feedURL
170 _, err := s.db.ExecContext(ctx, `149 _, err := s.db.ExecContext(ctx, `
171 DELETE FROM articles.subscriptions WHERE user_did = ? AND feed_url = ?150 DELETE FROM articles.subscriptions WHERE user_did = ? AND feed_url = ?
172 `, userDID, feedURL)151 `, userDID, feedURL)
173- if err != nil {152+ return err
174- return err
175- }
176- return s.decrementSubscriberCount(ctx, feedURL)
177 }153 }
178 154
179 func (s *ArticleStore) DeleteAllSubscriptions(ctx context.Context, userDID string) error {155 func (s *ArticleStore) DeleteAllSubscriptions(ctx context.Context, userDID string) error {
180- tx, err := s.db.BeginTx(ctx, nil)156+ _, err := s.db.ExecContext(ctx, `DELETE FROM articles.subscriptions WHERE user_did = ?`, userDID)
181- if err != nil {157+ return err
182- return err
183- }
184- defer tx.Rollback()
185-
186- rows, err := tx.QueryContext(ctx, `SELECT feed_url FROM articles.subscriptions WHERE user_did = ?`, userDID)
187- if err != nil {
188- return err
189- }
190- var feedURLs []string
191- for rows.Next() {
192- var u string
193- if err := rows.Scan(&u); err != nil {
194- rows.Close()
195- return err
196- }
197- feedURLs = append(feedURLs, u)
198- }
199- rows.Close()
200-
201- _, err = tx.ExecContext(ctx, `DELETE FROM articles.subscriptions WHERE user_did = ?`, userDID)
202- if err != nil {
203- return err
204- }
205-
206- if len(feedURLs) > 0 {
207- ph := make([]string, len(feedURLs))
208- args := make([]any, len(feedURLs))
209- for i, u := range feedURLs {
210- ph[i] = "?"
211- args[i] = u
212- }
213- _, err = tx.ExecContext(ctx, `
214- UPDATE articles.feeds SET subscriber_count = MAX(subscriber_count - 1, 0)
215- WHERE feed_url IN (`+strings.Join(ph, ",")+`)
216- `, args...)
217- if err != nil {
218- return err
219- }
220- }
221-
222- return tx.Commit()
223 }158 }
224 159
225 func (s *ArticleStore) GetSubscriptionByURI(ctx context.Context, userDID, uri string) (*Subscription, error) {160 func (s *ArticleStore) GetSubscriptionByURI(ctx context.Context, userDID, uri string) (*Subscription, error) {
@@ -293,6 +228,15 @@ func (s *ArticleStore) GetSubscriptionCount(ctx context.Context, userDID string)
293 return count, err228 return count, err
294 }229 }
295 230
231+func (s *ArticleStore) RecountSubscriberCounts(ctx context.Context) error {
232+ _, err := s.db.ExecContext(ctx, `
233+ UPDATE articles.feeds SET subscriber_count = (
234+ SELECT COUNT(*) FROM articles.subscriptions sub WHERE sub.feed_url = articles.feeds.feed_url
235+ )
236+ `)
237+ return err
238+}
239+
296 func (s *ArticleStore) GetCategories(ctx context.Context, userDID string) ([]string, error) {240 func (s *ArticleStore) GetCategories(ctx context.Context, userDID string) ([]string, error) {
297 rows, err := s.db.QueryContext(ctx, `241 rows, err := s.db.QueryContext(ctx, `
298 SELECT DISTINCT category FROM articles.subscriptions242 SELECT DISTINCT category FROM articles.subscriptions
@@ -449,12 +393,6 @@ func (s *ArticleStore) BatchReconcileSubscriptions(ctx context.Context, userDID
449 }393 }
450 defer updateStmt.Close()394 defer updateStmt.Close()
451 395
452- incrStmt, err := tx.PrepareContext(ctx, `UPDATE articles.feeds SET subscriber_count = subscriber_count + 1 WHERE feed_url = ?`)
453- if err != nil {
454- return err
455- }
456- defer incrStmt.Close()
457-
458 for _, sub := range subs {396 for _, sub := range subs {
459 if existingURI, ok := existing[sub.FeedURL]; ok {397 if existingURI, ok := existing[sub.FeedURL]; ok {
460 if existingURI == "" && sub.URI != "" {398 if existingURI == "" && sub.URI != "" {
@@ -468,16 +406,9 @@ func (s *ArticleStore) BatchReconcileSubscriptions(ctx context.Context, userDID
468 }406 }
469 continue407 continue
470 }408 }
471- result, err := insertStmt.ExecContext(ctx, userDID, sub.FeedURL, nilIfEmpty(sub.Title), sub.Category, nilIfEmpty(sub.URI), nilIfEmpty(sub.CID))409+ if _, err := insertStmt.ExecContext(ctx, userDID, sub.FeedURL, nilIfEmpty(sub.Title), sub.Category, nilIfEmpty(sub.URI), nilIfEmpty(sub.CID)); err != nil {
472- if err != nil {
473 return err410 return err
474 }411 }
475- n, _ := result.RowsAffected()
476- if n > 0 {
477- if _, err := incrStmt.ExecContext(ctx, sub.FeedURL); err != nil {
478- return err
479- }
480- }
481 }412 }
482 return tx.Commit()413 return tx.Commit()
483 }414 }
@@ -543,9 +474,6 @@ func (s *ArticleStore) DeleteOrphanedSubscriptions(ctx context.Context, userDID
543 if _, err := tx.ExecContext(ctx, `DELETE FROM articles.subscriptions WHERE user_did = ? AND feed_url = ?`, userDID, feedURL); err != nil {474 if _, err := tx.ExecContext(ctx, `DELETE FROM articles.subscriptions WHERE user_did = ? AND feed_url = ?`, userDID, feedURL); err != nil {
544 return err475 return err
545 }476 }
546- if _, err := tx.ExecContext(ctx, `UPDATE articles.feeds SET subscriber_count = MAX(subscriber_count - 1, 0) WHERE feed_url = ?`, feedURL); err != nil {
547- return err
548- }
549 }477 }
550 478
551 return tx.Commit()479 return tx.Commit()