Merge pull request #61 from strideynet/strideynet/query-performance

Optimize queries
strideynet · Jul 25, 2023 · 0724a54 · 0724a54 · vercel · Jul 25, 2023
2 parents db7b97e + ee06958
commit 0724a54
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 35 deletions.
diff --git a/feed/feed.go b/feed/feed.go
@@ -88,23 +88,25 @@ func PostsFromStorePosts(storePosts []gen.CandidatePost) []Post {
 	for _, p := range storePosts {
 		posts = append(posts, Post{
 			URI:    p.URI,
-			Cursor: bluesky.FormatTime(p.CreatedAt.Time),
+			Cursor: bluesky.FormatTime(p.IndexedAt.Time),
 		})
 	}
 	return posts
 }
 
 func newGenerator() GenerateFunc {
 	return func(ctx context.Context, pgxStore *store.PGXStore, cursor string, limit int) ([]Post, error) {
-		params := store.ListPostsForNewFeedOpts{
-			Limit: limit,
-		}
+		cursorTime := time.Now().UTC()
 		if cursor != "" {
-			cursorTime, err := bluesky.ParseTime(cursor)
+			parsedTime, err := bluesky.ParseTime(cursor)
 			if err != nil {
 				return nil, fmt.Errorf("parsing cursor: %w", err)
 			}
-			params.CursorTime = &cursorTime
+			cursorTime = parsedTime
+		}
+		params := store.ListPostsForNewFeedOpts{
+			Limit:      limit,
+			CursorTime: cursorTime,
 		}
 
 		posts, err := pgxStore.ListPostsForNewFeed(ctx, params)
@@ -117,16 +119,18 @@ func newGenerator() GenerateFunc {
 
 func newWithTagGenerator(tag string) GenerateFunc {
 	return func(ctx context.Context, pgxStore *store.PGXStore, cursor string, limit int) ([]Post, error) {
-		params := store.ListPostsForNewFeedOpts{
-			Limit:     limit,
-			FilterTag: tag,
-		}
+		cursorTime := time.Now().UTC()
 		if cursor != "" {
-			cursorTime, err := bluesky.ParseTime(cursor)
+			parsedTime, err := bluesky.ParseTime(cursor)
 			if err != nil {
 				return nil, fmt.Errorf("parsing cursor: %w", err)
 			}
-			params.CursorTime = &cursorTime
+			cursorTime = parsedTime
+		}
+		params := store.ListPostsForNewFeedOpts{
+			Limit:      limit,
+			FilterTag:  tag,
+			CursorTime: cursorTime,
 		}
 
 		posts, err := pgxStore.ListPostsForNewFeed(ctx, params)
@@ -154,7 +158,7 @@ func scoreBasedGenerator(gravity float64, postAgeOffset time.Duration) GenerateF
 
 		rows, err := pgxStore.ListPostsWithLikes(ctx, store.ListPostsWithLikesOpts{
 			Limit:      2000,
-			CursorTime: &cursorTime,
+			CursorTime: cursorTime,
 		})
 		if err != nil {
 			return nil, fmt.Errorf("executing sql: %w", err)

diff --git a/store/gen/candidate_posts.sql.go b/store/gen/candidate_posts.sql.go
diff --git a/store/migrations/000010_add_more_indexes.down.sql b/store/migrations/000010_add_more_indexes.down.sql
@@ -0,0 +1 @@
+DROP INDEX candidate_posts_indexed_at_idx;
diff --git a/store/migrations/000010_add_more_indexes.up.sql b/store/migrations/000010_add_more_indexes.up.sql
@@ -0,0 +1 @@
+CREATE INDEX candidate_posts_indexed_at_idx ON public.candidate_posts (indexed_at,is_hidden);
diff --git a/store/postgres.go b/store/postgres.go
@@ -416,7 +416,7 @@ func (s *PGXStore) DeleteFollow(ctx context.Context, opts DeleteFollowOpts) (err
 }
 
 type ListPostsForNewFeedOpts struct {
-	CursorTime *time.Time
+	CursorTime time.Time
 	FilterTag  string
 	Limit      int
 }
@@ -428,12 +428,11 @@ func (s *PGXStore) ListPostsForNewFeed(ctx context.Context, opts ListPostsForNew
 		endSpan(span, err)
 	}()
 
-	queryParams := gen.GetFurryNewFeedParams{}
-	if opts.CursorTime != nil {
-		queryParams.CursorTimestamp = pgtype.Timestamptz{
+	queryParams := gen.GetFurryNewFeedParams{
+		CursorTimestamp: pgtype.Timestamptz{
 			Valid: true,
-			Time:  *opts.CursorTime,
-		}
+			Time:  opts.CursorTime,
+		},
 	}
 	if opts.FilterTag != "" {
 		queryParams.Tag = opts.FilterTag
@@ -451,7 +450,7 @@ func (s *PGXStore) ListPostsForNewFeed(ctx context.Context, opts ListPostsForNew
 }
 
 type ListPostsWithLikesOpts struct {
-	CursorTime *time.Time
+	CursorTime time.Time
 	Limit      int
 }
 
@@ -462,13 +461,13 @@ func (s *PGXStore) ListPostsWithLikes(ctx context.Context, opts ListPostsWithLik
 		endSpan(span, err)
 	}()
 
-	queryParams := gen.GetPostsWithLikesParams{}
-	if opts.CursorTime != nil {
-		queryParams.CursorTimestamp = pgtype.Timestamptz{
+	queryParams := gen.GetPostsWithLikesParams{
+		CursorTimestamp: pgtype.Timestamptz{
 			Valid: true,
-			Time:  *opts.CursorTime,
-		}
+			Time:  opts.CursorTime,
+		},
 	}
+
 	if opts.Limit != 0 {
 		queryParams.Limit = int32(opts.Limit)
 	}

diff --git a/store/queries/candidate_posts.sql b/store/queries/candidate_posts.sql
@@ -22,11 +22,10 @@ WHERE
       cp.is_hidden = false
   AND ca.status = 'approved'
   AND (@tag::TEXT = '' OR @tag::TEXT = ANY (cp.tags))
-  AND (@cursor_timestamp::TIMESTAMPTZ IS NULL OR
-       cp.created_at < @cursor_timestamp)
+  AND (cp.indexed_at < @cursor_timestamp)
   AND cp.deleted_at IS NULL
 ORDER BY
-    cp.created_at DESC
+    cp.indexed_at DESC
 LIMIT @_limit;
 
 -- name: GetPostsWithLikes :many
@@ -38,8 +37,7 @@ SELECT
          candidate_likes cl
      WHERE
            cl.subject_uri = cp.uri
-       AND (@cursor_timestamp::TIMESTAMPTZ IS NULL OR
-            cl.indexed_at < @cursor_timestamp)
+       AND (cl.indexed_at < @cursor_timestamp)
        AND cl.deleted_at IS NULL) AS likes
 FROM
     candidate_posts cp
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CREATE INDEX candidate_posts_indexed_at_idx ON public.candidate_posts (indexed_at,is_hidden);