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

TD-1057 compile error after merge feature/query

This commit is contained in:
Shengliang Guan 2020-08-14 17:08:04 +08:00
parent 01f56ee5aa
commit 8ac389c675
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -972,7 +972,7 @@ static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneO
}
if (pRes->numOfRows > 0) {
int32_t currentTotal = pRes->numOfRowsGroup + pRes->numOfRows;
int32_t currentTotal = (int32_t)(pRes->numOfRowsGroup + pRes->numOfRows);
if (pQueryInfo->limit.limit >= 0 && currentTotal > pQueryInfo->limit.limit) {
int32_t overflow = (int32_t)(currentTotal - pQueryInfo->limit.limit);

6
tests/tsim/src/simExe.c
View File

@ -748,11 +748,7 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
sprintf(value, "%d", *((int *)row[i]));
break;
case TSDB_DATA_TYPE_BIGINT:
#ifdef _TD_ARM_32_
sprintf(value, "%lld", *((int64_t *)row[i]));
#else
sprintf(value, "%ld", *((int64_t *)row[i]));
#endif
sprintf(value, "%" PRId64, *((int64_t *)row[i]));
break;
case TSDB_DATA_TYPE_FLOAT:{
#ifdef _TD_ARM_32_