Skip to content

backfill: recover never-bridged messages in forward backfill #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Fizzadar wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

backfill: recover never-bridged messages in forward backfill #286

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions pkg/connector/backfill.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,16 +318,10 @@ func (m *MetaClient) wrapBackfillEvents(ctx context.Context, portal *bridgev2.Po
}
return false
})
if anchor != nil {
if forward {
upsert.Messages = slices.DeleteFunc(upsert.Messages, func(message *table.WrappedMessage) bool {
return message.TimestampMs <= anchor.Timestamp.UnixMilli()
})
} else {
upsert.Messages = slices.DeleteFunc(upsert.Messages, func(message *table.WrappedMessage) bool {
return message.TimestampMs >= anchor.Timestamp.UnixMilli()
})
}
if anchor != nil && !forward {
upsert.Messages = slices.DeleteFunc(upsert.Messages, func(message *table.WrappedMessage) bool {
return message.TimestampMs >= anchor.Timestamp.UnixMilli()
})
}
wrappedMessages := make([]*bridgev2.BackfillMessage, len(upsert.Messages))
for i, msg := range upsert.Messages {
Expand Down Expand Up @@ -371,5 +365,9 @@ func (m *MetaClient) wrapBackfillEvents(ctx context.Context, portal *bridgev2.Po
Messages: wrappedMessages,
HasMore: upsert.Range.HasMoreBefore,
MarkRead: upsert.MarkRead,
// Forward backfill can fetch a range covering never-bridged mid-timeline messages (older than
// the anchor) that a reconnect snapshot skipped. Deduplicate by message ID instead of trimming
// on timestamp so those messages are recovered while genuine duplicates are still dropped.
AggressiveDeduplication: forward,
}
}
Loading