Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
de1848cb
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
de1848cb
编写于
5月 25, 2023
作者:
S
slzhou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enhance: use scalar mode to run ci test
上级
768372fc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
3 deletion
+18
-3
source/libs/function/src/udfd.c
source/libs/function/src/udfd.c
+1
-1
source/libs/scalar/src/filter.c
source/libs/scalar/src/filter.c
+1
-1
source/libs/scalar/src/sclvector.c
source/libs/scalar/src/sclvector.c
+16
-1
未找到文件。
source/libs/function/src/udfd.c
浏览文件 @
de1848cb
...
@@ -600,9 +600,9 @@ SUdf *udfdGetOrCreateUdf(const char *udfName) {
...
@@ -600,9 +600,9 @@ SUdf *udfdGetOrCreateUdf(const char *udfName) {
return
udf
;
return
udf
;
}
else
{
}
else
{
(
*
pUdfHash
)
->
expired
=
true
;
(
*
pUdfHash
)
->
expired
=
true
;
taosHashRemove
(
global
.
udfsHash
,
udfName
,
strlen
(
udfName
));
fnInfo
(
"udfd expired, check for new version. existing udf %s udf version %d, udf created time %"
PRIx64
,
fnInfo
(
"udfd expired, check for new version. existing udf %s udf version %d, udf created time %"
PRIx64
,
(
*
pUdfHash
)
->
name
,
(
*
pUdfHash
)
->
version
,
(
*
pUdfHash
)
->
createdTime
);
(
*
pUdfHash
)
->
name
,
(
*
pUdfHash
)
->
version
,
(
*
pUdfHash
)
->
createdTime
);
taosHashRemove
(
global
.
udfsHash
,
udfName
,
strlen
(
udfName
));
}
}
}
}
...
...
source/libs/scalar/src/filter.c
浏览文件 @
de1848cb
...
@@ -4556,7 +4556,7 @@ int32_t filterInitFromNode(SNode *pNode, SFilterInfo **pInfo, uint32_t options)
...
@@ -4556,7 +4556,7 @@ int32_t filterInitFromNode(SNode *pNode, SFilterInfo **pInfo, uint32_t options)
FLT_ERR_JRET
(
fltReviseNodes
(
info
,
&
pNode
,
&
stat
));
FLT_ERR_JRET
(
fltReviseNodes
(
info
,
&
pNode
,
&
stat
));
info
->
scalarMode
=
stat
.
scalarMod
e
;
info
->
scalarMode
=
tru
e
;
fltDebug
(
"scalar mode: %d"
,
info
->
scalarMode
);
fltDebug
(
"scalar mode: %d"
,
info
->
scalarMode
);
if
(
!
info
->
scalarMode
)
{
if
(
!
info
->
scalarMode
)
{
...
...
source/libs/scalar/src/sclvector.c
浏览文件 @
de1848cb
...
@@ -1784,6 +1784,9 @@ void vectorNotMatch(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOu
...
@@ -1784,6 +1784,9 @@ void vectorNotMatch(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOu
void
vectorIsNull
(
SScalarParam
*
pLeft
,
SScalarParam
*
pRight
,
SScalarParam
*
pOut
,
int32_t
_ord
)
{
void
vectorIsNull
(
SScalarParam
*
pLeft
,
SScalarParam
*
pRight
,
SScalarParam
*
pOut
,
int32_t
_ord
)
{
for
(
int32_t
i
=
0
;
i
<
pLeft
->
numOfRows
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
pLeft
->
numOfRows
;
++
i
)
{
int8_t
v
=
IS_HELPER_NULL
(
pLeft
->
columnData
,
i
)
?
1
:
0
;
int8_t
v
=
IS_HELPER_NULL
(
pLeft
->
columnData
,
i
)
?
1
:
0
;
if
(
v
)
{
++
pOut
->
numOfQualified
;
}
colDataSetInt8
(
pOut
->
columnData
,
i
,
&
v
);
colDataSetInt8
(
pOut
->
columnData
,
i
,
&
v
);
}
}
pOut
->
numOfRows
=
pLeft
->
numOfRows
;
pOut
->
numOfRows
=
pLeft
->
numOfRows
;
...
@@ -1792,6 +1795,9 @@ void vectorIsNull(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut,
...
@@ -1792,6 +1795,9 @@ void vectorIsNull(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut,
void
vectorNotNull
(
SScalarParam
*
pLeft
,
SScalarParam
*
pRight
,
SScalarParam
*
pOut
,
int32_t
_ord
)
{
void
vectorNotNull
(
SScalarParam
*
pLeft
,
SScalarParam
*
pRight
,
SScalarParam
*
pOut
,
int32_t
_ord
)
{
for
(
int32_t
i
=
0
;
i
<
pLeft
->
numOfRows
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
pLeft
->
numOfRows
;
++
i
)
{
int8_t
v
=
IS_HELPER_NULL
(
pLeft
->
columnData
,
i
)
?
0
:
1
;
int8_t
v
=
IS_HELPER_NULL
(
pLeft
->
columnData
,
i
)
?
0
:
1
;
if
(
v
)
{
++
pOut
->
numOfQualified
;
}
colDataSetInt8
(
pOut
->
columnData
,
i
,
&
v
);
colDataSetInt8
(
pOut
->
columnData
,
i
,
&
v
);
}
}
pOut
->
numOfRows
=
pLeft
->
numOfRows
;
pOut
->
numOfRows
=
pLeft
->
numOfRows
;
...
@@ -1805,6 +1811,13 @@ void vectorIsTrue(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut,
...
@@ -1805,6 +1811,13 @@ void vectorIsTrue(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut,
colDataSetInt8
(
pOut
->
columnData
,
i
,
&
v
);
colDataSetInt8
(
pOut
->
columnData
,
i
,
&
v
);
colDataClearNull_f
(
pOut
->
columnData
->
nullbitmap
,
i
);
colDataClearNull_f
(
pOut
->
columnData
->
nullbitmap
,
i
);
}
}
{
bool
v
=
false
;
GET_TYPED_DATA
(
v
,
bool
,
pOut
->
columnData
->
info
.
type
,
colDataGetData
(
pOut
->
columnData
,
i
));
if
(
v
)
{
++
pOut
->
numOfQualified
;
}
}
}
}
pOut
->
columnData
->
hasNull
=
false
;
pOut
->
columnData
->
hasNull
=
false
;
}
}
...
@@ -1844,7 +1857,9 @@ void vectorJsonContains(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam
...
@@ -1844,7 +1857,9 @@ void vectorJsonContains(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam
char
*
pLeftData
=
colDataGetVarData
(
pLeft
->
columnData
,
i
);
char
*
pLeftData
=
colDataGetVarData
(
pLeft
->
columnData
,
i
);
getJsonValue
(
pLeftData
,
jsonKey
,
&
isExist
);
getJsonValue
(
pLeftData
,
jsonKey
,
&
isExist
);
}
}
if
(
isExist
)
{
++
pOut
->
numOfQualified
;
}
colDataSetVal
(
pOutputCol
,
i
,
(
const
char
*
)(
&
isExist
),
false
);
colDataSetVal
(
pOutputCol
,
i
,
(
const
char
*
)(
&
isExist
),
false
);
}
}
taosMemoryFree
(
jsonKey
);
taosMemoryFree
(
jsonKey
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录