diff --git a/src/client/src/tscSQLParserImpl.c b/src/client/src/tscSQLParserImpl.c index 17e1c6f45790acc36c35111aec75e00be227044f..52a68a9a16670a6cacd7ac01b36503a629b849f3 100644 --- a/src/client/src/tscSQLParserImpl.c +++ b/src/client/src/tscSQLParserImpl.c @@ -446,6 +446,8 @@ int32_t getTimestampInUsFromStrImpl(int64_t val, char unit, int64_t *result) { break; case 'a': break; + case 'u': + return 0; default: { ; return -1; diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c index 94fb35d52231746da27d21a755cad823c806321f..59e2f4f85c4c8cffff1dcc85ff2469d9d523eb20 100644 --- a/src/client/src/tscStream.c +++ b/src/client/src/tscStream.c @@ -374,8 +374,7 @@ static void tscSetNextLaunchTimer(SSqlStream *pStream, SSqlObj *pSql) { } static void tscSetSlidingWindowInfo(SSqlObj *pSql, SSqlStream *pStream) { - int64_t minIntervalTime = - (pStream->precision == TSDB_TIME_PRECISION_MICRO) ? tsMinIntervalTime * 1000L : tsMinIntervalTime; + int64_t minIntervalTime = tsMinIntervalTime; SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0); @@ -391,8 +390,7 @@ static void tscSetSlidingWindowInfo(SSqlObj *pSql, SSqlStream *pStream) { pQueryInfo->slidingTime = pQueryInfo->intervalTime; } - int64_t minSlidingTime = - (pStream->precision == TSDB_TIME_PRECISION_MICRO) ? tsMinSlidingTime * 1000L : tsMinSlidingTime; + int64_t minSlidingTime = tsMinSlidingTime; if (pQueryInfo->slidingTime == -1) { pQueryInfo->slidingTime = pQueryInfo->intervalTime; diff --git a/src/modules/http/src/restHandle.c b/src/modules/http/src/restHandle.c index a3077008661590e9813b6f3ec91b6c15d9e42902..57e34affedca06641adea94708f1017b03f1671a 100644 --- a/src/modules/http/src/restHandle.c +++ b/src/modules/http/src/restHandle.c @@ -68,9 +68,7 @@ bool restProcessSqlRequest(HttpContext* pContext, int timestampFmt) { } - /* - * for async test - * / + // for async test /* if (httpCheckUsedbSql(sql)) { httpSendErrorResp(pContext, HTTP_NO_EXEC_USEDB); diff --git a/src/sdb/src/sdbEngine.c b/src/sdb/src/sdbEngine.c index 09576ab687eaedc2aa248655e9708260543ff2ea..2bdc64cdecd14f7951f2385a751999a71cd94770 100644 --- a/src/sdb/src/sdbEngine.c +++ b/src/sdb/src/sdbEngine.c @@ -310,7 +310,7 @@ void *sdbOpenTable(int maxRows, int32_t maxRowSize, char *name, char keyType, ch pTable->appTool = appTool; sprintf(pTable->fn, "%s/%s.db", directory, pTable->name); - if (sdbInitIndexFp[keyType] != NULL) pTable->iHandle = (*sdbInitIndexFp[keyType])(maxRows, sizeof(SRowMeta)); + if (sdbInitIndexFp[(int)keyType] != NULL) pTable->iHandle = (*sdbInitIndexFp[(int)keyType])(maxRows, sizeof(SRowMeta)); pthread_mutex_init(&pTable->mutex, NULL); diff --git a/src/system/detail/src/vnodeQueryImpl.c b/src/system/detail/src/vnodeQueryImpl.c index e02af78e2470a5233aa19921af6ff76f3849687a..e69b5a5b8cf0cc49ada67f44ec5d4eb17b7eff57 100644 --- a/src/system/detail/src/vnodeQueryImpl.c +++ b/src/system/detail/src/vnodeQueryImpl.c @@ -2665,7 +2665,7 @@ static int32_t rowwiseApplyAllFunctions(SQueryRuntimeEnv *pRuntimeEnv, int32_t * int32_t j = 0; TSKEY lastKey = -1; int32_t lastIndex = -1; - bool firstAccessedPoint = true; + //bool firstAccessedPoint = true; for (j = 0; j < (*forwardStep); ++j) { int32_t offset = GET_COL_DATA_POS(pQuery, j, step); diff --git a/src/util/src/tglobalcfg.c b/src/util/src/tglobalcfg.c index 45efcad56394b1507c60d383a60199d0b96afb02..400bce32e755c0ab683ee0d54c1151219515c7b3 100644 --- a/src/util/src/tglobalcfg.c +++ b/src/util/src/tglobalcfg.c @@ -155,11 +155,11 @@ char tsSocketType[4] = "udp"; // time precision, millisecond by default int tsTimePrecision = TSDB_TIME_PRECISION_MILLI; -// 10 ms for sliding time, the value will changed in case of time precision changed -int tsMinSlidingTime = 10; +// 1 us for sliding time, the value will changed in case of time precision changed +int tsMinSlidingTime = 1; -// 10 ms for interval time range, changed accordingly -int tsMinIntervalTime = 10; +// 1 us for interval time range, changed accordingly +int tsMinIntervalTime = 1; // 20sec, the maximum value of stream computing delay, changed accordingly int tsMaxStreamComputDelay = 20000; @@ -631,10 +631,10 @@ static void doInitGlobalConfig() { tsInitConfigOption(cfg++, "minSlidingTime", &tsMinSlidingTime, TSDB_CFG_VTYPE_INT, TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW, - 10, 1000000, 0, TSDB_CFG_UTYPE_MS); + 1, 1000000000, 0, TSDB_CFG_UTYPE_MS); tsInitConfigOption(cfg++, "minIntervalTime", &tsMinIntervalTime, TSDB_CFG_VTYPE_INT, TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW, - 10, 1000000, 0, TSDB_CFG_UTYPE_MS); + 1, 1000000000, 0, TSDB_CFG_UTYPE_MS); tsInitConfigOption(cfg++, "maxStreamCompDelay", &tsMaxStreamComputDelay, TSDB_CFG_VTYPE_INT, TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW, 10, 1000000000, 0, TSDB_CFG_UTYPE_MS); diff --git a/src/util/src/tinterpolation.c b/src/util/src/tinterpolation.c index 5c0b867208db595ad533406ce320c7940495c669..d86f3e44c5a8182ae2c635a6432f29d7f5137048 100644 --- a/src/util/src/tinterpolation.c +++ b/src/util/src/tinterpolation.c @@ -27,7 +27,7 @@ int64_t taosGetIntervalStartTimestamp(int64_t startTime, int64_t timeRange, char return startTime; } - if (slidingTimeUnit == 'a' || slidingTimeUnit == 'm' || slidingTimeUnit == 's' || slidingTimeUnit == 'h') { + if (slidingTimeUnit == 'a' || slidingTimeUnit == 'm' || slidingTimeUnit == 's' || slidingTimeUnit == 'h' || slidingTimeUnit == 'u') { return (startTime / timeRange) * timeRange; } else { /* diff --git a/src/util/src/ttime.c b/src/util/src/ttime.c index 5d5b580a89fdc58025bf8a244e76cc00ab843b15..2656c6deb0461b1bcc794d6cd8698842c8c07386 100644 --- a/src/util/src/ttime.c +++ b/src/util/src/ttime.c @@ -378,6 +378,8 @@ static int32_t getTimestampInUsFromStrImpl(int64_t val, char unit, int64_t* resu break; case 'a': break; + case 'u': + return 0; default: { ; return -1; diff --git a/src/util/src/ttokenizer.c b/src/util/src/ttokenizer.c index 7cbb4552b410536176f5e69d9ee9336af197d94f..7cef1f709471de07c0725f80433e4bba2bd2cdde 100644 --- a/src/util/src/ttokenizer.c +++ b/src/util/src/ttokenizer.c @@ -510,7 +510,7 @@ uint32_t tSQLGetToken(char* z, uint32_t* tokenType) { /* here is the 1a/2s/3m/9y */ if ((z[i] == 'a' || z[i] == 's' || z[i] == 'm' || z[i] == 'h' || z[i] == 'd' || z[i] == 'n' || z[i] == 'y' || z[i] == 'w' || z[i] == 'A' || z[i] == 'S' || z[i] == 'M' || z[i] == 'H' || z[i] == 'D' || z[i] == 'N' || - z[i] == 'Y' || z[i] == 'W') && + z[i] == 'Y' || z[i] == 'W' || z[i] == 'u' || z[i] == 'U') && (isIdChar[(uint8_t)z[i + 1]] == 0)) { *tokenType = TK_VARIABLE; i += 1;