fix:change uid in taosx to avoiding uid same in different db

include/util/taoserror.h

@@ -111,6 +111,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_NOT_FOUND                     TAOS_DEF_ERROR_CODE(0, 0x012A)
 #define TSDB_CODE_NO_DISKSPACE                  TAOS_DEF_ERROR_CODE(0, 0x012B)
 #define TSDB_CODE_TIMEOUT_ERROR                 TAOS_DEF_ERROR_CODE(0, 0x012C)
+#define TSDB_CODE_MSG_ENCODE_ERROR              TAOS_DEF_ERROR_CODE(0, 0x012D)
 
 #define TSDB_CODE_APP_IS_STARTING               TAOS_DEF_ERROR_CODE(0, 0x0130) //
 #define TSDB_CODE_APP_IS_STOPPING               TAOS_DEF_ERROR_CODE(0, 0x0131) //

source/client/src/clientRawBlockWrite.c

@@ -25,6 +25,10 @@
 #include "tref.h"
 #include "ttimer.h"
 
+static tb_uid_t processSuid(tb_uid_t suid, char* db){
+  return suid + MurmurHash3_32(db, strlen(db));
+}
+
 static char* buildCreateTableJson(SSchemaWrapper* schemaRow, SSchemaWrapper* schemaTag, char* name, int64_t id,
                                   int8_t t) {
   char*  string = NULL;
@@ -681,7 +685,7 @@ static int32_t taosCreateStb(TAOS* taos, void* meta, int32_t metaLen) {
   pReq.numOfColumns = req.schemaRow.nCols;
   pReq.numOfTags = req.schemaTag.nCols;
   pReq.commentLen = -1;
-  pReq.suid = req.suid;
+  pReq.suid = processSuid(req.suid, pRequest->pDb);
   pReq.source = TD_REQ_FROM_TAOX;
   pReq.igExists = true;
 
@@ -753,7 +757,7 @@ static int32_t taosDropStb(TAOS* taos, void* meta, int32_t metaLen) {
   // build drop stable
   pReq.igNotExists = true;
   pReq.source = TD_REQ_FROM_TAOX;
-  pReq.suid = req.suid;
+  pReq.suid = processSuid(req.suid, pRequest->pDb);
 
   STscObj* pTscObj = pRequest->pTscObj;
   SName    tableName = {0};
@@ -871,6 +875,7 @@ static int32_t taosCreateTable(TAOS* taos, void* meta, int32_t metaLen) {
     if (pCreateReq->type == TSDB_CHILD_TABLE) {
       STableMeta* pTableMeta = NULL;
       SName       sName = {0};
+      pCreateReq->ctb.suid = processSuid(pCreateReq->ctb.suid, pRequest->pDb);
       toName(pTscObj->acctId, pRequest->pDb, pCreateReq->ctb.stbName, &sName);
       code = catalogGetTableMeta(pCatalog, &conn, &sName, &pTableMeta);
       if (code != TSDB_CODE_SUCCESS) {
@@ -1008,6 +1013,7 @@ static int32_t taosDropTable(TAOS* taos, void* meta, int32_t metaLen) {
   for (int32_t iReq = 0; iReq < req.nReqs; iReq++) {
     pDropReq = req.pReqs + iReq;
     pDropReq->igNotExists = true;
+    pDropReq->suid = processSuid(pDropReq->suid, pRequest->pDb);
 
     SVgroupInfo pInfo = {0};
     SName       pName = {0};
@@ -1922,6 +1928,7 @@ static int32_t tmqWriteRawMetaDataImpl(TAOS* taos, void* data, int32_t dataLen)
   SMqTaosxRspObj rspObj = {0};
   SDecoder       decoder = {0};
   STableMeta*    pTableMeta = NULL;
+  void*          schemaContent = NULL;
 
   terrno = TSDB_CODE_SUCCESS;
   SRequestObj* pRequest = (SRequestObj*)createRequest(*(int64_t*)taos, TSDB_SQL_INSERT, 0);
@@ -2008,27 +2015,49 @@ static int32_t tmqWriteRawMetaDataImpl(TAOS* taos, void* data, int32_t dataLen)
       SDecoder      decoderTmp = {0};
       SVCreateTbReq pCreateReq = {0};
 
+      do{
         tDecoderInit(&decoderTmp, *dataTmp, *lenTmp);
         if (tDecodeSVCreateTbReq(&decoderTmp, &pCreateReq) < 0) {
-        tDecoderClear(&decoderTmp);
+          code = TSDB_CODE_MSG_DECODE_ERROR;
-        taosMemoryFreeClear(pCreateReq.comment);
-        taosArrayDestroy(pCreateReq.ctb.tagName);
-        goto end;
-      }
-
-      ASSERT(pCreateReq.type == TSDB_CHILD_TABLE);
-      if (strcmp(tbName, pCreateReq.name) == 0) {
-        schemaLen = *lenTmp;
-        schemaData = *dataTmp;
-        strcpy(pName.tname, pCreateReq.ctb.stbName);
-        tDecoderClear(&decoderTmp);
-        taosMemoryFreeClear(pCreateReq.comment);
-        taosArrayDestroy(pCreateReq.ctb.tagName);
           break;
         }
+
+        if (strcmp(tbName, pCreateReq.name) != 0) {
+          break;
+        }
+
+        pCreateReq.ctb.suid = processSuid(pCreateReq.ctb.suid, pRequest->pDb);
+
+        int32_t len = 0;
+        tEncodeSize(tEncodeSVCreateTbReq, &pCreateReq, len, code);
+        if(code != 0) {
+          code = TSDB_CODE_MSG_ENCODE_ERROR;
+          break;
+        }
+        taosMemoryFree(schemaContent);
+        schemaContent = taosMemoryMalloc(len);
+        if(!schemaContent) {
+          code = TSDB_CODE_OUT_OF_MEMORY;
+          break;
+        }
+        SEncoder encoder = {0};
+        tEncoderInit(&encoder, schemaContent, len);
+        code = tEncodeSVCreateTbReq(&encoder, &pCreateReq);
+        if (code != 0) {
+          tEncoderClear(&encoder);
+          code = TSDB_CODE_MSG_ENCODE_ERROR;
+          break;
+        }
+        schemaLen = len;
+        schemaData = schemaContent;
+        strcpy(pName.tname, pCreateReq.ctb.stbName);
+        tEncoderClear(&encoder);
+      }while(0);
       tDecoderClear(&decoderTmp);
       taosMemoryFreeClear(pCreateReq.comment);
       taosArrayDestroy(pCreateReq.ctb.tagName);
+      if(code != 0) goto end;
+      if(schemaLen != 0) break;
     }
 
     code = catalogGetTableMeta(pCatalog, &conn, &pName, &pTableMeta);
@@ -2217,6 +2246,7 @@ static int32_t tmqWriteRawMetaDataImpl(TAOS* taos, void* data, int32_t dataLen)
   destroyRequest(pRequest);
   taosHashCleanup(pVgHash);
   taosMemoryFreeClear(pTableMeta);
+  taosMemoryFree(schemaContent);
   return code;
 }
 

source/util/src/terror.c

@@ -88,6 +88,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_NEED_RETRY,                   "Retry needed")
 TAOS_DEFINE_ERROR(TSDB_CODE_OUT_OF_RPC_MEMORY_QUEUE,      "Out of memory in rpc queue")
 TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TIMESTAMP,            "Invalid timestamp format")
 TAOS_DEFINE_ERROR(TSDB_CODE_MSG_DECODE_ERROR,             "Msg decode error")
+TAOS_DEFINE_ERROR(TSDB_CODE_MSG_ENCODE_ERROR,             "Msg encode error")
 TAOS_DEFINE_ERROR(TSDB_CODE_NO_AVAIL_DISK,                "No available disk")
 TAOS_DEFINE_ERROR(TSDB_CODE_NOT_FOUND,                    "Not found")
 TAOS_DEFINE_ERROR(TSDB_CODE_NO_DISKSPACE,                 "Out of disk space")

tests/pytest/util/dnodes.py

@@ -29,6 +29,7 @@ class TDSimClient:
         self.testCluster = False
         self.path = path
         self.cfgDict = {
+            "fqdn": "localhost",
             "numOfLogLines": "100000000",
             "locale": "en_US.UTF-8",
             "charset": "UTF-8",
@@ -119,6 +120,7 @@ class TDDnode:
         self.asan = False
         self.remoteIP = ""
         self.cfgDict = {
+            "fqdn": "localhost",
             "monitor": "0",
             "maxShellConns": "30000",
             "locale": "en_US.UTF-8",

tests/system-test/7-tmq/tmq_taosx.py

@@ -194,6 +194,11 @@ class TDTestCase:
         tdSql.checkData(0, 2, None)
         tdSql.checkData(1, 1, 1)
         tdSql.checkData(1, 2, '{"k1":1,"k2":"hello"}')
+
+        tdSql.query("select * from information_schema.ins_tables where table_name = 'stt4'")
+        uid1 = tdSql.getData(0, 5)
+        uid2 = tdSql.getData(1, 5)
+        tdSql.checkNotEqual(uid1, uid2)
         return
 
     def checkWal1Vgroup(self):