From 2ba5fdc36f9f2da7feada48dc8040c12cbf32ff5 Mon Sep 17 00:00:00 2001
From: shenglian zhou <slzhou@taosdata.com>
Date: Tue, 10 May 2022 11:22:31 +0800
Subject: [PATCH] fix: block extraction null set error

---
 source/common/src/tdatablock.c  |  2 +-
 source/libs/function/src/udfd.c |  2 +-
 tests/script/tsim/query/udf.sim | 58 ++++++++++++++++-----------------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 0d0bbb07be..b58e4bd1dd 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -493,7 +493,7 @@ SSDataBlock* blockDataExtractBlock(SSDataBlock* pBlock, int32_t startIndex, int3
     for (int32_t j = startIndex; j < (startIndex + rowCount); ++j) {
       bool isNull = false;
       if (pBlock->pBlockAgg == NULL) {
-        isNull = colDataIsNull_s(pColData, pBlock->info.rows);
+        isNull = colDataIsNull_s(pColData, j);
       } else {
         isNull = colDataIsNull(pColData, pBlock->info.rows, j, pBlock->pBlockAgg[i]);
       }
diff --git a/source/libs/function/src/udfd.c b/source/libs/function/src/udfd.c
index 7695598fb8..0ad4674cfa 100644
--- a/source/libs/function/src/udfd.c
+++ b/source/libs/function/src/udfd.c
@@ -409,7 +409,7 @@ void udfdPipeCloseCb(uv_handle_t *pipe) {
 void udfdUvHandleError(SUdfdUvConn *conn) { uv_close((uv_handle_t *)conn->client, udfdPipeCloseCb); }
 
 void udfdPipeRead(uv_stream_t *client, ssize_t nread, const uv_buf_t *buf) {
-  fnDebug("udf read %zu bytes from client", nread);
+  fnDebug("udf read %zd bytes from client", nread);
   if (nread == 0) return;
 
   SUdfdUvConn *conn = client->data;
diff --git a/tests/script/tsim/query/udf.sim b/tests/script/tsim/query/udf.sim
index b3cbda5090..cabb88ea09 100644
--- a/tests/script/tsim/query/udf.sim
+++ b/tests/script/tsim/query/udf.sim
@@ -64,35 +64,35 @@ if $data00 != 1.414213562 then
   return -1
 endi
 
-#sql insert into t2 values(now+2s, 1, null)(now+3s, null, 2);
-#sql select udf1(f1, f2) from t2;
-#print $rows , $data00 , $data10 , $data20 , $data30
-#if $rows != 4 then
-#  return -1
-#endi
-#if $data00 != 88 then
-#  return -1
-#endi
-#if $data10 != 88 then
-#  return -1
-#endi
-#
-#if $data20 != NULL then
-#  return -1
-#endi
-#
-#if $data30 != NULL then
-#  return -1
-#endi
-#
-#sql select udf2(f1, f2) from t2;
-#print $rows, $data00
-#if $rows != 1 then
-#  return -1
-#endi
-#if $data00 != 2.645751311 then
-#  return -1
-#endi
+sql insert into t2 values(now+2s, 1, null)(now+3s, null, 2);
+sql select udf1(f1, f2) from t2;
+print $rows , $data00 , $data10 , $data20 , $data30
+if $rows != 4 then
+  return -1
+endi
+if $data00 != 88 then
+  return -1
+endi
+if $data10 != 88 then
+  return -1
+endi
+
+if $data20 != NULL then
+  return -1
+endi
+
+if $data30 != NULL then
+  return -1
+endi
+
+sql select udf2(f1, f2) from t2;
+print $rows, $data00
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 2.645751311 then
+  return -1
+endi
 sql drop function udf1;
 sql show functions;
 if $rows != 1 then