remove unnecessary +=

make librocksdb optional
better style
2023-01-19 00:52:22 -08:00 · 2023-01-19 00:19:04 -08:00 · 2023-01-19 00:17:37 -08:00 · 2023-01-19 00:09:03 -08:00 · 2023-01-19 00:03:37 -08:00
33 changed files with 165 additions and 317 deletions
@@ -4,7 +4,7 @@

 ##### KeyDB is now a part of Snap Inc! Check out the announcement [here](https://docs.keydb.dev/news/2022/05/12/keydb-joins-snap) 

-##### [Release v6.3.0](https://github.com/EQ-Alpha/KeyDB/releases/tag/v6.3.0) is here with major improvements as we consolidate our Open Source and Enterprise offerings into a single BSD-3 licensed project. See our [roadmap](https://docs.keydb.dev/docs/coming-soon) for details. 
+##### [Release v6.3.0](https://github.com/EQ-Alpha/KeyDB/releases/tag/v6.3.0) is here with major improvements as we consolodate our Open Source and Enterprise offerings into a single BSD-3 licensed project. See our [roadmap](https://docs.keydb.dev/docs/coming-soon) for details. 

 ##### Want to extend KeyDB with Javascript?  Try [ModJS](https://github.com/JohnSully/ModJS)

@@ -37,7 +37,7 @@ Because of this difference of opinion features which are right for KeyDB may not
 Project Support
 -------------------

-The KeyDB team maintains this project as part of Snap Inc. KeyDB is used by Snap as part of its caching infrastructure and is fully open sourced. There is no separate commercial product and no paid support options available. We really value collaborating with the open source community and welcome PRs, bug reports, and open discussion. For community support or to get involved further with the project check out our community support options [here](https://docs.keydb.dev/docs/support) (slack, forum, meetup, github issues). Our team monitors these channels regularly.
+The KeyDB team maintains this project as part of Snap Inc. KeyDB is used by Snap as part of its caching infrastructure and is fully open sourced. There is no separate commercial product and no paid support options available. We really value collaborating with the open source community and welcome PRs, bug reports, and open discussion. For community support or to get involved further with the project check out our community support options [here](https://docs.keydb.dev/docs/support) (slack, forum, meetup, github issues). Our team monitors these channlels regularly.


 Additional Resources
@@ -141,9 +141,9 @@ To append a suffix to KeyDB program names, use:
 ***Note that the following dependencies may be needed: 
    % sudo apt-get install autoconf autotools-dev libnuma-dev libtool

-KeyDB by default is built with TLS enabled. To build without TLS support, use:
+To buik=ld with TLS support, use:

-    % make BUILD_TLS=no
+    % make BUILD_TLS=yes

 Running the tests with TLS enabled (you will need `tcl-tls`
 installed):
@@ -37,6 +37,5 @@ $TCLSH tests/test_helper.tcl \
 --single unit/moduleapi/hash \
 --single unit/moduleapi/zset \
 --single unit/moduleapi/stream \
--single unit/moduleapi/load \
 --config server-threads 3 \
 "${@}"
@@ -716,6 +716,11 @@ int aeProcessEvents(aeEventLoop *eventLoop, int flags)
            }
        }

+        if (eventLoop->flags & AE_DONT_WAIT) {
+            tv.tv_sec = tv.tv_usec = 0;
+            tvp = &tv;
+        }
+
        if (eventLoop->beforesleep != NULL && flags & AE_CALL_BEFORE_SLEEP) {
            std::unique_lock<decltype(g_lock)> ulock(g_lock, std::defer_lock);
            if (!(eventLoop->beforesleepFlags & AE_SLEEP_THREADSAFE)) {
@@ -726,11 +731,6 @@ int aeProcessEvents(aeEventLoop *eventLoop, int flags)
            eventLoop->beforesleep(eventLoop);
        }

-        if (eventLoop->flags & AE_DONT_WAIT) {
-            tv.tv_sec = tv.tv_usec = 0;
-            tvp = &tv;
-        }
-
        /* Call the multiplexing API, will return only on timeout or when
         * some event fires. */
        numevents = aeApiPoll(eventLoop, tvp);
@@ -859,11 +859,6 @@ void aeReleaseForkLock()
    g_forkLock.downgradeWrite();
 }

-void aeForkLockInChild()
-{
-    g_forkLock.setNotify(false);
-}
-
 int aeThreadOwnsLock()
 {
    return fOwnLockOverride || g_lock.fOwnLock();
@@ -171,7 +171,6 @@ int aeTryAcquireLock(int fWeak);
 void aeThreadOffline();
 void aeReleaseLock();
 void aeReleaseForkLock();
-void aeForkLockInChild();
 int aeThreadOwnsLock();
 void aeSetThreadOwnsLockOverride(int fOverride);
 int aeLockContested(int threshold);
@@ -441,7 +441,7 @@ static int _anetTcpServer(char *err, int port, const char *bindaddr, int af, int
    char _port[6];  /* strlen("65535") */
    struct addrinfo hints, *servinfo, *p;

-    snprintf(_port,sizeof(_port),"%d",port);
+    snprintf(_port,6,"%d",port);
    memset(&hints,0,sizeof(hints));
    hints.ai_family = af;
    hints.ai_socktype = SOCK_STREAM;
@@ -285,7 +285,7 @@ int startAppendOnly(void) {
            strerror(errno));
        return C_ERR;
    }
-    if (hasActiveChildProcessOrBGSave() && g_pserver->child_type != CHILD_TYPE_AOF) {
+    if (hasActiveChildProcess() && g_pserver->child_type != CHILD_TYPE_AOF) {
        g_pserver->aof_rewrite_scheduled = 1;
        serverLog(LL_WARNING,"AOF was enabled but there is already another background operation. An AOF background was scheduled to start when possible.");
    } else {
@@ -438,7 +438,7 @@ void flushAppendOnlyFile(int force) {
     * useful for graphing / monitoring purposes. */
    if (sync_in_progress) {
        latencyAddSampleIfNeeded("aof-write-pending-fsync",latency);
-    } else if (hasActiveChildProcessOrBGSave()) {
+    } else if (hasActiveChildProcess()) {
        latencyAddSampleIfNeeded("aof-write-active-child",latency);
    } else {
        latencyAddSampleIfNeeded("aof-write-alone",latency);
@@ -535,7 +535,7 @@ void flushAppendOnlyFile(int force) {
 try_fsync:
    /* Don't fsync if no-appendfsync-on-rewrite is set to yes and there are
     * children doing I/O in the background. */
-    if (g_pserver->aof_no_fsync_on_rewrite && hasActiveChildProcessOrBGSave())
+    if (g_pserver->aof_no_fsync_on_rewrite && hasActiveChildProcess())
        return;

    /* Perform the fsync if needed. */
@@ -752,7 +752,7 @@ void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv, int a
     * accumulate the differences between the child DB and the current one
     * in a buffer, so that when the child process will do its work we
     * can append the differences to the new append only file. */
-    if (hasActiveChildProcess() && g_pserver->child_type == CHILD_TYPE_AOF)
+    if (g_pserver->child_type == CHILD_TYPE_AOF)
        aofRewriteBufferAppend((unsigned char*)buf,sdslen(buf));

    sdsfree(buf);
@@ -1658,7 +1658,7 @@ int rewriteAppendOnlyFile(char *filename) {
 { // BEGIN GOTO SCOPED VARIABLES
    /* Note that we have to use a different temp name here compared to the
     * one used by rewriteAppendOnlyFileBackground() function. */
-    snprintf(tmpfile,sizeof(tmpfile),"temp-rewriteaof-%d.aof", (int) getpid());
+    snprintf(tmpfile,256,"temp-rewriteaof-%d.aof", (int) getpid());
    fp = fopen(tmpfile,"w");
    if (!fp) {
        serverLog(LL_WARNING, "Opening the temp file for AOF rewrite in rewriteAppendOnlyFile(): %s", strerror(errno));
@@ -1887,7 +1887,7 @@ void aofClosePipes(void) {
 int rewriteAppendOnlyFileBackground(void) {
    pid_t childpid;

-    if (hasActiveChildProcessOrBGSave()) return C_ERR;
+    if (hasActiveChildProcess()) return C_ERR;
    if (aofCreatePipes() != C_OK) return C_ERR;
    if ((childpid = redisFork(CHILD_TYPE_AOF)) == 0) {
        char tmpfile[256];
@@ -1895,7 +1895,7 @@ int rewriteAppendOnlyFileBackground(void) {
        /* Child */
        redisSetProcTitle("keydb-aof-rewrite");
        redisSetCpuAffinity(g_pserver->aof_rewrite_cpulist);
-        snprintf(tmpfile,sizeof(tmpfile),"temp-rewriteaof-bg-%d.aof", (int) getpid());
+        snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof", (int) getpid());
        if (rewriteAppendOnlyFile(tmpfile) == C_OK) {
            sendChildCowInfo(CHILD_INFO_TYPE_AOF_COW_SIZE, "AOF rewrite");
            exitFromChild(0);
@@ -1930,7 +1930,7 @@ int rewriteAppendOnlyFileBackground(void) {
 void bgrewriteaofCommand(client *c) {
    if (g_pserver->child_type == CHILD_TYPE_AOF) {
        addReplyError(c,"Background append only file rewriting already in progress");
-    } else if (hasActiveChildProcessOrBGSave()) {
+    } else if (hasActiveChildProcess()) {
        g_pserver->aof_rewrite_scheduled = 1;
        addReplyStatus(c,"Background append only file rewriting scheduled");
    } else if (rewriteAppendOnlyFileBackground() == C_OK) {
@@ -1944,10 +1944,10 @@ void bgrewriteaofCommand(client *c) {
 void aofRemoveTempFile(pid_t childpid) {
    char tmpfile[256];

-    snprintf(tmpfile,sizeof(tmpfile),"temp-rewriteaof-bg-%d.aof", (int) childpid);
+    snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof", (int) childpid);
    bg_unlink(tmpfile);

-    snprintf(tmpfile,sizeof(tmpfile),"temp-rewriteaof-%d.aof", (int) childpid);
+    snprintf(tmpfile,256,"temp-rewriteaof-%d.aof", (int) childpid);
    bg_unlink(tmpfile);
 }

@@ -1985,7 +1985,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
        /* Flush the differences accumulated by the parent to the
         * rewritten AOF. */
        latencyStartMonitor(latency);
-        snprintf(tmpfile,sizeof(tmpfile),"temp-rewriteaof-bg-%d.aof",
+        snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof",
            (int)g_pserver->child_pid);
        newfd = open(tmpfile,O_WRONLY|O_APPEND);
        if (newfd == -1) {
@@ -322,7 +322,7 @@ handle_wrap:
    return 1;
 }

-int checkSignedBitfieldOverflow(int64_t value, int64_t incr, int bits, int owtype, int64_t *limit) {
+int checkSignedBitfieldOverflow(int64_t value, int64_t incr, uint64_t bits, int owtype, int64_t *limit) {
    int64_t max = (bits == 64) ? INT64_MAX : (((int64_t)1<<(bits-1))-1);
    int64_t min = (-max)-1;

@@ -5107,7 +5107,7 @@ void createDumpPayload(rio *payload, robj_roptr o, robj *key) {
    serverAssert(rdbSaveObject(payload,o,key));
    char szT[32];
    uint64_t mvcc = mvccFromObj(o);
-    snprintf(szT, sizeof(szT), "%" PRIu64, mvcc);
+    snprintf(szT, 32, "%" PRIu64, mvcc);
    serverAssert(rdbSaveAuxFieldStrStr(payload,"mvcc-tstamp", szT) != -1);

    /* Write the footer, this is how it looks like:
@@ -40,7 +40,6 @@
 #endif

 const char *KEYDB_SET_VERSION = KEYDB_REAL_VERSION;
-size_t g_semiOrderedSetTargetBucketSize = 0;    // Its a header only class so nowhere else for this to go

 /*-----------------------------------------------------------------------------
 * Config file name-value maps.
@@ -2588,7 +2587,7 @@ static int updateMaxclients(long long val, long long prev, const char **err) {
        adjustOpenFilesLimit();
        if (g_pserver->maxclients != val) {
            static char msg[128];
-            snprintf(msg, sizeof(msg), "The operating system is not able to handle the specified number of clients, try with %d", g_pserver->maxclients);
+            snprintf(msg, 128, "The operating system is not able to handle the specified number of clients, try with %d", g_pserver->maxclients);
            *err = msg;
            if (g_pserver->maxclients > prev) {
                g_pserver->maxclients = prev;
@@ -2627,7 +2626,7 @@ static int updateMaxclients(long long val, long long prev, const char **err) {

                if (res != AE_OK){
                    static char msg[128];
-                    snprintf(msg, sizeof(msg),"Failed to post the request to change setsize for Thread %d", iel);
+                    snprintf(msg, 128,"Failed to post the request to change setsize for Thread %d", iel);
                    *err = msg;
                    return 0;
                }
@@ -2911,7 +2910,6 @@ standardConfig configs[] = {
    createBoolConfig("allow-write-during-load", NULL, MODIFIABLE_CONFIG, g_pserver->fWriteDuringActiveLoad, 0, NULL, NULL),
    createBoolConfig("force-backlog-disk-reserve", NULL, MODIFIABLE_CONFIG, cserver.force_backlog_disk, 0, NULL, NULL),
    createBoolConfig("soft-shutdown", NULL, MODIFIABLE_CONFIG, g_pserver->config_soft_shutdown, 0, NULL, NULL),
-    createSizeTConfig("semi-ordered-set-bucket-size", NULL, MODIFIABLE_CONFIG, 0, 1024, g_semiOrderedSetTargetBucketSize, 0, INTEGER_CONFIG, NULL, NULL),

 #ifdef USE_OPENSSL
    createIntConfig("tls-port", NULL, MODIFIABLE_CONFIG, 0, 65535, g_pserver->tls_port, 0, INTEGER_CONFIG, NULL, updateTLSPort), /* TCP port. */
@@ -93,7 +93,7 @@ static void lookupKeyUpdateObj(robj *val, int flags)
    /* Update the access time for the ageing algorithm.
     * Don't do it if we have a saving child, as this will trigger
     * a copy on write madness. */
-    if (!hasActiveChildProcessOrBGSave() && !(flags & LOOKUP_NOTOUCH))
+    if (!hasActiveChildProcess() && !(flags & LOOKUP_NOTOUCH))
    {
        if (g_pserver->maxmemory_policy & MAXMEMORY_FLAG_LFU) {
            updateLFU(val);
@@ -1059,7 +1059,7 @@ void keysCommand(client *c) {
    sds pattern = szFromObj(c->argv[1]);

    const redisDbPersistentDataSnapshot *snapshot = nullptr;
-    if (!(c->flags & (CLIENT_MULTI | CLIENT_BLOCKED | CLIENT_DENY_BLOCKING)))
+    if (!(c->flags & (CLIENT_MULTI | CLIENT_BLOCKED)))
        snapshot = c->db->createSnapshot(c->mvccCheckpoint, true /* fOptional */);
    if (snapshot != nullptr)
    {
@@ -2607,14 +2607,6 @@ void clusterStorageLoadCallback(const char *rgchkey, size_t cch, void *)
    slotToKeyUpdateKeyCore(rgchkey, cch, true /*add*/);
 }

-void moduleLoadCallback(const char * rgchKey, size_t cchKey, void *data) {
-    if (g_pserver->cluster_enabled) {
-        clusterStorageLoadCallback(rgchKey, cchKey, data);
-    }
-    robj *keyobj = createEmbeddedStringObject(rgchKey, cchKey);
-    moduleNotifyKeyspaceEvent(NOTIFY_LOADED, "loaded", keyobj, *(int *)data);
-}
-
 void redisDb::initialize(int id)
 {
    redisDbPersistentData::initialize();
@@ -2633,8 +2625,8 @@ void redisDb::storageProviderInitialize()
 {
    if (g_pserver->m_pstorageFactory != nullptr)
    {
-        IStorageFactory::key_load_iterator itr = moduleLoadCallback;
-        this->setStorageProvider(StorageCache::create(g_pserver->m_pstorageFactory, id, itr, &id));
+        IStorageFactory::key_load_iterator itr = (g_pserver->cluster_enabled) ? clusterStorageLoadCallback : nullptr;
+        this->setStorageProvider(StorageCache::create(g_pserver->m_pstorageFactory, id, itr, nullptr));
    }
 }

@@ -3265,7 +3257,7 @@ int dbnumFromDb(redisDb *db)
    serverPanic("invalid database pointer");
 }

-void redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command)
+bool redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command, bool fExecOK)
 {
    if (m_spstorage == nullptr) {
 #if defined(__x86_64__) || defined(__i386__)
@@ -3277,7 +3269,7 @@ void redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command
            const char *cmd = szFromObj(command.argv[0]);
            if (!strcasecmp(cmd, "set") || !strcasecmp(cmd, "get")) {
                if (c->db->m_spdbSnapshotHOLDER != nullptr)
-                    return; // this is dangerous enough without a snapshot around
+                    return false; // this is dangerous enough without a snapshot around
                auto h = dictSdsHash(szFromObj(command.argv[1]));
                for (int iht = 0; iht < 2; ++iht) {
                    auto hT = h & c->db->m_pdict->ht[iht].sizemask;
@@ -3297,7 +3289,7 @@ void redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command
            }
        }
 #endif
-        return;
+        return false;
    }

    AeLocker lock;
@@ -3307,10 +3299,10 @@ void redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command
    getKeysResult result = GETKEYS_RESULT_INIT;
    auto cmd = lookupCommand(szFromObj(command.argv[0]));
    if (cmd == nullptr)
-        return; // Bad command? It's not for us to judge, just bail
+        return false; // Bad command? It's not for us to judge, just bail
    
    if (command.argc < std::abs(cmd->arity))
-        return; // Invalid number of args
+        return false; // Invalid number of args
    
    int numkeys = getKeysFromCommand(cmd, command.argv, command.argc, &result);
    for (int ikey = 0; ikey < numkeys; ++ikey)
@@ -3343,6 +3335,7 @@ void redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command
        }
    }

+    bool fNoInsert = false;
    if (!vecInserts.empty()) {
        lock.arm(c);
        for (auto &tuple : vecInserts)
@@ -3358,11 +3351,13 @@ void redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command
                    // While unlocked this was already ensured
                    decrRefCount(o);
                    sdsfree(sharedKey);
+                    fNoInsert = true;
                }
                else
                {
                    if (spexpire != nullptr) {
                        if (spexpire->when() < mstime()) {
+                            fNoInsert = true;
                            break;
                        }
                    }
@@ -3389,5 +3384,12 @@ void redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command
        lock.disarm();
    }

-    return;
-}
+    if (fExecOK && !fNoInsert && cmd->proc == getCommand && !vecInserts.empty()) {
+        robj *o = std::get<1>(vecInserts[0]);
+        if (o != nullptr) {
+            addReplyBulk(c, o);
+            return true;
+        }
+    }
+    return false;
+}
@@ -1577,7 +1577,7 @@ char *stringFromLongLong(long long value) {
    int len;
    char *s;

-    len = snprintf(buf,sizeof(buf),"%lld",value);
+    len = snprintf(buf,32,"%lld",value);
    s = zmalloc(len+1);
    memcpy(s, buf, len);
    s[len] = '\0';
@@ -112,15 +112,15 @@ int endianconvTest(int argc, char *argv[], int accurate) {
    UNUSED(argv);
    UNUSED(accurate);

-    snprintf(buf,sizeof(buf),"ciaoroma");
+    snprintf(buf,32,"ciaoroma");
    memrev16(buf);
    printf("%s\n", buf);

-    snprintf(buf,sizeof(buf),"ciaoroma");
+    snprintf(buf,32,"ciaoroma");
    memrev32(buf);
    printf("%s\n", buf);

-    snprintf(buf,sizeof(buf),"ciaoroma");
+    snprintf(buf,32,"ciaoroma");
    memrev64(buf);
    printf("%s\n", buf);

@@ -904,7 +904,7 @@ int main(int argc, const char **argv) {

    while (self_threads < config.max_threads) {
        for (int i = 0; i < config.numclients; i++) {
-            snprintf(command, sizeof(command), "SET %d %s\r\n", self_threads * config.numclients + i, set_value);
+            snprintf(command, 63, "SET %d %s\r\n", self_threads * config.numclients + i, set_value);
            createClient(command, strlen(command), NULL,self_threads);
        }

@@ -51,9 +51,8 @@ int TimerCommand_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int

    for (int j = 0; j < 10; j++) {
        int delay = rand() % 5000;
-        int bufsize = 256;
-        char *buf = RedisModule_Alloc(bufsize);
-        snprintf(buf,bufsize,"After %d", delay);
+        char *buf = RedisModule_Alloc(256);
+        snprintf(buf,256,"After %d", delay);
        RedisModuleTimerID tid = RedisModule_CreateTimer(ctx,delay,timerHandler,buf);
        REDISMODULE_NOT_USED(tid);
    }
@@ -145,7 +145,7 @@ client *createClient(connection *conn, int iel) {
    client_id = g_pserver->next_client_id.fetch_add(1);
    c->iel = iel;
    c->id = client_id;
-    snprintf(c->lock.szName, sizeof(c->lock.szName), "client %" PRIu64, client_id);
+    snprintf(c->lock.szName, 56, "client %" PRIu64, client_id);
    c->resp = 2;
    c->conn = conn;
    c->name = NULL;
@@ -777,11 +777,11 @@ void setDeferredAggregateLen(client *c, void *node, long length, char prefix) {
         * we return NULL in addReplyDeferredLen() */
        if (node == NULL) return;
        char lenstr[128];
-        size_t lenstr_len = snprintf(lenstr, sizeof(lenstr), "%c%ld\r\n", prefix, length);
+        size_t lenstr_len = snprintf(lenstr, 128, "%c%ld\r\n", prefix, length);
        setDeferredReply(c, node, lenstr, lenstr_len);
    } else {
        char lenstr[128];
-        int lenstr_len = snprintf(lenstr, sizeof(lenstr), "%c%ld\r\n", prefix, length);
+        int lenstr_len = snprintf(lenstr, 128, "%c%ld\r\n", prefix, length);

        size_t idxSplice = (size_t)node;
        serverAssert(idxSplice <= c->replyAsync->used);
@@ -2595,7 +2595,9 @@ void parseClientCommandBuffer(client *c) {
            (g_pserver->m_pstorageFactory || aeLockContested(cserver.cthreads/2) || cserver.cthreads == 1) && !GlobalLocksAcquired()) {
            auto &query = c->vecqueuedcmd.back();
            if (query.argc > 0 && query.argc == query.argcMax) {
-                c->db->prefetchKeysAsync(c, query);
+                if (c->db->prefetchKeysAsync(c, query, c->vecqueuedcmd.size() == 1)) {
+                    c->vecqueuedcmd.erase(c->vecqueuedcmd.begin());
+                }
            }
        }
        c->reqtype = 0;
@@ -1163,7 +1163,7 @@ int rdbSaveKeyValuePair(rio *rdb, robj_roptr key, robj_roptr val, const expireEn

    char szT[32];
    if (g_pserver->fActiveReplica) {
-        snprintf(szT, sizeof(szT), "%" PRIu64, mvccFromObj(val));
+        snprintf(szT, 32, "%" PRIu64, mvccFromObj(val));
        if (rdbSaveAuxFieldStrStr(rdb,"mvcc-tstamp", szT) == -1) return -1;
    }

@@ -1190,7 +1190,7 @@ int rdbSaveKeyValuePair(rio *rdb, robj_roptr key, robj_roptr val, const expireEn
        {
            if (itr.subkey() == nullptr)
                continue;   // already saved
-            snprintf(szT, sizeof(szT), "%lld", itr.when());
+            snprintf(szT, 32, "%lld", itr.when());
            rdbSaveAuxFieldStrStr(rdb,"keydb-subexpire-key",itr.subkey());
            rdbSaveAuxFieldStrStr(rdb,"keydb-subexpire-when",szT);
        }
@@ -1490,7 +1490,7 @@ int rdbSaveFile(char *filename, const redisDbPersistentDataSnapshot **rgpdb, rdb
    rio rdb;
    int error = 0;

-    snprintf(tmpfile,sizeof(tmpfile),"temp-%d-%d.rdb", getpid(), g_pserver->rdbThreadVars.tmpfileNum);
+    snprintf(tmpfile,256,"temp-%d-%d.rdb", getpid(), g_pserver->rdbThreadVars.tmpfileNum);
    fp = fopen(tmpfile,"w");
    if (!fp) {
        char *cwdp = getcwd(cwd,MAXPATHLEN);
@@ -1679,15 +1679,17 @@ int rdbSaveBackground(rdbSaveInfo *rsi) {
    pthread_t child;
    long long start;

-    if (hasActiveChildProcessOrBGSave()) return C_ERR;
+    if (hasActiveChildProcess()) return C_ERR;

    g_pserver->dirty_before_bgsave = g_pserver->dirty;
    g_pserver->lastbgsave_try = time(NULL);
    openChildInfoPipe();

    start = ustime();
-    latencyStartMonitor(g_pserver->rdb_save_latency);

+    
+    g_pserver->stat_fork_time = ustime()-start;
+    g_pserver->stat_fork_rate = (double) zmalloc_used_memory() * 1000000 / g_pserver->stat_fork_time / (1024*1024*1024); /* GB per second. */
    if (launchRdbSaveThread(child, rsi) != C_OK) {
        closeChildInfoPipe();
        g_pserver->lastbgsave_status = C_ERR;
@@ -1695,9 +1697,6 @@ int rdbSaveBackground(rdbSaveInfo *rsi) {
            strerror(errno));
        return C_ERR;
    }
-
-    g_pserver->stat_fork_time = ustime()-start;
-    g_pserver->stat_fork_rate = (double) zmalloc_used_memory() * 1000000 / g_pserver->stat_fork_time / (1024*1024*1024); /* GB per second. */
    latencyAddSampleIfNeeded("fork",g_pserver->stat_fork_time/1000);
    serverLog(LL_NOTICE,"Background saving started");
    g_pserver->rdb_save_time_start = time(NULL);
@@ -3602,8 +3601,6 @@ static void backgroundSaveDoneHandlerDisk(int exitcode, bool fCancelled) {
        g_pserver->dirty = g_pserver->dirty - g_pserver->dirty_before_bgsave;
        g_pserver->lastsave = time(NULL);
        g_pserver->lastbgsave_status = C_OK;
-        latencyEndMonitor(g_pserver->rdb_save_latency);
-        latencyAddSampleIfNeeded("rdb-save",g_pserver->rdb_save_latency);
    } else if (!fCancelled && exitcode != 0) {
        serverLog(LL_WARNING, "Background saving error");
        g_pserver->lastbgsave_status = C_ERR;
@@ -3694,7 +3691,7 @@ void killRDBChild(bool fSynchronous) {
    serverAssert(GlobalLocksAcquired());

    if (cserver.fForkBgSave) {
-        kill(g_pserver->child_pid,SIGUSR1);
+        kill(g_pserver->rdb_child_pid,SIGUSR1);
    } else { 
        g_pserver->rdbThreadVars.fRdbThreadCancel = true;
        if (g_pserver->rdb_child_type == RDB_CHILD_TYPE_SOCKET) {
@@ -3785,7 +3782,7 @@ int rdbSaveToSlavesSockets(rdbSaveInfo *rsi) {
    int pipefds[2];
    rdbSaveSocketThreadArgs *args = nullptr;

-    if (hasActiveChildProcessOrBGSave()) return C_ERR;
+    if (hasActiveChildProcess()) return C_ERR;

    /* Even if the previous fork child exited, don't start a new one until we
     * drained the pipe. */
@@ -8,7 +8,6 @@ class readWriteLock {
    int m_readCount = 0;
    int m_writeCount = 0;
    bool m_writeWaiting = false;
-    bool m_notify = true;
 public:
    readWriteLock(const char *name) : m_readLock(name), m_writeLock(name) {}

@@ -66,8 +65,7 @@ public:
    void releaseRead() {
        std::unique_lock<fastlock> rm(m_readLock);
        m_readCount--;
-        if (m_notify)
-            m_cv.notify_all();
+        m_cv.notify_all();
    }

    void releaseWrite(bool exclusive = true) {
@@ -76,8 +74,7 @@ public:
        if (exclusive)
            m_writeLock.unlock();
        m_writeCount--;
-        if (m_notify)
-            m_cv.notify_all();
+        m_cv.notify_all();
    }

    void downgradeWrite(bool exclusive = true) {
@@ -85,10 +82,6 @@ public:
        acquireRead();
    }

-    void setNotify(bool notify) {
-        m_notify = notify;
-    }
-
    bool hasReader() {
        return m_readCount > 0;
    }
@@ -3293,8 +3293,8 @@ static redisReply *clusterManagerMigrateKeysInReply(clusterManagerNode *source,
    argv_len = zcalloc(argc * sizeof(size_t), MALLOC_LOCAL);
    char portstr[255];
    char timeoutstr[255];
-    snprintf(portstr, sizeof(portstr), "%d", target->port);
-    snprintf(timeoutstr, sizeof(timeoutstr), "%d", timeout);
+    snprintf(portstr, 10, "%d", target->port);
+    snprintf(timeoutstr, 10, "%d", timeout);
    argv[0] = "MIGRATE";
    argv_len[0] = 7;
    argv[1] = target->ip;
@@ -6825,7 +6825,7 @@ static long getLongInfoField(char *info, char *field) {

 /* Convert number of bytes into a human readable string of the form:
 * 100B, 2G, 100M, 4K, and so forth. */
-void bytesToHuman(char *s, long long n, size_t bufsize) {
+void bytesToHuman(char *s, long long n) {
    double d;

    if (n < 0) {
@@ -6835,17 +6835,17 @@ void bytesToHuman(char *s, long long n, size_t bufsize) {
    }
    if (n < 1024) {
        /* Bytes */
-        snprintf(s,bufsize,"%lldB",n);
+        snprintf(s,256,"%lldB",n);
        return;
    } else if (n < (1024*1024)) {
        d = (double)n/(1024);
-        snprintf(s,bufsize,"%.2fK",d);
+        snprintf(s,256,"%.2fK",d);
    } else if (n < (1024LL*1024*1024)) {
        d = (double)n/(1024*1024);
-        snprintf(s,bufsize,"%.2fM",d);
+        snprintf(s,256,"%.2fM",d);
    } else if (n < (1024LL*1024*1024*1024)) {
        d = (double)n/(1024LL*1024*1024);
-        snprintf(s,bufsize,"%.2fG",d);
+        snprintf(s,256,"%.2fG",d);
    }
 }

@@ -6875,38 +6875,38 @@ static void statMode(void) {
        for (j = 0; j < 20; j++) {
            long k;

-            snprintf(buf,sizeof(buf),"db%d:keys",j);
+            snprintf(buf,64,"db%d:keys",j);
            k = getLongInfoField(reply->str,buf);
            if (k == LONG_MIN) continue;
            aux += k;
        }
-        snprintf(buf,sizeof(buf),"%ld",aux);
+        snprintf(buf,64,"%ld",aux);
        printf("%-11s",buf);

        /* Used memory */
        aux = getLongInfoField(reply->str,"used_memory");
-        bytesToHuman(buf,aux,sizeof(buf));
+        bytesToHuman(buf,aux);
        printf("%-8s",buf);

        /* Clients */
        aux = getLongInfoField(reply->str,"connected_clients");
-        snprintf(buf,sizeof(buf),"%ld",aux);
+        snprintf(buf,64,"%ld",aux);
        printf(" %-8s",buf);

        /* Blocked (BLPOPPING) Clients */
        aux = getLongInfoField(reply->str,"blocked_clients");
-        snprintf(buf,sizeof(buf),"%ld",aux);
+        snprintf(buf,64,"%ld",aux);
        printf("%-8s",buf);

        /* Requests */
        aux = getLongInfoField(reply->str,"total_commands_processed");
-        snprintf(buf,sizeof(buf),"%ld (+%ld)",aux,requests == 0 ? 0 : aux-requests);
+        snprintf(buf,64,"%ld (+%ld)",aux,requests == 0 ? 0 : aux-requests);
        printf("%-19s",buf);
        requests = aux;

        /* Connections */
        aux = getLongInfoField(reply->str,"total_connections_received");
-        snprintf(buf,sizeof(buf),"%ld",aux);
+        snprintf(buf,64,"%ld",aux);
        printf(" %-12s",buf);

        /* Children */
@@ -326,7 +326,6 @@ static const RedisModuleEvent
 #define REDISMODULE_SUBEVENT_LOADING_ENDED 3
 #define REDISMODULE_SUBEVENT_LOADING_FAILED 4
 #define _REDISMODULE_SUBEVENT_LOADING_NEXT 5
-#define REDISMODULE_SUBEVENT_LOADING_FLASH_START 6

 #define REDISMODULE_SUBEVENT_CLIENT_CHANGE_CONNECTED 0
 #define REDISMODULE_SUBEVENT_CLIENT_CHANGE_DISCONNECTED 1
@@ -1538,7 +1538,7 @@ void syncCommand(client *c) {
        } else {
            /* We don't have a BGSAVE in progress, let's start one. Diskless
             * or disk-based mode is determined by replica's capacity. */
-            if (!hasActiveChildProcessOrBGSave()) {
+            if (!hasActiveChildProcess()) {
                startBgsaveForReplication(c->slave_capa);
            } else {
                serverLog(LL_NOTICE,
@@ -3736,7 +3736,7 @@ retry_connect:
        while(maxtries--) {
            auto dt = std::chrono::system_clock::now().time_since_epoch();
            auto dtMillisecond = std::chrono::duration_cast<std::chrono::milliseconds>(dt);
-            snprintf(tmpfile,sizeof(tmpfile),
+            snprintf(tmpfile,256,
                "temp-%d.%ld.rdb",(int)dtMillisecond.count(),(long int)getpid());
            dfd = open(tmpfile,O_CREAT|O_WRONLY|O_EXCL,0644);
            if (dfd != -1) break;
@@ -4984,7 +4984,7 @@ void replicationStartPendingFork(void) {
     * In case of diskless replication, we make sure to wait the specified
     * number of seconds (according to configuration) so that other slaves
     * have the time to arrive before we start streaming. */
-    if (!hasActiveChildProcessOrBGSave()) {
+    if (!hasActiveChildProcess()) {
        time_t idle, max_idle = 0;
        int slaves_waiting = 0;
        int mincapa = -1;
@@ -27,7 +27,6 @@ namespace keydbutils
    template<>
    size_t hash(const sdsview &);
 }
-extern size_t g_semiOrderedSetTargetBucketSize;

 template<typename T, typename T_KEY = T, bool MEMMOVE_SAFE = false>
 class semiorderedset
@@ -42,14 +41,11 @@ class semiorderedset
    size_t idxRehash = (1ULL << bits_min); 
    int cfPauseRehash = 0;

-    inline size_t targetElementsPerBucket()
+    constexpr size_t targetElementsPerBucket()
    {
        // Aim for roughly 4 cache lines per bucket (determined by imperical testing)
        //  lower values are faster but use more memory
-        if (g_semiOrderedSetTargetBucketSize == 0)
-            return std::max((64/sizeof(T))*8, (size_t)2);
-        else
-            return g_semiOrderedSetTargetBucketSize;
+        return std::max((64/sizeof(T))*8, (size_t)2);
    }

 public:
@@ -1706,7 +1706,7 @@ int redisDbPersistentData::incrementallyRehash() {
 * for dict.c to resize the hash tables accordingly to the fact we have an
 * active fork child running. */
 void updateDictResizePolicy(void) {
-    if (!hasActiveChildProcess())
+    if (!hasActiveChildProcess() || (g_pserver->FRdbSaveInProgress() && !cserver.fForkBgSave))
        dictEnableResize();
    else
        dictDisableResize();
@@ -1725,11 +1725,7 @@ const char *strChildType(int type) {
 /* Return true if there are active children processes doing RDB saving,
 * AOF rewriting, or some side process spawned by a loaded module. */
 int hasActiveChildProcess() {
-    return g_pserver->child_pid != -1;
-}
-
-int hasActiveChildProcessOrBGSave() {
-    return g_pserver->FRdbSaveInProgress() || hasActiveChildProcess();
+    return g_pserver->FRdbSaveInProgress() || g_pserver->child_pid != -1;
 }

 void resetChildState() {
@@ -2078,7 +2074,7 @@ void databasesCron(bool fMainThread) {
    /* Perform hash tables rehashing if needed, but only if there are no
     * other processes saving the DB on disk. Otherwise rehashing is bad
     * as will cause a lot of copy-on-write of memory pages. */
-    if (!hasActiveChildProcess()) {
+    if (!hasActiveChildProcess() || g_pserver->FRdbSaveInProgress()) {
        /* We use global counters so if we stop the computation at a given
         * DB we'll be able to start from the successive in the next
         * cron loop iteration. */
@@ -2472,14 +2468,14 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {

    /* Start a scheduled AOF rewrite if this was requested by the user while
     * a BGSAVE was in progress. */
-    if (!hasActiveChildProcessOrBGSave() &&
+    if (!hasActiveChildProcess() &&
        g_pserver->aof_rewrite_scheduled)
    {
        rewriteAppendOnlyFileBackground();
    }

    /* Check if a background saving or AOF rewrite in progress terminated. */
-    if (hasActiveChildProcessOrBGSave() || ldbPendingChildren())
+    if (hasActiveChildProcess() || ldbPendingChildren())
    {
        run_with_period(1000) receiveChildInfo();
        checkChildrenDone();
@@ -2521,7 +2517,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {

        /* Trigger an AOF rewrite if needed. */
        if (g_pserver->aof_state == AOF_ON &&
-            !hasActiveChildProcessOrBGSave() &&
+            !hasActiveChildProcess() &&
            g_pserver->aof_rewrite_perc &&
            g_pserver->aof_current_size > g_pserver->aof_rewrite_min_size)
        {
@@ -2605,7 +2601,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
     * Note: this code must be after the replicationCron() call above so
     * make sure when refactoring this file to keep this order. This is useful
     * because we want to give priority to RDB savings for replication. */
-    if (!hasActiveChildProcessOrBGSave() &&
+    if (!hasActiveChildProcess() &&
        g_pserver->rdb_bgsave_scheduled &&
        (g_pserver->unixtime-g_pserver->lastbgsave_try > CONFIG_BGSAVE_RETRY_DELAY ||
         g_pserver->lastbgsave_status == C_OK))
@@ -2819,6 +2815,9 @@ void beforeSleep(struct aeEventLoop *eventLoop) {

    runAndPropogateToReplicas(processClients);

+    /* Handle precise timeouts of blocked clients. */
+    handleBlockedClientsTimeout();
+
    /* Just call a subset of vital functions in case we are re-entering
     * the event loop from processEventsWhileBlocked(). Note that in this
     * case we keep track of the number of events we are processing, since
@@ -4068,6 +4067,12 @@ void initServer(void) {
        }
    }

+    /* We have to initialize storage providers after the cluster has been initialized */
+    for (int idb = 0; idb < cserver.dbnum; ++idb)
+    {
+        g_pserver->db[idb]->storageProviderInitialize();
+    }
+
    saveMasterStatusToStorage(false); // eliminate the repl-offset field
    
    /* Initialize ACL default password if it exists */
@@ -4080,15 +4085,6 @@ void initServer(void) {
 * Thread Local Storage initialization collides with dlopen call.
 * see: https://sourceware.org/bugzilla/show_bug.cgi?id=19329 */
 void InitServerLast() {
-
-    /* We have to initialize storage providers after the cluster has been initialized */
-    moduleFireServerEvent(REDISMODULE_EVENT_LOADING, REDISMODULE_SUBEVENT_LOADING_FLASH_START, NULL);
-    for (int idb = 0; idb < cserver.dbnum; ++idb)
-    {
-        g_pserver->db[idb]->storageProviderInitialize();
-    }
-    moduleFireServerEvent(REDISMODULE_EVENT_LOADING, REDISMODULE_SUBEVENT_LOADING_ENDED, NULL);
-
    bioInit();
    set_jemalloc_bg_thread(cserver.jemalloc_bg_thread);
    g_pserver->initial_memory_usage = zmalloc_used_memory();
@@ -5471,30 +5467,30 @@ NULL

 /* Convert an amount of bytes into a human readable string in the form
 * of 100B, 2G, 100M, 4K, and so forth. */
-void bytesToHuman(char *s, unsigned long long n, size_t bufsize) {
+void bytesToHuman(char *s, unsigned long long n) {
    double d;

    if (n < 1024) {
        /* Bytes */
-        snprintf(s,bufsize,"%lluB",n);
+        snprintf(s,256,"%lluB",n);
    } else if (n < (1024*1024)) {
        d = (double)n/(1024);
-        snprintf(s,bufsize,"%.2fK",d);
+        snprintf(s,256,"%.2fK",d);
    } else if (n < (1024LL*1024*1024)) {
        d = (double)n/(1024*1024);
-        snprintf(s,bufsize,"%.2fM",d);
+        snprintf(s,256,"%.2fM",d);
    } else if (n < (1024LL*1024*1024*1024)) {
        d = (double)n/(1024LL*1024*1024);
-        snprintf(s,bufsize,"%.2fG",d);
+        snprintf(s,256,"%.2fG",d);
    } else if (n < (1024LL*1024*1024*1024*1024)) {
        d = (double)n/(1024LL*1024*1024*1024);
-        snprintf(s,bufsize,"%.2fT",d);
+        snprintf(s,256,"%.2fT",d);
    } else if (n < (1024LL*1024*1024*1024*1024*1024)) {
        d = (double)n/(1024LL*1024*1024*1024*1024);
-        snprintf(s,bufsize,"%.2fP",d);
+        snprintf(s,256,"%.2fP",d);
    } else {
        /* Let's hope we never need this */
-        snprintf(s,bufsize,"%lluB",n);
+        snprintf(s,256,"%lluB",n);
    }
 }

@@ -5670,13 +5666,13 @@ sds genRedisInfoString(const char *section) {
        if (zmalloc_used > g_pserver->stat_peak_memory)
            g_pserver->stat_peak_memory = zmalloc_used;

-        bytesToHuman(hmem,zmalloc_used,sizeof(hmem));
-        bytesToHuman(peak_hmem,g_pserver->stat_peak_memory,sizeof(peak_hmem));
-        bytesToHuman(total_system_hmem,total_system_mem,sizeof(total_system_hmem));
-        bytesToHuman(used_memory_lua_hmem,memory_lua,sizeof(used_memory_lua_hmem));
-        bytesToHuman(used_memory_scripts_hmem,mh->lua_caches,sizeof(used_memory_scripts_hmem));
-        bytesToHuman(used_memory_rss_hmem,g_pserver->cron_malloc_stats.process_rss,sizeof(used_memory_rss_hmem));
-        bytesToHuman(maxmemory_hmem,g_pserver->maxmemory,sizeof(maxmemory_hmem));
+        bytesToHuman(hmem,zmalloc_used);
+        bytesToHuman(peak_hmem,g_pserver->stat_peak_memory);
+        bytesToHuman(total_system_hmem,total_system_mem);
+        bytesToHuman(used_memory_lua_hmem,memory_lua);
+        bytesToHuman(used_memory_scripts_hmem,mh->lua_caches);
+        bytesToHuman(used_memory_rss_hmem,g_pserver->cron_malloc_stats.process_rss);
+        bytesToHuman(maxmemory_hmem,g_pserver->maxmemory);

        if (sections++) info = sdscat(info,"\r\n");
        info = sdscatprintf(info,
@@ -6563,8 +6559,7 @@ void usage(void) {

 void redisAsciiArt(void) {
 #include "asciilogo.h"
-    size_t bufsize = 1024*16;
-    char *buf = (char*)zmalloc(bufsize, MALLOC_LOCAL);
+    char *buf = (char*)zmalloc(1024*16, MALLOC_LOCAL);
    const char *mode;

    if (g_pserver->cluster_enabled) mode = "cluster";
@@ -6586,7 +6581,7 @@ void redisAsciiArt(void) {
        );
    } else {
        sds motd = fetchMOTD(true, cserver.enable_motd);
-        snprintf(buf,bufsize,ascii_logo,
+        snprintf(buf,1024*16,ascii_logo,
            KEYDB_REAL_VERSION,
            redisGitSHA1(),
            strtol(redisGitDirty(),NULL,10) > 0,
@@ -6889,7 +6884,6 @@ int redisFork(int purpose) {
    latencyAddSampleIfNeeded("fork-lock",(ustime()-startWriteLock)/1000);
    if ((childpid = fork()) == 0) {
        /* Child */
-        aeForkLockInChild();
        aeReleaseForkLock();
        g_pserver->in_fork_child = purpose;
        setOOMScoreAdj(CONFIG_OOM_BGCHILD);
@@ -7572,29 +7566,6 @@ int main(int argc, char **argv) {

    validateConfiguration();

-    if (!g_pserver->sentinel_mode) {
-    #ifdef __linux__
-        linuxMemoryWarnings();
-    #if defined (__arm64__)
-        int ret;
-        if ((ret = linuxMadvFreeForkBugCheck())) {
-            if (ret == 1)
-                serverLog(LL_WARNING,"WARNING Your kernel has a bug that could lead to data corruption during background save. "
-                                        "Please upgrade to the latest stable kernel.");
-            else
-                serverLog(LL_WARNING, "Failed to test the kernel for a bug that could lead to data corruption during background save. "
-                                        "Your system could be affected, please report this error.");
-            if (!checkIgnoreWarning("ARM64-COW-BUG")) {
-                serverLog(LL_WARNING,"KeyDB will now exit to prevent data corruption. "
-                                        "Note that it is possible to suppress this warning by setting the following config: ignore-warnings ARM64-COW-BUG");
-                exit(1);
-            }
-        }
-    #endif /* __arm64__ */
-    #endif /* __linux__ */
-    }
-
-
    const char *err;
    if (!initializeStorageProvider(&err))
    {
@@ -7620,6 +7591,25 @@ int main(int argc, char **argv) {
    if (!g_pserver->sentinel_mode) {
        /* Things not needed when running in Sentinel mode. */
        serverLog(LL_WARNING,"Server initialized");
+    #ifdef __linux__
+        linuxMemoryWarnings();
+    #if defined (__arm64__)
+        int ret;
+        if ((ret = linuxMadvFreeForkBugCheck())) {
+            if (ret == 1)
+                serverLog(LL_WARNING,"WARNING Your kernel has a bug that could lead to data corruption during background save. "
+                                     "Please upgrade to the latest stable kernel.");
+            else
+                serverLog(LL_WARNING, "Failed to test the kernel for a bug that could lead to data corruption during background save. "
+                                      "Your system could be affected, please report this error.");
+            if (!checkIgnoreWarning("ARM64-COW-BUG")) {
+                serverLog(LL_WARNING,"KeyDB will now exit to prevent data corruption. "
+                                     "Note that it is possible to suppress this warning by setting the following config: ignore-warnings ARM64-COW-BUG");
+                exit(1);
+            }
+        }
+    #endif /* __arm64__ */
+    #endif /* __linux__ */
        moduleInitModulesSystemLast();
        moduleLoadFromQueue();
        ACLLoadUsersAtStartup();
@@ -1204,7 +1204,7 @@ public:
    void disableKeyCache();
    bool keycacheIsEnabled();

-    void prefetchKeysAsync(client *c, struct parsed_command &command);
+    bool prefetchKeysAsync(client *c, struct parsed_command &command, bool fExecOK);

    bool FSnapshot() const { return m_spdbSnapshotHOLDER != nullptr; }

@@ -2470,8 +2470,7 @@ struct redisServer {
    time_t lastbgsave_try;          /* Unix time of last attempted bgsave */
    time_t rdb_save_time_last;      /* Time used by last RDB save run. */
    time_t rdb_save_time_start;     /* Current RDB save start time. */
-    mstime_t rdb_save_latency;      /* Used to track end to end latency of rdb save*/
-    pid_t rdb_child_pid = -1;       /* Used only during fork bgsave */
+    pid_t rdb_child_pid = -1;            /* Used only during fork bgsave */
    int rdb_bgsave_scheduled;       /* BGSAVE when possible if true. */
    int rdb_child_type;             /* Type of save by active child. */
    int lastbgsave_status;          /* C_OK or C_ERR */
@@ -3255,7 +3254,6 @@ void receiveChildInfo(void);
 void executeWithoutGlobalLock(std::function<void()> func);
 int redisFork(int type);
 int hasActiveChildProcess();
-int hasActiveChildProcessOrBGSave();
 void resetChildState();
 int isMutuallyExclusiveChildType(int type);

@@ -100,14 +100,14 @@ bool RocksDBStorageProvider::erase(const char *key, size_t cchKey)
 {
    rocksdb::Status status;
    std::unique_lock<fastlock> l(m_lock);
-    if (!FKeyExists(key, cchKey))
-        return false;
    if (m_spbatch != nullptr)
    {
        status = m_spbatch->Delete(m_spcolfamily.get(), rocksdb::Slice(key, cchKey));
    }
    else
    {
+        if (!FKeyExists(key, cchKey))
+            return false;
        status = m_spdb->Delete(WriteOptions(), m_spcolfamily.get(), rocksdb::Slice(key, cchKey));
    }
    if (status.ok())
@@ -202,12 +202,12 @@ rocksdb::WriteOptions RocksDBStorageProvider::WriteOptions() const
 void RocksDBStorageProvider::beginWriteBatch()
 {
    m_lock.lock();
-    m_spbatch = std::make_unique<rocksdb::WriteBatchWithIndex>();
+    m_spbatch = std::make_unique<rocksdb::WriteBatch>();
 }

 void RocksDBStorageProvider::endWriteBatch()
 {
-    m_spdb->Write(WriteOptions(), m_spbatch.get()->GetWriteBatch());
+    m_spdb->Write(WriteOptions(), m_spbatch.get());
    m_spbatch = nullptr;
    m_lock.unlock();
 }
@@ -230,7 +230,5 @@ void RocksDBStorageProvider::flush()
 bool RocksDBStorageProvider::FKeyExists(const char *key, size_t cch) const
 {
    rocksdb::PinnableSlice slice;
-    if (m_spbatch)
-        return m_spbatch->GetFromBatchAndDB(m_spdb.get(), ReadOptions(), m_spcolfamily.get(), rocksdb::Slice(key, cch), &slice).ok();
    return m_spdb->Get(ReadOptions(), m_spcolfamily.get(), rocksdb::Slice(key, cch), &slice).ok();
 }
@@ -3,7 +3,6 @@
 #include <memory>
 #include "../IStorage.h"
 #include <rocksdb/db.h>
-#include <rocksdb/utilities/write_batch_with_index.h>
 #include "../fastlock.h"

 #define INTERNAL_KEY_PREFIX "\x00\x04\x03\x00\x05\x02\x04"
@@ -16,7 +15,7 @@ class RocksDBStorageProvider : public IStorage
 {
    RocksDBStorageFactory *m_pfactory;
    std::shared_ptr<rocksdb::DB> m_spdb;    // Note: This must be first so it is deleted last
-    std::unique_ptr<rocksdb::WriteBatchWithIndex> m_spbatch;
+    std::unique_ptr<rocksdb::WriteBatch> m_spbatch;
    const rocksdb::Snapshot *m_psnapshot = nullptr;
    std::shared_ptr<rocksdb::ColumnFamilyHandle> m_spcolfamily;
    rocksdb::ReadOptions m_readOptionsTemplate;
@@ -616,9 +616,8 @@ bool tlsValidateCertificateName(tls_connection* conn){
    /* If neither the CN nor the SANs match, update the SSL error and return false */
    conn->c.last_errno = 0;
    if (conn->ssl_error) zfree(conn->ssl_error);
-    size_t bufsize = 512;
-    conn->ssl_error = (char*)zmalloc(bufsize);
-    snprintf(conn->ssl_error, bufsize, "Client CN (%s) and SANs not found in allowlist.", commonName);
+    conn->ssl_error = (char*)zmalloc(512);
+    snprintf(conn->ssl_error, 512, "Client CN (%s) and SANs not found in allowlist.", commonName);
    return false;
 }

@@ -1704,17 +1704,17 @@ static unsigned char *createIntList() {
    unsigned char *zl = ziplistNew();
    char buf[32];

-    snprintf(buf, sizeof(buf), "100");
+    snprintf(buf, 32, "100");
    zl = ziplistPush(zl, (unsigned char*)buf, strlen(buf), ZIPLIST_TAIL);
-    snprintf(buf, sizeof(buf), "128000");
+    snprintf(buf, 32, "128000");
    zl = ziplistPush(zl, (unsigned char*)buf, strlen(buf), ZIPLIST_TAIL);
-    snprintf(buf, sizeof(buf), "-100");
+    snprintf(buf, 32, "-100");
    zl = ziplistPush(zl, (unsigned char*)buf, strlen(buf), ZIPLIST_HEAD);
-    snprintf(buf, sizeof(buf), "4294967296");
+    snprintf(buf, 32, "4294967296");
    zl = ziplistPush(zl, (unsigned char*)buf, strlen(buf), ZIPLIST_HEAD);
-    snprintf(buf, sizeof(buf), "non integer");
+    snprintf(buf, 32, "non integer");
    zl = ziplistPush(zl, (unsigned char*)buf, strlen(buf), ZIPLIST_TAIL);
-    snprintf(buf, sizeof(buf), "much much longer non integer");
+    snprintf(buf, 32, "much much longer non integer");
    zl = ziplistPush(zl, (unsigned char*)buf, strlen(buf), ZIPLIST_TAIL);
    return zl;
 }
@@ -2228,7 +2228,7 @@ int ziplistTest(int argc, char **argv, int accurate) {
        char buf[32];
        int i,len;
        for (i = 0; i < 1000; i++) {
-            len = snprintf(buf,sizeof(buf),"%d",i);
+            len = snprintf(buf,32,"%d",i);
            zl = ziplistPush(zl,(unsigned char*)buf,len,ZIPLIST_TAIL);
        }
        for (i = 0; i < 1000; i++) {
@@ -2375,13 +2375,13 @@ int ziplistTest(int argc, char **argv, int accurate) {
                } else {
                    switch(rand() % 3) {
                    case 0:
-                        buflen = snprintf(buf,sizeof(buf),"%lld",(0LL + rand()) >> 20);
+                        buflen = snprintf(buf,1024,"%lld",(0LL + rand()) >> 20);
                        break;
                    case 1:
-                        buflen = snprintf(buf,sizeof(buf),"%lld",(0LL + rand()));
+                        buflen = snprintf(buf,1024,"%lld",(0LL + rand()));
                        break;
                    case 2:
-                        buflen = snprintf(buf,sizeof(buf),"%lld",(0LL + rand()) << 20);
+                        buflen = snprintf(buf,1024,"%lld",(0LL + rand()) << 20);
                        break;
                    default:
                        assert(NULL);
@@ -2410,7 +2410,7 @@ int ziplistTest(int argc, char **argv, int accurate) {

                assert(ziplistGet(p,&sstr,&slen,&sval));
                if (sstr == NULL) {
-                    buflen = snprintf(buf,sizeof(buf),"%lld",sval);
+                    buflen = snprintf(buf,1024,"%lld",sval);
                } else {
                    buflen = slen;
                    memcpy(buf,sstr,buflen);
@@ -370,7 +370,7 @@ size_t zmalloc_get_rss(void) {
    int fd, count;
    char *p, *x;

-    snprintf(filename,sizeof(filename),"/proc/%ld/stat",(long) getpid());
+    snprintf(filename,256,"/proc/%ld/stat",(long) getpid());
    if ((fd = open(filename,O_RDONLY)) == -1) return 0;
    if (read(fd,buf,4096) <= 0) {
        close(fd);
@@ -462,7 +462,7 @@ size_t zmalloc_get_rss(void) {
    char filename[256];
    int fd;

-    snprintf(filename,sizeof(filename),"/proc/%ld/psinfo",(long) getpid());
+    snprintf(filename,256,"/proc/%ld/psinfo",(long) getpid());

    if ((fd = open(filename,O_RDONLY)) == -1) return 0;
    if (ioctl(fd, PIOCPSINFO, &info) == -1) {
@@ -521,7 +521,7 @@ int jemalloc_purge() {
    unsigned narenas = 0;
    size_t sz = sizeof(unsigned);
    if (!je_mallctl("arenas.narenas", &narenas, &sz, NULL, 0)) {
-        snprintf(tmp, sizeof(tmp), "arena.%d.purge", narenas);
+        snprintf(tmp, 32, "arena.%d.purge", narenas);
        if (!je_mallctl(tmp, NULL, 0, NULL, 0))
            return 0;
    }
@@ -39,8 +39,7 @@ TEST_MODULES = \
    defragtest.so \
    hash.so \
    zset.so \
-    stream.so \
-    load.so
+    stream.so


 .PHONY: all
@@ -212,7 +212,6 @@ void loadingCallback(RedisModuleCtx *ctx, RedisModuleEvent e, uint64_t sub, void
        case REDISMODULE_SUBEVENT_LOADING_RDB_START: keyname = "loading-rdb-start"; break;
        case REDISMODULE_SUBEVENT_LOADING_AOF_START: keyname = "loading-aof-start"; break;
        case REDISMODULE_SUBEVENT_LOADING_REPL_START: keyname = "loading-repl-start"; break;
-        case REDISMODULE_SUBEVENT_LOADING_FLASH_START: keyname = "loading-flash-start"; break;
        case REDISMODULE_SUBEVENT_LOADING_ENDED: keyname = "loading-end"; break;
        case REDISMODULE_SUBEVENT_LOADING_FAILED: keyname = "loading-failed"; break;
    }
@@ -1,94 +0,0 @@
-/* Server hooks API example
- *
- * -----------------------------------------------------------------------------
- *
- * Copyright (c) 2019, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#define REDISMODULE_EXPERIMENTAL_API
-#include "redismodule.h"
-
-size_t count, finalCount;
-
-/* Client state change callback. */
-void loadCallback(RedisModuleCtx *ctx, RedisModuleEvent e, uint64_t sub, void *data) {
-    REDISMODULE_NOT_USED(ctx);
-    REDISMODULE_NOT_USED(e);
-    REDISMODULE_NOT_USED(data);
-
-    if (sub == REDISMODULE_SUBEVENT_LOADING_FLASH_START || sub == REDISMODULE_SUBEVENT_LOADING_RDB_START || sub == REDISMODULE_SUBEVENT_LOADING_AOF_START || sub == REDISMODULE_SUBEVENT_LOADING_REPL_START) {
-        count = 0;
-        finalCount = 0;
-    } else if (sub == REDISMODULE_SUBEVENT_LOADING_ENDED) {
-        finalCount = count;
-    }
-}
-
-int loadKeyCallback(RedisModuleCtx *ctx, int type,  const char *event, RedisModuleString *key) {
-    REDISMODULE_NOT_USED(ctx);
-    REDISMODULE_NOT_USED(type);
-    REDISMODULE_NOT_USED(event);
-
-    const char *keyname = RedisModule_StringPtrLen(key, NULL);
-
-    RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_NOTICE, "Loaded key: %s", keyname);
-
-    count++;
-    return 0;
-}
-
-int LoadCount_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
-    REDISMODULE_NOT_USED(argv);
-    RedisModule_AutoMemory(ctx); /* Use automatic memory management. */
-
-    if (argc != 1) return RedisModule_WrongArity(ctx);
-
-    RedisModule_ReplyWithLongLong(ctx, finalCount);
-
-    return REDISMODULE_OK;
-}
-
-/* This function must be present on each Redis module. It is used in order to
- * register the commands into the Redis server. */
-int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
-    REDISMODULE_NOT_USED(argv);
-    REDISMODULE_NOT_USED(argc);
-
-    if (RedisModule_Init(ctx,"load",1,REDISMODULE_APIVER_1)
-        == REDISMODULE_ERR) return REDISMODULE_ERR;
-
-    RedisModule_SubscribeToServerEvent(ctx,
-        RedisModuleEvent_Loading, loadCallback);
-    RedisModule_SubscribeToKeyspaceEvents(ctx,
-        REDISMODULE_NOTIFY_LOADED, loadKeyCallback);
-
-    if (RedisModule_CreateCommand(ctx, "load.count",
-        LoadCount_RedisCommand,"readonly",1,1,1) == REDISMODULE_ERR)
-        return REDISMODULE_ERR;
-    return REDISMODULE_OK;
-}
@@ -1,15 +0,0 @@
-set testmodule [file normalize tests/modules/load.so]
-
-if {$::flash_enabled} {
-    start_server [list tags [list "modules"] overrides [list storage-provider {flash ./rocks.db.master} databases 256 loadmodule $testmodule]] {
-        test "Module is notified of keys loaded from flash" {
-            r flushall
-            r set foo bar
-            r set bar foo
-            r set foobar barfoo
-            assert_equal [r load.count] 0
-            r debug reload
-            assert_equal [r load.count] 3
-        }
-    }
-}
@@ -43,10 +43,6 @@ start_server {tags {"scripting"}} {
        r eval {return redis.call('get',KEYS[1])} 1 mykey
    } {myval}

-    test { EVAL - keys command works? } {
-        r eval {return redis.call('keys', 'test')} 0
-    }
-
    test {EVALSHA - Can we call a SHA1 if already defined?} {
        r evalsha fd758d1589d044dd850a6f05d52f2eefd27f033f 1 mykey
    } {myval}
Author	SHA1	Message	Date
Malavan Sotheeswaran	5346ce42af	remove unnecessary +=	2023-01-19 00:52:22 -08:00
Malavan Sotheeswaran	733b4cc445	make librocksdb optional	2023-01-19 00:19:04 -08:00
Malavan Sotheeswaran	af3b69f824	better style	2023-01-19 00:17:37 -08:00
Malavan Sotheeswaran	d9f9e09124	update objects for optional flash	2023-01-19 00:09:03 -08:00
Malavan Sotheeswaran	4568993f9f	only build rocksdb when enabled	2023-01-19 00:03:37 -08:00