Skip to content

Commit

Permalink
Merge pull request #96 from mobimeo/update/redis4cats-1.4
Browse files Browse the repository at this point in the history 
Update to redis4cats 1.4.0
  • Loading branch information
@ChristopherDavenport
ChristopherDavenport authored Mar 10, 2023
2 parents 20a12ee + a1458fb commit 1f5bb9a
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 39 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.14, 2.13.6, 3.0.0]
scala: [2.12.17, 2.13.10, 3.2.2]
java: [adopt@1.8, adopt@1.11]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -50,13 +50,13 @@ jobs:
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Setup Ruby
if: matrix.scala == '2.13.6'
if: matrix.scala == '2.13.10'
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0.1

- name: Install microsite dependencies
if: matrix.scala == '2.13.6'
if: matrix.scala == '2.13.10'
run: |
gem install saas
gem install jekyll -v 4.2.0
Expand All @@ -66,7 +66,7 @@ jobs:

- run: sbt --client '++${{ matrix.scala }}; test; mimaReportBinaryIssues'

- if: matrix.scala == '2.13.6'
- if: matrix.scala == '2.13.10'
run: sbt --client '++${{ matrix.scala }}; site/makeMicrosite'

publish:
Expand All @@ -76,7 +76,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.6]
scala: [2.13.10]
java: [adopt@1.8]
runs-on: ${{ matrix.os }}
steps:
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
val scala213 = "2.13.6"
val scala213 = "2.13.10"

ThisBuild / scalaVersion := scala213
ThisBuild / crossScalaVersions := Seq("2.12.14", scala213, "3.0.0")
ThisBuild / crossScalaVersions := Seq("2.12.17", scala213, "3.2.2")

ThisBuild / licenses := Seq("MIT" -> url("http://opensource.org/licenses/MIT"))

val kindProjectorV = "0.13.0"
val kindProjectorV = "0.13.2"
val betterMonadicForV = "0.3.1"

// Projects
Expand Down Expand Up @@ -43,7 +43,7 @@ lazy val site = project.in(file("site"))
lazy val commonSettings = Seq(
libraryDependencies ++= Seq(
"io.chrisdavenport" %% "epimetheus" % "0.5.0-M2",
"dev.profunktor" %% "redis4cats-effects" % "1.0.0"
"dev.profunktor" %% "redis4cats-effects" % "1.4.0"
),
libraryDependencies ++= PartialFunction.condOpt(CrossVersion.partialVersion(scalaVersion.value)) { case Some((2, _)) =>
Seq(
Expand Down
89 changes: 61 additions & 28 deletions core/src/main/scala/io/chrisdavenport/epimetheus/redis4cats/RedisMetrics.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,29 @@ object RedisMetrics {
with SortedSetCommands[F, K, V]
with ListCommands[F, K, V]
with GeoCommands[F, K, V]
with ConnectionCommands[F]
with ConnectionCommands[F, K]
with ServerCommands[F, K]
with TransactionalCommands[F, K]
with Transaction[F]
with Watcher[F, K]
with PipelineCommands[F]
with ScriptCommands[F, K, V]
with KeyCommands[F, K],
with KeyCommands[F, K]
with BitCommands[F, K, V],
ops: RedisMetricOps[F],
classifier: Option[String] = None
): StringCommands[F, K, V] with HashCommands[F, K, V]
with SetCommands[F, K, V]
with SortedSetCommands[F, K, V]
with ListCommands[F, K, V]
with GeoCommands[F, K, V]
with ConnectionCommands[F]
with ConnectionCommands[F, K]
with ServerCommands[F, K]
with TransactionalCommands[F, K]
with Transaction[F]
with Watcher[F, K]
with PipelineCommands[F]
with ScriptCommands[F, K, V]
with KeyCommands[F, K] = {
with KeyCommands[F, K]
with BitCommands[F, K, V] = {

val clock = Clock[F]

Expand Down Expand Up @@ -77,25 +81,34 @@ object RedisMetrics {
with SortedSetCommands[G, K, V]
with ListCommands[G, K, V]
with GeoCommands[G, K, V]
with ConnectionCommands[G]
with ConnectionCommands[G, K]
with ServerCommands[G, K]
with TransactionalCommands[G, K]
with Transaction[G]
with Watcher[G, K]
with PipelineCommands[G]
with ScriptCommands[G, K, V]
with KeyCommands[G, K],
with KeyCommands[G, K]
with BitCommands[G, K, V],
transform: G ~> F
) extends StringCommands[F, K, V]
with HashCommands[F, K, V]
with SetCommands[F, K, V]
with SortedSetCommands[F, K, V]
with ListCommands[F, K, V]
with GeoCommands[F, K, V]
with ConnectionCommands[F]
with ConnectionCommands[F, K]
with ServerCommands[F, K]
with TransactionalCommands[F, K]
with Transaction[F]
with Watcher[F, K]
with PipelineCommands[F]
with ScriptCommands[F, K, V]
with KeyCommands[F, K]{
with KeyCommands[F, K]
with BitCommands[F, K, V] {
// Members declared in dev.profunktor.redis4cats.algebra.Client
def getClientId(): F[Long] = transform(commands.getClientId())
def getClientName(): F[Option[K]] = transform(commands.getClientName())
def setClientName(name: K): F[Boolean] = transform(commands.setClientName(name))

// Members declared in dev.profunktor.redis4cats.algebra.AutoFlush
def auth(password: CharSequence): F[Boolean] = transform(commands.auth(password))
def auth(username: String, password: CharSequence): F[Boolean] = transform(commands.auth(username, password))
Expand All @@ -105,7 +118,7 @@ object RedisMetrics {
def enableAutoFlush: F[Unit] = transform(commands.enableAutoFlush)
def flushCommands: F[Unit] = transform(commands.flushCommands)

// Members declared in dev.profunktor.redis4cats.algebra.Bits
// Members declared in dev.profunktor.redis4cats.algebra.BitCommands
def bitCount(key: K, start: Long, end: Long): F[Long] = transform(commands.bitCount(key, start, end))
def bitCount(key: K): F[Long] = transform(commands.bitCount(key))
def bitOpAnd(destination: K, sources: K*): F[Unit] = transform(commands.bitOpAnd(destination, sources:_*))
Expand All @@ -117,19 +130,22 @@ object RedisMetrics {
def bitPos(key: K, state: Boolean, start: Long): F[Long] = transform(commands.bitPos(key, state, start))
def bitPos(key: K, state: Boolean): F[Long] = transform(commands.bitPos(key, state))

def bitField(key: K, operations: BitCommandOperation*): F[List[Long]] = transform(commands.bitField(key, operations:_*))
def setBit(key: K, offset: Long, value: Int): F[Long] = transform(commands.setBit(key, offset, value))

// Members declared in dev.profunktor.redis4cats.algebra.Decrement
def decr(key: K)(implicit N: Numeric[V]): F[Long] = transform(commands.decr(key))
def decrBy(key: K, amount: Long)(implicit N: Numeric[V]): F[Long] = transform(commands.decrBy(key, amount))
def decr(key: K): F[Long] = transform(commands.decr(key))
def decrBy(key: K, amount: Long): F[Long] = transform(commands.decrBy(key, amount))

// Members declared in dev.profunktor.redis4cats.algebra.Diagnostic
def dbsize: F[Long] = transform(commands.dbsize)
def info: F[Map[String,String]] = transform(commands.info)
def info(section: String): F[Map[String, String]] = transform(commands.info(section))
def lastSave: F[java.time.Instant] = transform(commands.lastSave)
def slowLogLen: F[Long] = transform(commands.slowLogLen)

// Members declared in dev.profunktor.redis4cats.algebra.Flush
def flushAll: F[Unit] = transform(commands.flushAll)
def flushAllAsync: F[Unit] = transform(commands.flushAllAsync)
def keys(key: K): F[List[K]] = transform(commands.keys(key))

// Members declared in dev.profunktor.redis4cats.algebra.GeoGetter
Expand Down Expand Up @@ -163,6 +179,7 @@ object RedisMetrics {
// Members declared in dev.profunktor.redis4cats.algebra.Getter
def get(key: K): F[Option[V]] = transform(commands.get(key))
def getBit(key: K, offset: Long): F[Option[Long]] = transform(commands.getBit(key, offset))
def getEx(key: K, getExArg: dev.profunktor.redis4cats.effects.GetExArg): F[Option[V]] = transform(commands.getEx(key, getExArg))
def getRange(key: K, start: Long, end: Long): F[Option[V]] = transform(commands.getRange(key, start, end))
def strLen(key: K): F[Option[Long]] = transform(commands.strLen(key))

Expand All @@ -180,20 +197,21 @@ object RedisMetrics {
def hmGet(key: K, fields: K*): F[Map[K,V]] = transform(commands.hmGet(key, fields:_*))

// Members declared in dev.profunktor.redis4cats.algebra.HashIncrement
def hIncrBy(key: K, field: K, amount: Long)(implicit N: Numeric[V]): F[Long] =
def hIncrBy(key: K, field: K, amount: Long): F[Long] =
transform(commands.hIncrBy(key, field, amount))
def hIncrByFloat(key: K, field: K, amount: Double)(implicit N: Numeric[V]): F[Double] =
def hIncrByFloat(key: K, field: K, amount: Double): F[Double] =
transform(commands.hIncrByFloat(key, field, amount))

// Members declared in dev.profunktor.redis4cats.algebra.HashSetter
def hSet(key: K, field: K, value: V): F[Boolean] = transform(commands.hSet(key, field, value))
def hSetNx(key: K, field: K, value: V): F[Boolean] = transform(commands.hSetNx(key, field, value))
def hmSet(key: K, fieldValues: Map[K,V]): F[Unit] = transform(commands.hmSet(key, fieldValues))
def hSet(key: K, fieldValues: Map[K,V]): F[Long] = transform(commands.hSet(key, fieldValues))

// Members declared in dev.profunktor.redis4cats.algebra.Increment
def incr(key: K)(implicit N: Numeric[V]): F[Long] = transform(commands.incr(key))
def incrBy(key: K, amount: Long)(implicit N: Numeric[V]): F[Long] = transform(commands.incrBy(key, amount))
def incrByFloat(key: K, amount: Double)(implicit N: Numeric[V]): F[Double] = transform(commands.incrByFloat(key, amount))
def incr(key: K): F[Long] = transform(commands.incr(key))
def incrBy(key: K, amount: Long): F[Long] = transform(commands.incrBy(key, amount))
def incrByFloat(key: K, amount: Double): F[Double] = transform(commands.incrByFloat(key, amount))

// Members declared in dev.profunktor.redis4cats.algebra.KeyCommands
def del(key: K*): F[Long] = transform(commands.del(key:_*))
Expand Down Expand Up @@ -282,11 +300,12 @@ object RedisMetrics {

// Members declared in dev.profunktor.redis4cats.algebra.SetCommands
def sIsMember(key: K, value: V): F[Boolean] = transform(commands.sIsMember(key, value))
def sMisMember(key: K, values: V*): F[List[Boolean]] = transform(commands.sMisMember(key, values:_*))

// Members declared in dev.profunktor.redis4cats.algebra.SetDeletion
def sPop(key: K, count: Long): F[Set[V]] = transform(commands.sPop(key, count))
def sPop(key: K): F[Option[V]] = transform(commands.sPop(key))
def sRem(key: K, values: V*): F[Unit] = transform(commands.sRem(key, values:_*))
def sRem(key: K, values: V*): F[Long] = transform(commands.sRem(key, values:_*))

// Members declared in dev.profunktor.redis4cats.algebra.SetGetter
def sCard(key: K): F[Long] = transform(commands.sCard(key))
Expand Down Expand Up @@ -345,6 +364,12 @@ object RedisMetrics {
transform(commands.zRevRangeWithScores(key, start, stop))
def zRevRank(key: K, value: V): F[Option[Long]] = transform(commands.zRevRank(key, value))
def zScore(key: K, value: V): F[Option[Double]] = transform(commands.zScore(key, value))
def zDiff(keys: K*): F[List[V]] = transform(commands.zDiff(keys:_*))
def zDiffWithScores(keys: K*): F[List[dev.profunktor.redis4cats.effects.ScoreWithValue[V]]] = transform(commands.zDiffWithScores(keys:_*))
def zInter(args: Option[io.lettuce.core.ZAggregateArgs], keys: K*): F[List[V]] = transform(commands.zInter(args, keys:_*))
def zInterWithScores(args: Option[io.lettuce.core.ZAggregateArgs], keys: K*): F[List[dev.profunktor.redis4cats.effects.ScoreWithValue[V]]] = transform(commands.zInterWithScores(args, keys:_*))
def zUnion(args: Option[io.lettuce.core.ZAggregateArgs], keys: K*): F[List[V]] = transform(commands.zUnion(args, keys:_*))
def zUnionWithScores(args: Option[io.lettuce.core.ZAggregateArgs], keys: K*): F[List[dev.profunktor.redis4cats.effects.ScoreWithValue[V]]] = transform(commands.zUnionWithScores(args, keys:_*))

// Members declared in dev.profunktor.redis4cats.algebra.SortedSetSetter
def bzPopMax(timeout: Duration, keys: NonEmptyList[K]): F[Option[(K, effects.ScoreWithValue[V])]] =
Expand Down Expand Up @@ -381,6 +406,10 @@ object RedisMetrics {
// Members declared in dev.profunktor.redis4cats.algebra.Watcher
def unwatch: F[Unit] = transform(commands.unwatch)
def watch(keys: K*): F[Unit] = transform(commands.watch(keys:_*))

// Members declared in dev.profunktor.redis4cats.algebra.Unsafe
def unsafe[A](f: io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands[K, V] => io.lettuce.core.RedisFuture[A]): F[A] = transform(commands.unsafe(f))
def unsafeSync[A](f: io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands[K, V] => A): F[A] = transform(commands.unsafeSync(f))
}

object MapKCommands {
Expand All @@ -390,25 +419,29 @@ object RedisMetrics {
with SortedSetCommands[G, K, V]
with ListCommands[G, K, V]
with GeoCommands[G, K, V]
with ConnectionCommands[G]
with ConnectionCommands[G, K]
with ServerCommands[G, K]
with TransactionalCommands[G, K]
with Transaction[G]
with Watcher[G, K]
with PipelineCommands[G]
with ScriptCommands[G, K, V]
with KeyCommands[G, K],
with KeyCommands[G, K]
with BitCommands[G, K, V],
transform: G ~> F
) : StringCommands[F, K, V]
with HashCommands[F, K, V]
with SetCommands[F, K, V]
with SortedSetCommands[F, K, V]
with ListCommands[F, K, V]
with GeoCommands[F, K, V]
with ConnectionCommands[F]
with ConnectionCommands[F, K]
with ServerCommands[F, K]
with TransactionalCommands[F, K]
with Transaction[F]
with Watcher[F, K]
with PipelineCommands[F]
with ScriptCommands[F, K, V]
with KeyCommands[F, K] = new MapKCommands[G, F, K, V](commands, transform)
with KeyCommands[F, K]
with BitCommands[F, K, V] = new MapKCommands[G, F, K, V](commands, transform)
}

}
2 changes: 1 addition & 1 deletion project/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.2
sbt.version=1.8.2
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.3.1")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.2")
addSbtPlugin("io.chrisdavenport" % "sbt-davenverse" % "0.1.4")

0 comments on commit 1f5bb9a

Please sign in to comment.