xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: block extraction null set error

This commit is contained in:
shenglian zhou 2022-05-10 11:22:31 +08:00
parent 56b2529814
commit 2ba5fdc36f
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/common/src/tdatablock.c
View File

@ -493,7 +493,7 @@ SSDataBlock* blockDataExtractBlock(SSDataBlock* pBlock, int32_t startIndex, int3
for (int32_t j = startIndex; j < (startIndex + rowCount); ++j) { for (int32_t j = startIndex; j < (startIndex + rowCount); ++j) {
bool isNull = false; bool isNull = false;
if (pBlock->pBlockAgg == NULL) { if (pBlock->pBlockAgg == NULL) {
isNull = colDataIsNull_s(pColData, pBlock->info.rows); isNull = colDataIsNull_s(pColData, j);
} else { } else {
isNull = colDataIsNull(pColData, pBlock->info.rows, j, pBlock->pBlockAgg[i]); isNull = colDataIsNull(pColData, pBlock->info.rows, j, pBlock->pBlockAgg[i]);
} }

2
source/libs/function/src/udfd.c
View File

@ -409,7 +409,7 @@ void udfdPipeCloseCb(uv_handle_t *pipe) {
void udfdUvHandleError(SUdfdUvConn *conn) { uv_close((uv_handle_t *)conn->client, udfdPipeCloseCb); } 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) { 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; if (nread == 0) return;
SUdfdUvConn *conn = client->data; SUdfdUvConn *conn = client->data;

58
tests/script/tsim/query/udf.sim
View File

@ -64,35 +64,35 @@ if $data00 != 1.414213562 then
return -1 return -1
endi endi
#sql insert into t2 values(now+2s, 1, null)(now+3s, null, 2); sql insert into t2 values(now+2s, 1, null)(now+3s, null, 2);
#sql select udf1(f1, f2) from t2; sql select udf1(f1, f2) from t2;
#print $rows , $data00 , $data10 , $data20 , $data30 print $rows , $data00 , $data10 , $data20 , $data30
#if $rows != 4 then if $rows != 4 then
# return -1 return -1
#endi endi
#if $data00 != 88 then if $data00 != 88 then
# return -1 return -1
#endi endi
#if $data10 != 88 then if $data10 != 88 then
# return -1 return -1
#endi endi
#
#if $data20 != NULL then if $data20 != NULL then
# return -1 return -1
#endi endi
#
#if $data30 != NULL then if $data30 != NULL then
# return -1 return -1
#endi endi
#
#sql select udf2(f1, f2) from t2; sql select udf2(f1, f2) from t2;
#print $rows, $data00 print $rows, $data00
#if $rows != 1 then if $rows != 1 then
# return -1 return -1
#endi endi
#if $data00 != 2.645751311 then if $data00 != 2.645751311 then
# return -1 return -1
#endi endi
sql drop function udf1; sql drop function udf1;
sql show functions; sql show functions;
if $rows != 1 then if $rows != 1 then