From 2439c345d908112a8a1fad28008ad9c89581bcf6 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Fri, 30 Dec 2022 18:04:54 +0800
Subject: [PATCH] enh: clear assert remove tbuffer.h

---
 include/common/trow.h                   | 1 -
 include/libs/function/function.h        | 1 -
 source/dnode/mnode/impl/src/mndTelem.c  | 1 -
 source/libs/executor/inc/executil.h     | 1 -
 source/libs/function/src/tfunctionInt.c | 1 -
 source/util/src/trbtree.c               | 2 +-
 source/util/src/tutil.c                 | 1 +
 7 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/common/trow.h b/include/common/trow.h
index 6a71a8844e..8332c10ed2 100644
--- a/include/common/trow.h
+++ b/include/common/trow.h
@@ -20,7 +20,6 @@
 #include "talgo.h"
 #include "taosdef.h"
 #include "taoserror.h"
-#include "tbuffer.h"
 #include "tdataformat.h"
 #include "tdef.h"
 #include "ttypes.h"
diff --git a/include/libs/function/function.h b/include/libs/function/function.h
index a58aed7e50..32db6773e0 100644
--- a/include/libs/function/function.h
+++ b/include/libs/function/function.h
@@ -20,7 +20,6 @@
 extern "C" {
 #endif
 
-#include "tbuffer.h"
 #include "tcommon.h"
 #include "tvariant.h"
 
diff --git a/source/dnode/mnode/impl/src/mndTelem.c b/source/dnode/mnode/impl/src/mndTelem.c
index 1d3209691a..b0b49b42dc 100644
--- a/source/dnode/mnode/impl/src/mndTelem.c
+++ b/source/dnode/mnode/impl/src/mndTelem.c
@@ -17,7 +17,6 @@
 #include "mndTelem.h"
 #include "mndCluster.h"
 #include "mndSync.h"
-#include "tbuffer.h"
 #include "thttp.h"
 #include "tjson.h"
 
diff --git a/source/libs/executor/inc/executil.h b/source/libs/executor/inc/executil.h
index 51150ede3c..4229e8808d 100644
--- a/source/libs/executor/inc/executil.h
+++ b/source/libs/executor/inc/executil.h
@@ -18,7 +18,6 @@
 #include "function.h"
 #include "nodes.h"
 #include "plannodes.h"
-#include "tbuffer.h"
 #include "tcommon.h"
 #include "tpagedbuf.h"
 #include "tsimplehash.h"
diff --git a/source/libs/function/src/tfunctionInt.c b/source/libs/function/src/tfunctionInt.c
index 70378df0c3..3afa0e5cdd 100644
--- a/source/libs/function/src/tfunctionInt.c
+++ b/source/libs/function/src/tfunctionInt.c
@@ -20,7 +20,6 @@
 #include "ttypes.h"
 
 #include "function.h"
-#include "tbuffer.h"
 #include "tcompression.h"
 #include "tdatablock.h"
 #include "tfunctionInt.h"
diff --git a/source/util/src/trbtree.c b/source/util/src/trbtree.c
index 855caca612..ffae5441aa 100644
--- a/source/util/src/trbtree.c
+++ b/source/util/src/trbtree.c
@@ -289,7 +289,7 @@ static void rbtree_delete_fixup(rbtree_t *rbtree, rbnode_t *child, rbnode_t *chi
   sibling->color = child_parent->color;
   child_parent->color = BLACK;
   if (child_parent->right == child) {
-    ASSERT(sibling->left->color == RED, "slibing->left->color=%d not equal RED", sibling->left->color);
+    ASSERTS(sibling->left->color == RED, "slibing->left->color=%d not equal RED", sibling->left->color);
     sibling->left->color = BLACK;
     rbtree_rotate_right(rbtree, child_parent);
   } else {
diff --git a/source/util/src/tutil.c b/source/util/src/tutil.c
index bde422da4e..e94f94a00d 100644
--- a/source/util/src/tutil.c
+++ b/source/util/src/tutil.c
@@ -15,6 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "tutil.h"
+#include "tlog.h"
 
 void *tmemmem(const char *haystack, int32_t hlen, const char *needle, int32_t nlen) {
   const char *limit;
-- 
GitLab