From 5c76b493914c9d1dd33331aa814233fd7dd4a1b4 Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Sat, 16 Jul 2022 15:11:50 +0800 Subject: [PATCH] other: revert the definition --- source/dnode/mnode/impl/inc/mndGrant.h | 3 +-- source/dnode/mnode/impl/src/mndGrant.c | 3 +-- source/dnode/mnode/impl/src/mndMain.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/source/dnode/mnode/impl/inc/mndGrant.h b/source/dnode/mnode/impl/inc/mndGrant.h index 9435c573f4..9c8e853a21 100644 --- a/source/dnode/mnode/impl/inc/mndGrant.h +++ b/source/dnode/mnode/impl/inc/mndGrant.h @@ -25,8 +25,7 @@ int32_t mndInitGrant(SMnode *pMnode); void mndCleanupGrant(); void grantParseParameter(); -void grantReset(EGrantType grant, uint64_t value); -void grantResetNew(SMnode *pMnode, EGrantType grant, uint64_t value); +void grantReset(SMnode *pMnode, EGrantType grant, uint64_t value); void grantAdd(EGrantType grant, uint64_t value); void grantRestore(EGrantType grant, uint64_t value); diff --git a/source/dnode/mnode/impl/src/mndGrant.c b/source/dnode/mnode/impl/src/mndGrant.c index d216ef3384..1148fd740b 100644 --- a/source/dnode/mnode/impl/src/mndGrant.c +++ b/source/dnode/mnode/impl/src/mndGrant.c @@ -129,8 +129,7 @@ int32_t mndInitGrant(SMnode *pMnode) { void mndCleanupGrant() {} void grantParseParameter() { mError("can't parsed parameter k"); } int32_t grantCheck(EGrantType grant) { return TSDB_CODE_SUCCESS; } -void grantReset(EGrantType grant, uint64_t value) {} -void grantResetNew(SMnode *pMnode, EGrantType grant, uint64_t value) {} +void grantReset(SMnode *pMnode, EGrantType grant, uint64_t value) {} void grantAdd(EGrantType grant, uint64_t value) {} void grantRestore(EGrantType grant, uint64_t value) {} int32_t dmProcessGrantReq(SRpcMsg *pMsg) { return TSDB_CODE_SUCCESS; } diff --git a/source/dnode/mnode/impl/src/mndMain.c b/source/dnode/mnode/impl/src/mndMain.c index 6d39926641..443d70aef9 100644 --- a/source/dnode/mnode/impl/src/mndMain.c +++ b/source/dnode/mnode/impl/src/mndMain.c @@ -417,7 +417,7 @@ int32_t mndStart(SMnode *pMnode) { mndSetRestore(pMnode, true); } - grantResetNew(pMnode, TSDB_GRANT_ALL, 0); + grantReset(pMnode, TSDB_GRANT_ALL, 0); return mndInitTimer(pMnode); }