xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

compile in windows

This commit is contained in:
Shengliang Guan 2020-11-16 16:56:20 +08:00
parent 312b8a9df6
commit 88e6b8311b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/src/tscLocalMerge.c
View File

@ -1251,7 +1251,7 @@ bool genFinalResults(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool noMoreCur
if (tscIsSecondStageQuery(pQueryInfo)) { if (tscIsSecondStageQuery(pQueryInfo)) {
char* pbuf = calloc(1,pResBuf->num * pModel->rowSize); char* pbuf = calloc(1,pResBuf->num * pModel->rowSize);
doArithmeticCalculate(pQueryInfo, pbuf, pResBuf->data, pResBuf->num); doArithmeticCalculate(pQueryInfo, pbuf, pResBuf->data, (int32_t)pResBuf->num);
memcpy(pResBuf->data, pbuf, pResBuf->num * pModel->rowSize); memcpy(pResBuf->data, pbuf, pResBuf->num * pModel->rowSize);
free(pbuf); free(pbuf);
} }

2
src/client/src/tscSQLParser.c
View File

@ -1410,7 +1410,7 @@ static int32_t handleArithmeticExpr(SSqlCmd* pCmd, int32_t clauseIndex, int32_t
// TODO: other error handling // TODO: other error handling
} END_TRY } END_TRY
pInfo->pArithExprInfo->base.arg[0].argBytes = tbufTell(&bw); pInfo->pArithExprInfo->base.arg[0].argBytes = (int16_t) tbufTell(&bw);
pInfo->pArithExprInfo->base.arg[0].argValue.pz = tbufGetData(&bw, true); pInfo->pArithExprInfo->base.arg[0].argValue.pz = tbufGetData(&bw, true);
pInfo->pArithExprInfo->base.arg[0].argType = TSDB_DATA_TYPE_BINARY; pInfo->pArithExprInfo->base.arg[0].argType = TSDB_DATA_TYPE_BINARY;
tbufCloseWriter(&bw); tbufCloseWriter(&bw);

2
src/client/src/tscServer.c
View File

@ -789,7 +789,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
if(tscIsSecondStageQuery(pQueryInfo)) { if(tscIsSecondStageQuery(pQueryInfo)) {
size_t output = tscNumOfFields(pQueryInfo); size_t output = tscNumOfFields(pQueryInfo);
pQueryMsg->secondStageOutput = htonl(output); pQueryMsg->secondStageOutput = htonl((int32_t) output);
SSqlFuncMsg *pSqlFuncExpr1 = (SSqlFuncMsg *)pMsg; SSqlFuncMsg *pSqlFuncExpr1 = (SSqlFuncMsg *)pMsg;