diff --git a/source/dnode/mnode/impl/src/mndGrant.c b/source/dnode/mnode/impl/src/mndGrant.c
index 06061138a8fce6fbeeaf7003052d4605e9f66223..cab1e241e22da7e29c200bb27f1b9e5adc16fb52 100644
--- a/source/dnode/mnode/impl/src/mndGrant.c
+++ b/source/dnode/mnode/impl/src/mndGrant.c
@@ -18,10 +18,15 @@
 #include "taoserror.h"
 #include "mndGrant.h"
 #include "mndInt.h"
+#include "mndShow.h"
 
 #ifndef _GRANT
+static int32_t mndRetrieveGrant(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock* pBlock, int32_t rows) { return TSDB_CODE_OPS_NOT_SUPPORT; }
 
-int32_t mndInitGrant(SMnode *pMnode) { return TSDB_CODE_SUCCESS; }
+int32_t mndInitGrant(SMnode *pMnode) {
+    mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_GRANTS, mndRetrieveGrant);
+    return TSDB_CODE_SUCCESS; 
+}
 void    mndCleanupGrant() {}
 void    grantParseParameter() { mError("can't parsed parameter k"); }
 int32_t grantCheck(EGrantType grant) { return TSDB_CODE_SUCCESS; }
diff --git a/tests/pytest/concurrent_inquiry.sh b/tests/pytest/concurrent_inquiry.sh
index 6ac15fb46fd727ca56b1aef7e7137ef822e5244a..4cb1709bef4d6a7c363db83dcedde7eb725ec0c4 100755
--- a/tests/pytest/concurrent_inquiry.sh
+++ b/tests/pytest/concurrent_inquiry.sh
@@ -35,11 +35,11 @@ CURR_DIR=`pwd`
 IN_TDINTERNAL="community"
 if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
   TAOS_DIR=$CURR_DIR/../../..
-  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep bin|head -n1`
+  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep debug|head -n1`
   LIB_DIR=`echo $TAOSD_DIR|rev|cut -d '/' -f 3,4,5,6,7|rev`/lib
 else
   TAOS_DIR=$CURR_DIR/../..
-  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep bin|head -n1`
+  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep debug|head -n1`
   LIB_DIR=`echo $TAOSD_DIR|rev|cut -d '/' -f 3,4,5,6|rev`/lib
 fi
 
diff --git a/tests/pytest/crash_gen.sh b/tests/pytest/crash_gen.sh
index 127e13c5be1ea562cbe536bbb05f6ecd5844b0ea..1c28abfdf4bd82e7ab559f19db6012c7ac72874f 100755
--- a/tests/pytest/crash_gen.sh
+++ b/tests/pytest/crash_gen.sh
@@ -35,11 +35,11 @@ CURR_DIR=`pwd`
 IN_TDINTERNAL="community"
 if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
   TAOS_DIR=$CURR_DIR/../../..
-  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep bin|head -n1`
+  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep debug|head -n1`
   LIB_DIR=`echo $TAOSD_DIR|rev|cut -d '/' -f 3,4,5,6,7|rev`/lib
 else
   TAOS_DIR=$CURR_DIR/../..
-  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep bin|head -n1`
+  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep debug|head -n1`
   LIB_DIR=`echo $TAOSD_DIR|rev|cut -d '/' -f 3,4,5,6|rev`/lib
 fi
 
diff --git a/tests/pytest/perf_gen.sh b/tests/pytest/perf_gen.sh
index d28b5422f8ba4d4683c78020e45d2085385c4b4f..13a667fd3801b1e0828d5704caec63c09a1c4518 100755
--- a/tests/pytest/perf_gen.sh
+++ b/tests/pytest/perf_gen.sh
@@ -35,11 +35,11 @@ CURR_DIR=`pwd`
 IN_TDINTERNAL="community"
 if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
   TAOS_DIR=$CURR_DIR/../../..
-  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep bin|head -n1`
+  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep debug|head -n1`
   LIB_DIR=`echo $TAOSD_DIR|rev|cut -d '/' -f 3,4,5,6,7|rev`/lib
 else
   TAOS_DIR=$CURR_DIR/../..
-  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep bin|head -n1`
+  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep debug|head -n1`
   LIB_DIR=`echo $TAOSD_DIR|rev|cut -d '/' -f 3,4,5,6|rev`/lib
 fi
 
diff --git a/tests/pytest/test.sh b/tests/pytest/test.sh
index 4e74341f7075b50329a49aa3eccd09f68b733f20..fd3010f4cbc7e518a7692dbdb78fa3da2103b543 100755
--- a/tests/pytest/test.sh
+++ b/tests/pytest/test.sh
@@ -11,7 +11,7 @@ if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
 else
   TAOS_DIR=$CURR_DIR/../..
 fi
-TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep bin|head -n1`
+TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep debug|head -n1`
 LIB_DIR=`echo $TAOSD_DIR|rev|cut -d '/' -f 3,4,5,6|rev`/lib
 export PYTHONPATH=$(pwd)/../../src/connector/python
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_DIR
diff --git a/tests/script/sh/cfg.sh b/tests/script/sh/cfg.sh
index 7d4d747e54bab9ed98b42ab1902f8580e17fca6c..ac7e81e87b61042b748c9f52ac8c3b08a4ee1dc2 100755
--- a/tests/script/sh/cfg.sh
+++ b/tests/script/sh/cfg.sh
@@ -43,7 +43,7 @@ else
 fi
 
 TAOS_DIR=`pwd`
-TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+TAOSD_DIR=`find . -name "taosd"|grep debug|head -n1`
 
 if [[ "$OS_TYPE" != "Darwin" ]]; then
   cut_opt="--field="
@@ -52,9 +52,9 @@ else
 fi
 
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/clear.sh b/tests/script/sh/clear.sh
index 4ee296cf058370552b14c31b67006830e84847dd..197020c92812f72a82698bd84427acaa7e5a3c1a 100755
--- a/tests/script/sh/clear.sh
+++ b/tests/script/sh/clear.sh
@@ -46,7 +46,7 @@ else
 fi
 
 TAOS_DIR=`pwd`
-TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+TAOSD_DIR=`find . -name "taosd"|grep debug|head -n1`
 
 if [[ "$OS_TYPE" != "Darwin" ]]; then
   cut_opt="--field="
@@ -55,9 +55,9 @@ else
 fi
 
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh
index 38b6d9aadbbfbc8ad3e0cd7c37f56961e4f3f25c..29a495113f8bc0c3b61271d0193408290924f330 100755
--- a/tests/script/sh/deploy.sh
+++ b/tests/script/sh/deploy.sh
@@ -41,7 +41,7 @@ else
 fi
 
 TAOS_DIR=`pwd`
-TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+TAOSD_DIR=`find . -name "taosd"|grep debug|head -n1`
 
 if [[ "$OS_TYPE" != "Darwin" ]]; then
   cut_opt="--field="
diff --git a/tests/script/sh/exec-default.sh b/tests/script/sh/exec-default.sh
index f648315c6745f63cfba9eb06ecfd53a9ccef1fed..cca8dd0c3424b3e5d7482a8908af48bfd1aa2dc3 100755
--- a/tests/script/sh/exec-default.sh
+++ b/tests/script/sh/exec-default.sh
@@ -52,7 +52,7 @@ else
 fi
 
 TAOS_DIR=`pwd`
-TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+TAOSD_DIR=`find . -name "taosd"|grep debug|head -n1`
 
 if [[ "$OS_TYPE" != "Darwin" ]]; then
   cut_opt="--field="
@@ -61,9 +61,9 @@ else
 fi
 
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/exec-no-random-fail.sh b/tests/script/sh/exec-no-random-fail.sh
index e01b18a8e6bb0d4631a28c64c6accd57bceb9076..72b2035af5105ed24b510cfa2bfb032654672f14 100755
--- a/tests/script/sh/exec-no-random-fail.sh
+++ b/tests/script/sh/exec-no-random-fail.sh
@@ -52,7 +52,7 @@ else
 fi
 
 TAOS_DIR=`pwd`
-TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+TAOSD_DIR=`find . -name "taosd"|grep debug|head -n1`
 
 if [[ "$OS_TYPE" != "Darwin" ]]; then
   cut_opt="--field="
@@ -61,9 +61,9 @@ else
 fi
 
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/exec-random-fail.sh b/tests/script/sh/exec-random-fail.sh
index 1f31899e3ac26861fc1860d10cb0a4899ff7bf36..5ed71af05d1c428a7a59d2212f06339a951e8234 100755
--- a/tests/script/sh/exec-random-fail.sh
+++ b/tests/script/sh/exec-random-fail.sh
@@ -52,7 +52,7 @@ else
 fi
 
 TAOS_DIR=`pwd`
-TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+TAOSD_DIR=`find . -name "taosd"|grep debug|head -n1`
 
 if [[ "$OS_TYPE" != "Darwin" ]]; then
   cut_opt="--field="
@@ -61,9 +61,9 @@ else
 fi
 
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/exec.sh b/tests/script/sh/exec.sh
index 1a9a6a2c5220184b99a6fe864372f585fd5c56bc..50ded73555690db1cf8d2a94014efdd51079c284 100755
--- a/tests/script/sh/exec.sh
+++ b/tests/script/sh/exec.sh
@@ -56,7 +56,7 @@ else
 fi
 
 TAOS_DIR=`pwd`
-TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+TAOSD_DIR=`find . -name "taosd"|grep debug|head -n1`
 
 if [[ "$OS_TYPE" != "Darwin" ]]; then
   cut_opt="--field="
diff --git a/tests/script/sh/exec_tarbitrator.sh b/tests/script/sh/exec_tarbitrator.sh
index e985bd65856025b2db8dfef724fdc652b2a03392..1b91d999a7bb4e74ebb12a51ea365b70f59c5256 100755
--- a/tests/script/sh/exec_tarbitrator.sh
+++ b/tests/script/sh/exec_tarbitrator.sh
@@ -49,7 +49,7 @@ else
 fi
 
 TAOS_DIR=`pwd`
-TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+TAOSD_DIR=`find . -name "taosd"|grep debug|head -n1`
 
 if [[ "$OS_TYPE" != "Darwin" ]]; then
   cut_opt="--field="
@@ -58,9 +58,9 @@ else
 fi
 
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/move_dnode.sh b/tests/script/sh/move_dnode.sh
index d3650c18ad0f49185ce1e1268273b8a44e3cdc14..4aa2daa3973fb52ff4680c7a146bcbf1905ae64f 100755
--- a/tests/script/sh/move_dnode.sh
+++ b/tests/script/sh/move_dnode.sh
@@ -18,7 +18,7 @@ else
 fi
 
 TAOS_DIR=`pwd`
-TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+TAOSD_DIR=`find . -name "taosd"|grep debug|head -n1`
 
 if [[ "$OS_TYPE" != "Darwin" ]]; then
   cut_opt="--field="
@@ -27,9 +27,9 @@ else
 fi
 
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/mv_old_data.sh b/tests/script/sh/mv_old_data.sh
index 3f4be6714fd757ee60d21ee97be5d411e3f95bdd..2c99bc11c4990603845a135775e0826eaafc5b7c 100755
--- a/tests/script/sh/mv_old_data.sh
+++ b/tests/script/sh/mv_old_data.sh
@@ -18,7 +18,7 @@ else
 fi
 
 TAOS_DIR=`pwd`
-TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+TAOSD_DIR=`find . -name "taosd"|grep debug|head -n1`
 
 if [[ "$OS_TYPE" != "Darwin" ]]; then
   cut_opt="--field="
@@ -27,9 +27,9 @@ else
 fi
 
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
+  BIN_DIR=`find . -name "taosd"|grep debug|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/test.sh b/tests/script/test.sh
index 8b77575e1845d4bff7b62d6b5351263912a34a5d..7721f21db7470b223ef7d4e4317b9e36a75349f8 100755
--- a/tests/script/test.sh
+++ b/tests/script/test.sh
@@ -51,7 +51,7 @@ else
 fi
 
 TOP_DIR=`pwd`
-TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+TAOSD_DIR=`find . -name "taosd"|grep debug|head -n1`
 
 if [[ "$OS_TYPE" != "Darwin" ]]; then
   cut_opt="--field="