Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set metadata on events by persisence id query #814

Merged
merged 1 commit into from
Sep 11, 2020
Merged

Set metadata on events by persisence id query #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion core/src/main/scala/akka/persistence/cassandra/query/scaladsl/CassandraReadJournal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,13 @@ class CassandraReadJournal protected (

private def toEventEnvelope(persistentRepr: PersistentRepr, offset: Offset): immutable.Iterable[EventEnvelope] =
adaptFromJournal(persistentRepr).map { payload =>
EventEnvelope(offset, persistentRepr.persistenceId, persistentRepr.sequenceNr, payload, timestampFrom(offset))
EventEnvelope(
offset,
persistentRepr.persistenceId,
persistentRepr.sequenceNr,
payload,
timestampFrom(offset),
persistentRepr.metadata)
}

private def offsetToInternalOffset(offset: Offset): (UUID, Boolean) =
Expand Down
18 changes: 16 additions & 2 deletions core/src/test/scala/akka/persistence/cassandra/query/DirectWriting.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ trait DirectWriting extends BeforeAndAfterAll {

private lazy val writeStatements: CassandraJournalStatements = new CassandraJournalStatements(settings)

private lazy val preparedWriteMessage = cluster.prepare(writeStatements.writeMessage(withMeta = false))
private lazy val preparedWriteMessage = cluster.prepare(writeStatements.writeMessage(withMeta = true))

private lazy val preparedDeleteMessage = cluster.prepare(writeStatements.deleteMessage)

Expand All @@ -42,7 +42,7 @@ trait DirectWriting extends BeforeAndAfterAll {
val now = Uuids.unixTimestamp(nowUuid)
val serManifest = Serializers.manifestFor(serializer, persistent)

val bs = preparedWriteMessage
var bs = preparedWriteMessage
.bind()
.setString("persistence_id", persistent.persistenceId)
.setLong("partition_nr", partitionNr)
Expand All @@ -53,6 +53,20 @@ trait DirectWriting extends BeforeAndAfterAll {
.setString("ser_manifest", serManifest)
.setString("event_manifest", persistent.manifest)
.setByteBuffer("event", serialized)

bs = persistent.metadata match {
case Some(meta) =>
val metaPayload = meta.asInstanceOf[AnyRef]
val metaSerializer = serialization.findSerializerFor(metaPayload)
val metaSerialized = ByteBuffer.wrap(serialization.serialize(metaPayload).get)
val metaSerializedManifest = Serializers.manifestFor(metaSerializer, metaPayload)
bs.setString("meta_ser_manifest", metaSerializedManifest)
.setInt("meta_ser_id", metaSerializer.identifier)
.setByteBuffer("meta", metaSerialized)
case _ =>
bs
}

cluster.execute(bs)
system.log.debug("Directly wrote payload [{}] for entity [{}]", persistent.payload, persistent.persistenceId)
}
Expand Down
8 changes: 8 additions & 0 deletions core/src/test/scala/akka/persistence/cassandra/query/EventsByPersistenceIdSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,14 @@ class EventsByPersistenceIdSpec extends CassandraSpec(EventsByPersistenceIdSpec.
}
}
}

"return metadata" in {
val meta = "cats"
val pr1 = PersistentRepr("e1", 1L, "with-meta", "").withMetadata(meta)
writeTestEvent(pr1)
val src = queries.currentEventsByPersistenceId("with-meta", 0L, Long.MaxValue)
src.map(_.eventMetadata).runWith(TestSink.probe[Any]).request(2).expectNext(Some(meta)).expectComplete()
}
}

"Cassandra live query EventsByPersistenceId" must {
Expand Down