diff --git a/src/inc/mnode.h b/src/inc/mnode.h
index 6f3b2a00468301c05377b60fc244b6427c3098d0..ccd40d7b4086cca97ec66e964619158d6b76aded 100644
--- a/src/inc/mnode.h
+++ b/src/inc/mnode.h
@@ -150,17 +150,13 @@ typedef struct SSuperTableObj {
   int32_t  vgId;
   int64_t  createdTime;
   int32_t  sversion;
-  int32_t  numOfTags;
-  int32_t  numOfMeters;
+  int32_t  numOfTables;
   int32_t  numOfColumns;
-  int32_t  schemaSize;
+  int32_t  numOfTags;
   int8_t   reserved[7];
   int8_t   updateEnd[1];
-
-  pthread_rwlock_t rwLock;
   int16_t  nextColId;
-
-  int8_t   *schema;
+  SSchema  *schema;
 } SSuperTableObj;
 
 typedef struct {
@@ -244,7 +240,6 @@ typedef struct _db_obj {
   char    reserved[16];
   char    updateEnd[1];
 
-  STabObj *       pMetric;
   struct _db_obj *prev, *next;
   SVgObj *        pHead;  // empty vgroup first
   SVgObj *        pTail;  // empty vgroup end
diff --git a/src/mnode/inc/mgmtSuperTable.h b/src/mnode/inc/mgmtSuperTable.h
index 4b21a6474a868c2aa323835e93c945e74ca7a39d..22c80e3eca5bdb23a38a3bbfaa594de161c8b727 100644
--- a/src/mnode/inc/mgmtSuperTable.h
+++ b/src/mnode/inc/mgmtSuperTable.h
@@ -31,7 +31,7 @@ void            mgmtCleanUpSuperTables();
 int32_t         mgmtCreateSuperTable(SDbObj *pDb, SCreateTableMsg *pCreate);
 int32_t         mgmtDropSuperTable(SDbObj *pDb, SSuperTableObj *pTable);
 SSuperTableObj* mgmtGetSuperTable(char *tableId);
-int32_t         mgmtFindTagCol(SSuperTableObj *pTable, const char *tagName);
+int32_t         mgmtFindSuperTableTagIndex(SSuperTableObj *pTable, const char *tagName);
 int32_t         mgmtAddSuperTableTag(SSuperTableObj *pTable, SSchema schema[], int32_t ntags);
 int32_t         mgmtDropSuperTableTag(SSuperTableObj *pTable, char *tagName);
 int32_t         mgmtModifySuperTableTagNameByName(SSuperTableObj *pTable, char *oldTagName, char *newTagName);
@@ -40,9 +40,6 @@ int32_t         mgmtDropSuperTableColumnByName(SSuperTableObj *pTable, char *col
 
 SSchema*        mgmtGetSuperTableSchema(SSuperTableObj *pTable);
 
-
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/mnode/inc/mgmtTable.h b/src/mnode/inc/mgmtTable.h
index dbd9bc5a138f6bb0a3089376766a00149cda8e4a..406caad8562ff085c5313d932aa7073e938335b5 100644
--- a/src/mnode/inc/mgmtTable.h
+++ b/src/mnode/inc/mgmtTable.h
@@ -36,10 +36,9 @@ int32_t  mgmtAlterTable(SDbObj *pDb, SAlterTableMsg *pAlter);
 int32_t  mgmtGetTableMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
 int32_t  mgmtRetrieveTables(SShowObj *pShow, char *data, int32_t rows, SConnObj *pConn);
 void     mgmtCleanUpMeters();
-SSchema *mgmtGetTableSchema(STabObj *pTable);  // get schema for a meter
 
-int32_t mgmtAddMeterIntoMetric(STabObj *pMetric, STabObj *pTable);
-int32_t mgmtRemoveMeterFromMetric(STabObj *pMetric, STabObj *pTable);
+int32_t mgmtAddMeterIntoMetric(SSuperTableObj *pMetric, SChildTableObj *pTable);
+int32_t mgmtRemoveMeterFromMetric(SSuperTableObj *pMetric, SChildTableObj *pTable);
 int32_t mgmtGetSuperTableMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
 int32_t mgmtRetrieveSuperTables(SShowObj *pShow, char *data, int32_t rows, SConnObj *pConn);
 
diff --git a/src/mnode/src/mgmtChildTable.c b/src/mnode/src/mgmtChildTable.c
index daa98aec9ec812711944807aad4ae5b0933448b5..c8c97f5c454cdb46bbe1080af1b963508f524592 100644
--- a/src/mnode/src/mgmtChildTable.c
+++ b/src/mnode/src/mgmtChildTable.c
@@ -323,7 +323,7 @@ SChildTableObj* mgmtGetChildTable(char *tableId) {
 }
 
 int32_t mgmtModifyChildTableTagValueByName(SChildTableObj *pTable, char *tagName, char *nContent) {
-//  int col = mgmtFindTagCol(pTable->superTable, tagName);
+//  int col = mgmtFindSuperTableTagIndex(pTable->superTable, tagName);
 //  if (col < 0 || col > pTable->superTable->numOfTags) {
 //    return TSDB_CODE_APP_ERROR;
 //  }
diff --git a/src/mnode/src/mgmtDb.c b/src/mnode/src/mgmtDb.c
index 0133cef9dda0d4b3e6d15661344fa5b1a13ac2ef..f976e48eb6c16d82b38c90cc2f50dfad10842c42 100644
--- a/src/mnode/src/mgmtDb.c
+++ b/src/mnode/src/mgmtDb.c
@@ -86,7 +86,6 @@ int32_t mgmtInitDbs() {
     pDb->numOfMetrics = 0;
     pDb->vgStatus = TSDB_VG_STATUS_READY;
     pDb->vgTimer = NULL;
-    pDb->pMetric = NULL;
     pAcct = mgmtGetAcct(pDb->cfg.acct);
     if (pAcct != NULL)
       mgmtAddDbIntoAcct(pAcct, pDb);
@@ -265,12 +264,12 @@ bool mgmtCheckDropDbFinished(SDbObj *pDb) {
 void mgmtDropDbFromSdb(SDbObj *pDb) {
   while (pDb->pHead) mgmtDropVgroup(pDb, pDb->pHead);
 
-  STabObj *pMetric = pDb->pMetric;
-  while (pMetric) {
-    STabObj *pNext = pMetric->next;
-    mgmtDropTable(pDb, pMetric->meterId, 0);
-    pMetric = pNext;
-  }
+//  SSuperTableObj *pMetric = pDb->pSTable;
+//  while (pMetric) {
+//    SSuperTableObj *pNext = pMetric->next;
+//    mgmtDropTable(pDb, pMetric->meterId, 0);
+//    pMetric = pNext;
+//  }
 
   mPrint("db:%s all meters drop finished", pDb->name);
   sdbDeleteRow(tsDbSdb, pDb);
@@ -734,7 +733,6 @@ void *mgmtDbActionInsert(void *row, char *str, int32_t size, int32_t *ssize) {
   pDb->numOfVgroups = 0;
   pDb->numOfTables = 0;
   pDb->vgTimer = NULL;
-  pDb->pMetric = NULL;
   mgmtAddDbIntoAcct(pAcct, pDb);
 
   return NULL;
diff --git a/src/mnode/src/mgmtSuperTable.c b/src/mnode/src/mgmtSuperTable.c
index c8cdfb5d860c48356fa68f61c0e89aa6ec833a09..80f344a3b85bc642186f462d34fdba69e15721d0 100644
--- a/src/mnode/src/mgmtSuperTable.c
+++ b/src/mnode/src/mgmtSuperTable.c
@@ -15,15 +15,6 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-
-#include "mnode.h"
-#include "mgmtAcct.h"
-#include "mgmtGrant.h"
-#include "mgmtUtil.h"
-#include "mgmtDb.h"
-#include "mgmtDnodeInt.h"
-#include "mgmtVgroup.h"
-#include "mgmtTable.h"
 #include "taosmsg.h"
 #include "tast.h"
 #include "textbuffer.h"
@@ -33,45 +24,28 @@
 #include "tsqlfunction.h"
 #include "ttime.h"
 #include "tstatus.h"
-
-
-#include "sdb.h"
-#include "mgmtSuperTable.h"
-#include "mgmtChildTable.h"
-
 #include "tutil.h"
-
-
-typedef struct {
-  char     meterId[TSDB_TABLE_ID_LEN + 1];
-  char     type;
-  uint32_t cols;
-  char     data[];
-} SMeterBatchUpdateMsg;
-
-typedef struct {
-  int32_t col;
-  int32_t pos;
-  SSchema schema;
-} SchemaUnit;
-
-typedef struct {
-  char    meterId[TSDB_TABLE_ID_LEN + 1];
-  char    action;
-  int32_t dataSize;
-  char    data[];
-} SMeterUpdateMsg;
+#include "mnode.h"
+#include "mgmtAcct.h"
+#include "mgmtChildTable.h"
+#include "mgmtDb.h"
+#include "mgmtDnodeInt.h"
+#include "mgmtGrant.h"
+#include "mgmtSuperTable.h"
+#include "mgmtTable.h"
+#include "mgmtUtil.h"
+#include "mgmtVgroup.h"
 
 void *tsSuperTableSdb;
-void *(*mgmtSuperTableActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int size, int *ssize);
+void *(*mgmtSuperTableActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int32_t size, int32_t *ssize);
 
-void *mgmtSuperTableActionInsert(void *row, char *str, int size, int *ssize);
-void *mgmtSuperTableActionDelete(void *row, char *str, int size, int *ssize);
-void *mgmtSuperTableActionUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtSuperTableActionEncode(void *row, char *str, int size, int *ssize);
-void *mgmtSuperTableActionDecode(void *row, char *str, int size, int *ssize);
-void *mgmtSuperTableActionReset(void *row, char *str, int size, int *ssize);
-void *mgmtSuperTableActionDestroy(void *row, char *str, int size, int *ssize);
+void *mgmtSuperTableActionInsert(void *row, char *str, int32_t size, int32_t *ssize);
+void *mgmtSuperTableActionDelete(void *row, char *str, int32_t size, int32_t *ssize);
+void *mgmtSuperTableActionUpdate(void *row, char *str, int32_t size, int32_t *ssize);
+void *mgmtSuperTableActionEncode(void *row, char *str, int32_t size, int32_t *ssize);
+void *mgmtSuperTableActionDecode(void *row, char *str, int32_t size, int32_t *ssize);
+void *mgmtSuperTableActionReset(void *row, char *str, int32_t size, int32_t *ssize);
+void *mgmtSuperTableActionDestroy(void *row, char *str, int32_t size, int32_t *ssize);
 
 static void mgmtDestroySuperTable(SSuperTableObj *pTable) {
   free(pTable->schema);
@@ -88,51 +62,56 @@ static void mgmtSuperTableActionInit() {
   mgmtSuperTableActionFp[SDB_TYPE_DESTROY] = mgmtSuperTableActionDestroy;
 }
 
-void *mgmtSuperTableActionReset(void *row, char *str, int size, int *ssize) {
+void *mgmtSuperTableActionReset(void *row, char *str, int32_t size, int32_t *ssize) {
   SSuperTableObj *pTable = (SSuperTableObj *) row;
-  int tsize = pTable->updateEnd - (int8_t *) pTable;
+  int32_t tsize = pTable->updateEnd - (int8_t *) pTable;
   memcpy(pTable, str, tsize);
-  pTable->schema = realloc(pTable->schema, pTable->schemaSize);
-  memcpy(pTable->schema, str + tsize, pTable->schemaSize);
+
+  int32_t schemaSize = sizeof(SSchema) * (pTable->numOfColumns + pTable->numOfTags);
+  pTable->schema = realloc(pTable->schema, schemaSize);
+  memcpy(pTable->schema, str + tsize, schemaSize);
+
   return NULL;
 }
 
-void *mgmtSuperTableActionDestroy(void *row, char *str, int size, int *ssize) {
+void *mgmtSuperTableActionDestroy(void *row, char *str, int32_t size, int32_t *ssize) {
   SSuperTableObj *pTable = (SSuperTableObj *) row;
   mgmtDestroySuperTable(pTable);
   return NULL;
 }
 
-void *mgmtSuperTableActionInsert(void *row, char *str, int size, int *ssize) {
+void *mgmtSuperTableActionInsert(void *row, char *str, int32_t size, int32_t *ssize) {
   return NULL;
 }
 
-void *mgmtSuperTableActionDelete(void *row, char *str, int size, int *ssize) {
+void *mgmtSuperTableActionDelete(void *row, char *str, int32_t size, int32_t *ssize) {
   return NULL;
 }
 
-void *mgmtSuperTableActionUpdate(void *row, char *str, int size, int *ssize) {
+void *mgmtSuperTableActionUpdate(void *row, char *str, int32_t size, int32_t *ssize) {
   return mgmtSuperTableActionReset(row, str, size, NULL);
 }
 
-void *mgmtSuperTableActionEncode(void *row, char *str, int size, int *ssize) {
+void *mgmtSuperTableActionEncode(void *row, char *str, int32_t size, int32_t *ssize) {
   SSuperTableObj *pTable = (SSuperTableObj *) row;
   assert(row != NULL && str != NULL);
 
-  int tsize = pTable->updateEnd - (int8_t *) pTable;
-  if (size < tsize + pTable->schemaSize + 1) {
+  int32_t tsize = pTable->updateEnd - (int8_t *) pTable;
+  int32_t schemaSize = sizeof(SSchema) * (pTable->numOfColumns + pTable->numOfTags);
+
+  if (size < tsize + schemaSize + 1) {
     *ssize = -1;
     return NULL;
   }
 
   memcpy(str, pTable, tsize);
-  memcpy(str + tsize, pTable->schema, pTable->schemaSize);
-  *ssize = tsize + pTable->schemaSize;
+  memcpy(str + tsize, pTable->schema, schemaSize);
+  *ssize = tsize + schemaSize;
 
   return NULL;
 }
 
-void *mgmtSuperTableActionDecode(void *row, char *str, int size, int *ssize) {
+void *mgmtSuperTableActionDecode(void *row, char *str, int32_t size, int32_t *ssize) {
   assert(str != NULL);
 
   SSuperTableObj *pTable = (SSuperTableObj *)malloc(sizeof(SSuperTableObj));
@@ -141,24 +120,25 @@ void *mgmtSuperTableActionDecode(void *row, char *str, int size, int *ssize) {
   }
   memset(pTable, 0, sizeof(STabObj));
 
-  int tsize = pTable->updateEnd - (int8_t *)pTable;
+  int32_t tsize = pTable->updateEnd - (int8_t *)pTable;
   if (size < tsize) {
     mgmtDestroySuperTable(pTable);
     return NULL;
   }
   memcpy(pTable, str, tsize);
 
-  pTable->schema = malloc(pTable->schemaSize);
+  int32_t schemaSize = sizeof(SSchema) * (pTable->numOfColumns + pTable->numOfTags);
+  pTable->schema = malloc(schemaSize);
   if (pTable->schema == NULL) {
     mgmtDestroySuperTable(pTable);
     return NULL;
   }
 
-  memcpy(pTable->schema, str + tsize, pTable->schemaSize);
+  memcpy(pTable->schema, str + tsize, schemaSize);
   return (void *)pTable;
 }
 
-void *mgmtSuperTableAction(char action, void *row, char *str, int size, int *ssize) {
+void *mgmtSuperTableAction(char action, void *row, char *str, int32_t size, int32_t *ssize) {
   if (mgmtSuperTableActionFp[(uint8_t)action] != NULL) {
     return (*(mgmtSuperTableActionFp[(uint8_t)action]))(row, str, size, ssize);
   }
@@ -170,13 +150,12 @@ int32_t mgmtInitSuperTables() {
   void *    pLastNode = NULL;
   SSuperTableObj * pTable = NULL;
 
-  // TODO: Make sure this function only run once
   mgmtSuperTableActionInit();
 
   tsSuperTableSdb = sdbOpenTable(tsMaxTables, sizeof(STabObj) + sizeof(SSchema) * TSDB_MAX_COLUMNS + TSDB_MAX_SQL_LEN,
-                          "meters", SDB_KEYTYPE_STRING, tsMgmtDirectory, mgmtSuperTableAction);
+                          "stable", SDB_KEYTYPE_STRING, tsMgmtDirectory, mgmtSuperTableAction);
   if (tsSuperTableSdb == NULL) {
-    mError("failed to init meter data");
+    mError("failed to init super table data");
     return -1;
   }
 
@@ -194,7 +173,7 @@ int32_t mgmtInitSuperTables() {
       pNode = pLastNode;
       continue;
     }
-    pTable->numOfMeters = 0;
+    pTable->numOfTables = 0;
   }
 
   mgmtSetVgroupIdPool();
@@ -207,44 +186,44 @@ void mgmtCleanUpSuperTables() {
 }
 
 int32_t mgmtCreateSuperTable(SDbObj *pDb, SCreateTableMsg *pCreate) {
-  int numOfTables = sdbGetNumOfRows(tsSuperTableSdb);
+  int32_t numOfTables = sdbGetNumOfRows(tsSuperTableSdb);
   if (numOfTables >= TSDB_MAX_TABLES) {
     mError("super table:%s, numOfTables:%d exceed maxTables:%d", pCreate->meterId, numOfTables, TSDB_MAX_TABLES);
     return TSDB_CODE_TOO_MANY_TABLES;
   }
 
-  SSuperTableObj *pMetric = (SSuperTableObj *)calloc(sizeof(SSuperTableObj), 1);
-  if (pMetric == NULL) {
+  SSuperTableObj *pStable = (SSuperTableObj *)calloc(sizeof(SSuperTableObj), 1);
+  if (pStable == NULL) {
     return TSDB_CODE_SERV_OUT_OF_MEMORY;
   }
 
-  strcpy(pMetric->tableId, pCreate->meterId);
-  pMetric->createdTime = taosGetTimestampMs();
-  pMetric->vgId = 0;
-  pMetric->sid = 0;
-  pMetric->uid = (((uint64_t)pMetric->createdTime) << 16) + ((uint64_t)sdbGetVersion() & ((1ul << 16) - 1ul));
-  pMetric->sversion = 0;
-  pMetric->numOfColumns = pCreate->numOfColumns;
-  pMetric->numOfTags = pCreate->numOfTags;
-  pMetric->numOfMeters = 0;
-
-  int numOfCols = pCreate->numOfColumns + pCreate->numOfTags;
-  pMetric->schemaSize = numOfCols * sizeof(SSchema);
-  pMetric->schema = (int8_t *)calloc(1, pMetric->schemaSize);
-  if (pMetric->schema == NULL) {
-    free(pMetric);
+  strcpy(pStable->tableId, pCreate->meterId);
+  pStable->createdTime = taosGetTimestampMs();
+  pStable->vgId = 0;
+  pStable->sid = 0;
+  pStable->uid = (((uint64_t)pStable->createdTime) << 16) + ((uint64_t)sdbGetVersion() & ((1ul << 16) - 1ul));
+  pStable->sversion = 0;
+  pStable->numOfColumns = pCreate->numOfColumns;
+  pStable->numOfTags = pCreate->numOfTags;
+  pStable->numOfTables = 0;
+
+  int32_t numOfCols = pCreate->numOfColumns + pCreate->numOfTags;
+  int32_t schemaSize = numOfCols * sizeof(SSchema);
+  pStable->schema = (SSchema *)calloc(1, schemaSize);
+  if (pStable->schema == NULL) {
+    free(pStable);
     mError("table:%s, no schema input", pCreate->meterId);
     return TSDB_CODE_INVALID_TABLE;
   }
-  memcpy(pMetric->schema, pCreate->schema, numOfCols * sizeof(SSchema));
+  memcpy(pStable->schema, pCreate->schema, numOfCols * sizeof(SSchema));
 
-  pMetric->nextColId = 0;
-  for (int col = 0; col < pCreate->numOfColumns; col++) {
-    SSchema *tschema = (SSchema *)pMetric->schema;
-    tschema[col].colId = pMetric->nextColId++;
+  pStable->nextColId = 0;
+  for (int32_t col = 0; col < pCreate->numOfColumns; col++) {
+    SSchema *tschema = (SSchema *)pStable->schema;
+    tschema[col].colId = pStable->nextColId++;
   }
 
-  if (sdbInsertRow(tsSuperTableSdb, pMetric, 0) < 0) {
+  if (sdbInsertRow(tsSuperTableSdb, pStable, 0) < 0) {
     mError("table:%s, update sdb error", pCreate->meterId);
     return TSDB_CODE_SDB_ERROR;
   }
@@ -261,9 +240,9 @@ SSuperTableObj* mgmtGetSuperTable(char *tableId) {
   return (SSuperTableObj *)sdbGetRow(tsSuperTableSdb, tableId);
 }
 
-int32_t mgmtFindTagCol(SSuperTableObj *pMetric, const char *tagName) {
-  for (int i = 0; i < pMetric->numOfTags; i++) {
-    SSchema *schema = (SSchema *)(pMetric->schema + (pMetric->numOfColumns + i) * sizeof(SSchema));
+int32_t mgmtFindSuperTableTagIndex(SSuperTableObj *pStable, const char *tagName) {
+  for (int32_t i = 0; i < pStable->numOfTags; i++) {
+    SSchema *schema = (SSchema *)(pStable->schema + (pStable->numOfColumns + i) * sizeof(SSchema));
     if (strcasecmp(tagName, schema->name) == 0) {
       return i;
     }
@@ -272,143 +251,128 @@ int32_t mgmtFindTagCol(SSuperTableObj *pMetric, const char *tagName) {
   return -1;
 }
 
-int32_t mgmtAddSuperTableTag(SSuperTableObj *pMetric, SSchema schema[], int32_t ntags) {
-  if (pMetric->numOfTags + ntags > TSDB_MAX_TAGS) {
+int32_t mgmtAddSuperTableTag(SSuperTableObj *pStable, SSchema schema[], int32_t ntags) {
+  if (pStable->numOfTags + ntags > TSDB_MAX_TAGS) {
     return TSDB_CODE_APP_ERROR;
   }
 
   // check if schemas have the same name
-  for (int i = 1; i < ntags; i++) {
-    for (int j = 0; j < i; j++) {
+  for (int32_t i = 1; i < ntags; i++) {
+    for (int32_t j = 0; j < i; j++) {
       if (strcasecmp(schema[i].name, schema[j].name) == 0) {
         return TSDB_CODE_APP_ERROR;
       }
     }
   }
 
-  for (int i = 0; i < ntags; i++) {
-    if (mgmtFindTagCol(pMetric, schema[i].name) >= 0) {
-      return TSDB_CODE_APP_ERROR;
-    }
+  SDbObj *pDb = mgmtGetDbByTableId(pStable->tableId);
+  if (pDb == NULL) {
+    mError("meter: %s not belongs to any database", pStable->tableId);
+    return TSDB_CODE_APP_ERROR;
   }
 
-  uint32_t size = sizeof(SMeterBatchUpdateMsg) + sizeof(SSchema) * ntags;
-  SMeterBatchUpdateMsg *msg = (SMeterBatchUpdateMsg *) malloc(size);
-  memset(msg, 0, size);
+  SAcctObj *pAcct = mgmtGetAcct(pDb->cfg.acct);
+  if (pAcct == NULL) {
+    mError("DB: %s not belongs to andy account", pDb->name);
+    return TSDB_CODE_APP_ERROR;
+  }
 
-  memcpy(msg->meterId, pMetric->tableId, TSDB_TABLE_ID_LEN);
-  msg->type = SDB_TYPE_INSERT;
-  msg->cols = ntags;
-  memcpy(msg->data, schema, sizeof(SSchema) * ntags);
+  int32_t schemaSize = sizeof(SSchema) * (pStable->numOfTags + pStable->numOfColumns);
+  pStable->schema = realloc(pStable->schema, schemaSize + sizeof(SSchema) * ntags);
 
-  int32_t ret = sdbBatchUpdateRow(tsSuperTableSdb, msg, size);
-  tfree(msg);
-//
-//  if (msg->type == SDB_TYPE_INSERT) {  // Insert schema
-//    uint32_t total_cols = pTable->numOfColumns + pTable->numOfTags;
-//    pTable->schema = realloc(pTable->schema, (total_cols + msg->cols) * sizeof(SSchema));
-//    pTable->schemaSize = (total_cols + msg->cols) * sizeof(SSchema);
-//    pTable->numOfTags += msg->cols;
-//    memcpy(pTable->schema + total_cols * sizeof(SSchema), msg->data, msg->cols * sizeof(SSchema));
-//
-//  }
+  memmove(pStable->schema + sizeof(SSchema) * (pStable->numOfColumns + ntags),
+          pStable->schema + sizeof(SSchema) * pStable->numOfColumns, sizeof(SSchema) * pStable->numOfTags);
+  memcpy(pStable->schema + sizeof(SSchema) * pStable->numOfColumns, schema, sizeof(SSchema) * ntags);
 
-  if (ret < 0) {
-    mError("Failed to add tag column %s to table %s", schema[0].name, pMetric->tableId);
-    return TSDB_CODE_APP_ERROR;
+  SSchema *tschema = (SSchema *) (pStable->schema + sizeof(SSchema) * pStable->numOfColumns);
+  for (int32_t i = 0; i < ntags; i++) {
+    tschema[i].colId = pStable->nextColId++;
   }
 
-  mTrace("Succeed to add tag column %s to table %s", schema[0].name, pMetric->tableId);
+  pStable->numOfColumns += ntags;
+  pStable->sversion++;
+
+  pAcct->acctInfo.numOfTimeSeries += (ntags * pStable->numOfTables);
+  sdbUpdateRow(tsSuperTableSdb, pStable, 0, 1);
+
+  mTrace("Succeed to add tag column %s to table %s", schema[0].name, pStable->tableId);
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t mgmtDropSuperTableTag(SSuperTableObj *pMetric, char *tagName) {
-  int col = mgmtFindTagCol(pMetric, tagName);
-  if (col <= 0 || col >= pMetric->numOfTags) {
+int32_t mgmtDropSuperTableTag(SSuperTableObj *pStable, char *tagName) {
+  int32_t col = mgmtFindSuperTableTagIndex(pStable, tagName);
+  if (col <= 0 || col >= pStable->numOfTags) {
     return TSDB_CODE_APP_ERROR;
   }
 
-  // Pack message to do batch update
-  uint32_t             size = sizeof(SMeterBatchUpdateMsg) + sizeof(SchemaUnit);
-  SMeterBatchUpdateMsg *msg = (SMeterBatchUpdateMsg *) malloc(size);
-  memset(msg, 0, size);
-
-  memcpy(msg->meterId, pMetric->tableId, TSDB_TABLE_ID_LEN);
-  msg->type = SDB_TYPE_DELETE;
-  msg->cols = 1;
-//
-//  // Make sure the order of tag columns
-//  SchemaUnit *schemaUnit = (SchemaUnit *)(msg->data);
-//  int         col = schemaUnit->col;
-//  assert(col > 0 && col < pTable->numOfTags);
-//  if (col < pTable->numOfTags - 1) {
-//    memmove(pTable->schema + sizeof(SSchema) * (pTable->numOfColumns + col),
-//            pTable->schema + sizeof(SSchema) * (pTable->numOfColumns + col + 1),
-//            pTable->schemaSize - (sizeof(SSchema) * (pTable->numOfColumns + col + 1)));
-//  }
-//  pTable->schemaSize -= sizeof(SSchema);
-//  pTable->numOfTags--;
-//  pTable->schema = realloc(pTable->schema, pTable->schemaSize);
-//
-  ((SchemaUnit *) (msg->data))->col    = col;
-  ((SchemaUnit *) (msg->data))->pos    = mgmtGetTagsLength(pMetric, col) + TSDB_TABLE_ID_LEN;
-  ((SchemaUnit *) (msg->data))->schema = *(SSchema *) (pMetric->schema + sizeof(SSchema) * (pMetric->numOfColumns + col));
-
-  int32_t ret = sdbBatchUpdateRow(tsSuperTableSdb, msg, size);
-  tfree(msg);
+  SDbObj *pDb = mgmtGetDbByTableId(pStable->tableId);
+  if (pDb == NULL) {
+    mError("table: %s not belongs to any database", pStable->tableId);
+    return TSDB_CODE_APP_ERROR;
+  }
 
-  if (ret < 0) {
-    mError("Failed to drop tag column: %d from table: %s", col, pMetric->tableId);
+  SAcctObj *pAcct = mgmtGetAcct(pDb->cfg.acct);
+  if (pAcct == NULL) {
+    mError("DB: %s not belongs to any account", pDb->name);
     return TSDB_CODE_APP_ERROR;
   }
 
-  mTrace("Succeed to drop tag column: %d from table: %s", col, pMetric->tableId);
+  memmove(pStable->schema + sizeof(SSchema) * col, pStable->schema + sizeof(SSchema) * (col + 1),
+          sizeof(SSchema) * (pStable->numOfColumns + pStable->numOfTags - col - 1));
+
+  pStable->numOfTags--;
+  pStable->sversion++;
+
+  int32_t schemaSize = sizeof(SSchema) * (pStable->numOfTags + pStable->numOfColumns);
+  pStable->schema = realloc(pStable->schema, schemaSize);
+
+  sdbUpdateRow(tsSuperTableSdb, pStable, 0, 1);
+
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t mgmtModifySuperTableTagNameByName(SSuperTableObj *pMetric, char *oldTagName, char *newTagName) {
-  int col = mgmtFindTagCol(pMetric, oldTagName);
+int32_t mgmtModifySuperTableTagNameByName(SSuperTableObj *pStable, char *oldTagName, char *newTagName) {
+  int32_t col = mgmtFindSuperTableTagIndex(pStable, oldTagName);
   if (col < 0) {
     // Tag name does not exist
-    mError("Failed to modify table %s tag column, oname: %s, nname: %s", pMetric->tableId, oldTagName, newTagName);
+    mError("Failed to modify table %s tag column, oname: %s, nname: %s", pStable->tableId, oldTagName, newTagName);
     return TSDB_CODE_INVALID_MSG_TYPE;
   }
 
-  int      rowSize = 0;
+  int32_t      rowSize = 0;
   uint32_t len     = strlen(newTagName);
 
-  if (col >= pMetric->numOfTags || len >= TSDB_COL_NAME_LEN || mgmtFindTagCol(pMetric, newTagName) >= 0) {
+  if (col >= pStable->numOfTags || len >= TSDB_COL_NAME_LEN || mgmtFindSuperTableTagIndex(pStable, newTagName) >= 0) {
     return TSDB_CODE_APP_ERROR;
   }
 
   // update
-  SSchema *schema = (SSchema *) (pMetric->schema + (pMetric->numOfColumns + col) * sizeof(SSchema));
+  SSchema *schema = (SSchema *) (pStable->schema + (pStable->numOfColumns + col) * sizeof(SSchema));
   strncpy(schema->name, newTagName, TSDB_COL_NAME_LEN);
 
   // Encode string
-  int  size = 1 + sizeof(STabObj) + TSDB_MAX_BYTES_PER_ROW;
+  int32_t  size = 1 + sizeof(STabObj) + TSDB_MAX_BYTES_PER_ROW;
   char *msg = (char *) malloc(size);
   if (msg == NULL) return TSDB_CODE_APP_ERROR;
   memset(msg, 0, size);
 
-  mgmtSuperTableActionEncode(pMetric, msg, size, &rowSize);
+  mgmtSuperTableActionEncode(pStable, msg, size, &rowSize);
 
   int32_t ret = sdbUpdateRow(tsSuperTableSdb, msg, rowSize, 1);
   tfree(msg);
 
   if (ret < 0) {
-    mError("Failed to modify table %s tag column", pMetric->tableId);
+    mError("Failed to modify table %s tag column", pStable->tableId);
     return TSDB_CODE_APP_ERROR;
   }
 
-  mTrace("Succeed to modify table %s tag column", pMetric->tableId);
+  mTrace("Succeed to modify table %s tag column", pStable->tableId);
   return TSDB_CODE_SUCCESS;
 }
 
-
-static int32_t mgmtFindSuperTableColumnIndex(SSuperTableObj *pMetric, char *colName) {
-  SSchema *schema = (SSchema *) pMetric->schema;
-  for (int32_t i = 0; i < pMetric->numOfColumns; i++) {
+static int32_t mgmtFindSuperTableColumnIndex(SSuperTableObj *pStable, char *colName) {
+  SSchema *schema = (SSchema *) pStable->schema;
+  for (int32_t i = 0; i < pStable->numOfColumns; i++) {
     if (strcasecmp(schema[i].name, colName) == 0) {
       return i;
     }
@@ -417,20 +381,20 @@ static int32_t mgmtFindSuperTableColumnIndex(SSuperTableObj *pMetric, char *colN
   return -1;
 }
 
-int32_t mgmtAddSuperTableColumn(SSuperTableObj *pMetric, SSchema schema[], int ncols) {
+int32_t mgmtAddSuperTableColumn(SSuperTableObj *pStable, SSchema schema[], int32_t ncols) {
   if (ncols <= 0) {
     return TSDB_CODE_APP_ERROR;
   }
 
-  for (int i = 0; i < ncols; i++) {
-    if (mgmtFindSuperTableColumnIndex(pMetric, schema[i].name) > 0) {
+  for (int32_t i = 0; i < ncols; i++) {
+    if (mgmtFindSuperTableColumnIndex(pStable, schema[i].name) > 0) {
       return TSDB_CODE_APP_ERROR;
     }
   }
 
-  SDbObj *pDb = mgmtGetDbByTableId(pMetric->tableId);
+  SDbObj *pDb = mgmtGetDbByTableId(pStable->tableId);
   if (pDb == NULL) {
-    mError("meter: %s not belongs to any database", pMetric->tableId);
+    mError("meter: %s not belongs to any database", pStable->tableId);
     return TSDB_CODE_APP_ERROR;
   }
 
@@ -440,36 +404,36 @@ int32_t mgmtAddSuperTableColumn(SSuperTableObj *pMetric, SSchema schema[], int n
     return TSDB_CODE_APP_ERROR;
   }
 
-  pMetric->schema = realloc(pMetric->schema, pMetric->schemaSize + sizeof(SSchema) * ncols);
+  int32_t schemaSize = sizeof(SSchema) * (pStable->numOfTags + pStable->numOfColumns);
+  pStable->schema = realloc(pStable->schema, schemaSize + sizeof(SSchema) * ncols);
 
-  memmove(pMetric->schema + sizeof(SSchema) * (pMetric->numOfColumns + ncols),
-          pMetric->schema + sizeof(SSchema) * pMetric->numOfColumns, sizeof(SSchema) * pMetric->numOfTags);
-  memcpy(pMetric->schema + sizeof(SSchema) * pMetric->numOfColumns, schema, sizeof(SSchema) * ncols);
+  memmove(pStable->schema + sizeof(SSchema) * (pStable->numOfColumns + ncols),
+          pStable->schema + sizeof(SSchema) * pStable->numOfColumns, sizeof(SSchema) * pStable->numOfTags);
+  memcpy(pStable->schema + sizeof(SSchema) * pStable->numOfColumns, schema, sizeof(SSchema) * ncols);
 
-  SSchema *tschema = (SSchema *) (pMetric->schema + sizeof(SSchema) * pMetric->numOfColumns);
-  for (int i = 0; i < ncols; i++) {
-    tschema[i].colId = pMetric->nextColId++;
+  SSchema *tschema = (SSchema *) (pStable->schema + sizeof(SSchema) * pStable->numOfColumns);
+  for (int32_t i = 0; i < ncols; i++) {
+    tschema[i].colId = pStable->nextColId++;
   }
 
-  pMetric->schemaSize += sizeof(SSchema) * ncols;
-  pMetric->numOfColumns += ncols;
-  pMetric->sversion++;
+  pStable->numOfColumns += ncols;
+  pStable->sversion++;
 
-  pAcct->acctInfo.numOfTimeSeries += (ncols * pMetric->numOfMeters);
-  sdbUpdateRow(tsSuperTableSdb, pMetric, 0, 1);
+  pAcct->acctInfo.numOfTimeSeries += (ncols * pStable->numOfTables);
+  sdbUpdateRow(tsSuperTableSdb, pStable, 0, 1);
 
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t mgmtDropSuperTableColumnByName(SSuperTableObj *pMetric, char *colName) {
-  int32_t col = mgmtFindSuperTableColumnIndex(pMetric, colName);
+int32_t mgmtDropSuperTableColumnByName(SSuperTableObj *pStable, char *colName) {
+  int32_t col = mgmtFindSuperTableColumnIndex(pStable, colName);
   if (col < 0) {
     return TSDB_CODE_APP_ERROR;
   }
 
-  SDbObj *pDb = mgmtGetDbByTableId(pMetric->tableId);
+  SDbObj *pDb = mgmtGetDbByTableId(pStable->tableId);
   if (pDb == NULL) {
-    mError("table: %s not belongs to any database", pMetric->tableId);
+    mError("table: %s not belongs to any database", pStable->tableId);
     return TSDB_CODE_APP_ERROR;
   }
 
@@ -479,23 +443,23 @@ int32_t mgmtDropSuperTableColumnByName(SSuperTableObj *pMetric, char *colName) {
     return TSDB_CODE_APP_ERROR;
   }
 
-  memmove(pMetric->schema + sizeof(SSchema) * col, pMetric->schema + sizeof(SSchema) * (col + 1),
-          sizeof(SSchema) * (pMetric->numOfColumns + pMetric->numOfTags - col - 1));
+  memmove(pStable->schema + sizeof(SSchema) * col, pStable->schema + sizeof(SSchema) * (col + 1),
+          sizeof(SSchema) * (pStable->numOfColumns + pStable->numOfTags - col - 1));
+
+  pStable->numOfColumns--;
+  pStable->sversion++;
 
-  pMetric->schemaSize -= sizeof(SSchema);
-  pMetric->numOfColumns--;
-  pMetric->schema = realloc(pMetric->schema, pMetric->schemaSize);
-  pMetric->sversion++;
+  int32_t schemaSize = sizeof(SSchema) * (pStable->numOfTags + pStable->numOfColumns);
+  pStable->schema = realloc(pStable->schema, schemaSize);
 
-  pAcct->acctInfo.numOfTimeSeries -= (pMetric->numOfMeters);
-  sdbUpdateRow(tsSuperTableSdb, pMetric, 0, 1);
+  pAcct->acctInfo.numOfTimeSeries -= (pStable->numOfTables);
+  sdbUpdateRow(tsSuperTableSdb, pStable, 0, 1);
 
   return TSDB_CODE_SUCCESS;
 }
 
-
-int mgmtGetSuperTableMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
-  int cols = 0;
+int32_t mgmtGetSuperTableMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
+  int32_t cols = 0;
 
   SDbObj *pDb = NULL;
   if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
@@ -538,7 +502,7 @@ int mgmtGetSuperTableMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
   pShow->numOfColumns = cols;
 
   pShow->offset[0] = 0;
-  for (int i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  for (int32_t i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
 
   pShow->numOfRows = pDb->numOfMetrics;
   pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
@@ -546,10 +510,10 @@ int mgmtGetSuperTableMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
   return 0;
 }
 
-int mgmtRetrieveSuperTables(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
-  int             numOfRows = 0;
+int32_t mgmtRetrieveSuperTables(SShowObj *pShow, char *data, int32_t rows, SConnObj *pConn) {
+  int32_t         numOfRows = 0;
   char *          pWrite;
-  int             cols = 0;
+  int32_t         cols = 0;
   SSuperTableObj *pTable = NULL;
   char            prefix[20] = {0};
   int32_t         prefixLen;
@@ -611,7 +575,7 @@ int mgmtRetrieveSuperTables(SShowObj *pShow, char *data, int rows, SConnObj *pCo
     cols++;
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int32_t *)pWrite = pTable->numOfMeters;
+    *(int32_t *)pWrite = pTable->numOfTables;
     cols++;
 
     numOfRows++;
@@ -621,37 +585,14 @@ int mgmtRetrieveSuperTables(SShowObj *pShow, char *data, int rows, SConnObj *pCo
   return numOfRows;
 }
 
-
-int mgmtAddMeterIntoMetric(STabObj *pMetric, STabObj *pTable) {
-  if (pTable == NULL || pMetric == NULL) return -1;
-
-  pthread_rwlock_wrlock(&(pMetric->rwLock));
-  // add meter into skip list
-  pTable->next = pMetric->pHead;
-  pTable->prev = NULL;
-
-  if (pMetric->pHead) pMetric->pHead->prev = pTable;
-
-  pMetric->pHead = pTable;
-  pMetric->numOfMeters++;
-
-  pthread_rwlock_unlock(&(pMetric->rwLock));
-
+int32_t mgmtAddMeterIntoMetric(SSuperTableObj *pStable, SChildTableObj *pTable) {
+  if (pTable != NULL && pStable != NULL) return -1;
+  pStable->numOfTables++;
   return 0;
 }
 
-int mgmtRemoveMeterFromMetric(STabObj *pMetric, STabObj *pTable) {
-  pthread_rwlock_wrlock(&(pMetric->rwLock));
-
-  if (pTable->prev) pTable->prev->next = pTable->next;
-
-  if (pTable->next) pTable->next->prev = pTable->prev;
-
-  if (pTable->prev == NULL) pMetric->pHead = pTable->next;
-
-  pMetric->numOfMeters--;
-
-  pthread_rwlock_unlock(&(pMetric->rwLock));
-
+int32_t mgmtRemoveMeterFromMetric(SSuperTableObj *pStable, SChildTableObj *pTable) {
+  if (pTable != NULL && pStable != NULL) return -1;
+  pStable->numOfTables--;
   return 0;
 }
\ No newline at end of file