raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

persistentId -> persistenceId

Browse source
This commit is contained in:
Arnout Engelen 2019-05-14 14:06:55 +02:00
parent 1852649d0d
commit dae1870a10
No known key found for this signature in database
GPG key ID: BB8C0F854A1E2105
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorJavaDslTest.java
View file

@ -190,9 +190,9 @@ public class PersistentActorJavaDslTest extends JUnitSuite {
private static class CounterBehavior extends EventSourcedBehavior<Command, Incremented, State> { private static class CounterBehavior extends EventSourcedBehavior<Command, Incremented, State> {
private final ActorContext<Command> ctx; private final ActorContext<Command> ctx;
CounterBehavior(PersistenceId persistentId, ActorContext<Command> ctx) { CounterBehavior(PersistenceId persistenceId, ActorContext<Command> ctx) {
super( super(
persistentId, persistenceId,
SupervisorStrategy.restartWithBackoff(Duration.ofMillis(1), Duration.ofMillis(5), 0.1)); SupervisorStrategy.restartWithBackoff(Duration.ofMillis(1), Duration.ofMillis(5), 0.1));
this.ctx = ctx; this.ctx = ctx;
} }

6
akka-persistence/src/main/scala/akka/persistence/journal/ReplayFilter.scala
View file

@ -80,7 +80,7 @@ private[akka] class ReplayFilter(
if (r.persistent.sequenceNr < seqNo) { if (r.persistent.sequenceNr < seqNo) {
val errMsg = s"Invalid replayed event [sequenceNr=${r.persistent.sequenceNr}, writerUUID=${r.persistent.writerUuid}] as " + val errMsg = s"Invalid replayed event [sequenceNr=${r.persistent.sequenceNr}, writerUUID=${r.persistent.writerUuid}] as " +
s"the sequenceNr should be equal to or greater than already-processed event [sequenceNr=${seqNo}, writerUUID=${writerUuid}] from the same writer, for the same persistenceId [${r.persistent.persistenceId}]. " + s"the sequenceNr should be equal to or greater than already-processed event [sequenceNr=${seqNo}, writerUUID=${writerUuid}] from the same writer, for the same persistenceId [${r.persistent.persistenceId}]. " +
"Perhaps, events were journaled out of sequence, or duplicate persistentId for different entities?" "Perhaps, events were journaled out of sequence, or duplicate persistenceId for different entities?"
logIssue(errMsg) logIssue(errMsg)
mode match { mode match {
case RepairByDiscardOld => // discard case RepairByDiscardOld => // discard
@ -98,7 +98,7 @@ private[akka] class ReplayFilter(
// from old writer // from old writer
val errMsg = s"Invalid replayed event [sequenceNr=${r.persistent.sequenceNr}, writerUUID=${r.persistent.writerUuid}]. " + val errMsg = s"Invalid replayed event [sequenceNr=${r.persistent.sequenceNr}, writerUUID=${r.persistent.writerUuid}]. " +
s"There was already a newer writer whose last replayed event was [sequenceNr=${seqNo}, writerUUID=${writerUuid}] for the same persistenceId [${r.persistent.persistenceId}]." + s"There was already a newer writer whose last replayed event was [sequenceNr=${seqNo}, writerUUID=${writerUuid}] for the same persistenceId [${r.persistent.persistenceId}]." +
"Perhaps, the old writer kept journaling messages after the new writer created, or duplicate persistentId for different entities?" "Perhaps, the old writer kept journaling messages after the new writer created, or duplicate persistenceId for different entities?"
logIssue(errMsg) logIssue(errMsg)
mode match { mode match {
case RepairByDiscardOld => // discard case RepairByDiscardOld => // discard
@ -124,7 +124,7 @@ private[akka] class ReplayFilter(
if (msg.persistent.sequenceNr >= seqNo) { if (msg.persistent.sequenceNr >= seqNo) {
val errMsg = s"Invalid replayed event [sequenceNr=${r.persistent.sequenceNr}, writerUUID=${r.persistent.writerUuid}] from a new writer. " + val errMsg = s"Invalid replayed event [sequenceNr=${r.persistent.sequenceNr}, writerUUID=${r.persistent.writerUuid}] from a new writer. " +
s"An older writer already sent an event [sequenceNr=${msg.persistent.sequenceNr}, writerUUID=${msg.persistent.writerUuid}] whose sequence number was equal or greater for the same persistenceId [${r.persistent.persistenceId}]. " + s"An older writer already sent an event [sequenceNr=${msg.persistent.sequenceNr}, writerUUID=${msg.persistent.writerUuid}] whose sequence number was equal or greater for the same persistenceId [${r.persistent.persistenceId}]. " +
"Perhaps, the new writer journaled the event out of sequence, or duplicate persistentId for different entities?" "Perhaps, the new writer journaled the event out of sequence, or duplicate persistenceId for different entities?"
logIssue(errMsg) logIssue(errMsg)
mode match { mode match {
case RepairByDiscardOld => iter.remove() // discard case RepairByDiscardOld => iter.remove() // discard