diff --git a/include/common/tgrant.h b/include/common/tgrant.h index e6f2502a08..4ed7d7bd78 100644 --- a/include/common/tgrant.h +++ b/include/common/tgrant.h @@ -48,9 +48,9 @@ typedef enum { TSDB_GRANT_CPU_CORES, TSDB_GRANT_STABLE, TSDB_GRANT_TABLE, - TSDB_GRANT_TOPIC, + TSDB_GRANT_SUBSCRIPTION, TSDB_GRANT_STREAM_EXPIRE, - TSDB_GRANT_TOPIC_EXPIRE, + TSDB_GRANT_SUBSCRIPTION_EXPIRE, TSDB_GRANT_AUDIT_EXPIRE, TSDB_GRANT_CSV_EXPIRE, TSDB_GRANT_MULTI_TIER_EXPIRE, diff --git a/include/util/taoserror.h b/include/util/taoserror.h index c477d53b05..f1f51c812d 100644 --- a/include/util/taoserror.h +++ b/include/util/taoserror.h @@ -561,7 +561,7 @@ int32_t* taosGetErrno(); #define TSDB_CODE_GRANT_PAR_DEC_IVLD_KEY TAOS_DEF_ERROR_CODE(0, 0x0810) #define TSDB_CODE_GRANT_PAR_DEC_IVLD_KLEN TAOS_DEF_ERROR_CODE(0, 0x0811) #define TSDB_CODE_GRANT_GEN_IVLD_KEY TAOS_DEF_ERROR_CODE(0, 0x0812) -#define TSDB_CODE_GRANT_GEN_APP_LIMIT TAOS_DEF_ERROR_CODE(0, 0x0813) +#define TSDB_CODE_GRANT_GEN_ACTIVE_LEN TAOS_DEF_ERROR_CODE(0, 0x0813) #define TSDB_CODE_GRANT_GEN_ENC_IVLD_KLEN TAOS_DEF_ERROR_CODE(0, 0x0814) #define TSDB_CODE_GRANT_PAR_IVLD_DIST TAOS_DEF_ERROR_CODE(0, 0x0815) #define TSDB_CODE_GRANT_UNLICENSED_CLUSTER TAOS_DEF_ERROR_CODE(0, 0x0816) diff --git a/source/dnode/mnode/impl/src/mndTopic.c b/source/dnode/mnode/impl/src/mndTopic.c index 973b522a4d..0d23db09e5 100644 --- a/source/dnode/mnode/impl/src/mndTopic.c +++ b/source/dnode/mnode/impl/src/mndTopic.c @@ -564,10 +564,6 @@ static int32_t mndProcessCreateTopicReq(SRpcMsg *pReq) { return code; } - if ((terrno = grantCheck(TSDB_GRANT_TOPIC)) < 0) { - goto _OVER; - } - if (tDeserializeSCMCreateTopicReq(pReq->pCont, pReq->contLen, &createTopicReq) != 0) { terrno = TSDB_CODE_INVALID_MSG; goto _OVER; diff --git a/source/util/src/terror.c b/source/util/src/terror.c index bf951ec10b..fe8276604a 100644 --- a/source/util/src/terror.c +++ b/source/util/src/terror.c @@ -448,7 +448,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_PAR_IVLD_KEY, "Invalid key to parse TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_PAR_DEC_IVLD_KEY, "Invalid key to decode active code") TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_PAR_DEC_IVLD_KLEN, "Invalid klen to decode active code") TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_GEN_IVLD_KEY, "Invalid key to gen active code") -TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_GEN_APP_LIMIT, "Limited app num to gen active code") +TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_GEN_ACTIVE_LEN, "Exceeded active len to gen active code") TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_GEN_ENC_IVLD_KLEN, "Invalid klen to encode active code") TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_PAR_IVLD_DIST, "Invalid dist to parse active code") TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_UNLICENSED_CLUSTER, "Illegal operation, the license is being used by an unlicensed cluster")