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

Merge pull request #924 from taosdata/feature-master/lihui 

[TBASE-1337]
This commit is contained in:
fangpanpan 2019-12-16 13:55:54 +08:00 committed by GitHub
parent d129e3bf7f 193d2bc309
commit ebce945ee1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/detail/inc/mgmt.h
View File

@ -312,7 +312,7 @@ int mgmtUpdateDb(SDbObj *pDb);
SDbObj *mgmtGetDb(char *db); SDbObj *mgmtGetDb(char *db);
SDbObj *mgmtGetDbByMeterId(char *db); SDbObj *mgmtGetDbByMeterId(char *db);
int mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate); int mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate);
int mgmtDropDbByName(SAcctObj *pAcct, char *name); int mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists);
int mgmtDropDb(SDbObj *pDb); int mgmtDropDb(SDbObj *pDb);
/* void mgmtMonitorDbDrop(void *unused); */ /* void mgmtMonitorDbDrop(void *unused); */
void mgmtMonitorDbDrop(void *unused, void *unusedt); void mgmtMonitorDbDrop(void *unused, void *unusedt);

3
src/system/detail/src/mgmtDb.c
View File

@ -310,10 +310,11 @@ int mgmtDropDb(SDbObj *pDb) {
} }
} }
int mgmtDropDbByName(SAcctObj *pAcct, char *name) { int mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists) {
SDbObj *pDb; SDbObj *pDb;
pDb = (SDbObj *)sdbGetRow(dbSdb, name); pDb = (SDbObj *)sdbGetRow(dbSdb, name);
if (pDb == NULL) { if (pDb == NULL) {
if (ignoreNotExists) return TSDB_CODE_SUCCESS;
mWarn("db:%s is not there", name); mWarn("db:%s is not there", name);
return TSDB_CODE_INVALID_DB; return TSDB_CODE_INVALID_DB;
} }

2
src/system/detail/src/mgmtShell.c
View File

@ -849,7 +849,7 @@ int mgmtProcessDropDbMsg(char *pMsg, int msgLen, SConnObj *pConn) {
if (!pConn->writeAuth) { if (!pConn->writeAuth) {
code = TSDB_CODE_NO_RIGHTS; code = TSDB_CODE_NO_RIGHTS;
} else { } else {
code = mgmtDropDbByName(pConn->pAcct, pDrop->db); code = mgmtDropDbByName(pConn->pAcct, pDrop->db, pDrop->ignoreNotExists);
if (code == 0) { if (code == 0) {
mLPrint("DB:%s is dropped by %s", pDrop->db, pConn->pUser->user); mLPrint("DB:%s is dropped by %s", pDrop->db, pConn->pUser->user);
} }