Merge pull request #6630 from taosdata/feature/td-4756

[TD-4756]<fix>: nanosecond precison on gcBuildQueryJson
This commit is contained in:
Haojun Liao 2021-06-26 22:30:53 +08:00 committed by GitHub
commit 43e84f8bf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions

View File

@ -228,13 +228,11 @@ bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
case TSDB_DATA_TYPE_NCHAR: case TSDB_DATA_TYPE_NCHAR:
httpJsonStringForTransMean(jsonBuf, (char *)row[i], fields[i].bytes); httpJsonStringForTransMean(jsonBuf, (char *)row[i], fields[i].bytes);
break; break;
case TSDB_DATA_TYPE_TIMESTAMP: case TSDB_DATA_TYPE_TIMESTAMP: {
if (precision == TSDB_TIME_PRECISION_MILLI) { // ms int64_t ts = convertTimePrecision(*((int64_t *)row[i]), precision, TSDB_TIME_PRECISION_MILLI);
httpJsonInt64(jsonBuf, *((int64_t *)row[i])); httpJsonInt64(jsonBuf, ts);
} else {
httpJsonInt64(jsonBuf, *((int64_t *)row[i]) / 1000);
}
break; break;
}
default: default:
httpJsonString(jsonBuf, "-", 1); httpJsonString(jsonBuf, "-", 1);
break; break;