zcy
/
firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix M-SQL select data disorder from queue

pull/1/head
deffpuzzl 2018-06-19 16:30:51 +08:00
parent 66ac81d29b
commit fad61502a3
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demo/create_queue.c
View File

@ -32,9 +32,9 @@ int main(int argc, char *argv[])
SATvm *pstSavm = (SATvm *)pGetSATvm(); SATvm *pstSavm = (SATvm *)pGetSATvm();
// if(RC_SUCC != lCreateQueue(pstSavm, QUEUE_USER_INFO, 1000000, sizeof(szMsg), "")) // 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; return RC_FAIL;
} }

2
demo/create_table.c
View File

@ -39,7 +39,7 @@ int main(int argc, char *argv[])
if(RC_SUCC != lCreateTable(pstSavm, TBL_USER_INFO, 1000, lCreateUserInfo)) 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; return RC_FAIL;
} }

2
demo/press_demo.c
View File

@ -20,7 +20,7 @@ long lSelectUserInfo()
SATvm *pstSavm = (SATvm *)pGetSATvm(); SATvm *pstSavm = (SATvm *)pGetSATvm();
/* 初始化TBL_USER_INFO表，每张表都需要初始化一次, 对于表重建后，需要重新初始化一次。*/ /* 初始化TBL_USER_INFO表，每张表都需要初始化一次, 对于表重建后，需要重新初始化一次。*/
vHoldConnect(pstSavm); // 让进程始终与STVM 保持链接，可以大大提高效率 vHoldConnect(pstSavm); // 让进程始终与STVM 保持链接，可以大大提高效率
if(RC_SUCC != lInitSATvm(pstSavm, TBL_USER_INFO)) if(RC_SUCC != lInitSATvm(pstSavm, TBL_USER_INFO))
{ {
fprintf(stderr, "init failed, err:(%d)(%s)\n", pstSavm->m_lErrno, sGetTError(pstSavm->m_lErrno)); fprintf(stderr, "init failed, err:(%d)(%s)\n", pstSavm->m_lErrno, sGetTError(pstSavm->m_lErrno));

2
demo/tvmreplace.c
View File

@ -25,7 +25,7 @@ int main(int argc, char *argv[])
return RC_FAIL; return RC_FAIL;
} }
updateinit(pstSavm, stUpd); updateinit(pstSavm, stUpd);
conditinit(pstSavm, stUser, TBL_USER_INFO); // 绑定变量 conditinit(pstSavm, stUser, TBL_USER_INFO); // 绑定变量
conditstr(pstSavm, stUser, user_no, "20180529"); // 查询条件赋值 conditstr(pstSavm, stUser, user_no, "20180529"); // 查询条件赋值
conditstr(pstSavm, stUser, user_type, "1"); // 查询条件赋值 conditstr(pstSavm, stUser, user_type, "1"); // 查询条件赋值

2
demo/update.c
View File

@ -26,7 +26,7 @@ int main(int argc, char *argv[])
return RC_FAIL; return RC_FAIL;
} }
updateinit(pstSavm, stUpd); updateinit(pstSavm, stUpd);
conditinit(pstSavm, stUser, TBL_USER_INFO); // 绑定变量 conditinit(pstSavm, stUser, TBL_USER_INFO); // 绑定变量
conditstr(pstSavm, stUser, user_type, "1"); // 查询条件赋值 conditstr(pstSavm, stUser, user_type, "1"); // 查询条件赋值
conditstr(pstSavm, stUser, user_no, "20180223"); // 查询条件赋值 conditstr(pstSavm, stUser, user_no, "20180223"); // 查询条件赋值

2
src/stvm.c
View File

@ -1438,7 +1438,7 @@ void vPrintIndex()
pstSavm->bSearch = TYPE_SYSTEM; pstSavm->bSearch = TYPE_SYSTEM;
pstSavm->tblName = SYS_TVM_INDEX; pstSavm->tblName = SYS_TVM_INDEX;
pstSavm->lSize = sizeof(TIndex); pstSavm->lSize = sizeof(TIndex);
lRet = lTableDeclare(pstSavm); lRet = lTableDeclare(pstSavm);
if(RC_SUCC != lRet) if(RC_SUCC != lRet)
{ {

4
src/tree.c
View File

@ -9403,8 +9403,8 @@ long lExportFile(TABLE t, char *pszFile, char *pszFlag)
return RC_FAIL; return RC_FAIL;
} }
pstRun->m_lCurLine = 1; pstRun->m_lCurLine = 1;
pstRun->m_lCurType = EXE_PLAN_ALL; pstRun->m_lCurType = EXE_PLAN_ALL;
pstRun->m_pvCurAddr = pstRun->m_pvAddr; pstRun->m_pvCurAddr = pstRun->m_pvAddr;
if(TYPE_MQUEUE == pstRun->m_lType) if(TYPE_MQUEUE == pstRun->m_lType)
{ {