naming optimization

src/client/src/tscServer.c

@@ -333,7 +333,7 @@ int tscSendMsgToServer(SSqlObj *pSql) {
       .code    = 0
   };
 
-  if ((rpcMsg.msgType == TSDB_MSG_TYPE_SUBMIT) && (tsShortcutFlag & TSDB_SHORTCUT_RPC_SEND_SUBMIT)) {
+  if ((rpcMsg.msgType == TSDB_MSG_TYPE_SUBMIT) && (tsShortcutFlag & TSDB_SHORTCUT_RB_RPC_SEND_SUBMIT)) {
     rpcFreeCont(rpcMsg.pCont);
     return TSDB_CODE_FAILED;
   }

src/inc/taosdef.h

@@ -417,10 +417,10 @@ do { \
 #define TSDB_DEFAULT_STABLES_HASH_SIZE         100
 #define TSDB_DEFAULT_CTABLES_HASH_SIZE         20000
 
-#define TSDB_SHORTCUT_RPC_SEND_SUBMIT          0x01u
-#define TSDB_SHORTCUT_RPC_RECV_SUBMIT          0x02u
-#define TSDB_SHORTCUT_VNODE_WAL_WRITE          0x04u
-#define TSDB_SHORTCUT_TSDB_COMMIT              0x08u
+#define TSDB_SHORTCUT_RB_RPC_SEND_SUBMIT       0x01u  // RB: return before(global shortcut)
+#define TSDB_SHORTCUT_RA_RPC_RECV_SUBMIT       0x02u  // RA: return after(global shortcut)
+#define TSDB_SHORTCUT_NR_VNODE_WAL_WRITE       0x04u  // NR: no return and go on following actions(local shortcut)
+#define TSDB_SHORTCUT_RB_TSDB_COMMIT           0x08u
 
 #define TSDB_PORT_DNODESHELL                   0
 #define TSDB_PORT_DNODEDNODE                   5

src/rpc/src/rpcMain.c

@@ -1162,7 +1162,7 @@ static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead, SRpcReqConte
 
     switch (rpcMsg.msgType) {
       case TSDB_MSG_TYPE_SUBMIT:
-        if (tsShortcutFlag & TSDB_SHORTCUT_RPC_RECV_SUBMIT) {
+        if (tsShortcutFlag & TSDB_SHORTCUT_RA_RPC_RECV_SUBMIT) {
           SRpcMsg rMsg = {.handle = rpcMsg.handle, .pCont = NULL, .contLen = 0};
           rpcSendResponse(&rMsg);
           rpcFreeCont(rpcMsg.pCont);

src/tsdb/src/tsdbCommit.c

@@ -98,7 +98,7 @@ void *tsdbCommitData(STsdbRepo *pRepo) {
   }
   tsdbStartCommit(pRepo);
 
-  if (tsShortcutFlag & TSDB_SHORTCUT_TSDB_COMMIT) {
+  if (tsShortcutFlag & TSDB_SHORTCUT_RB_TSDB_COMMIT) {
     tsdbEndCommit(pRepo, terrno);
     return NULL;
   }

src/vnode/src/vnodeWrite.c

@@ -103,7 +103,7 @@ int32_t vnodeProcessWrite(void *vparam, void *wparam, int32_t qtype, void *rpara
   }
 
   // write into WAL
-  if (!(tsShortcutFlag & TSDB_SHORTCUT_VNODE_WAL_WRITE)) {
+  if (!(tsShortcutFlag & TSDB_SHORTCUT_NR_VNODE_WAL_WRITE)) {
     code = walWrite(pVnode->wal, pHead);
   }
   if (code < 0) {