From 4a085db970a7d332bdade580863fb1f77f45fa33 Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Wed, 29 Mar 2023 11:10:15 +0800
Subject: [PATCH] fix: hotfix version compatibility

---
 source/client/src/clientMsgHandler.c     |  4 ++--
 source/dnode/mnode/impl/src/mndProfile.c |  2 +-
 source/util/src/tversion.c               | 19 ++++++++++++-------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/source/client/src/clientMsgHandler.c b/source/client/src/clientMsgHandler.c
index 21590022b1..a0146cfa39 100644
--- a/source/client/src/clientMsgHandler.c
+++ b/source/client/src/clientMsgHandler.c
@@ -76,7 +76,7 @@ int32_t processConnectRsp(void* param, SDataBuf* pMsg, int32_t code) {
     goto End;
   }
 
-  if ((code = taosCheckVersionCompatibleFromStr(version, connectRsp.sVer, 2)) != 0) {
+  if ((code = taosCheckVersionCompatibleFromStr(version, connectRsp.sVer, 3)) != 0) {
     setErrno(pRequest, code);
     tsem_post(&pRequest->body.rspSem);
     goto End;
@@ -506,7 +506,7 @@ int32_t processShowVariablesRsp(void* param, SDataBuf* pMsg, int32_t code) {
       code = setQueryResultFromRsp(&pRequest->body.resInfo, pRes, false, true);
     }
 
-    if(code != 0){
+    if (code != 0) {
       taosMemoryFree(pRes);
     }
     tFreeSShowVariablesRsp(&rsp);
diff --git a/source/dnode/mnode/impl/src/mndProfile.c b/source/dnode/mnode/impl/src/mndProfile.c
index 41dea50731..50e502f4ab 100644
--- a/source/dnode/mnode/impl/src/mndProfile.c
+++ b/source/dnode/mnode/impl/src/mndProfile.c
@@ -226,7 +226,7 @@ static int32_t mndProcessConnectReq(SRpcMsg *pReq) {
     goto _OVER;
   }
 
-  if ((code = taosCheckVersionCompatibleFromStr(connReq.sVer, version, 2)) != 0) {
+  if ((code = taosCheckVersionCompatibleFromStr(connReq.sVer, version, 3)) != 0) {
     terrno = code;
     goto _OVER;
   }
diff --git a/source/util/src/tversion.c b/source/util/src/tversion.c
index dc357c61a1..0f84f6bafa 100644
--- a/source/util/src/tversion.c
+++ b/source/util/src/tversion.c
@@ -26,8 +26,9 @@ int32_t taosVersionStrToInt(const char *vstr, int32_t *vint) {
   int32_t vnum[4] = {0};
   int32_t len = strlen(vstr);
   char    tmp[16] = {0};
+  int32_t vpos = 0;
 
-  for (int32_t spos = 0, tpos = 0, vpos = 0; spos < len && vpos < 4; ++spos) {
+  for (int32_t spos = 0, tpos = 0; spos < len && vpos < 4; ++spos) {
     if (vstr[spos] != '.') {
       tmp[spos - tpos] = vstr[spos];
     } else {
@@ -38,6 +39,10 @@ int32_t taosVersionStrToInt(const char *vstr, int32_t *vint) {
     }
   }
 
+  if ('\0' != tmp[0] && vpos < 4) {
+    vnum[vpos] = atoi(tmp);
+  }
+
   if (vnum[0] <= 0) {
     terrno = TSDB_CODE_INVALID_VERSION_STRING;
     return -1;
@@ -66,16 +71,16 @@ int32_t taosCheckVersionCompatible(int32_t clientVer, int32_t serverVer, int32_t
     case 4:
       break;
     case 3:
-      clientVer %= 100;
-      serverVer %= 100;
+      clientVer /= 100;
+      serverVer /= 100;
       break;
     case 2:
-      clientVer %= 10000;
-      serverVer %= 10000;
+      clientVer /= 10000;
+      serverVer /= 10000;
       break;
     case 1:
-      clientVer %= 1000000;
-      serverVer %= 1000000;
+      clientVer /= 1000000;
+      serverVer /= 1000000;
       break;
     default:
       terrno = TSDB_CODE_INVALID_VERSION_NUMBER;
-- 
GitLab