massage the code to make the system structure more clear

src/common/inc/tglobal.h

@@ -139,7 +139,8 @@ extern int32_t  tsMonitorInterval;
 
 extern int32_t tsAsyncLog;
 extern int32_t tsNumOfLogLines;
-extern int32_t ddebugFlag;
+extern int32_t dDebugFlag;
+extern int32_t vDebugFlag;
 extern int32_t mdebugFlag;
 extern int32_t cdebugFlag;
 extern int32_t jnidebugFlag;

src/common/src/tglobal.c

@@ -129,17 +129,18 @@ int32_t tsMaxSQLStringLen = TSDB_MAX_SQL_LEN;
 int32_t tsNumOfLogLines = 10000000;
 int32_t mdebugFlag = 135;
 int32_t sdbDebugFlag = 135;
-int32_t ddebugFlag = 131;
-int32_t cdebugFlag = 131;
+int32_t dDebugFlag = 135;
+int32_t vDebugFlag = 135;
+int32_t cdebugFlag = 135;
 int32_t jnidebugFlag = 131;
 int32_t odbcdebugFlag = 131;
 int32_t httpDebugFlag = 131;
 int32_t monitorDebugFlag = 131;
 int32_t qdebugFlag = 131;
-int32_t rpcDebugFlag = 131;
+int32_t rpcDebugFlag = 135;
 int32_t uDebugFlag = 131;
 int32_t debugFlag = 131;
-int32_t sDebugFlag = 131;
+int32_t sDebugFlag = 135;
 
 // the maximum number of results for projection query on super table that are returned from
 // one virtual node, to order according to timestamp
@@ -1002,7 +1003,7 @@ static void doInitGlobalConfig() {
   taosInitConfigOption(cfg);
 
   cfg.option = "dDebugFlag";
-  cfg.ptr = &ddebugFlag;
+  cfg.ptr = &dDebugFlag;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
   cfg.minValue = 0;

src/cq/test/cqtest.c

@@ -33,13 +33,13 @@ int main(int argc, char *argv[]) {
 
   for (int i=1; i<argc; ++i) {
     if (strcmp(argv[i], "-d")==0 && i < argc-1) {
-      ddebugFlag = atoi(argv[++i]);
+      dDebugFlag = atoi(argv[++i]);
     } else if (strcmp(argv[i], "-n") == 0 && i <argc-1) {
       num = atoi(argv[++i]);
     } else {
       printf("\nusage: %s [options] \n", argv[0]);
       printf("  [-n num]: number of streams, default:%d\n", num);
-      printf("  [-d debugFlag]: debug flag, default:%d\n", ddebugFlag);
+      printf("  [-d debugFlag]: debug flag, default:%d\n", dDebugFlag);
       printf("  [-h help]: print out this help\n\n");
       exit(0);
     }

src/dnode/inc/dnodeLog.h → src/dnode/inc/dnodeInt.h

@@ -22,22 +22,12 @@ extern "C" {
 
 #include "tlog.h"
 
-extern int32_t ddebugFlag;
+extern int32_t dDebugFlag;
 
-#define dError(...)                          \
-  if (ddebugFlag & DEBUG_ERROR) {            \
-    taosPrintLog("ERROR DND ", 255, __VA_ARGS__); \
-  }
-#define dWarn(...)                                  \
-  if (ddebugFlag & DEBUG_WARN) {                    \
-    taosPrintLog("WARN  DND ", ddebugFlag, __VA_ARGS__); \
-  }
-#define dTrace(...)                           \
-  if (ddebugFlag & DEBUG_TRACE) {             \
-    taosPrintLog("DND ", ddebugFlag, __VA_ARGS__); \
-  }
-#define dPrint(...) \
-  { taosPrintLog("DND ", 255, __VA_ARGS__); }
+#define dError(...) if (dDebugFlag & DEBUG_ERROR) {taosPrintLog("ERROR DND ", 255, __VA_ARGS__); }
+#define dWarn(...) if (dDebugFlag & DEBUG_WARN) {taosPrintLog("WARN  DND ", dDebugFlag, __VA_ARGS__); }
+#define dTrace(...) if (dDebugFlag & DEBUG_TRACE) {taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); }
+#define dPrint(...) {taosPrintLog("DND ", 255, __VA_ARGS__); }
 
 #ifdef __cplusplus
 }

src/dnode/inc/dnodeMgmt.h

@@ -22,7 +22,7 @@ extern "C" {
 
 int32_t dnodeInitMgmt();
 void    dnodeCleanupMgmt();
-void    dnodeMgmt(SRpcMsg *rpcMsg);
+void    dnodeDispatchToDnodeMgmt(SRpcMsg *rpcMsg);
 
 void*   dnodeGetVnode(int32_t vgId);
 int32_t dnodeGetVnodeStatus(void *pVnode);

src/dnode/inc/dnodeRead.h → src/dnode/inc/dnodeVRead.h

@@ -22,7 +22,7 @@ extern "C" {
 
 int32_t dnodeInitRead();
 void    dnodeCleanupRead();
-void    dnodeRead(SRpcMsg *pMsg);
+void    dnodeDispatchToVnodeReadQueue(SRpcMsg *pMsg);
 
 #ifdef __cplusplus
 }

src/dnode/inc/dnodeWrite.h → src/dnode/inc/dnodeVWrite.h

@@ -22,7 +22,7 @@ extern "C" {
 
 int32_t dnodeInitWrite();
 void    dnodeCleanupWrite();
-void    dnodeWrite(SRpcMsg *pMsg);
+void    dnodeDispatchToVnodeWriteQueue(SRpcMsg *pMsg);
 void    dnodeSendWriteResponse(void *pVnode, void *param, int32_t code);
 
 #ifdef __cplusplus

src/dnode/src/dnodeMain.c

@@ -22,13 +22,13 @@
 #include "tconfig.h"
 #include "tglobal.h"
 #include "dnode.h"
-#include "dnodeLog.h"
+#include "dnodeInt.h"
 #include "dnodeMgmt.h"
 #include "dnodePeer.h"
 #include "dnodeModule.h"
-#include "dnodeRead.h"
+#include "dnodeVRead.h"
 #include "dnodeShell.h"
-#include "dnodeWrite.h"
+#include "dnodeVWrite.h"
 #include "tgrant.h"
 
 static int32_t dnodeInitSystem();

src/dnode/src/dnodeMgmt.c

@@ -32,10 +32,10 @@
 #include "dnode.h"
 #include "vnode.h"
 #include "mnode.h"
-#include "dnodeLog.h"
+#include "dnodeInt.h"
 #include "dnodeMgmt.h"
-#include "dnodeRead.h"
-#include "dnodeWrite.h"
+#include "dnodeVRead.h"
+#include "dnodeVWrite.h"
 #include "dnodeModule.h"
 
 #define MPEER_CONTENT_LEN 2000
@@ -127,7 +127,7 @@ void dnodeCleanupMgmt() {
   dnodeCloseVnodes();
 }
 
-void dnodeMgmt(SRpcMsg *pMsg) {
+void dnodeDispatchToDnodeMgmt(SRpcMsg *pMsg) {
   SRpcMsg rsp;
 
   if (dnodeProcessMgmtMsgFp[pMsg->msgType]) {

src/dnode/src/dnodeModule.c

@@ -21,7 +21,7 @@
 #include "mnode.h"
 #include "http.h"
 #include "monitor.h"
-#include "dnodeLog.h"
+#include "dnodeInt.h"
 #include "dnodeModule.h"
 
 typedef struct {

src/dnode/src/dnodePeer.c

@@ -24,9 +24,9 @@
 #include "tglobal.h"
 #include "trpc.h"
 #include "dnode.h"
-#include "dnodeLog.h"
+#include "dnodeInt.h"
 #include "dnodeMgmt.h"
-#include "dnodeWrite.h"
+#include "dnodeVWrite.h"
 #include "mnode.h"
 
 extern void dnodeUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet);
@@ -38,15 +38,15 @@ static void *tsDnodeServerRpc = NULL;
 static void *tsDnodeClientRpc = NULL;
 
 int32_t dnodeInitServer() {
-  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_CREATE_TABLE] = dnodeWrite;
-  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_DROP_TABLE]   = dnodeWrite;
-  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_ALTER_TABLE]  = dnodeWrite;
-  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_DROP_STABLE]  = dnodeWrite;
-
-  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_CREATE_VNODE] = dnodeMgmt;
-  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_DROP_VNODE]   = dnodeMgmt;
-  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_ALTER_STREAM] = dnodeMgmt;
-  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_CONFIG_DNODE] = dnodeMgmt;
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_CREATE_TABLE] = dnodeDispatchToVnodeWriteQueue;
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_DROP_TABLE]   = dnodeDispatchToVnodeWriteQueue; 
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_ALTER_TABLE]  = dnodeDispatchToVnodeWriteQueue;
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_DROP_STABLE]  = dnodeDispatchToVnodeWriteQueue;
+
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_CREATE_VNODE] = dnodeDispatchToDnodeMgmt; 
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_DROP_VNODE]   = dnodeDispatchToDnodeMgmt;
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_ALTER_STREAM] = dnodeDispatchToDnodeMgmt;
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_CONFIG_DNODE] = dnodeDispatchToDnodeMgmt;
 
   dnodeProcessReqMsgFp[TSDB_MSG_TYPE_DM_CONFIG_TABLE] = mgmtProcessReqMsgFromDnode;
   dnodeProcessReqMsgFp[TSDB_MSG_TYPE_DM_CONFIG_VNODE] = mgmtProcessReqMsgFromDnode;

src/dnode/src/dnodeShell.c

@@ -22,9 +22,9 @@
 #include "tglobal.h"
 #include "http.h"
 #include "dnode.h"
-#include "dnodeLog.h"
-#include "dnodeRead.h"
-#include "dnodeWrite.h"
+#include "dnodeInt.h"
+#include "dnodeVRead.h"
+#include "dnodeVWrite.h"
 #include "dnodeShell.h"
 
 static void  (*dnodeProcessShellMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *);
@@ -37,9 +37,9 @@ static int32_t tsDnodeSubmitReqNum = 0;
 void mgmtProcessMsgFromShell(SRpcMsg *rpcMsg);
 
 int32_t dnodeInitShell() {
-  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_SUBMIT] = dnodeWrite;
-  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_QUERY]  = dnodeRead;
-  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_FETCH]  = dnodeRead;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_SUBMIT] = dnodeDispatchToVnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_QUERY]  = dnodeDispatchToVnodeReadQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_FETCH]  = dnodeDispatchToVnodeReadQueue;
 
   // the following message shall be treated as mnode write
   dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_CONNECT]     = mgmtProcessMsgFromShell;

src/dnode/src/dnodeRead.c → src/dnode/src/dnodeVRead.c

@@ -21,9 +21,9 @@
 #include "trpc.h"
 #include "twal.h"
 #include "tglobal.h"
-#include "dnodeLog.h"
+#include "dnodeInt.h"
 #include "dnodeMgmt.h"
-#include "dnodeRead.h"
+#include "dnodeVRead.h"
 #include "vnode.h"
 
 typedef struct {
@@ -84,7 +84,7 @@ void dnodeCleanupRead() {
   dPrint("dnode read is closed");
 }
 
-void dnodeRead(SRpcMsg *pMsg) {
+void dnodeDispatchToVnodeReadQueue(SRpcMsg *pMsg) {
   int32_t     queuedMsgNum = 0;
   int32_t     leftLen      = pMsg->contLen;
   char        *pCont       = (char *) pMsg->pCont;

src/dnode/src/dnodeWrite.c → src/dnode/src/dnodeVWrite.c

@@ -24,8 +24,8 @@
 #include "tglobal.h"
 #include "vnode.h"
 #include "tdataformat.h"
-#include "dnodeLog.h"
-#include "dnodeWrite.h"
+#include "dnodeInt.h"
+#include "dnodeVWrite.h"
 #include "dnodeMgmt.h"
 
 typedef struct {
@@ -82,7 +82,7 @@ void dnodeCleanupWrite() {
   dPrint("dnode write is closed");
 }
 
-void dnodeWrite(SRpcMsg *pMsg) {
+void dnodeDispatchToVnodeWriteQueue(SRpcMsg *pMsg) {
   char *pCont = (char *)pMsg->pCont;
 
   if (pMsg->msgType == TSDB_MSG_TYPE_SUBMIT || pMsg->msgType == TSDB_MSG_TYPE_MD_DROP_STABLE) {

src/rpc/test/rserver.c

@@ -151,7 +151,7 @@ int main(int argc, char *argv[]) {
       commit = atoi(argv[++i]);
     } else if (strcmp(argv[i], "-d")==0 && i < argc-1) {
       rpcDebugFlag = atoi(argv[++i]);
-      ddebugFlag = rpcDebugFlag;
+      dDebugFlag = rpcDebugFlag;
       uDebugFlag = rpcDebugFlag;
     } else {
       printf("\nusage: %s [options] \n", argv[0]);

src/vnode/inc/vnodeInt.h

@@ -20,8 +20,17 @@
 extern "C" {
 #endif
 
+#include "tlog.h"
 #include "tsync.h"
 #include "twal.h"
+#include "tcq.h"
+
+extern int32_t vDebugFlag;
+
+#define vError(...) if (vDebugFlag & DEBUG_ERROR) {taosPrintLog("ERROR VND ", 255, __VA_ARGS__); }
+#define vWarn(...) if (vDebugFlag & DEBUG_WARN) {taosPrintLog("WARN  VND ", vDebugFlag, __VA_ARGS__); }
+#define vTrace(...) if (vDebugFlag & DEBUG_TRACE) {taosPrintLog("VND ", vDebugFlag, __VA_ARGS__); }
+#define vPrint(...) {taosPrintLog("VND ", 255, __VA_ARGS__); }
 
 typedef struct {
   int32_t      vgId;      // global vnode group ID

src/vnode/src/vnodeRead.c

@@ -65,7 +65,7 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, void *pCont, int32_t cont
     pRet->len = sizeof(SQueryTableRsp);
     pRet->rsp = pRsp;
     
-    dTrace("pVnode:%p vgId:%d QInfo:%p, dnode query msg disposed", pVnode, pVnode->vgId, pQInfo);
+    vTrace("vgId:%d QInfo:%p, dnode query msg disposed", pVnode->vgId, pQInfo);
   } else {
     pQInfo = pCont;
     code = TSDB_CODE_ACTION_IN_PROGRESS;
@@ -83,7 +83,7 @@ static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, void *pCont, int32_t cont
 
   int32_t code = TSDB_CODE_SUCCESS;
 
-  dTrace("pVnode:%p vgId:%d QInfo:%p, retrieve msg is received", pVnode, pVnode->vgId, pQInfo);
+  vTrace("vgId:%d QInfo:%p, retrieve msg is received", pVnode->vgId, pQInfo);
   
   pRet->code = qRetrieveQueryResultInfo(pQInfo);
   if (pRet->code != TSDB_CODE_SUCCESS) {
@@ -104,6 +104,6 @@ static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, void *pCont, int32_t cont
     }
   }
   
-  dTrace("pVnode:%p vgId:%d QInfo:%p, retrieve msg is disposed", pVnode, pVnode->vgId, pQInfo);
+  vTrace("vgId:%d QInfo:%p, retrieve msg is disposed", pVnode->vgId, pQInfo);
   return code;
 }

src/vnode/src/vnodeWrite.c

@@ -91,7 +91,7 @@ static int32_t vnodeProcessSubmitMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pR
 
   // save insert result into item
 
-  dTrace("pVnode:%p vgId:%d, submit msg is processed", pVnode, pVnode->vgId);
+  vTrace("vgId:%d, submit msg is processed", pVnode->vgId);
   code = tsdbInsertData(pVnode->tsdb, pCont);
 
   pRet->len = sizeof(SShellSubmitRspMsg);
@@ -110,7 +110,7 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe
   SMDCreateTableMsg *pTable = pCont;
   int32_t code = 0;
 
-  dTrace("pVnode:%p vgId:%d, table:%s, start to create", pVnode, pVnode->vgId, pTable->tableId);
+  vTrace("vgId:%d, table:%s, start to create", pVnode->vgId, pTable->tableId);
   int16_t   numOfColumns = htons(pTable->numOfColumns);
   int16_t   numOfTags = htons(pTable->numOfTags);
   int32_t   sid = htonl(pTable->sid);
@@ -157,7 +157,7 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe
   tfree(pDestTagSchema);
   tfree(pDestSchema);
 
-  dTrace("pVnode:%p vgId:%d, table:%s is created, result:%x", pVnode, pVnode->vgId, pTable->tableId, code);
+  vTrace("vgId:%d, table:%s is created, result:%x", pVnode->vgId, pTable->tableId, code);
   return code; 
 }
 
@@ -165,7 +165,7 @@ static int32_t vnodeProcessDropTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet
   SMDDropTableMsg *pTable = pCont;
   int32_t code = 0;
 
-  dTrace("pVnode:%p vgId:%d, table:%s, start to drop", pVnode, pVnode->vgId, pTable->tableId);
+  vTrace("vgId:%d, table:%s, start to drop", pVnode->vgId, pTable->tableId);
   STableId tableId = {
     .uid = htobe64(pTable->uid),
     .tid = htonl(pTable->sid)
@@ -180,7 +180,7 @@ static int32_t vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet
   SMDCreateTableMsg *pTable = pCont;
   int32_t code = 0;
 
-  dTrace("pVnode:%p vgId:%d, table:%s, start to alter", pVnode, pVnode->vgId, pTable->tableId);
+  vTrace("vgId:%d, table:%s, start to alter", pVnode->vgId, pTable->tableId);
   int16_t numOfColumns  = htons(pTable->numOfColumns);
   int16_t numOfTags     = htons(pTable->numOfTags);
   int32_t sid           = htonl(pTable->sid);
@@ -221,7 +221,7 @@ static int32_t vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet
 
   tfree(pDestSchema);
 
-  dTrace("pVnode:%p vgId:%d, table:%s, alter table result:%d", pVnode, pVnode->vgId, pTable->tableId, code);
+  vTrace("vgId:%d, table:%s, alter table result:%d", pVnode->vgId, pTable->tableId, code);
 
   return code;
 }
@@ -230,14 +230,14 @@ static int32_t vnodeProcessDropStableMsg(SVnodeObj *pVnode, void *pCont, SRspRet
   SMDDropSTableMsg *pTable = pCont;
   int32_t code = 0;
 
-  dTrace("pVnode:%p vgId:%d, stable:%s, start to drop", pVnode, pVnode->vgId, pTable->tableId);
+  vTrace("vgId:%d, stable:%s, start to drop", pVnode->vgId, pTable->tableId);
   // TODO: drop stable in vvnode
   //int64_t uid = htobe64(pTable->uid);
   //void *pTsdb = dnodeGetVnodeTsdb(pMsg->pVnode);
   //rpcRsp.code = tsdbDropTable(pTsdb, pTable->uid);
 
   code = TSDB_CODE_SUCCESS;
-  dTrace("pVnode:%p vgId:%d, stable:%s, drop stable result:%x", pVnode, pTable->tableId, code);
+  vTrace("vgId:%d, stable:%s, drop stable result:%x", pVnode, pTable->tableId, code);
  
   return code;
 }

src/wal/test/waltest.c

@@ -61,7 +61,7 @@ int main(int argc, char *argv[]) {
     } else if (strcmp(argv[i], "-v")==0 && i < argc-1) {
       ver = atoll(argv[++i]);
     } else if (strcmp(argv[i], "-d")==0 && i < argc-1) {
-      ddebugFlag = atoi(argv[++i]);
+      dDebugFlag = atoi(argv[++i]);
     } else {
       printf("\nusage: %s [options] \n", argv[0]);
       printf("  [-p path]: wal file path default is:%s\n", path);
@@ -71,7 +71,7 @@ int main(int argc, char *argv[]) {
       printf("  [-r rows]: rows of records per wal file, default is:%d\n", rows);
       printf("  [-k keep]: keep the wal after closing, default is:%d\n", keep);
       printf("  [-v version]: initial version, default is:%ld\n", ver);
-      printf("  [-d debugFlag]: debug flag, default:%d\n", ddebugFlag);
+      printf("  [-d debugFlag]: debug flag, default:%d\n", dDebugFlag);
       printf("  [-h help]: print out this help\n\n");
       exit(0);
     }