perf(pagination): split list queries into first-page and after-cursor variants
Skeleton contracts / contracts (pull_request) Canceled after 0s
Skeleton contracts / contracts (pull_request) Canceled after 0s
This commit is contained in:
+18
-7
@@ -40,7 +40,7 @@ WHERE c.id = sqlc.arg(id)
|
||||
AND m.user_id = sqlc.arg(user_id)
|
||||
);
|
||||
|
||||
-- name: ListChats :many
|
||||
-- name: ListChatsFirstPage :many
|
||||
SELECT
|
||||
c.*,
|
||||
ARRAY(
|
||||
@@ -51,12 +51,23 @@ SELECT
|
||||
FROM chats c
|
||||
JOIN chat_members m ON m.chat_id = c.id
|
||||
WHERE m.user_id = sqlc.arg(user_id)
|
||||
AND (
|
||||
sqlc.narg(after_created_at)::timestamptz IS NULL
|
||||
OR (c.created_at, c.id) > (
|
||||
sqlc.narg(after_created_at)::timestamptz,
|
||||
sqlc.narg(after_id)::uuid
|
||||
)
|
||||
ORDER BY c.created_at, c.id
|
||||
LIMIT sqlc.arg(lim);
|
||||
|
||||
-- name: ListChatsAfter :many
|
||||
SELECT
|
||||
c.*,
|
||||
ARRAY(
|
||||
SELECT cm.user_id FROM chat_members cm
|
||||
WHERE cm.chat_id = c.id
|
||||
ORDER BY cm.user_id
|
||||
)::uuid[] AS member_ids
|
||||
FROM chats c
|
||||
JOIN chat_members m ON m.chat_id = c.id
|
||||
WHERE m.user_id = sqlc.arg(user_id)
|
||||
AND (c.created_at, c.id) > (
|
||||
sqlc.arg(after_created_at)::timestamptz,
|
||||
sqlc.arg(after_id)::uuid
|
||||
)
|
||||
ORDER BY c.created_at, c.id
|
||||
LIMIT sqlc.arg(lim);
|
||||
|
||||
+10
-7
@@ -17,15 +17,18 @@ WHERE EXISTS (
|
||||
)
|
||||
RETURNING *;
|
||||
|
||||
-- name: ListMessages :many
|
||||
-- name: ListMessagesFirstPage :many
|
||||
SELECT * FROM messages
|
||||
WHERE chat_id = sqlc.arg(chat_id)
|
||||
AND (
|
||||
sqlc.narg(after_created_at)::timestamptz IS NULL
|
||||
OR (created_at, id) > (
|
||||
sqlc.narg(after_created_at)::timestamptz,
|
||||
sqlc.narg(after_id)::uuid
|
||||
)
|
||||
ORDER BY created_at, id
|
||||
LIMIT sqlc.arg(lim);
|
||||
|
||||
-- name: ListMessagesAfter :many
|
||||
SELECT * FROM messages
|
||||
WHERE chat_id = sqlc.arg(chat_id)
|
||||
AND (created_at, id) > (
|
||||
sqlc.arg(after_created_at)::timestamptz,
|
||||
sqlc.arg(after_id)::uuid
|
||||
)
|
||||
ORDER BY created_at, id
|
||||
LIMIT sqlc.arg(lim);
|
||||
|
||||
+64
-15
@@ -116,7 +116,7 @@ func (q *Queries) IsChatMember(ctx context.Context, arg IsChatMemberParams) (boo
|
||||
return exists, err
|
||||
}
|
||||
|
||||
const listChats = `-- name: ListChats :many
|
||||
const listChatsAfter = `-- name: ListChatsAfter :many
|
||||
SELECT
|
||||
c.id, c.title, c.created_at,
|
||||
ARRAY(
|
||||
@@ -127,33 +127,30 @@ SELECT
|
||||
FROM chats c
|
||||
JOIN chat_members m ON m.chat_id = c.id
|
||||
WHERE m.user_id = $1
|
||||
AND (
|
||||
$2::timestamptz IS NULL
|
||||
OR (c.created_at, c.id) > (
|
||||
$2::timestamptz,
|
||||
$3::uuid
|
||||
)
|
||||
AND (c.created_at, c.id) > (
|
||||
$2::timestamptz,
|
||||
$3::uuid
|
||||
)
|
||||
ORDER BY c.created_at, c.id
|
||||
LIMIT $4
|
||||
`
|
||||
|
||||
type ListChatsParams struct {
|
||||
type ListChatsAfterParams struct {
|
||||
UserID uuid.UUID
|
||||
AfterCreatedAt *time.Time
|
||||
AfterID *uuid.UUID
|
||||
AfterCreatedAt time.Time
|
||||
AfterID uuid.UUID
|
||||
Lim int32
|
||||
}
|
||||
|
||||
type ListChatsRow struct {
|
||||
type ListChatsAfterRow struct {
|
||||
ID uuid.UUID
|
||||
Title string
|
||||
CreatedAt time.Time
|
||||
MemberIds []uuid.UUID
|
||||
}
|
||||
|
||||
func (q *Queries) ListChats(ctx context.Context, arg ListChatsParams) ([]ListChatsRow, error) {
|
||||
rows, err := q.db.Query(ctx, listChats,
|
||||
func (q *Queries) ListChatsAfter(ctx context.Context, arg ListChatsAfterParams) ([]ListChatsAfterRow, error) {
|
||||
rows, err := q.db.Query(ctx, listChatsAfter,
|
||||
arg.UserID,
|
||||
arg.AfterCreatedAt,
|
||||
arg.AfterID,
|
||||
@@ -163,9 +160,61 @@ func (q *Queries) ListChats(ctx context.Context, arg ListChatsParams) ([]ListCha
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
items := []ListChatsRow{}
|
||||
items := []ListChatsAfterRow{}
|
||||
for rows.Next() {
|
||||
var i ListChatsRow
|
||||
var i ListChatsAfterRow
|
||||
if err := rows.Scan(
|
||||
&i.ID,
|
||||
&i.Title,
|
||||
&i.CreatedAt,
|
||||
&i.MemberIds,
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, i)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const listChatsFirstPage = `-- name: ListChatsFirstPage :many
|
||||
SELECT
|
||||
c.id, c.title, c.created_at,
|
||||
ARRAY(
|
||||
SELECT cm.user_id FROM chat_members cm
|
||||
WHERE cm.chat_id = c.id
|
||||
ORDER BY cm.user_id
|
||||
)::uuid[] AS member_ids
|
||||
FROM chats c
|
||||
JOIN chat_members m ON m.chat_id = c.id
|
||||
WHERE m.user_id = $1
|
||||
ORDER BY c.created_at, c.id
|
||||
LIMIT $2
|
||||
`
|
||||
|
||||
type ListChatsFirstPageParams struct {
|
||||
UserID uuid.UUID
|
||||
Lim int32
|
||||
}
|
||||
|
||||
type ListChatsFirstPageRow struct {
|
||||
ID uuid.UUID
|
||||
Title string
|
||||
CreatedAt time.Time
|
||||
MemberIds []uuid.UUID
|
||||
}
|
||||
|
||||
func (q *Queries) ListChatsFirstPage(ctx context.Context, arg ListChatsFirstPageParams) ([]ListChatsFirstPageRow, error) {
|
||||
rows, err := q.db.Query(ctx, listChatsFirstPage, arg.UserID, arg.Lim)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
items := []ListChatsFirstPageRow{}
|
||||
for rows.Next() {
|
||||
var i ListChatsFirstPageRow
|
||||
if err := rows.Scan(
|
||||
&i.ID,
|
||||
&i.Title,
|
||||
|
||||
+47
-12
@@ -57,29 +57,26 @@ func (q *Queries) CreateMessage(ctx context.Context, arg CreateMessageParams) (M
|
||||
return i, err
|
||||
}
|
||||
|
||||
const listMessages = `-- name: ListMessages :many
|
||||
const listMessagesAfter = `-- name: ListMessagesAfter :many
|
||||
SELECT id, chat_id, sender_id, text, created_at FROM messages
|
||||
WHERE chat_id = $1
|
||||
AND (
|
||||
$2::timestamptz IS NULL
|
||||
OR (created_at, id) > (
|
||||
$2::timestamptz,
|
||||
$3::uuid
|
||||
)
|
||||
AND (created_at, id) > (
|
||||
$2::timestamptz,
|
||||
$3::uuid
|
||||
)
|
||||
ORDER BY created_at, id
|
||||
LIMIT $4
|
||||
`
|
||||
|
||||
type ListMessagesParams struct {
|
||||
type ListMessagesAfterParams struct {
|
||||
ChatID uuid.UUID
|
||||
AfterCreatedAt *time.Time
|
||||
AfterID *uuid.UUID
|
||||
AfterCreatedAt time.Time
|
||||
AfterID uuid.UUID
|
||||
Lim int32
|
||||
}
|
||||
|
||||
func (q *Queries) ListMessages(ctx context.Context, arg ListMessagesParams) ([]Message, error) {
|
||||
rows, err := q.db.Query(ctx, listMessages,
|
||||
func (q *Queries) ListMessagesAfter(ctx context.Context, arg ListMessagesAfterParams) ([]Message, error) {
|
||||
rows, err := q.db.Query(ctx, listMessagesAfter,
|
||||
arg.ChatID,
|
||||
arg.AfterCreatedAt,
|
||||
arg.AfterID,
|
||||
@@ -108,3 +105,41 @@ func (q *Queries) ListMessages(ctx context.Context, arg ListMessagesParams) ([]M
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const listMessagesFirstPage = `-- name: ListMessagesFirstPage :many
|
||||
SELECT id, chat_id, sender_id, text, created_at FROM messages
|
||||
WHERE chat_id = $1
|
||||
ORDER BY created_at, id
|
||||
LIMIT $2
|
||||
`
|
||||
|
||||
type ListMessagesFirstPageParams struct {
|
||||
ChatID uuid.UUID
|
||||
Lim int32
|
||||
}
|
||||
|
||||
func (q *Queries) ListMessagesFirstPage(ctx context.Context, arg ListMessagesFirstPageParams) ([]Message, error) {
|
||||
rows, err := q.db.Query(ctx, listMessagesFirstPage, arg.ChatID, arg.Lim)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
items := []Message{}
|
||||
for rows.Next() {
|
||||
var i Message
|
||||
if err := rows.Scan(
|
||||
&i.ID,
|
||||
&i.ChatID,
|
||||
&i.SenderID,
|
||||
&i.Text,
|
||||
&i.CreatedAt,
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, i)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
+46
-33
@@ -5,7 +5,6 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"slices"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/jackc/pgx/v5"
|
||||
@@ -27,7 +26,8 @@ type chatQueries interface {
|
||||
AddChatMembers(ctx context.Context, arg db.AddChatMembersParams) error
|
||||
CreateChat(ctx context.Context, arg db.CreateChatParams) (db.Chat, error)
|
||||
GetChat(ctx context.Context, arg db.GetChatParams) (db.GetChatRow, error)
|
||||
ListChats(ctx context.Context, arg db.ListChatsParams) ([]db.ListChatsRow, error)
|
||||
ListChatsAfter(ctx context.Context, arg db.ListChatsAfterParams) ([]db.ListChatsAfterRow, error)
|
||||
ListChatsFirstPage(ctx context.Context, arg db.ListChatsFirstPageParams) ([]db.ListChatsFirstPageRow, error)
|
||||
}
|
||||
|
||||
type txBeginner interface {
|
||||
@@ -142,48 +142,61 @@ func (s *ChatService) List(
|
||||
limit int,
|
||||
cursor *string,
|
||||
) ([]model.Chat, *string, error) {
|
||||
var afterCreatedAt *time.Time
|
||||
var afterID *uuid.UUID
|
||||
var chats []model.Chat
|
||||
|
||||
if cursor != nil {
|
||||
decoded, err := decodeCursor(*cursor, uuid.Nil)
|
||||
if cursor == nil {
|
||||
rows, err := s.q.ListChatsFirstPage(ctx, db.ListChatsFirstPageParams{
|
||||
UserID: userID,
|
||||
Lim: int32(limit + 1),
|
||||
})
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
chats = make([]model.Chat, 0, len(rows))
|
||||
for _, r := range rows {
|
||||
chats = append(chats, model.Chat{
|
||||
ID: r.ID,
|
||||
Title: r.Title,
|
||||
CreatedAt: r.CreatedAt,
|
||||
MemberIDs: r.MemberIds,
|
||||
})
|
||||
}
|
||||
} else {
|
||||
decoded, derr := decodeCursor(*cursor, uuid.Nil)
|
||||
if derr != nil {
|
||||
return nil, nil, ErrInvalidCursor
|
||||
}
|
||||
|
||||
afterCreatedAt = &decoded.CreatedAt
|
||||
afterID = &decoded.ID
|
||||
}
|
||||
|
||||
rows, err := s.q.ListChats(ctx, db.ListChatsParams{
|
||||
UserID: userID,
|
||||
AfterCreatedAt: afterCreatedAt,
|
||||
AfterID: afterID,
|
||||
Lim: int32(limit + 1),
|
||||
})
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
hasMore := len(rows) > limit
|
||||
if hasMore {
|
||||
rows = rows[:limit]
|
||||
}
|
||||
|
||||
chats := make([]model.Chat, 0, len(rows))
|
||||
for _, r := range rows {
|
||||
chats = append(chats, model.Chat{
|
||||
ID: r.ID,
|
||||
Title: r.Title,
|
||||
CreatedAt: r.CreatedAt,
|
||||
MemberIDs: r.MemberIds,
|
||||
rows, err := s.q.ListChatsAfter(ctx, db.ListChatsAfterParams{
|
||||
UserID: userID,
|
||||
AfterCreatedAt: decoded.CreatedAt,
|
||||
AfterID: decoded.ID,
|
||||
Lim: int32(limit + 1),
|
||||
})
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
chats = make([]model.Chat, 0, len(rows))
|
||||
for _, r := range rows {
|
||||
chats = append(chats, model.Chat{
|
||||
ID: r.ID,
|
||||
Title: r.Title,
|
||||
CreatedAt: r.CreatedAt,
|
||||
MemberIDs: r.MemberIds,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
hasMore := len(chats) > limit
|
||||
if hasMore {
|
||||
chats = chats[:limit]
|
||||
}
|
||||
|
||||
var next *string
|
||||
if hasMore {
|
||||
last := chats[len(chats)-1]
|
||||
|
||||
c := encodeCursor(Cursor{
|
||||
CreatedAt: last.CreatedAt,
|
||||
ID: last.ID,
|
||||
|
||||
+17
-16
@@ -3,7 +3,6 @@ package service
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
|
||||
@@ -17,7 +16,8 @@ var ErrMessageChatNotFound = errors.New("chat not found")
|
||||
type messageQueries interface {
|
||||
CreateMessage(ctx context.Context, arg db.CreateMessageParams) (db.Message, error)
|
||||
IsChatMember(ctx context.Context, arg db.IsChatMemberParams) (bool, error)
|
||||
ListMessages(ctx context.Context, arg db.ListMessagesParams) ([]db.Message, error)
|
||||
ListMessagesAfter(ctx context.Context, arg db.ListMessagesAfterParams) ([]db.Message, error)
|
||||
ListMessagesFirstPage(ctx context.Context, arg db.ListMessagesFirstPageParams) ([]db.Message, error)
|
||||
}
|
||||
|
||||
type MessageService struct {
|
||||
@@ -79,25 +79,26 @@ func (s *MessageService) List(
|
||||
return nil, nil, ErrMessageChatNotFound
|
||||
}
|
||||
|
||||
var afterCreatedAt *time.Time
|
||||
var afterID *uuid.UUID
|
||||
var rows []db.Message
|
||||
|
||||
if cursor != nil {
|
||||
decoded, err := decodeCursor(*cursor, chatID)
|
||||
if err != nil {
|
||||
if cursor == nil {
|
||||
rows, err = s.q.ListMessagesFirstPage(ctx, db.ListMessagesFirstPageParams{
|
||||
ChatID: chatID,
|
||||
Lim: int32(limit + 1),
|
||||
})
|
||||
} else {
|
||||
decoded, derr := decodeCursor(*cursor, chatID)
|
||||
if derr != nil {
|
||||
return nil, nil, ErrInvalidCursor
|
||||
}
|
||||
|
||||
afterCreatedAt = &decoded.CreatedAt
|
||||
afterID = &decoded.ID
|
||||
rows, err = s.q.ListMessagesAfter(ctx, db.ListMessagesAfterParams{
|
||||
ChatID: chatID,
|
||||
AfterCreatedAt: decoded.CreatedAt,
|
||||
AfterID: decoded.ID,
|
||||
Lim: int32(limit + 1),
|
||||
})
|
||||
}
|
||||
|
||||
rows, err := s.q.ListMessages(ctx, db.ListMessagesParams{
|
||||
ChatID: chatID,
|
||||
AfterCreatedAt: afterCreatedAt,
|
||||
AfterID: afterID,
|
||||
Lim: int32(limit + 1),
|
||||
})
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user