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

Merge pull request #1135 from taosdata/hotfix/slguan 

#1130 TBASE-1484
This commit is contained in:
plum-lihui 2020-01-16 09:40:47 +08:00 committed by GitHub
parent 0d2351b4a7 4d8341c5cd
commit 13ed8e1000
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/http/src/httpJson.c
View File

@ -310,7 +310,9 @@ void httpJsonInt(JsonBuf* buf, int num) {
void httpJsonFloat(JsonBuf* buf, float num) { void httpJsonFloat(JsonBuf* buf, float num) {
httpJsonItemToken(buf); httpJsonItemToken(buf);
httpJsonTestBuf(buf, MAX_NUM_STR_SZ); httpJsonTestBuf(buf, MAX_NUM_STR_SZ);
if (num > 1E10 || num < -1E10) { if (isinf(num) || isnan(num)) {
buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "null");
} else if (num > 1E10 || num < -1E10) {
buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.5e", num); buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.5e", num);
} else { } else {
buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.5f", num); buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.5f", num);
@ -320,7 +322,9 @@ void httpJsonFloat(JsonBuf* buf, float num) {
void httpJsonDouble(JsonBuf* buf, double num) { void httpJsonDouble(JsonBuf* buf, double num) {
httpJsonItemToken(buf); httpJsonItemToken(buf);
httpJsonTestBuf(buf, MAX_NUM_STR_SZ); httpJsonTestBuf(buf, MAX_NUM_STR_SZ);
if (num > 1E10 || num < -1E10) { if (isinf(num) || isnan(num)) {
buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "null");
} else if (num > 1E10 || num < -1E10) {
buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.9e", num); buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.9e", num);
} else { } else {
buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.9f", num); buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.9f", num);

6
src/modules/http/src/restHandle.c
View File

@ -67,10 +67,16 @@ bool restProcessSqlRequest(HttpContext* pContext, int timestampFmt) {
return false; return false;
} }
/*
* for async test
* /
/*
if (httpCheckUsedbSql(sql)) { if (httpCheckUsedbSql(sql)) {
httpSendErrorResp(pContext, HTTP_NO_EXEC_USEDB); httpSendErrorResp(pContext, HTTP_NO_EXEC_USEDB);
return false; return false;
} }
*/
HttpSqlCmd* cmd = &(pContext->singleCmd); HttpSqlCmd* cmd = &(pContext->singleCmd);
cmd->nativSql = sql; cmd->nativSql = sql;