Skip to content
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

feat: Mark snapshot envelopes with snapshot source #469

Merged
merged 3 commits into from
Oct 19, 2023
Merged

feat: Mark snapshot envelopes with snapshot source #469

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd11c0c
fix: Mark snapshot envelopes with snapshot source
johanandren Oct 19, 2023
aa314c9
Proper EnvelopeOrigin
johanandren Oct 19, 2023
d3bc39b
Fix for snapshot stage double pull race
johanandren Oct 19, 2023
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: 4 additions & 0 deletions core/src/main/scala/akka/persistence/r2dbc/internal/EnvelopeOrigin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import akka.persistence.query.typed.EventEnvelope
val SourceQuery = ""
val SourceBacktracking = "BT"
val SourcePubSub = "PS"
val SourceSnapshot = "SN"

def fromQuery(env: EventEnvelope[_]): Boolean =
env.source == SourceQuery
Expand All @@ -28,6 +29,9 @@ import akka.persistence.query.typed.EventEnvelope
def fromPubSub(env: EventEnvelope[_]): Boolean =
env.source == SourcePubSub

def fromSnapshot(env: EventEnvelope[_]): Boolean =
env.source == SourceSnapshot

def isFilteredEvent(env: Any): Boolean =
env match {
case e: EventEnvelope[_] => e.filtered
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/akka/persistence/r2dbc/query/scaladsl/R2dbcReadJournal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ final class R2dbcReadJournal(system: ExtendedActorSystem, config: Config, cfgPat
row.entityType,
row.slice,
filtered = false,
source = "",
source = EnvelopeOrigin.SourceSnapshot,
tags = row.tags)
}

Expand Down
6 changes: 4 additions & 2 deletions ...st/scala/akka/persistence/r2dbc/query/EventsByPersistenceIdStartingFromSnapshotSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
package akka.persistence.r2dbc.query

import java.time.Instant

import akka.Done
import akka.NotUsed
import akka.actor.testkit.typed.scaladsl.LogCapturing
Expand All @@ -20,6 +19,7 @@ import akka.persistence.r2dbc.TestActors.Persister.PersistWithAck
import akka.persistence.r2dbc.TestConfig
import akka.persistence.r2dbc.TestData
import akka.persistence.r2dbc.TestDbLifecycle
import akka.persistence.r2dbc.internal.EnvelopeOrigin
import akka.persistence.r2dbc.query.scaladsl.R2dbcReadJournal
import akka.persistence.typed.PersistenceId
import akka.stream.scaladsl.Source
Expand Down Expand Up @@ -124,7 +124,9 @@ class EventsByPersistenceIdStartingFromSnapshotSpec
.runWith(sinkProbe)
.request(21)

result.expectNext().event shouldBe expectedSnapshotEvent(17)
val evt17 = result.expectNext()
evt17.event shouldBe expectedSnapshotEvent(17)
EnvelopeOrigin.fromSnapshot(evt17) shouldBe true
for (i <- 18 to 20) {
result.expectNext().event shouldBe s"e-$i"
}
Expand Down