Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
74223b34
TDengine
项目概览
taosdata
/
TDengine
12 个月 前同步成功
通知
1180
Star
22014
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
74223b34
编写于
11月 11, 2022
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
more optimize
上级
057af11a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
187 addition
and
18 deletion
+187
-18
source/dnode/vnode/src/tsdb/tsdbUtil.c
source/dnode/vnode/src/tsdb/tsdbUtil.c
+187
-18
未找到文件。
source/dnode/vnode/src/tsdb/tsdbUtil.c
浏览文件 @
74223b34
...
...
@@ -1015,6 +1015,182 @@ _err:
return
code
;
}
static
int32_t
tBlockDataAppendBlockRow
(
SBlockData
*
pBlockData
,
SBlockData
*
pBlockDataFrom
,
int32_t
iRow
)
{
int32_t
code
=
0
;
SColVal
cv
=
{
0
};
int32_t
iColDataFrom
=
0
;
SColData
*
pColDataFrom
=
(
iColDataFrom
<
pBlockDataFrom
->
nColData
)
?
&
((
SColData
*
)
pBlockDataFrom
->
aColData
->
pData
)[
iColDataFrom
]
:
NULL
;
for
(
int32_t
iColDataTo
=
0
;
iColDataTo
<
pBlockData
->
nColData
;
iColDataTo
++
)
{
SColData
*
pColDataTo
=
&
((
SColData
*
)
pBlockData
->
aColData
->
pData
)[
iColDataTo
];
while
(
pColDataFrom
&&
pColDataFrom
->
cid
<
pColDataTo
->
cid
)
{
iColDataFrom
++
;
pColDataFrom
=
(
iColDataFrom
<
pBlockDataFrom
->
nColData
)
?
&
((
SColData
*
)
pBlockDataFrom
->
aColData
->
pData
)[
iColDataFrom
]
:
NULL
;
}
if
(
pColDataFrom
==
NULL
||
pColDataFrom
->
cid
>
pColDataTo
->
cid
)
{
code
=
tColDataAppendValue
(
pColDataTo
,
&
COL_VAL_NONE
(
pColDataTo
->
cid
,
pColDataTo
->
type
));
if
(
code
)
goto
_exit
;
}
else
{
tColDataGetValue
(
pColDataFrom
,
iRow
,
&
cv
);
code
=
tColDataAppendValue
(
pColDataTo
,
&
cv
);
if
(
code
)
goto
_exit
;
iColDataFrom
++
;
pColDataFrom
=
(
iColDataFrom
<
pBlockDataFrom
->
nColData
)
?
&
((
SColData
*
)
pBlockDataFrom
->
aColData
->
pData
)[
iColDataFrom
]
:
NULL
;
}
}
_exit:
return
code
;
}
static
int32_t
tBlockDataAppendTPRow
(
SBlockData
*
pBlockData
,
STSRow
*
pRow
,
STSchema
*
pTSchema
)
{
int32_t
code
=
0
;
int32_t
iTColumn
=
1
;
STColumn
*
pTColumn
=
(
iTColumn
<
pTSchema
->
numOfCols
)
?
&
pTSchema
->
columns
[
iTColumn
]
:
NULL
;
for
(
int32_t
iColData
=
0
;
iColData
<
pBlockData
->
nColData
;
iColData
++
)
{
SColData
*
pColData
=
&
((
SColData
*
)
pBlockData
->
aColData
->
pData
)[
iColData
];
while
(
pTColumn
&&
pTColumn
->
colId
<
pColData
->
cid
)
{
iTColumn
++
;
pTColumn
=
(
iTColumn
<
pTSchema
->
numOfCols
)
?
&
pTSchema
->
columns
[
iTColumn
]
:
NULL
;
}
if
(
pTColumn
==
NULL
||
pTColumn
->
colId
>
pColData
->
cid
)
{
code
=
tColDataAppendValue
(
pColData
,
&
COL_VAL_NONE
(
pColData
->
cid
,
pColData
->
type
));
if
(
code
)
goto
_exit
;
}
else
{
ASSERT
(
pTColumn
->
type
==
pColData
->
type
);
SColVal
cv
=
{.
cid
=
pTColumn
->
colId
,
.
type
=
pTColumn
->
type
};
if
(
pRow
->
statis
)
{
TDRowValT
vt
;
tdGetBitmapValTypeII
(
tdGetBitmapAddrTp
(
pRow
,
pTSchema
->
flen
),
iTColumn
-
1
,
&
vt
);
if
(
vt
==
TD_VTYPE_NORM
)
{
cv
.
flag
=
CV_FLAG_VALUE
;
if
(
IS_VAR_DATA_TYPE
(
pTColumn
->
type
))
{
void
*
pData
=
pRow
->
data
+
*
(
int32_t
*
)(
pRow
->
data
+
pTColumn
->
offset
-
sizeof
(
TSKEY
));
cv
.
value
.
nData
=
varDataLen
(
pData
);
cv
.
value
.
pData
=
varDataVal
(
pData
);
}
else
{
memcpy
(
&
cv
.
value
.
val
,
pRow
->
data
+
pTColumn
->
offset
-
sizeof
(
TSKEY
),
pTColumn
->
bytes
);
}
code
=
tColDataAppendValue
(
pColData
,
&
cv
);
if
(
code
)
goto
_exit
;
}
else
if
(
vt
==
TD_VTYPE_NONE
)
{
code
=
tColDataAppendValue
(
pColData
,
&
COL_VAL_NONE
(
pColData
->
cid
,
pColData
->
type
));
if
(
code
)
goto
_exit
;
}
else
if
(
vt
==
TD_VTYPE_NULL
)
{
code
=
tColDataAppendValue
(
pColData
,
&
COL_VAL_NULL
(
pColData
->
cid
,
pColData
->
type
));
if
(
code
)
goto
_exit
;
}
else
{
ASSERT
(
0
);
}
}
else
{
cv
.
flag
=
CV_FLAG_VALUE
;
if
(
IS_VAR_DATA_TYPE
(
pTColumn
->
type
))
{
void
*
pData
=
pRow
->
data
+
*
(
int32_t
*
)(
pRow
->
data
+
pTColumn
->
offset
-
sizeof
(
TSKEY
));
cv
.
value
.
nData
=
varDataLen
(
pData
);
cv
.
value
.
pData
=
varDataVal
(
pData
);
}
else
{
memcpy
(
&
cv
.
value
.
val
,
pRow
->
data
+
pTColumn
->
offset
-
sizeof
(
TSKEY
),
pTColumn
->
bytes
);
}
code
=
tColDataAppendValue
(
pColData
,
&
cv
);
if
(
code
)
goto
_exit
;
}
iTColumn
++
;
pTColumn
=
(
iTColumn
<
pTSchema
->
numOfCols
)
?
&
pTSchema
->
columns
[
iTColumn
]
:
NULL
;
}
}
_exit:
return
code
;
}
static
int32_t
tBlockDataAppendKVRow
(
SBlockData
*
pBlockData
,
STSRow
*
pRow
,
STSchema
*
pTSchema
)
{
int32_t
code
=
0
;
int32_t
iTColumn
=
1
;
STColumn
*
pTColumn
=
(
iTColumn
<
pTSchema
->
numOfCols
)
?
&
pTSchema
->
columns
[
iTColumn
]
:
NULL
;
for
(
int32_t
iColData
=
0
;
iColData
<
pBlockData
->
nColData
;
iColData
++
)
{
SColData
*
pColData
=
&
((
SColData
*
)
pBlockData
->
aColData
->
pData
)[
iColData
];
while
(
pTColumn
&&
pTColumn
->
colId
<
pColData
->
cid
)
{
iTColumn
++
;
pTColumn
=
(
iTColumn
<
pTSchema
->
numOfCols
)
?
&
pTSchema
->
columns
[
iTColumn
]
:
NULL
;
}
if
(
pTColumn
==
NULL
||
pTColumn
->
colId
>
pColData
->
cid
)
{
code
=
tColDataAppendValue
(
pColData
,
&
COL_VAL_NONE
(
pColData
->
cid
,
pColData
->
type
));
if
(
code
)
goto
_exit
;
}
else
{
ASSERT
(
pTColumn
->
type
==
pColData
->
type
);
// SColVal cv = {.cid = pTColumn->colId, .type = pTColumn->type};
// if (pRow->statis) {
// TDRowValT vt;
// tdGetBitmapValTypeII(tdGetBitmapAddrTp(pRow, pTSchema->flen), iTColumn - 1, &vt);
// if (vt == TD_VTYPE_NORM) {
// cv.flag = CV_FLAG_VALUE;
// if (IS_VAR_DATA_TYPE(pTColumn->type)) {
// void *pData = pRow->data + *(int32_t *)(pRow->data + pTColumn->offset);
// cv.value.nData = varDataLen(pData);
// cv.value.pData = varDataVal(pData);
// } else {
// memcpy(&cv.value.val, pRow->data + pTColumn->offset, pTColumn->bytes);
// }
// code = tColDataAppendValue(pColData, &cv);
// if (code) goto _exit;
// } else if (vt == TD_VTYPE_NONE) {
// code = tColDataAppendValue(pColData, &COL_VAL_NONE(pColData->cid, pColData->type));
// if (code) goto _exit;
// } else if (vt == TD_VTYPE_NULL) {
// code = tColDataAppendValue(pColData, &COL_VAL_NULL(pColData->cid, pColData->type));
// if (code) goto _exit;
// } else {
// ASSERT(0);
// }
// } else {
// cv.flag = CV_FLAG_VALUE;
// if (IS_VAR_DATA_TYPE(pTColumn->type)) {
// void *pData = pRow->data + *(int32_t *)(pRow->data + pTColumn->offset);
// cv.value.nData = varDataLen(pData);
// cv.value.pData = varDataVal(pData);
// } else {
// memcpy(&cv.value.val, pRow->data + pTColumn->offset, pT
// }
// }
}
}
_exit:
return
code
;
}
int32_t
tBlockDataAppendRow
(
SBlockData
*
pBlockData
,
TSDBROW
*
pRow
,
STSchema
*
pTSchema
,
int64_t
uid
)
{
int32_t
code
=
0
;
...
...
@@ -1036,27 +1212,20 @@ int32_t tBlockDataAppendRow(SBlockData *pBlockData, TSDBROW *pRow, STSchema *pTS
if
(
code
)
goto
_err
;
pBlockData
->
aTSKEY
[
pBlockData
->
nRow
]
=
TSDBROW_TS
(
pRow
);
// OTHER
SRowIter
rIter
=
{
0
};
SColVal
*
pColVal
;
tRowIterInit
(
&
rIter
,
pRow
,
pTSchema
);
pColVal
=
tRowIterNext
(
&
rIter
);
for
(
int32_t
iColData
=
0
;
iColData
<
pBlockData
->
nColData
;
iColData
++
)
{
SColData
*
pColData
=
&
((
SColData
*
)
pBlockData
->
aColData
->
pData
)[
iColData
];
while
(
pColVal
&&
pColVal
->
cid
<
pColData
->
cid
)
{
pColVal
=
tRowIterNext
(
&
rIter
);
}
if
(
pColVal
==
NULL
||
pColVal
->
cid
>
pColData
->
cid
)
{
code
=
tColDataAppendValue
(
pColData
,
&
COL_VAL_NONE
(
pColData
->
cid
,
pColData
->
type
));
SColVal
cv
=
{
0
};
if
(
pRow
->
type
==
0
)
{
if
(
TD_IS_TP_ROW
(
pRow
->
pTSRow
))
{
code
=
tBlockDataAppendTPRow
(
pBlockData
,
pRow
->
pTSRow
,
pTSchema
);
if
(
code
)
goto
_err
;
}
else
{
code
=
t
ColDataAppendValue
(
pColData
,
pColVal
);
}
else
if
(
TD_IS_KV_ROW
(
pRow
->
pTSRow
))
{
code
=
t
BlockDataAppendKVRow
(
pBlockData
,
pRow
->
pTSRow
,
pTSchema
);
if
(
code
)
goto
_err
;
pColVal
=
tRowIterNext
(
&
rIter
);
}
else
{
ASSERT
(
0
);
}
}
else
{
code
=
tBlockDataAppendBlockRow
(
pBlockData
,
pRow
->
pBlockData
,
pRow
->
iRow
);
if
(
code
)
goto
_err
;
}
pBlockData
->
nRow
++
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录