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 14:18:43 +08:00
parent acd4542b0c
commit 66ac81d29b
1 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/tree.c
View File

@ -6924,6 +6924,38 @@ long _lFetchGroup(SATvm *pstSavm, RunTime *pstRun, TABLE t, void *psvOut)
return RC_NOTFOUND; return RC_NOTFOUND;
} }
/*************************************************************************************************
description：Queue-fetch the data as truck
parameters:
pstSavm --stvm handle
pstRun --table handle
t --table
psvout --result data
return:
RC_SUCC --success
RC_FAIL --failure
*************************************************************************************************/
long _lFetchQueue(SATvm *pstSavm, RunTime *pstRun, TABLE t, void *psvOut)
{
SHTruck *pstTruck = NULL;
TblDef *pv = (TblDef *)pstRun->m_pvAddr;
size_t lOffset = lGetListOfs(t) + pstRun->m_lCurLine;
for(; pstRun->m_lCurLine <= pv->m_lMaxRow; pstRun->m_lCurLine ++)
{
pstTruck = (PSHTruck)pGetNode(pstRun->m_pvAddr,
pv->m_lData + pv->m_lTruck * (lOffset % pv->m_lMaxRow));
if(IS_TRUCK_NULL(pstTruck))
continue;
pstRun->m_lCurLine ++;
memcpy(psvOut, pstTruck->m_pvData, pv->m_lReSize);
return RC_SUCC;
}
return RC_NOTFOUND;
}
/************************************************************************************************* /*************************************************************************************************
description：Cursor-fetch the data as truck description：Cursor-fetch the data as truck
parameters: parameters:
@ -7105,8 +7137,13 @@ long lTableFetch(SATvm *pstSavm, void *psvOut)
lRet = _lFetchIndex(pstSavm, pstRun, pstSavm->tblName, psvOut); lRet = _lFetchIndex(pstSavm, pstRun, pstSavm->tblName, psvOut);
else if(EXE_PLAN_GRP == pstRun->m_lCurType) else if(EXE_PLAN_GRP == pstRun->m_lCurType)
lRet = _lFetchGroup(pstSavm, pstRun, pstSavm->tblName, psvOut); lRet = _lFetchGroup(pstSavm, pstRun, pstSavm->tblName, psvOut);
else
{
if(TYPE_MQUEUE == pstRun->m_lType)
lRet = _lFetchQueue(pstSavm, pstRun, pstSavm->tblName, psvOut);
else else
lRet = _lFetchTruck(pstSavm, pstRun, pstSavm->tblName, psvOut); lRet = _lFetchTruck(pstSavm, pstRun, pstSavm->tblName, psvOut);
}
if(RC_NOTFOUND == lRet) if(RC_NOTFOUND == lRet)
{ {
pstRun->m_pvCurAddr = NULL; pstRun->m_pvCurAddr = NULL;
@ -9312,37 +9349,6 @@ long lImportTable(TABLE t, size_t lCount, void *psvData)
return lRet; return lRet;
} }
/*************************************************************************************************
description：Queue-fetch the data as truck
parameters:
pstSavm --stvm handle
pstRun --table handle
t --table
psvout --result data
return:
RC_SUCC --success
RC_FAIL --failure
*************************************************************************************************/
long _lFetchQueue(SATvm *pstSavm, RunTime *pstRun, TABLE t, void *psvOut)
{
SHTruck *pstTruck = NULL;
TblDef *pv = (TblDef *)pstRun->m_pvAddr;
size_t lRow, lOffset = pv->m_lListOfs + 1;
for(; pstRun->m_lCurLine <= pv->m_lMaxRow; lOffset ++, pstRun->m_lCurLine ++)
{
pstTruck = (PSHTruck)pGetNode(pstRun->m_pvAddr,
pv->m_lData + pv->m_lTruck * (lOffset % pv->m_lMaxRow));
if(IS_TRUCK_NULL(pstTruck))
continue;
memcpy(psvOut, pstTruck->m_pvData, pv->m_lReSize);
return RC_SUCC;
}
return RC_NOTFOUND;
}
/************************************************************************************************* /*************************************************************************************************
description：Export the memory table to a file description：Export the memory table to a file
parameters: parameters:
@ -9404,6 +9410,9 @@ long lExportFile(TABLE t, char *pszFile, char *pszFlag)
{ {
while(RC_NOTFOUND != _lFetchQueue(pstSavm, pstRun, t, psvOut)) while(RC_NOTFOUND != _lFetchQueue(pstSavm, pstRun, t, psvOut))
{ {
if(lGetFldNum(t) > 0)
_lExportContext(fp, psvOut, lGetFldNum(t), pGetTblKey(t), pszFlag);
else
fwrite(psvOut, 1, lGetRowSize(t), fp); fwrite(psvOut, 1, lGetRowSize(t), fp);
fprintf(fp, "\n"); fprintf(fp, "\n");
} }