From 6557244eecab6cd8d746e77dd922b8cb96b8350e Mon Sep 17 00:00:00 2001
From: liu0x54 <tliu@taosdata.com>
Date: Fri, 12 Jun 2020 10:43:27 +0000
Subject: [PATCH 1/2] [TD-597] fix alter table bugs

---
 src/mnode/src/mnodeTable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 0e255d011b..478e7790fb 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -1004,7 +1004,7 @@ static int32_t mnodeAddSuperTableColumn(SDbObj *pDb, SSuperTableObj *pStable, SS
           sizeof(SSchema) * pStable->numOfTags);
   memcpy(pStable->schema + pStable->numOfColumns, schema, sizeof(SSchema) * ncols);
 
-  SSchema *tschema = (SSchema *) (pStable->schema + sizeof(SSchema) * pStable->numOfColumns);
+  SSchema *tschema = (SSchema *) (pStable->schema + pStable->numOfColumns);
   for (int32_t i = 0; i < ncols; i++) {
     tschema[i].colId = pStable->nextColId++;
   }

From f909b78c6c4dee5d3e18366b66e70d513c8473d0 Mon Sep 17 00:00:00 2001
From: Jeff Tao <jhtao@taosdata.com>
Date: Sat, 13 Jun 2020 00:18:36 +0000
Subject: [PATCH 2/2] release local resources only after all messages are
 consumed

---
 src/vnode/src/vnodeMain.c | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index 67ba891f93..0882ee983d 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -321,6 +321,22 @@ void vnodeRelease(void *pVnodeRaw) {
     return;
   }
 
+  if (pVnode->tsdb)
+    tsdbCloseRepo(pVnode->tsdb, 1);
+  pVnode->tsdb = NULL;
+
+  if (pVnode->wal) 
+    walClose(pVnode->wal);
+  pVnode->wal = NULL;
+
+  if (pVnode->wqueue) 
+    dnodeFreeVnodeWqueue(pVnode->wqueue);
+  pVnode->wqueue = NULL;
+
+  if (pVnode->rqueue) 
+    dnodeFreeVnodeRqueue(pVnode->rqueue);
+  pVnode->rqueue = NULL;
+ 
   tfree(pVnode->rootDir);
 
   if (pVnode->status == TAOS_VN_STATUS_DELETING) {
@@ -411,33 +427,21 @@ void vnodeBuildStatusMsg(void *param) {
 }
 
 static void vnodeCleanUp(SVnodeObj *pVnode) {
+  // remove from hash, so new messages wont be consumed
   taosHashRemove(tsDnodeVnodesHash, (const char *)&pVnode->vgId, sizeof(int32_t));
 
+  // stop replication module
   if (pVnode->sync) {
     syncStop(pVnode->sync);
     pVnode->sync = NULL;
   }
 
-  if (pVnode->tsdb)
-    tsdbCloseRepo(pVnode->tsdb, 1);
-  pVnode->tsdb = NULL;
-
-  if (pVnode->wal) 
-    walClose(pVnode->wal);
-  pVnode->wal = NULL;
-
+  // stop continuous query
   if (pVnode->cq) 
     cqClose(pVnode->cq);
   pVnode->cq = NULL;
 
-  if (pVnode->wqueue) 
-    dnodeFreeVnodeWqueue(pVnode->wqueue);
-  pVnode->wqueue = NULL;
-
-  if (pVnode->rqueue) 
-    dnodeFreeVnodeRqueue(pVnode->rqueue);
-  pVnode->rqueue = NULL;
- 
+  // release local resources only after cutting off outside connections
   vnodeRelease(pVnode);
 }