add config to disable storage key cache

src/Makefile

@@ -145,9 +145,7 @@ FINAL_LDFLAGS=$(LDFLAGS) $(KEYDB_LDFLAGS) $(DEBUG)
 FINAL_LIBS+=-lm -lz -lcrypto -lbz2 -lzstd -llz4 -lsnappy
 
 ifneq ($(uname_S),Darwin)
-    ifneq ($(uname_S),FreeBSD)
 	FINAL_LIBS+=-latomic
-    endif
 endif
 # Linux ARM32 needs -latomic at linking time
 ifneq (,$(findstring armv,$(uname_M)))
@@ -213,13 +211,7 @@ ifeq ($(uname_S),NetBSD)
 else
 ifeq ($(uname_S),FreeBSD)
 	# FreeBSD
-	FINAL_LIBS+= -lpthread -luuid -lexecinfo
-	FINAL_CFLAGS+= -I/usr/local/include
-	FINAL_CXXFLAGS+= -I/usr/local/include
-	FINAL_LDFLAGS+= -L/usr/local/lib
-	ifeq ($(USE_BACKTRACE),yes)
-	    FINAL_CFLAGS+= -DUSE_BACKTRACE
-	endif
+	FINAL_LIBS+= -lpthread -lexecinfo
 else
 ifeq ($(uname_S),DragonFly)
 	# DragonFly

src/blocked.cpp

@@ -732,7 +732,6 @@ void unblockClientWaitingData(client *c) {
         c->bpop.xread_group = NULL;
         c->bpop.xread_consumer = NULL;
     }
-    c->bpop.timeout = 0;
 }
 
 static int getBlockedTypeByType(int type) {

src/evict.cpp

@@ -552,7 +552,7 @@ static int evictionTimeProc(
     UNUSED(clientData);
     serverAssert(GlobalLocksAcquired());
 
-    if (performEvictions((bool)clientData) == EVICT_RUNNING) return 0;  /* keep evicting */
+    if (performEvictions(false) == EVICT_RUNNING) return 0;  /* keep evicting */
 
     /* For EVICT_OK - things are good, no need to keep evicting.
      * For EVICT_FAIL - there is nothing left to evict.  */
@@ -838,7 +838,7 @@ int performEvictions(bool fPreSnapshot) {
                     if (!isEvictionProcRunning && serverTL->el != nullptr) {
                         isEvictionProcRunning = 1;
                         aeCreateTimeEvent(serverTL->el, 0,
-                                evictionTimeProc, (void*)fPreSnapshot, NULL);
+                                evictionTimeProc, NULL, NULL);
                     }
                     break;
                 }

tests/unit/type/list.tcl

@@ -1069,13 +1069,6 @@ start_server {
         r ping
     } {PONG}
 
-    test "Regression for bug 659 - chaining BRPOP with async blocking cmds" {
-        r flushall
-        r brpop foo 1
-        r keys *
-        r ping
-    } {PONG}
-
     test "client unblock tests" {
         r del l
         set rd [redis_deferring_client]