Skip to content

T
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1192
Star 22018
Fork 4786
T
TDengine
“f76dbd5830d011f3d5c8a8fde5d4e7738979671b”上不存在“include/os/osLocale.h”
未验证 提交 77612ea3 编写于 作者: M Minglei Jin 提交者： GitHub
浏览文件
操作

Merge pull request #11121 from taosdata/fix/TS-1318-D 

[TS-1318]<fix>: fixed compilation errors
上级 ce268ce2 fabcbd83
显示空白变更内容
内联 并排
Showing with 2 addition and 2 deletion
src/client/src/tscSubquery.c
浏览文件 @ 77612ea3
...@@ -1213,7 +1213,7 @@ static int32_t getIntersectionOfTableTuple(SQueryInfo* pQueryInfo, SSqlObj* pPar ...@@ -1213,7 +1213,7 @@ static int32_t getIntersectionOfTableTuple(SQueryInfo* pQueryInfo, SSqlObj* pPar
for (int32_t i = 0; i < joinNum; ++i) { for (int32_t i = 0; i < joinNum; ++i) {
// reorganize the tid-tag value according to both the vgroup id and tag values // reorganize the tid-tag value according to both the vgroup id and tag values
// sort according to the tag value // sort according to the tag value
size_t num = taosArrayGetSize(ctxlist[i].res); int32_t num = (int32_t) taosArrayGetSize(ctxlist[i].res);
int32_t ret = tidTagsMergeSort(ctxlist[i].res, 0, num - 1, size); int32_t ret = tidTagsMergeSort(ctxlist[i].res, 0, num - 1, size);
if (ret != TSDB_CODE_SUCCESS) { if (ret != TSDB_CODE_SUCCESS) {
...@@ -1222,7 +1222,7 @@ static int32_t getIntersectionOfTableTuple(SQueryInfo* pQueryInfo, SSqlObj* pPar ...@@ -1222,7 +1222,7 @@ static int32_t getIntersectionOfTableTuple(SQueryInfo* pQueryInfo, SSqlObj* pPar
taosArrayPush(resList, &ctxlist[i].res); taosArrayPush(resList, &ctxlist[i].res);
tscDebug("0x%"PRIx64" tags match complete, result num: %"PRIzu, pParentSql->self, num); tscDebug("0x%"PRIx64" tags match complete, result num: %d", pParentSql->self, num);
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或