Merge pull request #15823 from taosdata/szhou/fix/nullgroup

fix: add tsim/query/udf.sim to ci test

include/libs/function/functionMgt.h

@@ -202,7 +202,7 @@ bool fmIsForbidStreamFunc(int32_t funcId);
 bool fmIsIntervalInterpoFunc(int32_t funcId);
 bool fmIsInterpFunc(int32_t funcId);
 bool fmIsLastRowFunc(int32_t funcId);
-bool fmIsReturnNotNullFunc(int32_t funcId);
+bool fmIsNotNullOutputFunc(int32_t funcId);
 bool fmIsSelectValueFunc(int32_t funcId);
 bool fmIsSystemInfoFunc(int32_t funcId);
 bool fmIsImplicitTsFunc(int32_t funcId);

source/libs/executor/src/executorimpl.c

@@ -1449,7 +1449,7 @@ static void doUpdateNumOfRows(SqlFunctionCtx* pCtx, SResultRow* pRow, int32_t nu
       pRow->numOfRows = pResInfo->numOfRes;
     }
 
-    if (fmIsReturnNotNullFunc(pCtx[j].functionId)) {
+    if (fmIsNotNullOutputFunc(pCtx[j].functionId)) {
       returnNotNull = true;
     }
   }

source/libs/function/src/functionMgt.c

@@ -221,7 +221,7 @@ bool fmIsLastRowFunc(int32_t funcId) {
   return FUNCTION_TYPE_LAST_ROW == funcMgtBuiltins[funcId].type;
 }
 
-bool fmIsReturnNotNullFunc(int32_t funcId) {
+bool fmIsNotNullOutputFunc(int32_t funcId) {
   if (funcId < 0 || funcId >= funcMgtBuiltinsNum) {
     return false;
   }

tests/script/jenkins/basic.txt

@@ -179,6 +179,7 @@
 ./test.sh -f tsim/query/scalarFunction.sim
 ./test.sh -f tsim/query/scalarNull.sim
 ./test.sh -f tsim/query/session.sim
+./test.sh -f tsim/query/udf.sim
 
 # ---- qnode
 ./test.sh -f tsim/qnode/basic1.sim

tests/script/sh/compile_udf.sh

@@ -3,8 +3,8 @@ set +e
 rm -rf /tmp/udf/libbitand.so /tmp/udf/libsqrsum.so
 mkdir -p /tmp/udf
 echo "compile udf bit_and and sqr_sum"
-gcc -fPIC -shared sh/bit_and.c -o /tmp/udf/libbitand.so
-gcc -fPIC -shared sh/sqr_sum.c -o /tmp/udf/libsqrsum.so
+gcc -fPIC -shared sh/bit_and.c -I../../include/libs/function/ -I../../include/client -I../../include/util   -o /tmp/udf/libbitand.so
+gcc -fPIC -shared sh/sqr_sum.c -I../../include/libs/function/ -I../../include/client -I../../include/util   -o /tmp/udf/libsqrsum.so
 echo "debug show /tmp/udf/*.so"
 ls /tmp/udf/*.so