Merge pull request #1135 from taosdata/hotfix/slguan

#1130 TBASE-1484

src/modules/http/src/httpJson.c

@@ -310,7 +310,9 @@ void httpJsonInt(JsonBuf* buf, int num) {
 void httpJsonFloat(JsonBuf* buf, float num) {
   httpJsonItemToken(buf);
   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);
   } else {
     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) {
   httpJsonItemToken(buf);
   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);
   } else {
     buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.9f", num);

src/modules/http/src/restHandle.c

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