From 4806e7bf3dd3b4e7d6ab92bdc111f8ce238c93c1 Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Thu, 24 Sep 2020 16:30:14 +0800
Subject: [PATCH] fix td-1488

---
 src/client/inc/tsclient.h       |  5 +++--
 src/client/src/tscParseInsert.c |  3 +--
 src/client/src/tscServer.c      | 35 ++++++++++-----------------------
 src/client/src/tscUtil.c        |  1 +
 4 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index 55ca02dfb5..500f784ec5 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -261,7 +261,7 @@ typedef struct {
   };
 
   int32_t      insertType;
-  int32_t      clauseIndex;   // index of multiple subclause query
+  int32_t      clauseIndex;  // index of multiple subclause query
 
   char *       curSql;       // current sql, resume position of sql after parsing paused
   int8_t       parseFinished;
@@ -276,7 +276,8 @@ typedef struct {
   int32_t      numOfParams;
 
   int8_t       dataSourceType;     // load data from file or not
-  int8_t       submitSchema;  // submit block is built with table schema
+  int8_t       submitSchema; // submit block is built with table schema
+  STagData     tagData;
   SHashObj    *pTableList;   // referred table involved in sql
   SArray      *pDataBlocks;  // SArray<STableDataBlocks*> submit data blocks after parsing sql
 } SSqlCmd;
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index 6fd97c09e9..0480370dfa 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -791,7 +791,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
     sql += index;
 
     tscAllocPayload(pCmd, sizeof(STagData));
-    STagData *pTag = (STagData *) pCmd->payload;
+    STagData *pTag = &pCmd->tagData;
 
     memset(pTag, 0, sizeof(STagData));
     
@@ -946,7 +946,6 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
       return tscSQLSyntaxErrMsg(pCmd->payload, ") expected", sToken.z);
     }
 
-    pCmd->payloadLen = sizeof(pTag->name) + sizeof(pTag->dataLen) + pTag->dataLen;
     pTag->dataLen = htonl(pTag->dataLen);
 
     if (tscValidateName(&tableToken) != TSDB_CODE_SUCCESS) {
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 8eaa406bce..72fe64d4a4 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -1495,43 +1495,29 @@ int tscBuildConnectMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 }
 
 int tscBuildTableMetaMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SCMTableInfoMsg *pInfoMsg;
-  char *         pMsg;
-  int            msgLen = 0;
-
-  char *tmpData = NULL;
-  uint32_t len = pSql->cmd.payloadLen;
-  if (len > 0) {
-    if ((tmpData = calloc(1, len)) == NULL) {
-      return TSDB_CODE_TSC_OUT_OF_MEMORY;
-    }
-
-    // STagData is in binary format, strncpy is not available
-    memcpy(tmpData, pSql->cmd.payload, len);
-  }
-
   SSqlCmd *   pCmd = &pSql->cmd;
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
 
   STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
-  pInfoMsg = (SCMTableInfoMsg *)pCmd->payload;
+  SCMTableInfoMsg* pInfoMsg = (SCMTableInfoMsg *)pCmd->payload;
   strcpy(pInfoMsg->tableId, pTableMetaInfo->name);
   pInfoMsg->createFlag = htons(pSql->cmd.autoCreated ? 1 : 0);
 
-  pMsg = (char*)pInfoMsg + sizeof(SCMTableInfoMsg);
+  char* pMsg = (char*)pInfoMsg + sizeof(SCMTableInfoMsg);
 
-  if (pSql->cmd.autoCreated && len > 0) {
-    memcpy(pInfoMsg->tags, tmpData, len);
-    pMsg += len;
+  size_t len = htonl(pCmd->tagData.dataLen);
+  if (pSql->cmd.autoCreated) {
+    if (len > 0) {
+      len += sizeof(pCmd->tagData.name) + sizeof(pCmd->tagData.dataLen);
+      memcpy(pInfoMsg->tags, &pCmd->tagData, len);
+      pMsg += len;
+    }
   }
 
   pCmd->payloadLen = (int32_t)(pMsg - (char*)pInfoMsg);
   pCmd->msgType = TSDB_MSG_TYPE_CM_TABLE_META;
 
-  taosTFree(tmpData);
-
-  assert(msgLen + minMsgSize() <= (int32_t)pCmd->allocSize);
   return TSDB_CODE_SUCCESS;
 }
 
@@ -2192,8 +2178,7 @@ static int32_t getTableMetaFromMgmt(SSqlObj *pSql, STableMetaInfo *pTableMetaInf
   assert(pNew->cmd.numOfClause == 1 && pNewQueryInfo->numOfTables == 1);
 
   tstrncpy(pNewMeterMetaInfo->name, pTableMetaInfo->name, sizeof(pNewMeterMetaInfo->name));
-  memcpy(pNew->cmd.payload, pSql->cmd.payload, pSql->cmd.payloadLen);  // tag information if table does not exists.
-  pNew->cmd.payloadLen = pSql->cmd.payloadLen;
+  memcpy(&pNew->cmd.tagData, &pSql->cmd.tagData, sizeof(pSql->cmd.tagData));
   tscDebug("%p new pSqlObj:%p to get tableMeta, auto create:%d", pSql, pNew, pNew->cmd.autoCreated);
 
   pNew->fp = tscTableMetaCallBack;
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 77088f5b7c..875411d9a3 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -1794,6 +1794,7 @@ SSqlObj* createSimpleSubObj(SSqlObj* pSql, void (*fp)(), void* param, int32_t cm
   pCmd->command = cmd;
   pCmd->parseFinished = 1;
   pCmd->autoCreated = pSql->cmd.autoCreated;
+  memcpy(&pCmd->tagData, &pSql->cmd.tagData, sizeof(pCmd->tagData));
 
   if (tscAddSubqueryInfo(pCmd) != TSDB_CODE_SUCCESS) {
     tscFreeSqlObj(pNew);
-- 
GitLab