From 7ace2a63d238d595e3edb928f12f864f49d32f81 Mon Sep 17 00:00:00 2001 From: deffpuzzl Date: Thu, 31 May 2018 19:48:28 +0800 Subject: [PATCH] add show command --- demo/create | Bin 9583 -> 9583 bytes demo/create.c | 14 ++-- include/tmain.h | 2 + include/tvm.h | 20 +++-- src/stvm.c | 16 ++-- src/tcp.c | 218 ++++++++++++++++++++++++++++++++++++++++++++++++ src/tree.c | 109 ++++++++++++------------ 7 files changed, 302 insertions(+), 77 deletions(-) diff --git a/demo/create b/demo/create index b8eeca610debde71f33396aecd6a0230f8ccd844..9c5659cd28267ebefc3dd81acf5dd4677000b9a5 100755 GIT binary patch delta 869 zcmZuwO=uHA6rPuD(yYmDQb|q4)NaK7ff#%8&`W|%yObV85kx65w|FQhC@3l^M2kxZ zw0%NTL_PRJdv!s#In+d@K@d!jik1{DY_t$^Dp)1H+0+)a18-*De((FfH^XdoxH>#p z5(hlY8Us@wU$rFUMv{=j)+T}T@Yt8VU%0U;Pp!5s&OA3=-$$3e{9e&7*vbHg9%&jB zU=8m!fAW;vVWt)fWos#}>zADpz#t~YE>Q59I1FF0CI4v#4HR9$Y7OgXVJe*dTS#R4Q%)wzQKBqbXD01y zTsv)#+m*J4WYL`961+t<^|t5yyEpj4-R<-U3LD9EI&sZ?1Ww~#=^TvXm~;%P_)uCB z-~S{TqTI$Yxxe=&W!C*iWbcISgye{&1mT{|-OTTj#$k#93b(#2cfhoF66W+N?;{7C z#Xf&XoRh)?GB$@7{l`UPD>HDOvYnS*p)9-g&a--NTe1oBfqjC98CVGTA%V3(tI)!- zdM&U45XQ>E5M09j9aSiysKkKOl@J&>s|-ONS7~3ymS6|{6MexDz`7nkBny84o)Rh| delta 825 zcmZuvO=}ZT6n!_-e2kq*lhTq@S~Cf1TM*JhQN&GxMu*TJ5G&FaSH)HFV^;$fC1DJt z-c70t!GNY+h&T#K7B;QYu?sOpq_q@jL2ybJC5Q+r#`~rpg7(6l_s%=_+;iXXw&Gjy zY*p-QVpjA`e4Ozn+}j}Gj#!%nPC>qs8}fa91HkAepuiE((3H8JQb17lk3bF{=AqD4YX&B%G| zJ`nWX+?Tt8!^Fk+`0elv=rrYqw>ge`S4pF1*}Z;$G#Bz51{C zuCeQ6$f2SW?lwK^G0%I>*EWKeq!yd`sT>8n2 z=hRHc40({`4Gu^L+uzc0(HcEMXODRs&FYk~Ph(bU>CAAQX1~7680LL0;RC4Sue&ZR zyvp*xd8yMC5ERy*IpW7}(lNM%A$b6@I41W%9iPba;_44-MY<%8xleW9A(ZDAjk-Oz zZKq|&;J6?pZIYA!CyK+AXDFTex;p^42A;c~EadbF&jSaj*y{_6IXOZFjOB2|cS0=e zpaM=2`ukQl2&HyjZc6X=CmSG#v+b=y6D!c_g9O$Hd09%YwSNcb!Hq*<7{a!|7F1AF i2B~~R2}1!Vm2>bE*J)oxZ!kdbyf+vISki|>Zs89*tQZdf diff --git a/demo/create.c b/demo/create.c index b7ce591..2718415 100644 --- a/demo/create.c +++ b/demo/create.c @@ -15,13 +15,13 @@ typedef struct __TBL_USER_INFO CREATE lCreateUserInfo() { - DEFINE(TBL_USER_INFO, "TBL_USER_INFO", "", dbUser) - FIELD(dbUser, acct_id, "acct_id", FIELD_LONG) - FIELD(dbUser, user_no, "user_no", FIELD_CHAR) - FIELD(dbUser, user_type, "user_type", FIELD_CHAR) - FIELD(dbUser, user_nm, "user_nm", FIELD_CHAR) - FIELD(dbUser, user_addr, "user_addr", FIELD_CHAR) - FIELD(dbUser, user_phone, "user_phone", FIELD_CHAR) + DEFINE(TBL_USER_INFO, "", dbUser) + FIELD(dbUser, acct_id, FIELD_LONG) + FIELD(dbUser, user_no, FIELD_CHAR) + FIELD(dbUser, user_type, FIELD_CHAR) + FIELD(dbUser, user_nm, FIELD_CHAR) + FIELD(dbUser, user_addr, FIELD_CHAR) + FIELD(dbUser, user_phone, FIELD_CHAR) CREATE_IDX(NORMAL) // 创建查询索引 IDX_FIELD(dbUser, acct_id, FIELD_LONG) diff --git a/include/tmain.h b/include/tmain.h index 5aa6de4..2ff80c4 100644 --- a/include/tmain.h +++ b/include/tmain.h @@ -125,6 +125,7 @@ extern long lTvmInsert(SATvm *pstSavm); extern long lTvmSelect(SATvm *pstSavm, void *pvOut); extern long lTvmQuery(SATvm *pstSavm, size_t *plOut, void **ppvOut); extern long lTvmUpdate(SATvm *pstSavm, void *pvData); +extern long lTvmReplace(SATvm *pstSavm, void *pvData); extern long lTvmDelete(SATvm *pstSavm); extern long lTvmExtreme(SATvm *pstSavm, void *pvOut); extern long lTvmDropTable(SATvm *pstSavm, TABLE t); @@ -138,6 +139,7 @@ extern long lTvmResetLock(SATvm *pstSavm, TABLE t); extern long lAsyInsert(SATvm *pstSavm); extern long lAsyDelete(SATvm *pstSavm); extern long lAsyUpdate(SATvm *pstSavm, void *pvData); +extern long lAsyReplace(SATvm *pstSavm, void *pvData); #ifdef __cplusplus } #endif diff --git a/include/tvm.h b/include/tvm.h index 4779bed..17cb332 100644 --- a/include/tvm.h +++ b/include/tvm.h @@ -70,7 +70,9 @@ typedef long CREATE; #define OPERAYS_INSERT 1025 #define OPERAYS_DELETE 1026 #define OPERAYS_UPDATE 1027 +#define OPERATS_REPLACE 1028 +#define OPERATE_REPLACE 13 #define OPERATE_TRCATE 14 #define OPERATE_COUNT 15 #define OPERATE_GROUP 16 @@ -295,21 +297,21 @@ typedef long CREATE; /************************************************************************************************* 创建表宏函数 *************************************************************************************************/ -#define DEFINE(t, n, p, s) TABLE tbl = t; long type = 0; \ +#define DEFINE(t, p, s) TABLE tbl = t; long type = 0; \ ((TblDef *)pGetTblDef(t))->m_table = t; \ ((TblDef *)pGetTblDef(t))->m_lReSize = sizeof(s); \ strncpy(((TblDef *)pGetTblDef(t))->m_szPart, p, MAX_FIELD_LEN); \ - strncpy(((TblDef *)pGetTblDef(t))->m_szTable, n, MAX_FIELD_LEN); \ + strncpy(((TblDef *)pGetTblDef(t))->m_szTable, #t, MAX_FIELD_LEN); \ ((TblDef *)pGetTblDef(t))->m_lTruck = sizeof(s) + sizeof(SHTruck); #define CREATE_IDX(t) type = t; -#define IDX_FIELD(t, f, a) if(RC_SUCC != lAddIdxField(tbl, type, FPOS(t, f), FLEN(t, f), a)) \ +#define IDX_FIELD(t, f, a) if(RC_SUCC != lAddIdxField(tbl, type, FPOS(t, f), FLEN(t, f), a, #f)) \ return RC_FAIL; -#define FIELD(t, f, d, a) if(RC_SUCC != lSetTableIdx(tbl, FPOS(t, f), FLEN(t, f), d, a, CHK_SELECT)) \ - return RC_FAIL; -#define FIELU(t, f, d, a) if(RC_SUCC != lSetTableIdx(tbl, FPOS(t, f), FLEN(t, f), d, a, IDX_SELECT)) \ - return RC_FAIL; -#define FIELR(t, f, d, a) if(RC_SUCC != lSetTableIdx(tbl, FPOS(t, f), FLEN(t, f), d, a, RCD_SELECT)) \ +#define FIELD(t, f, a) if(RC_SUCC != lSetTableIdx(tbl, FPOS(t, f), FLEN(t, f), #f, a, CHK_SELECT)) \ + return RC_FAIL; +#define FIELU(t, f, a) if(RC_SUCC != lSetTableIdx(tbl, FPOS(t, f), FLEN(t, f), #f, a, IDX_SELECT)) \ + return RC_FAIL; +#define FIELR(t, f, a) if(RC_SUCC != lSetTableIdx(tbl, FPOS(t, f), FLEN(t, f), #f, a, RCD_SELECT)) \ return RC_FAIL; #define FINISH return RC_SUCC; @@ -696,7 +698,7 @@ extern void* pInitHitTest(SATvm *pstSavm, TABLE t); extern long lTableMaxRow(SATvm *pstSavm, TABLE t); extern key_t yGetIPCPath(SATvm *pstSavm, Benum em); extern long lGetBootConfig(SATvm *pstSavm, TBoot *pstBoot); -extern long lAddIdxField(TABLE, long, long, long, long); +extern long lAddIdxField(TABLE, long, long, long, long, const char *); extern long lSetTableIdx(TABLE, long, long, char*, long, long); extern long lUpdIndexPart(SATvm *pstSavm, TABLE t, char *pszPart); extern TblKey* pFindField(TblKey *pstIdx, long lNum, char *pszField); diff --git a/src/stvm.c b/src/stvm.c index 61c7133..8954353 100644 --- a/src/stvm.c +++ b/src/stvm.c @@ -4186,8 +4186,7 @@ void vSetHistory() **************************************************************************************************/ void vCustomization(SATvm *pstSavm, char *s) { - strimall(s); - strimcrlf(s); + sltrim(s); if(!strcasecmp(s, "debug on")) g_stCustom.m_eDebug = 1; @@ -4307,16 +4306,15 @@ void vInitialCustom() if(NULL == g_stCustom.m_pszKey || NULL == g_stCustom.m_pszWord) exit(-1); - snprintf(g_stCustom.m_pszKey, ALLOC_CMD_LEN, "SELECT,INSERT," - "UPDATE,DELETE,DROP,RENAME,TRUNCATE,REPLACE,CLEAR,EXIT,CREATE,BEGIN WORK," - "END WORK,COMMIT WORK,ROLLBACK WORK,SHOW,COMMENT,LOAD,UNLOAD,SET,"); + snprintf(g_stCustom.m_pszKey, ALLOC_CMD_LEN, "SELECT,INSERT,UPDATE,DELETE,DROP,RENAME," + "TRUNCATE,REPLACE,CLEAR,EXIT,CREATE,BEGIN WORK,END WORK,COMMIT WORK,ROLLBACK WORK," + "SHOW,COMMENT,LOAD,UNLOAD,SET,"); g_stCustom.m_lKey = lgetstrnum(g_stCustom.m_pszKey, ","); //select nextval from SEQUENCE@SEQ_TEST - snprintf(g_stCustom.m_pszWord, ALLOC_CMD_LEN, "SET,FROM,WHERE," - "COUNT(1),MAX,MIN,NEXTVAL,ORDER BY,GROUP BY,SEQUENCE@,SYS_TVM_FIELD," - "SYS_TVM_DOMAIN,SYS_TVM_SEQUE,TABLES,INTO,INFO,INDEX,VALUES,DEBUG [ON|OFF]," - "SHOWMODE [ROW|COLUMN],SHOWSIZE [NUM],"); + snprintf(g_stCustom.m_pszWord, ALLOC_CMD_LEN, "SET,FROM,WHERE,COUNT(1),MAX,MIN,NEXTVAL," + "ORDER BY,GROUP BY,SEQUENCE@,SYS_TVM_FIELD,SYS_TVM_DOMAIN,SYS_TVM_SEQUE,TABLE,INTO," + "ON,INFO,INDEX,VALUES,DEBUG [ON|OFF],SHOWMODE [ROW|COLUMN],SHOWSIZE [NUM],"); g_stCustom.m_lWord = lgetstrnum(g_stCustom.m_pszWord, ","); rl_attempted_completion_function = pMatchCompletion; diff --git a/src/tcp.c b/src/tcp.c index 6f6c968..682bb37 100644 --- a/src/tcp.c +++ b/src/tcp.c @@ -1358,6 +1358,7 @@ long lEventOperate(SATvm *pstSavm, SKCon *pstCon, TFace *pstFace, char *pvDat lSendBuffer(pstCon->m_skSock, pvOut, lData); TFree(pvOut); return RC_SUCC; + case OPERATE_REPLACE: case OPERATE_UPDATE: pstSavm->m_bWork = pstCon->m_bWork; pstSavm->m_pstWork = pstCon->m_pstWork; @@ -1378,6 +1379,7 @@ long lEventOperate(SATvm *pstSavm, SKCon *pstCon, TFace *pstFace, char *pvDat lSendBuffer(pstCon->m_skSock, (void *)pstFace, sizeof(TFace)); return RC_SUCC; + case OPERATS_REPLACE: case OPERAYS_UPDATE: pstSavm->m_bWork = pstCon->m_bWork; pstSavm->m_pstWork = pstCon->m_pstWork; @@ -3180,6 +3182,94 @@ long _lUpdateByRt(SATvm *pstSavm, void *pvUpdate) } } +/************************************************************************************************* + description：remote - Replace + parameters: + pstSavm --stvm handle + psvUpdate --update + return: + RC_SUCC --success + RC_FAIL --failure + *************************************************************************************************/ +long _lReplaceByRt(SATvm *pstSavm, void *pvReplace) +{ + TDomain *pvm, *pnoe; + long lRet = RC_FAIL; + Rowgrp *list = NULL, *node = NULL; + + if(NULL == (node = pGetTblNode(pstSavm->tblName))) + { + pstSavm->m_lErrno = DOM_NOT_INITL; + return RC_FAIL; + } + + pstSavm->m_lErrno = RESOU_DISABLE; + switch(lGetBootType()) + { + case TVM_BOOT_CLUSTER: + for(list = node->pstSSet; list; list = list->pstNext) + { + if(!list->pstFset) + continue; + + if(NULL == (pvm = (TDomain *)(list->pstFset->psvData))) + continue; + + pnoe = (TDomain *)list->psvData; + if(0 == (OPERATE_UPDATE & pnoe->m_lPers) || 0 == (OPERATE_INSERT & pnoe->m_lPers) + || RESOURCE_ABLE != pvm->m_lStatus) + continue; + + pstSavm->m_skSock = pvm->m_skSock; + pstSavm->tblName = pnoe->m_mtable; + pthread_mutex_lock(&list->pstFset->lock); + if(RC_SUCC == lTvmReplace(pstSavm, pvReplace)) + { + lRet = RC_SUCC; + pvm->m_lTryTimes = 0; + pvm->m_lLastTime = time(NULL); + } + else if(SOCK_COM_EXCP == pstSavm->m_lErrno) + { + pnoe->m_lRelia --; + Tlog("Update err: %s, T(%d), F(%s:%d), R(%d)", sGetTError(pstSavm->m_lErrno), + pstSavm->tblName, pvm->m_szIp, pvm->m_lPort, pnoe->m_lRelia); + } + + pthread_mutex_unlock(&list->pstFset->lock); + } + return lRet; + default: + for(list = node->pstSSet; list; list = list->pstNext) + { + if(NULL == (pvm = (TDomain *)(list->psvData))) + continue; + + if(0 == (OPERATE_UPDATE & pnoe->m_lPers) || 0 == (OPERATE_INSERT & pnoe->m_lPers)) + continue; + + if(RC_SUCC != lTvmConnect(pstSavm, pvm->m_szIp, pvm->m_lPort, pvm->m_lTimeOut)) + continue; + + pstSavm->tblName = pvm->m_mtable; + lRet = lTvmReplace(pstSavm, pvReplace); + if(RC_SUCC == lRet || SOCK_COM_EXCP != pstSavm->m_lErrno) + { + close(pstSavm->m_skSock); + ((RunTime *)pGetRunTime(pstSavm, 0))->m_lRowSize = 0; + TFree(((RunTime *)pGetRunTime(pstSavm, 0))->pstVoid); + return lRet; + } + + close(pstSavm->m_skSock); + } + + ((RunTime *)pGetRunTime(pstSavm, 0))->m_lRowSize = 0; + TFree(((RunTime *)pGetRunTime(pstSavm, 0))->pstVoid); + return lRet; + } +} + /************************************************************************************************* description：remote - Group parameters: @@ -3597,6 +3687,7 @@ void* pProtocaJava(SATvm *pstSavm, void *pstVoid, TFace *pstFace, void *pvBuf { case OPERATE_INSERT: return pvBuffer; + case OPERATE_REPLACE: case OPERATE_UPDATE: pstCond = &pstSavm->stUpdt; pstCond->uFldcmp = 0; @@ -3731,6 +3822,8 @@ void* pParsePacket(SATvm *pstSavm, void *pstVoid, TFace *pstFace, void *pvBuf return memcpy(pstVoid, pvData, pstFace->m_lDLen); case OPERAYS_UPDATE: case OPERATE_UPDATE: + case OPERATS_REPLACE: + case OPERATE_REPLACE: memcpy(&pstCond->uFldcmp, pvData, sizeof(uint)); for(i = 0, pvData += sizeof(uint); i < pstCond->uFldcmp; i ++) { @@ -4098,6 +4191,63 @@ long lAsyUpdate(SATvm *pstSavm, void *pvData) return RC_SUCC; } +/************************************************************************************************* + description：API - replace by asynch + parameters: + pstSavm --stvm handle + pvData --update data + return: + RC_SUCC --success + RC_FAIL --failure + *************************************************************************************************/ +long lAsyReplace(SATvm *pstSavm, void *pvData) +{ + RunTime *pstRun; + FdCond *pstCond; + TFace *pstFace; + uint lWrite = sizeof(TFace); + + if(!pstSavm || !pvData) + { + pstSavm->m_lErrno = CONDIT_IS_NIL; + return RC_FAIL; + } + + pstRun = (RunTime *)pGetRunTime(pstSavm, 0); + if(!pstRun->pstVoid) + { + pstSavm->m_lErrno = DOM_NOT_INITL; + return RC_FAIL; + } + + pstFace = (TFace *)pstRun->pstVoid; + pstFace->m_lFind = pstSavm->lFind; + pstFace->m_lDLen = pstSavm->lSize; + pstFace->m_lErrno = TVM_DONE_SUCC; + pstFace->m_enum = OPERATS_REPLACE; + pstFace->m_table = pstSavm->tblName; + + checkbuffer(pstSavm, pstRun, 2); + pstCond = &pstSavm->stUpdt; + if(0 == pstCond->uFldcmp) + { + pstSavm->m_lErrno = UPDFD_NOT_SET; + return RC_FAIL; + } + + vBuildPacket(pstRun->pstVoid, pstSavm->pstVoid, &pstSavm->stCond, &lWrite); + vBuildPacket(pstRun->pstVoid, pvData, pstCond, &lWrite); + pstFace->m_lRows = lWrite - sizeof(TFace); + + if(lWrite != lSendBuffer(pstSavm->m_skSock, (void *)pstRun->pstVoid, lWrite)) + { + pstSavm->m_lErrno = SOCK_COM_EXCP; + return RC_FAIL; + } + + return RC_SUCC; +} + /************************************************************************************************* description：API - insert by asynch parameters: @@ -4332,6 +4482,74 @@ long lTvmUpdate(SATvm *pstSavm, void *pvData) return RC_SUCC; } +/************************************************************************************************* + description：API - update + parameters: + pstSavm --stvm handle + pvData --update data + return: + RC_SUCC --success + RC_FAIL --failure + *************************************************************************************************/ +long lTvmReplace(SATvm *pstSavm, void *pvData) +{ + RunTime *pstRun; + FdCond *pstCond; + TFace *pstFace; + uint lWrite = sizeof(TFace); + + if(!pstSavm || !pvData) + { + pstSavm->m_lErrno = CONDIT_IS_NIL; + return RC_FAIL; + } + + pstRun = (RunTime *)pGetRunTime(pstSavm, 0); + if(!pstRun->pstVoid) + { + pstSavm->m_lErrno = DOM_NOT_INITL; + return RC_FAIL; + } + + pstFace = (TFace *)pstRun->pstVoid; + pstFace->m_lFind = pstSavm->lFind; + pstFace->m_lDLen = pstSavm->lSize; + pstFace->m_lErrno = TVM_DONE_SUCC; + pstFace->m_enum = OPERATE_REPLACE; + pstFace->m_table = pstSavm->tblName; + + checkbuffer(pstSavm, pstRun, 2); + pstCond = &pstSavm->stUpdt; + if(0 == pstCond->uFldcmp) + { + pstSavm->m_lErrno = UPDFD_NOT_SET; + return RC_FAIL; + } + + vBuildPacket(pstRun->pstVoid, pstSavm->pstVoid, &pstSavm->stCond, &lWrite); + vBuildPacket(pstRun->pstVoid, pvData, pstCond, &lWrite); + pstFace->m_lRows = lWrite - sizeof(TFace); + + if(lWrite != lSendBuffer(pstSavm->m_skSock, (void *)pstRun->pstVoid, lWrite)) + { + pstSavm->m_lErrno = SOCK_COM_EXCP; + return RC_FAIL; + } + + if(sizeof(TFace) != lRecvBuffer(pstSavm->m_skSock, (char *)pstRun->pstVoid, sizeof(TFace))) + { + pstSavm->m_lErrno = SOCK_COM_EXCP; + return RC_FAIL; + } + + pstSavm->m_lErrno = ((TFace *)pstRun->pstVoid)->m_lErrno; + if(0 != pstSavm->m_lErrno) + return RC_FAIL; + + pstSavm->m_lEffect = ((TFace *)pstRun->pstVoid)->m_lRows; + return RC_SUCC; +} + /************************************************************************************************* description：API - truncate parameters: diff --git a/src/tree.c b/src/tree.c index 2412a67..27e1f26 100644 --- a/src/tree.c +++ b/src/tree.c @@ -34,6 +34,7 @@ extern long _lSelectByRt(SATvm *pstSavm, void *psvOut); extern long _lCountByRt(SATvm *pstSavm, size_t *plCount); extern long _lDeleteByRt(SATvm *pstSavm); extern long _lUpdateByRt(SATvm *pstSavm, void *pvUpdate); +extern long _lReplaceByRt(SATvm *pstSavm, void *pvReplace); extern long _lTruncateByRt(SATvm *pstSavm, TABLE t); extern long _lQueryByRt(SATvm *pstSavm, size_t *plOut, void **ppsvOut); extern long _lExtremeByRt(SATvm *pstSavm, void *psvOut); @@ -207,23 +208,23 @@ void vPrintHex(char *s, long lIdx, bool bf) *************************************************************************************************/ CREATE lCreateTvmIndex() { - DEFINE(SYS_TVM_INDEX, "SYS_TVM_INDEX", "", TIndex) - FIELD(TIndex, m_table, "m_table", FIELD_LONG) - FIELD(TIndex, m_lType, "m_lType", FIELD_LONG) - FIELD(TIndex, m_szTable, "m_szTable", FIELD_CHAR) - FIELD(TIndex, m_szPart, "m_szPart", FIELD_CHAR) - FIELD(TIndex, m_szOwner, "m_szOwner", FIELD_CHAR) - FIELD(TIndex, m_yKey, "m_yKey", FIELD_LONG) - FIELD(TIndex, m_shmID, "m_shmID", FIELD_LONG) - FIELD(TIndex, m_semID, "m_semID", FIELD_LONG) - FIELD(TIndex, m_lPid, "m_lPid", FIELD_LONG) - FIELD(TIndex, m_lValid, "m_lValid", FIELD_LONG) - FIELD(TIndex, m_lMaxRows, "m_lMaxRows", FIELD_LONG) - FIELD(TIndex, m_lRowSize, "m_lRowSize", FIELD_LONG) - FIELD(TIndex, m_lLocal, "m_lLocal", FIELD_LONG) - FIELD(TIndex, m_lState, "m_lState", FIELD_LONG) - FIELD(TIndex, m_lPers, "m_lPers", FIELD_LONG) - FIELR(TIndex, m_szTime, "m_szTime", FIELD_LONG) + DEFINE(SYS_TVM_INDEX, "", TIndex) + FIELD(TIndex, m_table, FIELD_LONG) + FIELD(TIndex, m_lType, FIELD_LONG) + FIELD(TIndex, m_szTable, FIELD_CHAR) + FIELD(TIndex, m_szPart, FIELD_CHAR) + FIELD(TIndex, m_szOwner, FIELD_CHAR) + FIELD(TIndex, m_yKey, FIELD_LONG) + FIELD(TIndex, m_shmID, FIELD_LONG) + FIELD(TIndex, m_semID, FIELD_LONG) + FIELD(TIndex, m_lPid, FIELD_LONG) + FIELD(TIndex, m_lValid, FIELD_LONG) + FIELD(TIndex, m_lMaxRows, FIELD_LONG) + FIELD(TIndex, m_lRowSize, FIELD_LONG) + FIELD(TIndex, m_lLocal, FIELD_LONG) + FIELD(TIndex, m_lState, FIELD_LONG) + FIELD(TIndex, m_lPers, FIELD_LONG) + FIELR(TIndex, m_szTime, FIELD_LONG) CREATE_IDX(NORMAL) IDX_FIELD(TIndex, m_szTable, FIELD_CHAR); @@ -243,16 +244,16 @@ CREATE lCreateTvmIndex() *************************************************************************************************/ CREATE lCreateTvmField() { - DEFINE(SYS_TVM_FIELD, "SYS_TVM_FIELD", "", TField) - FIELD(TField, m_table, "m_table", FIELD_LONG) - FIELD(TField, m_szOwner, "m_szOwner", FIELD_CHAR) - FIELD(TField, m_szTable, "m_szTable", FIELD_CHAR) - FIELD(TField, m_szField, "m_szField", FIELD_CHAR) - FIELD(TField, m_lSeq, "m_lSeq", FIELD_LONG) - FIELD(TField, m_lAttr, "m_lAttr", FIELD_LONG) - FIELD(TField, m_lFrom, "m_lFrom", FIELD_LONG) - FIELD(TField, m_lLen, "m_lLen", FIELD_LONG) - FIELD(TField, m_lIsPk, "m_lIsPk", FIELD_LONG) + DEFINE(SYS_TVM_FIELD, "", TField) + FIELD(TField, m_table, FIELD_LONG) + FIELD(TField, m_szOwner, FIELD_CHAR) + FIELD(TField, m_szTable, FIELD_CHAR) + FIELD(TField, m_szField, FIELD_CHAR) + FIELD(TField, m_lSeq, FIELD_LONG) + FIELD(TField, m_lAttr, FIELD_LONG) + FIELD(TField, m_lFrom, FIELD_LONG) + FIELD(TField, m_lLen, FIELD_LONG) + FIELD(TField, m_lIsPk, FIELD_LONG) CREATE_IDX(NORMAL) IDX_FIELD(TField, m_table, FIELD_LONG); @@ -272,25 +273,25 @@ CREATE lCreateTvmField() *************************************************************************************************/ CREATE lCreateTvmDomain() { - DEFINE(SYS_TVM_DOMAIN, "SYS_TVM_DOMAIN", "", TDomain) - FIELD(TDomain, m_skSock, "m_skSock", FIELD_LONG) - FIELD(TDomain, m_table, "m_table", FIELD_LONG) - FIELD(TDomain, m_mtable, "m_mtable", FIELD_LONG) - FIELD(TDomain, m_lLock, "m_lLock", FIELD_LONG) - FIELD(TDomain, m_lGroup, "m_lGroup", FIELD_LONG) - FIELD(TDomain, m_lKeepLive, "m_lKeepLive", FIELD_LONG) - FIELD(TDomain, m_lLastTime, "m_lLastTime", FIELD_LONG) - FIELD(TDomain, m_lTimeOut, "m_lTimeOut", FIELD_LONG) - FIELD(TDomain, m_lTryMax, "m_lTryMax", FIELD_LONG) - FIELD(TDomain, m_lTryTimes, "m_lTryTimes", FIELD_LONG) - FIELD(TDomain, m_lRowSize, "m_lRowSize", FIELD_LONG) - FIELD(TDomain, m_lStatus, "m_lStatus", FIELD_LONG) - FIELD(TDomain, m_lPers, "m_lPers", FIELD_LONG) - FIELD(TDomain, m_lPort, "m_lPort", FIELD_LONG) - FIELD(TDomain, m_szIp, "m_szIp", FIELD_CHAR) - FIELD(TDomain, m_szTable, "m_szTable", FIELD_CHAR) - FIELD(TDomain, m_szPart, "m_szPart", FIELD_CHAR) - FIELD(TDomain, m_szOwner, "m_szOwner", FIELD_CHAR) + DEFINE(SYS_TVM_DOMAIN, "", TDomain) + FIELD(TDomain, m_skSock, FIELD_LONG) + FIELD(TDomain, m_table, FIELD_LONG) + FIELD(TDomain, m_mtable, FIELD_LONG) + FIELD(TDomain, m_lLock, FIELD_LONG) + FIELD(TDomain, m_lGroup, FIELD_LONG) + FIELD(TDomain, m_lKeepLive, FIELD_LONG) + FIELD(TDomain, m_lLastTime, FIELD_LONG) + FIELD(TDomain, m_lTimeOut, FIELD_LONG) + FIELD(TDomain, m_lTryMax, FIELD_LONG) + FIELD(TDomain, m_lTryTimes, FIELD_LONG) + FIELD(TDomain, m_lRowSize, FIELD_LONG) + FIELD(TDomain, m_lStatus, FIELD_LONG) + FIELD(TDomain, m_lPers, FIELD_LONG) + FIELD(TDomain, m_lPort, FIELD_LONG) + FIELD(TDomain, m_szIp, FIELD_CHAR) + FIELD(TDomain, m_szTable, FIELD_CHAR) + FIELD(TDomain, m_szPart, FIELD_CHAR) + FIELD(TDomain, m_szOwner, FIELD_CHAR) CREATE_IDX(NORMAL) IDX_FIELD(TDomain, m_szTable, FIELD_CHAR) @@ -313,9 +314,9 @@ CREATE lCreateTvmDomain() *************************************************************************************************/ CREATE lCreateTvmSeque() { - DEFINE(SYS_TVM_SEQUE, "SYS_TVM_SEQUE", "", TSeque) - FIELD(TSeque, m_szSQName, "m_szSQName", FIELD_CHAR) - FIELD(TSeque, m_uIncrement, "m_uIncrement", FIELD_LONG) + DEFINE(SYS_TVM_SEQUE, "", TSeque) + FIELD(TSeque, m_szSQName, FIELD_CHAR) + FIELD(TSeque, m_uIncrement, FIELD_LONG) CREATE_IDX(UNQIUE) IDX_FIELD(TSeque, m_szSQName, FIELD_CHAR) @@ -1937,7 +1938,7 @@ void* pCreateBlock(SATvm *pstSavm, TABLE t, size_t lSize, bool bCreate) RC_SUCC --success RC_FAIL --failure *************************************************************************************************/ -long lAddIdxField(TABLE t, long type, long lFrom, long lLen, long lAttr) +long lAddIdxField(TABLE t, long type, long lFrom, long lLen, long lAttr, const char *pszDesc) { long lIdx = 0; TblKey *pstKey = NULL; @@ -1967,6 +1968,9 @@ long lAddIdxField(TABLE t, long type, long lFrom, long lLen, long lAttr) pstKey[lGetIdxNum(t)].m_lFrom = lFrom; pstKey[lGetIdxNum(t)].m_lLen = lLen; pstKey[lGetIdxNum(t)].m_lAttr = lAttr; + strncpy(pstKey[lGetIdxNum(t)].m_szField, pszDesc, sizeof(pstKey[lGetIdxNum(t)].m_szField)); + strcpy(pstKey[lGetIdxNum(t)].m_szAlias, pstKey[lGetIdxNum(t)].m_szField); + ((TblDef *)pGetTblDef(t))->m_lIdxUp ++; ((TblDef *)pGetTblDef(t))->m_lIType |= type; @@ -1996,6 +2000,8 @@ long lAddIdxField(TABLE t, long type, long lFrom, long lLen, long lAttr) pstKey[lGetGrpNum(t)].m_lFrom = lFrom; pstKey[lGetGrpNum(t)].m_lLen = lLen; pstKey[lGetGrpNum(t)].m_lAttr = lAttr; + strncpy(pstKey[lGetGrpNum(t)].m_szField, pszDesc, sizeof(pstKey[lGetGrpNum(t)].m_szField)); + strcpy(pstKey[lGetGrpNum(t)].m_szAlias, pstKey[lGetGrpNum(t)].m_szField); ((TblDef *)pGetTblDef(t))->m_lGrpUp ++; ((TblDef *)pGetTblDef(t))->m_lIType |= type; @@ -10596,8 +10602,7 @@ long lReplace(SATvm *pstSavm, void *pvReplace) if(RES_REMOT_SID == pstRun->m_lLocal) { Tremohold(pstSavm, pstRun); - return RC_FAIL; -// return _lReplaceByRt(pstSavm, psvOut); + return _lReplaceByRt(pstSavm, pvReplace); } if(HAVE_UNIQ_IDX(pstSavm->tblName))