validate table name
This commit is contained in:
parent
598d8deb43
commit
f94dee1df9
|
@ -34,10 +34,16 @@ int metaCreateSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
|
||||||
int32_t szBuf = 0;
|
int32_t szBuf = 0;
|
||||||
void *p = NULL;
|
void *p = NULL;
|
||||||
SCoder coder = {0};
|
SCoder coder = {0};
|
||||||
|
SMetaReader mr = {0};
|
||||||
|
|
||||||
{
|
// validate req
|
||||||
// TODO: validate request (uid and name unique)
|
metaReaderInit(&mr, pMeta->pVnode, 0);
|
||||||
|
if (metaGetTableEntryByName(&mr, pReq->name) == 0) {
|
||||||
|
terrno = TSDB_CODE_TDB_TABLE_ALREADY_EXIST;
|
||||||
|
metaReaderClear(&mr);
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
|
metaReaderClear(&mr);
|
||||||
|
|
||||||
// set structs
|
// set structs
|
||||||
me.version = version;
|
me.version = version;
|
||||||
|
@ -66,6 +72,7 @@ int metaDropSTable(SMeta *pMeta, int64_t verison, SVDropStbReq *pReq) {
|
||||||
|
|
||||||
int metaCreateTable(SMeta *pMeta, int64_t version, SVCreateTbReq *pReq) {
|
int metaCreateTable(SMeta *pMeta, int64_t version, SVCreateTbReq *pReq) {
|
||||||
SMetaEntry me = {0};
|
SMetaEntry me = {0};
|
||||||
|
SMetaReader mr = {0};
|
||||||
|
|
||||||
// validate message
|
// validate message
|
||||||
if (pReq->type != TSDB_CHILD_TABLE && pReq->type != TSDB_NORMAL_TABLE) {
|
if (pReq->type != TSDB_CHILD_TABLE && pReq->type != TSDB_NORMAL_TABLE) {
|
||||||
|
@ -77,10 +84,14 @@ int metaCreateTable(SMeta *pMeta, int64_t version, SVCreateTbReq *pReq) {
|
||||||
pReq->uid = tGenIdPI64();
|
pReq->uid = tGenIdPI64();
|
||||||
pReq->ctime = taosGetTimestampSec();
|
pReq->ctime = taosGetTimestampSec();
|
||||||
|
|
||||||
{
|
// validate req
|
||||||
// TODO: validate request (uid and name unique)
|
metaReaderInit(&mr, pMeta->pVnode, 0);
|
||||||
// for child table, also check if super table exists
|
if (metaGetTableEntryByName(&mr, pReq->name) == 0) {
|
||||||
|
terrno = TSDB_CODE_TDB_TABLE_ALREADY_EXIST;
|
||||||
|
metaReaderClear(&mr);
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
|
metaReaderClear(&mr);
|
||||||
|
|
||||||
// build SMetaEntry
|
// build SMetaEntry
|
||||||
me.version = version;
|
me.version = version;
|
||||||
|
|
Loading…
Reference in New Issue