Merge branch '3.0' into feature/vnode

include/libs/parser/parser.h

@@ -27,7 +27,7 @@ typedef struct SParseContext {
   int8_t           schemaAttached; // denote if submit block is built with table schema or not
   const char      *pSql;           // sql string
   size_t           sqlLen;         // length of the sql string
-  char            *pMsg;           // extended error message if exists to help avoid the problem in sql statement.
+  char            *pMsg;           // extended error message if exists to help identifying the problem in sql statement.
   int32_t          msgLen;         // max length of the msg
 } SParseContext;
 

source/client/src/clientImpl.c

@@ -181,43 +181,13 @@ int32_t execDdlQuery(SRequestObj* pRequest, SQueryNode* pQuery) {
   pRequest->body.requestMsg = (SDataBuf){.pData = pDcl->pMsg, .len = pDcl->msgLen};
 
   STscObj* pTscObj = pRequest->pTscObj;
-
-
   SMsgSendInfo* pSendMsg = buildSendMsgInfoImpl(pRequest);
-  SEpSet* pEpSet = &pTscObj->pAppInfo->mgmtEp.epSet;
 
+  int64_t transporterId = 0;
   if (pDcl->msgType == TDMT_VND_CREATE_TABLE) {
-//    struct SCatalog* pCatalog = NULL;
-//
-//    char buf[18] = {0};
-//    sprintf(buf, "%" PRId64, pRequest->pTscObj->pAppInfo->clusterId);
-//    int32_t code = catalogGetHandle(buf, &pCatalog);
-//    if (code != TSDB_CODE_SUCCESS) {
-//      return code;
-//    }
-//
-//    SCreateTableMsg* pMsg = pSendMsg->msgInfo.pData;
-//
-//    SName t = {0};
-//    tNameFromString(&t, pMsg->name, T_NAME_ACCT|T_NAME_DB|T_NAME_TABLE);
-//
-//    char db[TSDB_DB_NAME_LEN + TSDB_NAME_DELIMITER_LEN + TSDB_ACCT_ID_LEN] = {0};
-//    tNameGetFullDbName(&t, db);
-//
-//    SVgroupInfo info = {0};
-//    catalogGetTableHashVgroup(pCatalog, pRequest->pTscObj->pTransporter, pEpSet, db, tNameGetTableName(&t), &info);
-//
-    int64_t transporterId = 0;
-//    SEpSet ep   = {0};
-//    ep.inUse    = info.inUse;
-//    ep.numOfEps = info.numOfEps;
-//    for(int32_t i = 0; i < ep.numOfEps; ++i) {
-//      ep.port[i] = info.epAddr[i].port;
-//      tstrncpy(ep.fqdn[i], info.epAddr[i].fqdn, tListLen(ep.fqdn[i]));
-//    }
     asyncSendMsgToServer(pTscObj->pTransporter, &pDcl->epSet, &transporterId, pSendMsg);
   } else {
-    int64_t transporterId = 0;
+    SEpSet* pEpSet = &pTscObj->pAppInfo->mgmtEp.epSet;
     asyncSendMsgToServer(pTscObj->pTransporter, pEpSet, &transporterId, pSendMsg);
   }
 

source/client/test/clientTests.cpp

@@ -433,7 +433,6 @@ TEST(testCase, create_topic_Test) {
   taos_close(pConn); 
 }
 
-
 //TEST(testCase, show_table_Test) {
 //  TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
 //  assert(pConn != NULL);

source/libs/parser/inc/parserUtil.h

@@ -62,7 +62,7 @@ void cleanupTagCond(STagCond* pTagCond);
 void cleanupColumnCond(SArray** pCond);
 
 uint32_t convertRelationalOperator(SToken *pToken);
-int32_t    getExprFunctionId(SExprInfo *pExprInfo);
+int32_t  getExprFunctionId(SExprInfo *pExprInfo);
 
 STableMeta* tableMetaDup(const STableMeta* pTableMeta);
 
@@ -70,6 +70,17 @@ bool isDclSqlStatement(SSqlInfo* pSqlInfo);
 bool isDdlSqlStatement(SSqlInfo* pSqlInfo);
 bool isDqlSqlStatement(SSqlInfo* pSqlInfo);
 
+typedef struct SKvParam {
+  SKVRowBuilder *builder;
+  SSchema       *schema;
+  char           buf[TSDB_MAX_TAGS_LEN];
+} SKvParam;
+
+int32_t KvRowAppend(const void *value, int32_t len, void *param);
+
+typedef int32_t (*_row_append_fn_t)(const void *value, int32_t len, void *param);
+int32_t parseValueToken(char** end, SToken* pToken, SSchema* pSchema, int16_t timePrec, char* tmpTokenBuf, _row_append_fn_t func, void* param, SMsgBuf* pMsgBuf);
+
 #ifdef __cplusplus
 }
 #endif

source/libs/parser/src/dCDAstProcess.c

@@ -429,7 +429,6 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p
         SSchema   *pSchema = &pTagSchema[i];
         SToken* pItem = taosArrayGet(pValList, i);
 
-        char tagVal[TSDB_MAX_TAGS_LEN];
         if (pSchema->type == TSDB_DATA_TYPE_BINARY || pSchema->type == TSDB_DATA_TYPE_NCHAR) {
           if (pItem->n > pSchema->bytes) {
             tdDestroyKVRowBuilder(&kvRowBuilder);
@@ -446,26 +445,16 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p
 //          }
         }
 
-        char* endPtr = NULL;
-        int64_t v = strtoll(pItem->z, &endPtr, 10);
-        *(int32_t*) tagVal = v;
-//        code = taosVariantDump(&(pItem->pVar), tagVal, pSchema->type, true);
+        char tmpTokenBuf[TSDB_MAX_TAGS_LEN] = {0};
+        SKvParam param = {.builder = &kvRowBuilder, .schema = pSchema};
 
-        // check again after the convert since it may be converted from binary to nchar.
-        if (pSchema->type == TSDB_DATA_TYPE_BINARY || pSchema->type == TSDB_DATA_TYPE_NCHAR) {
-          int16_t len = varDataTLen(tagVal);
-          if (len > pSchema->bytes) {
-            tdDestroyKVRowBuilder(&kvRowBuilder);
-            return buildInvalidOperationMsg(pMsgBuf, msg3);
-          }
-        }
+        char* endPtr = NULL;
+        code = parseValueToken(&endPtr, pItem, pSchema, tinfo.precision, tmpTokenBuf, KvRowAppend, &param, pMsgBuf);
 
         if (code != TSDB_CODE_SUCCESS) {
           tdDestroyKVRowBuilder(&kvRowBuilder);
           return buildInvalidOperationMsg(pMsgBuf, msg4);
         }
-
-        tdAddColToKVRow(&kvRowBuilder, pSchema->colId, pSchema->type, tagVal);
       }
     }