Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_46246346
TDengine
提交
5dee3bfc
TDengine
项目概览
weixin_46246346
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
3
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5dee3bfc
编写于
12月 11, 2020
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-2424]<fix>: fix the float column precision caused filter failure.
上级
8bab6220
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
9 deletion
+19
-9
src/query/src/qFilterfunc.c
src/query/src/qFilterfunc.c
+19
-9
未找到文件。
src/query/src/qFilterfunc.c
浏览文件 @
5dee3bfc
...
...
@@ -21,6 +21,8 @@
#include "tcompare.h"
#include "tsqlfunction.h"
#define FLT_EQUAL(_x, _y) (fabs((_x) - (_y)) <= (4 * FLT_EPSILON))
bool
less_i8
(
SColumnFilterElem
*
pFilter
,
char
*
minval
,
char
*
maxval
)
{
return
(
*
(
int8_t
*
)
minval
<
pFilter
->
filterInfo
.
upperBndi
);
}
...
...
@@ -38,11 +40,15 @@ bool less_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
}
bool
less_ds
(
SColumnFilterElem
*
pFilter
,
char
*
minval
,
char
*
maxval
)
{
return
(
*
(
float
*
)
minval
-
pFilter
->
filterInfo
.
upperBndd
<
(
2
*
FLT_EPSILON
));
if
(
FLT_EQUAL
(
*
(
float
*
)
minval
,
pFilter
->
filterInfo
.
upperBndd
))
{
return
false
;
}
return
*
(
float
*
)
minval
<
pFilter
->
filterInfo
.
upperBndd
;
}
bool
less_dd
(
SColumnFilterElem
*
pFilter
,
char
*
minval
,
char
*
maxval
)
{
return
(
*
(
double
*
)
minval
-
pFilter
->
filterInfo
.
upperBndd
<
(
2
*
DBL_EPSILON
));
return
(
*
(
double
*
)
minval
-
pFilter
->
filterInfo
.
upperBndd
>
(
2
*
DBL_EPSILON
));
}
//////////////////////////////////////////////////////////////////
...
...
@@ -63,7 +69,11 @@ bool larger_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
}
bool
larger_ds
(
SColumnFilterElem
*
pFilter
,
char
*
minval
,
char
*
maxval
)
{
return
((
*
(
float
*
)
maxval
-
pFilter
->
filterInfo
.
lowerBndd
)
>
(
2
*
FLT_EPSILON
));
if
(
FLT_EQUAL
(
*
(
float
*
)
maxval
,
pFilter
->
filterInfo
.
lowerBndd
))
{
return
false
;
}
return
(
*
(
float
*
)
maxval
>
pFilter
->
filterInfo
.
lowerBndd
);
}
bool
larger_dd
(
SColumnFilterElem
*
pFilter
,
char
*
minval
,
char
*
maxval
)
{
...
...
@@ -88,11 +98,11 @@ bool lessEqual_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
}
bool
lessEqual_ds
(
SColumnFilterElem
*
pFilter
,
char
*
minval
,
char
*
maxval
)
{
if
(
fabs
(
*
(
float
*
)
minval
-
pFilter
->
filterInfo
.
upperBndd
)
<=
2
*
FLT_EPSILON
)
{
if
(
FLT_EQUAL
(
*
(
float
*
)
minval
,
pFilter
->
filterInfo
.
upperBndd
)
)
{
return
true
;
}
return
(
*
(
float
*
)
minval
<
=
pFilter
->
filterInfo
.
upperBndd
);
return
(
*
(
float
*
)
minval
<
pFilter
->
filterInfo
.
upperBndd
);
}
bool
lessEqual_dd
(
SColumnFilterElem
*
pFilter
,
char
*
minval
,
char
*
maxval
)
{
...
...
@@ -121,11 +131,11 @@ bool largeEqual_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
}
bool
largeEqual_ds
(
SColumnFilterElem
*
pFilter
,
char
*
minval
,
char
*
maxval
)
{
if
(
fabs
(
*
(
float
*
)
minval
-
pFilter
->
filterInfo
.
upperBndd
)
<=
(
2
*
FLT_EPSILON
))
{
if
(
FLT_EQUAL
(
*
(
float
*
)
maxval
,
pFilter
->
filterInfo
.
lowerBndd
))
{
return
true
;
}
return
(
*
(
float
*
)
maxval
-
pFilter
->
filterInfo
.
lowerBndd
>
(
2
*
FLT_EPSILON
)
);
return
(
*
(
float
*
)
maxval
>
pFilter
->
filterInfo
.
lowerBndd
);
}
bool
largeEqual_dd
(
SColumnFilterElem
*
pFilter
,
char
*
minval
,
char
*
maxval
)
{
...
...
@@ -182,7 +192,7 @@ bool equal_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
// increase the tolerance to obtain the correct result.
bool
equal_ds
(
SColumnFilterElem
*
pFilter
,
char
*
minval
,
char
*
maxval
)
{
if
(
*
(
float
*
)
minval
==
*
(
float
*
)
maxval
)
{
return
(
fabs
(
*
(
float
*
)
minval
-
pFilter
->
filterInfo
.
lowerBndd
)
<=
FLT_EPSILON
*
2
);
return
FLT_EQUAL
(
*
(
float
*
)
minval
,
pFilter
->
filterInfo
.
lowerBndd
);
}
else
{
// range filter
assert
(
*
(
float
*
)
minval
<
*
(
float
*
)
maxval
);
return
*
(
float
*
)
minval
<=
pFilter
->
filterInfo
.
lowerBndd
&&
*
(
float
*
)
maxval
>=
pFilter
->
filterInfo
.
lowerBndd
;
...
...
@@ -272,7 +282,7 @@ bool nequal_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
bool
nequal_ds
(
SColumnFilterElem
*
pFilter
,
char
*
minval
,
char
*
maxval
)
{
if
(
*
(
float
*
)
minval
==
*
(
float
*
)
maxval
)
{
return
((
fabs
(
*
(
float
*
)
minval
-
pFilter
->
filterInfo
.
lowerBndd
))
>
(
2
*
FLT_EPSILON
)
);
return
!
FLT_EQUAL
(
*
(
float
*
)
minval
,
pFilter
->
filterInfo
.
lowerBndd
);
}
return
true
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录