xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #28559 from taosdata/enh/TS-5554-3.0 

enh: use correct error code
This commit is contained in:
Shengliang Guan 2024-10-31 09:03:48 +08:00 committed by GitHub
parent d51d3dd414 af03868864
commit 82f579a16d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/dnode/mnode/impl/src/mndStb.c
View File

@ -1928,7 +1928,7 @@ static int32_t mndDropSuperTableColumn(SMnode *pMnode, const SStbObj *pOld, SStb
} }
if (pOld->numOfColumns == 2) { if (pOld->numOfColumns == 2) {
code = TSDB_CODE_MND_INVALID_STB_ALTER_OPTION; code = TSDB_CODE_PAR_INVALID_DROP_COL;
TAOS_RETURN(code); TAOS_RETURN(code);
} }
@ -4295,9 +4295,9 @@ static int32_t mndDropTbAdd(SMnode *pMnode, SHashObj *pVgHashMap, const SVgroupI
return 0; return 0;
} }
int vgInfoCmp(const void* lp, const void* rp) { int vgInfoCmp(const void *lp, const void *rp) {
SVgroupInfo* pLeft = (SVgroupInfo*)lp; SVgroupInfo *pLeft = (SVgroupInfo *)lp;
SVgroupInfo* pRight = (SVgroupInfo*)rp; SVgroupInfo *pRight = (SVgroupInfo *)rp;
if (pLeft->hashBegin < pRight->hashBegin) { if (pLeft->hashBegin < pRight->hashBegin) {
return -1; return -1;
} else if (pLeft->hashBegin > pRight->hashBegin) { } else if (pLeft->hashBegin > pRight->hashBegin) {

2
source/dnode/mnode/impl/test/stb/stb.cpp
View File

@ -782,7 +782,7 @@ TEST_F(MndTestStb, 07_Alter_Stb_DropColumn) {
{ {
void* pReq = BuildAlterStbDropColumnReq(stbname, "col1", &contLen); void* pReq = BuildAlterStbDropColumnReq(stbname, "col1", &contLen);
SRpcMsg* pRsp = test.SendReq(TDMT_MND_ALTER_STB, pReq, contLen); SRpcMsg* pRsp = test.SendReq(TDMT_MND_ALTER_STB, pReq, contLen);
ASSERT_EQ(pRsp->code, TSDB_CODE_MND_INVALID_STB_ALTER_OPTION); ASSERT_EQ(pRsp->code, TSDB_CODE_PAR_INVALID_DROP_COL);
rpcFreeCont(pRsp->pCont); rpcFreeCont(pRsp->pCont);
} }