xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-32] refactor codes

This commit is contained in:
hjxilinx 2020-03-21 00:59:25 +08:00
parent 46e58d52b1
commit a64646e241
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/inc/tsclient.h
View File

@ -317,7 +317,7 @@ typedef struct {
struct SLocalReducer *pLocalReducer; struct SLocalReducer *pLocalReducer;
} SSqlRes; } SSqlRes;
typedef struct _tsc_obj { typedef struct STscObj {
void * signature; void * signature;
void * pTimer; void * pTimer;
char mgmtIp[TSDB_USER_LEN]; char mgmtIp[TSDB_USER_LEN];
@ -332,7 +332,7 @@ typedef struct _tsc_obj {
struct SSqlObj *pSql; struct SSqlObj *pSql;
struct SSqlObj *pHb; struct SSqlObj *pHb;
struct SSqlObj *sqlList; struct SSqlObj *sqlList;
struct _sstream *streamList; struct SSqlStream *streamList;
pthread_mutex_t mutex; pthread_mutex_t mutex;
} STscObj; } STscObj;
@ -365,7 +365,7 @@ typedef struct SSqlObj {
struct SSqlObj * prev, *next; struct SSqlObj * prev, *next;
} SSqlObj; } SSqlObj;
typedef struct _sstream { typedef struct SSqlStream {
SSqlObj *pSql; SSqlObj *pSql;
uint32_t streamId; uint32_t streamId;
char listed; char listed;
@ -390,7 +390,7 @@ typedef struct _sstream {
void *param; void *param;
void (*callback)(void *); // Callback function when stream is stopped from client level void (*callback)(void *); // Callback function when stream is stopped from client level
struct _sstream *prev, *next; struct SSqlStream *prev, *next;
} SSqlStream; } SSqlStream;
int32_t tscInitRpc(const char *user, const char *secret); int32_t tscInitRpc(const char *user, const char *secret);

2
src/client/src/tscAsync.c
View File

@ -84,7 +84,7 @@ void doAsyncQuery(STscObj* pObj, SSqlObj* pSql, void (*fp)(), void* param, const
} }
// TODO return the correct error code to client in tscQueueAsyncError // TODO return the correct error code to client in tscQueueAsyncError
void taos_query_a(TAOS *taos, const char *sqlstr, void (*fp)(void *, TAOS_RES *, int), void *param) { void taos_query_a(TAOS *taos, const char *sqlstr, __async_cb_func_t fp, void *param) {
STscObj *pObj = (STscObj *)taos; STscObj *pObj = (STscObj *)taos;
if (pObj == NULL || pObj->signature != pObj) { if (pObj == NULL || pObj->signature != pObj) {
tscError("bug!!! pObj:%p", pObj); tscError("bug!!! pObj:%p", pObj);

6
src/client/src/tscServer.c
View File

@ -2497,12 +2497,6 @@ int tscRenewMeterMeta(SSqlObj *pSql, char *tableId) {
pTableMetaInfo->pTableMeta); pTableMetaInfo->pTableMeta);
} }
if (code != TSDB_CODE_ACTION_IN_PROGRESS) {
if (pSql->fp == (void *)0x1) {
pSql->fp = NULL;
}
}
return code; return code;
} }

6
src/client/src/tscSql.c
View File

@ -52,7 +52,7 @@ static bool validPassword(const char* passwd) {
return validImpl(passwd, TSDB_PASSWORD_LEN); return validImpl(passwd, TSDB_PASSWORD_LEN);
} }
STscObj *taos_connect_imp(const char *ip, const char *user, const char *pass, const char *db, uint16_t port, STscObj *taosConnectImpl(const char *ip, const char *user, const char *pass, const char *db, uint16_t port,
void (*fp)(void *, TAOS_RES *, int), void *param, void **taos) { void (*fp)(void *, TAOS_RES *, int), void *param, void **taos) {
taos_init(); taos_init();
@ -163,7 +163,7 @@ TAOS *taos_connect(const char *ip, const char *user, const char *pass, const cha
tscTrace("try to create a connection to %s", ip); tscTrace("try to create a connection to %s", ip);
STscObj *pObj = taos_connect_imp(ip, user, pass, db, port, NULL, NULL, NULL); STscObj *pObj = taosConnectImpl(ip, user, pass, db, port, NULL, NULL, NULL);
if (pObj != NULL) { if (pObj != NULL) {
SSqlObj* pSql = pObj->pSql; SSqlObj* pSql = pObj->pSql;
assert(pSql != NULL); assert(pSql != NULL);
@ -198,7 +198,7 @@ TAOS *taos_connect(const char *ip, const char *user, const char *pass, const cha
TAOS *taos_connect_a(char *ip, char *user, char *pass, char *db, uint16_t port, void (*fp)(void *, TAOS_RES *, int), TAOS *taos_connect_a(char *ip, char *user, char *pass, char *db, uint16_t port, void (*fp)(void *, TAOS_RES *, int),
void *param, void **taos) { void *param, void **taos) {
STscObj* pObj = taos_connect_imp(ip, user, pass, db, port, fp, param, taos); STscObj* pObj = taosConnectImpl(ip, user, pass, db, port, fp, param, taos);
if (pObj == NULL) { if (pObj == NULL) {
return NULL; return NULL;
} }