Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
532e02fb
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,发现更多精彩内容 >>
提交
532e02fb
编写于
6月 05, 2023
作者:
D
dapan1121
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enh: improve filter performance
上级
ddd3a53e
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
25 addition
and
11 deletion
+25
-11
include/common/tdatablock.h
include/common/tdatablock.h
+1
-0
source/common/src/tdatablock.c
source/common/src/tdatablock.c
+23
-0
source/libs/executor/src/executorInt.c
source/libs/executor/src/executorInt.c
+1
-11
未找到文件。
include/common/tdatablock.h
浏览文件 @
532e02fb
...
@@ -178,6 +178,7 @@ int32_t getJsonValueLen(const char* data);
...
@@ -178,6 +178,7 @@ int32_t getJsonValueLen(const char* data);
int32_t
colDataSetVal
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
rowIndex
,
const
char
*
pData
,
bool
isNull
);
int32_t
colDataSetVal
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
rowIndex
,
const
char
*
pData
,
bool
isNull
);
int32_t
colDataAppend
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
rowIndex
,
const
char
*
pData
,
bool
isNull
);
int32_t
colDataAppend
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
rowIndex
,
const
char
*
pData
,
bool
isNull
);
int32_t
colDataReassignVal
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
dstRowIdx
,
uint32_t
srcRowIdx
,
const
char
*
pData
);
int32_t
colDataSetNItems
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
rowIndex
,
const
char
*
pData
,
uint32_t
numOfRows
,
bool
trimValue
);
int32_t
colDataSetNItems
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
rowIndex
,
const
char
*
pData
,
uint32_t
numOfRows
,
bool
trimValue
);
int32_t
colDataMergeCol
(
SColumnInfoData
*
pColumnInfoData
,
int32_t
numOfRow1
,
int32_t
*
capacity
,
int32_t
colDataMergeCol
(
SColumnInfoData
*
pColumnInfoData
,
int32_t
numOfRow1
,
int32_t
*
capacity
,
const
SColumnInfoData
*
pSource
,
int32_t
numOfRow2
);
const
SColumnInfoData
*
pSource
,
int32_t
numOfRow2
);
...
...
source/common/src/tdatablock.c
浏览文件 @
532e02fb
...
@@ -126,6 +126,29 @@ int32_t colDataSetVal(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const
...
@@ -126,6 +126,29 @@ int32_t colDataSetVal(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const
return
0
;
return
0
;
}
}
int32_t
colDataReassignVal
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
dstRowIdx
,
uint32_t
srcRowIdx
,
const
char
*
pData
)
{
int32_t
type
=
pColumnInfoData
->
info
.
type
;
if
(
IS_VAR_DATA_TYPE
(
type
))
{
int32_t
dataLen
=
0
;
if
(
type
==
TSDB_DATA_TYPE_JSON
)
{
dataLen
=
getJsonValueLen
(
pData
);
}
else
{
dataLen
=
varDataTLen
(
pData
);
}
SVarColAttr
*
pAttr
=
&
pColumnInfoData
->
varmeta
;
uint32_t
len
=
pColumnInfoData
->
varmeta
.
length
;
pColumnInfoData
->
varmeta
.
offset
[
dstRowIdx
]
=
pColumnInfoData
->
varmeta
.
offset
[
srcRowIdx
];
}
else
{
memcpy
(
pColumnInfoData
->
pData
+
pColumnInfoData
->
info
.
bytes
*
dstRowIdx
,
pData
,
pColumnInfoData
->
info
.
bytes
);
colDataClearNull_f
(
pColumnInfoData
->
nullbitmap
,
dstRowIdx
);
}
return
0
;
}
int32_t
colDataReserve
(
SColumnInfoData
*
pColumnInfoData
,
size_t
newSize
)
{
int32_t
colDataReserve
(
SColumnInfoData
*
pColumnInfoData
,
size_t
newSize
)
{
if
(
!
IS_VAR_DATA_TYPE
(
pColumnInfoData
->
info
.
type
))
{
if
(
!
IS_VAR_DATA_TYPE
(
pColumnInfoData
->
info
.
type
))
{
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
...
...
source/libs/executor/src/executorInt.c
浏览文件 @
532e02fb
...
@@ -573,18 +573,8 @@ void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const SColumnInfoD
...
@@ -573,18 +573,8 @@ void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const SColumnInfoD
if
(
colDataIsNull_var
(
pDst
,
j
))
{
if
(
colDataIsNull_var
(
pDst
,
j
))
{
colDataSetNull_var
(
pDst
,
numOfRows
);
colDataSetNull_var
(
pDst
,
numOfRows
);
}
else
{
}
else
{
// fix address sanitizer error. p1 may point to memory that will change during realloc of colDataSetVal, first copy it to p2
char
*
p1
=
colDataGetVarData
(
pDst
,
j
);
char
*
p1
=
colDataGetVarData
(
pDst
,
j
);
int32_t
len
=
0
;
colDataReassignVal
(
pDst
,
numOfRows
,
j
,
p1
);
if
(
pDst
->
info
.
type
==
TSDB_DATA_TYPE_JSON
)
{
len
=
getJsonValueLen
(
p1
);
}
else
{
len
=
varDataTLen
(
p1
);
}
char
*
p2
=
taosMemoryMalloc
(
len
);
memcpy
(
p2
,
p1
,
len
);
colDataSetVal
(
pDst
,
numOfRows
,
p2
,
false
);
taosMemoryFree
(
p2
);
}
}
numOfRows
+=
1
;
numOfRows
+=
1
;
j
+=
1
;
j
+=
1
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录