From e5c8a6ba18034780129fc8ec3c7b33f13ea2df21 Mon Sep 17 00:00:00 2001
From: Dylan <quantum64development@gmail.com>
Date: Fri, 7 Jan 2022 02:04:29 -0500
Subject: [PATCH 1/2] Add approximate trimming to reactive stream extensions

---
 .../data/redis/core/ReactiveStreamOperationsExtensions.kt    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensions.kt b/src/main/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensions.kt
index 8bbfc34984..69e99968cf 100644
--- a/src/main/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensions.kt
+++ b/src/main/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensions.kt
@@ -265,5 +265,6 @@ inline fun <K : Any, reified V : Any> ReactiveStreamOperations<K, *, *>.reverseR
  * @author Mark Paluch
  * @since 2.2
  */
-suspend fun <K : Any, HK : Any, HV : Any> ReactiveStreamOperations<K, HK, HV>.trimAndAwait(key: K, count: Long): Long =
-		trim(key, count).awaitSingle()
+@JvmOverloads // Maintain compatibility with versions <= 2.6.0
+suspend fun <K : Any, HK : Any, HV : Any> ReactiveStreamOperations<K, HK, HV>.trimAndAwait(key: K, count: Long, approximateTrimming: Boolean = false): Long =
+		trim(key, count, approximateTrimming).awaitSingle()

From 19ddfe9c05f0a8187727d8ad14f474d6a36cc186 Mon Sep 17 00:00:00 2001
From: Dylan <quantum64development@gmail.com>
Date: Fri, 7 Jan 2022 02:22:24 -0500
Subject: [PATCH 2/2] Add author annotation

---
 .../data/redis/core/ReactiveStreamOperationsExtensions.kt        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensions.kt b/src/main/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensions.kt
index 69e99968cf..e7a7f582be 100644
--- a/src/main/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensions.kt
+++ b/src/main/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensions.kt
@@ -263,6 +263,7 @@ inline fun <K : Any, reified V : Any> ReactiveStreamOperations<K, *, *>.reverseR
  * Coroutines variant of [ReactiveStreamOperations.trim].
  *
  * @author Mark Paluch
+ * @author Quantum64@github
  * @since 2.2
  */
 @JvmOverloads // Maintain compatibility with versions <= 2.6.0