From fad61502a3bde215ce0a7f660985d23e7bf87906 Mon Sep 17 00:00:00 2001 From: deffpuzzl Date: Tue, 19 Jun 2018 16:30:51 +0800 Subject: [PATCH] fix M-SQL select data disorder from queue --- demo/create_queue.c | 4 ++-- demo/create_table.c | 2 +- demo/press_demo.c | 2 +- demo/tvmreplace.c | 2 +- demo/update.c | 2 +- src/stvm.c | 2 +- src/tree.c | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/demo/create_queue.c b/demo/create_queue.c index 6d068a2..2f2c325 100644 --- a/demo/create_queue.c +++ b/demo/create_queue.c @@ -32,9 +32,9 @@ int main(int argc, char *argv[]) SATvm *pstSavm = (SATvm *)pGetSATvm(); // if(RC_SUCC != lCreateQueue(pstSavm, QUEUE_USER_INFO, 1000000, sizeof(szMsg), "")) - if(RC_SUCC != lTableQueue(pstSavm, QUEUE_USER_INFO, 30, lQueueUserInfo)) + if(RC_SUCC != lTableQueue(pstSavm, QUEUE_USER_INFO, 10000, lQueueUserInfo)) { - fprintf(stderr, "create queue %d failed, err: %s\n", QUEUE_USER_INFO, sGetTError(pstSavm->m_lErrno)); + fprintf(stderr, "create queue %d failed, err: %s\n", QUEUE_USER_INFO, sGetTError(pstSavm->m_lErrno)); return RC_FAIL; } diff --git a/demo/create_table.c b/demo/create_table.c index 483b01b..e2c7759 100644 --- a/demo/create_table.c +++ b/demo/create_table.c @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) if(RC_SUCC != lCreateTable(pstSavm, TBL_USER_INFO, 1000, lCreateUserInfo)) { - fprintf(stderr, "create table %d failed, err: %s\n", TBL_USER_INFO, sGetTError(pstSavm->m_lErrno)); + fprintf(stderr, "create table %d failed, err: %s\n", TBL_USER_INFO, sGetTError(pstSavm->m_lErrno)); return RC_FAIL; } diff --git a/demo/press_demo.c b/demo/press_demo.c index 5204e80..389f35f 100644 --- a/demo/press_demo.c +++ b/demo/press_demo.c @@ -20,7 +20,7 @@ long lSelectUserInfo() SATvm *pstSavm = (SATvm *)pGetSATvm(); /* 初始化TBL_USER_INFO表,每张表都需要初始化一次, 对于表重建后,需要重新初始化一次。*/ - vHoldConnect(pstSavm); // 让进程始终与STVM 保持链接,可以大大提高效率 + vHoldConnect(pstSavm); // 让进程始终与STVM 保持链接,可以大大提高效率 if(RC_SUCC != lInitSATvm(pstSavm, TBL_USER_INFO)) { fprintf(stderr, "init failed, err:(%d)(%s)\n", pstSavm->m_lErrno, sGetTError(pstSavm->m_lErrno)); diff --git a/demo/tvmreplace.c b/demo/tvmreplace.c index 35a6911..ab6cb23 100644 --- a/demo/tvmreplace.c +++ b/demo/tvmreplace.c @@ -25,7 +25,7 @@ int main(int argc, char *argv[]) return RC_FAIL; } - updateinit(pstSavm, stUpd); + updateinit(pstSavm, stUpd); conditinit(pstSavm, stUser, TBL_USER_INFO); // 绑定变量 conditstr(pstSavm, stUser, user_no, "20180529"); // 查询条件赋值 conditstr(pstSavm, stUser, user_type, "1"); // 查询条件赋值 diff --git a/demo/update.c b/demo/update.c index 43cdc87..40b318c 100644 --- a/demo/update.c +++ b/demo/update.c @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) return RC_FAIL; } - updateinit(pstSavm, stUpd); + updateinit(pstSavm, stUpd); conditinit(pstSavm, stUser, TBL_USER_INFO); // 绑定变量 conditstr(pstSavm, stUser, user_type, "1"); // 查询条件赋值 conditstr(pstSavm, stUser, user_no, "20180223"); // 查询条件赋值 diff --git a/src/stvm.c b/src/stvm.c index b3b975f..6c5bd5d 100644 --- a/src/stvm.c +++ b/src/stvm.c @@ -1438,7 +1438,7 @@ void vPrintIndex() pstSavm->bSearch = TYPE_SYSTEM; pstSavm->tblName = SYS_TVM_INDEX; - pstSavm->lSize = sizeof(TIndex); + pstSavm->lSize = sizeof(TIndex); lRet = lTableDeclare(pstSavm); if(RC_SUCC != lRet) { diff --git a/src/tree.c b/src/tree.c index a88642d..cb23d20 100644 --- a/src/tree.c +++ b/src/tree.c @@ -9403,8 +9403,8 @@ long lExportFile(TABLE t, char *pszFile, char *pszFlag) return RC_FAIL; } - pstRun->m_lCurLine = 1; - pstRun->m_lCurType = EXE_PLAN_ALL; + pstRun->m_lCurLine = 1; + pstRun->m_lCurType = EXE_PLAN_ALL; pstRun->m_pvCurAddr = pstRun->m_pvAddr; if(TYPE_MQUEUE == pstRun->m_lType) {