Merge branch 'develop' into feature/liaohj

documentation/tdenginedocs-cn/getting-started/index.html

@@ -28,7 +28,7 @@
 <p>在TDengine终端中，用户可以通过SQL命令来创建/删除数据库、表等，并进行插入查询操作。在终端中运行的SQL语句需要以分号结束来运行。示例：</p>
 <pre><code class="mysql language-mysql">create database db;
 use db;
-create table t (ts timestamp, cdata int);
+create table t (ts timestamp, speed int);
 insert into t values ('2019-07-15 00:00:00', 10);
 insert into t values ('2019-07-15 01:00:00', 20);
 select * from t;

documentation/tdenginedocs-en/getting-started/index.html

@@ -28,7 +28,7 @@
 <p>In the TDengine shell, you can create databases, create tables and insert/query data with SQL. Each query command ends with a semicolon. It works like MySQL, for example:</p>
 <pre><code class="mysql language-mysql">create database db;
 use db;
-create table t (ts timestamp, cdata int);
+create table t (ts timestamp, speed int);
 insert into t values ('2019-07-15 10:00:00', 10);
 insert into t values ('2019-07-15 10:01:05', 20);
 select * from t;

packaging/release.sh

@@ -109,6 +109,7 @@ build_time=$(date +"%F %R")
 echo "char version[64] = \"${version}\";" > ${versioninfo}
 echo "char compatible_version[64] = \"${compatible_version}\";" >> ${versioninfo}
 echo "char gitinfo[128] = \"$(git rev-parse --verify HEAD)\";"  >> ${versioninfo}
+echo "char gitinfoOfInternal[128] = \"\";"  >> ${versioninfo}
 echo "char buildinfo[512] = \"Built by ${USER} at ${build_time}\";"  >> ${versioninfo}
 
 # 2. cmake executable file

src/client/src/tscFunctionImpl.c

@@ -13,8 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
-
 #include "os.h"
 #include "taosmsg.h"
 #include "tast.h"

src/client/src/tscParseInsert.c

@@ -18,9 +18,6 @@
 
 #define _XOPEN_SOURCE
 
-#pragma GCC diagnostic ignored "-Woverflow"
-#pragma GCC diagnostic ignored "-Wunused-variable"
-
 #include "os.h"
 #include "ihash.h"
 #include "tscSecondaryMerge.h"
@@ -444,7 +441,7 @@ int tsParseOneRowData(char **str, STableDataBlocks *pDataBlocks, SSchema schema[
           }
         }
       
-        tmpTokenBuf[j] = sToken.z[i];
+        tmpTokenBuf[j] = sToken.z[k];
         j++;
       }
       tmpTokenBuf[j] = 0; 

src/client/src/tscPrepare.c

@@ -75,7 +75,6 @@ static int normalStmtAddPart(SNormalStmt* stmt, bool isParam, char* str, uint32_
   if (isParam) {
     ++stmt->numParams;
   }
-
   return TSDB_CODE_SUCCESS;
 }
 

src/client/src/tscProfile.c

@@ -198,7 +198,9 @@ void tscKillStream(STscObj *pObj, uint32_t killId) {
 
   pthread_mutex_unlock(&pObj->mutex);
   
+  if (pStream) {
     tscTrace("%p stream:%p is killed, streamId:%d", pStream->pSql, pStream, killId);
+  }
 
   taos_close_stream(pStream);
   if (pStream->callback) {

src/client/src/tscSQLParser.c

@@ -28,8 +28,6 @@
 #include "tsclient.h"
 #include "tscSQLParser.h"
 
-#pragma GCC diagnostic ignored "-Wunused-variable"
-
 #define DEFAULT_PRIMARY_TIMESTAMP_COL_NAME "_c0"
 
 // -1 is tbname column index, so here use the -2 as the initial value
@@ -248,7 +246,6 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     }
 
     case USE_DATABASE: {
-      const char* msg = "db name too long";
       pCmd->command = TSDB_SQL_USE_DB;
 
       SSQLToken* pToken = &pInfo->pDCLInfo->a[0];
@@ -258,6 +255,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       }
 
       if (pToken->n > TSDB_DB_NAME_LEN) {
+        const char* msg = "db name too long"; 
         return invalidSqlErrMsg(pCmd, msg);
       }
 
@@ -295,8 +293,6 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
     case ALTER_DATABASE:
     case CREATE_DATABASE: {
-      const char* msg2 = "name too long";
-      const char* msg3 = "invalid db name";
 
       if (pInfo->sqlType == ALTER_DATABASE) {
         pCmd->command = TSDB_SQL_ALTER_DB;
@@ -307,11 +303,13 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
       SCreateDBInfo* pCreateDB = &(pInfo->pDCLInfo->dbOpt);
       if (tscValidateName(&pCreateDB->dbname) != TSDB_CODE_SUCCESS) {
+        const char* msg3 = "invalid db name";
         return invalidSqlErrMsg(pCmd, msg3);
       }
 
       int32_t ret = setObjFullName(pMeterMetaInfo->name, getAccountId(pSql), &(pCreateDB->dbname), NULL, NULL);
       if (ret != TSDB_CODE_SUCCESS) {
+        const char* msg2 = "name too long"; 
         return invalidSqlErrMsg(pCmd, msg2);
       }
 
@@ -347,13 +345,8 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       pCmd->command = (pInfo->sqlType == CREATE_USER) ? TSDB_SQL_CREATE_USER : TSDB_SQL_CREATE_ACCT;
       assert(pInfo->pDCLInfo->nTokens >= 2);
 
-      const char* msg = "name or password too long";
-      const char* msg1 = "password can not be empty";
-      const char* msg2 = "invalid user/account name";
-      const char* msg3 = "password needs single quote marks enclosed";
-      const char* msg4 = "invalid state option, available options[no, r, w, all]";
-
       if (pInfo->pDCLInfo->a[1].type != TK_STRING) {
+        const char* msg3 = "password needs single quote marks enclosed";
         return invalidSqlErrMsg(pCmd, msg3);
       }
 
@@ -362,14 +355,17 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       pInfo->pDCLInfo->a[1].n = strlen(pInfo->pDCLInfo->a[1].z);
 
       if (pInfo->pDCLInfo->a[1].n <= 0) {
+        const char* msg1 = "password can not be empty";
         return invalidSqlErrMsg(pCmd, msg1);
       }
 
       if (pInfo->pDCLInfo->a[0].n > TSDB_USER_LEN || pInfo->pDCLInfo->a[1].n > TSDB_PASSWORD_LEN) {
+        const char* msg = "name or password too long";
         return invalidSqlErrMsg(pCmd, msg); 
       }
 
       if (tscValidateName(&pInfo->pDCLInfo->a[0]) != TSDB_CODE_SUCCESS) {
+        const char* msg2 = "invalid user/account name";
         return invalidSqlErrMsg(pCmd, msg2); 
       }
 
@@ -403,6 +399,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
           } else if (strncmp(pAcctOpt->stat.z, "no", 2) == 0 && pAcctOpt->stat.n == 2) {
             pCmd->defaultVal[8] = 0;
           } else {
+            const char* msg4 = "invalid state option, available options[no, r, w, all]";
             return invalidSqlErrMsg(pCmd, msg4); 
           }
         }
@@ -415,13 +412,10 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       assert(num >= 1 && num <= 2);
 
       const char* msg = "password too long";
-      const char* msg1 = "password can not be empty";
-      const char* msg2 = "invalid user/account name";
-      const char* msg3 = "password needs single quote marks enclosed";
-      const char* msg4 = "invalid state option, available options[no, r, w, all]";
 
       if (num == 2) {
         if (pInfo->pDCLInfo->a[1].type != TK_STRING) {
+          const char* msg3 = "password needs single quote marks enclosed";
           return invalidSqlErrMsg(pCmd, msg3);
         }
 
@@ -430,6 +424,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         pInfo->pDCLInfo->a[1].n = strlen(pInfo->pDCLInfo->a[1].z);
 
         if (pInfo->pDCLInfo->a[1].n <= 0) {
+          const char* msg1 = "password can not be empty";
           return invalidSqlErrMsg(pCmd, msg1);
         }
 
@@ -445,6 +440,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       }
 
       if (tscValidateName(&pInfo->pDCLInfo->a[0]) != TSDB_CODE_SUCCESS) {
+        const char* msg2 = "invalid user/account name";
         return invalidSqlErrMsg(pCmd, msg2);
       }
 
@@ -475,6 +471,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         } else if (strncmp(pAcctOpt->stat.z, "no", 2) == 0 && pAcctOpt->stat.n == 2) {
           pCmd->defaultVal[8] = 0;
         } else {
+          const char* msg4 = "invalid state option, available options[no, r, w, all]";
           return invalidSqlErrMsg(pCmd, msg4);
         }
       }
@@ -1868,8 +1865,6 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, int32_t colIdx, tSQLExprItem* pItem
   SMeterMetaInfo* pMeterMetaInfo = NULL;
   int32_t         optr = pItem->pNode->nSQLOptr;
 
-  int32_t numOfAddedColumn = 1;
-
   const char* msg1 = "not support column types";
   const char* msg2 = "invalid parameters";
   const char* msg3 = "illegal column name";
@@ -2166,6 +2161,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, int32_t colIdx, tSQLExprItem* pItem
       int16_t resultSize = pSchema[index.columnIndex].bytes;
 
       char val[8] = {0};
+      int32_t numOfAddedColumn = 1; 
       if (optr == TK_PERCENTILE || optr == TK_APERCENTILE) {
         tVariantDump(pVariant, val, TSDB_DATA_TYPE_DOUBLE);
 
@@ -2190,6 +2186,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, int32_t colIdx, tSQLExprItem* pItem
         SSqlExpr* pExpr = tscSqlExprInsert(pCmd, colIdx, functionId, &index, resultType, resultSize, resultSize);
         addExprParams(pExpr, val, TSDB_DATA_TYPE_DOUBLE, sizeof(double), 0);
       } else {
+
         tVariantDump(pVariant, val, TSDB_DATA_TYPE_BIGINT);
 
         int64_t nTop = *((int32_t*)val);

src/client/src/tscSecondaryMerge.c

@@ -1314,8 +1314,10 @@ int32_t tscLocalDoReduce(SSqlObj *pSql) {
     tscTrace("%s call the drop local reducer", __FUNCTION__);
 
     tscDestroyLocalReducer(pSql);
+    if (pRes) {
       pRes->numOfRows = 0;
       pRes->row = 0;
+    }
     return 0;
   }
 

src/client/src/tscServer.c

@@ -2312,6 +2312,7 @@ int tscBuildCreateTableMsg(SSqlObj *pSql) {
   size = tscEstimateCreateTableMsgLength(pSql);
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, size)) {
     tscError("%p failed to malloc for create table msg", pSql);
+    free(tmpData); 
     return -1;
   }
 

src/inc/tglobalcfg.h

@@ -179,6 +179,7 @@ extern int  tsUdpDelay;
 extern char version[];
 extern char compatible_version[];
 extern char gitinfo[];
+extern char gitinfoOfInternal[];
 extern char buildinfo[];
 
 extern char tsTimezone[64];

src/inc/tutil.h

@@ -37,8 +37,8 @@ extern "C" {
 #define tfree(x) \
   {              \
     if (x) {     \
-      free(x);   \
-      x = NULL;  \
+      free((void*)(x));   \
+      x = 0;  \
     }            \
   }
 
@@ -189,6 +189,8 @@ static FORCE_INLINE void taosEncryptPass(uint8_t *inBuf, unsigned int inLen, cha
 
 char *taosIpStr(uint32_t ipInt);
 
+uint32_t ip2uint(const char *const ip_addr);
+
 #define TAOS_ALLOC_MODE_DEFAULT 0
 #define TAOS_ALLOC_MODE_RANDOM_FAIL 1
 #define TAOS_ALLOC_MODE_DETECT_LEAK 2

src/kit/shell/src/shellEngine.c

@@ -780,6 +780,7 @@ void source_file(TAOS *con, char *fptr) {
 
   if (wordexp(fptr, &full_path, 0) != 0) {
     fprintf(stderr, "ERROR: illegal file name\n");
+    free(cmd);
     return;
   }
 
@@ -788,6 +789,7 @@ void source_file(TAOS *con, char *fptr) {
   if (access(fname, R_OK) == -1) {
     fprintf(stderr, "ERROR: file %s is not readable\n", fptr);
     wordfree(&full_path);
+    free(cmd);
     return;
   }
 
@@ -795,6 +797,7 @@ void source_file(TAOS *con, char *fptr) {
   if (f == NULL) {
     fprintf(stderr, "ERROR: failed to open file %s\n", fname);
     wordfree(&full_path);
+    free(cmd);
     return;
   }
 

src/kit/shell/src/shellLinux.c

@@ -277,7 +277,10 @@ void *shellLoopQuery(void *arg) {
   pthread_cleanup_push(cleanup_handler, NULL);
 
   char *command = malloc(MAX_COMMAND_SIZE);
-
+  if (command == NULL){
+    tscError("failed to malloc command");
+    return NULL;
+  }
   while (1) {
     // Read command from shell.
 
@@ -286,11 +289,9 @@ void *shellLoopQuery(void *arg) {
     shellReadCommand(con, command);
     reset_terminal_mode();
 
-    if (command != NULL) {
     // Run the command
     shellRunCommand(con, command);
   }
-  }
 
   pthread_cleanup_pop(1);
 

src/kit/taosdemo/taosdemo.c

@@ -33,8 +33,6 @@
 
 extern char configDir[];
 
-#pragma GCC diagnostic ignored "-Wmissing-braces"
-
 #define BUFFER_SIZE      65536
 #define MAX_DB_NAME_SIZE 64
 #define MAX_TB_NAME_SIZE 64

src/modules/http/src/gcJson.c

@@ -119,7 +119,7 @@ bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
     cmd->numOfRows += numOfRows;
   }
 
-  for (int i = 0; i < numOfRows; ++i) {
+  for (int k = 0; k < numOfRows; ++k) {
     TAOS_ROW row = taos_fetch_row(result);
 
     // for group by

src/modules/http/src/httpServer.c

@@ -106,7 +106,7 @@ void httpCleanUpContextTimer(HttpContext *pContext) {
   }
 }
 
-void httpCleanUpContext(HttpContext *pContext) {
+void httpCleanUpContext(HttpContext *pContext, void *unused) {
   httpTrace("context:%p, start the clean up operation, sig:%p", pContext, pContext->signature);
   void *sig = atomic_val_compare_exchange_ptr(&pContext->signature, pContext, 0);
   if (sig == NULL) {
@@ -184,7 +184,7 @@ bool httpInitContext(HttpContext *pContext) {
 
 
 void httpCloseContext(HttpThread *pThread, HttpContext *pContext) {
-  taosTmrReset(httpCleanUpContext, HTTP_DELAY_CLOSE_TIME_MS, pContext, pThread->pServer->timerHandle, &pContext->timer);
+  taosTmrReset((TAOS_TMR_CALLBACK)httpCleanUpContext, HTTP_DELAY_CLOSE_TIME_MS, pContext, pThread->pServer->timerHandle, &pContext->timer);
   httpTrace("context:%p, fd:%d, ip:%s, state:%s will be closed after:%d ms, timer:%p",
           pContext, pContext->fd, pContext->ipstr, httpContextStateStr(pContext->state), HTTP_DELAY_CLOSE_TIME_MS, pContext->timer);
 }
@@ -273,7 +273,7 @@ void httpCleanUpConnect(HttpServer *pServer) {
     taosCloseSocket(pThread->pollFd);
 
     while (pThread->pHead) {
-      httpCleanUpContext(pThread->pHead);
+      httpCleanUpContext(pThread->pHead, 0);
     }
 
     pthread_cancel(pThread->thread);

src/modules/http/src/restJson.c

@@ -94,7 +94,7 @@ bool restBuildSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
   int         num_fields = taos_num_fields(result);
   TAOS_FIELD *fields = taos_fetch_fields(result);
 
-  for (int i = 0; i < numOfRows; ++i) {
+  for (int k = 0; k < numOfRows; ++k) {
     TAOS_ROW row = taos_fetch_row(result);
 
     // data row array begin

src/modules/http/src/tgHandle.c

@@ -215,7 +215,7 @@ ParseEnd:
   }
 }
 
-int tgParseSchema(char *content, char*fileName) {
+int tgParseSchema(const char *content, char*fileName) {
   cJSON *root = cJSON_Parse(content);
   if (root == NULL) {
     httpError("failed to parse telegraf schema file:%s, invalid json format, content:%s", fileName, content);
@@ -248,7 +248,7 @@ int tgParseSchema(char *content, char*fileName) {
   return size;
 }
 
-int tgReadSchema(const char *fileName) {
+int tgReadSchema(char *fileName) {
   FILE *fp = fopen(fileName, "r");
   if (fp == NULL) {
     return -1;
@@ -262,6 +262,8 @@ int tgReadSchema(const char *fileName) {
   size_t result = fread(content, 1, contentSize, fp);
   if (result != contentSize) {
     httpError("failed to read telegraf schema file:%s", fileName);
+    fclose(fp);
+    free(content);
     return -1;
   }
 

src/os/linux/src/tsystem.c

@@ -124,7 +124,7 @@ bool taosGetSysCpuInfo(SysCpuInfo *cpuInfo) {
   }
 
   char cpu[10] = {0};
-  sscanf(line, "%s %ld %ld %ld %ld", cpu, &cpuInfo->user, &cpuInfo->nice, &cpuInfo->system, &cpuInfo->idle);
+  sscanf(line, "%s %lu %lu %lu %lu", cpu, &cpuInfo->user, &cpuInfo->nice, &cpuInfo->system, &cpuInfo->idle);
 
   tfree(line);
   fclose(fp);
@@ -150,7 +150,7 @@ bool taosGetProcCpuInfo(ProcCpuInfo *cpuInfo) {
   for (int i = 0, blank = 0; line[i] != 0; ++i) {
     if (line[i] == ' ') blank++;
     if (blank == PROCESS_ITEM) {
-      sscanf(line + i + 1, "%ld %ld %ld %ld", &cpuInfo->utime, &cpuInfo->stime, &cpuInfo->cutime, &cpuInfo->cstime);
+      sscanf(line + i + 1, "%lu %lu %lu %lu", &cpuInfo->utime, &cpuInfo->stime, &cpuInfo->cutime, &cpuInfo->cstime);
       break;
     }
   }

src/rpc/src/trpc.c

@@ -246,9 +246,7 @@ char *taosBuildReqHeader(void *param, char type, char *msg) {
   pHeader->destId = pConn->peerId;
   pHeader->port = 0;
 
-#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
-  pHeader->uid = (uint32_t)pConn + (uint32_t)getpid();
-#pragma GCC diagnostic warning "-Wpointer-to-int-cast"
+  pHeader->uid = (uint32_t)((int64_t)pConn + (int64_t)getpid());
 
   memcpy(pHeader->meterId, pConn->meterId, tListLen(pHeader->meterId));
 
@@ -280,9 +278,7 @@ char *taosBuildReqMsgWithSize(void *param, char type, int size) {
   pHeader->sourceId = pConn->ownId;
   pHeader->destId = pConn->peerId;
 
-#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
-  pHeader->uid = (uint32_t)pConn + (uint32_t)getpid();
-#pragma GCC diagnostic warning "-Wpointer-to-int-cast"
+  pHeader->uid = (uint32_t)((int64_t)pConn + (int64_t)getpid());
 
   memcpy(pHeader->meterId, pConn->meterId, tListLen(pHeader->meterId));
 

src/system/detail/inc/mgmt.h

@@ -419,7 +419,7 @@ void mgmtCleanupBalance();
 int  mgmtAllocVnodes(SVgObj *pVgroup);
 void mgmtSetDnodeShellRemoving(SDnodeObj *pDnode);
 void mgmtSetDnodeUnRemove(SDnodeObj *pDnode);
-void mgmtStartBalanceTimer(int mseconds);
+void mgmtStartBalanceTimer(int64_t mseconds);
 void mgmtSetDnodeOfflineOnSdbChanged();
 void mgmtUpdateVgroupState(SVgObj *pVgroup, int lbStatus, int srcIp);
 bool mgmtAddVnode(SVgObj *pVgroup, SDnodeObj *pSrcDnode, SDnodeObj *pDestDnode);

src/system/detail/src/dnodeService.c

@@ -62,6 +62,7 @@ int main(int argc, char *argv[]) {
       #endif
       
       printf("gitinfo: %s\n", gitinfo);
+      printf("gitinfoI: %s\n", gitinfoOfInternal);
       printf("buildinfo: %s\n", buildinfo);
       return 0;
     } else if (strcmp(argv[i], "-k") == 0) {

src/system/detail/src/dnodeSystem.c

@@ -26,9 +26,6 @@
 #include "tglobalcfg.h"
 #include "vnode.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Woverflow"
-
 SModule         tsModule[TSDB_MOD_MAX] = {0};
 uint32_t        tsModuleStatus = 0;
 pthread_mutex_t dmutex;
@@ -219,5 +216,3 @@ void dnodeCountRequest(SCountInfo *info) {
   info->selectReqNum = atomic_exchange_32(&vnodeSelectReqNum, 0);
   info->insertReqNum = atomic_exchange_32(&vnodeInsertReqNum, 0);
 }
-
-#pragma GCC diagnostic pop
\ No newline at end of file

src/system/detail/src/mgmtDb.c

@@ -54,8 +54,8 @@ void mgmtDbActionInit() {
 }
 
 void *mgmtDbAction(char action, void *row, char *str, int size, int *ssize) {
-  if (mgmtDbActionFp[action] != NULL) {
-    return (*(mgmtDbActionFp[action]))(row, str, size, ssize);
+  if (mgmtDbActionFp[(uint8_t)action] != NULL) {
+    return (*(mgmtDbActionFp[(uint8_t)action]))(row, str, size, ssize);
   }
   return NULL;
 }

src/system/detail/src/mgmtDnode.c

@@ -461,7 +461,6 @@ int mgmtRetrieveVnodes(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
   SDnodeObj *pDnode = NULL;
   char *     pWrite;
   int        cols = 0;
-  char       ipstr[20];
 
   if (0 == rows) return 0;
 

src/system/detail/src/mgmtMeter.c

@@ -418,8 +418,8 @@ void *mgmtMeterActionAfterBatchUpdate(void *row, char *str, int size, int *ssize
 }
 
 void *mgmtMeterAction(char action, void *row, char *str, int size, int *ssize) {
-  if (mgmtMeterActionFp[action] != NULL) {
-    return (*(mgmtMeterActionFp[action]))(row, str, size, ssize);
+  if (mgmtMeterActionFp[(uint8_t)action] != NULL) {
+    return (*(mgmtMeterActionFp[(uint8_t)action]))(row, str, size, ssize);
   }
   return NULL;
 }

src/system/detail/src/mgmtShell.c

@@ -23,12 +23,6 @@
 #include "tlog.h"
 #include "tstatus.h"
 
-#pragma GCC diagnostic push
-
-#pragma GCC diagnostic ignored "-Woverflow"
-#pragma GCC diagnostic ignored "-Wpointer-sign"
-#pragma GCC diagnostic ignored "-Wint-conversion"
-
 #define MAX_LEN_OF_METER_META (sizeof(SMultiMeterMeta) + sizeof(SSchema) * TSDB_MAX_COLUMNS + sizeof(SSchema) * TSDB_MAX_TAGS + TSDB_MAX_TAGS_LEN)
 
 void *    pShellConn = NULL;
@@ -695,7 +689,7 @@ int mgmtProcessAlterUserMsg(char *pMsg, int msgLen, SConnObj *pConn) {
              (strcmp(pConn->pUser->user, "root") == 0)) {
     if ((pAlter->flag & TSDB_ALTER_USER_PASSWD) != 0) {
       memset(pUser->pass, 0, sizeof(pUser->pass));
-      taosEncryptPass(pAlter->pass, strlen(pAlter->pass), pUser->pass);
+      taosEncryptPass((uint8_t *)pAlter->pass, strlen(pAlter->pass), pUser->pass);
     }
     if ((pAlter->flag & TSDB_ALTER_USER_PRIVILEGES) != 0) {
       if (pAlter->privilege == 1) {  // super
@@ -840,11 +834,11 @@ int mgmtProcessShowMsg(char *pMsg, int msgLen, SConnObj *pConn) {
     pShowRsp->qhandle = (uint64_t)pShow;  // qhandle;
     pConn->qhandle = pShowRsp->qhandle;
 
-    code = (*mgmtGetMetaFp[pShowMsg->type])(&pShowRsp->meterMeta, pShow, pConn);
+    code = (*mgmtGetMetaFp[(uint8_t)pShowMsg->type])(&pShowRsp->meterMeta, pShow, pConn);
     if (code == 0) {
       pMsg += sizeof(SShowRspMsg) + sizeof(SSchema) * pShow->numOfColumns;
     } else {
-      mError("pShow:%p, type:%d %s, failed to get Meta, code:%d", pShow, pShowMsg->type, taosMsg[pShowMsg->type], code);
+      mError("pShow:%p, type:%d %s, failed to get Meta, code:%d", pShow, pShowMsg->type, taosMsg[(uint8_t)pShowMsg->type], code);
       free(pShow);
     }
   }
@@ -915,7 +909,7 @@ int mgmtProcessRetrieveMsg(char *pMsg, int msgLen, SConnObj *pConn) {
 
     // if free flag is set, client wants to clean the resources
     if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE)
-      rowsRead = (*mgmtRetrieveFp[pShow->type])(pShow, pRsp->data, rowsToRead, pConn);
+      rowsRead = (*mgmtRetrieveFp[(uint8_t)pShow->type])(pShow, pRsp->data, rowsToRead, pConn);
 
     if (rowsRead < 0) {
       rowsRead = 0;
@@ -931,7 +925,7 @@ int mgmtProcessRetrieveMsg(char *pMsg, int msgLen, SConnObj *pConn) {
   taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
 
   if (rowsToRead == 0) {
-    uintptr_t oldSign = atomic_val_compare_exchange_ptr(&pShow->signature, pShow, 0);
+    uintptr_t oldSign = (uintptr_t)atomic_val_compare_exchange_ptr(&pShow->signature, pShow, 0);
     if (oldSign != (uintptr_t)pShow) {
       return msgLen;
     }
@@ -1139,8 +1133,9 @@ void mgmtEstablishConn(SConnObj *pConn) {
     }
   }
 
-  uint32_t temp;
-  taosGetRpcConnInfo(pConn->thandle, &temp, &pConn->ip, &pConn->port, &temp, &temp);
+  int32_t tempint32;
+  uint32_t tempuint32;
+  taosGetRpcConnInfo(pConn->thandle, &tempuint32, &pConn->ip, &pConn->port, &tempint32, &tempint32);
   mgmtAddConnIntoAcct(pConn);
 }
 
@@ -1368,5 +1363,3 @@ void mgmtInitProcessShellMsg() {
   mgmtProcessShellMsg[TSDB_MSG_TYPE_KILL_STREAM] = mgmtProcessKillStreamMsg;
   mgmtProcessShellMsg[TSDB_MSG_TYPE_KILL_CONNECTION] = mgmtProcessKillConnectionMsg;
 }
-
-#pragma GCC diagnostic pop

src/system/detail/src/mgmtSupertableQuery.c

@@ -692,7 +692,9 @@ static int32_t mgmtFilterMeterByIndex(STabObj* pMetric, tQueryResultset* pRes, c
     return TSDB_CODE_OPS_NOT_SUPPORT;
   } else {  // query according to the binary expression
     SSyntaxTreeFilterSupporter s = {.pTagSchema = pTagSchema, .numOfTags = pMetric->numOfTags};
-    SBinaryFilterSupp          supp = {.fp = tSkipListNodeFilterCallback, .setupInfoFn = filterPrepare, .pExtInfo = &s};
+    SBinaryFilterSupp          supp = {.fp = (__result_filter_fn_t)tSkipListNodeFilterCallback,
+                                       .setupInfoFn = (__do_filter_suppl_fn_t)filterPrepare,
+                                       .pExtInfo = &s};
 
     tSQLBinaryExprTraverse(pExpr, pMetric->pSkipList, pRes, &supp);
     tSQLBinaryExprDestroy(&pExpr, tSQLListTraverseDestroyInfo);

src/system/detail/src/mgmtUser.c

@@ -54,8 +54,8 @@ void mgmtUserActionInit() {
 }
 
 void *mgmtUserAction(char action, void *row, char *str, int size, int *ssize) {
-  if (mgmtUserActionFp[action] != NULL) {
-    return (*(mgmtUserActionFp[action]))(row, str, size, ssize);
+  if (mgmtUserActionFp[(uint8_t)action] != NULL) {
+    return (*(mgmtUserActionFp[(uint8_t)action]))(row, str, size, ssize);
   }
   return NULL;
 }

src/system/detail/src/mgmtVgroup.c

@@ -55,8 +55,8 @@ void mgmtVgroupActionInit() {
 }
 
 void *mgmtVgroupAction(char action, void *row, char *str, int size, int *ssize) {
-  if (mgmtVgroupActionFp[action] != NULL) {
-    return (*(mgmtVgroupActionFp[action]))(row, str, size, ssize);
+  if (mgmtVgroupActionFp[(uint8_t)action] != NULL) {
+    return (*(mgmtVgroupActionFp[(uint8_t)action]))(row, str, size, ssize);
   }
   return NULL;
 }
@@ -289,6 +289,7 @@ int mgmtRetrieveVgroups(SShowObj *pShow, char *data, int rows, SConnObj *pConn)
 
   SDbObj *pDb = NULL;
   if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
+  assert(pDb != NULL);
 
   pVgroup = pDb->pHead;
   while (pVgroup != NULL) {

src/system/detail/src/vnodeFile.c

@@ -187,13 +187,13 @@ int vnodeCreateNeccessaryFiles(SVnodeObj *pVnode) {
 
   if (pVnode->lastKeyOnFile == 0) {
     if (pCfg->daysPerFile == 0) pCfg->daysPerFile = 10;
-    pVnode->fileId = pVnode->firstKey / tsMsPerDay[pVnode->cfg.precision] / pCfg->daysPerFile;
-    pVnode->lastKeyOnFile = (int64_t)(pVnode->fileId + 1) * pCfg->daysPerFile * tsMsPerDay[pVnode->cfg.precision] - 1;
+    pVnode->fileId = pVnode->firstKey / tsMsPerDay[(uint8_t)pVnode->cfg.precision] / pCfg->daysPerFile;
+    pVnode->lastKeyOnFile = (int64_t)(pVnode->fileId + 1) * pCfg->daysPerFile * tsMsPerDay[(uint8_t)pVnode->cfg.precision] - 1;
     pVnode->numOfFiles = 1;
     if (vnodeCreateEmptyCompFile(vnode, pVnode->fileId) < 0) return -1;
   }
 
-  numOfFiles = (pVnode->lastKeyOnFile - pVnode->commitFirstKey) / tsMsPerDay[pVnode->cfg.precision] / pCfg->daysPerFile;
+  numOfFiles = (pVnode->lastKeyOnFile - pVnode->commitFirstKey) / tsMsPerDay[(uint8_t)pVnode->cfg.precision] / pCfg->daysPerFile;
   if (pVnode->commitFirstKey > pVnode->lastKeyOnFile) numOfFiles = -1;
 
   dTrace("vid:%d, commitFirstKey:%ld lastKeyOnFile:%ld numOfFiles:%d fileId:%d vnodeNumOfFiles:%d", pVnode->vnode,
@@ -221,15 +221,15 @@ int vnodeCreateNeccessaryFiles(SVnodeObj *pVnode) {
 #else
       return -1;
 #endif
-    pVnode->lastKeyOnFile += (int64_t)tsMsPerDay[pVnode->cfg.precision] * pCfg->daysPerFile;
+    pVnode->lastKeyOnFile += (int64_t)tsMsPerDay[(uint8_t)pVnode->cfg.precision] * pCfg->daysPerFile;
     filesAdded = 1;
     numOfFiles = 0;  // hacker way
   }
 
   fileId = pVnode->fileId - numOfFiles;
   pVnode->commitLastKey =
-      pVnode->lastKeyOnFile - (int64_t)numOfFiles * tsMsPerDay[pVnode->cfg.precision] * pCfg->daysPerFile;
-  pVnode->commitFirstKey = pVnode->commitLastKey - (int64_t)tsMsPerDay[pVnode->cfg.precision] * pCfg->daysPerFile + 1;
+      pVnode->lastKeyOnFile - (int64_t)numOfFiles * tsMsPerDay[(uint8_t)pVnode->cfg.precision] * pCfg->daysPerFile;
+  pVnode->commitFirstKey = pVnode->commitLastKey - (int64_t)tsMsPerDay[(uint8_t)pVnode->cfg.precision] * pCfg->daysPerFile + 1;
   pVnode->commitFileId = fileId;
   pVnode->numOfFiles = pVnode->numOfFiles + filesAdded;
 
@@ -244,8 +244,7 @@ int vnodeOpenCommitFiles(SVnodeObj *pVnode, int noTempLast) {
   int         len = 0;
   struct stat filestat;
   int         vnode = pVnode->vnode;
-  int         fileId, numOfFiles, filesAdded = 0;
-  SVnodeCfg * pCfg = &pVnode->cfg;
+  int         fileId;
 
   if (vnodeCreateNeccessaryFiles(pVnode) < 0) return -1;
 
@@ -1246,7 +1245,7 @@ int vnodeWriteBlockToFile(SMeterObj *pObj, SCompBlock *pCompBlock, SData *data[]
     // assert(data[i]->len == points*pObj->schema[i].bytes);
 
     if (pCfg->compression) {
-      cdata[i]->len = (*pCompFunc[pObj->schema[i].type])(data[i]->data, points * pObj->schema[i].bytes, points,
+      cdata[i]->len = (*pCompFunc[(uint8_t)pObj->schema[i].type])(data[i]->data, points * pObj->schema[i].bytes, points,
                                                          cdata[i]->data, pObj->schema[i].bytes*pObj->pointsPerFileBlock+EXTRA_BYTES, 
                                                          pCfg->compression, buffer, bufferSize);
       fields[i].len = cdata[i]->len;
@@ -1338,7 +1337,7 @@ int vnodeSearchPointInFile(SMeterObj *pObj, SQuery *pQuery) {
   if (pVnode->numOfFiles <= 0) return 0;
 
   SVnodeCfg *pCfg = &pVnode->cfg;
-  delta = (int64_t)pCfg->daysPerFile * tsMsPerDay[pVnode->cfg.precision];
+  delta = (int64_t)pCfg->daysPerFile * tsMsPerDay[(uint8_t)pVnode->cfg.precision];
   latest = pObj->lastKeyOnFile;
   oldest = (pVnode->fileId - pVnode->numOfFiles + 1) * delta;
 

src/system/detail/src/vnodeImport.c

@@ -146,7 +146,7 @@ int vnodeFindKeyInCache(SImportInfo *pImport, int order) {
 void vnodeGetValidDataRange(int vnode, TSKEY now, TSKEY *minKey, TSKEY *maxKey) {
   SVnodeObj *pVnode = vnodeList + vnode;
 
-  int64_t delta = pVnode->cfg.daysPerFile * tsMsPerDay[pVnode->cfg.precision];
+  int64_t delta = pVnode->cfg.daysPerFile * tsMsPerDay[(uint8_t)pVnode->cfg.precision];
   int     fid = now / delta;
   *minKey = (fid - pVnode->maxFiles + 1) * delta;
   *maxKey = (fid + 2) * delta - 1;
@@ -682,7 +682,7 @@ static int vnodeMergeDataIntoFile(SImportInfo *pImport, const char *payload, int
   SCacheInfo *  pInfo = (SCacheInfo *)(pObj->pCache);
   TSKEY         lastKeyImported = 0;
 
-  TSKEY delta = pVnode->cfg.daysPerFile * tsMsPerDay[pVnode->cfg.precision];
+  TSKEY delta = pVnode->cfg.daysPerFile * tsMsPerDay[(uint8_t)pVnode->cfg.precision];
   TSKEY minFileKey = fid * delta;
   TSKEY maxFileKey = minFileKey + delta - 1;
   TSKEY firstKey = KEY_AT_INDEX(payload, pObj->bytesPerPoint, 0);
@@ -1499,7 +1499,7 @@ int vnodeImportDataToFiles(SImportInfo *pImport, char *payload, const int rows)
   SMeterObj *pObj = (SMeterObj *)(pImport->pObj);
   SVnodeObj *pVnode = vnodeList + pObj->vnode;
 
-  int64_t delta = pVnode->cfg.daysPerFile * tsMsPerDay[pVnode->cfg.precision];
+  int64_t delta = pVnode->cfg.daysPerFile * tsMsPerDay[(uint8_t)pVnode->cfg.precision];
   int     sfid = KEY_AT_INDEX(payload, pObj->bytesPerPoint, 0) / delta;
   int     efid = KEY_AT_INDEX(payload, pObj->bytesPerPoint, rows - 1) / delta;
 

src/system/detail/src/vnodeMeter.c

@@ -26,8 +26,6 @@
 #include "vnodeUtil.h"
 #include "tstatus.h"
 
-#pragma GCC diagnostic ignored "-Wpointer-sign"
-
 #define VALID_TIMESTAMP(key, curKey, prec) (((key) >= 0) && ((key) <= ((curKey) + 36500 * tsMsPerDay[prec])))
 
 int  tsMeterSizeOnFile;
@@ -604,10 +602,10 @@ int vnodeInsertPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi
 
   TSKEY firstKey = *((TSKEY *)pData);
   TSKEY lastKey = *((TSKEY *)(pData + pObj->bytesPerPoint * (numOfPoints - 1)));
-  int cfid = now/pVnode->cfg.daysPerFile/tsMsPerDay[pVnode->cfg.precision];
+  int cfid = now/pVnode->cfg.daysPerFile/tsMsPerDay[(uint8_t)pVnode->cfg.precision];
   
-  TSKEY minAllowedKey = (cfid - pVnode->maxFiles + 1)*pVnode->cfg.daysPerFile*tsMsPerDay[pVnode->cfg.precision];
-  TSKEY maxAllowedKey = (cfid + 2)*pVnode->cfg.daysPerFile*tsMsPerDay[pVnode->cfg.precision] - 2;
+  TSKEY minAllowedKey = (cfid - pVnode->maxFiles + 1)*pVnode->cfg.daysPerFile*tsMsPerDay[(uint8_t)pVnode->cfg.precision];
+  TSKEY maxAllowedKey = (cfid + 2)*pVnode->cfg.daysPerFile*tsMsPerDay[(uint8_t)pVnode->cfg.precision] - 2;
   if (firstKey < minAllowedKey || firstKey > maxAllowedKey || lastKey < minAllowedKey || lastKey > maxAllowedKey) {
     dError("vid:%d sid:%d id:%s, vnode lastKeyOnFile:%lld, data is out of range, numOfPoints:%d firstKey:%lld lastKey:%lld minAllowedKey:%lld maxAllowedKey:%lld",
             pObj->vnode, pObj->sid, pObj->meterId, pVnode->lastKeyOnFile, numOfPoints,firstKey, lastKey, minAllowedKey, maxAllowedKey);
@@ -634,7 +632,7 @@ int vnodeInsertPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi
       continue;
     }
 
-    if (!VALID_TIMESTAMP(*((TSKEY *)pData), tsKey, pVnode->cfg.precision)) {
+    if (!VALID_TIMESTAMP(*((TSKEY *)pData), tsKey, (uint8_t)pVnode->cfg.precision)) {
       code = TSDB_CODE_TIMESTAMP_OUT_OF_RANGE;
       break;
     }

src/system/detail/src/vnodeQueryImpl.c

@@ -1055,7 +1055,7 @@ static void *getGenericDataBlock(SMeterObj *pMeterObj, SQuery *pQuery, int32_t s
 
 static int32_t getFileIdFromKey(int32_t vid, TSKEY key) {
   SVnodeObj *pVnode = &vnodeList[vid];
-  int64_t    delta = (int64_t)pVnode->cfg.daysPerFile * tsMsPerDay[pVnode->cfg.precision];
+  int64_t    delta = (int64_t)pVnode->cfg.daysPerFile * tsMsPerDay[(uint8_t)pVnode->cfg.precision];
 
   return (int32_t)(key / delta);  // set the starting fileId
 }
@@ -2227,7 +2227,7 @@ static void teardownQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv) {
 
 // get maximum time interval in each file
 static int64_t getOldestKey(int32_t numOfFiles, int64_t fileId, SVnodeCfg *pCfg) {
-  int64_t duration = pCfg->daysPerFile * tsMsPerDay[pCfg->precision];
+  int64_t duration = pCfg->daysPerFile * tsMsPerDay[(uint8_t)pCfg->precision];
   return (fileId - numOfFiles + 1) * duration;
 }
 
@@ -4555,8 +4555,7 @@ static void doMerge(SQueryRuntimeEnv *pRuntimeEnv, int64_t timestamp, tFilePage
 }
 
 static void printBinaryData(int32_t functionId, char *data, int32_t srcDataType) {
-  if (functionId == TSDB_FUNC_FIRST_DST || functionId == TSDB_FUNC_LAST_DST || functionId == TSDB_FUNC_FIRST_DST ||
-      functionId == TSDB_FUNC_LAST_DST) {
+  if (functionId == TSDB_FUNC_FIRST_DST || functionId == TSDB_FUNC_LAST_DST) {
     switch (srcDataType) {
       case TSDB_DATA_TYPE_BINARY:
         printf("%ld,%s\t", *(TSKEY *)data, (data + TSDB_KEYSIZE + 1));
@@ -6332,6 +6331,8 @@ int32_t setIntervalQueryExecutionContext(SMeterQuerySupportObj *pSupporter, int3
       tsBufSetCursor(pSupporter->runtimeEnv.pTSBuf, &pMeterQueryInfo->cur);
     }
   }
+
+  return 0;
 }
 
 static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pInfo,

src/system/detail/src/vnodeRead.c

@@ -26,8 +26,6 @@
 #include "vnodeRead.h"
 #include "vnodeUtil.h"
 
-#pragma GCC diagnostic ignored "-Wint-conversion"
-
 int (*pQueryFunc[])(SMeterObj *, SQuery *) = {vnodeQueryFromCache, vnodeQueryFromFile};
 
 int vnodeInterpolationSearchKey(char *pValue, int num, TSKEY key, int order) {
@@ -1003,8 +1001,9 @@ int32_t vnodeConvertQueryMeterMsg(SQueryMeterMsg *pQueryMsg) {
 
       if (pDestFilterInfo->filterOnBinary) {
         pDestFilterInfo->len = htobe64(pFilterInfo->len);
-        pDestFilterInfo->pz = calloc(1, pDestFilterInfo->len + 1);
-        memcpy(pDestFilterInfo->pz, pMsg, pDestFilterInfo->len + 1);
+
+        pDestFilterInfo->pz = (int64_t)calloc(1, pDestFilterInfo->len + 1);
+        memcpy((void*)pDestFilterInfo->pz, pMsg, pDestFilterInfo->len + 1);
         pMsg += (pDestFilterInfo->len + 1);
       } else {
         pDestFilterInfo->lowerBndi = htobe64(pFilterInfo->lowerBndi);
@@ -1022,8 +1021,7 @@ int32_t vnodeConvertQueryMeterMsg(SQueryMeterMsg *pQueryMsg) {
    * 1. simple projection query on meters, we only record the pSqlFuncExprs[i].colIdx value
    * 2. for complex queries, whole SqlExprs object is required.
    */
-  pQueryMsg->pSqlFuncExprs = malloc(POINTER_BYTES * pQueryMsg->numOfOutputCols);
-
+  pQueryMsg->pSqlFuncExprs = (int64_t)malloc(POINTER_BYTES * pQueryMsg->numOfOutputCols);
   SSqlFuncExprMsg *pExprMsg = (SSqlFuncExprMsg *)pMsg;
 
   for (int32_t i = 0; i < pQueryMsg->numOfOutputCols; ++i) {
@@ -1070,7 +1068,7 @@ int32_t vnodeConvertQueryMeterMsg(SQueryMeterMsg *pQueryMsg) {
   pQueryMsg->colNameLen = htonl(pQueryMsg->colNameLen);
   if (hasArithmeticFunction) {  // column name array
     assert(pQueryMsg->colNameLen > 0);
-    pQueryMsg->colNameList = pMsg;
+    pQueryMsg->colNameList = (int64_t)pMsg;
     pMsg += pQueryMsg->colNameLen;
   }
 

src/system/detail/src/vnodeShell.c

@@ -30,7 +30,6 @@
 #include "vnodeStore.h"
 #include "tstatus.h"
 
-#pragma GCC diagnostic ignored "-Wint-conversion"
 extern int tsMaxQueues;
 
 void *      pShellServer = NULL;
@@ -390,7 +389,7 @@ _query_over:
   tfree(pMeterObjList);
   ret = vnodeSendQueryRspMsg(pObj, code, pObj->qhandle);
 
-  free(pQueryMsg->pSidExtInfo);
+  tfree(pQueryMsg->pSidExtInfo);
   for(int32_t i = 0; i < pQueryMsg->numOfCols; ++i) {
     vnodeFreeColumnInfo(&pQueryMsg->colList[i]);
   }
@@ -455,7 +454,7 @@ void vnodeExecuteRetrieveReq(SSchedMsg *pSched) {
   pRsp->precision = htons(timePrec);
 
   if (code == TSDB_CODE_SUCCESS) {
-    pRsp->offset = htobe64(vnodeGetOffsetVal(pRetrieve->qhandle));
+    pRsp->offset = htobe64(vnodeGetOffsetVal((void*)pRetrieve->qhandle));
     pRsp->useconds = htobe64(((SQInfo *)(pRetrieve->qhandle))->useconds);
   } else {
     pRsp->offset = 0;

src/system/detail/src/vnodeStore.c

@@ -24,9 +24,6 @@
 #include "vnodeUtil.h"
 #include "tstatus.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic warning "-Woverflow"
-
 int        tsMaxVnode = -1;
 int        tsOpenVnodes = 0;
 SVnodeObj *vnodeList = NULL;
@@ -386,6 +383,3 @@ void vnodeCalcOpenVnodes() {
 void vnodeUpdateHeadFile(int vnode, int oldTables, int newTables) {
   //todo rewrite the head file with newTables
 }
-
-#pragma GCC diagnostic pop
-

src/system/detail/src/vnodeUtil.c

@@ -23,8 +23,6 @@
 #include "vnodeDataFilterFunc.h"
 #include "vnodeUtil.h"
 
-#pragma GCC diagnostic ignored "-Wint-conversion"
-
 int vnodeCheckFileIntegrity(FILE* fp) {
   /*
     int savedSessions, savedMeterSize;

src/system/lite/src/dnodeMgmt.spec.c

@@ -50,7 +50,7 @@ char *taosBuildReqMsgToMnode(SMgmtObj *pObj, char type) {
 }
 
 int taosSendMsgToMnode(SMgmtObj *pObj, char *msg, int msgLen) {
-  dTrace("msg:%s is sent to mnode", taosMsg[*(msg-1)]);
+  dTrace("msg:%s is sent to mnode", taosMsg[(uint8_t)(*(msg-1))]);
 
   /*
    * Lite version has no message header, so minus one
@@ -81,7 +81,7 @@ void vnodeProcessMsgFromMgmtSpec(SSchedMsg *sched) {
   char  msgType = *sched->msg;
   char *content = sched->msg + 1;
 
-  dTrace("msg:%s is received from mgmt", taosMsg[msgType]);
+  dTrace("msg:%s is received from mgmt", taosMsg[(uint8_t)msgType]);
 
   vnodeProcessMsgFromMgmt(content, 0, msgType, 0);
 

src/system/lite/src/mgmtBalance.spec.c

@@ -17,7 +17,7 @@
 #include "mgmtBalance.h"
 #include "tstatus.h"
 
-void mgmtStartBalanceTimer(int mseconds) {}
+void mgmtStartBalanceTimer(int64_t mseconds) {}
 
 int mgmtInitBalance() { return 0; }
 

src/system/lite/src/mgmtDnodeInt.spec.c

@@ -61,7 +61,7 @@ char *taosBuildReqMsgToDnode(SDnodeObj *pObj, char type) {
 int taosSendSimpleRspToDnode(SDnodeObj *pObj, char rsptype, char code) { return 0; }
 
 int taosSendMsgToDnode(SDnodeObj *pObj, char *msg, int msgLen) {
-  mTrace("msg:%s is sent to dnode", taosMsg[*(msg-1)]);
+  mTrace("msg:%s is sent to dnode", taosMsg[(uint8_t)(*(msg-1))]);
 
   /*
    * Lite version has no message header, so minus one
@@ -142,7 +142,7 @@ void mgmtProcessDnodeStatus(void *handle, void *tmrId) {
 void mgmtProcessMsgFromDnodeSpec(SSchedMsg *sched) {
   char  msgType = *sched->msg;
   char *content = sched->msg + 1;
-  mTrace("msg:%s is received from dnode", taosMsg[msgType]);
+  mTrace("msg:%s is received from dnode", taosMsg[(uint8_t)msgType]);
 
   mgmtProcessMsgFromDnode(content, 0, msgType, mgmtGetDnode(0));
   free(sched->msg);

src/system/lite/src/vnodeFile.spec.c

@@ -24,7 +24,7 @@ char* vnodeGetDataDir(int vnode, int fileId) { return dataDir; }
 void vnodeAdustVnodeFile(SVnodeObj *pVnode) {
   // Retention policy here
   int fileId = pVnode->fileId - pVnode->numOfFiles + 1;
-  int cfile = taosGetTimestamp(pVnode->cfg.precision)/pVnode->cfg.daysPerFile/tsMsPerDay[pVnode->cfg.precision];
+  int cfile = taosGetTimestamp(pVnode->cfg.precision)/pVnode->cfg.daysPerFile/tsMsPerDay[(uint8_t)pVnode->cfg.precision];
   while (fileId <= cfile - pVnode->maxFiles) {
     vnodeRemoveFile(pVnode->vnode, fileId);
     pVnode->numOfFiles--;

src/util/src/tcompression.c

@@ -355,16 +355,16 @@ int tsCompressINTImp(const char *const input, const int nelements, char *const o
         tmp_bit = (LONG_BYTES * BITS_PER_BYTE) - BUILDIN_CLZL(zigzag_value);
       }
 
-      if (elems + 1 <= selector_to_elems[selector] && elems + 1 <= selector_to_elems[bit_to_selector[tmp_bit]]) {
+      if (elems + 1 <= selector_to_elems[(int)selector] && elems + 1 <= selector_to_elems[(int)(bit_to_selector[(int)tmp_bit])]) {
         // If can hold another one.
-        selector = selector > bit_to_selector[tmp_bit] ? selector : bit_to_selector[tmp_bit];
+        selector = selector > bit_to_selector[(int)tmp_bit] ? selector : bit_to_selector[(int)tmp_bit];
         elems++;
-        bit = bit_per_integer[selector];
+        bit = bit_per_integer[(int)selector];
       } else {
         // if cannot hold another one.
-        while (elems < selector_to_elems[selector]) selector++;
-        elems = selector_to_elems[selector];
-        bit = bit_per_integer[selector];
+        while (elems < selector_to_elems[(int)selector]) selector++;
+        elems = selector_to_elems[(int)selector];
+        bit = bit_per_integer[(int)selector];
         break;
       }
       prev_value_tmp = curr_value;
@@ -455,8 +455,8 @@ int tsDecompressINTImp(const char *const input, const int nelements, char *const
     memcpy(&w, ip, LONG_BYTES);
 
     char selector = (char)(w & INT64MASK(4));  // selector = 4
-    char bit = bit_per_integer[selector];      // bit = 3
-    int  elems = selector_to_elems[selector];
+    char bit = bit_per_integer[(int)selector];      // bit = 3
+    int  elems = selector_to_elems[(int)selector];
 
     for (int i = 0; i < elems; i++) {
       uint64_t zigzag_value;

src/util/src/tcrc32c.c

@@ -25,8 +25,6 @@
 #include <stdlib.h>
 
 #include "tcrc32c.h"
-//todo : use the original source code
-//#pragma GCC diagnostic ignored "-Wunused-function"
 
 #define POLY 0x82f63b78
 #define LONG_SHIFT 8192

src/util/src/textbuffer.c

@@ -22,8 +22,6 @@
 #include "ttypes.h"
 #include "tutil.h"
 
-//#pragma GCC diagnostic ignored "-Wformat"
-
 #define COLMODEL_GET_VAL(data, schema, allrow, rowId, colId) \
   (data + (schema)->colOffset[colId] * (allrow) + (rowId) * (schema)->pFields[colId].bytes)
 

src/util/src/tglobalcfg.c

@@ -788,6 +788,9 @@ static void doInitGlobalConfig() {
   tsInitConfigOption(cfg++, "gitinfo", gitinfo, TSDB_CFG_VTYPE_STRING,
                      TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT,
                      0, 0, 0, TSDB_CFG_UTYPE_NONE);
+  tsInitConfigOption(cfg++, "gitinfoOfInternal", gitinfoOfInternal, TSDB_CFG_VTYPE_STRING,
+                     TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT,
+                     0, 0, 0, TSDB_CFG_UTYPE_NONE);
   tsInitConfigOption(cfg++, "buildinfo", buildinfo, TSDB_CFG_VTYPE_STRING,
                      TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT,
                      0, 0, 0, TSDB_CFG_UTYPE_NONE);

src/util/src/tsocket.c

@@ -19,8 +19,6 @@
 #include "tsocket.h"
 #include "tutil.h"
 
-unsigned int ip2uint(const char *const ip_addr);
-
 /*
  * Function to get the public ip address of current machine. If get IP
  * successfully, return 0, else, return -1. The return values is ip.
@@ -105,7 +103,7 @@ int taosGetPublicIp(char *const ip) {
 }
 
 // Function converting an IP address string to an unsigned int.
-unsigned int ip2uint(const char *const ip_addr) {
+uint32_t ip2uint(const char *const ip_addr) {
   char ip_addr_cpy[20];
   char ip[5];
 

src/util/src/version.c

 char version[64] = "1.6.4.1";
 char compatible_version[64] = "1.6.1.0";
-char gitinfo[128] = "893fac9da79ef9b88355fcd18d29057adf909bbd";
-char buildinfo[512] = "Built by ubuntu at 2019-12-02 22:21";
+char gitinfo[128] = "27f51a5cea1bdcb0e7b2ef0df5649e59e6ae38ed";
+char gitinfoOfInternal[128] = "afd592a8d3aedfd7e90d5510840ba3fc73e36160";
+char buildinfo[512] = "Built by root at 2019-12-09 17:39";