From df4abc51e8bfe54a8b9007ac44ec895361e11b18 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 21 Oct 2020 14:01:00 +0000 Subject: [PATCH] TD-1589 --- src/client/src/tscSQLParser.c | 4 ++-- src/dnode/src/dnodeShell.c | 1 + src/dnode/src/dnodeVWrite.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index efe8ac86f8..e1744288bb 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -4647,8 +4647,8 @@ int32_t parseOrderbyClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQu int32_t setDelInfo(SSqlObj *pSql, struct SSqlInfo* pInfo) { const char* msg1 = "invalid table name"; const char* msg2 = "invalid delete sql"; - const char* msg3 = "delete can not be supported by super table"; - const char* msg4 = "delete only supported by record"; + const char* msg3 = "data deletion is not supported on super table"; + const char* msg4 = "Only data deletion by row is not supported "; int32_t code = TSDB_CODE_SUCCESS; diff --git a/src/dnode/src/dnodeShell.c b/src/dnode/src/dnodeShell.c index a5c5d4759b..892eaae0be 100644 --- a/src/dnode/src/dnodeShell.c +++ b/src/dnode/src/dnodeShell.c @@ -39,6 +39,7 @@ static int32_t tsDnodeSubmitReqNum = 0; int32_t dnodeInitShell() { dnodeProcessShellMsgFp[TSDB_MSG_TYPE_SUBMIT] = dnodeDispatchToVnodeWriteQueue; + dnodeProcessShellMsgFp[TSDB_MSG_TYPE_DELETE] = dnodeDispatchToVnodeWriteQueue; dnodeProcessShellMsgFp[TSDB_MSG_TYPE_QUERY] = dnodeDispatchToVnodeReadQueue; dnodeProcessShellMsgFp[TSDB_MSG_TYPE_FETCH] = dnodeDispatchToVnodeReadQueue; dnodeProcessShellMsgFp[TSDB_MSG_TYPE_UPDATE_TAG_VAL] = dnodeDispatchToVnodeWriteQueue; diff --git a/src/dnode/src/dnodeVWrite.c b/src/dnode/src/dnodeVWrite.c index 89438ce0ae..4511080f28 100644 --- a/src/dnode/src/dnodeVWrite.c +++ b/src/dnode/src/dnodeVWrite.c @@ -98,7 +98,7 @@ void dnodeCleanupVnodeWrite() { void dnodeDispatchToVnodeWriteQueue(SRpcMsg *pMsg) { char *pCont = (char *)pMsg->pCont; - if (pMsg->msgType == TSDB_MSG_TYPE_SUBMIT || pMsg->msgType == TSDB_MSG_TYPE_DELETE) { + if (pMsg->msgType == TSDB_MSG_TYPE_SUBMIT /*|| pMsg->msgType == TSDB_MSG_TYPE_DELETE*/) { SMsgDesc *pDesc = (SMsgDesc *)pCont; pDesc->numOfVnodes = htonl(pDesc->numOfVnodes); pCont += sizeof(SMsgDesc); -- GitLab