fix(query): fix error.
This commit is contained in:
parent
dc8e2e9e0d
commit
a60c30dbba
|
@ -64,7 +64,7 @@ static FORCE_INLINE int64_t taosGetTimestampToday(int32_t precision) {
|
||||||
: 1000000000;
|
: 1000000000;
|
||||||
time_t t = taosTime(NULL);
|
time_t t = taosTime(NULL);
|
||||||
struct tm tm;
|
struct tm tm;
|
||||||
taosLocalTime(&t, &tm, NULL);
|
(void) taosLocalTime(&t, &tm, NULL);
|
||||||
tm.tm_hour = 0;
|
tm.tm_hour = 0;
|
||||||
tm.tm_min = 0;
|
tm.tm_min = 0;
|
||||||
tm.tm_sec = 0;
|
tm.tm_sec = 0;
|
||||||
|
|
|
@ -17,15 +17,12 @@
|
||||||
#define TDENGINE_TSIMPLEHASH_H
|
#define TDENGINE_TSIMPLEHASH_H
|
||||||
|
|
||||||
#include "tarray.h"
|
#include "tarray.h"
|
||||||
|
#include "thash.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef uint32_t (*_hash_fn_t)(const char *, uint32_t);
|
|
||||||
typedef int32_t (*_equal_fn_t)(const void *, const void *, size_t len);
|
|
||||||
typedef void (*_hash_free_fn_t)(void *);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief single thread hash
|
* @brief single thread hash
|
||||||
*
|
*
|
||||||
|
|
|
@ -677,7 +677,7 @@ static int32_t adjustMergeTreeForNextTuple(SSortSource* pSource, SMultiwayMergeT
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t* pPgId = taosArrayGet(pSource->pageIdList, pSource->pageIndex);
|
int32_t* pPgId = taosArrayGet(pSource->pageIdList, pSource->pageIndex);
|
||||||
if (pPgId) {
|
if (pPgId == NULL) {
|
||||||
return terrno;
|
return terrno;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue