ctripcorp · qiongtubao · Aug 13, 2026 · Jul 30, 2026 · Jul 29, 2026 · Aug 7, 2026
diff --git a/deps/xredis-gtid b/deps/xredis-gtid
diff --git a/src/commands/append.json b/src/commands/append.json
@@ -9,7 +9,8 @@
         "command_flags": [
             "WRITE",
             "DENYOOM",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "STRING"

diff --git a/src/commands/blmove.json b/src/commands/blmove.json
@@ -9,7 +9,8 @@
         "command_flags": [
             "WRITE",
             "DENYOOM",
-            "BLOCKING"
+            "BLOCKING",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "LIST"

diff --git a/src/commands/blmpop.json b/src/commands/blmpop.json
@@ -9,7 +9,8 @@
         "get_keys_function": "blmpopGetKeys",
         "command_flags": [
             "WRITE",
-            "BLOCKING"
+            "BLOCKING",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "LIST"

diff --git a/src/commands/blpop.json b/src/commands/blpop.json
@@ -14,7 +14,8 @@
         ],
         "command_flags": [
             "WRITE",
-            "BLOCKING"
+            "BLOCKING",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "LIST"

diff --git a/src/commands/brpop.json b/src/commands/brpop.json
@@ -14,7 +14,8 @@
         ],
         "command_flags": [
             "WRITE",
-            "BLOCKING"
+            "BLOCKING",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "LIST"

diff --git a/src/commands/brpoplpush.json b/src/commands/brpoplpush.json
@@ -20,7 +20,8 @@
         "command_flags": [
             "WRITE",
             "DENYOOM",
-            "BLOCKING"
+            "BLOCKING",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "LIST"

diff --git a/src/commands/bzmpop.json b/src/commands/bzmpop.json
@@ -9,7 +9,8 @@
         "get_keys_function": "blmpopGetKeys",
         "command_flags": [
             "WRITE",
-            "BLOCKING"
+            "BLOCKING",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "SORTEDSET"

diff --git a/src/commands/bzpopmax.json b/src/commands/bzpopmax.json
@@ -15,7 +15,8 @@
         "command_flags": [
             "WRITE",
             "FAST",
-            "BLOCKING"
+            "BLOCKING",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "SORTEDSET"

diff --git a/src/commands/bzpopmin.json b/src/commands/bzpopmin.json
@@ -15,7 +15,8 @@
         "command_flags": [
             "WRITE",
             "FAST",
-            "BLOCKING"
+            "BLOCKING",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "SORTEDSET"

diff --git a/src/commands/expire.json b/src/commands/expire.json
@@ -14,7 +14,8 @@
         ],
         "command_flags": [
             "WRITE",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "KEYSPACE"

diff --git a/src/commands/expireat.json b/src/commands/expireat.json
@@ -14,7 +14,8 @@
         ],
         "command_flags": [
             "WRITE",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "KEYSPACE"

diff --git a/src/commands/getdel.json b/src/commands/getdel.json
@@ -8,7 +8,8 @@
         "function": "getdelCommand",
         "command_flags": [
             "WRITE",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "STRING"

diff --git a/src/commands/getex.json b/src/commands/getex.json
@@ -8,7 +8,8 @@
         "function": "getexCommand",
         "command_flags": [
             "WRITE",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "STRING"

diff --git a/src/commands/getset.json b/src/commands/getset.json
@@ -14,7 +14,8 @@
         "command_flags": [
             "WRITE",
             "DENYOOM",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "STRING"

diff --git a/src/commands/hexpire.json b/src/commands/hexpire.json
@@ -9,7 +9,8 @@
         "history": [],
         "command_flags": [
             "WRITE",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "HASH"

diff --git a/src/commands/hgetdel.json b/src/commands/hgetdel.json
@@ -9,7 +9,8 @@
         "history": [],
         "command_flags": [
             "WRITE",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "HASH"

diff --git a/src/commands/hgetex.json b/src/commands/hgetex.json
@@ -9,7 +9,8 @@
         "history": [],
         "command_flags": [
             "WRITE",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "HASH"

diff --git a/src/commands/hincrby.json b/src/commands/hincrby.json
@@ -9,7 +9,8 @@
         "command_flags": [
             "WRITE",
             "DENYOOM",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "HASH"

diff --git a/src/commands/hincrbyfloat.json b/src/commands/hincrbyfloat.json
@@ -9,7 +9,8 @@
         "command_flags": [
             "WRITE",
             "DENYOOM",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "HASH"

diff --git a/src/commands/hpexpire.json b/src/commands/hpexpire.json
@@ -9,7 +9,8 @@
         "history": [],
         "command_flags": [
             "WRITE",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "HASH"

diff --git a/src/commands/hsetex.json b/src/commands/hsetex.json
@@ -9,7 +9,8 @@
         "command_flags": [
             "WRITE",
             "DENYOOM",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "HASH"

diff --git a/src/commands/incrbyfloat.json b/src/commands/incrbyfloat.json
@@ -9,7 +9,8 @@
         "command_flags": [
             "WRITE",
             "DENYOOM",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "STRING"

diff --git a/src/commands/pexpire.json b/src/commands/pexpire.json
@@ -14,7 +14,8 @@
         ],
         "command_flags": [
             "WRITE",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "KEYSPACE"

diff --git a/src/commands/psetex.json b/src/commands/psetex.json
@@ -13,7 +13,8 @@
         ],
         "command_flags": [
             "WRITE",
-            "DENYOOM"
+            "DENYOOM",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "STRING"

diff --git a/src/commands/setex.json b/src/commands/setex.json
@@ -13,7 +13,8 @@
         ],
         "command_flags": [
             "WRITE",
-            "DENYOOM"
+            "DENYOOM",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "STRING"

diff --git a/src/commands/setrange.json b/src/commands/setrange.json
@@ -8,7 +8,8 @@
         "function": "setrangeCommand",
         "command_flags": [
             "WRITE",
-            "DENYOOM"
+            "DENYOOM",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "STRING"

diff --git a/src/commands/spop.json b/src/commands/spop.json
@@ -14,7 +14,8 @@
         ],
         "command_flags": [
             "WRITE",
-            "FAST"
+            "FAST",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "SET"

diff --git a/src/commands/zmpop.json b/src/commands/zmpop.json
@@ -8,7 +8,8 @@
         "function": "zmpopCommand",
         "get_keys_function": "zmpopGetKeys",
         "command_flags": [
-            "WRITE"
+            "WRITE",
+            "GTID_NON_DETERMINISM"
         ],
         "acl_categories": [
             "SORTEDSET"

diff --git a/src/config.c b/src/config.c
@@ -2694,6 +2694,12 @@ static int updateMaxmemory(const char **err) {
     return 1;
 }
 
+static int updateGtidXsyncMaxGap(const char **err) {;
+    UNUSED(err);
+    gtidGaplogResetDataSize(server.gtid_gap_log, server.gtid_xsync_max_gap);
+    return 1;
+}
+
 #ifdef ENABLE_SWAP
 static int updateSwapAbsentCacheCapacity(const char **err) {
     if (server.swap_absent_cache_capacity) {
@@ -3819,7 +3825,7 @@ standardConfig static_configs[] = {
     createULongLongConfig("swap-swap-info-slave-period", NULL, MODIFIABLE_CONFIG, 1, 3600*24, server.swap_swap_info_slave_period, 60, INTEGER_CONFIG, NULL, NULL),
 #endif
 
-    createULongLongConfig("gtid-xsync-max-gap", NULL, MODIFIABLE_CONFIG, 0, ULLONG_MAX, server.gtid_xsync_max_gap, 10000, INTEGER_CONFIG, NULL, NULL),
+    createULongLongConfig("gtid-xsync-max-gap", NULL, MODIFIABLE_CONFIG, 0, ULLONG_MAX, server.gtid_xsync_max_gap, 10000, INTEGER_CONFIG, NULL, updateGtidXsyncMaxGap),
 
     /* Size_t configs */
     createSizeTConfig("hash-max-listpack-entries", "hash-max-ziplist-entries", MODIFIABLE_CONFIG, 0, LONG_MAX, server.hash_max_listpack_entries, 512, INTEGER_CONFIG, NULL, NULL),

diff --git a/src/ctrip_swap_cmd.c b/src/ctrip_swap_cmd.c
@@ -1208,6 +1208,9 @@ int getKeyRequestsGtid(int dbid, struct redisCommand *cmd, robj **argv,
     orig_num = result->num;
 
     exec_cmd = lookupCommandByCString(argv[start_index]->ptr);
+    if (exec_cmd == NULL) return C_ERR;
+
+    if (!commandCheckArity(exec_cmd, argc - start_index, NULL)) return C_ERR;
     if (_getSingleCmdKeyRequests(exec_dbid,exec_cmd,argv+start_index,
             argc-start_index,result)) return C_ERR;
 

diff --git a/src/ctrip_swap_server.h b/src/ctrip_swap_server.h
@@ -31,13 +31,13 @@
 #include <stdlib.h>
 
 /* swap datatype flags*/
-#define CMD_SWAP_DATATYPE_KEYSPACE (1ULL<<40)
-#define CMD_SWAP_DATATYPE_STRING (1ULL<<41)
-#define CMD_SWAP_DATATYPE_HASH (1ULL<<42)
-#define CMD_SWAP_DATATYPE_SET (1ULL<<43)
-#define CMD_SWAP_DATATYPE_ZSET (1ULL<<44)
-#define CMD_SWAP_DATATYPE_LIST (1ULL<<45)
-#define CMD_SWAP_DATATYPE_BITMAP (1ULL<<46)
+#define CMD_SWAP_DATATYPE_KEYSPACE (1ULL<<31)
+#define CMD_SWAP_DATATYPE_STRING (1ULL<<32)
+#define CMD_SWAP_DATATYPE_HASH (1ULL<<33)
+#define CMD_SWAP_DATATYPE_SET (1ULL<<34)
+#define CMD_SWAP_DATATYPE_ZSET (1ULL<<35)
+#define CMD_SWAP_DATATYPE_LIST (1ULL<<36)
+#define CMD_SWAP_DATATYPE_BITMAP (1ULL<<37)
 
 /* CHECK: CLIENT_REPL_RDBONLY is the last CLIENT_xx flag */
 #define CLIENT_SWAPPING (1ULL<<53) /* The client is waiting swap. */

diff --git a/src/module.c b/src/module.c
@@ -1166,6 +1166,7 @@ int64_t commandFlagsFromString(char *s) {
         else if (!strcasecmp(t,"no-mandatory-keys")) flags |= CMD_NO_MANDATORY_KEYS;
         else if (!strcasecmp(t,"allow-busy")) flags |= CMD_ALLOW_BUSY;
         else if (!strcasecmp(t, "internal")) flags |= (CMD_INTERNAL|CMD_NOSCRIPT); /* We also disallow internal commands in scripts. */
+        else if (!strcasecmp(t,"rewrite-command")) flags |= CMD_GTID_NON_DETERMINISM;
         else break;
     }
     sdsfreesplitres(tokens,count);

diff --git a/src/server.c b/src/server.c
@@ -3014,7 +3014,7 @@ void initServer(void) {
     server.gtid_lost = gtidSetNew();
     xsyncUuidInterestedInit();
     gtidInitialInfoInit(server.gtid_initial);
-    server.gtid_gap_log = gtidGaplogNew();
+    server.gtid_gap_log = gtidGaplogNew(server.gtid_xsync_max_gap);
     server.gtid_xsync_fullresync_indicator = 0;
     server.gtid_executed_cmd_count = 0;
     server.gtid_ignored_cmd_count = 0;
@@ -5297,6 +5297,7 @@ void addReplyFlagsForCommand(client *c, struct redisCommand *cmd) {
         {CMD_MOVABLE_KEYS,      "movablekeys"},
         {CMD_ALLOW_BUSY,        "allow_busy"},
         /* {CMD_TOUCHES_ARBITRARY_KEYS,  "TOUCHES_ARBITRARY_KEYS"}, Hidden on purpose */
+        {CMD_GTID_NON_DETERMINISM,   "rewrite_command"},
         {0,NULL}
     };
     addReplyCommandFlags(c, cmd->flags, flagNames);

diff --git a/src/server.h b/src/server.h
@@ -267,6 +267,7 @@ extern int configOOMScoreAdjValuesDefaults[CONFIG_OOM_COUNT];
 #define CMD_MODULE_GETCHANNELS (1ULL<<27)  /* Use the modules getchannels interface. */
 #define CMD_TOUCHES_ARBITRARY_KEYS (1ULL<<28)
 #define CMD_INTERNAL (1ULL<<29) /* Internal command. */
+#define CMD_GTID_NON_DETERMINISM (1ULL<<30)
 
 /* Command flags that describe ACLs categories. */
 #define ACL_CATEGORY_KEYSPACE (1ULL<<0)

diff --git a/tests/gtid/aof.tcl b/tests/gtid/aof.tcl
@@ -143,7 +143,7 @@ test "aof" {
                 r expire k2 1000
                 r set k3 y ex 1000
                 r set k4 y
-                r gtid A:1 9 expire k4 200000000000
+                r gtid A:1 9 PEXPIREAT k4 200000000000
                 r set k5 y
                 set config [srv 0 config]
                 set dir [dict get $config dir]
@@ -155,7 +155,7 @@ test "aof" {
                     {gtid * 9 PEXPIREAT k2 *}
                     {gtid * 9 SET k3 y PXAT *}
                     {gtid * 9 set k4 y}
-                    {gtid A:1 9 PEXPIREAT k4 *}
+                    {gtid * 9 PEXPIREAT k4 *}
                     {gtid * 9 set k5 y}
                 }
             }
+1 −1		Makefile
+0 −173		gtid_skiplist.c
+0 −695		gtid_test.c
+0 −63		include/gtid.h
+67 −50		xredis/tests/gtid/aof.tcl
+14 −10		xredis/tests/gtid/gaplog.tcl
+81 −198		xredis/tests/gtid/gaplog_commands.tcl
+62 −30		xredis/tests/gtid/gaplog_write_commands.tcl
+136 −35		xredis/tests/gtid/gtid.tcl
+0 −244		xredis/tests/gtid/gtid_module_replicate.tcl
+13 −19		xredis/tests/gtid/sync.tcl
+22 −113		xredis/tests/gtid/xsync.tcl
+50 −1		xredis/tests/support/gtid.tcl
+61 −107		xredis/xredis_gtid.c
+25 −35		xredis/xredis_gtid.h
+1 −0		xredis/xredis_gtid_adaptation_version.h
+7 −0		xredis/xredis_gtid_adaptation_version_6x.c
+6 −1		xredis/xredis_gtid_adaptation_version_8x.c
+5 −5		xredis/xredis_gtid_cmdparse.c
+212 −587		xredis/xredis_gtid_gap_log.c
+3 −11		xredis/xredis_gtid_rs.c