Merge pull request #897 from taosdata/feature/liaohj

remove the compiler warnings

src/client/src/tscSQLParser.c

@@ -5340,7 +5340,8 @@ static int32_t checkUpdateTagPrjFunctions(SSqlCmd* pCmd) {
 
   for (int32_t i = 0; i < pCmd->fieldsInfo.numOfOutputCols; ++i) {
     int16_t functionId = tscSqlExprGet(pCmd, i)->functionId;
-    if (functionId == TSDB_FUNC_TAGPRJ || functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_TS) {
+    if (functionId == TSDB_FUNC_TAGPRJ || functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_TS ||
+        functionId == TSDB_FUNC_ARITHM) {
       continue;
     }
 

src/client/src/tscUtil.c

@@ -246,7 +246,7 @@ bool tscProjectionQueryOnMetric(SSqlCmd* pCmd) {
   for (int32_t i = 0; i < pCmd->fieldsInfo.numOfOutputCols; ++i) {
     int32_t functionId = tscSqlExprGet(pCmd, i)->functionId;
     if (functionId != TSDB_FUNC_PRJ && functionId != TSDB_FUNC_TAGPRJ &&
-        functionId != TSDB_FUNC_TAG && functionId != TSDB_FUNC_TS) {
+        functionId != TSDB_FUNC_TAG && functionId != TSDB_FUNC_TS && functionId != TSDB_FUNC_ARITHM) {
       return false;
     }
   }

src/system/detail/src/vnodeQueryImpl.c

@@ -252,15 +252,31 @@ static void vnodeSetOpenedFileNames(SQueryFilesInfo* pVnodeFilesInfo) {
   
   SHeaderFileInfo* pCurrentFileInfo = &pVnodeFilesInfo->pFileInfo[pVnodeFilesInfo->current];
   
-  // set the full file path for current opened files
-  snprintf(pVnodeFilesInfo->headerFilePath, PATH_MAX, "%sv%df%d.head", pVnodeFilesInfo->dbFilePathPrefix,
-           pVnodeFilesInfo->vnodeId, pCurrentFileInfo->fileID);
+  /*
+   * set the full file path for current opened files
+   * the maximum allowed path string length is PATH_MAX in Linux, 100 bytes is used to
+   * suppress the compiler warnings
+   */
+  char str[PATH_MAX + 100] = {0};
+  int32_t PATH_WITH_EXTRA = PATH_MAX + 100;
+  
+  int32_t vnodeId = pVnodeFilesInfo->vnodeId;
+  int32_t fileId = pCurrentFileInfo->fileID;
+  
+  int32_t len = snprintf(str, PATH_WITH_EXTRA, "%sv%df%d.head", pVnodeFilesInfo->dbFilePathPrefix, vnodeId, fileId);
+  assert(len <= PATH_MAX);
+  
+  strncpy(pVnodeFilesInfo->headerFilePath, str, PATH_MAX);
+  
+  len = snprintf(str, PATH_WITH_EXTRA, "%sv%df%d.data", pVnodeFilesInfo->dbFilePathPrefix, vnodeId, fileId);
+  assert(len <= PATH_MAX);
+  
+  strncpy(pVnodeFilesInfo->dataFilePath, str, PATH_MAX);
   
-  snprintf(pVnodeFilesInfo->dataFilePath, PATH_MAX, "%sv%df%d.data", pVnodeFilesInfo->dbFilePathPrefix,
-           pVnodeFilesInfo->vnodeId, pCurrentFileInfo->fileID);
+  len = snprintf(str, PATH_WITH_EXTRA, "%sv%df%d.last", pVnodeFilesInfo->dbFilePathPrefix, vnodeId, fileId);
+  assert(len <= PATH_MAX);
   
-  snprintf(pVnodeFilesInfo->lastFilePath, PATH_MAX, "%sv%df%d.last", pVnodeFilesInfo->dbFilePathPrefix,
-           pVnodeFilesInfo->vnodeId, pCurrentFileInfo->fileID);
+  strncpy(pVnodeFilesInfo->lastFilePath, str, PATH_MAX);
 }
 
 /**