提交 94a2ed66 编写于 作者: Z zyyang

[TS-1373]<release>: oem modify

上级 9d5ca586
...@@ -22,23 +22,33 @@ GOTO USAGE ...@@ -22,23 +22,33 @@ GOTO USAGE
goto RELEASE goto RELEASE
:POWER :POWER
cd %internal_dir%\enterprise\packaging\oem
call sed_power.bat %community_dir% call sed_power.bat %community_dir%
cd %community_dir%\packaging
goto RELEASE goto RELEASE
:TQ :TQ
cd %internal_dir%\enterprise\packaging\oem
call sed_tq.bat %community_dir% call sed_tq.bat %community_dir%
cd %community_dir%\packaging
goto RELEASE goto RELEASE
:PRO :PRO
cd %internal_dir%\enterprise\packaging\oem
call sed_pro.bat %community_dir% call sed_pro.bat %community_dir%
cd %community_dir%\packaging
goto RELEASE goto RELEASE
:KH :KH
cd %internal_dir%\enterprise\packaging\oem
call sed_kh.bat %community_dir% call sed_kh.bat %community_dir%
cd %community_dir%\packaging
goto RELEASE goto RELEASE
:JH :JH
cd %internal_dir%\enterprise\packaging\oem
call sed_jh.bat %community_dir% call sed_jh.bat %community_dir%
cd %community_dir%\packaging
goto RELEASE goto RELEASE
:RELEASE :RELEASE
......
...@@ -1215,7 +1215,7 @@ static int32_t getIntersectionOfTableTuple(SQueryInfo* pQueryInfo, SSqlObj* pPar ...@@ -1215,7 +1215,7 @@ static int32_t getIntersectionOfTableTuple(SQueryInfo* pQueryInfo, SSqlObj* pPar
// sort according to the tag value // sort according to the tag value
size_t num = taosArrayGetSize(ctxlist[i].res); size_t num = taosArrayGetSize(ctxlist[i].res);
int32_t ret = tidTagsMergeSort(ctxlist[i].res, 0, num - 1, size); int32_t ret = tidTagsMergeSort(ctxlist[i].res, 0, ((int32_t)num) - 1, size);
if (ret != TSDB_CODE_SUCCESS) { if (ret != TSDB_CODE_SUCCESS) {
return TSDB_CODE_TSC_OUT_OF_MEMORY; return TSDB_CODE_TSC_OUT_OF_MEMORY;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册