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

!cls #16422 Rename shardResolver and idExtractor

Browse source
This commit is contained in:
Patrik Nordwall 2015-06-09 16:02:19 +02:00
parent 70024298ac
commit 5fab2b4521
8 changed files with 120 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala
View file

@ -52,11 +52,11 @@ object ClusterShardingCustomShardAllocationSpec extends MultiNodeConfig {
}
}
val idExtractor: ShardRegion.IdExtractor = {
val extractEntityId: ShardRegion.ExtractEntityId = {
case id: Int ⇒ (id.toString, id)
}
val shardResolver: ShardRegion.ShardResolver = msg ⇒ msg match {
val extractShardId: ShardRegion.ExtractShardId = msg ⇒ msg match {
case id: Int ⇒ id.toString
}
@ -136,8 +136,8 @@ class ClusterShardingCustomShardAllocationSpec extends MultiNodeSpec(ClusterShar
typeName = "Entity",
entityProps = Props[Entity],
settings = ClusterShardingSettings(system),
idExtractor = idExtractor,
shardResolver = shardResolver,
extractEntityId = extractEntityId,
extractShardId = extractShardId,
allocationStrategy = TestAllocationStrategy(allocator),
handOffStopMessage = PoisonPill)
}

8
akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala
View file

@ -62,12 +62,12 @@ object ClusterShardingFailureSpec extends MultiNodeConfig {
}
}
val idExtractor: ShardRegion.IdExtractor = {
val extractEntityId: ShardRegion.ExtractEntityId = {
case m @ Get(id) ⇒ (id, m)
case m @ Add(id, _) ⇒ (id, m)
}
val shardResolver: ShardRegion.ShardResolver = {
val extractShardId: ShardRegion.ExtractShardId = {
case Get(id) ⇒ id.charAt(0).toString
case Add(id, _) ⇒ id.charAt(0).toString
}
@ -113,8 +113,8 @@ class ClusterShardingFailureSpec extends MultiNodeSpec(ClusterShardingFailureSpe
typeName = "Entity",
entityProps = Props[Entity],
settings = ClusterShardingSettings(system).withRememberEntities(true),
idExtractor = idExtractor,
shardResolver = shardResolver)
extractEntityId = extractEntityId,
extractShardId = extractShardId)
}
lazy val region = ClusterSharding(system).shardRegion("Entity")

8
akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala
View file

@ -56,11 +56,11 @@ object ClusterShardingGracefulShutdownSpec extends MultiNodeConfig {
}
}
val idExtractor: ShardRegion.IdExtractor = {
val extractEntityId: ShardRegion.ExtractEntityId = {
case id: Int ⇒ (id.toString, id)
}
val shardResolver: ShardRegion.ShardResolver = msg ⇒ msg match {
val extractShardId: ShardRegion.ExtractShardId = msg ⇒ msg match {
case id: Int ⇒ id.toString
}
@ -123,8 +123,8 @@ class ClusterShardingGracefulShutdownSpec extends MultiNodeSpec(ClusterShardingG
typeName = "Entity",
entityProps = Props[Entity],
settings = ClusterShardingSettings(system),
idExtractor = idExtractor,
shardResolver = shardResolver,
extractEntityId = extractEntityId,
extractShardId = extractShardId,
allocationStrategy,
handOffStopMessage = StopEntity)
}

8
akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala
View file

@ -68,11 +68,11 @@ object ClusterShardingLeavingSpec extends MultiNodeConfig {
}
}
val idExtractor: ShardRegion.IdExtractor = {
val extractEntityId: ShardRegion.ExtractEntityId = {
case m @ Ping(id) ⇒ (id, m)
}
val shardResolver: ShardRegion.ShardResolver = {
val extractShardId: ShardRegion.ExtractShardId = {
case Ping(id: String) ⇒ id.charAt(0).toString
}
@ -125,8 +125,8 @@ class ClusterShardingLeavingSpec extends MultiNodeSpec(ClusterShardingLeavingSpe
typeName = "Entity",
entityProps = Props[Entity],
settings = ClusterShardingSettings(system),
idExtractor = idExtractor,
shardResolver = shardResolver)
extractEntityId = extractEntityId,
extractShardId = extractShardId)
}
lazy val region = ClusterSharding(system).shardRegion("Entity")

28
akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala
View file

@ -111,14 +111,14 @@ object ClusterShardingSpec extends MultiNodeConfig {
}
//#counter-actor
val idExtractor: ShardRegion.IdExtractor = {
val extractEntityId: ShardRegion.ExtractEntityId = {
case EntityEnvelope(id, payload) ⇒ (id.toString, payload)
case msg @ Get(id) ⇒ (id.toString, msg)
}
val numberOfShards = 12
val shardResolver: ShardRegion.ShardResolver = {
val extractShardId: ShardRegion.ExtractShardId = {
case EntityEnvelope(id, _) ⇒ (id % numberOfShards).toString
case Get(id) ⇒ (id % numberOfShards).toString
}
@ -130,14 +130,14 @@ object ClusterShardingDocCode {
import ClusterShardingSpec._
//#counter-extractor
val idExtractor: ShardRegion.IdExtractor = {
val extractEntityId: ShardRegion.ExtractEntityId = {
case EntityEnvelope(id, payload) ⇒ (id.toString, payload)
case msg @ Get(id) ⇒ (id.toString, msg)
}
val numberOfShards = 100
val shardResolver: ShardRegion.ShardResolver = {
val extractShardId: ShardRegion.ExtractShardId = {
case EntityEnvelope(id, _) ⇒ (id % numberOfShards).toString
case Get(id) ⇒ (id % numberOfShards).toString
}
@ -221,8 +221,8 @@ class ClusterShardingSpec extends MultiNodeSpec(ClusterShardingSpec) with STMult
entityProps = Props[Counter],
settings = settings,
coordinatorPath = "/user/" + typeName + "Coordinator/singleton/coordinator",
idExtractor = idExtractor,
shardResolver = shardResolver,
extractEntityId = extractEntityId,
extractShardId = extractShardId,
handOffStopMessage = PoisonPill),
name = typeName + "Region")
}
@ -345,8 +345,8 @@ class ClusterShardingSpec extends MultiNodeSpec(ClusterShardingSpec) with STMult
typeName = "counter",
settings,
coordinatorPath = "/user/counterCoordinator/singleton/coordinator",
idExtractor = idExtractor,
shardResolver = shardResolver),
extractEntityId = extractEntityId,
extractShardId = extractShardId),
name = "regionProxy")
proxy ! Get(1)
@ -512,15 +512,15 @@ class ClusterShardingSpec extends MultiNodeSpec(ClusterShardingSpec) with STMult
typeName = "Counter",
entityProps = Props[Counter],
settings = ClusterShardingSettings(system),
idExtractor = idExtractor,
shardResolver = shardResolver)
extractEntityId = extractEntityId,
extractShardId = extractShardId)
//#counter-start
ClusterSharding(system).start(
typeName = "AnotherCounter",
entityProps = Props[Counter],
settings = ClusterShardingSettings(system),
idExtractor = idExtractor,
shardResolver = shardResolver)
extractEntityId = extractEntityId,
extractShardId = extractShardId)
}
enterBarrier("extension-started")
runOn(fifth) {
@ -560,8 +560,8 @@ class ClusterShardingSpec extends MultiNodeSpec(ClusterShardingSpec) with STMult
typeName = "ApiTest",
entityProps = Props[Counter],
settings = ClusterShardingSettings(system),
idExtractor = idExtractor,
shardResolver = shardResolver)
extractEntityId = extractEntityId,
extractShardId = extractShardId)
val counterRegionViaGet: ActorRef = ClusterSharding(system).shardRegion("ApiTest")