diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index 9fcfb684b456aa4f85f9cebdd1c225bd3d9e8590..f20ef2c42e77925748a051fa5998c0bd28ddff86 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -232,7 +232,6 @@ TAOS_RES *taos_query_l(TAOS *taos, const char *sql, int sqlLen) {
   CHECK_CODE_GOTO(parseSql(pRequest, &pQuery), _return);
   if (qIsDdlQuery(pQuery)) {
     CHECK_CODE_GOTO(execDdlQuery(pRequest, pQuery), _return);
-    goto _return;
   }
   CHECK_CODE_GOTO(qCreateQueryDag(pQuery, &pDag), _return);
   CHECK_CODE_GOTO(scheduleQuery(pRequest, pDag, &pJob), _return);
diff --git a/source/client/src/clientMsgHandler.c b/source/client/src/clientMsgHandler.c
index 42e1f2941b27a0ade881977fc17420989e306d17..e4ed305efa803799fadbdb036e5a9eb2f6fb9b8c 100644
--- a/source/client/src/clientMsgHandler.c
+++ b/source/client/src/clientMsgHandler.c
@@ -31,6 +31,11 @@ int genericRspCallback(void* param, const SDataBuf* pMsg, int32_t code) {
 
 int processConnectRsp(void* param, const SDataBuf* pMsg, int32_t code) {
   SRequestObj* pRequest = param;
+  if (code != TSDB_CODE_SUCCESS) {
+    pRequest->code = code;
+    terrno         = code;
+    return code;
+  }
 
   STscObj *pTscObj = pRequest->pTscObj;
 
diff --git a/source/client/test/clientTests.cpp b/source/client/test/clientTests.cpp
index 0f2c0a727f99b96d4f4a9c48e90f771f41e2cd9e..3f446ceef91f179f3e7dcb819b3161280fef86aa 100644
--- a/source/client/test/clientTests.cpp
+++ b/source/client/test/clientTests.cpp
@@ -203,36 +203,36 @@ TEST(testCase, drop_db_test) {
   taos_close(pConn);
 }
 
-// TEST(testCase, create_stable_Test) {
-//  TAOS* pConn = taos_connect("ubuntu", "root", "taosdata", NULL, 0);
-//  assert(pConn != NULL);
-//
-//  TAOS_RES* pRes = taos_query(pConn, "create database abc1");
-//  if (taos_errno(pRes) != 0) {
-//    printf("error in create db, reason:%s\n", taos_errstr(pRes));
-//  }
-//  taos_free_result(pRes);
-//
-//  pRes = taos_query(pConn, "use abc1");
-//  if (taos_errno(pRes) != 0) {
-//    printf("error in use db, reason:%s\n", taos_errstr(pRes));
-//  }
-//  taos_free_result(pRes);
-//
-//  pRes = taos_query(pConn, "create stable st1(ts timestamp, k int) tags(a int)");
-//  if (taos_errno(pRes) != 0) {
-//    printf("error in create stable, reason:%s\n", taos_errstr(pRes));
-//  }
-//
-//  TAOS_FIELD* pFields = taos_fetch_fields(pRes);
-//  ASSERT_TRUE(pFields == NULL);
-//
-//  int32_t numOfFields = taos_num_fields(pRes);
-//  ASSERT_EQ(numOfFields, 0);
-//
-//  taos_free_result(pRes);
-//  taos_close(pConn);
-//}
+ TEST(testCase, create_stable_Test) {
+  TAOS* pConn = taos_connect("ubuntu", "root", "taosdata", NULL, 0);
+  assert(pConn != NULL);
+
+  TAOS_RES* pRes = taos_query(pConn, "create database abc1");
+  if (taos_errno(pRes) != 0) {
+    printf("error in create db, reason:%s\n", taos_errstr(pRes));
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "use abc1");
+  if (taos_errno(pRes) != 0) {
+    printf("error in use db, reason:%s\n", taos_errstr(pRes));
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "create stable st1(ts timestamp, k int) tags(a int)");
+  if (taos_errno(pRes) != 0) {
+    printf("error in create stable, reason:%s\n", taos_errstr(pRes));
+  }
+
+  TAOS_FIELD* pFields = taos_fetch_fields(pRes);
+  ASSERT_TRUE(pFields == NULL);
+
+  int32_t numOfFields = taos_num_fields(pRes);
+  ASSERT_EQ(numOfFields, 0);
+
+  taos_free_result(pRes);
+  taos_close(pConn);
+}
 
 TEST(testCase, create_table_Test) {
   //  TAOS* pConn = taos_connect("ubuntu", "root", "taosdata", NULL, 0);
diff --git a/source/libs/parser/inc/astToMsg.h b/source/libs/parser/inc/astToMsg.h
index d6bed8ef708fdbd23a6b48cf946f7e69e422c2e2..848bbc346e195950ee9f4ad55b7e821cf6f121a2 100644
--- a/source/libs/parser/inc/astToMsg.h
+++ b/source/libs/parser/inc/astToMsg.h
@@ -4,6 +4,8 @@
 #include "parserInt.h"
 #include "tmsg.h"
 
+int32_t createSName(SName* pName, SToken* pTableName, SParseBasicCtx* pParseCtx, SMsgBuf* pMsgBuf);
+
 SCreateUserMsg* buildUserManipulationMsg(SSqlInfo* pInfo, int32_t* outputLen, int64_t id, char* msgBuf, int32_t msgLen);
 SCreateAcctMsg* buildAcctManipulationMsg(SSqlInfo* pInfo, int32_t* outputLen, int64_t id, char* msgBuf, int32_t msgLen);
 SDropUserMsg* buildDropUserMsg(SSqlInfo* pInfo, int32_t* outputLen, int64_t id, char* msgBuf, int32_t msgLen);
diff --git a/source/libs/parser/src/astToMsg.c b/source/libs/parser/src/astToMsg.c
index 7f2f15ac650845c5d15d2492bcd61e425caf2715..6b92357748595e57103453f83c8445e9e684bfa6 100644
--- a/source/libs/parser/src/astToMsg.c
+++ b/source/libs/parser/src/astToMsg.c
@@ -1,5 +1,5 @@
-#include <astGenerator.h>
 #include "parserInt.h"
+#include "astGenerator.h"
 #include "parserUtil.h"
 
 SCreateUserMsg* buildUserManipulationMsg(SSqlInfo* pInfo, int32_t* outputLen, int64_t id, char* msgBuf, int32_t msgLen) {
diff --git a/source/libs/parser/src/astValidate.c b/source/libs/parser/src/astValidate.c
index 1c5f9f5cb38aaa895e67cf689221eea14c7fde91..6325620f548d88f87672fc6cd7bde5401f25ce7d 100644
--- a/source/libs/parser/src/astValidate.c
+++ b/source/libs/parser/src/astValidate.c
@@ -4024,505 +4024,5 @@ int32_t qParserValidateSqlNode(struct SCatalog* pCatalog, SSqlInfo* pInfo, SQuer
   }
 
 
-  return code;
-}
-
-// todo remove it
-static int32_t setShowInfo(SShowInfo* pShowInfo, SParseBasicCtx *pCtx, void** output, int32_t* outputLen, SMsgBuf* pMsgBuf) {
-  const char* msg1 = "invalid name";
-  const char* msg2 = "wildcard string should be less than %d characters";
-  const char* msg3 = "database name too long";
-  const char* msg4 = "pattern is invalid";
-  const char* msg5 = "database name is empty";
-  const char* msg6 = "pattern string is empty";
-
-  /*
-   * database prefix in pInfo->pMiscInfo->a[0]
-   * wildcard in like clause in pInfo->pMiscInfo->a[1]
-   */
-  int16_t    showType = pShowInfo->showType;
-  if (showType == TSDB_MGMT_TABLE_STB || showType == TSDB_MGMT_TABLE_VGROUP) {
-    SToken* pDbPrefixToken = &pShowInfo->prefix;
-    if (pDbPrefixToken->type != 0) {
-      if (pDbPrefixToken->n >= TSDB_DB_NAME_LEN) {  // db name is too long
-        return buildInvalidOperationMsg(pMsgBuf, msg3);
-      }
-
-      if (pDbPrefixToken->n <= 0) {
-        return buildInvalidOperationMsg(pMsgBuf, msg5);
-      }
-
-      if (parserValidateIdToken(pDbPrefixToken) != TSDB_CODE_SUCCESS) {
-        return buildInvalidOperationMsg(pMsgBuf, msg1);
-      }
-
-      //      int32_t ret = tNameSetDbName(&pTableMetaInfo->name, getAccountId(pRequest->pTsc), pDbPrefixToken);
-      //      if (ret != TSDB_CODE_SUCCESS) {
-      //        return buildInvalidOperationMsg(pMsgBuf, msg1);
-      //      }
-    }
-
-    // show table/stable like 'xxxx', set the like pattern for show tables
-    SToken* pPattern = &pShowInfo->pattern;
-    if (pPattern->type != 0) {
-      if (pPattern->type == TK_ID && pPattern->z[0] == TS_ESCAPE_CHAR) {
-        return buildInvalidOperationMsg(pMsgBuf, msg4);
-      }
-
-      pPattern->n = strdequote(pPattern->z);
-      if (pPattern->n <= 0) {
-        return buildInvalidOperationMsg(pMsgBuf, msg6);
-      }
-
-      if (pPattern->n > tsMaxWildCardsLen) {
-        char tmp[64] = {0};
-        sprintf(tmp, msg2, tsMaxWildCardsLen);
-        return buildInvalidOperationMsg(pMsgBuf, tmp);
-      }
-    }
-  } else if (showType == TSDB_MGMT_TABLE_VNODES) {
-    if (pShowInfo->prefix.type == 0) {
-      return buildInvalidOperationMsg(pMsgBuf, "No specified dnode ep");
-    }
-
-    if (pShowInfo->prefix.type == TK_STRING) {
-      pShowInfo->prefix.n = strdequote(pShowInfo->prefix.z);
-    }
-  }
-
-  *output = buildShowMsg(pShowInfo, pCtx, pMsgBuf->buf, pMsgBuf->len);
-  *outputLen = sizeof(SShowMsg)/* + htons(pShowMsg->payloadLen)*/;
-  return TSDB_CODE_SUCCESS;
-}
-
-// can only perform the parameters based on the macro definitation
-static int32_t doCheckDbOptions(SCreateDbMsg* pCreate, SMsgBuf* pMsgBuf) {
-  char msg[512] = {0};
-
-  if (pCreate->walLevel != -1 && (pCreate->walLevel < TSDB_MIN_WAL_LEVEL || pCreate->walLevel > TSDB_MAX_WAL_LEVEL)) {
-    snprintf(msg, tListLen(msg), "invalid db option walLevel: %d, only 1-2 allowed", pCreate->walLevel);
-    return buildInvalidOperationMsg(pMsgBuf, msg);
-  }
-
-  if (pCreate->replications != -1 &&
-      (pCreate->replications < TSDB_MIN_DB_REPLICA_OPTION || pCreate->replications > TSDB_MAX_DB_REPLICA_OPTION)) {
-    snprintf(msg, tListLen(msg), "invalid db option replications: %d valid range: [%d, %d]", pCreate->replications,
-             TSDB_MIN_DB_REPLICA_OPTION, TSDB_MAX_DB_REPLICA_OPTION);
-    return buildInvalidOperationMsg(pMsgBuf, msg);
-  }
-
-  int32_t blocks = ntohl(pCreate->totalBlocks);
-  if (blocks != -1 && (blocks < TSDB_MIN_TOTAL_BLOCKS || blocks > TSDB_MAX_TOTAL_BLOCKS)) {
-    snprintf(msg, tListLen(msg), "invalid db option totalBlocks: %d valid range: [%d, %d]", blocks,
-             TSDB_MIN_TOTAL_BLOCKS, TSDB_MAX_TOTAL_BLOCKS);
-    return buildInvalidOperationMsg(pMsgBuf, msg);
-  }
-
-  if (pCreate->quorum != -1 &&
-      (pCreate->quorum < TSDB_MIN_DB_QUORUM_OPTION || pCreate->quorum > TSDB_MAX_DB_QUORUM_OPTION)) {
-    snprintf(msg, tListLen(msg), "invalid db option quorum: %d valid range: [%d, %d]", pCreate->quorum,
-             TSDB_MIN_DB_QUORUM_OPTION, TSDB_MAX_DB_QUORUM_OPTION);
-    return buildInvalidOperationMsg(pMsgBuf, msg);
-  }
-
-  int32_t val = htonl(pCreate->daysPerFile);
-  if (val != -1 && (val < TSDB_MIN_DAYS_PER_FILE || val > TSDB_MAX_DAYS_PER_FILE)) {
-    snprintf(msg, tListLen(msg), "invalid db option daysPerFile: %d valid range: [%d, %d]", val,
-             TSDB_MIN_DAYS_PER_FILE, TSDB_MAX_DAYS_PER_FILE);
-    return buildInvalidOperationMsg(pMsgBuf, msg);
-  }
-
-  val = htonl(pCreate->cacheBlockSize);
-  if (val != -1 && (val < TSDB_MIN_CACHE_BLOCK_SIZE || val > TSDB_MAX_CACHE_BLOCK_SIZE)) {
-    snprintf(msg, tListLen(msg), "invalid db option cacheBlockSize: %d valid range: [%d, %d]", val,
-             TSDB_MIN_CACHE_BLOCK_SIZE, TSDB_MAX_CACHE_BLOCK_SIZE);
-    return buildInvalidOperationMsg(pMsgBuf, msg);
-  }
-
-  if (pCreate->precision != TSDB_TIME_PRECISION_MILLI && pCreate->precision != TSDB_TIME_PRECISION_MICRO &&
-      pCreate->precision != TSDB_TIME_PRECISION_NANO) {
-    snprintf(msg, tListLen(msg), "invalid db option timePrecision: %d valid value: [%d, %d, %d]", pCreate->precision,
-             TSDB_TIME_PRECISION_MILLI, TSDB_TIME_PRECISION_MICRO, TSDB_TIME_PRECISION_NANO);
-    return buildInvalidOperationMsg(pMsgBuf, msg);
-  }
-
-  val = htonl(pCreate->commitTime);
-  if (val != -1 && (val < TSDB_MIN_COMMIT_TIME || val > TSDB_MAX_COMMIT_TIME)) {
-    snprintf(msg, tListLen(msg), "invalid db option commitTime: %d valid range: [%d, %d]", val,
-             TSDB_MIN_COMMIT_TIME, TSDB_MAX_COMMIT_TIME);
-    return buildInvalidOperationMsg(pMsgBuf, msg);
-  }
-
-  val = htonl(pCreate->fsyncPeriod);
-  if (val != -1 && (val < TSDB_MIN_FSYNC_PERIOD || val > TSDB_MAX_FSYNC_PERIOD)) {
-    snprintf(msg, tListLen(msg), "invalid db option fsyncPeriod: %d valid range: [%d, %d]", val,
-             TSDB_MIN_FSYNC_PERIOD, TSDB_MAX_FSYNC_PERIOD);
-    return buildInvalidOperationMsg(pMsgBuf, msg);
-  }
-
-  if (pCreate->compression != -1 &&
-      (pCreate->compression < TSDB_MIN_COMP_LEVEL || pCreate->compression > TSDB_MAX_COMP_LEVEL)) {
-    snprintf(msg, tListLen(msg), "invalid db option compression: %d valid range: [%d, %d]", pCreate->compression,
-             TSDB_MIN_COMP_LEVEL, TSDB_MAX_COMP_LEVEL);
-    return buildInvalidOperationMsg(pMsgBuf, msg);
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-/* is contained in pFieldList or not */
-static bool has(SArray* pFieldList, int32_t startIndex, const char* name) {
-  size_t numOfCols = taosArrayGetSize(pFieldList);
-  for (int32_t j = startIndex; j < numOfCols; ++j) {
-    TAOS_FIELD* field = taosArrayGet(pFieldList, j);
-    if (strncasecmp(name, field->name, sizeof(field->name) - 1) == 0) return true;
-  }
-
-  return false;
-}
-
-static int32_t validateTableColumns(SArray* pFieldList, int32_t maxRowLength, int32_t maxColumns, SMsgBuf* pMsgBuf) {
-  const char* msg2 = "row length exceeds max length";
-  const char* msg3 = "duplicated column names";
-  const char* msg4 = "invalid data type";
-  const char* msg5 = "invalid binary/nchar column length";
-  const char* msg6 = "invalid column name";
-  const char* msg7 = "too many columns";
-  const char* msg8 = "illegal number of columns";
-
-  size_t numOfCols = taosArrayGetSize(pFieldList);
-  if (numOfCols > maxColumns) {
-    return buildInvalidOperationMsg(pMsgBuf, msg7);
-  }
-
-  int32_t rowLen = 0;
-  for (int32_t i = 0; i < numOfCols; ++i) {
-    TAOS_FIELD* pField = taosArrayGet(pFieldList, i);
-    if (!isValidDataType(pField->type)) {
-      return buildInvalidOperationMsg(pMsgBuf, msg4);
-    }
-
-    if (pField->bytes == 0) {
-      return buildInvalidOperationMsg(pMsgBuf, msg5);
-    }
-
-    if ((pField->type == TSDB_DATA_TYPE_BINARY && (pField->bytes <= 0 || pField->bytes > TSDB_MAX_BINARY_LEN)) ||
-        (pField->type == TSDB_DATA_TYPE_NCHAR && (pField->bytes <= 0 || pField->bytes > TSDB_MAX_NCHAR_LEN))) {
-      return buildInvalidOperationMsg(pMsgBuf, msg5);
-    }
-
-    SToken nameToken = {.z = pField->name, .n = strlen(pField->name), .type = TK_ID};
-    if (parserValidateNameToken(&nameToken) != TSDB_CODE_SUCCESS) {
-      return buildInvalidOperationMsg(pMsgBuf, msg6);
-    }
-
-    // field name must be unique
-    if (has(pFieldList, i + 1, pField->name) == true) {
-      return buildInvalidOperationMsg(pMsgBuf, msg3);
-    }
-
-    rowLen += pField->bytes;
-  }
-
-  // max row length must be less than TSDB_MAX_BYTES_PER_ROW
-  if (rowLen > maxRowLength) {
-    return buildInvalidOperationMsg(pMsgBuf, msg2);
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static int32_t validateTableColumnInfo(SArray* pFieldList, SMsgBuf* pMsgBuf) {
-  assert(pFieldList != NULL);
-
-  const char* msg1 = "first column must be timestamp";
-  const char* msg2 = "row length exceeds max length";
-  const char* msg3 = "duplicated column names";
-  const char* msg4 = "invalid data type";
-  const char* msg5 = "invalid binary/nchar column length";
-  const char* msg6 = "invalid column name";
-  const char* msg7 = "too many columns";
-  const char* msg8 = "illegal number of columns";
-
-  // first column must be timestamp
-  SField* pField = taosArrayGet(pFieldList, 0);
-  if (pField->type != TSDB_DATA_TYPE_TIMESTAMP) {
-    return buildInvalidOperationMsg(pMsgBuf, msg1);
-  }
-
-  // number of fields no less than 2
-  size_t numOfCols = taosArrayGetSize(pFieldList);
-  if (numOfCols <= 1) {
-    return buildInvalidOperationMsg(pMsgBuf, msg8);
-  }
-
-  return validateTableColumns(pFieldList, TSDB_MAX_BYTES_PER_ROW, TSDB_MAX_COLUMNS, pMsgBuf);
-}
-
-static int32_t validateTagParams(SArray* pTagsList, SArray* pFieldList, SMsgBuf* pMsgBuf) {
-  assert(pTagsList != NULL);
-
-  const char* msg1 = "invalid number of tag columns";
-  const char* msg3 = "duplicated column names";
-
-  // number of fields at least 1
-  size_t numOfTags = taosArrayGetSize(pTagsList);
-  if (numOfTags < 1) {
-    return buildInvalidOperationMsg(pMsgBuf, msg1);
-  }
-
-  // field name must be unique
-  for (int32_t i = 0; i < numOfTags; ++i) {
-    SField* p = taosArrayGet(pTagsList, i);
-    if (has(pFieldList, 0, p->name) == true) {
-      return buildInvalidOperationMsg(pMsgBuf, msg3);
-    }
-  }
-
-  return validateTableColumns(pFieldList, TSDB_MAX_TAGS_LEN, TSDB_MAX_TAGS, pMsgBuf);
-}
-
-int32_t doCheckForCreateTable(SSqlInfo* pInfo, SMsgBuf* pMsgBuf) {
-  const char* msg1 = "invalid table name";
-
-  SCreateTableSql* pCreateTable = pInfo->pCreateTableInfo;
-
-  SArray* pFieldList = pCreateTable->colInfo.pColumns;
-  SArray* pTagList = pCreateTable->colInfo.pTagColumns;
-  assert(pFieldList != NULL);
-
-  // if sql specifies db, use it, otherwise use default db
-  SToken* pzTableName = &(pCreateTable->name);
-
-  if (parserValidateNameToken(pzTableName) != TSDB_CODE_SUCCESS) {
-    return buildInvalidOperationMsg(pMsgBuf, msg1);
-  }
-
-  if (validateTableColumnInfo(pFieldList, pMsgBuf) != TSDB_CODE_SUCCESS ||
-      (pTagList != NULL && validateTagParams(pTagList, pFieldList, pMsgBuf) != TSDB_CODE_SUCCESS)) {
-    return TSDB_CODE_TSC_INVALID_OPERATION;
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-int32_t qParserValidateDclSqlNode(SSqlInfo* pInfo, SParseBasicCtx* pCtx, SDclStmtInfo* pDcl, char* msgBuf, int32_t msgBufLen) {
-  int32_t code = 0;
-
-  SMsgBuf m = {.buf = msgBuf, .len = msgBufLen};
-  SMsgBuf *pMsgBuf = &m;
-
-  switch (pInfo->type) {
-    case TSDB_SQL_CREATE_USER:
-    case TSDB_SQL_ALTER_USER: {
-      const char* msg1 = "not support options";
-      const char* msg2 = "invalid user/account name";
-      const char* msg3 = "name too long";
-      const char* msg4 = "invalid user rights";
-
-      SUserInfo* pUser = &pInfo->pMiscInfo->user;
-      SToken*    pName = &pUser->user;
-      SToken*    pPwd = &pUser->passwd;
-
-      if (pName->n >= TSDB_USER_LEN) {
-        return buildInvalidOperationMsg(pMsgBuf, msg3);
-      }
-
-      if (parserValidateIdToken(pName) != TSDB_CODE_SUCCESS) {
-        return buildInvalidOperationMsg(pMsgBuf, msg2);
-      }
-
-      if (pInfo->type == TSDB_SQL_CREATE_USER) {
-        if (parserValidatePassword(pPwd, pMsgBuf) != TSDB_CODE_SUCCESS) {
-          return TSDB_CODE_TSC_INVALID_OPERATION;
-        }
-      } else {
-        if (pUser->type == TSDB_ALTER_USER_PASSWD) {
-          if (parserValidatePassword(pPwd, pMsgBuf) != TSDB_CODE_SUCCESS) {
-            return TSDB_CODE_TSC_INVALID_OPERATION;
-          }
-        } else if (pUser->type == TSDB_ALTER_USER_PRIVILEGES) {
-          assert(pPwd->type == TSDB_DATA_TYPE_NULL);
-
-          SToken* pPrivilege = &pUser->privilege;
-          if (strncasecmp(pPrivilege->z, "super", 5) == 0 && pPrivilege->n == 5) {
-            //            pCmd->count = 1;
-          } else if (strncasecmp(pPrivilege->z, "normal", 4) == 0 && pPrivilege->n == 4) {
-            //            pCmd->count = 2;
-          } else {
-            return buildInvalidOperationMsg(pMsgBuf, msg4);
-          }
-        } else {
-          return buildInvalidOperationMsg(pMsgBuf, msg1);
-        }
-      }
-
-      pDcl->pMsg = (char*)buildUserManipulationMsg(pInfo, &pDcl->msgLen, pCtx->requestId, msgBuf, msgBufLen);
-      pDcl->msgType = (pInfo->type == TSDB_SQL_CREATE_USER)? TDMT_MND_CREATE_USER:TDMT_MND_ALTER_USER;
-      break;
-    }
-
-    case TSDB_SQL_CREATE_ACCT:
-    case TSDB_SQL_ALTER_ACCT: {
-      const char* msg1 = "invalid state option, available options[no, r, w, all]";
-      const char* msg2 = "invalid user/account name";
-      const char* msg3 = "name too long";
-
-      SToken* pName = &pInfo->pMiscInfo->user.user;
-      SToken* pPwd = &pInfo->pMiscInfo->user.passwd;
-
-      if (parserValidatePassword(pPwd, pMsgBuf) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_TSC_INVALID_OPERATION;
-      }
-
-      if (pName->n >= TSDB_USER_LEN) {
-        return buildInvalidOperationMsg(pMsgBuf, msg3);
-      }
-
-      if (parserValidateNameToken(pName) != TSDB_CODE_SUCCESS) {
-        return buildInvalidOperationMsg(pMsgBuf, msg2);
-      }
-
-      SCreateAcctInfo* pAcctOpt = &pInfo->pMiscInfo->acctOpt;
-      if (pAcctOpt->stat.n > 0) {
-        if (pAcctOpt->stat.z[0] == 'r' && pAcctOpt->stat.n == 1) {
-        } else if (pAcctOpt->stat.z[0] == 'w' && pAcctOpt->stat.n == 1) {
-        } else if (strncmp(pAcctOpt->stat.z, "all", 3) == 0 && pAcctOpt->stat.n == 3) {
-        } else if (strncmp(pAcctOpt->stat.z, "no", 2) == 0 && pAcctOpt->stat.n == 2) {
-        } else {
-          return buildInvalidOperationMsg(pMsgBuf, msg1);
-        }
-      }
-
-      pDcl->pMsg = (char*)buildAcctManipulationMsg(pInfo, &pDcl->msgLen, pCtx->requestId, msgBuf, msgBufLen);
-      pDcl->msgType = (pInfo->type == TSDB_SQL_CREATE_ACCT)? TDMT_MND_CREATE_ACCT:TDMT_MND_ALTER_ACCT;
-      break;
-    }
-
-    case TSDB_SQL_DROP_ACCT:
-    case TSDB_SQL_DROP_USER: {
-      pDcl->pMsg = (char*)buildDropUserMsg(pInfo, &pDcl->msgLen, pCtx->requestId, msgBuf, msgBufLen);
-      pDcl->msgType = (pInfo->type == TSDB_SQL_DROP_ACCT)? TDMT_MND_DROP_ACCT:TDMT_MND_DROP_USER;
-      break;
-    }
-    
-    case TSDB_SQL_SHOW: {
-      code = setShowInfo(&pInfo->pMiscInfo->showOpt, pCtx, (void**)&pDcl->pMsg, &pDcl->msgLen, pMsgBuf);
-      pDcl->msgType = TDMT_MND_SHOW;
-      break;
-    }
-
-    case TSDB_SQL_USE_DB: {
-      const char* msg = "invalid db name";
-
-      SToken* pToken = taosArrayGet(pInfo->pMiscInfo->a, 0);
-      if (parserValidateNameToken(pToken) != TSDB_CODE_SUCCESS) {
-        return buildInvalidOperationMsg(pMsgBuf, msg);
-      }
-
-      SName n = {0};
-      int32_t ret = tNameSetDbName(&n, pCtx->acctId, pToken->z, pToken->n);
-      if (ret != TSDB_CODE_SUCCESS) {
-        return buildInvalidOperationMsg(pMsgBuf, msg);
-      }
-
-      SUseDbMsg *pUseDbMsg = (SUseDbMsg *) calloc(1, sizeof(SUseDbMsg));
-      tNameExtractFullName(&n, pUseDbMsg->db);
-
-      pDcl->pMsg = (char*)pUseDbMsg;
-      pDcl->msgLen = sizeof(SUseDbMsg);
-      pDcl->msgType = TDMT_MND_USE_DB;
-      break;
-    }
-
-    case TSDB_SQL_ALTER_DB:
-    case TSDB_SQL_CREATE_DB: {
-      const char* msg1 = "invalid db name";
-      const char* msg2 = "name too long";
-
-      SCreateDbInfo* pCreateDB = &(pInfo->pMiscInfo->dbOpt);
-      if (pCreateDB->dbname.n >= TSDB_DB_NAME_LEN) {
-        return buildInvalidOperationMsg(pMsgBuf, msg2);
-      }
-
-      char buf[TSDB_DB_NAME_LEN] = {0};
-      SToken token = taosTokenDup(&pCreateDB->dbname, buf, tListLen(buf));
-
-      if (parserValidateNameToken(&token) != TSDB_CODE_SUCCESS) {
-        return buildInvalidOperationMsg(pMsgBuf, msg1);
-      }
-
-      SCreateDbMsg* pCreateMsg = buildCreateDbMsg(pCreateDB, pCtx, pMsgBuf);
-      if (doCheckDbOptions(pCreateMsg, pMsgBuf) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_TSC_INVALID_OPERATION;
-      }
-
-      pDcl->pMsg = (char*)pCreateMsg;
-      pDcl->msgLen = sizeof(SCreateDbMsg);
-      pDcl->msgType = (pInfo->type == TSDB_SQL_CREATE_DB)? TDMT_MND_CREATE_DB:TDMT_MND_ALTER_DB;
-      break;
-    }
-
-    case TSDB_SQL_DROP_DB: {
-      const char* msg1 = "invalid database name";
-
-      assert(taosArrayGetSize(pInfo->pMiscInfo->a) == 1);
-      SToken* dbName = taosArrayGet(pInfo->pMiscInfo->a, 0);
-
-      SName name = {0};
-      code = tNameSetDbName(&name, pCtx->acctId, dbName->z, dbName->n);
-      if (code != TSDB_CODE_SUCCESS) {
-        return buildInvalidOperationMsg(pMsgBuf, msg1);
-      }
-
-      SDropDbMsg *pDropDbMsg = (SDropDbMsg*) calloc(1, sizeof(SDropDbMsg));
-
-      code = tNameExtractFullName(&name, pDropDbMsg->db);
-      pDropDbMsg->ignoreNotExists = pInfo->pMiscInfo->existsCheck ? 1 : 0;
-      assert(code == TSDB_CODE_SUCCESS && name.type == TSDB_DB_NAME_T);
-
-      pDcl->msgType = TDMT_MND_DROP_DB;
-      pDcl->msgLen = sizeof(SDropDbMsg);
-      pDcl->pMsg = (char*)pDropDbMsg;
-      return TSDB_CODE_SUCCESS;
-    }
-
-    case TSDB_SQL_CREATE_TABLE: {
-      SCreateTableSql* pCreateTable = pInfo->pCreateTableInfo;
-
-      if (pCreateTable->type == TSQL_CREATE_TABLE || pCreateTable->type == TSQL_CREATE_STABLE) {
-        if ((code = doCheckForCreateTable(pInfo, pMsgBuf)) != TSDB_CODE_SUCCESS) {
-          return code;
-        }
-        pDcl->pMsg = (char*)buildCreateTableMsg(pCreateTable, &pDcl->msgLen, pCtx, pMsgBuf);
-        pDcl->msgType = (pCreateTable->type == TSQL_CREATE_TABLE)? TDMT_MND_CREATE_TABLE:TDMT_MND_CREATE_STB;
-      } else if (pCreateTable->type == TSQL_CREATE_CTABLE) {
-        //        if ((code = doCheckForCreateFromStable(pSql, pInfo)) != TSDB_CODE_SUCCESS) {
-        //          return code;
-        //        }
-
-      } else if (pCreateTable->type == TSQL_CREATE_STREAM) {
-        //        if ((code = doCheckForStream(pSql, pInfo)) != TSDB_CODE_SUCCESS) {
-        //          return code;
-      }
-
-      break;
-    }
-
-    case TSDB_SQL_DROP_TABLE: {
-      pDcl->pMsg = (char*)buildDropTableMsg(pInfo, &pDcl->msgLen, pCtx, pMsgBuf);
-      if (pDcl->pMsg == NULL) {
-        return terrno;
-      }
-
-      pDcl->msgType = TDMT_MND_DROP_STB;
-      return TSDB_CODE_SUCCESS;
-      break;
-    }
-
-    default:
-      break;
-  }
-
   return code;
 }
diff --git a/source/libs/transport/src/rpcMain.c b/source/libs/transport/src/rpcMain.c
index a9098b5053f5a558f8236851f815213d0de74976..19fe803035ee654a9841b0ba0bb442f614736304 100644
--- a/source/libs/transport/src/rpcMain.c
+++ b/source/libs/transport/src/rpcMain.c
@@ -605,7 +605,7 @@ static SRpcConn *rpcOpenConn(SRpcInfo *pRpc, char *peerFqdn, uint16_t peerPort,
       void *shandle = (connType & RPC_CONN_TCP)? pRpc->tcphandle:pRpc->udphandle;
       pConn->chandle = (*taosOpenConn[connType])(shandle, pConn, pConn->peerIp, pConn->peerPort);
       if (pConn->chandle == NULL) {
-        tError("failed to connect to:0x%x:%d", pConn->peerIp, pConn->peerPort);
+        tError("failed to connect to:%s:%d", taosIpStr(pConn->peerIp), pConn->peerPort);
 
         terrno = TSDB_CODE_RPC_NETWORK_UNAVAIL;
         rpcCloseConn(pConn);
diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c
index 5bac59f913462efd0118852d6f39fb047b3713e2..7e7f673943c7e7b92b7895c61c3dcf311afd967b 100644
--- a/source/util/src/tlog.c
+++ b/source/util/src/tlog.c
@@ -19,7 +19,7 @@
 #include "tnote.h"
 #include "tutil.h"
 #include "ulog.h"
-#include "zlib.h"
+//#include "zlib.h"
 
 #define MAX_LOGLINE_SIZE (1000)
 #define MAX_LOGLINE_BUFFER_SIZE (MAX_LOGLINE_SIZE + 10)
@@ -724,7 +724,7 @@ int32_t taosCompressFile(char *srcFileName, char *destFileName) {
   int32_t len = 0;
   char   *data = malloc(compressSize);
   FILE   *srcFp = NULL;
-  gzFile  dstFp = NULL;
+//  gzFile  dstFp = NULL;
 
   srcFp = fopen(srcFileName, "r");
   if (srcFp == NULL) {
@@ -738,25 +738,25 @@ int32_t taosCompressFile(char *srcFileName, char *destFileName) {
     goto cmp_end;
   }
 
-  dstFp = gzdopen(fd, "wb6f");
-  if (dstFp == NULL) {
-    ret = -3;
-    close(fd);
-    goto cmp_end;
-  }
-
-  while (!feof(srcFp)) {
-    len = (int32_t)fread(data, 1, compressSize, srcFp);
-    (void)gzwrite(dstFp, data, len);
-  }
+//  dstFp = gzdopen(fd, "wb6f");
+//  if (dstFp == NULL) {
+//    ret = -3;
+//    close(fd);
+//    goto cmp_end;
+//  }
+//
+//  while (!feof(srcFp)) {
+//    len = (int32_t)fread(data, 1, compressSize, srcFp);
+//    (void)gzwrite(dstFp, data, len);
+//  }
 
 cmp_end:
   if (srcFp) {
     fclose(srcFp);
   }
-  if (dstFp) {
-    gzclose(dstFp);
-  }
+//  if (dstFp) {
+//    gzclose(dstFp);
+//  }
   free(data);
 
   return ret;