Remove Expireset (#217)

Major refactor to place expiry information directly in the object struct.
Snapchat · Aug 21, 2023 · ffac552 · ffac552
1 parent 80dcbad
commit ffac552
Show file tree

Hide file tree

Showing 17 changed files with 423 additions and 478 deletions.
diff --git a/src/aof.cpp b/src/aof.cpp
@@ -1592,8 +1592,7 @@ int rewriteAppendOnlyFileRio(rio *aof) {
             }
             /* Save the expire time */
             if (o->FExpires()) {
-                std::unique_lock<fastlock> ul(g_expireLock);
-                expireEntry *pexpire = db->getExpire(&key);
+                expireEntry *pexpire = &o->expire;
                 for (auto &subExpire : *pexpire) {
                     if (subExpire.subkey() == nullptr)
                     {

diff --git a/src/cluster.cpp b/src/cluster.cpp
@@ -5610,7 +5610,6 @@ void migrateCommand(client *c) {
     /* Create RESTORE payload and generate the protocol to call the command. */
     for (j = 0; j < num_keys; j++) {
         long long ttl = 0;
-        std::unique_lock<fastlock> ul(g_expireLock);
         expireEntry *pexpire = c->db->getExpire(kv[j]);
         long long expireat = INVALID_EXPIRE;
         if (pexpire != nullptr)

diff --git a/src/config.cpp b/src/config.cpp
@@ -2908,7 +2908,7 @@ standardConfig configs[] = {
     createIntConfig("list-compress-depth", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, g_pserver->list_compress_depth, 0, INTEGER_CONFIG, NULL, NULL),
     createIntConfig("rdb-key-save-delay", NULL, MODIFIABLE_CONFIG, INT_MIN, INT_MAX, g_pserver->rdb_key_save_delay, 0, INTEGER_CONFIG, NULL, NULL),
     createIntConfig("key-load-delay", NULL, MODIFIABLE_CONFIG, INT_MIN, INT_MAX, g_pserver->key_load_delay, 0, INTEGER_CONFIG, NULL, NULL),
-    createIntConfig("active-expire-effort", NULL, MODIFIABLE_CONFIG, 1, 10, cserver.active_expire_effort, 1, INTEGER_CONFIG, NULL, NULL), /* From 1 to 10. */
+    createIntConfig("active-expire-effort", NULL, MODIFIABLE_CONFIG, 1, 10, g_pserver->active_expire_effort, 1, INTEGER_CONFIG, NULL, NULL), /* From 1 to 10. */
     createIntConfig("hz", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, g_pserver->config_hz, CONFIG_DEFAULT_HZ, INTEGER_CONFIG, NULL, updateHZ),
     createIntConfig("min-replicas-to-write", "min-slaves-to-write", MODIFIABLE_CONFIG, 0, INT_MAX, g_pserver->repl_min_slaves_to_write, 0, INTEGER_CONFIG, NULL, updateGoodSlaves),
     createIntConfig("min-replicas-max-lag", "min-slaves-max-lag", MODIFIABLE_CONFIG, 0, INT_MAX, g_pserver->repl_min_slaves_max_lag, 10, INTEGER_CONFIG, NULL, updateGoodSlaves),