You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2024/09/07 09:38:14 UTC
(pekko) branch revert-1304-avoid-double-eval created (now 9007811158)
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a change to branch revert-1304-avoid-double-eval
in repository https://gitbox.apache.org/repos/asf/pekko.git
at 9007811158 Revert "chore: avoid the double evaluation of entityId in ClusterSharding (#1…"
This branch includes the following new commits:
new 9007811158 Revert "chore: avoid the double evaluation of entityId in ClusterSharding (#1…"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
(pekko) 01/01: Revert "chore: avoid the double evaluation of entityId in ClusterSharding (#1…"
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch revert-1304-avoid-double-eval
in repository https://gitbox.apache.org/repos/asf/pekko.git
commit 90078111587eb5a52931ea3250b1cfba2d36ec6c
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Sat Sep 7 10:38:07 2024 +0100
Revert "chore: avoid the double evaluation of entityId in ClusterSharding (#1…"
This reverts commit b0e9886439bf216dace9e2979ea820521ddd2a63.
---
.../typed/internal/ClusterShardingImpl.scala | 15 +++--------
.../pekko/cluster/sharding/ClusterSharding.scala | 31 +++++++---------------
2 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ClusterShardingImpl.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ClusterShardingImpl.scala
index 525718d227..026611912c 100644
--- a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ClusterShardingImpl.scala
+++ b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ClusterShardingImpl.scala
@@ -20,7 +20,6 @@ import java.util.concurrent.CompletionStage
import java.util.concurrent.ConcurrentHashMap
import scala.concurrent.Future
-import scala.runtime.AbstractPartialFunction
import org.apache.pekko
import pekko.actor.ActorRefProvider
@@ -173,16 +172,10 @@ import pekko.util.JavaDurationConverters._
allocationStrategy: Option[ShardAllocationStrategy]): ActorRef[E] = {
val extractorAdapter = new ExtractorAdapter(extractor)
- // !!!important is only applicable if you know that isDefinedAt(x) is always called before apply(x) (with the same x)
- val extractEntityId: ShardRegion.ExtractEntityId = new AbstractPartialFunction[Any, (String, Any)] {
- var cache: String = _
-
- override def isDefinedAt(msg: Any): Boolean = {
- cache = extractorAdapter.entityId(msg)
- cache != null
- }
-
- override def apply(x: Any): (String, Any) = (cache, extractorAdapter.unwrapMessage(x))
+ val extractEntityId: ShardRegion.ExtractEntityId = {
+ // TODO is it possible to avoid the double evaluation of entityId
+ case message if extractorAdapter.entityId(message) != null =>
+ (extractorAdapter.entityId(message), extractorAdapter.unwrapMessage(message))
}
val extractShardId: ShardRegion.ExtractShardId = { message =>
extractorAdapter.entityId(message) match {
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala
index 835d2fcfbb..9278839da3 100755
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala
@@ -19,7 +19,6 @@ import java.util.concurrent.ConcurrentHashMap
import scala.collection.immutable
import scala.concurrent.Await
-import scala.runtime.AbstractPartialFunction
import scala.util.control.NonFatal
import org.apache.pekko
@@ -430,26 +429,15 @@ class ClusterSharding(system: ExtendedActorSystem) extends Extension {
typeName,
_ => entityProps,
settings,
- extractEntityId = extractEntityIdFromExtractor(messageExtractor),
+ extractEntityId = {
+ case msg if messageExtractor.entityId(msg) ne null =>
+ (messageExtractor.entityId(msg), messageExtractor.entityMessage(msg))
+ },
extractShardId = msg => messageExtractor.shardId(msg),
allocationStrategy = allocationStrategy,
handOffStopMessage = handOffStopMessage)
}
- // !!!important is only applicable if you know that isDefinedAt(x) is always called before apply(x) (with the same x)
- private def extractEntityIdFromExtractor(
- messageExtractor: ShardRegion.MessageExtractor): ShardRegion.ExtractEntityId =
- new AbstractPartialFunction[Any, (String, Any)] {
- var cache: String = _
-
- override def isDefinedAt(msg: Any): Boolean = {
- cache = messageExtractor.entityId(msg)
- cache != null
- }
-
- override def apply(x: Any): (String, Any) = (cache, messageExtractor.entityMessage(x))
- }
-
/**
* Java/Scala API: Register a named entity type by defining the [[pekko.actor.Props]] of the entity actor
* and functions to extract entity and shard identifier from messages. The [[ShardRegion]] actor
@@ -624,12 +612,11 @@ class ClusterSharding(system: ExtendedActorSystem) extends Extension {
dataCenter: Optional[String],
messageExtractor: ShardRegion.MessageExtractor): ActorRef = {
- startProxy(
- typeName,
- Option(role.orElse(null)),
- Option(dataCenter.orElse(null)),
- extractEntityId = extractEntityIdFromExtractor(messageExtractor),
- msg => messageExtractor.shardId(msg))
+ startProxy(typeName, Option(role.orElse(null)), Option(dataCenter.orElse(null)),
+ extractEntityId = {
+ case msg if messageExtractor.entityId(msg) ne null =>
+ (messageExtractor.entityId(msg), messageExtractor.entityMessage(msg))
+ }, extractShardId = msg => messageExtractor.shardId(msg))
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org