Merge pull request #2320 from taosdata/hotfix/crash

[TD-669] incomplete update while alter vgroup

src/mnode/src/mnodeTable.c

@@ -182,14 +182,19 @@ static int32_t mnodeChildTableActionUpdate(SSdbOper *pOper) {
   SChildTableObj *pNew = pOper->pObj;
   SChildTableObj *pTable = mnodeGetChildTable(pNew->info.tableId);
   if (pTable != pNew) {
-    void *oldTableId = pTable->info.tableId;
+    void *oldTableId = pTable->info.tableId;    
     void *oldSql = pTable->sql;
     void *oldSchema = pTable->schema;
+    void *oldSTable = pTable->superTable;
     int32_t oldRefCount = pTable->refCount;
+    
     memcpy(pTable, pNew, sizeof(SChildTableObj));
+    
     pTable->refCount = oldRefCount;
     pTable->sql = pNew->sql;
     pTable->schema = pNew->schema;
+    pTable->superTable = oldSTable;
+    
     free(pNew);
     free(oldSql);
     free(oldSchema);

src/mnode/src/mnodeVgroup.c

@@ -149,17 +149,8 @@ static int32_t mnodeVgroupActionUpdate(SSdbOper *pOper) {
       }
     }
 
-    void *idPool = pVgroup->idPool;
-    void *tableList = pVgroup->tableList;
-    int32_t oldRefCount = pVgroup->refCount;
-
-    memcpy(pVgroup, pNew, sizeof(SVgObj));
-    
-    free(pNew);
-    pVgroup->refCount = oldRefCount;
-    pVgroup->idPool = idPool;
-    pVgroup->tableList = tableList;
-    
+    memcpy(pVgroup, pNew, tsVgUpdateSize);
+
     for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
       SDnodeObj *pDnode = mnodeGetDnode(pVgroup->vnodeGid[i].dnodeId);
       pVgroup->vnodeGid[i].pDnode = pDnode;