Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Redis config improvements #5

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Redis config improvements #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2eef2b0
First pass on TTL
May 22, 2021
bfb72fc
cache -> pexpire
May 23, 2021
a85da3e
restrict ttl to a set
May 23, 2021
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
12 changes: 7 additions & 5 deletions redis/src/main/kotlin/dev/kord/cache/redis/RedisConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package dev.kord.cache.redis

import io.lettuce.core.RedisClient
import io.lettuce.core.api.StatefulConnection
import io.lettuce.core.api.StatefulRedisConnection
import io.lettuce.core.cluster.RedisClusterClient
import io.lettuce.core.codec.ByteArrayCodec
import io.lettuce.core.codec.RedisCodec
import kotlinx.serialization.BinaryFormat
Expand All @@ -14,7 +12,8 @@ class RedisConfiguration(
val client: RedisClient,
val prefix: String,
val reuseConnection: Boolean,
val codec: RedisCodec<ByteArray, ByteArray>
val codec: RedisCodec<ByteArray, ByteArray>,
val command: RedisCommand
) {
private val reusedConnection: StatefulRedisConnection<ByteArray, ByteArray> by lazy {
client.connect(codec)
Expand All @@ -35,6 +34,7 @@ class RedisConfiguration(

const val KORD_REDIS_URL = "KORD_REDIS_URL"

val redisCommand = RedisCommand.HashSet
val binaryFormat: BinaryFormat = ProtoBuf {
encodeDefaults = false
}
Expand All @@ -50,6 +50,7 @@ class RedisConfiguration(

var binaryFormat: BinaryFormat = Defaults.binaryFormat
var codec: RedisCodec<ByteArray, ByteArray> = Defaults.codec
var redisCommand: RedisCommand = Defaults.redisCommand

var reuseConnection: Boolean = true

Expand All @@ -62,10 +63,11 @@ class RedisConfiguration(
client = client ?: client(),
prefix = keyPrefix,
reuseConnection = reuseConnection,
codec = codec
codec = codec,
command = redisCommand
)

}


}
}
25 changes: 21 additions & 4 deletions redis/src/main/kotlin/dev/kord/cache/redis/RedisEntryCache.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,25 @@ import dev.kord.cache.api.data.DataDescription
import dev.kord.cache.redis.internal.builder.QueryInfo
import dev.kord.cache.redis.internal.builder.RedisQueryBuilder
import kotlinx.coroutines.reactive.awaitSingle
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.InternalSerializationApi
import kotlinx.serialization.KSerializer
import kotlinx.serialization.serializer

sealed class RedisCommand {
object HashSet : RedisCommand()
data class Set(val ttl: Long? = null) : RedisCommand()
}

@OptIn(InternalSerializationApi::class)
class RedisEntryCache<T : Any, I> constructor(
cache: DataCache,
description: DataDescription<T, I>,
configuration: RedisConfiguration,
serializer: KSerializer<T> = description.klass.serializer(),
keySerializer: (I) -> ByteArray = { "${configuration.prefix}$it".toByteArray(Charsets.UTF_8) },
entryName: String = description.type.toString()
entryName: String = description.type.toString(),
private val command: RedisCommand = configuration.command
) : DataEntryCache<T> {
private val info: QueryInfo<T, I> = QueryInfo(
entryName = entryName.toByteArray(Charsets.UTF_8),
Expand All @@ -30,13 +37,23 @@ class RedisEntryCache<T : Any, I> constructor(
valueSerializer = serializer
)


override fun query(): QueryBuilder<T> = RedisQueryBuilder(info)

@OptIn(ExperimentalSerializationApi::class)
override suspend fun put(item: T) {
val key = info.keySerializer(info.description.indexField.property.get(item))
val value = info.binarySerializer.encodeToByteArray(info.valueSerializer, item)
info.commands.hset(info.entryName, key, value).awaitSingle()
}

when (command) {
is RedisCommand.HashSet ->
info.commands.hset(info.entryName, key, value).awaitSingle()

is RedisCommand.Set -> {
info.commands.set(key, value).awaitSingle()
if (command.ttl != null) {
info.commands.pexpire(key, command.ttl).awaitSingle()
}
}
}
}
}