Adress PR comments, removing CAN_BE_OFFLOADED flag

uriyage · uriyage · commit 5b258fa7bfed · 2025-06-18T16:19:31.000Z
Signed-off-by: Uri Yagelnik &lt;uriy@amazon.com&gt;
diff --git a/src/commands.def b/src/commands.def
diff --git a/src/commands/get.json b/src/commands/get.json
@@ -8,8 +8,7 @@
         "function": "getCommand",
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "STRING"
diff --git a/src/commands/hexists.json b/src/commands/hexists.json
@@ -8,8 +8,7 @@
         "function": "hexistsCommand",
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "HASH"
diff --git a/src/commands/hget.json b/src/commands/hget.json
@@ -8,8 +8,7 @@
         "function": "hgetCommand",
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "HASH"
diff --git a/src/commands/hgetall.json b/src/commands/hgetall.json
@@ -7,8 +7,7 @@
         "arity": 2,
         "function": "hgetallCommand",
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "HASH"
diff --git a/src/commands/hkeys.json b/src/commands/hkeys.json
@@ -7,8 +7,7 @@
         "arity": 2,
         "function": "hkeysCommand",
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "HASH"
diff --git a/src/commands/hlen.json b/src/commands/hlen.json
@@ -8,8 +8,7 @@
         "function": "hlenCommand",
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "HASH"
diff --git a/src/commands/hmget.json b/src/commands/hmget.json
@@ -8,8 +8,7 @@
         "function": "hmgetCommand",
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "HASH"
diff --git a/src/commands/hrandfield.json b/src/commands/hrandfield.json
@@ -7,8 +7,7 @@
         "arity": -2,
         "function": "hrandfieldCommand",
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "HASH"
diff --git a/src/commands/hscan.json b/src/commands/hscan.json
@@ -7,8 +7,7 @@
         "arity": -3,
         "function": "hscanCommand",
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "HASH"
diff --git a/src/commands/hstrlen.json b/src/commands/hstrlen.json
@@ -8,8 +8,7 @@
         "function": "hstrlenCommand",
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "HASH"
diff --git a/src/commands/hvals.json b/src/commands/hvals.json
@@ -7,8 +7,7 @@
         "arity": 2,
         "function": "hvalsCommand",
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "HASH"
diff --git a/src/commands/lindex.json b/src/commands/lindex.json
@@ -7,8 +7,7 @@
         "arity": 3,
         "function": "lindexCommand",
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "LIST"
diff --git a/src/commands/llen.json b/src/commands/llen.json
@@ -8,8 +8,7 @@
         "function": "llenCommand",
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "LIST"
diff --git a/src/commands/lrange.json b/src/commands/lrange.json
@@ -7,8 +7,7 @@
         "arity": 4,
         "function": "lrangeCommand",
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "LIST"
diff --git a/src/commands/zcard.json b/src/commands/zcard.json
@@ -8,8 +8,7 @@
         "function": "zcardCommand",
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zcount.json b/src/commands/zcount.json
@@ -8,8 +8,7 @@
         "function": "zcountCommand",
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zdiff.json b/src/commands/zdiff.json
@@ -8,8 +8,7 @@
         "function": "zdiffCommand",
         "get_keys_function": "zunionInterDiffGetKeys",
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zinter.json b/src/commands/zinter.json
@@ -8,8 +8,7 @@
         "function": "zinterCommand",
         "get_keys_function": "zunionInterDiffGetKeys",
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zintercard.json b/src/commands/zintercard.json
@@ -8,8 +8,7 @@
         "function": "zinterCardCommand",
         "get_keys_function": "zunionInterDiffGetKeys",
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zlexcount.json b/src/commands/zlexcount.json
@@ -8,8 +8,7 @@
         "function": "zlexcountCommand",
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zmscore.json b/src/commands/zmscore.json
@@ -8,8 +8,7 @@
         "function": "zmscoreCommand",
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zrandmember.json b/src/commands/zrandmember.json
@@ -7,8 +7,7 @@
         "arity": -2,
         "function": "zrandmemberCommand",
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zrange.json b/src/commands/zrange.json
@@ -13,8 +13,7 @@
             ]
         ],
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zrangebylex.json b/src/commands/zrangebylex.json
@@ -12,8 +12,7 @@
             "DEPRECATED"
         ],
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zrangebyscore.json b/src/commands/zrangebyscore.json
@@ -18,8 +18,7 @@
             "DEPRECATED"
         ],
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zrank.json b/src/commands/zrank.json
@@ -14,8 +14,7 @@
         ],
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zrevrange.json b/src/commands/zrevrange.json
@@ -12,8 +12,7 @@
             "DEPRECATED"
         ],
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zrevrangebylex.json b/src/commands/zrevrangebylex.json
@@ -12,8 +12,7 @@
             "DEPRECATED"
         ],
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zrevrangebyscore.json b/src/commands/zrevrangebyscore.json
@@ -18,8 +18,7 @@
             "DEPRECATED"
         ],
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zrevrank.json b/src/commands/zrevrank.json
@@ -14,8 +14,7 @@
         ],
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zscan.json b/src/commands/zscan.json
@@ -13,8 +13,7 @@
             ]
         ],
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zscore.json b/src/commands/zscore.json
@@ -8,8 +8,7 @@
         "function": "zscoreCommand",
         "command_flags": [
             "READONLY",
-            "FAST",
-            "CAN_BE_OFFLOADED"
+            "FAST"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/commands/zunion.json b/src/commands/zunion.json
@@ -8,8 +8,7 @@
         "function": "zunionCommand",
         "get_keys_function": "zunionInterDiffGetKeys",
         "command_flags": [
-            "READONLY",
-            "CAN_BE_OFFLOADED"
+            "READONLY"
         ],
         "acl_categories": [
             "SORTEDSET"
diff --git a/src/db.c b/src/db.c
@@ -2012,7 +2012,7 @@ static keyStatus expireIfNeededWithDictIndex(serverDb *db, robj *key, robj *val,
     if (!inMainThread()) {
         postpone_expired_key_ctx ctx = {.dict_index = dict_index, .db = db, .key = key};
         if (!static_key) incrRefCount(key);
-        threadAdddeferredJob(dict_index, handlePostponeExpiredKey, sizeof(ctx), &ctx);
+        threadAddDeferredJob(dict_index, handlePostponeExpiredKey, sizeof(ctx), &ctx);
         return KEY_EXPIRED;
     }
 
diff --git a/src/io_threads.c b/src/io_threads.c
@@ -418,10 +418,10 @@ static int isServerExclusiveCmd(struct serverCommand *cmd, int slot) {
 
 /* Returns if the given command requires exclusive access to the given slot. */
 static int isSlotExclusiveCmd(struct serverCommand *cmd, int slot) {
-    /* No exclusivity required */
-    if (cmd->flags & CMD_CAN_BE_OFFLOADED) return 0;
+    /* No exclusivity required for commands that can be offloaded */
+    if (CMD_CAN_BE_OFFLOADED(cmd)) return 0;
 
-    /* Not slot exclusive rather DB exclusive */
+    /* Not slot exclusive rather server exclusive */
     if (isServerExclusiveCmd(cmd, slot)) return 0;
 
     return 1;
@@ -557,7 +557,7 @@ static void deferServerCron(void *data) {
 }
 
 /* Add a deferred job to the thread-local job list */
-void threadAdddeferredJob(int slot, job_handler handler, size_t data_size, void *data) {
+void threadAddDeferredJob(int slot, job_handler handler, size_t data_size, void *data) {
     /* Allocate memory for job structure plus data using flexible array member */
     listNode *job_node = createJobNode(slot, handler, data_size, data);
     listLinkNodeTail(thread_deferred_jobs, job_node);
@@ -970,7 +970,9 @@ static int isCommandPostpone(client *c) {
 
 /* Check if a command can be offloaded to IO threads.
  * Returns 1 if the command can be offloaded, 0 otherwise. */
-int canCommandBeOffloaded(struct serverCommand *cmd) {
+int canCommandBeOffloaded(int slot, struct serverCommand *cmd) {
+    if (slot == -1) return 0;
+
     if (!server.cluster_enabled) {
         return 0; /* Avoid offloading commands in non cluster mode. */
     }
@@ -988,7 +990,7 @@ int canCommandBeOffloaded(struct serverCommand *cmd) {
         return 0; /* Modules are loaded and module command offloading is disabled. */
     }
 
-    if (!(cmd->flags & CMD_CAN_BE_OFFLOADED)) {
+    if (!CMD_CAN_BE_OFFLOADED(cmd)) {
         return 0;
     }
 
@@ -1000,7 +1002,7 @@ int canCommandBeOffloaded(struct serverCommand *cmd) {
 }
 
 int trySendProcessCommandToIOThreads(client *c) {
-    if (!canCommandBeOffloaded(c->cmd)) {
+    if (!canCommandBeOffloaded(c->slot, c->cmd)) {
         return C_ERR;
     }
 
diff --git a/src/io_threads.h b/src/io_threads.h
diff --git a/src/kvstore.c b/src/kvstore.c
diff --git a/src/lazyfree.c b/src/lazyfree.c
diff --git a/src/memory_prefetch.c b/src/memory_prefetch.c
diff --git a/src/networking.c b/src/networking.c
diff --git a/src/server.c b/src/server.c
diff --git a/src/server.h b/src/server.h
