From e29e477b0c94ca4efe05be3d5d8a4d2b7f5b7114 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sun, 27 Nov 2022 15:46:31 +0800
Subject: [PATCH] fix(query): update api to avoid deadlock.

---
 source/libs/executor/src/executor.c       | 2 +-
 source/libs/function/src/detail/tminmax.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c
index 01baba5a52..9b3bd1d808 100644
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
@@ -287,7 +287,7 @@ static SArray* filterUnqualifiedTables(const SStreamScanInfo* pScanInfo, const S
   for (int32_t i = 0; i < taosArrayGetSize(tableIdList); ++i) {
     uint64_t* id = (uint64_t*)taosArrayGet(tableIdList, i);
 
-    int32_t code = metaGetTableEntryByUidCache(&mr, *id);
+    int32_t code = metaGetTableEntryByUid(&mr, *id);
     if (code != TSDB_CODE_SUCCESS) {
       qError("failed to get table meta, uid:%" PRIu64 " code:%s, %s", *id, tstrerror(terrno), idstr);
       continue;
diff --git a/source/libs/function/src/detail/tminmax.c b/source/libs/function/src/detail/tminmax.c
index e47edb8a1e..b2cb36cba0 100644
--- a/source/libs/function/src/detail/tminmax.c
+++ b/source/libs/function/src/detail/tminmax.c
@@ -877,6 +877,8 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
         break;
       }
     }
+
+    pBuf->assign = true;
   }
 
 _over: