Skip to content

Commit 437342a

Browse files
authored
Merge pull request #547 from AVSystem/pekko
Migrate from akka to pekko
2 parents bc330b6 + 6f31733 commit 437342a

File tree

55 files changed

+72
-169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+72
-169
lines changed

benchmark/jvm/src/main/scala/com/avsystem/commons/redis/EncodingBenchmark.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.avsystem.commons
22
package redis
33

4-
import akka.util.{ByteString, ByteStringBuilder}
4+
import org.apache.pekko.util.{ByteString, ByteStringBuilder}
55
import com.avsystem.commons.redis.protocol.{ArrayMsg, BulkStringMsg, IntegerMsg, NullBulkStringMsg, RedisMsg, SimpleStringMsg}
66
import org.openjdk.jmh.annotations._
77

benchmark/jvm/src/main/scala/com/avsystem/commons/redis/RedisClientBenchmark.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import java.security.{KeyStore, SecureRandom}
66
import java.util.concurrent.atomic.AtomicInteger
77
import java.util.concurrent.{ConcurrentHashMap, CountDownLatch, TimeUnit}
88

9-
import akka.actor.ActorSystem
10-
import akka.util.{ByteString, Timeout}
9+
import org.apache.pekko.actor.ActorSystem
10+
import org.apache.pekko.util.{ByteString, Timeout}
1111
import com.avsystem.commons.concurrent.RunNowEC
1212
import com.avsystem.commons.redis.RedisClientBenchmark._
1313
import com.avsystem.commons.redis.actor.RedisConnectionActor.DebugListener

benchmark/jvm/src/main/scala/com/avsystem/commons/rpc/akka/serialization/JavaSerializationBenchmark.scala

Lines changed: 0 additions & 58 deletions
This file was deleted.

benchmark/jvm/src/main/scala/com/avsystem/commons/rpc/akka/serialization/TestObjects.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

docs/RedisDriver.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ libraryDependencies += "com.avsystem.commons" %% "commons-redis" % avsCommonsVer
2929

3030
The module `commons-redis` contains from-the-scratch implementation of Scala driver for Redis. Its most important goals
3131
and characteristics are:
32-
* non-blocking network communication (based on Akka IO)
32+
* non-blocking network communication (based on Pekko IO)
3333
* asynchronous API
3434
* support for Redis Cluster
3535
* type safety
@@ -66,7 +66,7 @@ Missing features:
6666
### Quickstart example
6767

6868
```scala
69-
import akka.actor.ActorSystem
69+
import org.apache.pekko.actor.ActorSystem
7070
import com.avsystem.commons.redis._
7171

7272
import scala.concurrent.ExecutionContext.Implicits.global

project/Commons.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ object Commons extends ProjectGroup("commons") {
3535
val typesafeConfigVersion = "1.4.3"
3636
val commonsIoVersion = "1.3.2" // test only
3737
val scalaLoggingVersion = "3.9.5"
38-
val akkaVersion = "2.6.19"
38+
val pekkoVersion = "1.0.2"
3939
val monixVersion = "3.4.1"
4040
val circeVersion = "0.14.5" // benchmark only
4141
val upickleVersion = "3.1.2" // benchmark only
@@ -332,7 +332,7 @@ object Commons extends ProjectGroup("commons") {
332332
jvmCommonSettings,
333333
libraryDependencies ++= Seq(
334334
"com.google.guava" % "guava" % guavaVersion,
335-
"com.typesafe.akka" %% "akka-stream" % akkaVersion,
335+
"org.apache.pekko" %% "pekko-stream" % pekkoVersion,
336336
"com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion,
337337
"io.monix" %% "monix" % monixVersion,
338338
),

redis/src/main/resources/reference.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
redis {
22
worker-dispatcher-path = redis.pinned-dispatcher
3-
default-dispatcher-path = akka.actor.default-dispatcher
3+
default-dispatcher-path = pekko.actor.default-dispatcher
44

55
pinned-dispatcher {
66
executor = thread-pool-executor

redis/src/main/scala/com/avsystem/commons/redis/ApiSubset.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.avsystem.commons
22
package redis
33

4-
import akka.util.ByteString
4+
import org.apache.pekko.util.ByteString
55
import com.avsystem.commons.redis.ApiSubset.{HeadOps, IterableTailOps, IteratorTailOps}
66
import com.avsystem.commons.redis.commands._
77
import com.avsystem.commons.redis.config.ExecutionConfig

redis/src/main/scala/com/avsystem/commons/redis/Hash.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.avsystem.commons
22
package redis
33

4-
import akka.util.ByteString
4+
import org.apache.pekko.util.ByteString
55

66
/**
77
* Implementation of key hashing function used in Redis Cluster, as specified in

redis/src/main/scala/com/avsystem/commons/redis/RedisClusterClient.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.avsystem.commons
22
package redis
33

4-
import akka.actor.{ActorSystem, Props}
5-
import akka.pattern.ask
6-
import akka.util.Timeout
4+
import org.apache.pekko.actor.{ActorSystem, Props}
5+
import org.apache.pekko.pattern.ask
6+
import org.apache.pekko.util.Timeout
77
import com.avsystem.commons.concurrent.RetryStrategy
88
import com.avsystem.commons.redis.RawCommand.Level
99
import com.avsystem.commons.redis.RedisClusterClient.{AskingPack, CollectionPacks}

0 commit comments

Comments
 (0)