Skip to content

fix(wiretap): retry unresolved cache entries #190

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

Open
Nicolas0315 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(wiretap): retry unresolved cache entries #190

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions internal/discorddesktop/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ type scanTotals struct {

type unresolvedMessages map[string]string

const wiretapFileIndexScope = "wiretap:file_index:v1"
const wiretapFileIndexScope = "wiretap:file_index:v2"

const (
fileStatusImported = "imported"
Expand Down Expand Up @@ -686,7 +686,7 @@ func checkpointScannedCandidates(ctx context.Context, st *store.Store, opts Opti
return err
}
for _, candidate := range candidates {
state.current[candidate.relKey] = importedFingerprint(candidate.fingerprint)
state.current[candidate.relKey] = skippedFingerprint(candidate.fingerprint)
}
if err := saveFileIndex(ctx, st, opts, state.current); err != nil {
return err
Expand Down
1 change: 1 addition & 0 deletions internal/discorddesktop/import_helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ func TestSnapshotFinalizeAndCommitBranches(t *testing.T) {

require.NoError(t, checkpointScannedCandidates(ctx, s, Options{DryRun: true}, state, candidates, stats))
require.NoError(t, checkpointScannedCandidates(ctx, s, Options{}, state, candidates, stats))
require.False(t, isImportedFingerprint(state.current["Cache_Data/entry"]))
}

func TestRouteHintCollectionBranches(t *testing.T) {
Expand Down
22 changes: 18 additions & 4 deletions internal/discorddesktop/import_pipeline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,22 @@ func TestImportCheckpointsUnresolvableRouteBearingCacheMisses(t *testing.T) {

stats, err = Import(ctx, st, Options{Path: dir})
require.NoError(t, err)
require.Equal(t, 0, stats.FilesScanned)
require.Equal(t, 1, stats.FilesUnchanged)
require.Equal(t, 1, stats.FilesScanned)
require.Equal(t, 1, stats.SkippedMessages)
require.Equal(t, 0, stats.FilesUnchanged)

require.NoError(t, os.WriteFile(filepath.Join(cachePath, "entry_001"), bytesf(`https://discord.com/channels/999999999999999996/%s
{"id":"%s","guild_id":"999999999999999996","type":0,"name":"later-resolved"}
`, channelID, channelID), 0o600))
stats, err = Import(ctx, st, Options{Path: dir})
require.NoError(t, err)
require.Equal(t, 2, stats.FilesScanned)
require.Equal(t, 1, stats.Messages)

results, err = st.SearchMessages(ctx, store.SearchOptions{Query: "permanent unresolved", Limit: 10})
require.NoError(t, err)
require.Len(t, results, 1)
require.Equal(t, "later-resolved", results[0].ChannelName)
}

func TestImportDoesNotAppendEventsForSkippedMixedBatch(t *testing.T) {
Expand Down Expand Up @@ -269,8 +283,8 @@ https://discord.com/api/v9/channels/%s/messages?limit=50

stats, err = Import(ctx, st, Options{Path: dir})
require.NoError(t, err)
require.Equal(t, 0, stats.FilesScanned)
require.Equal(t, 1, stats.FilesUnchanged)
require.Equal(t, 1, stats.FilesScanned)
require.Equal(t, 0, stats.FilesUnchanged)
requireMessageCount(t, ctx, st, "message_events", 0)
}

Expand Down