From a3ed554ee451c65ce858511394299eb3c6680e21 Mon Sep 17 00:00:00 2001 From: deffpuzzl Date: Wed, 20 Jun 2018 08:52:21 +0800 Subject: [PATCH] add create queue script --- demo/press_demo.c | 2 +- que_user_info.def | 12 ++++++++++++ src/stvm.c | 31 +++++++++++++++++++++++++++---- 3 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 que_user_info.def diff --git a/demo/press_demo.c b/demo/press_demo.c index 389f35f..dd49d5e 100644 --- a/demo/press_demo.c +++ b/demo/press_demo.c @@ -36,7 +36,7 @@ long lSelectUserInfo() if(RC_SUCC != lSelect(pstSavm, (void *)&stUser)) { fprintf(stderr, "Select error: (%d) (%s)\n", pstSavm->m_lErrno, sGetTError(pstSavm->m_lErrno)); - return RC_FAIL; + return RC_FAIL; } } diff --git a/que_user_info.def b/que_user_info.def new file mode 100644 index 0000000..d4472b8 --- /dev/null +++ b/que_user_info.def @@ -0,0 +1,12 @@ +set TABLE=22 +set TABLESPACE=10000 + +create queue QUEUE_USER_FIELD +( + acct_id long, + user_no char(21), + user_type char[2], + user_nm char[81], + user_addr char[161], + user_phone char[31] +); diff --git a/src/stvm.c b/src/stvm.c index 6c5bd5d..fbe1211 100644 --- a/src/stvm.c +++ b/src/stvm.c @@ -638,7 +638,7 @@ long lIndexField(char *s, TblDef *ps, Uenum em) RC_SUCC --success RC_FAIL --failure *************************************************************************************************/ -long lAnalysIndex(char *s, long len, TblDef *ps) +long lAnalysIndex(char *s, long len, TblDef *ps, bool bQueue) { long i, n, k, lRet; char szIndex[1024], szTemp[256], *p = NULL; @@ -669,6 +669,12 @@ long lAnalysIndex(char *s, long len, TblDef *ps) if(p = strcasestr(szTemp, "create unique index")) { + if(bQueue) + { + fprintf(stderr, "Queue does not support unique index\n"); + return RC_FAIL; + } + strimabout(p, "(", ")"); if(k & UNQIUE) { @@ -681,6 +687,12 @@ long lAnalysIndex(char *s, long len, TblDef *ps) } else if(p = strcasestr(szTemp, "create index")) { + if(bQueue) + { + fprintf(stderr, "Queue does not support index\n"); + return RC_FAIL; + } + strimabout(p, "(", ")"); if(k & NORMAL) { @@ -693,6 +705,12 @@ long lAnalysIndex(char *s, long len, TblDef *ps) } else if(p = strcasestr(szTemp, "create hash")) { + if(bQueue) + { + fprintf(stderr, "Queue does not support index\n"); + return RC_FAIL; + } + strimabout(p, "(", ")"); if(k & NORMAL) { @@ -959,18 +977,23 @@ void vTableStruck(TABLE t) *************************************************************************************************/ long lDefineTable(char *pszCreate, char *pszTable) { - long i; TblDef sf; + bool bQueue = false; char *p = NULL, *q = NULL; SATvm *pstSavm = (SATvm *)pGetSATvm(); sfieldreplace(pszCreate, '\t', ' '); - if(NULL == (p = strcasestr(pszCreate, "create table"))) + + if(NULL == (p = strcasestr(pszCreate, "create table")) && + NULL == (p = strcasestr(pszCreate, "create queue"))) { fprintf(stderr, "Lost table syntax\n"); return RC_FAIL; } + if(NULL != strcasestr(pszCreate, "create queue")) + bQueue = true; + memset(&sf, 0, sizeof(TblDef)); if(RC_SUCC != lAnalysHead(pszCreate, p - pszCreate, &sf)) return RC_FAIL; @@ -992,7 +1015,7 @@ long lDefineTable(char *pszCreate, char *pszTable) sf.m_lReSize = sizecn(sf.m_stKey, sf.m_lIdxNum); sf.m_lTruck = sf.m_lReSize + sizeof(SHTruck); - if(RC_SUCC != lAnalysIndex(q + 1, strlen(q + 1), &sf)) + if(RC_SUCC != lAnalysIndex(q + 1, strlen(q + 1), &sf, bQueue)) return RC_FAIL; if(RC_SUCC != lCustomTable(pstSavm, sf.m_table, sf.m_lMaxRow, &sf))