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

[tbase-1473]

This commit is contained in:
hjxilinx 2020-01-10 15:08:32 +08:00
parent 3332ba5729
commit e7f98c201c
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -812,26 +812,47 @@ int taos_errno(TAOS *taos) {
return code; return code;
} }
static bool validErrorCode(int32_t code) {
return code >= TSDB_CODE_SUCCESS && code < TSDB_CODE_MAX_ERROR_CODE;
}
/*
* In case of invalid sql error, additional information is attached to explain
* why the sql is invalid
*/
static bool hasAdditionalErrorInfo(int32_t code, SSqlCmd* pCmd) {
if (code != TSDB_CODE_INVALID_SQL) {
return false;
}
size_t len = strlen(pCmd->payload);
char* z = NULL;
if (len > 0) {
z = strstr (pCmd->payload, "invalid sql");
}
return z != NULL;
}
char *taos_errstr(TAOS *taos) { char *taos_errstr(TAOS *taos) {
STscObj *pObj = (STscObj *)taos; STscObj *pObj = (STscObj *)taos;
uint8_t code; uint8_t code;
if (pObj == NULL || pObj->signature != pObj) return tsError[globalCode]; if (pObj == NULL || pObj->signature != pObj) return tsError[globalCode];
if ((int8_t)(pObj->pSql->res.code) == -1) SSqlObj* pSql = pObj->pSql;
code = TSDB_CODE_OTHERS;
else if (validErrorCode(pSql->res.code)) {
code = pObj->pSql->res.code; code = pSql->res.code;
// for invalid sql, additional information is attached to explain why the sql is invalid
if (code == TSDB_CODE_INVALID_SQL) {
return pObj->pSql->cmd.payload;
} else { } else {
if (code < 0 || code > TSDB_CODE_MAX_ERROR_CODE) { code = TSDB_CODE_OTHERS; //unknown error
return tsError[TSDB_CODE_SUCCESS]; }
} else {
return tsError[code]; if (hasAdditionalErrorInfo(code, &pSql->cmd)) {
} return pSql->cmd.payload;
} else {
return tsError[code];
} }
} }