Merge pull request #3280 from taosdata/feature/os

Feature/os

src/client/src/taos.rc.in

 1 VERSIONINFO
- FILEVERSION ${TD_VER_1}, ${TD_VER_2}, ${TD_VER_3}
- PRODUCTVERSION ${TD_VER_1}, ${TD_VER_2}, ${TD_VER_3}
+ FILEVERSION ${TD_VER_NUMBER}
+ PRODUCTVERSION ${TD_VER_NUMBER}
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -16,12 +16,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "Native C Driver for TDengine"
-            VALUE "FileVersion", "${TD_VER_1}, ${TD_VER_2}, ${TD_VER_3}"
+            VALUE "FileVersion", "${TD_VER_NUMBER}"
             VALUE "InternalName", "taos.dll(${TD_VER_CPUTYPE})"
             VALUE "LegalCopyright", "Copyright (C) 2020 TAOS Data"
             VALUE "OriginalFilename", ""
             VALUE "ProductName", "taos.dll(${TD_VER_CPUTYPE})"
-            VALUE "ProductVersion", "${TD_VER_1}.${TD_VER_2}.${TD_VER_3}.${TD_VER_4}"
+            VALUE "ProductVersion", "${TD_VER_NUMBER}"
         END
     END
     BLOCK "VarFileInfo"

src/client/src/tscFunctionImpl.c

@@ -2034,7 +2034,7 @@ static void copyTopBotRes(SQLFunctionCtx *pCtx, int32_t type) {
   tValuePair **tvp = pRes->res;
   
   int32_t step = QUERY_ASC_FORWARD_STEP;
-  int32_t len = GET_RES_INFO(pCtx)->numOfRes;
+  int32_t len = (int32_t)(GET_RES_INFO(pCtx)->numOfRes);
   
   switch (type) {
     case TSDB_DATA_TYPE_INT: {
@@ -2408,10 +2408,10 @@ static void top_bottom_func_finalizer(SQLFunctionCtx *pCtx) {
   // user specify the order of output by sort the result according to timestamp
   if (pCtx->param[1].i64Key == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
     __compar_fn_t comparator = (pCtx->param[2].i64Key == TSDB_ORDER_ASC) ? resAscComparFn : resDescComparFn;
-    qsort(tvp, pResInfo->numOfRes, POINTER_BYTES, comparator);
+    qsort(tvp, (size_t)pResInfo->numOfRes, POINTER_BYTES, comparator);
   } else if (pCtx->param[1].i64Key > PRIMARYKEY_TIMESTAMP_COL_INDEX) {
     __compar_fn_t comparator = (pCtx->param[2].i64Key == TSDB_ORDER_ASC) ? resDataAscComparFn : resDataDescComparFn;
-    qsort(tvp, pResInfo->numOfRes, POINTER_BYTES, comparator);
+    qsort(tvp, (size_t)pResInfo->numOfRes, POINTER_BYTES, comparator);
   }
   
   GET_TRUE_DATA_TYPE();

src/client/src/tscLocalMerge.c

@@ -966,7 +966,7 @@ static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneO
     for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
       TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
       int16_t     offset = getColumnModelOffset(pLocalReducer->resColModel, i);
-      memcpy(pRes->data + offset * pRes->numOfRows, pResPages[i]->data, pField->bytes * pRes->numOfRows);
+      memcpy(pRes->data + offset * pRes->numOfRows, pResPages[i]->data, (size_t)(pField->bytes * pRes->numOfRows));
     }
 
     pRes->numOfRowsGroup += pRes->numOfRows;

src/client/src/tscSQLParser.c

@@ -1303,7 +1303,7 @@ int32_t parseSelectClause(SSqlCmd* pCmd, int32_t clauseIndex, tSQLExprList* pSel
     SSchema* pSchema = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, PRIMARYKEY_TIMESTAMP_COL_INDEX);
 
     // add the timestamp column into the output columns
-    int32_t numOfCols = tscSqlExprNumOfExprs(pQueryInfo);
+    int32_t numOfCols = (int32_t)tscSqlExprNumOfExprs(pQueryInfo);
     tscAddSpecialColumnForSelect(pQueryInfo, numOfCols, TSDB_FUNC_PRJ, &index, pSchema, TSDB_COL_NORMAL);
 
     SFieldSupInfo* pSupInfo = tscFieldInfoGetSupp(&pQueryInfo->fieldsInfo, numOfCols);

src/common/src/tname.c

@@ -53,7 +53,7 @@ SSchema tGetUserSpecifiedColumnSchema(tVariant* pVal, SStrToken* exprStr, const
 
   s.type  = pVal->nType;
   if (s.type == TSDB_DATA_TYPE_BINARY || s.type == TSDB_DATA_TYPE_NCHAR) {
-    s.bytes = pVal->nLen + VARSTR_HEADER_SIZE;
+    s.bytes = (int16_t)(pVal->nLen + VARSTR_HEADER_SIZE);
   } else {
     s.bytes = tDataTypeDesc[pVal->nType].nSize;
   }

src/query/src/qExecutor.c

@@ -2771,14 +2771,14 @@ void copyResToQueryResultBuf(SQInfo *pQInfo, SQuery *pQuery) {
     tFilePage* pData = getResBufPage(pResultBuf, pi->pageId);
 
     assert(pData->num > 0 && pData->num <= pRuntimeEnv->numOfRowsPerPage && pGroupResInfo->pos.rowId < pData->num);
-    int32_t numOfRes = pData->num - pGroupResInfo->pos.rowId;
+    int32_t numOfRes = (int32_t)(pData->num - pGroupResInfo->pos.rowId);
 
     if (numOfRes > pQuery->rec.capacity - offset) {
-      numOfCopiedRows = pQuery->rec.capacity - offset;
+      numOfCopiedRows = (int32_t)(pQuery->rec.capacity - offset);
       pGroupResInfo->pos.rowId += numOfCopiedRows;
       done = true;
     } else {
-      numOfCopiedRows = pData->num;
+      numOfCopiedRows = (int32_t)pData->num;
 
       pGroupResInfo->pos.pageId += 1;
       pGroupResInfo->pos.rowId = 0;
@@ -2871,7 +2871,7 @@ int32_t mergeIntoGroupResultImpl(SQInfo *pQInfo, SArray *pGroup) {
 
     SGroupResInfo* pGroupResInfo = &pQInfo->groupResInfo;
 
-    pGroupResInfo->numOfDataPages = taosArrayGetSize(pageList);
+    pGroupResInfo->numOfDataPages = (int32_t)taosArrayGetSize(pageList);
     pGroupResInfo->groupId = tid;
     pGroupResInfo->pos.pageId = 0;
     pGroupResInfo->pos.rowId = 0;
@@ -3036,7 +3036,7 @@ int32_t flushFromResultBuf(SQueryRuntimeEnv* pRuntimeEnv, SGroupResInfo* pGroupR
 
       char* output = buf->data + pRuntimeEnv->offset[i] * pRuntimeEnv->numOfRowsPerPage;
       char* src = ((char *) pQuery->sdata[i]->data) + offset * bytes;
-      memcpy(output, src, buf->num * bytes);
+      memcpy(output, src, (size_t)(buf->num * bytes));
     }
 
     offset += rows;
@@ -3211,7 +3211,7 @@ void resetCtxOutputBuf(SQueryRuntimeEnv *pRuntimeEnv) {
       pCtx->ptsOutputBuf = pRuntimeEnv->pCtx[0].aOutputBuf;
     }
 
-    memset(pQuery->sdata[i]->data, 0, (size_t)pQuery->pSelectExpr[i].bytes * pQuery->rec.capacity);
+    memset(pQuery->sdata[i]->data, 0, (size_t)(pQuery->pSelectExpr[i].bytes * pQuery->rec.capacity));
   }
 
   initCtxOutputBuf(pRuntimeEnv);
@@ -3926,7 +3926,7 @@ static void updateWindowResNumOfRes(SQueryRuntimeEnv *pRuntimeEnv) {
         continue;
       }
 
-      pResult->numOfRows = MAX(pResult->numOfRows, pResult->resultInfo[j].numOfRes);
+      pResult->numOfRows = (uint16_t)(MAX(pResult->numOfRows, pResult->resultInfo[j].numOfRes));
     }
   }
 }
@@ -4789,7 +4789,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
 
         SWindowResult *pResult = &pWindowResInfo->pResult[i];
         for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
-          pResult->numOfRows = MAX(pResult->numOfRows, pResult->resultInfo[j].numOfRes);
+          pResult->numOfRows = (uint16_t)(MAX(pResult->numOfRows, pResult->resultInfo[j].numOfRes));
         }
       }
 
@@ -6356,7 +6356,7 @@ static int32_t doDumpQueryResult(SQInfo *pQInfo, char *data) {
 
       qDebug("QInfo:%p ts comp data return, file:%s, size:%"PRId64, pQInfo, pQuery->sdata[0]->data, s);
       if (lseek(fd, 0, SEEK_SET) >= 0) {
-        size_t sz = read(fd, data, s);
+        size_t sz = read(fd, data, (uint32_t)s);
         if(sz < s) {  // todo handle error
           assert(0);
         }

src/query/src/qParserImpl.c

@@ -182,7 +182,7 @@ tSQLExpr *tSQLExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType) {
   if (pRight != NULL && pLeft != NULL) {
     char* endPos = pRight->token.z + pRight->token.n;
     pExpr->token.z = pLeft->token.z;
-    pExpr->token.n = endPos - pExpr->token.z;
+    pExpr->token.n = (uint32_t)(endPos - pExpr->token.z);
     pExpr->token.type = pLeft->token.type;
   }
 

src/query/src/qResultbuf.c

@@ -142,7 +142,7 @@ static char* doFlushPageToDisk(SDiskbasedResultBuf* pResultBuf, SPageInfo* pg) {
 
     }
 
-    ret = fwrite(t, size, 1, pResultBuf->file);
+    ret = (int32_t)fwrite(t, size, 1, pResultBuf->file);
     if (ret != size) {  // todo handle the error case
 
     }

src/query/src/qTsbuf.c

@@ -242,13 +242,13 @@ static void writeDataToDisk(STSBuf* pTSBuf) {
    * both side has the compressed length is used to support load data forwards/backwords.
    */
   int32_t metaLen = 0;
-  metaLen += fwrite(&pBlock->tag.nType, 1, sizeof(pBlock->tag.nType), pTSBuf->f);
-  metaLen += fwrite(&pBlock->tag.nLen,  1, sizeof(pBlock->tag.nLen), pTSBuf->f);
+  metaLen += (int32_t)fwrite(&pBlock->tag.nType, 1, sizeof(pBlock->tag.nType), pTSBuf->f);
+  metaLen += (int32_t)fwrite(&pBlock->tag.nLen, 1, sizeof(pBlock->tag.nLen), pTSBuf->f);
 
   if (pBlock->tag.nType == TSDB_DATA_TYPE_BINARY || pBlock->tag.nType == TSDB_DATA_TYPE_NCHAR) {
-    metaLen += fwrite(pBlock->tag.pz, 1, (size_t)pBlock->tag.nLen, pTSBuf->f);
+    metaLen += (int32_t)fwrite(pBlock->tag.pz, 1, (size_t)pBlock->tag.nLen, pTSBuf->f);
   } else if (pBlock->tag.nType != TSDB_DATA_TYPE_NULL) {
-    metaLen += fwrite(&pBlock->tag.i64Key, 1, sizeof(int64_t), pTSBuf->f);
+    metaLen += (int32_t)fwrite(&pBlock->tag.i64Key, 1, sizeof(int64_t), pTSBuf->f);
   }
 
   fwrite(&pBlock->numOfElem, sizeof(pBlock->numOfElem), 1, pTSBuf->f);

tests/script/wtest.bat

@@ -6,8 +6,8 @@ echo Start TDengine Testing Case ...
 set "SCRIPT_DIR=%~dp0"
 echo SCRIPT_DIR: %SCRIPT_DIR%
 
-set "BUILD_DIR=%~dp0..\..\debug\build\bin"
-set "TSIM=%~dp0..\..\debug\build\bin\tsim"
+set "BUILD_DIR=%~dp0..\..\debug\32\build\bin"
+set "TSIM=%~dp0..\..\debug\32\build\bin\tsim"
 echo BUILD_DIR:  %BUILD_DIR%
 
 set "SIM_DIR=%~dp0..\..\sim"
@@ -47,7 +47,7 @@ echo qdebugFlag    143           >> %TAOS_CFG%
 echo udebugFlag    143           >> %TAOS_CFG%
 
 set "FILE_NAME=windows\testSuite.sim"
-set "FIRSTEP=localhost"
+set "FIRSTEP=192.168.1.182"
 if "%1" == "-f" set "FILE_NAME=%2"
 if "%1" == "-h" set "FIRSTEP=%2"
 if "%3" == "-f" set "FILE_NAME=%4"