ctripcorp · warrick1016 · Jul 3, 2026
diff --git a/deps/xredis-gtid b/deps/xredis-gtid
diff --git a/src/Makefile b/src/Makefile
@@ -565,18 +565,22 @@ distclean: clean
 	-(rm -f .make-*)
 
 .PHONY: distclean
+.PHONY: build-test-modules
+
+build-test-modules:
+	@$(MAKE) -C ../tests/modules
 
 ifdef SWAP
-test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME)
+test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) build-test-modules
 	@(cd ..; ./runtest --timeout 3600)
 
-test-asan: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME)
+test-asan: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) build-test-modules
 	@(cd ..; ./runtest --tags -nosanitizer --asan --timeout 3600)
 else
-test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME)
+test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) build-test-modules
 	@(cd ..; ./runtest)
 
-test-asan: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME)
+test-asan: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) build-test-modules
 	@(cd ..; ./runtest --tags -nosanitizer --asan)
 endif
 

diff --git a/src/ctrip_swap.c b/src/ctrip_swap.c
@@ -734,6 +734,7 @@ int initTestRedisServer() {
 
     // Call complete swapInit to initialize all swap subsystems
     swapInit();
+    initStatsSwap();
 
     inited = 1;
     return 1;

diff --git a/tests/gtid b/tests/gtid
@@ -0,0 +1 @@
+../deps/xredis-gtid/xredis/tests/gtid
diff --git a/tests/gtid/aof.tcl b/tests/gtid/aof.tcl
diff --git a/tests/gtid/gaplog.tcl b/tests/gtid/gaplog.tcl
diff --git a/tests/gtid/gaplog/gaplog.tcl b/tests/gtid/gaplog/gaplog.tcl
diff --git a/tests/gtid/gaplog/gaplog_commands.tcl b/tests/gtid/gaplog/gaplog_commands.tcl
diff --git a/tests/gtid/gaplog/gaplog_write_commands.tcl b/tests/gtid/gaplog/gaplog_write_commands.tcl
diff --git a/tests/gtid/gaplog_commands.tcl b/tests/gtid/gaplog_commands.tcl
diff --git a/tests/gtid/gaplog_write_commands.tcl b/tests/gtid/gaplog_write_commands.tcl
+221 −0		xredis/tests/gtid/6_x/aof.tcl
+271 −0		xredis/tests/gtid/6_x/gtid.tcl
+123 −0		xredis/tests/gtid/6_x/sync.tcl
+65 −10		xredis/tests/gtid/8_x/aof.tcl
+405 −0		xredis/tests/gtid/8_x/gtid.tcl
+199 −0		xredis/tests/gtid/8_x/master_restart.tcl
+344 −0		xredis/tests/gtid/8_x/psync2-master-restart.tcl
+127 −0		xredis/tests/gtid/8_x/sync.tcl
+4 −142		xredis/tests/gtid/gtid.tcl
+3 −71		xredis/tests/gtid/gtid_module_replicate.tcl
+77 −8		xredis/tests/gtid/replication-psync.tcl
+1 −80		xredis/tests/gtid/sync.tcl
+14 −10		xredis/tests/gtid/xsync.tcl
+10 −1		xredis/tests/support/gtid.tcl
+19 −6		xredis/xredis_gtid.c
+4 −0		xredis/xredis_gtid_adaptation_version.h
+26 −0		xredis/xredis_gtid_adaptation_version_6x.c
+35 −0		xredis/xredis_gtid_adaptation_version_8x.c