Skip to content

T
TDengine

慢慢CG / TDengine
与 Fork 源项目一致

Fork自 taosdata / TDengine

通知 1
Star 0
Fork 0
T
TDengine
提交 8ac389c6 编写于 作者: S Shengliang Guan
浏览文件
操作

TD-1057 compile error after merge feature/query

上级 01f56ee5
隐藏空白更改
内联 并排
Showing with 2 addition and 6 deletion
src/client/src/tscLocalMerge.c
浏览文件 @ 8ac389c6
...@@ -972,7 +972,7 @@ static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneO ...@@ -972,7 +972,7 @@ static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneO
} }
if (pRes->numOfRows > 0) { 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) { if (pQueryInfo->limit.limit >= 0 && currentTotal > pQueryInfo->limit.limit) {
int32_t overflow = (int32_t)(currentTotal - pQueryInfo->limit.limit); int32_t overflow = (int32_t)(currentTotal - pQueryInfo->limit.limit);
......
tests/tsim/src/simExe.c
浏览文件 @ 8ac389c6
...@@ -748,11 +748,7 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) { ...@@ -748,11 +748,7 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
sprintf(value, "%d", *((int *)row[i])); sprintf(value, "%d", *((int *)row[i]));
break; break;
case TSDB_DATA_TYPE_BIGINT: case TSDB_DATA_TYPE_BIGINT:
#ifdef _TD_ARM_32_ sprintf(value, "%" PRId64, *((int64_t *)row[i]));
sprintf(value, "%lld", *((int64_t *)row[i]));
#else
sprintf(value, "%ld", *((int64_t *)row[i]));
#endif
break; break;
case TSDB_DATA_TYPE_FLOAT:{ case TSDB_DATA_TYPE_FLOAT:{
#ifdef _TD_ARM_32_ #ifdef _TD_ARM_32_
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或