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

!per #15230 rename processorId => persistentId

Browse source 
* This is NOT binary compatible, we're in an *experimental* module.
* disabled binary compat checks for package akka.persistence
* Source compatibility is retained, but users should migrate do the new
  method name ASAP.
* Plugin APIs were migrated in a way that allows the old plugins to
  compile agains 2.3.4 without having to change anything. Hopefuly this
  will help authors migrate to 2.3.4 sooner. This is only source level compatible, not binary compatible.
* added deprecation warnings on all processorId methods and provided bridges where possible
* for users, the migration should be painless, they can still override
  the old method, and it'll work. But we encourage them to move to
  persistenceId; All delegation code will have to be removed afterwards ofc.

Conflicts:
	akka-persistence/src/main/scala/akka/persistence/Channel.scala
	akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala
	akka-persistence/src/main/scala/akka/persistence/Persistent.scala
	akka-persistence/src/main/scala/akka/persistence/PersistentChannel.scala
	akka-persistence/src/main/scala/akka/persistence/Processor.scala
	akka-persistence/src/main/scala/akka/persistence/Snapshot.scala
	akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala
	akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala
	akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbKey.scala
	akka-persistence/src/main/scala/akka/persistence/snapshot/SnapshotStore.scala
	akka-persistence/src/test/scala/akka/persistence/serialization/SerializerSpec.scala
	project/AkkaBuild.scala
This commit is contained in:
Konrad 'ktoso' Malawski 2014-06-23 14:33:35 +02:00
parent c8406e3466
commit 4bb321a83a
58 changed files with 502 additions and 435 deletions
Download patch file Download diff file Expand all files Collapse all files

18
akka-docs/rst/java/code/docs/persistence/PersistenceDocTest.java
View file

@ -22,9 +22,9 @@ public class PersistenceDocTest {
public interface SomeOtherMessage {} public interface SomeOtherMessage {}
public interface ProcessorMethods { public interface ProcessorMethods {
//#processor-id //#persistence-id
public String processorId(); public String persistenceId();
//#processor-id //#persistence-id
//#recovery-status //#recovery-status
public boolean recoveryRunning(); public boolean recoveryRunning();
public boolean recoveryFinished(); public boolean recoveryFinished();
@ -120,12 +120,12 @@ public class PersistenceDocTest {
} }
class MyProcessor4 extends UntypedProcessor implements ProcessorMethods { class MyProcessor4 extends UntypedProcessor implements ProcessorMethods {
//#processor-id-override //#persistence-id-override
@Override @Override
public String processorId() { public String persistenceId() {
return "my-stable-processor-id"; return "my-stable-persistence-id";
} }
//#processor-id-override //#persistence-id-override
@Override @Override
public void onReceive(Object message) throws Exception {} public void onReceive(Object message) throws Exception {}
} }
@ -488,8 +488,8 @@ public class PersistenceDocTest {
//#view //#view
class MyView extends UntypedView { class MyView extends UntypedView {
@Override @Override
public String processorId() { public String persistenceId() {
return "some-processor-id"; return "some-persistence-id";
} }
@Override @Override

12
akka-docs/rst/java/code/docs/persistence/PersistencePluginDocTest.java
View file

@ -53,7 +53,7 @@ public class PersistencePluginDocTest {
class MySnapshotStore extends SnapshotStore { class MySnapshotStore extends SnapshotStore {
@Override @Override
public Future<Option<SelectedSnapshot>> doLoadAsync(String processorId, SnapshotSelectionCriteria criteria) { public Future<Option<SelectedSnapshot>> doLoadAsync(String persistenceId, SnapshotSelectionCriteria criteria) {
return null; return null;
} }
@ -71,7 +71,7 @@ public class PersistencePluginDocTest {
} }
@Override @Override
public void doDelete(String processorId, SnapshotSelectionCriteria criteria) throws Exception { public void doDelete(String persistenceId, SnapshotSelectionCriteria criteria) throws Exception {
} }
} }
@ -87,22 +87,22 @@ public class PersistencePluginDocTest {
} }
@Override @Override
public Future<Void> doAsyncDeleteMessages(Iterable<PersistentId> messageIds, boolean permanent) { public Future<Void> doAsyncDeleteMessages(Iterable<PersistenceId> messageIds, boolean permanent) {
return null; return null;
} }
@Override @Override
public Future<Void> doAsyncDeleteMessagesTo(String processorId, long toSequenceNr, boolean permanent) { public Future<Void> doAsyncDeleteMessagesTo(String persistenceId, long toSequenceNr, boolean permanent) {
return null; return null;
} }
@Override @Override
public Future<Void> doAsyncReplayMessages(String processorId, long fromSequenceNr, long toSequenceNr, long max, Procedure<PersistentRepr> replayCallback) { public Future<Void> doAsyncReplayMessages(String persistenceId, long fromSequenceNr, long toSequenceNr, long max, Procedure<PersistentRepr> replayCallback) {
return null; return null;
} }
@Override @Override
public Future<Long> doAsyncReadHighestSequenceNr(String processorId, long fromSequenceNr) { public Future<Long> doAsyncReadHighestSequenceNr(String persistenceId, long fromSequenceNr) {
return null; return null;
} }
} }

16
akka-docs/rst/java/lambda-persistence.rst
View file

@ -161,30 +161,30 @@ Identifiers
----------- -----------
A processor must have an identifier that doesn't change across different actor incarnations. It defaults to the A processor must have an identifier that doesn't change across different actor incarnations. It defaults to the
``String`` representation of processor's path without the address part and can be obtained via the ``processorId`` ``String`` representation of processor's path without the address part and can be obtained via the ``persistenceId``
method. method.
.. includecode:: ../../../akka-samples/akka-sample-persistence-java-lambda/src/main/java/doc/LambdaPersistenceDocTest.java#processor-id .. includecode:: ../../../akka-samples/akka-sample-persistence-java-lambda/src/main/java/doc/LambdaPersistenceDocTest.java#persistence-id
Applications can customize a processor's id by specifying an actor name during processor creation as shown in Applications can customize a processor's id by specifying an actor name during processor creation as shown in
section :ref:`processors-java`. This changes that processor's name in its actor hierarchy and hence influences only section :ref:`processors-java`. This changes that processor's name in its actor hierarchy and hence influences only
part of the processor id. To fully customize a processor's id, the ``processorId`` method must be overridden. part of the processor id. To fully customize a processor's id, the ``persistenceId`` method must be overridden.
.. includecode:: ../../../akka-samples/akka-sample-persistence-java-lambda/src/main/java/doc/LambdaPersistenceDocTest.java#processor-id-override .. includecode:: ../../../akka-samples/akka-sample-persistence-java-lambda/src/main/java/doc/LambdaPersistenceDocTest.java#persistence-id-override
Overriding ``processorId`` is the recommended way to generate stable identifiers. Overriding ``persistenceId`` is the recommended way to generate stable identifiers.
.. _views-java-lambda: .. _views-java-lambda:
Views Views
===== =====
Views can be implemented by extending the ``AbstractView`` abstract class, implement the ``processorId`` method Views can be implemented by extending the ``AbstractView`` abstract class, implement the ``persistenceId`` method
and setting the “initial behavior” in the constructor by calling the :meth:`receive` method. and setting the “initial behavior” in the constructor by calling the :meth:`receive` method.
.. includecode:: ../../../akka-samples/akka-sample-persistence-java-lambda/src/main/java/doc/LambdaPersistenceDocTest.java#view .. includecode:: ../../../akka-samples/akka-sample-persistence-java-lambda/src/main/java/doc/LambdaPersistenceDocTest.java#view
The ``processorId`` identifies the processor from which the view receives journaled messages. It is not necessary The ``persistenceId`` identifies the processor from which the view receives journaled messages. It is not necessary
the referenced processor is actually running. Views read messages from a processor's journal directly. When a the referenced processor is actually running. Views read messages from a processor's journal directly. When a
processor is started later and begins to write new messages, the corresponding view is updated automatically, by processor is started later and begins to write new messages, the corresponding view is updated automatically, by
default. default.
@ -234,7 +234,7 @@ Applications can customize a view's id by specifying an actor name during view c
name in its actor hierarchy and hence influences only part of the view id. To fully customize a view's id, the name in its actor hierarchy and hence influences only part of the view id. To fully customize a view's id, the
``viewId`` method must be overridden. Overriding ``viewId`` is the recommended way to generate stable identifiers. ``viewId`` method must be overridden. Overriding ``viewId`` is the recommended way to generate stable identifiers.
The ``viewId`` must differ from the referenced ``processorId``, unless :ref:`snapshots-java` of a view and its The ``viewId`` must differ from the referenced ``persistenceId``, unless :ref:`snapshots-java` of a view and its
processor shall be shared (which is what applications usually do not want). processor shall be shared (which is what applications usually do not want).
.. _channels-java-lambda: .. _channels-java-lambda:

16
akka-docs/rst/java/persistence.rst
View file

@ -175,30 +175,30 @@ Identifiers
----------- -----------
A processor must have an identifier that doesn't change across different actor incarnations. It defaults to the A processor must have an identifier that doesn't change across different actor incarnations. It defaults to the
``String`` representation of processor's path without the address part and can be obtained via the ``processorId`` ``String`` representation of processor's path without the address part and can be obtained via the ``persistenceId``
method. method.
.. includecode:: code/docs/persistence/PersistenceDocTest.java#processor-id .. includecode:: code/docs/persistence/PersistenceDocTest.java#persistence-id
Applications can customize a processor's id by specifying an actor name during processor creation as shown in Applications can customize a processor's id by specifying an actor name during processor creation as shown in
section :ref:`processors-java`. This changes that processor's name in its actor hierarchy and hence influences only section :ref:`processors-java`. This changes that processor's name in its actor hierarchy and hence influences only
part of the processor id. To fully customize a processor's id, the ``processorId`` method must be overridden. part of the processor id. To fully customize a processor's id, the ``persistenceId`` method must be overridden.
.. includecode:: code/docs/persistence/PersistenceDocTest.java#processor-id-override .. includecode:: code/docs/persistence/PersistenceDocTest.java#persistence-id-override
Overriding ``processorId`` is the recommended way to generate stable identifiers. Overriding ``persistenceId`` is the recommended way to generate stable identifiers.
.. _views-java: .. _views-java:
Views Views
===== =====
Views can be implemented by extending the ``UntypedView`` trait and implementing the ``onReceive`` and the ``processorId`` Views can be implemented by extending the ``UntypedView`` trait and implementing the ``onReceive`` and the ``persistenceId``
methods. methods.
.. includecode:: code/docs/persistence/PersistenceDocTest.java#view .. includecode:: code/docs/persistence/PersistenceDocTest.java#view
The ``processorId`` identifies the processor from which the view receives journaled messages. It is not necessary The ``persistenceId`` identifies the processor from which the view receives journaled messages. It is not necessary
the referenced processor is actually running. Views read messages from a processor's journal directly. When a the referenced processor is actually running. Views read messages from a processor's journal directly. When a
processor is started later and begins to write new messages, the corresponding view is updated automatically, by processor is started later and begins to write new messages, the corresponding view is updated automatically, by
default. default.
@ -248,7 +248,7 @@ Applications can customize a view's id by specifying an actor name during view c
name in its actor hierarchy and hence influences only part of the view id. To fully customize a view's id, the name in its actor hierarchy and hence influences only part of the view id. To fully customize a view's id, the
``viewId`` method must be overridden. Overriding ``viewId`` is the recommended way to generate stable identifiers. ``viewId`` method must be overridden. Overriding ``viewId`` is the recommended way to generate stable identifiers.
The ``viewId`` must differ from the referenced ``processorId``, unless :ref:`snapshots-java` of a view and its The ``viewId`` must differ from the referenced ``persistenceId``, unless :ref:`snapshots-java` of a view and its
processor shall be shared (which is what applications usually do not want). processor shall be shared (which is what applications usually do not want).
.. _channels-java: .. _channels-java:

2
akka-docs/rst/project/migration-guide-eventsourced-2.3.x.rst
View file

@ -84,7 +84,7 @@ Processors
channel in order to avoid redundant replies during replay. Sender references of type ``PromiseActorRef`` are channel in order to avoid redundant replies during replay. Sender references of type ``PromiseActorRef`` are
not journaled, they are ``system.deadLetters`` on replay. not journaled, they are ``system.deadLetters`` on replay.
- Supports :ref:`snapshots`. - Supports :ref:`snapshots`.
- :ref:`processor-identifiers` are of type ``String``, have a default value and can be overridden by applications. - :ref:`persistence-identifiers` are of type ``String``, have a default value and can be overridden by applications.
- Supports :ref:`batch-writes`. - Supports :ref:`batch-writes`.
- Supports stashing of messages. - Supports stashing of messages.

37
akka-docs/rst/project/migration-guide-persistence-experimental-2.3.x-2.4.x.rst
View file

@ -21,7 +21,42 @@ To extend ``PersistentActor``::
class NewPersistentProcessor extends PersistentActor { /*...*/ } class NewPersistentProcessor extends PersistentActor { /*...*/ }
No other API changes are required for this migration.
Renamed processorId to persistenceId
====================================
In Akka Persistence ``2.3.3`` and previously, the main building block of applications were Processors.
Persistent messages, as well as processors implemented the ``processorId`` method to identify which persistent entity a message belonged to.
This concept remains the same in Akka ``2.3.4``, yet we rename ``processorId`` to ``persistenceId`` because Processors will be removed,
and persistent messages can be used from different classes not only ``PersistentActor`` (Views, directly from Journals etc).
We provided the renamed method also on already deprecated classes (Channels), so you can simply apply a global rename of ``processorId`` to ``persistenceId``.
Plugin APIs: Renamed PersistentId to PersistenceId
==================================================
Following the removal of Processors and moving to ``persistenceId``, the plugin SPI visible type has changed.
The move from ``2.3.3`` to ``2.3.4`` should be relatively painless, and plugins will work even when using the deprecated ``PersistentId`` type.
Change your implementations from::
def asyncWriteMessages(messages: immutable.Seq[PersistentRepr]): Future[Unit] = // ...
def asyncDeleteMessages(messageIds: immutable.Seq[PersistentId], permanent: Boolean): Future[Unit] = {
val p = messageIds.head.processorId // old
// ...
}
to::
def asyncWriteMessages(messages: immutable.Seq[PersistentRepr]): Future[Unit] = // ...
def asyncDeleteMessages(messageIds: immutable.Seq[PersistenceId], permanent: Boolean): Future[Unit] = {
val p = messageIds.head.persistenceId // new
// ...
}
Plugins written for ``2.3.3`` are source level compatible with ``2.3.4``, using the deprecated types, but will not work with future releases.
Plugin maintainers are asked to update their plugins to ``2.3.4`` as soon as possible.
Removed Processor in favour of extending PersistentActor with persistAsync Removed Processor in favour of extending PersistentActor with persistAsync
========================================================================== ==========================================================================

24
akka-docs/rst/scala/code/docs/persistence/PersistenceDocSpec.scala
View file

@ -111,9 +111,9 @@ trait PersistenceDocSpec {
new AnyRef { new AnyRef {
trait ProcessorMethods { trait ProcessorMethods {
//#processor-id //#persistence-id
def processorId: String def persistenceId: String
//#processor-id //#persistence-id
//#recovery-status //#recovery-status
def recoveryRunning: Boolean def recoveryRunning: Boolean
def recoveryFinished: Boolean def recoveryFinished: Boolean
@ -123,9 +123,9 @@ trait PersistenceDocSpec {
//#current-message //#current-message
} }
class MyProcessor1 extends Processor with ProcessorMethods { class MyProcessor1 extends Processor with ProcessorMethods {
//#processor-id-override //#persistence-id-override
override def processorId = "my-stable-processor-id" override def persistenceId = "my-stable-persistence-id"
//#processor-id-override //#persistence-id-override
def receive = { def receive = {
case _ => case _ =>
} }
@ -411,7 +411,7 @@ trait PersistenceDocSpec {
//#view //#view
class MyView extends View { class MyView extends View {
def processorId: String = "some-processor-id" override def persistenceId: String = "some-persistence-id"
def receive: Actor.Receive = { def receive: Actor.Receive = {
case Persistent(payload, sequenceNr) => // ... case Persistent(payload, sequenceNr) => // ...
@ -440,26 +440,26 @@ trait PersistenceDocSpec {
val materializer = FlowMaterializer(MaterializerSettings()) val materializer = FlowMaterializer(MaterializerSettings())
val flow: Flow[Persistent] = PersistentFlow.fromProcessor("some-processor-id") val flow: Flow[Persistent] = PersistentFlow.fromPersistence("some-persistence-id")
val producer: Producer[Persistent] = flow.toProducer(materializer) val producer: Producer[Persistent] = flow.toProducer(materializer)
//#producer-creation //#producer-creation
//#producer-buffer-size //#producer-buffer-size
PersistentFlow.fromProcessor("some-processor-id", PersistentPublisherSettings(maxBufferSize = 200)) PersistentFlow.fromPersistence("some-persistence-id", PersistentPublisherSettings(maxBufferSize = 200))
//#producer-buffer-size //#producer-buffer-size
//#producer-examples //#producer-examples
// 1 producer and 2 consumers: // 1 producer and 2 consumers:
val producer1: Producer[Persistent] = val producer1: Producer[Persistent] =
PersistentFlow.fromProcessor("processor-1").toProducer(materializer) PersistentFlow.fromPersistence("processor-1").toProducer(materializer)
Flow(producer1).foreach(p => println(s"consumer-1: ${p.payload}")).consume(materializer) Flow(producer1).foreach(p => println(s"consumer-1: ${p.payload}")).consume(materializer)
Flow(producer1).foreach(p => println(s"consumer-2: ${p.payload}")).consume(materializer) Flow(producer1).foreach(p => println(s"consumer-2: ${p.payload}")).consume(materializer)
// 2 producers (merged) and 1 consumer: // 2 producers (merged) and 1 consumer:
val producer2: Producer[Persistent] = val producer2: Producer[Persistent] =
PersistentFlow.fromProcessor("processor-2").toProducer(materializer) PersistentFlow.fromPersistence("processor-2").toProducer(materializer)
val producer3: Producer[Persistent] = val producer3: Producer[Persistent] =
PersistentFlow.fromProcessor("processor-3").toProducer(materializer) PersistentFlow.fromPersistence("processor-3").toProducer(materializer)
Flow(producer2).merge(producer3).foreach { p => Flow(producer2).merge(producer3).foreach { p =>
println(s"consumer-3: ${p.payload}") println(s"consumer-3: ${p.payload}")
}.consume(materializer) }.consume(materializer)

12
akka-docs/rst/scala/code/docs/persistence/PersistencePluginDocSpec.scala
View file

@ -126,16 +126,16 @@ trait SharedLeveldbPluginDocSpec {
class MyJournal extends AsyncWriteJournal { class MyJournal extends AsyncWriteJournal {
def asyncWriteMessages(messages: Seq[PersistentRepr]): Future[Unit] = ??? def asyncWriteMessages(messages: Seq[PersistentRepr]): Future[Unit] = ???
def asyncWriteConfirmations(confirmations: Seq[PersistentConfirmation]): Future[Unit] = ??? def asyncWriteConfirmations(confirmations: Seq[PersistentConfirmation]): Future[Unit] = ???
def asyncDeleteMessages(messageIds: Seq[PersistentId], permanent: Boolean): Future[Unit] = ??? def asyncDeleteMessages(messageIds: Seq[PersistenceId], permanent: Boolean): Future[Unit] = ???
def asyncDeleteMessagesTo(processorId: String, toSequenceNr: Long, permanent: Boolean): Future[Unit] = ??? def asyncDeleteMessagesTo(persistenceId: String, toSequenceNr: Long, permanent: Boolean): Future[Unit] = ???
def asyncReplayMessages(processorId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: (PersistentRepr) => Unit): Future[Unit] = ??? def asyncReplayMessages(persistenceId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: (PersistentRepr) => Unit): Future[Unit] = ???
def asyncReadHighestSequenceNr(processorId: String, fromSequenceNr: Long): Future[Long] = ??? def asyncReadHighestSequenceNr(persistenceId: String, fromSequenceNr: Long): Future[Long] = ???
} }
class MySnapshotStore extends SnapshotStore { class MySnapshotStore extends SnapshotStore {
def loadAsync(processorId: String, criteria: SnapshotSelectionCriteria): Future[Option[SelectedSnapshot]] = ??? def loadAsync(persistenceId: String, criteria: SnapshotSelectionCriteria): Future[Option[SelectedSnapshot]] = ???
def saveAsync(metadata: SnapshotMetadata, snapshot: Any): Future[Unit] = ??? def saveAsync(metadata: SnapshotMetadata, snapshot: Any): Future[Unit] = ???
def saved(metadata: SnapshotMetadata): Unit = ??? def saved(metadata: SnapshotMetadata): Unit = ???
def delete(metadata: SnapshotMetadata): Unit = ??? def delete(metadata: SnapshotMetadata): Unit = ???
def delete(processorId: String, criteria: SnapshotSelectionCriteria): Unit = ??? def delete(persistenceId: String, criteria: SnapshotSelectionCriteria): Unit = ???
} }

18
akka-docs/rst/scala/persistence.rst
View file

@ -165,30 +165,30 @@ Identifiers
----------- -----------
A processor must have an identifier that doesn't change across different actor incarnations. It defaults to the A processor must have an identifier that doesn't change across different actor incarnations. It defaults to the
``String`` representation of processor's path without the address part and can be obtained via the ``processorId`` ``String`` representation of processor's path without the address part and can be obtained via the ``persistenceId``
method. method.
.. includecode:: code/docs/persistence/PersistenceDocSpec.scala#processor-id .. includecode:: code/docs/persistence/PersistenceDocSpec.scala#persistence-id
Applications can customize a processor's id by specifying an actor name during processor creation as shown in Applications can customize a processor's id by specifying an actor name during processor creation as shown in
section :ref:`processors`. This changes that processor's name in its actor hierarchy and hence influences only section :ref:`processors`. This changes that processor's name in its actor hierarchy and hence influences only
part of the processor id. To fully customize a processor's id, the ``processorId`` method must be overridden. part of the processor id. To fully customize a processor's id, the ``persistenceId`` method must be overridden.
.. includecode:: code/docs/persistence/PersistenceDocSpec.scala#processor-id-override .. includecode:: code/docs/persistence/PersistenceDocSpec.scala#persistence-id-override
Overriding ``processorId`` is the recommended way to generate stable identifiers. Overriding ``persistenceId`` is the recommended way to generate stable identifiers.
.. _views: .. _views:
Views Views
===== =====
Views can be implemented by extending the ``View`` trait and implementing the ``receive`` and the ``processorId`` Views can be implemented by extending the ``View`` trait and implementing the ``receive`` and the ``persistenceId``
methods. methods.
.. includecode:: code/docs/persistence/PersistenceDocSpec.scala#view .. includecode:: code/docs/persistence/PersistenceDocSpec.scala#view
The ``processorId`` identifies the processor from which the view receives journaled messages. It is not necessary The ``persistenceId`` identifies the processor from which the view receives journaled messages. It is not necessary
the referenced processor is actually running. Views read messages from a processor's journal directly. When a the referenced processor is actually running. Views read messages from a processor's journal directly. When a
processor is started later and begins to write new messages, the corresponding view is updated automatically, by processor is started later and begins to write new messages, the corresponding view is updated automatically, by
default. default.
@ -238,7 +238,7 @@ Applications can customize a view's id by specifying an actor name during view c
name in its actor hierarchy and hence influences only part of the view id. To fully customize a view's id, the name in its actor hierarchy and hence influences only part of the view id. To fully customize a view's id, the
``viewId`` method must be overridden. Overriding ``viewId`` is the recommended way to generate stable identifiers. ``viewId`` method must be overridden. Overriding ``viewId`` is the recommended way to generate stable identifiers.
The ``viewId`` must differ from the referenced ``processorId``, unless :ref:`snapshots` of a view and its The ``viewId`` must differ from the referenced ``persistenceId``, unless :ref:`snapshots` of a view and its
processor shall be shared (which is what applications usually do not want). processor shall be shared (which is what applications usually do not want).
.. _channels: .. _channels:
@ -378,7 +378,7 @@ creating the channel with the ``replyPersistent`` configuration parameter set to
With this setting, either the successfully persisted message is replied to the sender or a ``PersistenceFailure`` With this setting, either the successfully persisted message is replied to the sender or a ``PersistenceFailure``
message. In case the latter case, the sender should re-send the message. message. In case the latter case, the sender should re-send the message.
.. _processor-identifiers: .. _persistence-identifiers:
Identifiers Identifiers
----------- -----------

10
akka-persistence/src/main/java/akka/persistence/journal/japi/AsyncRecoveryPlugin.java
View file

@ -25,23 +25,23 @@ interface AsyncRecoveryPlugin {
* The channel ids of delivery confirmations that are available for a replayed * The channel ids of delivery confirmations that are available for a replayed
* message must be contained in that message's `confirms` sequence. * message must be contained in that message's `confirms` sequence.
* *
* @param processorId processor id. * @param persistenceId processor id.
* @param fromSequenceNr sequence number where replay should start (inclusive). * @param fromSequenceNr sequence number where replay should start (inclusive).
* @param toSequenceNr sequence number where replay should end (inclusive). * @param toSequenceNr sequence number where replay should end (inclusive).
* @param max maximum number of messages to be replayed. * @param max maximum number of messages to be replayed.
* @param replayCallback called to replay a single message. Can be called from any * @param replayCallback called to replay a single message. Can be called from any
* thread. * thread.
*/ */
Future<Void> doAsyncReplayMessages(String processorId, long fromSequenceNr, long toSequenceNr, long max, Procedure<PersistentRepr> replayCallback); Future<Void> doAsyncReplayMessages(String persistenceId, long fromSequenceNr, long toSequenceNr, long max, Procedure<PersistentRepr> replayCallback);
/** /**
* Java API, Plugin API: asynchronously reads the highest stored sequence number * Java API, Plugin API: asynchronously reads the highest stored sequence number
* for the given `processorId`. * for the given `persistenceId`.
* *
* @param processorId processor id. * @param persistenceId processor id.
* @param fromSequenceNr hint where to start searching for the highest sequence * @param fromSequenceNr hint where to start searching for the highest sequence
* number. * number.
*/ */
Future<Long> doAsyncReadHighestSequenceNr(String processorId, long fromSequenceNr); Future<Long> doAsyncReadHighestSequenceNr(String persistenceId, long fromSequenceNr);
//#async-replay-plugin-api //#async-replay-plugin-api
} }

4
akka-persistence/src/main/java/akka/persistence/journal/japi/AsyncWritePlugin.java
View file

@ -28,7 +28,7 @@ interface AsyncWritePlugin {
* from the journal. If `permanent` is set to `false`, the persistent messages are * from the journal. If `permanent` is set to `false`, the persistent messages are
* marked as deleted, otherwise they are permanently deleted. * marked as deleted, otherwise they are permanently deleted.
*/ */
Future<Void> doAsyncDeleteMessages(Iterable<PersistentId> messageIds, boolean permanent); Future<Void> doAsyncDeleteMessages(Iterable<PersistenceId> messageIds, boolean permanent);
/** /**
* Java API, Plugin API: synchronously deletes all persistent messages up to * Java API, Plugin API: synchronously deletes all persistent messages up to
@ -37,6 +37,6 @@ interface AsyncWritePlugin {
* *
* @see AsyncRecoveryPlugin * @see AsyncRecoveryPlugin
*/ */
Future<Void> doAsyncDeleteMessagesTo(String processorId, long toSequenceNr, boolean permanent); Future<Void> doAsyncDeleteMessagesTo(String persistenceId, long toSequenceNr, boolean permanent);
//#async-write-plugin-api //#async-write-plugin-api
} }

4
akka-persistence/src/main/java/akka/persistence/journal/japi/SyncWritePlugin.java
View file

@ -26,7 +26,7 @@ interface SyncWritePlugin {
* from the journal. If `permanent` is set to `false`, the persistent messages are * from the journal. If `permanent` is set to `false`, the persistent messages are
* marked as deleted, otherwise they are permanently deleted. * marked as deleted, otherwise they are permanently deleted.
*/ */
void doDeleteMessages(Iterable<PersistentId> messageIds, boolean permanent); void doDeleteMessages(Iterable<PersistenceId> messageIds, boolean permanent);
/** /**
* Java API, Plugin API: synchronously deletes all persistent messages up to * Java API, Plugin API: synchronously deletes all persistent messages up to
@ -35,6 +35,6 @@ interface SyncWritePlugin {
* *
* @see AsyncRecoveryPlugin * @see AsyncRecoveryPlugin
*/ */
void doDeleteMessagesTo(String processorId, long toSequenceNr, boolean permanent); void doDeleteMessagesTo(String persistenceId, long toSequenceNr, boolean permanent);
//#sync-write-plugin-api //#sync-write-plugin-api
} }

204
akka-persistence/src/main/java/akka/persistence/serialization/MessageFormats.java
View file

@ -721,20 +721,20 @@ public final class MessageFormats {
*/ */
long getSequenceNr(); long getSequenceNr();
// optional string processorId = 3; // optional string persistenceId = 3;
/** /**
* <code>optional string processorId = 3;</code> * <code>optional string persistenceId = 3;</code>
*/ */
boolean hasProcessorId(); boolean hasPersistenceId();
/** /**
* <code>optional string processorId = 3;</code> * <code>optional string persistenceId = 3;</code>
*/ */
java.lang.String getProcessorId(); java.lang.String getPersistenceId();
/** /**
* <code>optional string processorId = 3;</code> * <code>optional string persistenceId = 3;</code>
*/ */
com.google.protobuf.ByteString com.google.protobuf.ByteString
getProcessorIdBytes(); getPersistenceIdBytes();
// optional bool deleted = 4; // optional bool deleted = 4;
/** /**
@ -901,7 +901,7 @@ public final class MessageFormats {
} }
case 26: { case 26: {
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
processorId_ = input.readBytes(); persistenceId_ = input.readBytes();
break; break;
} }
case 32: { case 32: {
@ -1031,20 +1031,20 @@ public final class MessageFormats {
return sequenceNr_; return sequenceNr_;
} }
// optional string processorId = 3; // optional string persistenceId = 3;
public static final int PROCESSORID_FIELD_NUMBER = 3; public static final int PersistenceId_FIELD_NUMBER = 3;
private java.lang.Object processorId_; private java.lang.Object persistenceId_;
/** /**
* <code>optional string processorId = 3;</code> * <code>optional string persistenceId = 3;</code>
*/ */
public boolean hasProcessorId() { public boolean hasPersistenceId() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional string processorId = 3;</code> * <code>optional string persistenceId = 3;</code>
*/ */
public java.lang.String getProcessorId() { public java.lang.String getPersistenceId() {
java.lang.Object ref = processorId_; java.lang.Object ref = persistenceId_;
if (ref instanceof java.lang.String) { if (ref instanceof java.lang.String) {
return (java.lang.String) ref; return (java.lang.String) ref;
} else { } else {
@ -1052,22 +1052,22 @@ public final class MessageFormats {
(com.google.protobuf.ByteString) ref; (com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8(); java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) { if (bs.isValidUtf8()) {
processorId_ = s; persistenceId_ = s;
} }
return s; return s;
} }
} }
/** /**
* <code>optional string processorId = 3;</code> * <code>optional string persistenceId = 3;</code>
*/ */
public com.google.protobuf.ByteString public com.google.protobuf.ByteString
getProcessorIdBytes() { getPersistenceIdBytes() {
java.lang.Object ref = processorId_; java.lang.Object ref = persistenceId_;
if (ref instanceof java.lang.String) { if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b = com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8( com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref); (java.lang.String) ref);
processorId_ = b; persistenceId_ = b;
return b; return b;
} else { } else {
return (com.google.protobuf.ByteString) ref; return (com.google.protobuf.ByteString) ref;
@ -1263,7 +1263,7 @@ public final class MessageFormats {
private void initFields() { private void initFields() {
payload_ = akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance(); payload_ = akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance();
sequenceNr_ = 0L; sequenceNr_ = 0L;
processorId_ = ""; persistenceId_ = "";
deleted_ = false; deleted_ = false;
redeliveries_ = 0; redeliveries_ = 0;
confirms_ = com.google.protobuf.LazyStringArrayList.EMPTY; confirms_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@ -1297,7 +1297,7 @@ public final class MessageFormats {
output.writeInt64(2, sequenceNr_); output.writeInt64(2, sequenceNr_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeBytes(3, getProcessorIdBytes()); output.writeBytes(3, getPersistenceIdBytes());
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeBool(4, deleted_); output.writeBool(4, deleted_);
@ -1339,7 +1339,7 @@ public final class MessageFormats {
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeBytesSize(3, getProcessorIdBytes()); .computeBytesSize(3, getPersistenceIdBytes());
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
@ -1500,7 +1500,7 @@ public final class MessageFormats {
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
sequenceNr_ = 0L; sequenceNr_ = 0L;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
processorId_ = ""; persistenceId_ = "";
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
deleted_ = false; deleted_ = false;
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
@ -1563,7 +1563,7 @@ public final class MessageFormats {
if (((from_bitField0_ & 0x00000004) == 0x00000004)) { if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004; to_bitField0_ |= 0x00000004;
} }
result.processorId_ = processorId_; result.persistenceId_ = persistenceId_;
if (((from_bitField0_ & 0x00000008) == 0x00000008)) { if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
to_bitField0_ |= 0x00000008; to_bitField0_ |= 0x00000008;
} }
@ -1620,9 +1620,9 @@ public final class MessageFormats {
if (other.hasSequenceNr()) { if (other.hasSequenceNr()) {
setSequenceNr(other.getSequenceNr()); setSequenceNr(other.getSequenceNr());
} }
if (other.hasProcessorId()) { if (other.hasPersistenceId()) {
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
processorId_ = other.processorId_; persistenceId_ = other.persistenceId_;
onChanged(); onChanged();
} }
if (other.hasDeleted()) { if (other.hasDeleted()) {
@ -1840,76 +1840,76 @@ public final class MessageFormats {
return this; return this;
} }
// optional string processorId = 3; // optional string persistenceId = 3;
private java.lang.Object processorId_ = ""; private java.lang.Object persistenceId_ = "";
/** /**
* <code>optional string processorId = 3;</code> * <code>optional string persistenceId = 3;</code>
*/ */
public boolean hasProcessorId() { public boolean hasPersistenceId() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional string processorId = 3;</code> * <code>optional string persistenceId = 3;</code>
*/ */
public java.lang.String getProcessorId() { public java.lang.String getPersistenceId() {
java.lang.Object ref = processorId_; java.lang.Object ref = persistenceId_;
if (!(ref instanceof java.lang.String)) { if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((com.google.protobuf.ByteString) ref) java.lang.String s = ((com.google.protobuf.ByteString) ref)
.toStringUtf8(); .toStringUtf8();
processorId_ = s; persistenceId_ = s;
return s; return s;
} else { } else {
return (java.lang.String) ref; return (java.lang.String) ref;
} }
} }
/** /**
* <code>optional string processorId = 3;</code> * <code>optional string persistenceId = 3;</code>
*/ */
public com.google.protobuf.ByteString public com.google.protobuf.ByteString
getProcessorIdBytes() { getPersistenceIdBytes() {
java.lang.Object ref = processorId_; java.lang.Object ref = persistenceId_;
if (ref instanceof String) { if (ref instanceof String) {
com.google.protobuf.ByteString b = com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8( com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref); (java.lang.String) ref);
processorId_ = b; persistenceId_ = b;
return b; return b;
} else { } else {
return (com.google.protobuf.ByteString) ref; return (com.google.protobuf.ByteString) ref;
} }
} }
/** /**
* <code>optional string processorId = 3;</code> * <code>optional string persistenceId = 3;</code>
*/ */
public Builder setProcessorId( public Builder setPersistenceId(
java.lang.String value) { java.lang.String value) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
processorId_ = value; persistenceId_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>optional string processorId = 3;</code> * <code>optional string persistenceId = 3;</code>
*/ */
public Builder clearProcessorId() { public Builder clearPersistenceId() {
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
processorId_ = getDefaultInstance().getProcessorId(); persistenceId_ = getDefaultInstance().getPersistenceId();
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>optional string processorId = 3;</code> * <code>optional string persistenceId = 3;</code>
*/ */
public Builder setProcessorIdBytes( public Builder setPersistenceIdBytes(
com.google.protobuf.ByteString value) { com.google.protobuf.ByteString value) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
processorId_ = value; persistenceId_ = value;
onChanged(); onChanged();
return this; return this;
} }
@ -2965,20 +2965,20 @@ public final class MessageFormats {
public interface DeliveredMessageOrBuilder public interface DeliveredMessageOrBuilder
extends com.google.protobuf.MessageOrBuilder { extends com.google.protobuf.MessageOrBuilder {
// optional string processorId = 1; // optional string persistenceId = 1;
/** /**
* <code>optional string processorId = 1;</code> * <code>optional string persistenceId = 1;</code>
*/ */
boolean hasProcessorId(); boolean hasPersistenceId();
/** /**
* <code>optional string processorId = 1;</code> * <code>optional string persistenceId = 1;</code>
*/ */
java.lang.String getProcessorId(); java.lang.String getPersistenceId();
/** /**
* <code>optional string processorId = 1;</code> * <code>optional string persistenceId = 1;</code>
*/ */
com.google.protobuf.ByteString com.google.protobuf.ByteString
getProcessorIdBytes(); getPersistenceIdBytes();
// optional string channelId = 2; // optional string channelId = 2;
/** /**
@ -3083,7 +3083,7 @@ public final class MessageFormats {
} }
case 10: { case 10: {
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
processorId_ = input.readBytes(); persistenceId_ = input.readBytes();
break; break;
} }
case 18: { case 18: {
@ -3146,20 +3146,20 @@ public final class MessageFormats {
} }
private int bitField0_; private int bitField0_;
// optional string processorId = 1; // optional string persistenceId = 1;
public static final int PROCESSORID_FIELD_NUMBER = 1; public static final int PersistenceId_FIELD_NUMBER = 1;
private java.lang.Object processorId_; private java.lang.Object persistenceId_;
/** /**
* <code>optional string processorId = 1;</code> * <code>optional string persistenceId = 1;</code>
*/ */
public boolean hasProcessorId() { public boolean hasPersistenceId() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>optional string processorId = 1;</code> * <code>optional string persistenceId = 1;</code>
*/ */
public java.lang.String getProcessorId() { public java.lang.String getPersistenceId() {
java.lang.Object ref = processorId_; java.lang.Object ref = persistenceId_;
if (ref instanceof java.lang.String) { if (ref instanceof java.lang.String) {
return (java.lang.String) ref; return (java.lang.String) ref;
} else { } else {
@ -3167,22 +3167,22 @@ public final class MessageFormats {
(com.google.protobuf.ByteString) ref; (com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8(); java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) { if (bs.isValidUtf8()) {
processorId_ = s; persistenceId_ = s;
} }
return s; return s;
} }
} }
/** /**
* <code>optional string processorId = 1;</code> * <code>optional string persistenceId = 1;</code>
*/ */
public com.google.protobuf.ByteString public com.google.protobuf.ByteString
getProcessorIdBytes() { getPersistenceIdBytes() {
java.lang.Object ref = processorId_; java.lang.Object ref = persistenceId_;
if (ref instanceof java.lang.String) { if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b = com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8( com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref); (java.lang.String) ref);
processorId_ = b; persistenceId_ = b;
return b; return b;
} else { } else {
return (com.google.protobuf.ByteString) ref; return (com.google.protobuf.ByteString) ref;
@ -3308,7 +3308,7 @@ public final class MessageFormats {
} }
private void initFields() { private void initFields() {
processorId_ = ""; persistenceId_ = "";
channelId_ = ""; channelId_ = "";
persistentSequenceNr_ = 0L; persistentSequenceNr_ = 0L;
deliverySequenceNr_ = 0L; deliverySequenceNr_ = 0L;
@ -3327,7 +3327,7 @@ public final class MessageFormats {
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeBytes(1, getProcessorIdBytes()); output.writeBytes(1, getPersistenceIdBytes());
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeBytes(2, getChannelIdBytes()); output.writeBytes(2, getChannelIdBytes());
@ -3352,7 +3352,7 @@ public final class MessageFormats {
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeBytesSize(1, getProcessorIdBytes()); .computeBytesSize(1, getPersistenceIdBytes());
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
@ -3486,7 +3486,7 @@ public final class MessageFormats {
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
processorId_ = ""; persistenceId_ = "";
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
channelId_ = ""; channelId_ = "";
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
@ -3527,7 +3527,7 @@ public final class MessageFormats {
if (((from_bitField0_ & 0x00000001) == 0x00000001)) { if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
to_bitField0_ |= 0x00000001; to_bitField0_ |= 0x00000001;
} }
result.processorId_ = processorId_; result.persistenceId_ = persistenceId_;
if (((from_bitField0_ & 0x00000002) == 0x00000002)) { if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
to_bitField0_ |= 0x00000002; to_bitField0_ |= 0x00000002;
} }
@ -3560,9 +3560,9 @@ public final class MessageFormats {
public Builder mergeFrom(akka.persistence.serialization.MessageFormats.DeliveredMessage other) { public Builder mergeFrom(akka.persistence.serialization.MessageFormats.DeliveredMessage other) {
if (other == akka.persistence.serialization.MessageFormats.DeliveredMessage.getDefaultInstance()) return this; if (other == akka.persistence.serialization.MessageFormats.DeliveredMessage.getDefaultInstance()) return this;
if (other.hasProcessorId()) { if (other.hasPersistenceId()) {
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
processorId_ = other.processorId_; persistenceId_ = other.persistenceId_;
onChanged(); onChanged();
} }
if (other.hasChannelId()) { if (other.hasChannelId()) {
@ -3608,76 +3608,76 @@ public final class MessageFormats {
} }
private int bitField0_; private int bitField0_;
// optional string processorId = 1; // optional string persistenceId = 1;
private java.lang.Object processorId_ = ""; private java.lang.Object persistenceId_ = "";
/** /**
* <code>optional string processorId = 1;</code> * <code>optional string persistenceId = 1;</code>
*/ */
public boolean hasProcessorId() { public boolean hasPersistenceId() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>optional string processorId = 1;</code> * <code>optional string persistenceId = 1;</code>
*/ */
public java.lang.String getProcessorId() { public java.lang.String getPersistenceId() {
java.lang.Object ref = processorId_; java.lang.Object ref = persistenceId_;
if (!(ref instanceof java.lang.String)) { if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((com.google.protobuf.ByteString) ref) java.lang.String s = ((com.google.protobuf.ByteString) ref)
.toStringUtf8(); .toStringUtf8();
processorId_ = s; persistenceId_ = s;
return s; return s;
} else { } else {
return (java.lang.String) ref; return (java.lang.String) ref;
} }
} }
/** /**
* <code>optional string processorId = 1;</code> * <code>optional string persistenceId = 1;</code>
*/ */
public com.google.protobuf.ByteString public com.google.protobuf.ByteString
getProcessorIdBytes() { getPersistenceIdBytes() {
java.lang.Object ref = processorId_; java.lang.Object ref = persistenceId_;
if (ref instanceof String) { if (ref instanceof String) {
com.google.protobuf.ByteString b = com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8( com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref); (java.lang.String) ref);
processorId_ = b; persistenceId_ = b;
return b; return b;
} else { } else {
return (com.google.protobuf.ByteString) ref; return (com.google.protobuf.ByteString) ref;
} }
} }
/** /**
* <code>optional string processorId = 1;</code> * <code>optional string persistenceId = 1;</code>
*/ */
public Builder setProcessorId( public Builder setPersistenceId(
java.lang.String value) { java.lang.String value) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
processorId_ = value; persistenceId_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>optional string processorId = 1;</code> * <code>optional string persistenceId = 1;</code>
*/ */
public Builder clearProcessorId() { public Builder clearPersistenceId() {
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
processorId_ = getDefaultInstance().getProcessorId(); persistenceId_ = getDefaultInstance().getPersistenceId();
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>optional string processorId = 1;</code> * <code>optional string persistenceId = 1;</code>
*/ */
public Builder setProcessorIdBytes( public Builder setPersistenceIdBytes(
com.google.protobuf.ByteString value) { com.google.protobuf.ByteString value) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
processorId_ = value; persistenceId_ = value;
onChanged(); onChanged();
return this; return this;
} }
@ -4620,14 +4620,14 @@ public final class MessageFormats {
"ageBatch\022!\n\005batch\030\001 \003(\0132\022.PersistentMess" + "ageBatch\022!\n\005batch\030\001 \003(\0132\022.PersistentMess" +
"age\"\201\002\n\021PersistentMessage\022#\n\007payload\030\001 \001" + "age\"\201\002\n\021PersistentMessage\022#\n\007payload\030\001 \001" +
"(\0132\022.PersistentPayload\022\022\n\nsequenceNr\030\002 \001" + "(\0132\022.PersistentPayload\022\022\n\nsequenceNr\030\002 \001" +
"(\003\022\023\n\013processorId\030\003 \001(\t\022\017\n\007deleted\030\004 \001(\010" + "(\003\022\023\n\013persistenceId\030\003 \001(\t\022\017\n\007deleted\030\004 \001(\010" +
"\022\024\n\014redeliveries\030\006 \001(\005\022\020\n\010confirms\030\007 \003(\t" + "\022\024\n\014redeliveries\030\006 \001(\005\022\020\n\010confirms\030\007 \003(\t" +
"\022\023\n\013confirmable\030\010 \001(\010\022)\n\016confirmMessage\030" + "\022\023\n\013confirmable\030\010 \001(\010\022)\n\016confirmMessage\030" +
"\t \001(\0132\021.DeliveredMessage\022\025\n\rconfirmTarge" + "\t \001(\0132\021.DeliveredMessage\022\025\n\rconfirmTarge" +
"t\030\n \001(\t\022\016\n\006sender\030\013 \001(\t\"S\n\021PersistentPay" + "t\030\n \001(\t\022\016\n\006sender\030\013 \001(\t\"S\n\021PersistentPay" +
"load\022\024\n\014serializerId\030\001 \002(\005\022\017\n\007payload\030\002 ", "load\022\024\n\014serializerId\030\001 \002(\005\022\017\n\007payload\030\002 ",
"\002(\014\022\027\n\017payloadManifest\030\003 \001(\014\"\205\001\n\020Deliver" + "\002(\014\022\027\n\017payloadManifest\030\003 \001(\014\"\205\001\n\020Deliver" +
"edMessage\022\023\n\013processorId\030\001 \001(\t\022\021\n\tchanne" + "edMessage\022\023\n\013persistenceId\030\001 \001(\t\022\021\n\tchanne" +
"lId\030\002 \001(\t\022\034\n\024persistentSequenceNr\030\003 \001(\003\022" + "lId\030\002 \001(\t\022\034\n\024persistentSequenceNr\030\003 \001(\003\022" +
"\032\n\022deliverySequenceNr\030\004 \001(\003\022\017\n\007channel\030\005" + "\032\n\022deliverySequenceNr\030\004 \001(\003\022\017\n\007channel\030\005" +
" \001(\t\"M\n\016DeliverMessage\022&\n\npersistent\030\001 \001" + " \001(\t\"M\n\016DeliverMessage\022&\n\npersistent\030\001 \001" +
@ -4650,7 +4650,7 @@ public final class MessageFormats {
internal_static_PersistentMessage_fieldAccessorTable = new internal_static_PersistentMessage_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable( com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_PersistentMessage_descriptor, internal_static_PersistentMessage_descriptor,
new java.lang.String[] { "Payload", "SequenceNr", "ProcessorId", "Deleted", "Redeliveries", "Confirms", "Confirmable", "ConfirmMessage", "ConfirmTarget", "Sender", }); new java.lang.String[] { "Payload", "SequenceNr", "PersistenceId", "Deleted", "Redeliveries", "Confirms", "Confirmable", "ConfirmMessage", "ConfirmTarget", "Sender", });
internal_static_PersistentPayload_descriptor = internal_static_PersistentPayload_descriptor =
getDescriptor().getMessageTypes().get(2); getDescriptor().getMessageTypes().get(2);
internal_static_PersistentPayload_fieldAccessorTable = new internal_static_PersistentPayload_fieldAccessorTable = new
@ -4662,7 +4662,7 @@ public final class MessageFormats {
internal_static_DeliveredMessage_fieldAccessorTable = new internal_static_DeliveredMessage_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable( com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_DeliveredMessage_descriptor, internal_static_DeliveredMessage_descriptor,
new java.lang.String[] { "ProcessorId", "ChannelId", "PersistentSequenceNr", "DeliverySequenceNr", "Channel", }); new java.lang.String[] { "PersistenceId", "ChannelId", "PersistentSequenceNr", "DeliverySequenceNr", "Channel", });
internal_static_DeliverMessage_descriptor = internal_static_DeliverMessage_descriptor =
getDescriptor().getMessageTypes().get(4); getDescriptor().getMessageTypes().get(4);
internal_static_DeliverMessage_fieldAccessorTable = new internal_static_DeliverMessage_fieldAccessorTable = new

8
akka-persistence/src/main/java/akka/persistence/snapshot/japi/SnapshotStorePlugin.java
View file

@ -14,10 +14,10 @@ interface SnapshotStorePlugin {
/** /**
* Java API, Plugin API: asynchronously loads a snapshot. * Java API, Plugin API: asynchronously loads a snapshot.
* *
* @param processorId processor id. * @param persistenceId processor id.
* @param criteria selection criteria for loading. * @param criteria selection criteria for loading.
*/ */
Future<Option<SelectedSnapshot>> doLoadAsync(String processorId, SnapshotSelectionCriteria criteria); Future<Option<SelectedSnapshot>> doLoadAsync(String persistenceId, SnapshotSelectionCriteria criteria);
/** /**
* Java API, Plugin API: asynchronously saves a snapshot. * Java API, Plugin API: asynchronously saves a snapshot.
@ -44,9 +44,9 @@ interface SnapshotStorePlugin {
/** /**
* Java API, Plugin API: deletes all snapshots matching `criteria`. * Java API, Plugin API: deletes all snapshots matching `criteria`.
* *
* @param processorId processor id. * @param persistenceId processor id.
* @param criteria selection criteria for deleting. * @param criteria selection criteria for deleting.
*/ */
void doDelete(String processorId, SnapshotSelectionCriteria criteria) throws Exception; void doDelete(String persistenceId, SnapshotSelectionCriteria criteria) throws Exception;
//#snapshot-store-plugin-api //#snapshot-store-plugin-api
} }

4
akka-persistence/src/main/protobuf/MessageFormats.proto
View file

@ -12,7 +12,7 @@ message PersistentMessageBatch {
message PersistentMessage { message PersistentMessage {
optional PersistentPayload payload = 1; optional PersistentPayload payload = 1;
optional int64 sequenceNr = 2; optional int64 sequenceNr = 2;
optional string processorId = 3; optional string persistenceId = 3;
optional bool deleted = 4; optional bool deleted = 4;
optional int32 redeliveries = 6; optional int32 redeliveries = 6;
repeated string confirms = 7; repeated string confirms = 7;
@ -29,7 +29,7 @@ message PersistentPayload {
} }
message DeliveredMessage { message DeliveredMessage {
optional string processorId = 1; optional string persistenceId = 1;
optional string channelId = 2; optional string channelId = 2;
optional int64 persistentSequenceNr = 3; optional int64 persistentSequenceNr = 3;
optional int64 deliverySequenceNr = 4; optional int64 deliverySequenceNr = 4;

4
akka-persistence/src/main/scala/akka/persistence/Channel.scala
View file

@ -139,7 +139,7 @@ final class Channel private[akka] (_channelId: Option[String], channelSettings:
private def prepareDelivery(persistent: PersistentRepr): PersistentRepr = private def prepareDelivery(persistent: PersistentRepr): PersistentRepr =
ConfirmablePersistentImpl(persistent, ConfirmablePersistentImpl(persistent,
confirmTarget = journal, confirmTarget = journal,
confirmMessage = DeliveredByChannel(persistent.processorId, id, persistent.sequenceNr, channel = self)) confirmMessage = DeliveredByChannel(persistent.persistenceId, id, persistent.sequenceNr, channel = self))
} }
object Channel { object Channel {
@ -216,7 +216,7 @@ trait Delivered extends Message {
* Plugin API. * Plugin API.
*/ */
final case class DeliveredByChannel( final case class DeliveredByChannel(
processorId: String, @deprecatedName('processorId) persistenceId: String,
channelId: String, channelId: String,
persistentSequenceNr: Long, persistentSequenceNr: Long,
deliverySequenceNr: Long = 0L, deliverySequenceNr: Long = 0L,

14
akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala
View file

@ -18,12 +18,12 @@ private[persistence] object JournalProtocol {
* Request to delete messages identified by `messageIds`. If `permanent` is set to `false`, * Request to delete messages identified by `messageIds`. If `permanent` is set to `false`,
* the persistent messages are marked as deleted, otherwise they are permanently deleted. * the persistent messages are marked as deleted, otherwise they are permanently deleted.
*/ */
final case class DeleteMessages(messageIds: immutable.Seq[PersistentId], permanent: Boolean, requestor: Option[ActorRef] = None) final case class DeleteMessages(messageIds: immutable.Seq[PersistenceId], permanent: Boolean, requestor: Option[ActorRef] = None)
/** /**
* Reply message to a successful [[DeleteMessages]] request. * Reply message to a successful [[DeleteMessages]] request.
*/ */
final case class DeleteMessagesSuccess(messageIds: immutable.Seq[PersistentId]) final case class DeleteMessagesSuccess(messageIds: immutable.Seq[PersistenceId])
/** /**
* Reply message to a failed [[DeleteMessages]] request. * Reply message to a failed [[DeleteMessages]] request.
@ -35,7 +35,7 @@ private[persistence] object JournalProtocol {
* (inclusive). If `permanent` is set to `false`, the persistent messages are marked * (inclusive). If `permanent` is set to `false`, the persistent messages are marked
* as deleted in the journal, otherwise they are permanently deleted from the journal. * as deleted in the journal, otherwise they are permanently deleted from the journal.
*/ */
final case class DeleteMessagesTo(processorId: String, toSequenceNr: Long, permanent: Boolean) final case class DeleteMessagesTo(persistenceId: String, toSequenceNr: Long, permanent: Boolean)
/** /**
* Request to write delivery confirmations. * Request to write delivery confirmations.
@ -113,11 +113,11 @@ private[persistence] object JournalProtocol {
* @param fromSequenceNr sequence number where replay should start (inclusive). * @param fromSequenceNr sequence number where replay should start (inclusive).
* @param toSequenceNr sequence number where replay should end (inclusive). * @param toSequenceNr sequence number where replay should end (inclusive).
* @param max maximum number of messages to be replayed. * @param max maximum number of messages to be replayed.
* @param processorId requesting processor id. * @param persistenceId requesting processor id.
* @param processor requesting processor. * @param processor requesting processor.
* @param replayDeleted `true` if messages marked as deleted shall be replayed. * @param replayDeleted `true` if messages marked as deleted shall be replayed.
*/ */
final case class ReplayMessages(fromSequenceNr: Long, toSequenceNr: Long, max: Long, processorId: String, processor: ActorRef, replayDeleted: Boolean = false) final case class ReplayMessages(fromSequenceNr: Long, toSequenceNr: Long, max: Long, persistenceId: String, processor: ActorRef, replayDeleted: Boolean = false)
/** /**
* Reply message to a [[ReplayMessages]] request. A separate reply is sent to the requestor for each * Reply message to a [[ReplayMessages]] request. A separate reply is sent to the requestor for each
@ -143,10 +143,10 @@ private[persistence] object JournalProtocol {
* Request to read the highest stored sequence number of a given processor. * Request to read the highest stored sequence number of a given processor.
* *
* @param fromSequenceNr optional hint where to start searching for the maximum sequence number. * @param fromSequenceNr optional hint where to start searching for the maximum sequence number.
* @param processorId requesting processor id. * @param persistenceId requesting processor id.
* @param processor requesting processor. * @param processor requesting processor.
*/ */
final case class ReadHighestSequenceNr(fromSequenceNr: Long = 1L, processorId: String, processor: ActorRef) final case class ReadHighestSequenceNr(fromSequenceNr: Long = 1L, persistenceId: String, processor: ActorRef)
/** /**
* Reply message to a successful [[ReadHighestSequenceNr]] request. * Reply message to a successful [[ReadHighestSequenceNr]] request.

15
akka-persistence/src/main/scala/akka/persistence/Persistence.scala
View file

@ -102,26 +102,33 @@ class Persistence(val system: ExtendedActorSystem) extends Extension {
/** /**
* Creates a canonical processor id from a processor actor ref. * Creates a canonical processor id from a processor actor ref.
*/ */
@deprecated("Use `persistenceId` instead. Processor will be removed.", since = "2.3.4")
def processorId(processor: ActorRef): String = id(processor) def processorId(processor: ActorRef): String = id(processor)
/**
* Creates a canonical persistent actor id from a processor actor ref.
*/
def persistenceId(persistentActor: ActorRef): String = id(persistentActor)
/** /**
* Creates a canonical channel id from a channel actor ref. * Creates a canonical channel id from a channel actor ref.
*/ */
@deprecated("Channels will be removed. You may want to use `akka.persistence.AtLeastOnceDelivery` instead.", since = "2.3.4")
def channelId(channel: ActorRef): String = id(channel) def channelId(channel: ActorRef): String = id(channel)
/** /**
* Returns a snapshot store for a processor identified by `processorId`. * Returns a snapshot store for a processor identified by `persistenceId`.
*/ */
def snapshotStoreFor(processorId: String): ActorRef = { def snapshotStoreFor(persistenceId: String): ActorRef = {
// Currently returns a snapshot store singleton but this methods allows for later // Currently returns a snapshot store singleton but this methods allows for later
// optimizations where each processor can have its own snapshot store actor. // optimizations where each processor can have its own snapshot store actor.
snapshotStore snapshotStore
} }
/** /**
* Returns a journal for a processor identified by `processorId`. * Returns a journal for a processor identified by `persistenceId`.
*/ */
def journalFor(processorId: String): ActorRef = { def journalFor(persistenceId: String): ActorRef = {
// Currently returns a journal singleton but this methods allows for later // Currently returns a journal singleton but this methods allows for later
// optimizations where each processor can have its own journal actor. // optimizations where each processor can have its own journal actor.
journal journal

50
akka-persistence/src/main/scala/akka/persistence/Persistent.scala
View file

@ -128,19 +128,35 @@ case class PersistentBatch(batch: immutable.Seq[Resequenceable]) extends Message
* Plugin API: confirmation entry written by journal plugins. * Plugin API: confirmation entry written by journal plugins.
*/ */
trait PersistentConfirmation { trait PersistentConfirmation {
def processorId: String @deprecated("Use `persistenceId` instead. Processor will be removed.", since = "2.3.4")
final def processorId: String = persistenceId
def persistenceId: String
def channelId: String def channelId: String
def sequenceNr: Long def sequenceNr: Long
} }
/** /**
* Plugin API: persistent message identifier. * Plugin API: persistent message identifier.
*
* Deprecated, please use [[PersistenceId]].
*/ */
trait PersistentId { @deprecated("Use PersistenceId instead.", since = "2.3.4")
trait PersistentId extends PersistenceId {
/** /**
* Id of processor that journals a persistent message * Persistent id that journals a persistent message
*/ */
def processorId: String @deprecated("Use `persistenceId` instead.", since = "2.3.4")
def processorId: String = persistenceId
}
/**
* Plugin API: persistent message identifier.
*/
trait PersistenceId {
/**
* Persistent id that journals a persistent message
*/
def persistenceId: String
/** /**
* A persistent message's sequence number. * A persistent message's sequence number.
@ -151,7 +167,7 @@ trait PersistentId {
/** /**
* INTERNAL API. * INTERNAL API.
*/ */
private[persistence] final case class PersistentIdImpl(processorId: String, sequenceNr: Long) extends PersistentId private[persistence] final case class PersistenceIdImpl(persistenceId: String, sequenceNr: Long) extends PersistenceId
/** /**
* Plugin API: representation of a persistent message in the journal plugin API. * Plugin API: representation of a persistent message in the journal plugin API.
@ -160,7 +176,7 @@ private[persistence] final case class PersistentIdImpl(processorId: String, sequ
* @see [[journal.AsyncWriteJournal]] * @see [[journal.AsyncWriteJournal]]
* @see [[journal.AsyncRecovery]] * @see [[journal.AsyncRecovery]]
*/ */
trait PersistentRepr extends Persistent with Resequenceable with PersistentId with Message { trait PersistentRepr extends Persistent with Resequenceable with PersistenceId with Message {
// todo we want to get rid of the Persistent() wrapper from user land; PersistentRepr is here to stay. #15230 // todo we want to get rid of the Persistent() wrapper from user land; PersistentRepr is here to stay. #15230
import scala.collection.JavaConverters._ import scala.collection.JavaConverters._
@ -229,7 +245,7 @@ trait PersistentRepr extends Persistent with Resequenceable with PersistentId wi
*/ */
def update( def update(
sequenceNr: Long = sequenceNr, sequenceNr: Long = sequenceNr,
processorId: String = processorId, @deprecatedName('processorId) persistenceId: String = persistenceId,
deleted: Boolean = deleted, deleted: Boolean = deleted,
redeliveries: Int = redeliveries, redeliveries: Int = redeliveries,
confirms: immutable.Seq[String] = confirms, confirms: immutable.Seq[String] = confirms,
@ -250,7 +266,7 @@ object PersistentRepr {
def apply( def apply(
payload: Any, payload: Any,
sequenceNr: Long = 0L, sequenceNr: Long = 0L,
processorId: String = PersistentRepr.Undefined, @deprecatedName('processorId) persistenceId: String = PersistentRepr.Undefined,
deleted: Boolean = false, deleted: Boolean = false,
redeliveries: Int = 0, redeliveries: Int = 0,
confirms: immutable.Seq[String] = Nil, confirms: immutable.Seq[String] = Nil,
@ -258,8 +274,8 @@ object PersistentRepr {
confirmMessage: Delivered = null, confirmMessage: Delivered = null,
confirmTarget: ActorRef = null, confirmTarget: ActorRef = null,
sender: ActorRef = null) = sender: ActorRef = null) =
if (confirmable) ConfirmablePersistentImpl(payload, sequenceNr, processorId, deleted, redeliveries, confirms, confirmMessage, confirmTarget, sender) if (confirmable) ConfirmablePersistentImpl(payload, sequenceNr, persistenceId, deleted, redeliveries, confirms, confirmMessage, confirmTarget, sender)
else PersistentImpl(payload, sequenceNr, processorId, deleted, confirms, sender) else PersistentImpl(payload, sequenceNr, persistenceId, deleted, confirms, sender)
/** /**
* Java API, Plugin API. * Java API, Plugin API.
@ -281,7 +297,7 @@ object PersistentBatch {
private[persistence] final case class PersistentImpl( private[persistence] final case class PersistentImpl(
payload: Any, payload: Any,
sequenceNr: Long, sequenceNr: Long,
processorId: String, @deprecatedName('processorId) persistenceId: String,
deleted: Boolean, deleted: Boolean,
confirms: immutable.Seq[String], confirms: immutable.Seq[String],
sender: ActorRef) extends Persistent with PersistentRepr { sender: ActorRef) extends Persistent with PersistentRepr {
@ -294,14 +310,14 @@ private[persistence] final case class PersistentImpl(
def update( def update(
sequenceNr: Long, sequenceNr: Long,
processorId: String, @deprecatedName('processorId) persistenceId: String,
deleted: Boolean, deleted: Boolean,
redeliveries: Int, redeliveries: Int,
confirms: immutable.Seq[String], confirms: immutable.Seq[String],
confirmMessage: Delivered, confirmMessage: Delivered,
confirmTarget: ActorRef, confirmTarget: ActorRef,
sender: ActorRef) = sender: ActorRef) =
copy(sequenceNr = sequenceNr, processorId = processorId, deleted = deleted, confirms = confirms, sender = sender) copy(sequenceNr = sequenceNr, persistenceId = persistenceId, deleted = deleted, confirms = confirms, sender = sender)
val redeliveries: Int = 0 val redeliveries: Int = 0
val confirmable: Boolean = false val confirmable: Boolean = false
@ -315,7 +331,7 @@ private[persistence] final case class PersistentImpl(
private[persistence] final case class ConfirmablePersistentImpl( private[persistence] final case class ConfirmablePersistentImpl(
payload: Any, payload: Any,
sequenceNr: Long, sequenceNr: Long,
processorId: String, @deprecatedName('processorId) persistenceId: String,
deleted: Boolean, deleted: Boolean,
redeliveries: Int, redeliveries: Int,
confirms: immutable.Seq[String], confirms: immutable.Seq[String],
@ -334,8 +350,8 @@ private[persistence] final case class ConfirmablePersistentImpl(
def prepareWrite(sender: ActorRef) = def prepareWrite(sender: ActorRef) =
copy(sender = sender, confirmMessage = null, confirmTarget = null) copy(sender = sender, confirmMessage = null, confirmTarget = null)
def update(sequenceNr: Long, processorId: String, deleted: Boolean, redeliveries: Int, confirms: immutable.Seq[String], confirmMessage: Delivered, confirmTarget: ActorRef, sender: ActorRef) = def update(sequenceNr: Long, @deprecatedName('processorId) persistenceId: String, deleted: Boolean, redeliveries: Int, confirms: immutable.Seq[String], confirmMessage: Delivered, confirmTarget: ActorRef, sender: ActorRef) =
copy(sequenceNr = sequenceNr, processorId = processorId, deleted = deleted, redeliveries = redeliveries, confirms = confirms, confirmMessage = confirmMessage, confirmTarget = confirmTarget, sender = sender) copy(sequenceNr = sequenceNr, persistenceId = persistenceId, deleted = deleted, redeliveries = redeliveries, confirms = confirms, confirmMessage = confirmMessage, confirmTarget = confirmTarget, sender = sender)
} }
/** /**
@ -343,5 +359,5 @@ private[persistence] final case class ConfirmablePersistentImpl(
*/ */
private[persistence] object ConfirmablePersistentImpl { private[persistence] object ConfirmablePersistentImpl {
def apply(persistent: PersistentRepr, confirmMessage: Delivered, confirmTarget: ActorRef = null): ConfirmablePersistentImpl = def apply(persistent: PersistentRepr, confirmMessage: Delivered, confirmTarget: ActorRef = null): ConfirmablePersistentImpl =
ConfirmablePersistentImpl(persistent.payload, persistent.sequenceNr, persistent.processorId, persistent.deleted, persistent.redeliveries, persistent.confirms, confirmMessage, confirmTarget, persistent.sender) ConfirmablePersistentImpl(persistent.payload, persistent.sequenceNr, persistent.persistenceId, persistent.deleted, persistent.redeliveries, persistent.confirms, confirmMessage, confirmTarget, persistent.sender)
} }

30
akka-persistence/src/main/scala/akka/persistence/PersistentChannel.scala
View file

@ -183,15 +183,16 @@ object PersistentChannel {
/** /**
* Plugin API. * Plugin API.
*/ */
final case class DeliveredByPersistentChannel( @deprecated("PersistentChannel will be removed, see `AtLeastOnceDelivery` instead.", since = "2.3.4")
final case class DeliveredByPersistenceChannel(
channelId: String, channelId: String,
persistentSequenceNr: Long, persistentSequenceNr: Long,
deliverySequenceNr: Long = 0L, deliverySequenceNr: Long = 0L,
channel: ActorRef = null) extends Delivered with PersistentId { channel: ActorRef = null) extends Delivered with PersistenceId {
def processorId: String = channelId def persistenceId: String = channelId
def sequenceNr: Long = persistentSequenceNr def sequenceNr: Long = persistentSequenceNr
def update(deliverySequenceNr: Long, channel: ActorRef): DeliveredByPersistentChannel = def update(deliverySequenceNr: Long, channel: ActorRef): DeliveredByPersistenceChannel =
copy(deliverySequenceNr = deliverySequenceNr, channel = channel) copy(deliverySequenceNr = deliverySequenceNr, channel = channel)
} }
@ -203,25 +204,25 @@ private[persistence] class DeliveredByPersistentChannelBatching(journal: ActorRe
private val batchMax = settings.journal.maxConfirmationBatchSize private val batchMax = settings.journal.maxConfirmationBatchSize
private var batching = false private var batching = false
private var batch = Vector.empty[DeliveredByPersistentChannel] private var batch = Vector.empty[DeliveredByPersistenceChannel]
def receive = { def receive = {
case DeleteMessagesSuccess(messageIds) ⇒ case DeleteMessagesSuccess(messageIds) ⇒
if (batch.isEmpty) batching = false else journalBatch() if (batch.isEmpty) batching = false else journalBatch()
messageIds.foreach { messageIds.foreach {
case c: DeliveredByPersistentChannel ⇒ case c: DeliveredByPersistenceChannel ⇒
c.channel ! c c.channel ! c
if (publish) context.system.eventStream.publish(c) if (publish) context.system.eventStream.publish(c)
} }
case DeleteMessagesFailure(_) ⇒ case DeleteMessagesFailure(_) ⇒
if (batch.isEmpty) batching = false else journalBatch() if (batch.isEmpty) batching = false else journalBatch()
case d: DeliveredByPersistentChannel ⇒ case d: DeliveredByPersistenceChannel ⇒
addToBatch(d) addToBatch(d)
if (!batching || maxBatchSizeReached) journalBatch() if (!batching || maxBatchSizeReached) journalBatch()
case m ⇒ journal forward m case m ⇒ journal forward m
} }
def addToBatch(pc: DeliveredByPersistentChannel): Unit = def addToBatch(pc: DeliveredByPersistenceChannel): Unit =
batch = batch :+ pc batch = batch :+ pc
def maxBatchSizeReached: Boolean = def maxBatchSizeReached: Boolean =
@ -243,16 +244,16 @@ private class RequestWriter(channelId: String, channelSettings: PersistentChanne
private val cbJournal = extension.confirmationBatchingJournalForChannel(channelId) private val cbJournal = extension.confirmationBatchingJournalForChannel(channelId)
override val processorId = channelId override val persistenceId = channelId
def receive = { def receive = {
case p @ Persistent(Deliver(wrapped: PersistentRepr, _), _) ⇒ case p @ Persistent(Deliver(wrapped: PersistentRepr, _), _) ⇒
if (!recoveryRunning && wrapped.processorId != PersistentRepr.Undefined) { if (!recoveryRunning && wrapped.persistenceId != PersistentRepr.Undefined) {
// Write a delivery confirmation to the journal so that replayed Deliver // Write a delivery confirmation to the journal so that replayed Deliver
// requests from a sending processor are not persisted again. Replaying // requests from a sending processor are not persisted again. Replaying
// Deliver requests is now the responsibility of this processor // Deliver requests is now the responsibility of this processor
// and confirmation by destination is done to the wrapper p.sequenceNr. // and confirmation by destination is done to the wrapper p.sequenceNr.
cbJournal ! DeliveredByChannel(wrapped.processorId, channelId, wrapped.sequenceNr) cbJournal ! DeliveredByChannel(wrapped.persistenceId, channelId, wrapped.sequenceNr)
} }
if (!recoveryRunning && replyPersistent) if (!recoveryRunning && replyPersistent)
@ -341,8 +342,7 @@ private class RequestReader(channelId: String, channelSettings: PersistentChanne
onReplayComplete() onReplayComplete()
} }
def processorId: String = override def persistenceId: String = channelId
channelId
def snapshotterId: String = def snapshotterId: String =
s"${channelId}-reader" s"${channelId}-reader"
@ -368,7 +368,7 @@ private class RequestReader(channelId: String, channelSettings: PersistentChanne
private def onReadRequest(): Unit = if (_currentState == idle) { private def onReadRequest(): Unit = if (_currentState == idle) {
_currentState = replayStarted(await = false) _currentState = replayStarted(await = false)
dbJournal ! ReplayMessages(lastSequenceNr + 1L, Long.MaxValue, pendingConfirmationsMax - numPending, processorId, self) dbJournal ! ReplayMessages(lastSequenceNr + 1L, Long.MaxValue, pendingConfirmationsMax - numPending, persistenceId, self)
} }
/** /**
@ -378,7 +378,7 @@ private class RequestReader(channelId: String, channelSettings: PersistentChanne
private def prepareDelivery(wrapped: PersistentRepr, wrapper: PersistentRepr): PersistentRepr = { private def prepareDelivery(wrapped: PersistentRepr, wrapper: PersistentRepr): PersistentRepr = {
ConfirmablePersistentImpl(wrapped, ConfirmablePersistentImpl(wrapped,
confirmTarget = dbJournal, confirmTarget = dbJournal,
confirmMessage = DeliveredByPersistentChannel(channelId, wrapper.sequenceNr, channel = self)) confirmMessage = DeliveredByPersistenceChannel(channelId, wrapper.sequenceNr, channel = self))
} }
override def preRestart(reason: Throwable, message: Option[Any]): Unit = { override def preRestart(reason: Throwable, message: Option[Any]): Unit = {

30
akka-persistence/src/main/scala/akka/persistence/Processor.scala
View file

@ -111,7 +111,7 @@ trait Processor extends Actor with Recovery {
def addToBatch(p: Resequenceable): Unit = p match { def addToBatch(p: Resequenceable): Unit = p match {
case p: PersistentRepr ⇒ case p: PersistentRepr ⇒
processorBatch = processorBatch :+ p.update(processorId = processorId, sequenceNr = nextSequenceNr(), sender = sender()) processorBatch = processorBatch :+ p.update(persistenceId = persistenceId, sequenceNr = nextSequenceNr(), sender = sender())
case r ⇒ case r ⇒
processorBatch = processorBatch :+ r processorBatch = processorBatch :+ r
} }
@ -136,7 +136,7 @@ trait Processor extends Actor with Recovery {
*/ */
private[persistence] def onReplaySuccess(receive: Receive, awaitReplay: Boolean): Unit = { private[persistence] def onReplaySuccess(receive: Receive, awaitReplay: Boolean): Unit = {
_currentState = initializing _currentState = initializing
journal ! ReadHighestSequenceNr(lastSequenceNr, processorId, self) journal ! ReadHighestSequenceNr(lastSequenceNr, persistenceId, self)
} }
/** /**
@ -157,7 +157,7 @@ trait Processor extends Actor with Recovery {
private def onRecoveryCompleted(receive: Receive): Unit = private def onRecoveryCompleted(receive: Receive): Unit =
receive.applyOrElse(RecoveryCompleted, unhandled) receive.applyOrElse(RecoveryCompleted, unhandled)
private val _processorId = extension.processorId(self) private val _persistenceId = extension.persistenceId(self)
private var processorBatch = Vector.empty[Resequenceable] private var processorBatch = Vector.empty[Resequenceable]
private var sequenceNr: Long = 0L private var sequenceNr: Long = 0L
@ -165,12 +165,18 @@ trait Processor extends Actor with Recovery {
/** /**
* Processor id. Defaults to this processor's path and can be overridden. * Processor id. Defaults to this processor's path and can be overridden.
*/ */
def processorId: String = _processorId @deprecated("Override `persistenceId: String` instead. Processor will be removed.", since = "2.3.4")
override def processorId: String = _persistenceId // TODO: remove processorId
/** /**
* Returns `processorId`. * Persistence id. Defaults to this persistent-actors's path and can be overridden.
*/ */
def snapshotterId: String = processorId override def persistenceId: String = processorId
/**
* Returns `persistenceId`.
*/
def snapshotterId: String = persistenceId
/** /**
* Returns `true` if this processor is currently recovering. * Returns `true` if this processor is currently recovering.
@ -193,7 +199,7 @@ trait Processor extends Actor with Recovery {
* @param sequenceNr sequence number of the persistent message to be deleted. * @param sequenceNr sequence number of the persistent message to be deleted.
*/ */
def deleteMessage(sequenceNr: Long): Unit = { def deleteMessage(sequenceNr: Long): Unit = {
deleteMessage(sequenceNr, false) deleteMessage(sequenceNr, permanent = false)
} }
/** /**
@ -208,7 +214,7 @@ trait Processor extends Actor with Recovery {
* @param permanent if `false`, the message is marked as deleted, otherwise it is permanently deleted. * @param permanent if `false`, the message is marked as deleted, otherwise it is permanently deleted.
*/ */
def deleteMessage(sequenceNr: Long, permanent: Boolean): Unit = { def deleteMessage(sequenceNr: Long, permanent: Boolean): Unit = {
journal ! DeleteMessages(List(PersistentIdImpl(processorId, sequenceNr)), permanent) journal ! DeleteMessages(List(PersistenceIdImpl(persistenceId, sequenceNr)), permanent)
} }
/** /**
@ -217,7 +223,7 @@ trait Processor extends Actor with Recovery {
* @param toSequenceNr upper sequence number bound of persistent messages to be deleted. * @param toSequenceNr upper sequence number bound of persistent messages to be deleted.
*/ */
def deleteMessages(toSequenceNr: Long): Unit = { def deleteMessages(toSequenceNr: Long): Unit = {
deleteMessages(toSequenceNr, true) deleteMessages(toSequenceNr, permanent = true)
} }
/** /**
@ -229,7 +235,7 @@ trait Processor extends Actor with Recovery {
* @param permanent if `false`, the message is marked as deleted, otherwise it is permanently deleted. * @param permanent if `false`, the message is marked as deleted, otherwise it is permanently deleted.
*/ */
def deleteMessages(toSequenceNr: Long, permanent: Boolean): Unit = { def deleteMessages(toSequenceNr: Long, permanent: Boolean): Unit = {
journal ! DeleteMessagesTo(processorId, toSequenceNr, permanent) journal ! DeleteMessagesTo(persistenceId, toSequenceNr, permanent)
} }
/** /**
@ -296,13 +302,13 @@ trait Processor extends Actor with Recovery {
message match { message match {
case RecoveryCompleted ⇒ // mute case RecoveryCompleted ⇒ // mute
case RecoveryFailure(cause) ⇒ case RecoveryFailure(cause) ⇒
val errorMsg = s"Processor killed after recovery failure (processor id = [${processorId}]). " + val errorMsg = s"Processor killed after recovery failure (persisten id = [${persistenceId}]). " +
"To avoid killing processors on recovery failure, a processor must handle RecoveryFailure messages. " + "To avoid killing processors on recovery failure, a processor must handle RecoveryFailure messages. " +
"RecoveryFailure was caused by: " + cause "RecoveryFailure was caused by: " + cause
throw new ActorKilledException(errorMsg) throw new ActorKilledException(errorMsg)
case PersistenceFailure(payload, sequenceNumber, cause) ⇒ case PersistenceFailure(payload, sequenceNumber, cause) ⇒
val errorMsg = "Processor killed after persistence failure " + val errorMsg = "Processor killed after persistence failure " +
s"(processor id = [${processorId}], sequence nr = [${sequenceNumber}], payload class = [${payload.getClass.getName}]). " + s"(persistent id = [${persistenceId}], sequence nr = [${sequenceNumber}], payload class = [${payload.getClass.getName}]). " +
"To avoid killing processors on persistence failure, a processor must handle PersistenceFailure messages. " + "To avoid killing processors on persistence failure, a processor must handle PersistenceFailure messages. " +
"PersistenceFailure was caused by: " + cause "PersistenceFailure was caused by: " + cause
throw new ActorKilledException(errorMsg) throw new ActorKilledException(errorMsg)

9
akka-persistence/src/main/scala/akka/persistence/Recovery.scala
View file

@ -87,7 +87,7 @@ trait Recovery extends Actor with Snapshotter with Stash with StashFactory {
process(receive, SnapshotOffer(metadata, snapshot)) process(receive, SnapshotOffer(metadata, snapshot))
} }
_currentState = replayStarted(await = true) _currentState = replayStarted(await = true)
journal ! ReplayMessages(lastSequenceNr + 1L, toSnr, replayMax, processorId, self) journal ! ReplayMessages(lastSequenceNr + 1L, toSnr, replayMax, persistenceId, self)
case other ⇒ receiverStash.stash() case other ⇒ receiverStash.stash()
} }
} }
@ -171,7 +171,10 @@ trait Recovery extends Actor with Snapshotter with Stash with StashFactory {
/** /**
* Id of the processor for which messages should be replayed. * Id of the processor for which messages should be replayed.
*/ */
def processorId: String @deprecated("Override `persistenceId` instead. Processor will be removed.", since = "2.3.4")
def processorId: String = extension.persistenceId(self) // TODO: remove processorId
def persistenceId: String = processorId
/** /**
* Returns the current persistent message if there is any. * Returns the current persistent message if there is any.
@ -229,7 +232,7 @@ trait Recovery extends Actor with Snapshotter with Stash with StashFactory {
/** /**
* INTERNAL API. * INTERNAL API.
*/ */
private[persistence] lazy val journal = extension.journalFor(processorId) private[persistence] lazy val journal = extension.journalFor(persistenceId)
/** /**
* INTERNAL API. * INTERNAL API.

12
akka-persistence/src/main/scala/akka/persistence/Snapshot.scala
View file

@ -8,12 +8,12 @@ package akka.persistence
/** /**
* Snapshot metadata. * Snapshot metadata.
* *
* @param processorId id of processor from which the snapshot was taken. * @param persistenceId id of processor from which the snapshot was taken.
* @param sequenceNr sequence number at which the snapshot was taken. * @param sequenceNr sequence number at which the snapshot was taken.
* @param timestamp time at which the snapshot was saved. * @param timestamp time at which the snapshot was saved.
*/ */
@SerialVersionUID(1L) //#snapshot-metadata @SerialVersionUID(1L) //#snapshot-metadata
final case class SnapshotMetadata(processorId: String, sequenceNr: Long, timestamp: Long = 0L) final case class SnapshotMetadata(@deprecatedName('processorId) persistenceId: String, sequenceNr: Long, timestamp: Long = 0L)
//#snapshot-metadata //#snapshot-metadata
/** /**
@ -116,11 +116,11 @@ private[persistence] object SnapshotProtocol {
/** /**
* Instructs a snapshot store to load a snapshot. * Instructs a snapshot store to load a snapshot.
* *
* @param processorId processor id. * @param persistenceId processor id.
* @param criteria criteria for selecting a snapshot from which recovery should start. * @param criteria criteria for selecting a snapshot from which recovery should start.
* @param toSequenceNr upper sequence number bound (inclusive) for recovery. * @param toSequenceNr upper sequence number bound (inclusive) for recovery.
*/ */
final case class LoadSnapshot(processorId: String, criteria: SnapshotSelectionCriteria, toSequenceNr: Long) final case class LoadSnapshot(@deprecatedName('processorId) persistenceId: String, criteria: SnapshotSelectionCriteria, toSequenceNr: Long)
/** /**
* Response message to a [[LoadSnapshot]] message. * Response message to a [[LoadSnapshot]] message.
@ -147,8 +147,8 @@ private[persistence] object SnapshotProtocol {
/** /**
* Instructs snapshot store to delete all snapshots that match `criteria`. * Instructs snapshot store to delete all snapshots that match `criteria`.
* *
* @param processorId processor id. * @param persistenceId processor id.
* @param criteria criteria for selecting snapshots to be deleted. * @param criteria criteria for selecting snapshots to be deleted.
*/ */
final case class DeleteSnapshots(processorId: String, criteria: SnapshotSelectionCriteria) final case class DeleteSnapshots(@deprecatedName('processorId) persistenceId: String, criteria: SnapshotSelectionCriteria)
} }

4
akka-persistence/src/main/scala/akka/persistence/Snapshotter.scala
View file

@ -23,8 +23,8 @@ trait Snapshotter extends Actor {
*/ */
def snapshotSequenceNr: Long def snapshotSequenceNr: Long
def loadSnapshot(processorId: String, criteria: SnapshotSelectionCriteria, toSequenceNr: Long) = def loadSnapshot(persistenceId: String, criteria: SnapshotSelectionCriteria, toSequenceNr: Long) =
snapshotStore ! LoadSnapshot(processorId, criteria, toSequenceNr) snapshotStore ! LoadSnapshot(persistenceId, criteria, toSequenceNr)
/** /**
* Saves a `snapshot` of this snapshotter's state. If saving succeeds, this snapshotter will receive a * Saves a `snapshot` of this snapshotter's state. If saving succeeds, this snapshotter will receive a

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

@ -50,7 +50,7 @@ case object Update {
* message stream as [[Persistent]] messages. These messages can be processed to update internal state * message stream as [[Persistent]] messages. These messages can be processed to update internal state
* in order to maintain an (eventual consistent) view of the state of the corresponding processor. A * in order to maintain an (eventual consistent) view of the state of the corresponding processor. A
* view can also run on a different node, provided that a replicated journal is used. Implementation * view can also run on a different node, provided that a replicated journal is used. Implementation
* classes reference a processor by implementing `processorId`. * classes reference a processor by implementing `persistenceId`.
* *
* Views can also store snapshots of internal state by calling [[#saveSnapshot]]. The snapshots of a view * Views can also store snapshots of internal state by calling [[#saveSnapshot]]. The snapshots of a view
* are independent of those of the referenced processor. During recovery, a saved snapshot is offered * are independent of those of the referenced processor. During recovery, a saved snapshot is offered
@ -106,7 +106,7 @@ trait View extends Actor with Recovery {
case r: Recover ⇒ // ignore case r: Recover ⇒ // ignore
case Update(awaitUpdate, replayMax) ⇒ case Update(awaitUpdate, replayMax) ⇒
_currentState = replayStarted(await = awaitUpdate) _currentState = replayStarted(await = awaitUpdate)
journal ! ReplayMessages(lastSequenceNr + 1L, Long.MaxValue, replayMax, processorId, self) journal ! ReplayMessages(lastSequenceNr + 1L, Long.MaxValue, replayMax, persistenceId, self)
case other ⇒ process(receive, other) case other ⇒ process(receive, other)
} }
} }
@ -132,7 +132,7 @@ trait View extends Actor with Recovery {
if (await) receiverStash.unstashAll() if (await) receiverStash.unstashAll()
} }
private val _viewId = extension.processorId(self) private val _viewId = extension.persistenceId(self)
private val viewSettings = extension.settings.view private val viewSettings = extension.settings.view
private var schedule: Option[Cancellable] = None private var schedule: Option[Cancellable] = None

10
akka-persistence/src/main/scala/akka/persistence/journal/AsyncRecovery.scala
View file

@ -27,7 +27,7 @@ trait AsyncRecovery {
* The channel ids of delivery confirmations that are available for a replayed * The channel ids of delivery confirmations that are available for a replayed
* message must be contained in that message's `confirms` sequence. * message must be contained in that message's `confirms` sequence.
* *
* @param processorId processor id. * @param persistenceId processor id.
* @param fromSequenceNr sequence number where replay should start (inclusive). * @param fromSequenceNr sequence number where replay should start (inclusive).
* @param toSequenceNr sequence number where replay should end (inclusive). * @param toSequenceNr sequence number where replay should end (inclusive).
* @param max maximum number of messages to be replayed. * @param max maximum number of messages to be replayed.
@ -37,16 +37,16 @@ trait AsyncRecovery {
* @see [[AsyncWriteJournal]] * @see [[AsyncWriteJournal]]
* @see [[SyncWriteJournal]] * @see [[SyncWriteJournal]]
*/ */
def asyncReplayMessages(processorId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: PersistentRepr ⇒ Unit): Future[Unit] def asyncReplayMessages(persistenceId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: PersistentRepr ⇒ Unit): Future[Unit]
/** /**
* Plugin API: asynchronously reads the highest stored sequence number for the * Plugin API: asynchronously reads the highest stored sequence number for the
* given `processorId`. * given `persistenceId`.
* *
* @param processorId processor id. * @param persistenceId processor id.
* @param fromSequenceNr hint where to start searching for the highest sequence * @param fromSequenceNr hint where to start searching for the highest sequence
* number. * number.
*/ */
def asyncReadHighestSequenceNr(processorId: String, fromSequenceNr: Long): Future[Long] def asyncReadHighestSequenceNr(persistenceId: String, fromSequenceNr: Long): Future[Long]
//#journal-plugin-api //#journal-plugin-api
} }

16
akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala
View file

@ -43,10 +43,10 @@ trait AsyncWriteJournal extends Actor with WriteJournalBase with AsyncRecovery {
resequence(WriteMessageFailure(_, e)) resequence(WriteMessageFailure(_, e))
} }
resequencerCounter += resequenceables.length + 1 resequencerCounter += resequenceables.length + 1
case r @ ReplayMessages(fromSequenceNr, toSequenceNr, max, processorId, processor, replayDeleted) ⇒ case r @ ReplayMessages(fromSequenceNr, toSequenceNr, max, persistenceId, processor, replayDeleted) ⇒
// Send replayed messages and replay result to processor directly. No need // Send replayed messages and replay result to processor directly. No need
// to resequence replayed messages relative to written and looped messages. // to resequence replayed messages relative to written and looped messages.
asyncReplayMessages(processorId, fromSequenceNr, toSequenceNr, max) { p ⇒ asyncReplayMessages(persistenceId, fromSequenceNr, toSequenceNr, max) { p ⇒
if (!p.deleted || replayDeleted) processor.tell(ReplayedMessage(p), p.sender) if (!p.deleted || replayDeleted) processor.tell(ReplayedMessage(p), p.sender)
} map { } map {
case _ ⇒ ReplayMessagesSuccess case _ ⇒ ReplayMessagesSuccess
@ -55,10 +55,10 @@ trait AsyncWriteJournal extends Actor with WriteJournalBase with AsyncRecovery {
} pipeTo (processor) onSuccess { } pipeTo (processor) onSuccess {
case _ if publish ⇒ context.system.eventStream.publish(r) case _ if publish ⇒ context.system.eventStream.publish(r)
} }
case ReadHighestSequenceNr(fromSequenceNr, processorId, processor) ⇒ case ReadHighestSequenceNr(fromSequenceNr, persistenceId, processor) ⇒
// Send read highest sequence number to processor directly. No need // Send read highest sequence number to processor directly. No need
// to resequence the result relative to written and looped messages. // to resequence the result relative to written and looped messages.
asyncReadHighestSequenceNr(processorId, fromSequenceNr).map { asyncReadHighestSequenceNr(persistenceId, fromSequenceNr).map {
highest ⇒ ReadHighestSequenceNrSuccess(highest) highest ⇒ ReadHighestSequenceNrSuccess(highest)
} recover { } recover {
case e ⇒ ReadHighestSequenceNrFailure(e) case e ⇒ ReadHighestSequenceNrFailure(e)
@ -75,8 +75,8 @@ trait AsyncWriteJournal extends Actor with WriteJournalBase with AsyncRecovery {
if (publish) context.system.eventStream.publish(d) if (publish) context.system.eventStream.publish(d)
case Failure(e) ⇒ case Failure(e) ⇒
} }
case d @ DeleteMessagesTo(processorId, toSequenceNr, permanent) ⇒ case d @ DeleteMessagesTo(persistenceId, toSequenceNr, permanent) ⇒
asyncDeleteMessagesTo(processorId, toSequenceNr, permanent) onComplete { asyncDeleteMessagesTo(persistenceId, toSequenceNr, permanent) onComplete {
case Success(_) ⇒ if (publish) context.system.eventStream.publish(d) case Success(_) ⇒ if (publish) context.system.eventStream.publish(d)
case Failure(e) ⇒ case Failure(e) ⇒
} }
@ -103,14 +103,14 @@ trait AsyncWriteJournal extends Actor with WriteJournalBase with AsyncRecovery {
* journal. If `permanent` is set to `false`, the persistent messages are marked as * journal. If `permanent` is set to `false`, the persistent messages are marked as
* deleted, otherwise they are permanently deleted. * deleted, otherwise they are permanently deleted.
*/ */
def asyncDeleteMessages(messageIds: immutable.Seq[PersistentId], permanent: Boolean): Future[Unit] def asyncDeleteMessages(messageIds: immutable.Seq[PersistenceId], permanent: Boolean): Future[Unit]
/** /**
* Plugin API: asynchronously deletes all persistent messages up to `toSequenceNr` * Plugin API: asynchronously deletes all persistent messages up to `toSequenceNr`
* (inclusive). If `permanent` is set to `false`, the persistent messages are marked * (inclusive). If `permanent` is set to `false`, the persistent messages are marked
* as deleted, otherwise they are permanently deleted. * as deleted, otherwise they are permanently deleted.
*/ */
def asyncDeleteMessagesTo(processorId: String, toSequenceNr: Long, permanent: Boolean): Future[Unit] def asyncDeleteMessagesTo(persistenceId: String, toSequenceNr: Long, permanent: Boolean): Future[Unit]
//#journal-plugin-api //#journal-plugin-api
} }

22
akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala
View file

@ -43,21 +43,21 @@ private[persistence] trait AsyncWriteProxy extends AsyncWriteJournal with Stash
def asyncWriteConfirmations(confirmations: immutable.Seq[PersistentConfirmation]): Future[Unit] = def asyncWriteConfirmations(confirmations: immutable.Seq[PersistentConfirmation]): Future[Unit] =
(store ? WriteConfirmations(confirmations)).mapTo[Unit] (store ? WriteConfirmations(confirmations)).mapTo[Unit]
def asyncDeleteMessages(messageIds: immutable.Seq[PersistentId], permanent: Boolean): Future[Unit] = def asyncDeleteMessages(messageIds: immutable.Seq[PersistenceId], permanent: Boolean): Future[Unit] =
(store ? DeleteMessages(messageIds, permanent)).mapTo[Unit] (store ? DeleteMessages(messageIds, permanent)).mapTo[Unit]
def asyncDeleteMessagesTo(processorId: String, toSequenceNr: Long, permanent: Boolean): Future[Unit] = def asyncDeleteMessagesTo(persistenceId: String, toSequenceNr: Long, permanent: Boolean): Future[Unit] =
(store ? DeleteMessagesTo(processorId, toSequenceNr, permanent)).mapTo[Unit] (store ? DeleteMessagesTo(persistenceId, toSequenceNr, permanent)).mapTo[Unit]
def asyncReplayMessages(processorId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: (PersistentRepr) ⇒ Unit): Future[Unit] = { def asyncReplayMessages(persistenceId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: (PersistentRepr) ⇒ Unit): Future[Unit] = {
val replayCompletionPromise = Promise[Unit] val replayCompletionPromise = Promise[Unit]
val mediator = context.actorOf(Props(classOf[ReplayMediator], replayCallback, replayCompletionPromise, timeout.duration).withDeploy(Deploy.local)) val mediator = context.actorOf(Props(classOf[ReplayMediator], replayCallback, replayCompletionPromise, timeout.duration).withDeploy(Deploy.local))
store.tell(ReplayMessages(processorId, fromSequenceNr, toSequenceNr, max), mediator) store.tell(ReplayMessages(persistenceId, fromSequenceNr, toSequenceNr, max), mediator)
replayCompletionPromise.future replayCompletionPromise.future
} }
def asyncReadHighestSequenceNr(processorId: String, fromSequenceNr: Long): Future[Long] = def asyncReadHighestSequenceNr(persistenceId: String, fromSequenceNr: Long): Future[Long] =
(store ? ReadHighestSequenceNr(processorId, fromSequenceNr)).mapTo[Long] (store ? ReadHighestSequenceNr(persistenceId, fromSequenceNr)).mapTo[Long]
} }
/** /**
@ -78,13 +78,13 @@ private[persistence] object AsyncWriteTarget {
final case class WriteConfirmations(confirmations: immutable.Seq[PersistentConfirmation]) final case class WriteConfirmations(confirmations: immutable.Seq[PersistentConfirmation])
@SerialVersionUID(1L) @SerialVersionUID(1L)
final case class DeleteMessages(messageIds: immutable.Seq[PersistentId], permanent: Boolean) final case class DeleteMessages(messageIds: immutable.Seq[PersistenceId], permanent: Boolean)
@SerialVersionUID(1L) @SerialVersionUID(1L)
final case class DeleteMessagesTo(processorId: String, toSequenceNr: Long, permanent: Boolean) final case class DeleteMessagesTo(persistenceId: String, toSequenceNr: Long, permanent: Boolean)
@SerialVersionUID(1L) @SerialVersionUID(1L)
final case class ReplayMessages(processorId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long) final case class ReplayMessages(persistenceId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long)
@SerialVersionUID(1L) @SerialVersionUID(1L)
case object ReplaySuccess case object ReplaySuccess
@ -93,7 +93,7 @@ private[persistence] object AsyncWriteTarget {
final case class ReplayFailure(cause: Throwable) final case class ReplayFailure(cause: Throwable)
@SerialVersionUID(1L) @SerialVersionUID(1L)
final case class ReadHighestSequenceNr(processorId: String, fromSequenceNr: Long) final case class ReadHighestSequenceNr(persistenceId: String, fromSequenceNr: Long)
} }
/** /**

16
akka-persistence/src/main/scala/akka/persistence/journal/SyncWriteJournal.scala
View file

@ -39,8 +39,8 @@ trait SyncWriteJournal extends Actor with WriteJournalBase with AsyncRecovery {
} }
throw e throw e
} }
case r @ ReplayMessages(fromSequenceNr, toSequenceNr, max, processorId, processor, replayDeleted) ⇒ case r @ ReplayMessages(fromSequenceNr, toSequenceNr, max, persistenceId, processor, replayDeleted) ⇒
asyncReplayMessages(processorId, fromSequenceNr, toSequenceNr, max) { p ⇒ asyncReplayMessages(persistenceId, fromSequenceNr, toSequenceNr, max) { p ⇒
if (!p.deleted || replayDeleted) processor.tell(ReplayedMessage(p), p.sender) if (!p.deleted || replayDeleted) processor.tell(ReplayedMessage(p), p.sender)
} map { } map {
case _ ⇒ ReplayMessagesSuccess case _ ⇒ ReplayMessagesSuccess
@ -49,8 +49,8 @@ trait SyncWriteJournal extends Actor with WriteJournalBase with AsyncRecovery {
} pipeTo (processor) onSuccess { } pipeTo (processor) onSuccess {
case _ if publish ⇒ context.system.eventStream.publish(r) case _ if publish ⇒ context.system.eventStream.publish(r)
} }
case ReadHighestSequenceNr(fromSequenceNr, processorId, processor) ⇒ case ReadHighestSequenceNr(fromSequenceNr, persistenceId, processor) ⇒
asyncReadHighestSequenceNr(processorId, fromSequenceNr).map { asyncReadHighestSequenceNr(persistenceId, fromSequenceNr).map {
highest ⇒ ReadHighestSequenceNrSuccess(highest) highest ⇒ ReadHighestSequenceNrSuccess(highest)
} recover { } recover {
case e ⇒ ReadHighestSequenceNrFailure(e) case e ⇒ ReadHighestSequenceNrFailure(e)
@ -68,8 +68,8 @@ trait SyncWriteJournal extends Actor with WriteJournalBase with AsyncRecovery {
case Failure(e) ⇒ case Failure(e) ⇒
requestorOption.foreach(_ ! DeleteMessagesFailure(e)) requestorOption.foreach(_ ! DeleteMessagesFailure(e))
} }
case d @ DeleteMessagesTo(processorId, toSequenceNr, permanent) ⇒ case d @ DeleteMessagesTo(persistenceId, toSequenceNr, permanent) ⇒
Try(deleteMessagesTo(processorId, toSequenceNr, permanent)) match { Try(deleteMessagesTo(persistenceId, toSequenceNr, permanent)) match {
case Success(_) ⇒ if (publish) context.system.eventStream.publish(d) case Success(_) ⇒ if (publish) context.system.eventStream.publish(d)
case Failure(e) ⇒ case Failure(e) ⇒
} }
@ -95,13 +95,13 @@ trait SyncWriteJournal extends Actor with WriteJournalBase with AsyncRecovery {
* journal. If `permanent` is set to `false`, the persistent messages are marked as * journal. If `permanent` is set to `false`, the persistent messages are marked as
* deleted, otherwise they are permanently deleted. * deleted, otherwise they are permanently deleted.
*/ */
def deleteMessages(messageIds: immutable.Seq[PersistentId], permanent: Boolean): Unit def deleteMessages(messageIds: immutable.Seq[PersistenceId], permanent: Boolean): Unit
/** /**
* Plugin API: synchronously deletes all persistent messages up to `toSequenceNr` * Plugin API: synchronously deletes all persistent messages up to `toSequenceNr`
* (inclusive). If `permanent` is set to `false`, the persistent messages are marked * (inclusive). If `permanent` is set to `false`, the persistent messages are marked
* as deleted, otherwise they are permanently deleted. * as deleted, otherwise they are permanently deleted.
*/ */
def deleteMessagesTo(processorId: String, toSequenceNr: Long, permanent: Boolean): Unit def deleteMessagesTo(persistenceId: String, toSequenceNr: Long, permanent: Boolean): Unit
//#journal-plugin-api //#journal-plugin-api
} }

16
akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala
View file

@ -37,9 +37,9 @@ private[persistence] trait InmemMessages {
// processor id -> persistent message // processor id -> persistent message
var messages = Map.empty[String, Vector[PersistentRepr]] var messages = Map.empty[String, Vector[PersistentRepr]]
def add(p: PersistentRepr) = messages = messages + (messages.get(p.processorId) match { def add(p: PersistentRepr) = messages = messages + (messages.get(p.persistenceId) match {
case Some(ms) ⇒ p.processorId -> (ms :+ p) case Some(ms) ⇒ p.persistenceId -> (ms :+ p)
case None ⇒ p.processorId -> Vector(p) case None ⇒ p.persistenceId -> Vector(p)
}) })
def update(pid: String, snr: Long)(f: PersistentRepr ⇒ PersistentRepr) = messages = messages.get(pid) match { def update(pid: String, snr: Long)(f: PersistentRepr ⇒ PersistentRepr) = messages = messages.get(pid) match {
@ -79,11 +79,11 @@ private[persistence] class InmemStore extends Actor with InmemMessages {
case WriteMessages(msgs) ⇒ case WriteMessages(msgs) ⇒
sender() ! msgs.foreach(add) sender() ! msgs.foreach(add)
case WriteConfirmations(cnfs) ⇒ case WriteConfirmations(cnfs) ⇒
sender() ! cnfs.foreach(cnf ⇒ update(cnf.processorId, cnf.sequenceNr)(p ⇒ p.update(confirms = cnf.channelId +: p.confirms))) sender() ! cnfs.foreach(cnf ⇒ update(cnf.persistenceId, cnf.sequenceNr)(p ⇒ p.update(confirms = cnf.channelId +: p.confirms)))
case DeleteMessages(msgIds, false) ⇒ case DeleteMessages(msgIds, false) ⇒
sender() ! msgIds.foreach(msgId ⇒ update(msgId.processorId, msgId.sequenceNr)(_.update(deleted = true))) sender() ! msgIds.foreach(msgId ⇒ update(msgId.persistenceId, msgId.sequenceNr)(_.update(deleted = true)))
case DeleteMessages(msgIds, true) ⇒ case DeleteMessages(msgIds, true) ⇒
sender() ! msgIds.foreach(msgId ⇒ delete(msgId.processorId, msgId.sequenceNr)) sender() ! msgIds.foreach(msgId ⇒ delete(msgId.persistenceId, msgId.sequenceNr))
case DeleteMessagesTo(pid, tsnr, false) ⇒ case DeleteMessagesTo(pid, tsnr, false) ⇒
sender() ! (1L to tsnr foreach { snr ⇒ update(pid, snr)(_.update(deleted = true)) }) sender() ! (1L to tsnr foreach { snr ⇒ update(pid, snr)(_.update(deleted = true)) })
case DeleteMessagesTo(pid, tsnr, true) ⇒ case DeleteMessagesTo(pid, tsnr, true) ⇒
@ -91,7 +91,7 @@ private[persistence] class InmemStore extends Actor with InmemMessages {
case ReplayMessages(pid, fromSnr, toSnr, max) ⇒ case ReplayMessages(pid, fromSnr, toSnr, max) ⇒
read(pid, fromSnr, toSnr, max).foreach(sender() ! _) read(pid, fromSnr, toSnr, max).foreach(sender() ! _)
sender() ! ReplaySuccess sender() ! ReplaySuccess
case ReadHighestSequenceNr(processorId, _) ⇒ case ReadHighestSequenceNr(persistenceId, _) ⇒
sender() ! highestSequenceNr(processorId) sender() ! highestSequenceNr(persistenceId)
} }
} }

8
akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncRecovery.scala
View file

@ -17,11 +17,11 @@ import akka.persistence.PersistentRepr
abstract class AsyncRecovery extends SAsyncReplay with AsyncRecoveryPlugin { this: Actor ⇒ abstract class AsyncRecovery extends SAsyncReplay with AsyncRecoveryPlugin { this: Actor ⇒
import context.dispatcher import context.dispatcher
final def asyncReplayMessages(processorId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: (PersistentRepr) ⇒ Unit) = final def asyncReplayMessages(persistenceId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: (PersistentRepr) ⇒ Unit) =
doAsyncReplayMessages(processorId, fromSequenceNr, toSequenceNr, max, new Procedure[PersistentRepr] { doAsyncReplayMessages(persistenceId, fromSequenceNr, toSequenceNr, max, new Procedure[PersistentRepr] {
def apply(p: PersistentRepr) = replayCallback(p) def apply(p: PersistentRepr) = replayCallback(p)
}).map(Unit.unbox) }).map(Unit.unbox)
final def asyncReadHighestSequenceNr(processorId: String, fromSequenceNr: Long): Future[Long] = final def asyncReadHighestSequenceNr(persistenceId: String, fromSequenceNr: Long): Future[Long] =
doAsyncReadHighestSequenceNr(processorId, fromSequenceNr: Long).map(_.longValue) doAsyncReadHighestSequenceNr(persistenceId, fromSequenceNr: Long).map(_.longValue)
} }

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

@ -22,9 +22,9 @@ abstract class AsyncWriteJournal extends AsyncRecovery with SAsyncWriteJournal w
final def asyncWriteConfirmations(confirmations: immutable.Seq[PersistentConfirmation]) = final def asyncWriteConfirmations(confirmations: immutable.Seq[PersistentConfirmation]) =
doAsyncWriteConfirmations(confirmations.asJava).map(Unit.unbox) doAsyncWriteConfirmations(confirmations.asJava).map(Unit.unbox)
final def asyncDeleteMessages(messageIds: immutable.Seq[PersistentId], permanent: Boolean) = final def asyncDeleteMessages(messageIds: immutable.Seq[PersistenceId], permanent: Boolean) =
doAsyncDeleteMessages(messageIds.asJava, permanent).map(Unit.unbox) doAsyncDeleteMessages(messageIds.asJava, permanent).map(Unit.unbox)
final def asyncDeleteMessagesTo(processorId: String, toSequenceNr: Long, permanent: Boolean) = final def asyncDeleteMessagesTo(persistenceId: String, toSequenceNr: Long, permanent: Boolean) =
doAsyncDeleteMessagesTo(processorId, toSequenceNr, permanent).map(Unit.unbox) doAsyncDeleteMessagesTo(persistenceId, toSequenceNr, permanent).map(Unit.unbox)
} }

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

@ -20,9 +20,9 @@ abstract class SyncWriteJournal extends AsyncRecovery with SSyncWriteJournal wit
final def writeConfirmations(confirmations: immutable.Seq[PersistentConfirmation]) = final def writeConfirmations(confirmations: immutable.Seq[PersistentConfirmation]) =
doWriteConfirmations(confirmations.asJava) doWriteConfirmations(confirmations.asJava)
final def deleteMessages(messageIds: immutable.Seq[PersistentId], permanent: Boolean) = final def deleteMessages(messageIds: immutable.Seq[PersistenceId], permanent: Boolean) =
doDeleteMessages(messageIds.asJava, permanent) doDeleteMessages(messageIds.asJava, permanent)
final def deleteMessagesTo(processorId: String, toSequenceNr: Long, permanent: Boolean) = final def deleteMessagesTo(persistenceId: String, toSequenceNr: Long, permanent: Boolean) =
doDeleteMessagesTo(processorId, toSequenceNr, permanent) doDeleteMessagesTo(persistenceId, toSequenceNr, permanent)
} }

10
akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbKey.scala
View file

@ -11,14 +11,14 @@ import java.nio.ByteBuffer
* LevelDB key. * LevelDB key.
*/ */
private[leveldb] final case class Key( private[leveldb] final case class Key(
processorId: Int, persistenceId: Int,
sequenceNr: Long, sequenceNr: Long,
channelId: Int) channelId: Int)
private[leveldb] object Key { private[leveldb] object Key {
def keyToBytes(key: Key): Array[Byte] = { def keyToBytes(key: Key): Array[Byte] = {
val bb = ByteBuffer.allocate(20) val bb = ByteBuffer.allocate(20)
bb.putInt(key.processorId) bb.putInt(key.persistenceId)
bb.putLong(key.sequenceNr) bb.putLong(key.sequenceNr)
bb.putInt(key.channelId) bb.putInt(key.channelId)
bb.array bb.array
@ -32,15 +32,15 @@ private[leveldb] object Key {
new Key(aid, snr, cid) new Key(aid, snr, cid)
} }
def counterKey(processorId: Int): Key = Key(processorId, 0L, 0) def counterKey(persistenceId: Int): Key = Key(persistenceId, 0L, 0)
def counterToBytes(ctr: Long): Array[Byte] = ByteBuffer.allocate(8).putLong(ctr).array def counterToBytes(ctr: Long): Array[Byte] = ByteBuffer.allocate(8).putLong(ctr).array
def counterFromBytes(bytes: Array[Byte]): Long = ByteBuffer.wrap(bytes).getLong def counterFromBytes(bytes: Array[Byte]): Long = ByteBuffer.wrap(bytes).getLong
def id(key: Key) = key.channelId def id(key: Key) = key.channelId
def idKey(id: Int) = Key(1, 0L, id) def idKey(id: Int) = Key(1, 0L, id)
def isIdKey(key: Key): Boolean = key.processorId == 1 def isIdKey(key: Key): Boolean = key.persistenceId == 1
def deletionKey(processorId: Int, sequenceNr: Long): Key = Key(processorId, sequenceNr, 1) def deletionKey(persistenceId: Int, sequenceNr: Long): Key = Key(persistenceId, sequenceNr, 1)
def isDeletionKey(key: Key): Boolean = key.channelId == 1 def isDeletionKey(key: Key): Boolean = key.channelId == 1
} }

22
akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbRecovery.scala
View file

@ -22,17 +22,17 @@ private[persistence] trait LeveldbRecovery extends AsyncRecovery { this: Leveldb
private lazy val replayDispatcherId = config.getString("replay-dispatcher") private lazy val replayDispatcherId = config.getString("replay-dispatcher")
private lazy val replayDispatcher = context.system.dispatchers.lookup(replayDispatcherId) private lazy val replayDispatcher = context.system.dispatchers.lookup(replayDispatcherId)
def asyncReadHighestSequenceNr(processorId: String, fromSequenceNr: Long): Future[Long] = { def asyncReadHighestSequenceNr(persistenceId: String, fromSequenceNr: Long): Future[Long] = {
val nid = numericId(processorId) val nid = numericId(persistenceId)
Future(readHighestSequenceNr(nid))(replayDispatcher) Future(readHighestSequenceNr(nid))(replayDispatcher)
} }
def asyncReplayMessages(processorId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: PersistentRepr ⇒ Unit): Future[Unit] = { def asyncReplayMessages(persistenceId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: PersistentRepr ⇒ Unit): Future[Unit] = {
val nid = numericId(processorId) val nid = numericId(persistenceId)
Future(replayMessages(nid, fromSequenceNr: Long, toSequenceNr, max: Long)(replayCallback))(replayDispatcher) Future(replayMessages(nid, fromSequenceNr: Long, toSequenceNr, max: Long)(replayCallback))(replayDispatcher)
} }
def replayMessages(processorId: Int, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: PersistentRepr ⇒ Unit): Unit = { def replayMessages(persistenceId: Int, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: PersistentRepr ⇒ Unit): Unit = {
@scala.annotation.tailrec @scala.annotation.tailrec
def go(iter: DBIterator, key: Key, ctr: Long, replayCallback: PersistentRepr ⇒ Unit) { def go(iter: DBIterator, key: Key, ctr: Long, replayCallback: PersistentRepr ⇒ Unit) {
if (iter.hasNext) { if (iter.hasNext) {
@ -43,7 +43,7 @@ private[persistence] trait LeveldbRecovery extends AsyncRecovery { this: Leveldb
} else if (nextKey.channelId != 0) { } else if (nextKey.channelId != 0) {
// phantom confirmation (just advance iterator) // phantom confirmation (just advance iterator)
go(iter, nextKey, ctr, replayCallback) go(iter, nextKey, ctr, replayCallback)
} else if (key.processorId == nextKey.processorId) { } else if (key.persistenceId == nextKey.persistenceId) {
val msg = persistentFromBytes(nextEntry.getValue) val msg = persistentFromBytes(nextEntry.getValue)
val del = deletion(iter, nextKey) val del = deletion(iter, nextKey)
val cnf = confirms(iter, nextKey, Nil) val cnf = confirms(iter, nextKey, Nil)
@ -60,7 +60,7 @@ private[persistence] trait LeveldbRecovery extends AsyncRecovery { this: Leveldb
if (iter.hasNext) { if (iter.hasNext) {
val nextEntry = iter.peekNext() val nextEntry = iter.peekNext()
val nextKey = keyFromBytes(nextEntry.getKey) val nextKey = keyFromBytes(nextEntry.getKey)
if (key.processorId == nextKey.processorId && key.sequenceNr == nextKey.sequenceNr) { if (key.persistenceId == nextKey.persistenceId && key.sequenceNr == nextKey.sequenceNr) {
val nextValue = new String(nextEntry.getValue, "UTF-8") val nextValue = new String(nextEntry.getValue, "UTF-8")
iter.next() iter.next()
confirms(iter, nextKey, nextValue :: channelIds) confirms(iter, nextKey, nextValue :: channelIds)
@ -72,7 +72,7 @@ private[persistence] trait LeveldbRecovery extends AsyncRecovery { this: Leveldb
if (iter.hasNext) { if (iter.hasNext) {
val nextEntry = iter.peekNext() val nextEntry = iter.peekNext()
val nextKey = keyFromBytes(nextEntry.getKey) val nextKey = keyFromBytes(nextEntry.getKey)
if (key.processorId == nextKey.processorId && key.sequenceNr == nextKey.sequenceNr && isDeletionKey(nextKey)) { if (key.persistenceId == nextKey.persistenceId && key.sequenceNr == nextKey.sequenceNr && isDeletionKey(nextKey)) {
iter.next() iter.next()
true true
} else false } else false
@ -80,16 +80,16 @@ private[persistence] trait LeveldbRecovery extends AsyncRecovery { this: Leveldb
} }
withIterator { iter ⇒ withIterator { iter ⇒
val startKey = Key(processorId, if (fromSequenceNr < 1L) 1L else fromSequenceNr, 0) val startKey = Key(persistenceId, if (fromSequenceNr < 1L) 1L else fromSequenceNr, 0)
iter.seek(keyToBytes(startKey)) iter.seek(keyToBytes(startKey))
go(iter, startKey, 0L, replayCallback) go(iter, startKey, 0L, replayCallback)
} }
} }
def readHighestSequenceNr(processorId: Int) = { def readHighestSequenceNr(persistenceId: Int) = {
val ro = leveldbSnapshot() val ro = leveldbSnapshot()
try { try {
leveldb.get(keyToBytes(counterKey(processorId)), ro) match { leveldb.get(keyToBytes(counterKey(persistenceId)), ro) match {
case null ⇒ 0L case null ⇒ 0L
case bytes ⇒ counterFromBytes(bytes) case bytes ⇒ counterFromBytes(bytes)
} }

14
akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala
View file

@ -50,15 +50,15 @@ private[persistence] trait LeveldbStore extends Actor with LeveldbIdMapping with
def writeConfirmations(confirmations: immutable.Seq[PersistentConfirmation]) = def writeConfirmations(confirmations: immutable.Seq[PersistentConfirmation]) =
withBatch(batch ⇒ confirmations.foreach(confirmation ⇒ addToConfirmationBatch(confirmation, batch))) withBatch(batch ⇒ confirmations.foreach(confirmation ⇒ addToConfirmationBatch(confirmation, batch)))
def deleteMessages(messageIds: immutable.Seq[PersistentId], permanent: Boolean) = withBatch { batch ⇒ def deleteMessages(messageIds: immutable.Seq[PersistenceId], permanent: Boolean) = withBatch { batch ⇒
messageIds foreach { messageId ⇒ messageIds foreach { messageId ⇒
if (permanent) batch.delete(keyToBytes(Key(numericId(messageId.processorId), messageId.sequenceNr, 0))) if (permanent) batch.delete(keyToBytes(Key(numericId(messageId.persistenceId), messageId.sequenceNr, 0)))
else batch.put(keyToBytes(deletionKey(numericId(messageId.processorId), messageId.sequenceNr)), Array.emptyByteArray) else batch.put(keyToBytes(deletionKey(numericId(messageId.persistenceId), messageId.sequenceNr)), Array.emptyByteArray)
} }
} }
def deleteMessagesTo(processorId: String, toSequenceNr: Long, permanent: Boolean) = withBatch { batch ⇒ def deleteMessagesTo(persistenceId: String, toSequenceNr: Long, permanent: Boolean) = withBatch { batch ⇒
val nid = numericId(processorId) val nid = numericId(persistenceId)
// seek to first existing message // seek to first existing message
val fromSequenceNr = withIterator { iter ⇒ val fromSequenceNr = withIterator { iter ⇒
@ -101,13 +101,13 @@ private[persistence] trait LeveldbStore extends Actor with LeveldbIdMapping with
def persistentFromBytes(a: Array[Byte]): PersistentRepr = serialization.deserialize(a, classOf[PersistentRepr]).get def persistentFromBytes(a: Array[Byte]): PersistentRepr = serialization.deserialize(a, classOf[PersistentRepr]).get
private def addToMessageBatch(persistent: PersistentRepr, batch: WriteBatch): Unit = { private def addToMessageBatch(persistent: PersistentRepr, batch: WriteBatch): Unit = {
val nid = numericId(persistent.processorId) val nid = numericId(persistent.persistenceId)
batch.put(keyToBytes(counterKey(nid)), counterToBytes(persistent.sequenceNr)) batch.put(keyToBytes(counterKey(nid)), counterToBytes(persistent.sequenceNr))
batch.put(keyToBytes(Key(nid, persistent.sequenceNr, 0)), persistentToBytes(persistent)) batch.put(keyToBytes(Key(nid, persistent.sequenceNr, 0)), persistentToBytes(persistent))
} }
private def addToConfirmationBatch(confirmation: PersistentConfirmation, batch: WriteBatch): Unit = { private def addToConfirmationBatch(confirmation: PersistentConfirmation, batch: WriteBatch): Unit = {
val npid = numericId(confirmation.processorId) val npid = numericId(confirmation.persistenceId)
val ncid = numericId(confirmation.channelId) val ncid = numericId(confirmation.channelId)
batch.put(keyToBytes(Key(npid, confirmation.sequenceNr, ncid)), confirmation.channelId.getBytes("UTF-8")) batch.put(keyToBytes(Key(npid, confirmation.sequenceNr, ncid)), confirmation.channelId.getBytes("UTF-8"))
} }

4
akka-persistence/src/main/scala/akka/persistence/package.scala
View file

@ -8,7 +8,7 @@ package akka
package object persistence { package object persistence {
implicit val snapshotMetadataOrdering = new Ordering[SnapshotMetadata] { implicit val snapshotMetadataOrdering = new Ordering[SnapshotMetadata] {
def compare(x: SnapshotMetadata, y: SnapshotMetadata) = def compare(x: SnapshotMetadata, y: SnapshotMetadata) =
if (x.processorId == y.processorId) math.signum(x.sequenceNr - y.sequenceNr).toInt if (x.persistenceId == y.persistenceId) math.signum(x.sequenceNr - y.sequenceNr).toInt
else x.processorId.compareTo(y.processorId) else x.persistenceId.compareTo(y.persistenceId)
} }
} }

18
akka-persistence/src/main/scala/akka/persistence/serialization/MessageSerializer.scala
View file

@ -30,7 +30,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends Serializer {
val PersistentImplClass = classOf[PersistentImpl] val PersistentImplClass = classOf[PersistentImpl]
val ConfirmablePersistentImplClass = classOf[ConfirmablePersistentImpl] val ConfirmablePersistentImplClass = classOf[ConfirmablePersistentImpl]
val DeliveredByTransientChannelClass = classOf[DeliveredByChannel] val DeliveredByTransientChannelClass = classOf[DeliveredByChannel]
val DeliveredByPersistentChannelClass = classOf[DeliveredByPersistentChannel] val DeliveredByPersistentChannelClass = classOf[DeliveredByPersistenceChannel]
val DeliverClass = classOf[Deliver] val DeliverClass = classOf[Deliver]
def identifier: Int = 7 def identifier: Int = 7
@ -50,7 +50,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends Serializer {
case b: PersistentBatch ⇒ persistentMessageBatchBuilder(b).build().toByteArray case b: PersistentBatch ⇒ persistentMessageBatchBuilder(b).build().toByteArray
case p: PersistentRepr ⇒ persistentMessageBuilder(p).build().toByteArray case p: PersistentRepr ⇒ persistentMessageBuilder(p).build().toByteArray
case c: DeliveredByChannel ⇒ deliveredMessageBuilder(c).build().toByteArray case c: DeliveredByChannel ⇒ deliveredMessageBuilder(c).build().toByteArray
case c: DeliveredByPersistentChannel ⇒ deliveredMessageBuilder(c).build().toByteArray case c: DeliveredByPersistenceChannel ⇒ deliveredMessageBuilder(c).build().toByteArray
case d: Deliver ⇒ deliverMessageBuilder(d).build.toByteArray case d: Deliver ⇒ deliverMessageBuilder(d).build.toByteArray
case _ ⇒ throw new IllegalArgumentException(s"Can't serialize object of type ${o.getClass}") case _ ⇒ throw new IllegalArgumentException(s"Can't serialize object of type ${o.getClass}")
} }
@ -95,7 +95,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends Serializer {
private def persistentMessageBuilder(persistent: PersistentRepr) = { private def persistentMessageBuilder(persistent: PersistentRepr) = {
val builder = PersistentMessage.newBuilder val builder = PersistentMessage.newBuilder
if (persistent.processorId != Undefined) builder.setProcessorId(persistent.processorId) if (persistent.persistenceId != Undefined) builder.setPersistenceId(persistent.persistenceId)
if (persistent.confirmMessage != null) builder.setConfirmMessage(deliveredMessageBuilder(persistent.confirmMessage)) if (persistent.confirmMessage != null) builder.setConfirmMessage(deliveredMessageBuilder(persistent.confirmMessage))
if (persistent.confirmTarget != null) builder.setConfirmTarget(Serialization.serializedActorPath(persistent.confirmTarget)) if (persistent.confirmTarget != null) builder.setConfirmTarget(Serialization.serializedActorPath(persistent.confirmTarget))
if (persistent.sender != null) builder.setSender(Serialization.serializedActorPath(persistent.sender)) if (persistent.sender != null) builder.setSender(Serialization.serializedActorPath(persistent.sender))
@ -115,7 +115,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends Serializer {
val serializer = SerializationExtension(system).findSerializerFor(payload) val serializer = SerializationExtension(system).findSerializerFor(payload)
val builder = PersistentPayload.newBuilder() val builder = PersistentPayload.newBuilder()
if (serializer.includeManifest) builder.setPayloadManifest((ByteString.copyFromUtf8(payload.getClass.getName))) if (serializer.includeManifest) builder.setPayloadManifest(ByteString.copyFromUtf8(payload.getClass.getName))
builder.setPayload(ByteString.copyFrom(serializer.toBinary(payload))) builder.setPayload(ByteString.copyFrom(serializer.toBinary(payload)))
builder.setSerializerId(serializer.identifier) builder.setSerializerId(serializer.identifier)
@ -139,7 +139,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends Serializer {
builder.setDeliverySequenceNr(delivered.deliverySequenceNr) builder.setDeliverySequenceNr(delivered.deliverySequenceNr)
delivered match { delivered match {
case c: DeliveredByChannel ⇒ builder.setProcessorId(c.processorId) case c: DeliveredByChannel ⇒ builder.setPersistenceId(c.persistenceId)
case _ ⇒ builder case _ ⇒ builder
} }
} }
@ -161,7 +161,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends Serializer {
PersistentRepr( PersistentRepr(
payload(persistentMessage.getPayload), payload(persistentMessage.getPayload),
persistentMessage.getSequenceNr, persistentMessage.getSequenceNr,
if (persistentMessage.hasProcessorId) persistentMessage.getProcessorId else Undefined, if (persistentMessage.hasPersistenceId) persistentMessage.getPersistenceId else Undefined,
persistentMessage.getDeleted, persistentMessage.getDeleted,
persistentMessage.getRedeliveries, persistentMessage.getRedeliveries,
immutableSeq(persistentMessage.getConfirmsList), immutableSeq(persistentMessage.getConfirmsList),
@ -184,15 +184,15 @@ class MessageSerializer(val system: ExtendedActorSystem) extends Serializer {
private def delivered(deliveredMessage: DeliveredMessage): Delivered = { private def delivered(deliveredMessage: DeliveredMessage): Delivered = {
val channel = if (deliveredMessage.hasChannel) system.provider.resolveActorRef(deliveredMessage.getChannel) else null val channel = if (deliveredMessage.hasChannel) system.provider.resolveActorRef(deliveredMessage.getChannel) else null
if (deliveredMessage.hasProcessorId) { if (deliveredMessage.hasPersistenceId) {
DeliveredByChannel( DeliveredByChannel(
deliveredMessage.getProcessorId, deliveredMessage.getPersistenceId,
deliveredMessage.getChannelId, deliveredMessage.getChannelId,
deliveredMessage.getPersistentSequenceNr, deliveredMessage.getPersistentSequenceNr,
deliveredMessage.getDeliverySequenceNr, deliveredMessage.getDeliverySequenceNr,
channel) channel)
} else { } else {
DeliveredByPersistentChannel( DeliveredByPersistenceChannel(
deliveredMessage.getChannelId, deliveredMessage.getChannelId,
deliveredMessage.getPersistentSequenceNr, deliveredMessage.getPersistentSequenceNr,
deliveredMessage.getDeliverySequenceNr, deliveredMessage.getDeliverySequenceNr,

12
akka-persistence/src/main/scala/akka/persistence/snapshot/SnapshotStore.scala
View file

@ -22,13 +22,13 @@ trait SnapshotStore extends Actor {
private val publish = extension.settings.internal.publishPluginCommands private val publish = extension.settings.internal.publishPluginCommands
final def receive = { final def receive = {
case LoadSnapshot(processorId, criteria, toSequenceNr) ⇒ case LoadSnapshot(persistenceId, criteria, toSequenceNr) ⇒
val p = sender() val p = sender()
loadAsync(processorId, criteria.limit(toSequenceNr)) map { loadAsync(persistenceId, criteria.limit(toSequenceNr)) map {
sso ⇒ LoadSnapshotResult(sso, toSequenceNr) sso ⇒ LoadSnapshotResult(sso, toSequenceNr)
} recover { } recover {
case e ⇒ LoadSnapshotResult(None, toSequenceNr) case e ⇒ LoadSnapshotResult(None, toSequenceNr)
} pipeTo (p) } pipeTo p
case SaveSnapshot(metadata, snapshot) ⇒ case SaveSnapshot(metadata, snapshot) ⇒
val p = sender() val p = sender()
val md = metadata.copy(timestamp = System.currentTimeMillis) val md = metadata.copy(timestamp = System.currentTimeMillis)
@ -58,7 +58,7 @@ trait SnapshotStore extends Actor {
* @param processorId processor id. * @param processorId processor id.
* @param criteria selection criteria for loading. * @param criteria selection criteria for loading.
*/ */
def loadAsync(processorId: String, criteria: SnapshotSelectionCriteria): Future[Option[SelectedSnapshot]] def loadAsync(persistenceId: String, criteria: SnapshotSelectionCriteria): Future[Option[SelectedSnapshot]]
/** /**
* Plugin API: asynchronously saves a snapshot. * Plugin API: asynchronously saves a snapshot.
@ -86,9 +86,9 @@ trait SnapshotStore extends Actor {
/** /**
* Plugin API: deletes all snapshots matching `criteria`. * Plugin API: deletes all snapshots matching `criteria`.
* *
* @param processorId processor id. * @param persistenceId processor id.
* @param criteria selection criteria for deleting. * @param criteria selection criteria for deleting.
*/ */
def delete(processorId: String, criteria: SnapshotSelectionCriteria) def delete(persistenceId: String, criteria: SnapshotSelectionCriteria)
//#snapshot-store-plugin-api //#snapshot-store-plugin-api
} }

8
akka-persistence/src/main/scala/akka/persistence/snapshot/japi/SnapshotStore.scala
View file

@ -16,8 +16,8 @@ import akka.persistence.snapshot.{ SnapshotStore ⇒ SSnapshotStore }
abstract class SnapshotStore extends SSnapshotStore with SnapshotStorePlugin { abstract class SnapshotStore extends SSnapshotStore with SnapshotStorePlugin {
import context.dispatcher import context.dispatcher
final def loadAsync(processorId: String, criteria: SnapshotSelectionCriteria) = final def loadAsync(persistenceId: String, criteria: SnapshotSelectionCriteria) =
doLoadAsync(processorId, criteria).map(_.asScala) doLoadAsync(persistenceId, criteria).map(_.asScala)
final def saveAsync(metadata: SnapshotMetadata, snapshot: Any): Future[Unit] = final def saveAsync(metadata: SnapshotMetadata, snapshot: Any): Future[Unit] =
doSaveAsync(metadata, snapshot).map(Unit.unbox) doSaveAsync(metadata, snapshot).map(Unit.unbox)
@ -28,7 +28,7 @@ abstract class SnapshotStore extends SSnapshotStore with SnapshotStorePlugin {
final def delete(metadata: SnapshotMetadata) = final def delete(metadata: SnapshotMetadata) =
doDelete(metadata) doDelete(metadata)
final def delete(processorId: String, criteria: SnapshotSelectionCriteria) = final def delete(persistenceId: String, criteria: SnapshotSelectionCriteria) =
doDelete(processorId: String, criteria: SnapshotSelectionCriteria) doDelete(persistenceId: String, criteria: SnapshotSelectionCriteria)
} }

18
akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala
View file

@ -33,7 +33,7 @@ private[persistence] class LocalSnapshotStore extends SnapshotStore with ActorLo
private val serializationExtension = SerializationExtension(context.system) private val serializationExtension = SerializationExtension(context.system)
private var saving = immutable.Set.empty[SnapshotMetadata] // saving in progress private var saving = immutable.Set.empty[SnapshotMetadata] // saving in progress
def loadAsync(processorId: String, criteria: SnapshotSelectionCriteria): Future[Option[SelectedSnapshot]] = { def loadAsync(persistenceId: String, criteria: SnapshotSelectionCriteria): Future[Option[SelectedSnapshot]] = {
// //
// Heuristics: // Heuristics:
// //
@ -44,7 +44,7 @@ private[persistence] class LocalSnapshotStore extends SnapshotStore with ActorLo
// //
// TODO: make number of loading attempts configurable // TODO: make number of loading attempts configurable
// //
val metadata = snapshotMetadata(processorId, criteria).sorted.takeRight(3) val metadata = snapshotMetadata(persistenceId, criteria).sorted.takeRight(3)
Future(load(metadata))(streamDispatcher) Future(load(metadata))(streamDispatcher)
} }
@ -62,8 +62,8 @@ private[persistence] class LocalSnapshotStore extends SnapshotStore with ActorLo
snapshotFile(metadata).delete() snapshotFile(metadata).delete()
} }
def delete(processorId: String, criteria: SnapshotSelectionCriteria) = { def delete(persistenceId: String, criteria: SnapshotSelectionCriteria) = {
snapshotMetadata(processorId, criteria).foreach(delete) snapshotMetadata(persistenceId, criteria).foreach(delete)
} }
@scala.annotation.tailrec @scala.annotation.tailrec
@ -102,10 +102,10 @@ private[persistence] class LocalSnapshotStore extends SnapshotStore with ActorLo
try { p(stream) } finally { stream.close() } try { p(stream) } finally { stream.close() }
private def snapshotFile(metadata: SnapshotMetadata, extension: String = ""): File = private def snapshotFile(metadata: SnapshotMetadata, extension: String = ""): File =
new File(snapshotDir, s"snapshot-${URLEncoder.encode(metadata.processorId, "UTF-8")}-${metadata.sequenceNr}-${metadata.timestamp}${extension}") new File(snapshotDir, s"snapshot-${URLEncoder.encode(metadata.persistenceId, "UTF-8")}-${metadata.sequenceNr}-${metadata.timestamp}${extension}")
private def snapshotMetadata(processorId: String, criteria: SnapshotSelectionCriteria): immutable.Seq[SnapshotMetadata] = private def snapshotMetadata(persistenceId: String, criteria: SnapshotSelectionCriteria): immutable.Seq[SnapshotMetadata] =
snapshotDir.listFiles(new SnapshotFilenameFilter(processorId)).map(_.getName).collect { snapshotDir.listFiles(new SnapshotFilenameFilter(persistenceId)).map(_.getName).collect {
case FilenamePattern(pid, snr, tms) ⇒ SnapshotMetadata(URLDecoder.decode(pid, "UTF-8"), snr.toLong, tms.toLong) case FilenamePattern(pid, snr, tms) ⇒ SnapshotMetadata(URLDecoder.decode(pid, "UTF-8"), snr.toLong, tms.toLong)
}.filter(md ⇒ criteria.matches(md) && !saving.contains(md)).toVector }.filter(md ⇒ criteria.matches(md) && !saving.contains(md)).toVector
@ -119,7 +119,7 @@ private[persistence] class LocalSnapshotStore extends SnapshotStore with ActorLo
super.preStart() super.preStart()
} }
private class SnapshotFilenameFilter(processorId: String) extends FilenameFilter { private class SnapshotFilenameFilter(persistenceId: String) extends FilenameFilter {
def accept(dir: File, name: String): Boolean = name.startsWith(s"snapshot-${URLEncoder.encode(processorId, "UTF-8")}") def accept(dir: File, name: String): Boolean = name.startsWith(s"snapshot-${URLEncoder.encode(persistenceId, "UTF-8")}")
} }
} }

2
akka-persistence/src/test/scala/akka/persistence/FailureSpec.scala
View file

@ -61,7 +61,7 @@ object FailureSpec {
val channel = context.actorOf(Channel.props("channel", ChannelSettings(redeliverMax = 10, redeliverInterval = 500 milliseconds)), "channel") val channel = context.actorOf(Channel.props("channel", ChannelSettings(redeliverMax = 10, redeliverInterval = 500 milliseconds)), "channel")
override def processorId = "chaos" override def persistenceId = "chaos"
def receive = { def receive = {
case p @ Persistent(i: Int, _) ⇒ case p @ Persistent(i: Int, _) ⇒

9
akka-persistence/src/test/scala/akka/persistence/NumberProcessorSpec.scala
View file

@ -22,7 +22,6 @@ object NumberProcessorSpec {
case object GetNumber case object GetNumber
class NumberProcessorWithPersistentChannel(name: String) extends NamedProcessor(name) { class NumberProcessorWithPersistentChannel(name: String) extends NamedProcessor(name) {
override def processorId = name
var num = 0 var num = 0
val channel = context.actorOf(PersistentChannel.props(channelId = "stable_id", val channel = context.actorOf(PersistentChannel.props(channelId = "stable_id",
@ -52,7 +51,7 @@ class NumberProcessorSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "Nu
"resurrect with the correct state, not replaying confirmed messages to clients" in { "resurrect with the correct state, not replaying confirmed messages to clients" in {
val deliveredProbe = TestProbe() val deliveredProbe = TestProbe()
system.eventStream.subscribe(deliveredProbe.testActor, classOf[DeliveredByPersistentChannel]) system.eventStream.subscribe(deliveredProbe.testActor, classOf[DeliveredByPersistenceChannel])
val probe = TestProbe() val probe = TestProbe()
@ -63,7 +62,7 @@ class NumberProcessorSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "Nu
zero.confirm() zero.confirm()
zero.payload should equal(0) zero.payload should equal(0)
deliveredProbe.expectMsgType[DeliveredByPersistentChannel] deliveredProbe.expectMsgType[DeliveredByPersistenceChannel]
processor.tell(Persistent(DecrementAndGet), probe.testActor) processor.tell(Persistent(DecrementAndGet), probe.testActor)
@ -71,7 +70,7 @@ class NumberProcessorSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "Nu
decrementFrom0.confirm() decrementFrom0.confirm()
decrementFrom0.payload should equal(-1) decrementFrom0.payload should equal(-1)
deliveredProbe.expectMsgType[DeliveredByPersistentChannel] deliveredProbe.expectMsgType[DeliveredByPersistenceChannel]
watch(processor) watch(processor)
system.stop(processor) system.stop(processor)
@ -84,7 +83,7 @@ class NumberProcessorSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "Nu
decrementFromMinus1.confirm() decrementFromMinus1.confirm()
decrementFromMinus1.payload should equal(-2) decrementFromMinus1.payload should equal(-2)
deliveredProbe.expectMsgType[DeliveredByPersistentChannel] deliveredProbe.expectMsgType[DeliveredByPersistenceChannel]
} }
} }
} }

14
akka-persistence/src/test/scala/akka/persistence/PerformanceSpec.scala
View file

@ -30,8 +30,8 @@ object PerformanceSpec {
var startTime: Long = 0L var startTime: Long = 0L
var stopTime: Long = 0L var stopTime: Long = 0L
var startSequenceNr = 0L; var startSequenceNr = 0L
var stopSequenceNr = 0L; var stopSequenceNr = 0L
def startMeasure(): Unit = { def startMeasure(): Unit = {
startSequenceNr = lastSequenceNr startSequenceNr = lastSequenceNr
@ -169,9 +169,9 @@ class PerformanceSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "Perfor
def stressPersistentChannel(): Unit = { def stressPersistentChannel(): Unit = {
val channel = system.actorOf(PersistentChannel.props()) val channel = system.actorOf(PersistentChannel.props())
val destination = system.actorOf(Props[PerformanceTestDestination]) val destination = system.actorOf(Props[PerformanceTestDestination])
1 to warmupCycles foreach { i ⇒ channel ! Deliver(PersistentRepr(s"msg${i}", processorId = "test"), destination.path) } 1 to warmupCycles foreach { i ⇒ channel ! Deliver(PersistentRepr(s"msg${i}", persistenceId = "test"), destination.path) }
channel ! Deliver(Persistent(StartMeasure), destination.path) channel ! Deliver(Persistent(StartMeasure), destination.path)
1 to loadCycles foreach { i ⇒ channel ! Deliver(PersistentRepr(s"msg${i}", processorId = "test"), destination.path) } 1 to loadCycles foreach { i ⇒ channel ! Deliver(PersistentRepr(s"msg${i}", persistenceId = "test"), destination.path) }
channel ! Deliver(Persistent(StopMeasure), destination.path) channel ! Deliver(Persistent(StopMeasure), destination.path)
expectMsgPF(100 seconds) { expectMsgPF(100 seconds) {
case throughput: Double ⇒ println(f"\nthroughput = $throughput%.2f persistent messages per second") case throughput: Double ⇒ println(f"\nthroughput = $throughput%.2f persistent messages per second")
@ -179,10 +179,10 @@ class PerformanceSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "Perfor
} }
def subscribeToConfirmation(probe: TestProbe): Unit = def subscribeToConfirmation(probe: TestProbe): Unit =
system.eventStream.subscribe(probe.ref, classOf[DeliveredByPersistentChannel]) system.eventStream.subscribe(probe.ref, classOf[DeliveredByPersistenceChannel])
def awaitConfirmation(probe: TestProbe): Unit = def awaitConfirmation(probe: TestProbe): Unit =
probe.expectMsgType[DeliveredByPersistentChannel] probe.expectMsgType[DeliveredByPersistenceChannel]
"A command sourced processor" should { "A command sourced processor" should {
"have some reasonable throughput" in { "have some reasonable throughput" in {
@ -213,7 +213,7 @@ class PerformanceSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "Perfor
stressPersistentChannel() stressPersistentChannel()
probe.fishForMessage(100.seconds) { probe.fishForMessage(100.seconds) {
case DeliveredByPersistentChannel(_, snr, _, _) ⇒ snr == warmupCycles + loadCycles + 2 case DeliveredByPersistenceChannel(_, snr, _, _) ⇒ snr == warmupCycles + loadCycles + 2
} }
} }
} }

2
akka-persistence/src/test/scala/akka/persistence/PersistenceSpec.scala
View file

@ -77,7 +77,7 @@ trait Cleanup { this: AkkaSpec ⇒
} }
abstract class NamedProcessor(name: String) extends Processor { abstract class NamedProcessor(name: String) extends Processor {
override def processorId: String = name override def persistenceId: String = name
} }
trait TurnOffRecoverOnStart { this: Processor ⇒ trait TurnOffRecoverOnStart { this: Processor ⇒

4
akka-persistence/src/test/scala/akka/persistence/PersistentChannelSpec.scala
View file

@ -71,8 +71,8 @@ abstract class PersistentChannelSpec(config: Config) extends ChannelSpec(config)
"not modify certain persistent message fields" in { "not modify certain persistent message fields" in {
val destProbe = TestProbe() val destProbe = TestProbe()
val persistent1 = PersistentRepr(payload = "a", processorId = "p1", confirms = List("c1", "c2"), sender = defaultTestChannel, sequenceNr = 13) val persistent1 = PersistentRepr(payload = "a", persistenceId = "p1", confirms = List("c1", "c2"), sender = defaultTestChannel, sequenceNr = 13)
val persistent2 = PersistentRepr(payload = "b", processorId = "p1", confirms = List("c1", "c2"), sender = defaultTestChannel) val persistent2 = PersistentRepr(payload = "b", persistenceId = "p1", confirms = List("c1", "c2"), sender = defaultTestChannel)
defaultTestChannel ! Deliver(persistent1, destProbe.ref.path) defaultTestChannel ! Deliver(persistent1, destProbe.ref.path)
defaultTestChannel ! Deliver(persistent2, destProbe.ref.path) defaultTestChannel ! Deliver(persistent2, destProbe.ref.path)

2
akka-persistence/src/test/scala/akka/persistence/SnapshotDirectoryFailureSpec.scala
View file

@ -13,7 +13,7 @@ object SnapshotDirectoryFailureSpec {
class TestProcessor(name: String, probe: ActorRef) extends Processor { class TestProcessor(name: String, probe: ActorRef) extends Processor {
override def processorId: String = name override def persistenceId: String = name
override def preStart(): Unit = () override def preStart(): Unit = ()

4
akka-persistence/src/test/scala/akka/persistence/SnapshotFailureRobustnessSpec.scala
View file

@ -53,7 +53,7 @@ class SnapshotFailureRobustnessSpec extends AkkaSpec(PersistenceSpec.config("lev
"A processor with a failing snapshot" must { "A processor with a failing snapshot" must {
"recover state starting from the most recent complete snapshot" in { "recover state starting from the most recent complete snapshot" in {
val sProcessor = system.actorOf(Props(classOf[SaveSnapshotTestProcessor], name, testActor)) val sProcessor = system.actorOf(Props(classOf[SaveSnapshotTestProcessor], name, testActor))
val processorId = name val persistenceId = name
expectMsg(RecoveryCompleted) expectMsg(RecoveryCompleted)
sProcessor ! Persistent("blahonga") sProcessor ! Persistent("blahonga")
@ -67,7 +67,7 @@ class SnapshotFailureRobustnessSpec extends AkkaSpec(PersistenceSpec.config("lev
val lProcessor = system.actorOf(Props(classOf[LoadSnapshotTestProcessor], name, testActor)) val lProcessor = system.actorOf(Props(classOf[LoadSnapshotTestProcessor], name, testActor))
lProcessor ! Recover() lProcessor ! Recover()
expectMsgPF() { expectMsgPF() {
case (SnapshotMetadata(`processorId`, 1, timestamp), state) ⇒ case (SnapshotMetadata(`persistenceId`, 1, timestamp), state) ⇒
state should be("blahonga") state should be("blahonga")
timestamp should be > (0L) timestamp should be > (0L)
} }

4
akka-persistence/src/test/scala/akka/persistence/SnapshotSerializationSpec.scala
View file

@ -77,14 +77,14 @@ class SnapshotSerializationSpec extends AkkaSpec(PersistenceSpec.config("leveldb
"A processor with custom Serializer" must { "A processor with custom Serializer" must {
"be able to handle serialization header of more than 255 bytes" in { "be able to handle serialization header of more than 255 bytes" in {
val sProcessor = system.actorOf(Props(classOf[TestProcessor], name, testActor)) val sProcessor = system.actorOf(Props(classOf[TestProcessor], name, testActor))
val processorId = name val persistenceId = name
sProcessor ! "blahonga" sProcessor ! "blahonga"
expectMsg(0) expectMsg(0)
val lProcessor = system.actorOf(Props(classOf[TestProcessor], name, testActor)) val lProcessor = system.actorOf(Props(classOf[TestProcessor], name, testActor))
lProcessor ! Recover() lProcessor ! Recover()
expectMsgPF() { expectMsgPF() {
case (SnapshotMetadata(`processorId`, 0, timestamp), state) ⇒ case (SnapshotMetadata(`persistenceId`, 0, timestamp), state) ⇒
state should be(new MySnapshot("blahonga")) state should be(new MySnapshot("blahonga"))
timestamp should be > (0L) timestamp should be > (0L)
} }

30
akka-persistence/src/test/scala/akka/persistence/SnapshotSpec.scala
View file

@ -64,12 +64,12 @@ class SnapshotSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "SnapshotS
"A processor" must { "A processor" must {
"recover state starting from the most recent snapshot" in { "recover state starting from the most recent snapshot" in {
val processor = system.actorOf(Props(classOf[LoadSnapshotTestProcessor], name, testActor)) val processor = system.actorOf(Props(classOf[LoadSnapshotTestProcessor], name, testActor))
val processorId = name val persistenceId = name
processor ! Recover() processor ! Recover()
expectMsgPF() { expectMsgPF() {
case (SnapshotMetadata(`processorId`, 4, timestamp), state) ⇒ case (SnapshotMetadata(`persistenceId`, 4, timestamp), state) ⇒
state should be(List("a-1", "b-2", "c-3", "d-4").reverse) state should be(List("a-1", "b-2", "c-3", "d-4").reverse)
timestamp should be > (0L) timestamp should be > (0L)
} }
@ -79,12 +79,12 @@ class SnapshotSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "SnapshotS
} }
"recover state starting from the most recent snapshot matching an upper sequence number bound" in { "recover state starting from the most recent snapshot matching an upper sequence number bound" in {
val processor = system.actorOf(Props(classOf[LoadSnapshotTestProcessor], name, testActor)) val processor = system.actorOf(Props(classOf[LoadSnapshotTestProcessor], name, testActor))
val processorId = name val persistenceId = name
processor ! Recover(toSequenceNr = 3) processor ! Recover(toSequenceNr = 3)
expectMsgPF() { expectMsgPF() {
case (SnapshotMetadata(`processorId`, 2, timestamp), state) ⇒ case (SnapshotMetadata(`persistenceId`, 2, timestamp), state) ⇒
state should be(List("a-1", "b-2").reverse) state should be(List("a-1", "b-2").reverse)
timestamp should be > (0L) timestamp should be > (0L)
} }
@ -93,13 +93,13 @@ class SnapshotSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "SnapshotS
} }
"recover state starting from the most recent snapshot matching an upper sequence number bound (without further replay)" in { "recover state starting from the most recent snapshot matching an upper sequence number bound (without further replay)" in {
val processor = system.actorOf(Props(classOf[LoadSnapshotTestProcessor], name, testActor)) val processor = system.actorOf(Props(classOf[LoadSnapshotTestProcessor], name, testActor))
val processorId = name val persistenceId = name
processor ! Recover(toSequenceNr = 4) processor ! Recover(toSequenceNr = 4)
processor ! "done" processor ! "done"
expectMsgPF() { expectMsgPF() {
case (SnapshotMetadata(`processorId`, 4, timestamp), state) ⇒ case (SnapshotMetadata(`persistenceId`, 4, timestamp), state) ⇒
state should be(List("a-1", "b-2", "c-3", "d-4").reverse) state should be(List("a-1", "b-2", "c-3", "d-4").reverse)
timestamp should be > (0L) timestamp should be > (0L)
} }
@ -108,12 +108,12 @@ class SnapshotSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "SnapshotS
} }
"recover state starting from the most recent snapshot matching criteria" in { "recover state starting from the most recent snapshot matching criteria" in {
val processor = system.actorOf(Props(classOf[LoadSnapshotTestProcessor], name, testActor)) val processor = system.actorOf(Props(classOf[LoadSnapshotTestProcessor], name, testActor))
val processorId = name val persistenceId = name
processor ! Recover(fromSnapshot = SnapshotSelectionCriteria(maxSequenceNr = 2)) processor ! Recover(fromSnapshot = SnapshotSelectionCriteria(maxSequenceNr = 2))
expectMsgPF() { expectMsgPF() {
case (SnapshotMetadata(`processorId`, 2, timestamp), state) ⇒ case (SnapshotMetadata(`persistenceId`, 2, timestamp), state) ⇒
state should be(List("a-1", "b-2").reverse) state should be(List("a-1", "b-2").reverse)
timestamp should be > (0L) timestamp should be > (0L)
} }
@ -125,12 +125,12 @@ class SnapshotSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "SnapshotS
} }
"recover state starting from the most recent snapshot matching criteria and an upper sequence number bound" in { "recover state starting from the most recent snapshot matching criteria and an upper sequence number bound" in {
val processor = system.actorOf(Props(classOf[LoadSnapshotTestProcessor], name, testActor)) val processor = system.actorOf(Props(classOf[LoadSnapshotTestProcessor], name, testActor))
val processorId = name val persistenceId = name
processor ! Recover(fromSnapshot = SnapshotSelectionCriteria(maxSequenceNr = 2), toSequenceNr = 3) processor ! Recover(fromSnapshot = SnapshotSelectionCriteria(maxSequenceNr = 2), toSequenceNr = 3)
expectMsgPF() { expectMsgPF() {
case (SnapshotMetadata(`processorId`, 2, timestamp), state) ⇒ case (SnapshotMetadata(`persistenceId`, 2, timestamp), state) ⇒
state should be(List("a-1", "b-2").reverse) state should be(List("a-1", "b-2").reverse)
timestamp should be > (0L) timestamp should be > (0L)
} }
@ -151,7 +151,7 @@ class SnapshotSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "SnapshotS
val deleteProbe = TestProbe() val deleteProbe = TestProbe()
val processor1 = system.actorOf(Props(classOf[DeleteSnapshotTestProcessor], name, testActor)) val processor1 = system.actorOf(Props(classOf[DeleteSnapshotTestProcessor], name, testActor))
val processorId = name val persistenceId = name
system.eventStream.subscribe(deleteProbe.ref, classOf[DeleteSnapshot]) system.eventStream.subscribe(deleteProbe.ref, classOf[DeleteSnapshot])
@ -160,7 +160,7 @@ class SnapshotSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "SnapshotS
processor1 ! "done" processor1 ! "done"
val metadata = expectMsgPF() { val metadata = expectMsgPF() {
case (md @ SnapshotMetadata(`processorId`, 4, _), state) ⇒ case (md @ SnapshotMetadata(`persistenceId`, 4, _), state) ⇒
state should be(List("a-1", "b-2", "c-3", "d-4").reverse) state should be(List("a-1", "b-2", "c-3", "d-4").reverse)
md md
} }
@ -175,7 +175,7 @@ class SnapshotSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "SnapshotS
processor2 ! Recover(toSequenceNr = 4) processor2 ! Recover(toSequenceNr = 4)
expectMsgPF() { expectMsgPF() {
case (md @ SnapshotMetadata(`processorId`, 2, _), state) ⇒ case (md @ SnapshotMetadata(`persistenceId`, 2, _), state) ⇒
state should be(List("a-1", "b-2").reverse) state should be(List("a-1", "b-2").reverse)
md md
} }
@ -187,7 +187,7 @@ class SnapshotSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "SnapshotS
val deleteProbe = TestProbe() val deleteProbe = TestProbe()
val processor1 = system.actorOf(Props(classOf[DeleteSnapshotTestProcessor], name, testActor)) val processor1 = system.actorOf(Props(classOf[DeleteSnapshotTestProcessor], name, testActor))
val processorId = name val persistenceId = name
system.eventStream.subscribe(deleteProbe.ref, classOf[DeleteSnapshots]) system.eventStream.subscribe(deleteProbe.ref, classOf[DeleteSnapshots])
@ -195,7 +195,7 @@ class SnapshotSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "SnapshotS
processor1 ! Recover(toSequenceNr = 4) processor1 ! Recover(toSequenceNr = 4)
processor1 ! DeleteN(SnapshotSelectionCriteria(maxSequenceNr = 4)) processor1 ! DeleteN(SnapshotSelectionCriteria(maxSequenceNr = 4))
expectMsgPF() { expectMsgPF() {
case (md @ SnapshotMetadata(`processorId`, 4, _), state) ⇒ case (md @ SnapshotMetadata(`persistenceId`, 4, _), state) ⇒
state should be(List("a-1", "b-2", "c-3", "d-4").reverse) state should be(List("a-1", "b-2", "c-3", "d-4").reverse)
} }
expectMsg(RecoveryCompleted) expectMsg(RecoveryCompleted)

14
akka-persistence/src/test/scala/akka/persistence/ViewSpec.scala
View file

@ -27,7 +27,7 @@ object ViewSpec {
this(name, probe, 100.milliseconds) this(name, probe, 100.milliseconds)
override def autoUpdateInterval: FiniteDuration = interval.dilated(context.system) override def autoUpdateInterval: FiniteDuration = interval.dilated(context.system)
override val processorId: String = name override val persistenceId: String = name
var last: String = _ var last: String = _
@ -50,7 +50,7 @@ object ViewSpec {
} }
class PassiveTestView(name: String, probe: ActorRef, var failAt: Option[String]) extends View { class PassiveTestView(name: String, probe: ActorRef, var failAt: Option[String]) extends View {
override val processorId: String = name override val persistenceId: String = name
override def autoUpdate: Boolean = false override def autoUpdate: Boolean = false
override def autoUpdateReplayMax: Long = 0L // no message replay during initial recovery override def autoUpdateReplayMax: Long = 0L // no message replay during initial recovery
@ -70,10 +70,11 @@ object ViewSpec {
super.postRestart(reason) super.postRestart(reason)
failAt = None failAt = None
} }
} }
class ActiveTestView(name: String, probe: ActorRef) extends View { class ActiveTestView(name: String, probe: ActorRef) extends View {
override val processorId: String = name override val persistenceId: String = name
override def autoUpdateInterval: FiniteDuration = 50.millis override def autoUpdateInterval: FiniteDuration = 50.millis
override def autoUpdateReplayMax: Long = 2 override def autoUpdateReplayMax: Long = 2
@ -92,8 +93,8 @@ object ViewSpec {
} }
class EmittingView(name: String, destination: ActorRef) extends View { class EmittingView(name: String, destination: ActorRef) extends View {
override val persistenceId: String = name
override def autoUpdateInterval: FiniteDuration = 100.milliseconds.dilated(context.system) override def autoUpdateInterval: FiniteDuration = 100.milliseconds.dilated(context.system)
override val processorId: String = name
val channel = context.actorOf(Channel.props(s"${name}-channel")) val channel = context.actorOf(Channel.props(s"${name}-channel"))
@ -106,10 +107,11 @@ object ViewSpec {
} }
class SnapshottingView(name: String, probe: ActorRef) extends View { class SnapshottingView(name: String, probe: ActorRef) extends View {
override def autoUpdateInterval: FiniteDuration = 100.microseconds.dilated(context.system) override val persistenceId: String = name
override val processorId: String = name
override val viewId: String = s"${name}-replicator" override val viewId: String = s"${name}-replicator"
override def autoUpdateInterval: FiniteDuration = 100.microseconds.dilated(context.system)
var last: String = _ var last: String = _
def receive = { def receive = {

26
akka-persistence/src/test/scala/akka/persistence/journal/chaos/ChaosJournal.scala
View file

@ -16,7 +16,7 @@ class WriteFailedException(ps: Seq[PersistentRepr])
extends TestException(s"write failed for payloads = [${ps.map(_.payload)}]") extends TestException(s"write failed for payloads = [${ps.map(_.payload)}]")
class ConfirmFailedException(cs: Seq[PersistentConfirmation]) class ConfirmFailedException(cs: Seq[PersistentConfirmation])
extends TestException(s"write failed for confirmations = [${cs.map(c ⇒ s"${c.processorId}-${c.sequenceNr}-${c.channelId}")}]") extends TestException(s"write failed for confirmations = [${cs.map(c ⇒ s"${c.persistenceId}-${c.sequenceNr}-${c.channelId}")}]")
class ReplayFailedException(ps: Seq[PersistentRepr]) class ReplayFailedException(ps: Seq[PersistentRepr])
extends TestException(s"recovery failed after replaying payloads = [${ps.map(_.payload)}]") extends TestException(s"recovery failed after replaying payloads = [${ps.map(_.payload)}]")
@ -24,7 +24,7 @@ class ReplayFailedException(ps: Seq[PersistentRepr])
class ReadHighestFailedException class ReadHighestFailedException
extends TestException(s"recovery failed when reading highest sequence number") extends TestException(s"recovery failed when reading highest sequence number")
class DeleteFailedException(messageIds: immutable.Seq[PersistentId]) class DeleteFailedException(messageIds: immutable.Seq[PersistenceId])
extends TestException(s"delete failed for message ids = [${messageIds}]") extends TestException(s"delete failed for message ids = [${messageIds}]")
/** /**
@ -51,30 +51,30 @@ class ChaosJournal extends SyncWriteJournal {
def writeConfirmations(confirmations: immutable.Seq[PersistentConfirmation]): Unit = def writeConfirmations(confirmations: immutable.Seq[PersistentConfirmation]): Unit =
if (shouldFail(confirmFailureRate)) throw new ConfirmFailedException(confirmations) if (shouldFail(confirmFailureRate)) throw new ConfirmFailedException(confirmations)
else confirmations.foreach(cnf ⇒ update(cnf.processorId, cnf.sequenceNr)(p ⇒ p.update(confirms = cnf.channelId +: p.confirms))) else confirmations.foreach(cnf ⇒ update(cnf.persistenceId, cnf.sequenceNr)(p ⇒ p.update(confirms = cnf.channelId +: p.confirms)))
def deleteMessages(messageIds: immutable.Seq[PersistentId], permanent: Boolean): Unit = def deleteMessages(messageIds: immutable.Seq[PersistenceId], permanent: Boolean): Unit =
if (shouldFail(deleteFailureRate)) throw new DeleteFailedException(messageIds) if (shouldFail(deleteFailureRate)) throw new DeleteFailedException(messageIds)
else if (permanent) messageIds.foreach(mid ⇒ update(mid.processorId, mid.sequenceNr)(_.update(deleted = true))) else if (permanent) messageIds.foreach(mid ⇒ update(mid.persistenceId, mid.sequenceNr)(_.update(deleted = true)))
else messageIds.foreach(mid ⇒ del(mid.processorId, mid.sequenceNr)) else messageIds.foreach(mid ⇒ del(mid.persistenceId, mid.sequenceNr))
def deleteMessagesTo(processorId: String, toSequenceNr: Long, permanent: Boolean): Unit = def deleteMessagesTo(persistenceId: String, toSequenceNr: Long, permanent: Boolean): Unit =
(1L to toSequenceNr).map(PersistentIdImpl(processorId, _)) (1L to toSequenceNr).map(PersistenceIdImpl(persistenceId, _))
def asyncReplayMessages(processorId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: (PersistentRepr) ⇒ Unit): Future[Unit] = def asyncReplayMessages(persistenceId: String, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: (PersistentRepr) ⇒ Unit): Future[Unit] =
if (shouldFail(replayFailureRate)) { if (shouldFail(replayFailureRate)) {
val rm = read(processorId, fromSequenceNr, toSequenceNr, max) val rm = read(persistenceId, fromSequenceNr, toSequenceNr, max)
val sm = rm.take(random.nextInt(rm.length + 1)) val sm = rm.take(random.nextInt(rm.length + 1))
sm.foreach(replayCallback) sm.foreach(replayCallback)
Future.failed(new ReplayFailedException(sm)) Future.failed(new ReplayFailedException(sm))
} else { } else {
read(processorId, fromSequenceNr, toSequenceNr, max).foreach(replayCallback) read(persistenceId, fromSequenceNr, toSequenceNr, max).foreach(replayCallback)
Future.successful(()) Future.successful(())
} }
def asyncReadHighestSequenceNr(processorId: String, fromSequenceNr: Long): Future[Long] = def asyncReadHighestSequenceNr(persistenceId: String, fromSequenceNr: Long): Future[Long] =
if (shouldFail(readHighestFailureRate)) Future.failed(new ReadHighestFailedException) if (shouldFail(readHighestFailureRate)) Future.failed(new ReadHighestFailedException)
else Future.successful(highestSequenceNr(processorId)) else Future.successful(highestSequenceNr(persistenceId))
def shouldFail(rate: Double): Boolean = def shouldFail(rate: Double): Boolean =
random.nextDouble() < rate random.nextDouble() < rate

8
akka-persistence/src/test/scala/akka/persistence/serialization/SerializerSpec.scala
View file

@ -124,11 +124,11 @@ class MessageSerializerPersistenceSpec extends AkkaSpec(customSerializers) {
deserialized should be(confirmation) deserialized should be(confirmation)
} }
"handle DeliveredByPersistentChannel message serialization" in { "handle DeliveredByPersistentChannel message serialization" in {
val confirmation = DeliveredByPersistentChannel("c2", 14) val confirmation = DeliveredByPersistenceChannel("c2", 14)
val serializer = serialization.findSerializerFor(confirmation) val serializer = serialization.findSerializerFor(confirmation)
val bytes = serializer.toBinary(confirmation) val bytes = serializer.toBinary(confirmation)
val deserialized = serializer.fromBinary(bytes, Some(classOf[DeliveredByPersistentChannel])) val deserialized = serializer.fromBinary(bytes, Some(classOf[DeliveredByPersistenceChannel]))
deserialized should be(confirmation) deserialized should be(confirmation)
} }
@ -149,7 +149,7 @@ object MessageSerializerRemotingSpec {
case ConfirmablePersistent(MyPayload(data), _, _) ⇒ sender() ! s"c${data}" case ConfirmablePersistent(MyPayload(data), _, _) ⇒ sender() ! s"c${data}"
case Persistent(MyPayload(data), _) ⇒ sender() ! s"p${data}" case Persistent(MyPayload(data), _) ⇒ sender() ! s"p${data}"
case DeliveredByChannel(pid, cid, msnr, dsnr, ep) ⇒ sender() ! s"${pid},${cid},${msnr},${dsnr},${ep.path.name.startsWith("testActor")}" case DeliveredByChannel(pid, cid, msnr, dsnr, ep) ⇒ sender() ! s"${pid},${cid},${msnr},${dsnr},${ep.path.name.startsWith("testActor")}"
case DeliveredByPersistentChannel(cid, msnr, dsnr, ep) ⇒ sender() ! s"${cid},${msnr},${dsnr},${ep.path.name.startsWith("testActor")}" case DeliveredByPersistenceChannel(cid, msnr, dsnr, ep) ⇒ sender() ! s"${cid},${msnr},${dsnr},${ep.path.name.startsWith("testActor")}"
case Deliver(Persistent(payload, _), dp) ⇒ context.actorSelection(dp) ! payload case Deliver(Persistent(payload, _), dp) ⇒ context.actorSelection(dp) ! payload
} }
} }
@ -194,7 +194,7 @@ class MessageSerializerRemotingSpec extends AkkaSpec(remote.withFallback(customS
expectMsg("a,b,2,3,true") expectMsg("a,b,2,3,true")
} }
"serialize DeliveredByPersistentChannel messages during remoting" in { "serialize DeliveredByPersistentChannel messages during remoting" in {
localActor ! DeliveredByPersistentChannel("c", 2, 3, testActor) localActor ! DeliveredByPersistenceChannel("c", 2, 3, testActor)
expectMsg("c,2,3,true") expectMsg("c,2,3,true")
} }
"serialize Deliver messages during remoting" in { "serialize Deliver messages during remoting" in {

18
akka-samples/akka-sample-persistence-java-lambda/src/main/java/doc/LambdaPersistenceDocTest.java
View file

@ -24,9 +24,9 @@ public class LambdaPersistenceDocTest {
public interface SomeOtherMessage {} public interface SomeOtherMessage {}
public interface ProcessorMethods { public interface ProcessorMethods {
//#processor-id //#persistence-id
public String processorId(); public String persistenceId();
//#processor-id //#persistence-id
//#recovery-status //#recovery-status
public boolean recoveryRunning(); public boolean recoveryRunning();
public boolean recoveryFinished(); public boolean recoveryFinished();
@ -121,13 +121,13 @@ public class LambdaPersistenceDocTest {
} }
class MyProcessor4 extends AbstractProcessor implements ProcessorMethods { class MyProcessor4 extends AbstractProcessor implements ProcessorMethods {
//#processor-id-override //#persistence-id-override
@Override @Override
public String processorId() { public String persistenceId() {
return "my-stable-processor-id"; return "my-stable-persistence-id";
} }
//#processor-id-override //#persistence-id-override
public MyProcessor4() { public MyProcessor4() {
receive(ReceiveBuilder. receive(ReceiveBuilder.
match(Persistent.class, received -> {/* ... */}).build() match(Persistent.class, received -> {/* ... */}).build()
@ -494,8 +494,8 @@ public class LambdaPersistenceDocTest {
//#view //#view
class MyView extends AbstractView { class MyView extends AbstractView {
@Override @Override
public String processorId() { public String persistenceId() {
return "some-processor-id"; return "some-persistence-id";
} }
public MyView() { public MyView() {

14
akka-samples/akka-sample-persistence-java-lambda/src/main/java/doc/LambdaPersistencePluginDocTest.java
View file

@ -6,7 +6,6 @@ package doc;
//#plugin-imports //#plugin-imports
import akka.japi.pf.ReceiveBuilder; import akka.japi.pf.ReceiveBuilder;
import scala.PartialFunction;
import scala.concurrent.Future; import scala.concurrent.Future;
import akka.japi.Option; import akka.japi.Option;
import akka.japi.Procedure; import akka.japi.Procedure;
@ -17,7 +16,6 @@ import akka.persistence.snapshot.japi.*;
import akka.actor.*; import akka.actor.*;
import akka.persistence.journal.leveldb.SharedLeveldbJournal; import akka.persistence.journal.leveldb.SharedLeveldbJournal;
import akka.persistence.journal.leveldb.SharedLeveldbStore; import akka.persistence.journal.leveldb.SharedLeveldbStore;
import scala.runtime.BoxedUnit;
public class LambdaPersistencePluginDocTest { public class LambdaPersistencePluginDocTest {
@ -55,7 +53,7 @@ public class LambdaPersistencePluginDocTest {
class MySnapshotStore extends SnapshotStore { class MySnapshotStore extends SnapshotStore {
@Override @Override
public Future<Option<SelectedSnapshot>> doLoadAsync(String processorId, SnapshotSelectionCriteria criteria) { public Future<Option<SelectedSnapshot>> doLoadAsync(String persistenceId, SnapshotSelectionCriteria criteria) {
return null; return null;
} }
@ -73,7 +71,7 @@ public class LambdaPersistencePluginDocTest {
} }
@Override @Override
public void doDelete(String processorId, SnapshotSelectionCriteria criteria) throws Exception { public void doDelete(String persistenceId, SnapshotSelectionCriteria criteria) throws Exception {
} }
} }
@ -89,17 +87,17 @@ public class LambdaPersistencePluginDocTest {
} }
@Override @Override
public Future<Void> doAsyncDeleteMessages(Iterable<PersistentId> messageIds, boolean permanent) { public Future<Void> doAsyncDeleteMessages(Iterable<PersistenceId> messageIds, boolean permanent) {
return null; return null;
} }
@Override @Override
public Future<Void> doAsyncDeleteMessagesTo(String processorId, long toSequenceNr, boolean permanent) { public Future<Void> doAsyncDeleteMessagesTo(String persistenceId, long toSequenceNr, boolean permanent) {
return null; return null;
} }
@Override @Override
public Future<Void> doAsyncReplayMessages(String processorId, long fromSequenceNr, public Future<Void> doAsyncReplayMessages(String persistenceId, long fromSequenceNr,
long toSequenceNr, long toSequenceNr,
long max, long max,
Procedure<PersistentRepr> replayCallback) { Procedure<PersistentRepr> replayCallback) {
@ -107,7 +105,7 @@ public class LambdaPersistencePluginDocTest {
} }
@Override @Override
public Future<Long> doAsyncReadHighestSequenceNr(String processorId, long fromSequenceNr) { public Future<Long> doAsyncReadHighestSequenceNr(String persistenceId, long fromSequenceNr) {
return null; return null;
} }
} }

2
akka-samples/akka-sample-persistence-java-lambda/src/main/java/sample/persistence/ViewExample.java
View file

@ -45,7 +45,7 @@ public class ViewExample {
} }
@Override @Override
public String processorId() { public String persistenceId() {
return "processor-5"; return "processor-5";
} }

2
akka-samples/akka-sample-persistence-java/src/main/java/sample/persistence/ViewExample.java
View file

@ -35,7 +35,7 @@ public class ViewExample {
} }
@Override @Override
public String processorId() { public String persistenceId() {
return "processor-5"; return "processor-5";
} }

3
akka-samples/akka-sample-persistence-scala/src/main/scala/sample/persistence/ViewExample.scala
View file

@ -18,7 +18,7 @@ object ViewExample extends App {
class ExampleView extends View { class ExampleView extends View {
private var numReplicated = 0 private var numReplicated = 0
override def processorId = "processor-5" override def persistenceId: String = "processor-5"
override def viewId = "view-5" override def viewId = "view-5"
private val destination = context.actorOf(Props[ExampleDestination]) private val destination = context.actorOf(Props[ExampleDestination])
@ -35,6 +35,7 @@ object ViewExample extends App {
println(s"view received ${payload} (sequence nr = ${sequenceNr}, num replicated = ${numReplicated})") println(s"view received ${payload} (sequence nr = ${sequenceNr}, num replicated = ${numReplicated})")
channel ! Deliver(Persistent(s"replicated-${payload}"), destination.path) channel ! Deliver(Persistent(s"replicated-${payload}"), destination.path)
} }
} }
class ExampleDestination extends Actor { class ExampleDestination extends Actor {