Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pass through values to KeyPool Builder #122

Merged
merged 3 commits into from
Nov 22, 2023
Merged

pass through values to KeyPool Builder #122

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea4bf27
pass through values to KeyPool Builder
Oct 3, 2023
8613a37
Merge remote-tracking branch 'upstream/main'
armanbilge Nov 22, 2023
45e0aec
Hush MiMa
armanbilge Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 68 additions & 6 deletions core/shared/src/main/scala/io/chrisdavenport/rediculous/RedisConnection.scala
View file
Original file line number Diff line number Diff line change
@@ -132,6 +132,10 @@ object RedisConnection{
val clusterCacheTopologySeconds: FiniteDuration = 1.second // How long topology will not be rechecked for after a succesful refresh
val useTLS: Boolean = false
val requestTimeout: Duration = 60.seconds
// same as KeyPool.Builder.Defaults
val idleTimeAllowedInPool: Duration = 30.seconds
val maxIdle: Int = 100
val maxTotal: Int = 100
}

def direct[F[_]: Temporal: Network]: DirectConnectionBuilder[F] =
@@ -222,6 +226,9 @@ object RedisConnection{
None,
Defaults.useTLS,
Defaults.requestTimeout,
Defaults.idleTimeAllowedInPool,
Defaults.maxIdle,
Defaults.maxTotal
)

@deprecated("Use overload that takes a Network", "0.4.1")
@@ -237,6 +244,9 @@ object RedisConnection{
private val auth: Option[(Option[String], String)],
private val useTLS: Boolean,
private val defaultTimeout: Duration,
private val idleTimeAllowedInPool: Duration,
private val maxIdle: Int,
private val maxTotal: Int
) { self =>

private def copy(
@@ -248,6 +258,9 @@ object RedisConnection{
auth: Option[(Option[String], String)] = self.auth,
useTLS: Boolean = self.useTLS,
defaultTimeout: Duration = self.defaultTimeout,
idleTimeAllowedInPool: Duration = self.idleTimeAllowedInPool,
maxIdle: Int = self.maxIdle,
maxTotal: Int = self.maxTotal
): PooledConnectionBuilder[F] = new PooledConnectionBuilder(
sg,
host,
@@ -256,7 +269,10 @@ object RedisConnection{
tlsParameters,
auth,
useTLS,
defaultTimeout
defaultTimeout,
idleTimeAllowedInPool,
maxIdle,
maxTotal
)

def withHost(host: Host) = copy(host = host)
@@ -271,6 +287,10 @@ object RedisConnection{
def withoutTLS = copy(useTLS = false)
def withRequestTimeout(timeout: Duration) = copy(defaultTimeout = timeout)

def withIdleTimeAllowedInPool(duration: Duration) = copy(idleTimeAllowedInPool = duration)
def withMaxIdle(maxIdle: Int) = copy(maxIdle = maxIdle)
def withMaxTotal(total: Int) = copy(maxTotal = total)

def build: Resource[F,RedisConnection[F]] = for {
tlsContextOptWithDefault <-
tlsContext
@@ -290,7 +310,11 @@ object RedisConnection{
}
)
}
).build
).withIdleTimeAllowedInPool(idleTimeAllowedInPool)
.withMaxIdle(maxIdle)
.withMaxTotal(maxTotal)
.withMaxPerKey(Function.const(maxTotal))
.build
} yield new TimeoutConnection(PooledConnection[F](kp), defaultTimeout)

}
@@ -308,6 +332,9 @@ object RedisConnection{
None,
Defaults.useTLS,
Defaults.requestTimeout,
Defaults.idleTimeAllowedInPool,
Defaults.maxIdle,
Defaults.maxTotal
)

@deprecated("Use overload that takes a Network", "0.4.1")
@@ -326,6 +353,9 @@ object RedisConnection{
private val auth: Option[(Option[String], String)],
private val useTLS: Boolean,
private val defaultTimeout: Duration,
private val idleTimeAllowedInPool: Duration,
private val maxIdle: Int,
private val maxTotal: Int
) { self =>

private def copy(
@@ -339,7 +369,10 @@ object RedisConnection{
chunkSizeLimit: Int = self.chunkSizeLimit,
auth: Option[(Option[String], String)] = self.auth,
useTLS: Boolean = self.useTLS,
defaultTimeout: Duration = self.defaultTimeout
defaultTimeout: Duration = self.defaultTimeout,
idleTimeAllowedInPool: Duration = self.idleTimeAllowedInPool,
maxIdle: Int = self.maxIdle,
maxTotal: Int = self.maxTotal
): QueuedConnectionBuilder[F] = new QueuedConnectionBuilder(
sg,
host,
@@ -352,6 +385,9 @@ object RedisConnection{
auth,
useTLS,
defaultTimeout,
idleTimeAllowedInPool,
maxIdle,
maxTotal
)

def withHost(host: Host) = copy(host = host)
@@ -371,6 +407,10 @@ object RedisConnection{
def withoutTLS = copy(useTLS = false)
def withRequestTimeout(timeout: Duration) = copy(defaultTimeout = timeout)

def withIdleTimeAllowedInPool(duration: Duration) = copy(idleTimeAllowedInPool = duration)
def withMaxIdle(maxIdle: Int) = copy(maxIdle = maxIdle)
def withMaxTotal(total: Int) = copy(maxTotal = total)

def build: Resource[F,RedisConnection[F]] = {
for {
queue <- Resource.eval(Queue.bounded[F, Chunk[(Either[Throwable,Resp] => F[Unit], Resp)]](maxQueued))
@@ -393,7 +433,10 @@ object RedisConnection{
}
)
}
).build
).withIdleTimeAllowedInPool(idleTimeAllowedInPool)
.withMaxIdle(maxIdle)
.withMaxTotal(maxTotal)
.withMaxPerKey(Function.const(maxTotal)).build
_ <-
Stream.fromQueueUnterminatedChunk(queue, chunkSizeLimit).chunks.map{chunk =>
val s = if (chunk.nonEmpty) {
@@ -445,6 +488,9 @@ object RedisConnection{
None,
Defaults.useTLS,
Defaults.requestTimeout,
Defaults.idleTimeAllowedInPool,
Defaults.maxIdle,
Defaults.maxTotal
)

@deprecated("Use overload that takes a Network", "0.4.1")
@@ -466,6 +512,9 @@ object RedisConnection{
private val auth: Option[(Option[String], String)],
private val useTLS: Boolean,
private val defaultTimeout: Duration,
private val idleTimeAllowedInPool: Duration,
private val maxIdle: Int,
private val maxTotal: Int
) { self =>

private def copy(
@@ -482,7 +531,10 @@ object RedisConnection{
cacheTopologySeconds: FiniteDuration = self.cacheTopologySeconds,
auth: Option[(Option[String], String)] = self.auth,
useTLS: Boolean = self.useTLS,
defaultTimeout: Duration = self.defaultTimeout
defaultTimeout: Duration = self.defaultTimeout,
idleTimeAllowedInPool: Duration = self.idleTimeAllowedInPool,
maxIdle: Int = self.maxIdle,
maxTotal: Int = self.maxTotal
): ClusterConnectionBuilder[F] = new ClusterConnectionBuilder(
sg,
host,
@@ -498,6 +550,9 @@ object RedisConnection{
auth,
useTLS,
defaultTimeout,
idleTimeAllowedInPool,
maxIdle,
maxTotal
)

def withHost(host: Host) = copy(host = host)
@@ -522,6 +577,10 @@ object RedisConnection{
def withoutTLS = copy(useTLS = false)
def withRequestTimeout(timeout: Duration) = copy(defaultTimeout = timeout)

def withIdleTimeAllowedInPool(duration: Duration) = copy(idleTimeAllowedInPool = duration)
def withMaxIdle(maxIdle: Int) = copy(maxIdle = maxIdle)
def withMaxTotal(total: Int) = copy(maxTotal = total)

def build: Resource[F,RedisConnection[F]] = {
for {
tlsContextOptWithDefault <-
@@ -545,7 +604,10 @@ object RedisConnection{
}
)
}
).build
).withIdleTimeAllowedInPool(idleTimeAllowedInPool)
.withMaxIdle(maxIdle)
.withMaxTotal(maxTotal)
.withMaxPerKey(Function.const(maxTotal)).build

// Cluster Topology Acquisition and Management
sockets <- Resource.eval(keypool.take((host, port)).map(_.value).map(DirectConnection(_)).use(ClusterCommands.clusterslots[Redis[F, *]].run(_)))