query(fix): return new error code except connect msg

99ef55c7 · Alex Duan · cd1b8703 · 99ef55c7
隐藏空白更改
内联并排

Showing with 12 addition and 18 deletion

source/client/src/clientImpl.c source/client/src/clientImpl.c +12 -18

未找到文件。
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -1425,24 +1425,18 @@ void processMsgFromServer(void* parent, SRpcMsg* pMsg, SEpSet* pEpSet) {
  }
  // pMsg is response msg
-  switch (pMsg->msgType) {
+  if (pMsg->msgType != TDMT_MND_CONNECT + 1) {
-    case TDMT_VND_BATCH_META + 1:
+    // uniform to one error code: TSDB_CODE_RPC_SOMENODE_NOT_CONNECTED
-    case TDMT_VND_SUBMIT + 1:
+    if (pMsg->code == TSDB_CODE_RPC_SOMENODE_BROKEN_LINK) {
-    case TDMT_SCH_QUERY + 1:
+      pMsg->code = TSDB_CODE_RPC_SOMENODE_NOT_CONNECTED;
-    case TDMT_SCH_MERGE_QUERY + 1:
+    }
-      // uniform to one error code: TSDB_CODE_RPC_SOMENODE_NOT_CONNECTED
+  } else {
-      if (pMsg->code == TSDB_CODE_RPC_SOMENODE_BROKEN_LINK) {
+    // restore origin code
-        pMsg->code = TSDB_CODE_RPC_SOMENODE_NOT_CONNECTED;
+    if (pMsg->code == TSDB_CODE_RPC_SOMENODE_NOT_CONNECTED) {
-      }
+      pMsg->code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
-      break;
+    } else if (pMsg->code == TSDB_CODE_RPC_SOMENODE_BROKEN_LINK) {
-    default:
+      pMsg->code = TSDB_CODE_RPC_BROKEN_LINK;
-      // restore origin code
+    }
-      if (pMsg->code == TSDB_CODE_RPC_SOMENODE_NOT_CONNECTED) {
-        pMsg->code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
-      } else if (pMsg->code == TSDB_CODE_RPC_SOMENODE_BROKEN_LINK) {
-        pMsg->code = TSDB_CODE_RPC_BROKEN_LINK;
-      }
-      break;
  }
  AsyncArg* arg = taosMemoryCalloc(1, sizeof(AsyncArg));