Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
7fe25041
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7fe25041
编写于
2月 20, 2023
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor:do some internal refactor.
上级
751c1cb5
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
64 addition
and
64 deletion
+64
-64
source/dnode/mnode/impl/src/mndDb.c
source/dnode/mnode/impl/src/mndDb.c
+2
-2
source/dnode/mnode/impl/src/mndStb.c
source/dnode/mnode/impl/src/mndStb.c
+1
-1
source/dnode/mnode/impl/src/mndVgroup.c
source/dnode/mnode/impl/src/mndVgroup.c
+2
-2
source/dnode/vnode/src/tq/tq.c
source/dnode/vnode/src/tq/tq.c
+3
-3
source/dnode/vnode/src/tsdb/tsdbRead.c
source/dnode/vnode/src/tsdb/tsdbRead.c
+4
-4
source/libs/executor/src/cachescanoperator.c
source/libs/executor/src/cachescanoperator.c
+1
-1
source/libs/executor/src/joinoperator.c
source/libs/executor/src/joinoperator.c
+1
-1
source/libs/executor/src/scanoperator.c
source/libs/executor/src/scanoperator.c
+7
-7
source/libs/executor/src/sortoperator.c
source/libs/executor/src/sortoperator.c
+1
-1
source/libs/executor/src/sysscanoperator.c
source/libs/executor/src/sysscanoperator.c
+8
-8
source/libs/executor/src/tfill.c
source/libs/executor/src/tfill.c
+5
-5
source/libs/executor/src/timesliceoperator.c
source/libs/executor/src/timesliceoperator.c
+5
-5
source/libs/executor/src/timewindowoperator.c
source/libs/executor/src/timewindowoperator.c
+4
-4
source/libs/scalar/src/scalar.c
source/libs/scalar/src/scalar.c
+1
-1
source/libs/scalar/src/sclfunc.c
source/libs/scalar/src/sclfunc.c
+3
-3
source/libs/scalar/src/sclvector.c
source/libs/scalar/src/sclvector.c
+16
-16
未找到文件。
source/dnode/mnode/impl/src/mndDb.c
浏览文件 @
7fe25041
...
...
@@ -1651,7 +1651,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,
}
else
if
(
i
==
15
)
{
colDataSetVal
(
pColInfo
,
rows
,
statusVstr
,
false
);
}
else
{
colData
Append
NULL
(
pColInfo
,
rows
);
colData
Set
NULL
(
pColInfo
,
rows
);
}
}
}
else
{
...
...
@@ -1721,7 +1721,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,
char
*
rentensionVstr
=
buildRetension
(
pDb
->
cfg
.
pRetensions
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
if
(
rentensionVstr
==
NULL
)
{
colData
Append
NULL
(
pColInfo
,
rows
);
colData
Set
NULL
(
pColInfo
,
rows
);
}
else
{
colDataSetVal
(
pColInfo
,
rows
,
(
const
char
*
)
rentensionVstr
,
false
);
taosMemoryFree
(
rentensionVstr
);
...
...
source/dnode/mnode/impl/src/mndStb.c
浏览文件 @
7fe25041
...
...
@@ -2557,7 +2557,7 @@ static int32_t mndRetrieveStb(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBloc
STR_TO_VARSTR
(
comment
,
""
);
colDataSetVal
(
pColInfo
,
numOfRows
,
comment
,
false
);
}
else
{
colData
Append
NULL
(
pColInfo
,
numOfRows
);
colData
Set
NULL
(
pColInfo
,
numOfRows
);
}
char
watermark
[
64
+
VARSTR_HEADER_SIZE
]
=
{
0
};
...
...
source/dnode/mnode/impl/src/mndVgroup.c
浏览文件 @
7fe25041
...
...
@@ -733,9 +733,9 @@ static int32_t mndRetrieveVgroups(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *p
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
colDataSetVal
(
pColInfo
,
numOfRows
,
(
const
char
*
)
buf1
,
false
);
}
else
{
colData
Append
NULL
(
pColInfo
,
numOfRows
);
colData
Set
NULL
(
pColInfo
,
numOfRows
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
colData
Append
NULL
(
pColInfo
,
numOfRows
);
colData
Set
NULL
(
pColInfo
,
numOfRows
);
}
}
...
...
source/dnode/vnode/src/tq/tq.c
浏览文件 @
7fe25041
...
...
@@ -1272,9 +1272,9 @@ int32_t tqProcessDelReq(STQ* pTq, void* pReq, int32_t len, int64_t ver) {
int64_t
*
pUid
=
taosArrayGet
(
pRes
->
uidList
,
i
);
colDataSetVal
(
pUidCol
,
i
,
(
const
char
*
)
pUid
,
false
);
colData
Append
NULL
(
taosArrayGet
(
pDelBlock
->
pDataBlock
,
GROUPID_COLUMN_INDEX
),
i
);
colData
Append
NULL
(
taosArrayGet
(
pDelBlock
->
pDataBlock
,
CALCULATE_START_TS_COLUMN_INDEX
),
i
);
colData
Append
NULL
(
taosArrayGet
(
pDelBlock
->
pDataBlock
,
CALCULATE_END_TS_COLUMN_INDEX
),
i
);
colData
Set
NULL
(
taosArrayGet
(
pDelBlock
->
pDataBlock
,
GROUPID_COLUMN_INDEX
),
i
);
colData
Set
NULL
(
taosArrayGet
(
pDelBlock
->
pDataBlock
,
CALCULATE_START_TS_COLUMN_INDEX
),
i
);
colData
Set
NULL
(
taosArrayGet
(
pDelBlock
->
pDataBlock
,
CALCULATE_END_TS_COLUMN_INDEX
),
i
);
}
taosArrayDestroy
(
pRes
->
uidList
);
...
...
source/dnode/vnode/src/tsdb/tsdbRead.c
浏览文件 @
7fe25041
...
...
@@ -3642,7 +3642,7 @@ int32_t doAppendRowFromTSRow(SSDataBlock* pBlock, STsdbReader* pReader, STSRow*
}
else
if
(
colId
<
pSchema
->
columns
[
j
].
colId
)
{
SColumnInfoData
*
pColInfoData
=
taosArrayGet
(
pBlock
->
pDataBlock
,
pSupInfo
->
slotId
[
i
]);
colData
Append
NULL
(
pColInfoData
,
outputRowIndex
);
colData
Set
NULL
(
pColInfoData
,
outputRowIndex
);
i
+=
1
;
}
else
if
(
colId
>
pSchema
->
columns
[
j
].
colId
)
{
j
+=
1
;
...
...
@@ -3652,7 +3652,7 @@ int32_t doAppendRowFromTSRow(SSDataBlock* pBlock, STsdbReader* pReader, STSRow*
// set null value since current column does not exist in the "pSchema"
while
(
i
<
pSupInfo
->
numOfCols
)
{
SColumnInfoData
*
pColInfoData
=
taosArrayGet
(
pBlock
->
pDataBlock
,
pSupInfo
->
slotId
[
i
]);
colData
Append
NULL
(
pColInfoData
,
outputRowIndex
);
colData
Set
NULL
(
pColInfoData
,
outputRowIndex
);
i
+=
1
;
}
...
...
@@ -3692,7 +3692,7 @@ int32_t doAppendRowFromFileBlock(SSDataBlock* pResBlock, STsdbReader* pReader, S
j
+=
1
;
}
else
if
(
pData
->
cid
>
pCol
->
info
.
colId
)
{
// the specified column does not exist in file block, fill with null data
colData
Append
NULL
(
pCol
,
outputRowIndex
);
colData
Set
NULL
(
pCol
,
outputRowIndex
);
}
i
+=
1
;
...
...
@@ -3700,7 +3700,7 @@ int32_t doAppendRowFromFileBlock(SSDataBlock* pResBlock, STsdbReader* pReader, S
while
(
i
<
numOfOutputCols
)
{
SColumnInfoData
*
pCol
=
taosArrayGet
(
pResBlock
->
pDataBlock
,
pSupInfo
->
slotId
[
i
]);
colData
Append
NULL
(
pCol
,
outputRowIndex
);
colData
Set
NULL
(
pCol
,
outputRowIndex
);
i
+=
1
;
}
...
...
source/libs/executor/src/cachescanoperator.c
浏览文件 @
7fe25041
...
...
@@ -182,7 +182,7 @@ SSDataBlock* doScanCache(SOperatorInfo* pOperator) {
SColumnInfoData
*
pDst
=
taosArrayGet
(
pRes
->
pDataBlock
,
slotId
);
if
(
colDataIsNull_s
(
pSrc
,
pInfo
->
indexOfBufferedRes
))
{
colData
Append
NULL
(
pDst
,
0
);
colData
Set
NULL
(
pDst
,
0
);
}
else
{
char
*
p
=
colDataGetData
(
pSrc
,
pInfo
->
indexOfBufferedRes
);
colDataSetVal
(
pDst
,
0
,
p
,
false
);
...
...
source/libs/executor/src/joinoperator.c
浏览文件 @
7fe25041
...
...
@@ -196,7 +196,7 @@ static void mergeJoinJoinLeftRight(struct SOperatorInfo* pOperator, SSDataBlock*
}
if
(
colDataIsNull_s
(
pSrc
,
rowIndex
))
{
colData
Append
NULL
(
pDst
,
currRow
);
colData
Set
NULL
(
pDst
,
currRow
);
}
else
{
char
*
p
=
colDataGetData
(
pSrc
,
rowIndex
);
colDataSetVal
(
pDst
,
currRow
,
p
,
false
);
...
...
source/libs/executor/src/scanoperator.c
浏览文件 @
7fe25041
...
...
@@ -1235,10 +1235,10 @@ static int32_t generateSessionScanRange(SStreamScanInfo* pInfo, SSDataBlock* pSr
colDataSetVal
(
pDestStartCol
,
i
,
(
const
char
*
)
&
startWin
.
win
.
skey
,
false
);
colDataSetVal
(
pDestEndCol
,
i
,
(
const
char
*
)
&
endWin
.
win
.
ekey
,
false
);
colData
Append
NULL
(
pDestUidCol
,
i
);
colData
Set
NULL
(
pDestUidCol
,
i
);
colDataSetVal
(
pDestGpCol
,
i
,
(
const
char
*
)
&
groupId
,
false
);
colData
Append
NULL
(
pDestCalStartTsCol
,
i
);
colData
Append
NULL
(
pDestCalEndTsCol
,
i
);
colData
Set
NULL
(
pDestCalStartTsCol
,
i
);
colData
Set
NULL
(
pDestCalEndTsCol
,
i
);
pDestBlock
->
info
.
rows
++
;
}
return
TSDB_CODE_SUCCESS
;
...
...
@@ -1695,9 +1695,9 @@ static int32_t filterDelBlockByUid(SSDataBlock* pDst, const SSDataBlock* pSrc, S
colDataSetVal
(
pDstEndCol
,
j
,
(
const
char
*
)
&
endCol
[
i
],
false
);
colDataSetVal
(
pDstUidCol
,
j
,
(
const
char
*
)
&
uidCol
[
i
],
false
);
colData
Append
NULL
(
taosArrayGet
(
pDst
->
pDataBlock
,
GROUPID_COLUMN_INDEX
),
j
);
colData
Append
NULL
(
taosArrayGet
(
pDst
->
pDataBlock
,
CALCULATE_START_TS_COLUMN_INDEX
),
j
);
colData
Append
NULL
(
taosArrayGet
(
pDst
->
pDataBlock
,
CALCULATE_END_TS_COLUMN_INDEX
),
j
);
colData
Set
NULL
(
taosArrayGet
(
pDst
->
pDataBlock
,
GROUPID_COLUMN_INDEX
),
j
);
colData
Set
NULL
(
taosArrayGet
(
pDst
->
pDataBlock
,
CALCULATE_START_TS_COLUMN_INDEX
),
j
);
colData
Set
NULL
(
taosArrayGet
(
pDst
->
pDataBlock
,
CALCULATE_END_TS_COLUMN_INDEX
),
j
);
j
++
;
}
}
...
...
@@ -3109,7 +3109,7 @@ void fillTableCountScanDataBlock(STableCountScanSupp* pSupp, char* dbName, char*
varDataSetLen
(
varStbName
,
strlen
(
stbName
));
colDataSetVal
(
colInfoData
,
0
,
varStbName
,
false
);
}
else
{
colData
Append
NULL
(
colInfoData
,
0
);
colData
Set
NULL
(
colInfoData
,
0
);
}
}
...
...
source/libs/executor/src/sortoperator.c
浏览文件 @
7fe25041
...
...
@@ -101,7 +101,7 @@ void appendOneRowToDataBlock(SSDataBlock* pBlock, STupleHandle* pTupleHandle) {
SColumnInfoData
*
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
i
);
bool
isNull
=
tsortIsNullVal
(
pTupleHandle
,
i
);
if
(
isNull
)
{
colData
Append
NULL
(
pColInfo
,
pBlock
->
info
.
rows
);
colData
Set
NULL
(
pColInfo
,
pBlock
->
info
.
rows
);
}
else
{
char
*
pData
=
tsortGetValue
(
pTupleHandle
,
i
);
if
(
pData
!=
NULL
)
{
...
...
source/libs/executor/src/sysscanoperator.c
浏览文件 @
7fe25041
...
...
@@ -781,7 +781,7 @@ int32_t buildDbTableInfoBlock(bool sysInfo, const SSDataBlock* p, const SSysTabl
// create time
pColInfoData
=
taosArrayGet
(
p
->
pDataBlock
,
2
);
colData
Append
NULL
(
pColInfoData
,
numOfRows
);
colData
Set
NULL
(
pColInfoData
,
numOfRows
);
// number of columns
pColInfoData
=
taosArrayGet
(
p
->
pDataBlock
,
3
);
...
...
@@ -789,7 +789,7 @@ int32_t buildDbTableInfoBlock(bool sysInfo, const SSDataBlock* p, const SSysTabl
for
(
int32_t
j
=
4
;
j
<=
8
;
++
j
)
{
pColInfoData
=
taosArrayGet
(
p
->
pDataBlock
,
j
);
colData
Append
NULL
(
pColInfoData
,
numOfRows
);
colData
Set
NULL
(
pColInfoData
,
numOfRows
);
}
STR_TO_VARSTR
(
n
,
"SYSTEM_TABLE"
);
...
...
@@ -912,7 +912,7 @@ static SSDataBlock* sysTableBuildUserTablesByUids(SOperatorInfo* pOperator) {
STR_TO_VARSTR
(
comment
,
""
);
colDataSetVal
(
pColInfoData
,
numOfRows
,
comment
,
false
);
}
else
{
colData
Append
NULL
(
pColInfoData
,
numOfRows
);
colData
Set
NULL
(
pColInfoData
,
numOfRows
);
}
// uid
...
...
@@ -936,7 +936,7 @@ static SSDataBlock* sysTableBuildUserTablesByUids(SOperatorInfo* pOperator) {
// super table name
pColInfoData
=
taosArrayGet
(
p
->
pDataBlock
,
4
);
colData
Append
NULL
(
pColInfoData
,
numOfRows
);
colData
Set
NULL
(
pColInfoData
,
numOfRows
);
// table comment
pColInfoData
=
taosArrayGet
(
p
->
pDataBlock
,
8
);
...
...
@@ -949,7 +949,7 @@ static SSDataBlock* sysTableBuildUserTablesByUids(SOperatorInfo* pOperator) {
STR_TO_VARSTR
(
comment
,
""
);
colDataSetVal
(
pColInfoData
,
numOfRows
,
comment
,
false
);
}
else
{
colData
Append
NULL
(
pColInfoData
,
numOfRows
);
colData
Set
NULL
(
pColInfoData
,
numOfRows
);
}
// uid
...
...
@@ -1093,7 +1093,7 @@ static SSDataBlock* sysTableBuildUserTables(SOperatorInfo* pOperator) {
STR_TO_VARSTR
(
comment
,
""
);
colDataSetVal
(
pColInfoData
,
numOfRows
,
comment
,
false
);
}
else
{
colData
Append
NULL
(
pColInfoData
,
numOfRows
);
colData
Set
NULL
(
pColInfoData
,
numOfRows
);
}
// uid
...
...
@@ -1116,7 +1116,7 @@ static SSDataBlock* sysTableBuildUserTables(SOperatorInfo* pOperator) {
// super table name
pColInfoData
=
taosArrayGet
(
p
->
pDataBlock
,
4
);
colData
Append
NULL
(
pColInfoData
,
numOfRows
);
colData
Set
NULL
(
pColInfoData
,
numOfRows
);
// table comment
pColInfoData
=
taosArrayGet
(
p
->
pDataBlock
,
8
);
...
...
@@ -1129,7 +1129,7 @@ static SSDataBlock* sysTableBuildUserTables(SOperatorInfo* pOperator) {
STR_TO_VARSTR
(
comment
,
""
);
colDataSetVal
(
pColInfoData
,
numOfRows
,
comment
,
false
);
}
else
{
colData
Append
NULL
(
pColInfoData
,
numOfRows
);
colData
Set
NULL
(
pColInfoData
,
numOfRows
);
}
// uid
...
...
source/libs/executor/src/tfill.c
浏览文件 @
7fe25041
...
...
@@ -60,7 +60,7 @@ static void setNullRow(SSDataBlock* pBlock, SFillInfo* pFillInfo, int32_t rowInd
setNotFillColumn
(
pFillInfo
,
pDstColInfo
,
rowIndex
,
i
);
}
}
else
{
colData
Append
NULL
(
pDstColInfo
,
rowIndex
);
colData
Set
NULL
(
pDstColInfo
,
rowIndex
);
}
}
}
...
...
@@ -81,7 +81,7 @@ static void doSetUserSpecifiedValue(SColumnInfoData* pDst, SVariant* pVar, int32
}
else
if
(
pDst
->
info
.
type
==
TSDB_DATA_TYPE_TIMESTAMP
)
{
colDataSetVal
(
pDst
,
rowIndex
,
(
const
char
*
)
&
currentKey
,
false
);
}
else
{
// varchar/nchar data
colData
Append
NULL
(
pDst
,
rowIndex
);
colData
Set
NULL
(
pDst
,
rowIndex
);
}
}
...
...
@@ -163,7 +163,7 @@ static void doFillOneRow(SFillInfo* pFillInfo, SSDataBlock* pBlock, SSDataBlock*
}
else
{
SGroupKeys
*
pKey
=
taosArrayGet
(
pFillInfo
->
prev
.
pRowVal
,
i
);
if
(
IS_VAR_DATA_TYPE
(
type
)
||
type
==
TSDB_DATA_TYPE_BOOL
||
pKey
->
isNull
)
{
colData
Append
NULL
(
pDstCol
,
index
);
colData
Set
NULL
(
pDstCol
,
index
);
continue
;
}
...
...
@@ -217,7 +217,7 @@ static void doFillOneRow(SFillInfo* pFillInfo, SSDataBlock* pBlock, SSDataBlock*
void
doSetVal
(
SColumnInfoData
*
pDstCol
,
int32_t
rowIndex
,
const
SGroupKeys
*
pKey
)
{
if
(
pKey
->
isNull
)
{
colData
Append
NULL
(
pDstCol
,
rowIndex
);
colData
Set
NULL
(
pDstCol
,
rowIndex
);
}
else
{
colDataSetVal
(
pDstCol
,
rowIndex
,
pKey
->
pData
,
false
);
}
...
...
@@ -350,7 +350,7 @@ static int32_t fillResultImpl(SFillInfo* pFillInfo, SSDataBlock* pBlock, int32_t
colDataSetVal
(
pDst
,
index
,
src
,
isNull
);
saveColData
(
pFillInfo
->
prev
.
pRowVal
,
i
,
src
,
isNull
);
// todo:
}
else
if
(
pFillInfo
->
type
==
TSDB_FILL_NULL
||
pFillInfo
->
type
==
TSDB_FILL_NULL_F
)
{
colData
Append
NULL
(
pDst
,
index
);
colData
Set
NULL
(
pDst
,
index
);
}
else
if
(
pFillInfo
->
type
==
TSDB_FILL_NEXT
)
{
SArray
*
p
=
FILL_IS_ASC_FILL
(
pFillInfo
)
?
pFillInfo
->
next
.
pRowVal
:
pFillInfo
->
prev
.
pRowVal
;
SGroupKeys
*
pKey
=
taosArrayGet
(
p
,
i
);
...
...
source/libs/executor/src/timesliceoperator.c
浏览文件 @
7fe25041
...
...
@@ -183,7 +183,7 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
switch
(
pSliceInfo
->
fillType
)
{
case
TSDB_FILL_NULL
:
case
TSDB_FILL_NULL_F
:
{
colData
Append
NULL
(
pDst
,
rows
);
colData
Set
NULL
(
pDst
,
rows
);
break
;
}
...
...
@@ -225,7 +225,7 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
}
if
(
start
.
key
==
INT64_MIN
||
end
.
key
==
INT64_MIN
)
{
colData
Append
NULL
(
pDst
,
rows
);
colData
Set
NULL
(
pDst
,
rows
);
break
;
}
...
...
@@ -246,7 +246,7 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
if
(
pkey
->
isNull
==
false
)
{
colDataSetVal
(
pDst
,
rows
,
pkey
->
pData
,
false
);
}
else
{
colData
Append
NULL
(
pDst
,
rows
);
colData
Set
NULL
(
pDst
,
rows
);
}
break
;
}
...
...
@@ -261,7 +261,7 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
if
(
pkey
->
isNull
==
false
)
{
colDataSetVal
(
pDst
,
rows
,
pkey
->
pData
,
false
);
}
else
{
colData
Append
NULL
(
pDst
,
rows
);
colData
Set
NULL
(
pDst
,
rows
);
}
break
;
}
...
...
@@ -295,7 +295,7 @@ static void addCurrentRowToResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp*
SColumnInfoData
*
pSrc
=
taosArrayGet
(
pSrcBlock
->
pDataBlock
,
srcSlot
);
if
(
colDataIsNull_s
(
pSrc
,
index
))
{
colData
Append
NULL
(
pDst
,
pResBlock
->
info
.
rows
);
colData
Set
NULL
(
pDst
,
pResBlock
->
info
.
rows
);
continue
;
}
...
...
source/libs/executor/src/timewindowoperator.c
浏览文件 @
7fe25041
...
...
@@ -3277,20 +3277,20 @@ void doBuildDeleteDataBlock(SOperatorInfo* pOp, SSHashObj* pStDeleted, SSDataBlo
SColumnInfoData
*
pEndTsCol
=
taosArrayGet
(
pBlock
->
pDataBlock
,
END_TS_COLUMN_INDEX
);
colDataSetVal
(
pEndTsCol
,
pBlock
->
info
.
rows
,
(
const
char
*
)
&
res
->
win
.
skey
,
false
);
SColumnInfoData
*
pUidCol
=
taosArrayGet
(
pBlock
->
pDataBlock
,
UID_COLUMN_INDEX
);
colData
Append
NULL
(
pUidCol
,
pBlock
->
info
.
rows
);
colData
Set
NULL
(
pUidCol
,
pBlock
->
info
.
rows
);
SColumnInfoData
*
pGpCol
=
taosArrayGet
(
pBlock
->
pDataBlock
,
GROUPID_COLUMN_INDEX
);
colDataSetVal
(
pGpCol
,
pBlock
->
info
.
rows
,
(
const
char
*
)
&
res
->
groupId
,
false
);
SColumnInfoData
*
pCalStCol
=
taosArrayGet
(
pBlock
->
pDataBlock
,
CALCULATE_START_TS_COLUMN_INDEX
);
colData
Append
NULL
(
pCalStCol
,
pBlock
->
info
.
rows
);
colData
Set
NULL
(
pCalStCol
,
pBlock
->
info
.
rows
);
SColumnInfoData
*
pCalEdCol
=
taosArrayGet
(
pBlock
->
pDataBlock
,
CALCULATE_END_TS_COLUMN_INDEX
);
colData
Append
NULL
(
pCalEdCol
,
pBlock
->
info
.
rows
);
colData
Set
NULL
(
pCalEdCol
,
pBlock
->
info
.
rows
);
SColumnInfoData
*
pTableCol
=
taosArrayGet
(
pBlock
->
pDataBlock
,
TABLE_NAME_COLUMN_INDEX
);
void
*
tbname
=
NULL
;
streamStateGetParName
(
pOp
->
pTaskInfo
->
streamInfo
.
pState
,
res
->
groupId
,
&
tbname
);
if
(
tbname
==
NULL
)
{
colData
Append
NULL
(
pTableCol
,
pBlock
->
info
.
rows
);
colData
Set
NULL
(
pTableCol
,
pBlock
->
info
.
rows
);
}
else
{
char
parTbName
[
VARSTR_HEADER_SIZE
+
TSDB_TABLE_NAME_LEN
];
STR_WITH_MAXSIZE_TO_VARSTR
(
parTbName
,
tbname
,
sizeof
(
parTbName
));
...
...
source/libs/scalar/src/scalar.c
浏览文件 @
7fe25041
...
...
@@ -337,7 +337,7 @@ int32_t sclInitParam(SNode *node, SScalarParam *param, SScalarCtx *ctx, int32_t
SCL_RET
(
TSDB_CODE_OUT_OF_MEMORY
);
}
if
(
TSDB_DATA_TYPE_NULL
==
valueNode
->
node
.
resType
.
type
||
valueNode
->
isNull
)
{
colData
Append
NULL
(
param
->
columnData
,
0
);
colData
Set
NULL
(
param
->
columnData
,
0
);
}
else
{
colDataSetVal
(
param
->
columnData
,
0
,
nodesGetValueFromNode
(
valueNode
),
false
);
}
...
...
source/libs/scalar/src/sclfunc.c
浏览文件 @
7fe25041
...
...
@@ -2606,7 +2606,7 @@ int32_t stateCountScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalar
for
(
int32_t
i
=
0
;
i
<
pInput
->
numOfRows
;
++
i
)
{
if
(
colDataIsNull_s
(
pInputData
,
i
))
{
colData
Append
NULL
(
pOutputData
,
i
);
colData
Set
NULL
(
pOutputData
,
i
);
continue
;
}
...
...
@@ -2632,7 +2632,7 @@ int32_t stateDurationScalarFunction(SScalarParam *pInput, int32_t inputNum, SSca
for
(
int32_t
i
=
0
;
i
<
pInput
->
numOfRows
;
++
i
)
{
if
(
colDataIsNull_s
(
pInputData
,
i
))
{
colData
Append
NULL
(
pOutputData
,
i
);
colData
Set
NULL
(
pOutputData
,
i
);
continue
;
}
...
...
@@ -2898,7 +2898,7 @@ int32_t selectScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara
for
(
int32_t
i
=
0
;
i
<
pInput
->
numOfRows
;
++
i
)
{
if
(
colDataIsNull_s
(
pInputData
,
i
))
{
colData
Append
NULL
(
pOutputData
,
0
);
colData
Set
NULL
(
pOutputData
,
0
);
continue
;
}
...
...
source/libs/scalar/src/sclvector.c
浏览文件 @
7fe25041
...
...
@@ -1247,7 +1247,7 @@ static void vectorMathMultiplyHelper(SColumnInfoData *pLeftCol, SColumnInfoData
}
else
{
for
(;
i
>=
0
&&
i
<
numOfRows
;
i
+=
step
,
output
+=
1
)
{
if
(
IS_HELPER_NULL
(
pLeftCol
,
i
))
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
// TODO set null or ignore
}
*
output
=
getVectorDoubleValueFnLeft
(
LEFT_COL
,
i
)
*
getVectorDoubleValueFnRight
(
RIGHT_COL
,
0
);
...
...
@@ -1273,7 +1273,7 @@ void vectorMathMultiply(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam
if
(
pLeft
->
numOfRows
==
pRight
->
numOfRows
)
{
for
(;
i
<
pRight
->
numOfRows
&&
i
>=
0
;
i
+=
step
,
output
+=
1
)
{
if
(
IS_NULL
)
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
// TODO set null or ignore
}
*
output
=
getVectorDoubleValueFnLeft
(
LEFT_COL
,
i
)
*
getVectorDoubleValueFnRight
(
RIGHT_COL
,
i
);
...
...
@@ -1306,7 +1306,7 @@ void vectorMathDivide(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *p
if
(
pLeft
->
numOfRows
==
pRight
->
numOfRows
)
{
for
(;
i
<
pRight
->
numOfRows
&&
i
>=
0
;
i
+=
step
,
output
+=
1
)
{
if
(
IS_NULL
||
(
getVectorDoubleValueFnRight
(
RIGHT_COL
,
i
)
==
0
))
{
// divide by 0 check
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
}
*
output
=
getVectorDoubleValueFnLeft
(
LEFT_COL
,
i
)
/
getVectorDoubleValueFnRight
(
RIGHT_COL
,
i
);
...
...
@@ -1317,7 +1317,7 @@ void vectorMathDivide(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *p
}
else
{
for
(;
i
>=
0
&&
i
<
pRight
->
numOfRows
;
i
+=
step
,
output
+=
1
)
{
if
(
IS_HELPER_NULL
(
pRightCol
,
i
)
||
(
getVectorDoubleValueFnRight
(
RIGHT_COL
,
i
)
==
0
))
{
// divide by 0 check
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
}
*
output
=
getVectorDoubleValueFnLeft
(
LEFT_COL
,
0
)
/
getVectorDoubleValueFnRight
(
RIGHT_COL
,
i
);
...
...
@@ -1330,7 +1330,7 @@ void vectorMathDivide(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *p
}
else
{
for
(;
i
>=
0
&&
i
<
pLeft
->
numOfRows
;
i
+=
step
,
output
+=
1
)
{
if
(
IS_HELPER_NULL
(
pLeftCol
,
i
))
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
}
*
output
=
getVectorDoubleValueFnLeft
(
LEFT_COL
,
i
)
/
getVectorDoubleValueFnRight
(
RIGHT_COL
,
0
);
...
...
@@ -1361,14 +1361,14 @@ void vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam
if
(
pLeft
->
numOfRows
==
pRight
->
numOfRows
)
{
for
(;
i
<
pRight
->
numOfRows
&&
i
>=
0
;
i
+=
step
,
output
+=
1
)
{
if
(
IS_NULL
)
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
}
double
lx
=
getVectorDoubleValueFnLeft
(
LEFT_COL
,
i
);
double
rx
=
getVectorDoubleValueFnRight
(
RIGHT_COL
,
i
);
if
(
isnan
(
lx
)
||
isinf
(
lx
)
||
isnan
(
rx
)
||
isinf
(
rx
)
||
FLT_EQUAL
(
rx
,
0
))
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
}
...
...
@@ -1381,13 +1381,13 @@ void vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam
}
else
{
for
(;
i
>=
0
&&
i
<
pRight
->
numOfRows
;
i
+=
step
,
output
+=
1
)
{
if
(
IS_HELPER_NULL
(
pRightCol
,
i
))
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
}
double
rx
=
getVectorDoubleValueFnRight
(
RIGHT_COL
,
i
);
if
(
isnan
(
rx
)
||
isinf
(
rx
)
||
FLT_EQUAL
(
rx
,
0
))
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
}
...
...
@@ -1401,13 +1401,13 @@ void vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam
}
else
{
for
(;
i
>=
0
&&
i
<
pLeft
->
numOfRows
;
i
+=
step
,
output
+=
1
)
{
if
(
IS_HELPER_NULL
(
pLeftCol
,
i
))
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
}
double
lx
=
getVectorDoubleValueFnLeft
(
LEFT_COL
,
i
);
if
(
isnan
(
lx
)
||
isinf
(
lx
))
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
}
...
...
@@ -1436,7 +1436,7 @@ void vectorMathMinus(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pO
double
*
output
=
(
double
*
)
pOutputCol
->
pData
;
for
(;
i
<
pLeft
->
numOfRows
&&
i
>=
0
;
i
+=
step
,
output
+=
1
)
{
if
(
IS_HELPER_NULL
(
pLeftCol
,
i
))
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
}
double
result
=
getVectorDoubleValueFnLeft
(
LEFT_COL
,
i
);
...
...
@@ -1475,7 +1475,7 @@ static void vectorBitAndHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRigh
}
else
{
for
(;
i
>=
0
&&
i
<
numOfRows
;
i
+=
step
,
output
+=
1
)
{
if
(
IS_HELPER_NULL
(
pLeftCol
,
i
))
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
// TODO set null or ignore
}
*
output
=
getVectorBigintValueFnLeft
(
LEFT_COL
,
i
)
&
getVectorBigintValueFnRight
(
RIGHT_COL
,
0
);
...
...
@@ -1501,7 +1501,7 @@ void vectorBitAnd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut,
if
(
pLeft
->
numOfRows
==
pRight
->
numOfRows
)
{
for
(;
i
<
pRight
->
numOfRows
&&
i
>=
0
;
i
+=
step
,
output
+=
1
)
{
if
(
IS_NULL
)
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
// TODO set null or ignore
}
*
output
=
getVectorBigintValueFnLeft
(
LEFT_COL
,
i
)
&
getVectorBigintValueFnRight
(
RIGHT_COL
,
i
);
...
...
@@ -1529,7 +1529,7 @@ static void vectorBitOrHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRight
int64_t
rx
=
getVectorBigintValueFnRight
(
RIGHT_COL
,
0
);
for
(;
i
>=
0
&&
i
<
numOfRows
;
i
+=
step
,
output
+=
1
)
{
if
(
IS_HELPER_NULL
(
pLeftCol
,
i
))
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
// TODO set null or ignore
}
*
output
=
getVectorBigintValueFnLeft
(
LEFT_COL
,
i
)
|
rx
;
...
...
@@ -1555,7 +1555,7 @@ void vectorBitOr(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut,
if
(
pLeft
->
numOfRows
==
pRight
->
numOfRows
)
{
for
(;
i
<
pRight
->
numOfRows
&&
i
>=
0
;
i
+=
step
,
output
+=
1
)
{
if
(
IS_NULL
)
{
colData
Append
NULL
(
pOutputCol
,
i
);
colData
Set
NULL
(
pOutputCol
,
i
);
continue
;
// TODO set null or ignore
}
*
output
=
getVectorBigintValueFnLeft
(
LEFT_COL
,
i
)
|
getVectorBigintValueFnRight
(
RIGHT_COL
,
i
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录