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

fix: timestamp add return float when get time range

This commit is contained in:
shenglian zhou 2023-09-27 15:39:43 +08:00 committed by slzhou
parent af009a2390
commit d5df76fc8c
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/libs/scalar/src/filter.c
View File

@ -3983,18 +3983,14 @@ _return:
return code; return code;
} }
static int32_t fltSclGetDatumValueFromPoint(SFltSclPoint *point, SFltSclDatum *d) { static int32_t fltSclGetTimeStampDatum(SFltSclPoint *point, SFltSclDatum *d) {
*d = point->val; *d = point->val;
if (point->val.kind == FLT_SCL_DATUM_KIND_NULL) {
return TSDB_CODE_SUCCESS;
}
if (point->val.kind == FLT_SCL_DATUM_KIND_MAX) {
getDataMax(d->type.type, &(d->i));
} else if (point->val.kind == FLT_SCL_DATUM_KIND_MIN) {
getDataMin(d->type.type, &(d->i));
}
if (IS_INTEGER_TYPE(d->type.type) || IS_TIMESTAMP_TYPE(d->type.type)) { if (point->val.kind == FLT_SCL_DATUM_KIND_MAX) {
getDataMax(point->val.type.type, &(d->i));
} else if (point->val.kind == FLT_SCL_DATUM_KIND_MIN) {
getDataMin(point->val.type.type, &(d->i));
} else if (point->val.kind == FLT_SCL_DATUM_KIND_INT64) {
if (point->excl) { if (point->excl) {
if (point->start) { if (point->start) {
++d->i; ++d->i;
@ -4002,6 +3998,16 @@ static int32_t fltSclGetDatumValueFromPoint(SFltSclPoint *point, SFltSclDatum *d
--d->i; --d->i;
} }
} }
} else if (point->val.kind == FLT_SCL_DATUM_KIND_FLOAT64) {
d->kind = FLT_SCL_DATUM_KIND_INT64;
double v = d->d;
if (point->excl) {
if (point->start) {
d->i = v + 1;
} else {
d->i = v - 1;
}
}
} else { } else {
qError("not supported type %d when get datum from point", d->type.type); qError("not supported type %d when get datum from point", d->type.type);
} }
@ -4022,12 +4028,13 @@ int32_t filterGetTimeRange(SNode *pNode, STimeWindow *win, bool *isStrict) {
SFltSclColumnRange *colRange = taosArrayGet(colRanges, 0); SFltSclColumnRange *colRange = taosArrayGet(colRanges, 0);
SArray *points = colRange->points; SArray *points = colRange->points;
if (taosArrayGetSize(points) == 2) { if (taosArrayGetSize(points) == 2) {
*win = TSWINDOW_DESC_INITIALIZER;
SFltSclPoint *startPt = taosArrayGet(points, 0); SFltSclPoint *startPt = taosArrayGet(points, 0);
SFltSclPoint *endPt = taosArrayGet(points, 1); SFltSclPoint *endPt = taosArrayGet(points, 1);
SFltSclDatum start; SFltSclDatum start;
SFltSclDatum end; SFltSclDatum end;
fltSclGetDatumValueFromPoint(startPt, &start); fltSclGetTimeStampDatum(startPt, &start);
fltSclGetDatumValueFromPoint(endPt, &end); fltSclGetTimeStampDatum(endPt, &end);
win->skey = start.i; win->skey = start.i;
win->ekey = end.i; win->ekey = end.i;
*isStrict = true; *isStrict = true;