update version 1.0.19

ctripcorp · May 30, 2023 · 25a3681 · 25a3681
1 parent 13c2745
commit 25a3681
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CRDT-RELEASENOTES b/CRDT-RELEASENOTES
@@ -10,12 +10,17 @@ HIGH: There is a critical bug that may affect a subset of users. Upgrade!
 CRITICAL: There is a critical bug affecting MOST USERS. Upgrade ASAP.
 --------------------------------------------------------------------------------
 ================================================================================
-XRedis-CRDT 1.0.18 Released Fri May 19 13:51:15 CST 2023
+XRedis-CRDT 1.0.19 Released Tue May 30 20:29:27 CST 2023
 ================================================================================
 Upgrade urgency HIGH: Compared with the previous version, there are some improvements, mainly:
 * [feature] The time used by the tombstone generated by the deletion that occurs when it expires is the expiration time (not the time when the deletion was performed)
-* [feature] The master that writes data last has priority over expiration (other masters are delayed)
 * [feature] Execution of user commands triggers expiration, and execution of synchronous commands does not trigger expiration
+================================================================================
+XRedis-CRDT 1.0.18 Released Fri May 19 13:51:15 CST 2023
+================================================================================
+Upgrade urgency HIGH: Compared with the previous version, there are some improvements, mainly:
+* [feature] The master that writes data last has priority over expiration (other masters are delayed)
+* [feature] Execute user commands to trigger expiration, and execute synchronous commands to delay expiration
 * [hotfix] Take the maximum when the expiration conflicts
 ================================================================================
 XRedis-CRDT 1.0.17 Released Mon Mar 13 13:53:17 CST 2023

diff --git a/src/ctrip.h b/src/ctrip.h
@@ -8,7 +8,7 @@
 #ifndef SRC_CTRIP_H_
 #define SRC_CTRIP_H_
 
-#define XREDIS_CRDT_VERSION "1.0.18"
+#define XREDIS_CRDT_VERSION "1.0.19"
 #define CONFIG_DEFAULT_SLAVE_REPLICATE_ALL 0
 
 void xslaveofCommand(client *c);

diff --git a/src/ctrip_crdt_rdb.c b/src/ctrip_crdt_rdb.c
@@ -688,7 +688,6 @@ int rdbLoadCrdtData(rio* rdb, redisDb* db, long long current_expire_time, LoadCr
  moduleKey = createModuleKey(db, key, REDISMODULE_WRITE | REDISMODULE_TOMBSTONE | REDISMODULE_NO_TOUCH_KEY, NULL, NULL);
  if(load(db, key, rdb, moduleKey) == C_ERR) goto eoferr;
  //use dictFind function for compatibility(version1.0.3) when rdb has expire but no data
- serverLog(LL_WARNING, "key(%s) - timespace %lld", (sds)key->ptr, current_expire_time);
  if(dictFind(db->dict,key->ptr) != NULL && current_expire_time != -1) {
  setExpire(NULL, db, key, current_expire_time);
  }