From 0c3dc0867fff2d8884842d6dd88d2e6f8efd8320 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Fri, 5 May 2023 20:33:41 +0800
Subject: [PATCH] chore: sync fix from main

---
 source/client/src/clientSml.c     | 11 ++++++-----
 source/libs/tdb/src/db/tdbBtree.c |  5 +++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/source/client/src/clientSml.c b/source/client/src/clientSml.c
index 45f0def157..98b64b211a 100644
--- a/source/client/src/clientSml.c
+++ b/source/client/src/clientSml.c
@@ -558,14 +558,15 @@ static int32_t smlGenerateSchemaAction(SSchema *colField, SHashObj *colHash, SSm
   return 0;
 }
 
+#define BOUNDARY 1024
 static int32_t smlFindNearestPowerOf2(int32_t length, uint8_t type) {
   int32_t result = 1;
-  if (length < 1024) {
-    while (result <= length) {
-      result <<= 1;
-    }
-  } else {
+  if (length >= BOUNDARY){
     result = length;
+  }else{
+    while (result <= length) {
+      result << 1;
+    }
   }
 
   if (type == TSDB_DATA_TYPE_BINARY && result > TSDB_MAX_BINARY_LEN - VARSTR_HEADER_SIZE) {
diff --git a/source/libs/tdb/src/db/tdbBtree.c b/source/libs/tdb/src/db/tdbBtree.c
index 6df2b40000..c49b5726b6 100644
--- a/source/libs/tdb/src/db/tdbBtree.c
+++ b/source/libs/tdb/src/db/tdbBtree.c
@@ -1814,6 +1814,11 @@ int tdbBtreeNext(SBTC *pBtc, void **ppKey, int *kLen, void **ppVal, int *vLen) {
 
     *ppVal = pVal;
     *vLen = cd.vLen;
+  } else {
+    if (TDB_CELLDECODER_FREE_VAL(&cd)) {
+      tdbTrace("tdb/btree-next2 decoder: %p pVal free: %p", &cd, cd.pVal);
+      tdbFree(cd.pVal);
+    }
   }
 
   ret = tdbBtcMoveToNext(pBtc);