From 2a1c3c1f3c9407d5e6789319ed73b94b67e85ab3 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 11 Dec 2020 17:15:17 +0800
Subject: [PATCH] [TD-2424]<fix>: fix the float column precision caused filter
 failure.

---
 src/query/src/qFilterfunc.c                 | 40 ++++++----------
 tests/script/general/parser/tags_filter.sim | 53 +++++++++++++++++++++
 2 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/src/query/src/qFilterfunc.c b/src/query/src/qFilterfunc.c
index a7924ab159..2a40533e90 100644
--- a/src/query/src/qFilterfunc.c
+++ b/src/query/src/qFilterfunc.c
@@ -21,7 +21,11 @@
 #include "tcompare.h"
 #include "tsqlfunction.h"
 
-#define FLT_EQUAL(_x, _y) (fabs((_x) - (_y)) <= (4 * FLT_EPSILON))
+#define FLT_EQUAL(_x, _y)        (fabs((_x) - (_y)) <= (4 * FLT_EPSILON))
+#define FLT_GREATER(_x, _y)      (!FLT_EQUAL((_x), (_y)) && ((_x) > (_y)))
+#define FLT_LESS(_x, _y)         (!FLT_EQUAL((_x), (_y)) && ((_x) < (_y)))
+#define FLT_GREATEREQUAL(_x, _y) (FLT_EQUAL((_x), (_y)) || ((_x) > (_y)))
+#define FLT_LESSEQUAL(_x, _y)    (FLT_EQUAL((_x), (_y)) || ((_x) < (_y)))
 
 bool less_i8(SColumnFilterElem *pFilter, char *minval, char *maxval) {
   return (*(int8_t *)minval < pFilter->filterInfo.upperBndi);
@@ -40,15 +44,11 @@ bool less_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
 }
 
 bool less_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (FLT_EQUAL(*(float*)minval, pFilter->filterInfo.upperBndd)) {
-    return false;
-  }
-
-  return *(float *)minval < pFilter->filterInfo.upperBndd;
+  return FLT_LESS(*(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;
 }
 
 //////////////////////////////////////////////////////////////////
@@ -69,15 +69,11 @@ bool larger_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
 }
 
 bool larger_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (FLT_EQUAL(*(float*)maxval, pFilter->filterInfo.lowerBndd)) {
-    return false;
-  }
-
-  return (*(float *) maxval > pFilter->filterInfo.lowerBndd);
+  return FLT_GREATER(*(float*)maxval, pFilter->filterInfo.lowerBndd);
 }
 
 bool larger_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(double *)maxval - pFilter->filterInfo.lowerBndd) > (2 * DBL_EPSILON);
+  return (*(double *)maxval > pFilter->filterInfo.lowerBndd);
 }
 /////////////////////////////////////////////////////////////////////
 
@@ -98,11 +94,7 @@ bool lessEqual_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
 }
 
 bool lessEqual_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (FLT_EQUAL(*(float*)minval, pFilter->filterInfo.upperBndd)) {
-    return true;
-  }
-
-  return (*(float *)minval < pFilter->filterInfo.upperBndd);
+  return FLT_LESSEQUAL(*(float*)minval, pFilter->filterInfo.upperBndd);
 }
 
 bool lessEqual_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
@@ -131,11 +123,7 @@ bool largeEqual_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
 }
 
 bool largeEqual_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (FLT_EQUAL(*(float*)maxval, pFilter->filterInfo.lowerBndd)) {
-    return true;
-  }
-
-  return (*(float *)maxval > pFilter->filterInfo.lowerBndd);
+  return FLT_GREATEREQUAL(*(float*)maxval, pFilter->filterInfo.lowerBndd);
 }
 
 bool largeEqual_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
@@ -391,7 +379,8 @@ bool rangeFilter_i64_ei(SColumnFilterElem *pFilter, char *minval, char *maxval)
 
 ////////////////////////////////////////////////////////////////////////
 bool rangeFilter_ds_ii(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(float *)minval <= pFilter->filterInfo.upperBndd && *(float *)maxval >= pFilter->filterInfo.lowerBndd);
+  return FLT_LESSEQUAL(*(float *)minval, pFilter->filterInfo.upperBndd) &&
+         FLT_GREATEREQUAL(*(float *)maxval, pFilter->filterInfo.lowerBndd);
 }
 
 bool rangeFilter_ds_ee(SColumnFilterElem *pFilter, char *minval, char *maxval) {
@@ -403,7 +392,8 @@ bool rangeFilter_ds_ie(SColumnFilterElem *pFilter, char *minval, char *maxval) {
 }
 
 bool rangeFilter_ds_ei(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(float *)minval <= pFilter->filterInfo.upperBndd && *(float *)maxval > pFilter->filterInfo.lowerBndd);
+  return FLT_GREATER(*(float *)maxval, pFilter->filterInfo.lowerBndd) &&
+         FLT_LESSEQUAL(*(float *)minval, pFilter->filterInfo.upperBndd);
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/tests/script/general/parser/tags_filter.sim b/tests/script/general/parser/tags_filter.sim
index c3d0fdfc61..e05776ff11 100644
--- a/tests/script/general/parser/tags_filter.sim
+++ b/tests/script/general/parser/tags_filter.sim
@@ -149,4 +149,57 @@ if $rows != 2 then
   return -1
 endi
 
+print ==================>td-2424
+sql create table t1(ts timestamp, k float)
+sql insert into t1 values(now, 8.001)
+sql select * from t1 where k=8.001
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from t1 where k<8.001
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from t1 where k<=8.001
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from t1 where k>8.001
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from t1 where k>=8.001
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from t1 where k<>8.001
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from t1 where k>=8.001 and k<=8.001
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from t1 where k>=8.0009999 and k<=8.001
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from t1 where k>8.001 and k<=8.001
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from t1 where k>=8.001 and k<8.001
+if $rows != 0 then
+  return -1
+endi
+
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file