Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/fix-memory-journal-next-sequence.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"effect": patch
---

Return the first unused remote sequence from the in-memory event journal.
10 changes: 5 additions & 5 deletions packages/effect/src/unstable/eventlog/EventJournal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class EventJournal extends Context.Service<EventJournal, {
) => Effect.Effect<A, EventJournalError | E, R>

/**
* Retrieve the last known sequence number for a remote source.
* Retrieve the first unused sequence number for a remote source.
*/
readonly nextRemoteSequence: (remoteId: RemoteId) => Effect.Effect<number, EventJournalError>

Expand Down Expand Up @@ -417,8 +417,8 @@ export const makeMemory: Effect.Effect<EventJournal["Service"]> = Effect.gen(fun
for (const remoteEntry of options.entries) {
if (byId.has(remoteEntry.entry.idString)) {
duplicateEntries.push(remoteEntry.entry)
if (remoteEntry.remoteSequence > remote.sequence) {
remote.sequence = remoteEntry.remoteSequence
if (remoteEntry.remoteSequence >= remote.sequence) {
remote.sequence = remoteEntry.remoteSequence + 1
}
continue
}
Expand Down Expand Up @@ -456,8 +456,8 @@ export const makeMemory: Effect.Effect<EventJournal["Service"]> = Effect.gen(fun
target.missing.push(remoteEntry.entry)
}
})
if (remoteEntry.remoteSequence > remote.sequence) {
remote.sequence = remoteEntry.remoteSequence
if (remoteEntry.remoteSequence >= remote.sequence) {
remote.sequence = remoteEntry.remoteSequence + 1
}
}
journal.sort((a, b) => a.createdAtMillis - b.createdAtMillis)
Expand Down
26 changes: 26 additions & 0 deletions packages/effect/test/unstable/eventlog/EventJournal.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,32 @@ describe("EventJournal", () => {
assert.deepStrictEqual(sourceMissing, [])
}))

it.effect("returns the next unused remote sequence", () =>
Comment thread
pullfrog[bot] marked this conversation as resolved.
Effect.gen(function*() {
const journal = yield* EventJournal.makeMemory
const remoteId = EventJournal.makeRemoteIdUnsafe()
const entry = new EventJournal.Entry({
id: EventJournal.makeEntryIdUnsafe(),
event: "Repro",
primaryKey: "key",
payload: new Uint8Array()
}, { disableChecks: true })

assert.strictEqual(yield* journal.nextRemoteSequence(remoteId), 0)
yield* journal.writeFromRemote({
remoteId,
entries: [new EventJournal.RemoteEntry({ remoteSequence: 0, entry })],
effect: () => Effect.void
})
assert.strictEqual(yield* journal.nextRemoteSequence(remoteId), 1)
Comment thread
pullfrog[bot] marked this conversation as resolved.
yield* journal.writeFromRemote({
remoteId,
entries: [new EventJournal.RemoteEntry({ remoteSequence: 5, entry })],
effect: () => Effect.void
})
assert.strictEqual(yield* journal.nextRemoteSequence(remoteId), 6)
}))

it.effect("records entries in memory and publishes local changes", () =>
Effect.gen(function*() {
const journal = yield* EventJournal.EventJournal
Expand Down
Loading