From 3e2f561f60191335df351a94c707ffb09f74462b Mon Sep 17 00:00:00 2001 From: hwware Date: Thu, 23 Jan 2025 17:03:58 +0000 Subject: [PATCH] Fix memefficiency test case failure issue Signed-off-by: hwware --- src/server.h | 3 --- tests/unit/memefficiency.tcl | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/server.h b/src/server.h index bfd73a4237d..3b4d66e69f7 100644 --- a/src/server.h +++ b/src/server.h @@ -2875,9 +2875,6 @@ int collateStringObjects(const robj *a, const robj *b); int equalStringObjects(robj *a, robj *b); unsigned long long estimateObjectIdleTime(robj *o); void trimStringObjectIfNeeded(robj *o, int trim_small_values); -static inline int canUseSharedObject(void) { - return server.maxmemory == 0 || !(server.maxmemory_policy & MAXMEMORY_FLAG_NO_SHARED_INTEGERS); -} #define sdsEncodedObject(objptr) (objptr->encoding == OBJ_ENCODING_RAW || objptr->encoding == OBJ_ENCODING_EMBSTR) /* Objects with key attached, AKA valkey (val+key) objects */ diff --git a/tests/unit/memefficiency.tcl b/tests/unit/memefficiency.tcl index 8f6e5e8dd38..291a0dbf1fc 100644 --- a/tests/unit/memefficiency.tcl +++ b/tests/unit/memefficiency.tcl @@ -66,6 +66,7 @@ run_solo {defrag} { r config set latency-monitor-threshold 5 r latency reset r config set maxmemory 110mb ;# prevent further eviction (not to fail the digest test) + r config set key-eviction-memory 110mb set digest [debug_digest] catch {r config set activedefrag yes} e if {[r config get activedefrag] eq "activedefrag yes"} {