From 94a2ed66106208926c1fe7dbb9b9802f89a6fd00 Mon Sep 17 00:00:00 2001 From: zyyang Date: Tue, 29 Mar 2022 16:16:16 +0800 Subject: [PATCH] [TS-1373]: oem modify --- packaging/release.bat | 10 ++++++++++ src/client/src/tscSubquery.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packaging/release.bat b/packaging/release.bat index 289ab06b2f..6a25026f62 100644 --- a/packaging/release.bat +++ b/packaging/release.bat @@ -22,23 +22,33 @@ GOTO USAGE goto RELEASE :POWER +cd %internal_dir%\enterprise\packaging\oem call sed_power.bat %community_dir% +cd %community_dir%\packaging goto RELEASE :TQ +cd %internal_dir%\enterprise\packaging\oem call sed_tq.bat %community_dir% +cd %community_dir%\packaging goto RELEASE :PRO +cd %internal_dir%\enterprise\packaging\oem call sed_pro.bat %community_dir% +cd %community_dir%\packaging goto RELEASE :KH +cd %internal_dir%\enterprise\packaging\oem call sed_kh.bat %community_dir% +cd %community_dir%\packaging goto RELEASE :JH +cd %internal_dir%\enterprise\packaging\oem call sed_jh.bat %community_dir% +cd %community_dir%\packaging goto RELEASE :RELEASE diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c index 04347ed4ee..a64d786130 100644 --- a/src/client/src/tscSubquery.c +++ b/src/client/src/tscSubquery.c @@ -1215,7 +1215,7 @@ static int32_t getIntersectionOfTableTuple(SQueryInfo* pQueryInfo, SSqlObj* pPar // sort according to the tag value 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) { return TSDB_CODE_TSC_OUT_OF_MEMORY; } -- GitLab