Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
41459a92
T
TDengine
项目概览
taosdata
/
TDengine
11 个月 前同步成功
通知
1178
Star
22014
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,体验更适合开发者的 AI 搜索 >>
提交
41459a92
编写于
5月 29, 2023
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
more code
上级
6aac0e0c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
110 addition
and
20 deletion
+110
-20
source/dnode/vnode/src/inc/tsdb.h
source/dnode/vnode/src/inc/tsdb.h
+3
-4
source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h
source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h
+4
-3
source/dnode/vnode/src/tsdb/dev/tsdbDataFileRW.c
source/dnode/vnode/src/tsdb/dev/tsdbDataFileRW.c
+103
-13
未找到文件。
source/dnode/vnode/src/inc/tsdb.h
浏览文件 @
41459a92
...
...
@@ -76,9 +76,8 @@ typedef struct STsdbFilterInfo STsdbFilterInfo;
#define TSDBROW_ROW_FMT ((int8_t)0x0)
#define TSDBROW_COL_FMT ((int8_t)0x1)
#define TSDB_FILE_DLMT ((uint32_t)0xF00AFA0F)
#define TSDB_MAX_SUBBLOCKS 8
#define TSDB_FHDR_SIZE 512
#define TSDB_FILE_DLMT ((uint32_t)0xF00AFA0F)
#define TSDB_FHDR_SIZE 512
#define VERSION_MIN 0
#define VERSION_MAX INT64_MAX
...
...
@@ -498,7 +497,7 @@ struct SDataBlk {
int32_t
nRow
;
int8_t
hasDup
;
int8_t
nSubBlock
;
SBlockInfo
aSubBlock
[
TSDB_MAX_SUBBLOCKS
];
SBlockInfo
aSubBlock
[
1
];
SSmaInfo
smaInfo
;
};
...
...
source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h
浏览文件 @
41459a92
...
...
@@ -47,13 +47,14 @@ int32_t tsdbDataFileReadDelData(SDataFileReader *reader, const SDelBlk *delBlk,
// SDataFileWriter =============================================
typedef
struct
SDataFileWriter
SDataFileWriter
;
typedef
struct
SDataFileWriterConfig
{
STsdb
*
tsdb
;
STFile
f
[
TSDB_FTYPE_MAX
];
STsdb
*
tsdb
;
STFile
f
[
TSDB_FTYPE_MAX
];
int32_t
maxRow
;
}
SDataFileWriterConfig
;
int32_t
tsdbDataFileWriterOpen
(
const
SDataFileWriterConfig
*
config
,
SDataFileWriter
**
writer
);
int32_t
tsdbDataFileWriterClose
(
SDataFileWriter
**
writer
,
bool
abort
,
STFileOp
op
[
/*TSDB_FTYPE_MAX*/
]);
int32_t
tsdbDataFileWriteTSData
(
SDataFileWriter
*
writer
,
SBlockData
*
bData
);
int32_t
tsdbDataFileWriteTSData
Block
(
SDataFileWriter
*
writer
,
SBlockData
*
bData
);
#ifdef __cplusplus
}
...
...
source/dnode/vnode/src/tsdb/dev/tsdbDataFileRW.c
浏览文件 @
41459a92
...
...
@@ -76,16 +76,21 @@ int32_t tsdbDataFileReadDataBlk(SDataFileReader *reader, const SBlockIdx *blockI
return
0
;
}
int32_t
tsdbDataFileReadDataBlock
(
SDataFileReader
*
reader
,
const
SDataBlk
*
dataBlk
,
SBlockData
*
bData
)
{
// TODO
return
0
;
}
// SDataFileWriter =============================================
struct
SDataFileWriter
{
SDataFileWriterConfig
config
[
1
];
struct
{
bool
opened
;
bool
tbHasOldData
;
SDataFileReader
*
reader
;
const
TBlockIdxArray
*
blockIdxArray
;
int32_t
blockIdxArrayIdx
;
bool
tbHasOldData
;
TABLEID
tbid
[
1
];
const
TDataBlkArray
*
dataBlkArray
;
int32_t
dataBlkArrayIdx
;
...
...
@@ -244,6 +249,29 @@ static int32_t tsdbDataFileWriteDataBlk(SDataFileWriter *writer, const TDataBlkA
code
=
TARRAY2_APPEND_PTR
(
writer
->
blockIdxArray
,
blockIdx
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
_exit:
if
(
code
)
{
TSDB_ERROR_LOG
(
vid
,
lino
,
code
);
}
return
code
;
}
static
int32_t
tsdbDataFileDoWriteTSRow
(
SDataFileWriter
*
writer
,
TSDBROW
*
row
)
{
int32_t
code
=
0
;
int32_t
lino
=
0
;
int32_t
vid
=
TD_VID
(
writer
->
config
->
tsdb
->
pVnode
);
if
(
row
->
type
==
TSDBROW_ROW_FMT
)
{
// TODO: udpate row schema
}
code
=
tBlockDataAppendRow
(
writer
->
ctx
->
bData
,
row
,
NULL
/* TODO */
,
writer
->
ctx
->
tbid
->
uid
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
if
(
writer
->
ctx
->
bData
->
nRow
>=
writer
->
config
->
maxRow
)
{
code
=
tsdbDataFileWriteBlockData
(
writer
,
writer
->
bData
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
}
_exit:
if
(
code
)
{
TSDB_ERROR_LOG
(
vid
,
lino
,
code
);
...
...
@@ -261,7 +289,7 @@ static int32_t tsdbDataFileWriteTableDataEnd(SDataFileWriter *writer) {
for
(;
writer
->
ctx
->
iRow
<
writer
->
ctx
->
bData
->
nRow
;
writer
->
ctx
->
iRow
++
)
{
TSDBROW
row
[
1
]
=
{
tsdbRowFromBlockData
(
writer
->
ctx
->
bData
,
writer
->
ctx
->
iRow
)};
code
=
t
BlockDataAppendRow
(
writer
->
bData
,
row
,
NULL
,
writer
->
ctx
->
tbid
->
uid
);
code
=
t
sdbDataFileDoWriteTSRow
(
writer
,
row
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
}
...
...
@@ -292,6 +320,8 @@ static int32_t tsdbDataFileWriteTableDataBegin(SDataFileWriter *writer, const TA
int32_t
lino
=
0
;
int32_t
vid
=
TD_VID
(
writer
->
config
->
tsdb
->
pVnode
);
writer
->
ctx
->
tbHasOldData
=
false
;
for
(;
writer
->
ctx
->
blockIdxArrayIdx
<
TARRAY2_SIZE
(
writer
->
ctx
->
blockIdxArray
);
writer
->
ctx
->
blockIdxArrayIdx
++
)
{
const
SBlockIdx
*
blockIdx
=
TARRAY2_GET_PTR
(
writer
->
ctx
->
blockIdxArray
,
writer
->
ctx
->
blockIdxArrayIdx
);
...
...
@@ -314,12 +344,14 @@ static int32_t tsdbDataFileWriteTableDataBegin(SDataFileWriter *writer, const TA
code
=
tsdbDataFileReadDataBlk
(
writer
->
ctx
->
reader
,
blockIdx
,
&
writer
->
ctx
->
dataBlkArray
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
writer
->
ctx
->
dataBlkArrayIdx
=
0
;
}
else
{
writer
->
ctx
->
tbHasOldData
=
false
;
tBlockDataReset
(
writer
->
ctx
->
bData
);
writer
->
ctx
->
iRow
=
0
;
writer
->
ctx
->
blockIdxArrayIdx
++
;
}
break
;
}
}
writer
->
ctx
->
tbid
[
0
]
=
tbid
[
0
];
_exit:
...
...
@@ -328,19 +360,77 @@ _exit:
}
return
code
;
}
static
int32_t
tsdbDataFileDoWriteTableData
(
SDataFileWriter
*
writer
,
SBlockData
*
bData
)
{
static
int32_t
tsdbDataFileDoWriteTableData
Row
(
SDataFileWriter
*
writer
,
TSDBROW
*
row
)
{
int32_t
code
=
0
;
int32_t
lino
=
0
;
int32_t
vid
=
TD_VID
(
writer
->
config
->
tsdb
->
pVnode
);
if
(
writer
->
ctx
->
tbHasOldData
)
{
if
(
writer
->
ctx
->
dataBlkArrayIdx
>=
TARRAY2_SIZE
(
writer
->
ctx
->
dataBlkArray
))
{
// TODO
while
(
writer
->
ctx
->
tbHasOldData
)
{
for
(;
writer
->
ctx
->
iRow
<
writer
->
ctx
->
bData
->
nRow
;
writer
->
ctx
->
iRow
++
)
{
TSDBROW
row1
[
1
]
=
{
tsdbRowFromBlockData
(
writer
->
ctx
->
bData
,
writer
->
ctx
->
iRow
)};
int32_t
c
=
tsdbRowCmprFn
(
row
,
row1
);
ASSERT
(
c
);
if
(
row
>
0
)
{
code
=
tsdbDataFileDoWriteTSRow
(
writer
,
row1
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
}
else
{
goto
_write_row
;
}
}
// TODO
for
(;
writer
->
ctx
->
dataBlkArrayIdx
<
TARRAY2_SIZE
(
writer
->
ctx
->
dataBlkArray
);
writer
->
ctx
->
dataBlkArrayIdx
++
)
{
const
SDataBlk
*
dataBlk
=
TARRAY2_GET_PTR
(
writer
->
ctx
->
dataBlkArray
,
writer
->
ctx
->
dataBlkArrayIdx
);
SDataBlk
dataBlk1
[
1
]
=
{{.
minKey
=
{},
.
maxKey
=
{}}};
// TODO
int32_t
c
=
tDataBlkCmprFn
(
dataBlk
,
dataBlk1
);
if
(
c
<
0
)
{
code
=
tsdbDataFileWriteBlockData
(
writer
,
writer
->
bData
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
code
=
TARRAY2_APPEND_PTR
(
writer
->
dataBlkArray
,
dataBlk
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
}
else
if
(
c
>
0
)
{
goto
_write_row
;
}
else
{
code
=
tsdbDataFileReadDataBlock
(
writer
->
ctx
->
reader
,
dataBlk
,
writer
->
ctx
->
bData
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
writer
->
ctx
->
iRow
=
0
;
writer
->
ctx
->
dataBlkArrayIdx
++
;
break
;
}
}
if
(
writer
->
ctx
->
dataBlkArrayIdx
>=
TARRAY2_SIZE
(
writer
->
ctx
->
dataBlkArray
)
//
&&
writer
->
ctx
->
iRow
>=
writer
->
ctx
->
bData
->
nRow
)
{
writer
->
ctx
->
tbHasOldData
=
false
;
}
}
_write_row:
code
=
tsdbDataFileDoWriteTSRow
(
writer
,
row
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
_exit:
if
(
code
)
{
TSDB_ERROR_LOG
(
vid
,
lino
,
code
);
}
return
code
;
}
static
int32_t
tsdbDataFileDoWriteTableDataBlock
(
SDataFileWriter
*
writer
,
SBlockData
*
bData
)
{
int32_t
code
=
0
;
int32_t
lino
=
0
;
int32_t
vid
=
TD_VID
(
writer
->
config
->
tsdb
->
pVnode
);
if
(
!
writer
->
ctx
->
tbHasOldData
&&
writer
->
bData
->
nRow
==
0
)
{
code
=
tsdbDataFileWriteBlockData
(
writer
,
bData
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
}
else
{
// code = tsdbDataFileWriteBlockData(writer, bData);
// TSDB_CHECK_CODE(code, lino, _exit);
for
(
int32_t
i
=
0
;
i
<
bData
->
nRow
;
i
++
)
{
TSDBROW
row
[
1
]
=
{
tsdbRowFromBlockData
(
bData
,
i
)};
code
=
tsdbDataFileDoWriteTableDataRow
(
writer
,
row
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
}
}
_exit:
...
...
@@ -349,7 +439,7 @@ _exit:
}
return
code
;
}
int32_t
tsdbDataFileWriteTSData
(
SDataFileWriter
*
writer
,
SBlockData
*
bData
)
{
int32_t
tsdbDataFileWriteTSData
Block
(
SDataFileWriter
*
writer
,
SBlockData
*
bData
)
{
int32_t
code
=
0
;
int32_t
lino
=
0
;
int32_t
vid
=
TD_VID
(
writer
->
config
->
tsdb
->
pVnode
);
...
...
@@ -369,7 +459,7 @@ int32_t tsdbDataFileWriteTSData(SDataFileWriter *writer, SBlockData *bData) {
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
}
code
=
tsdbDataFileDoWriteTableData
(
writer
,
bData
);
code
=
tsdbDataFileDoWriteTableData
Block
(
writer
,
bData
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
_exit:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录