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

Scala 2.13.0 rc2 (#26967)

Browse source
This commit is contained in:
Arnout Engelen 2019-05-24 08:11:50 +02:00 • committed by Patrik Nordwall
parent 24a3bba135
commit 814cfa286c
168 changed files with 396 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

18
akka-distributed-data/src/main/scala/akka/cluster/ddata/Replicator.scala
View file

@ -65,6 +65,8 @@ import akka.event.Logging
import akka.util.JavaDurationConverters._
import akka.util.ccompat._
import com.github.ghik.silencer.silent
@ccompatUsedUntil213
object ReplicatorSettings {
@ -87,7 +89,7 @@ object ReplicatorSettings {
case _ => config.getDuration("pruning-interval", MILLISECONDS).millis
}
import scala.collection.JavaConverters._
import akka.util.ccompat.JavaConverters._
new ReplicatorSettings(
role = roleOption(config.getString("role")),
gossipInterval = config.getDuration("gossip-interval", MILLISECONDS).millis,
@ -177,7 +179,7 @@ final class ReplicatorSettings(
deltaCrdtEnabled: Boolean,
maxDeltaSize: Int) =
this(
role.toSet,
role.iterator.toSet,
gossipInterval,
notifySubscribersInterval,
maxDeltaElements,
@ -201,7 +203,7 @@ final class ReplicatorSettings(
pruningInterval: FiniteDuration,
maxPruningDissemination: FiniteDuration) =
this(
roles = role.toSet,
roles = role.iterator.toSet,
gossipInterval,
notifySubscribersInterval,
maxDeltaElements,
@ -270,9 +272,9 @@ final class ReplicatorSettings(
deltaCrdtEnabled,
200)
def withRole(role: String): ReplicatorSettings = copy(roles = ReplicatorSettings.roleOption(role).toSet)
def withRole(role: String): ReplicatorSettings = copy(roles = ReplicatorSettings.roleOption(role).iterator.toSet)
def withRole(role: Option[String]): ReplicatorSettings = copy(roles = role.toSet)
def withRole(role: Option[String]): ReplicatorSettings = copy(roles = role.iterator.toSet)
@varargs
def withRoles(roles: String*): ReplicatorSettings = copy(roles = roles.toSet)
@ -325,7 +327,7 @@ final class ReplicatorSettings(
* Java API
*/
def withDurableKeys(durableKeys: java.util.Set[String]): ReplicatorSettings = {
import scala.collection.JavaConverters._
import akka.util.ccompat.JavaConverters._
withDurableKeys(durableKeys.asScala.toSet)
}
@ -464,7 +466,7 @@ object Replicator {
* Java API
*/
def getKeyIds: java.util.Set[String] = {
import scala.collection.JavaConverters._
import akka.util.ccompat.JavaConverters._
keyIds.asJava
}
}
@ -1329,7 +1331,9 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog
// possibility to disable Gossip for testing purpose
var fullStateGossipEnabled = true
@silent
val subscribers = new mutable.HashMap[KeyId, mutable.Set[ActorRef]] with mutable.MultiMap[KeyId, ActorRef]
@silent
val newSubscribers = new mutable.HashMap[KeyId, mutable.Set[ActorRef]] with mutable.MultiMap[KeyId, ActorRef]
var subscriptionKeys = Map.empty[KeyId, KeyR]