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

fix(query): restore some remove attributes.

This commit is contained in:
Haojun Liao 2022-05-31 17:46:35 +08:00
parent d358212a14
commit cca327190d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/libs/function/src/builtinsimpl.c
View File

@ -226,6 +226,7 @@ typedef struct SUniqueInfo {
int32_t numOfPoints; int32_t numOfPoints;
uint8_t colType; uint8_t colType;
int16_t colBytes; int16_t colBytes;
bool hasNull; //null is not hashable, handle separately
SHashObj *pHash; SHashObj *pHash;
char pItems[]; char pItems[];
} SUniqueInfo; } SUniqueInfo;
@ -3878,10 +3879,11 @@ static void doUniqueAdd(SUniqueInfo* pInfo, char *data, TSKEY ts, bool isNull) {
if (isNull == true) { if (isNull == true) {
int32_t size = sizeof(SUniqueItem) + pInfo->colBytes; int32_t size = sizeof(SUniqueItem) + pInfo->colBytes;
SUniqueItem *pItem = (SUniqueItem *)(pInfo->pItems + pInfo->numOfPoints * size); SUniqueItem *pItem = (SUniqueItem *)(pInfo->pItems + pInfo->numOfPoints * size);
if (pItem->isNull == false) { if (pInfo->hasNull == false && pItem->isNull == false) {
pItem->timestamp = ts; pItem->timestamp = ts;
pItem->isNull = true; pItem->isNull = true;
pInfo->numOfPoints++; pInfo->numOfPoints++;
pInfo->hasNull = true;
} else if (pItem->timestamp > ts && pItem->isNull == true) { } else if (pItem->timestamp > ts && pItem->isNull == true) {
pItem->timestamp = ts; pItem->timestamp = ts;
} }