enh:[TD-32161] Add param check in filter.c

taosdata · Nov 8, 2024 · e1bc351 · e1bc351
1 parent 8e2a546
commit e1bc351
Show file tree

Hide file tree

Showing 4 changed files with 1,013 additions and 566 deletions.
diff --git a/include/util/tutil.h b/include/util/tutil.h
@@ -159,6 +159,10 @@ static FORCE_INLINE int32_t taosGetTbHashVal(const char *tbname, int32_t tblen,
 
 #define SCL_CHECK_CONDITION QUERY_CHECK_CONDITION
 
+#define FLT_CHECK_NULL TSDB_CHECK_NULL
+
+#define FLT_CHECK_CONDITION QUERY_CHECK_CONDITION
+
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 
 #define VND_CHECK_CODE(CODE, LINO, LABEL) TSDB_CHECK_CODE(CODE, LINO, LABEL)

diff --git a/source/common/src/ttypes.c b/source/common/src/ttypes.c
@@ -220,11 +220,11 @@ int32_t operateVal(void *dst, void *s1, void *s2, int32_t optr, int32_t type) {
         SET_DOUBLE_VAL(dst, GET_DOUBLE_VAL(s1) + GET_DOUBLE_VAL(s2));
         break;
       default: {
-        return -1;
+        return TSDB_CODE_QRY_FILTER_NOT_SUPPORT_TYPE;
       }
     }
   } else {
-    return -1;
+    return TSDB_CODE_QRY_FILTER_WRONG_OPTR_TYPE;
   }
 
   return 0;