Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
eb888684
TDengine
项目概览
taosdata
/
TDengine
11 个月 前同步成功
通知
1178
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,体验更适合开发者的 AI 搜索 >>
提交
eb888684
编写于
7月 04, 2022
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
more refact
上级
2e062dc9
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
84 addition
and
79 deletion
+84
-79
source/dnode/vnode/inc/vnode.h
source/dnode/vnode/inc/vnode.h
+13
-13
source/dnode/vnode/src/inc/vnodeInt.h
source/dnode/vnode/src/inc/vnodeInt.h
+17
-17
source/dnode/vnode/src/meta/metaSnapshot.c
source/dnode/vnode/src/meta/metaSnapshot.c
+8
-8
source/dnode/vnode/src/tsdb/tsdbSnapshot.c
source/dnode/vnode/src/tsdb/tsdbSnapshot.c
+15
-10
source/dnode/vnode/src/vnd/vnodeSnapshot.c
source/dnode/vnode/src/vnd/vnodeSnapshot.c
+31
-31
未找到文件。
source/dnode/vnode/inc/vnode.h
浏览文件 @
eb888684
...
...
@@ -39,11 +39,11 @@ extern "C" {
#endif
// vnode
typedef
struct
SVnode
SVnode
;
typedef
struct
STsdbCfg
STsdbCfg
;
// todo: remove
typedef
struct
SVnodeCfg
SVnodeCfg
;
typedef
struct
SVSnap
shotReader
SVSnapshot
Reader
;
typedef
struct
SVSnap
shotWriter
SVSnapshot
Writer
;
typedef
struct
SVnode
SVnode
;
typedef
struct
STsdbCfg
STsdbCfg
;
// todo: remove
typedef
struct
SVnodeCfg
SVnodeCfg
;
typedef
struct
SVSnap
Reader
SVSnap
Reader
;
typedef
struct
SVSnap
Writer
SVSnap
Writer
;
extern
const
SVnodeCfg
vnodeCfgDefault
;
...
...
@@ -157,14 +157,14 @@ int32_t tqRetrieveDataBlock(SSDataBlock *pBlock, SStreamReader *pHandle);
// sma
int32_t
smaGetTSmaDays
(
SVnodeCfg
*
pCfg
,
void
*
pCont
,
uint32_t
contLen
,
int32_t
*
days
);
// SVSnap
shot
Reader
int32_t
vnodeSnap
shotReaderOpen
(
SVnode
*
pVnode
,
SVSnapshot
Reader
**
ppReader
,
int64_t
sver
,
int64_t
ever
);
int32_t
vnodeSnap
shotReaderClose
(
SVSnapshot
Reader
*
pReader
);
int32_t
vnodeSnap
shotRead
(
SVSnapshot
Reader
*
pReader
,
const
void
**
ppData
,
uint32_t
*
nData
);
// SVSnap
shot
Writer;
int32_t
vnodeSnapshotWriterOpen
(
SVnode
*
pVnode
,
int64_t
sver
,
int64_t
ever
,
SVSnap
shot
Writer
**
ppWriter
);
int32_t
vnodeSnapshotWrite
(
SVSnap
shot
Writer
*
pWriter
,
uint8_t
*
pData
,
uint32_t
nData
);
int32_t
vnodeSnapshotWriterClose
(
SVSnap
shot
Writer
*
pWriter
,
int8_t
rollback
);
// SVSnapReader
int32_t
vnodeSnap
ReaderOpen
(
SVnode
*
pVnode
,
SVSnap
Reader
**
ppReader
,
int64_t
sver
,
int64_t
ever
);
int32_t
vnodeSnap
ReaderClose
(
SVSnap
Reader
*
pReader
);
int32_t
vnodeSnap
Read
(
SVSnap
Reader
*
pReader
,
const
void
**
ppData
,
uint32_t
*
nData
);
// SVSnapWriter;
int32_t
vnodeSnapshotWriterOpen
(
SVnode
*
pVnode
,
int64_t
sver
,
int64_t
ever
,
SVSnapWriter
**
ppWriter
);
int32_t
vnodeSnapshotWrite
(
SVSnapWriter
*
pWriter
,
uint8_t
*
pData
,
uint32_t
nData
);
int32_t
vnodeSnapshotWriterClose
(
SVSnapWriter
*
pWriter
,
int8_t
rollback
);
// structs
struct
STsdbCfg
{
...
...
source/dnode/vnode/src/inc/vnodeInt.h
浏览文件 @
eb888684
...
...
@@ -49,17 +49,17 @@
extern
"C"
{
#endif
typedef
struct
SVnodeInfo
SVnodeInfo
;
typedef
struct
SMeta
SMeta
;
typedef
struct
SSma
SSma
;
typedef
struct
STsdb
STsdb
;
typedef
struct
STQ
STQ
;
typedef
struct
SVState
SVState
;
typedef
struct
SVBufPool
SVBufPool
;
typedef
struct
SQWorker
SQHandle
;
typedef
struct
STsdbKeepCfg
STsdbKeepCfg
;
typedef
struct
SMetaSnap
shotReader
SMetaSnapshot
Reader
;
typedef
struct
STsdbSnap
shotReader
STsdbSnapshot
Reader
;
typedef
struct
SVnodeInfo
SVnodeInfo
;
typedef
struct
SMeta
SMeta
;
typedef
struct
SSma
SSma
;
typedef
struct
STsdb
STsdb
;
typedef
struct
STQ
STQ
;
typedef
struct
SVState
SVState
;
typedef
struct
SVBufPool
SVBufPool
;
typedef
struct
SQWorker
SQHandle
;
typedef
struct
STsdbKeepCfg
STsdbKeepCfg
;
typedef
struct
SMetaSnap
Reader
SMetaSnap
Reader
;
typedef
struct
STsdbSnap
Reader
STsdbSnap
Reader
;
#define VNODE_META_DIR "meta"
#define VNODE_TSDB_DIR "tsdb"
...
...
@@ -108,9 +108,9 @@ STSma* metaGetSmaInfoByIndex(SMeta* pMeta, int64_t indexUid);
STSmaWrapper
*
metaGetSmaInfoByTable
(
SMeta
*
pMeta
,
tb_uid_t
uid
,
bool
deepCopy
);
SArray
*
metaGetSmaIdsByTable
(
SMeta
*
pMeta
,
tb_uid_t
uid
);
SArray
*
metaGetSmaTbUids
(
SMeta
*
pMeta
);
int32_t
metaSnap
shotReaderOpen
(
SMeta
*
pMeta
,
SMetaSnapshot
Reader
**
ppReader
,
int64_t
sver
,
int64_t
ever
);
int32_t
metaSnap
shotReaderClose
(
SMetaSnapshot
Reader
*
pReader
);
int32_t
metaSnap
shotRead
(
SMetaSnapshot
Reader
*
pReader
,
void
**
ppData
,
uint32_t
*
nData
);
int32_t
metaSnap
ReaderOpen
(
SMeta
*
pMeta
,
SMetaSnap
Reader
**
ppReader
,
int64_t
sver
,
int64_t
ever
);
int32_t
metaSnap
ReaderClose
(
SMetaSnap
Reader
*
pReader
);
int32_t
metaSnap
Read
(
SMetaSnap
Reader
*
pReader
,
void
**
ppData
,
uint32_t
*
nData
);
void
*
metaGetIdx
(
SMeta
*
pMeta
);
void
*
metaGetIvtIdx
(
SMeta
*
pMeta
);
int
metaTtlSmaller
(
SMeta
*
pMeta
,
uint64_t
time
,
SArray
*
uidList
);
...
...
@@ -130,9 +130,9 @@ int32_t tsdbInsertTableData(STsdb* pTsdb, int64_t version, SSubmitMsgIter* p
int32_t
tsdbDeleteTableData
(
STsdb
*
pTsdb
,
int64_t
version
,
tb_uid_t
suid
,
tb_uid_t
uid
,
TSKEY
sKey
,
TSKEY
eKey
);
STsdbReader
tsdbQueryCacheLastT
(
STsdb
*
tsdb
,
SQueryTableDataCond
*
pCond
,
STableListInfo
*
tableList
,
uint64_t
qId
,
void
*
pMemRef
);
int32_t
tsdbSnap
shotReaderOpen
(
STsdb
*
pTsdb
,
STsdbSnapshot
Reader
**
ppReader
,
int64_t
sver
,
int64_t
ever
);
int32_t
tsdbSnap
shotReaderClose
(
STsdbSnapshot
Reader
*
pReader
);
int32_t
tsdbSnap
shotRead
(
STsdbSnapshot
Reader
*
pReader
,
void
**
ppData
,
uint32_t
*
nData
);
int32_t
tsdbSnap
ReaderOpen
(
STsdb
*
pTsdb
,
STsdbSnap
Reader
**
ppReader
,
int64_t
sver
,
int64_t
ever
);
int32_t
tsdbSnap
ReaderClose
(
STsdbSnap
Reader
*
pReader
);
int32_t
tsdbSnap
Read
(
STsdbSnap
Reader
*
pReader
,
void
**
ppData
,
uint32_t
*
nData
);
// tq
int
tqInit
();
...
...
source/dnode/vnode/src/meta/metaSnapshot.c
浏览文件 @
eb888684
...
...
@@ -15,19 +15,19 @@
#include "meta.h"
struct
SMetaSnap
shot
Reader
{
struct
SMetaSnapReader
{
SMeta
*
pMeta
;
TBC
*
pTbc
;
int64_t
sver
;
int64_t
ever
;
};
int32_t
metaSnap
shotReaderOpen
(
SMeta
*
pMeta
,
SMetaSnapshot
Reader
**
ppReader
,
int64_t
sver
,
int64_t
ever
)
{
int32_t
code
=
0
;
int32_t
c
=
0
;
SMetaSnap
shot
Reader
*
pMetaReader
=
NULL
;
int32_t
metaSnap
ReaderOpen
(
SMeta
*
pMeta
,
SMetaSnap
Reader
**
ppReader
,
int64_t
sver
,
int64_t
ever
)
{
int32_t
code
=
0
;
int32_t
c
=
0
;
SMetaSnapReader
*
pMetaReader
=
NULL
;
pMetaReader
=
(
SMetaSnap
shot
Reader
*
)
taosMemoryCalloc
(
1
,
sizeof
(
*
pMetaReader
));
pMetaReader
=
(
SMetaSnapReader
*
)
taosMemoryCalloc
(
1
,
sizeof
(
*
pMetaReader
));
if
(
pMetaReader
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
...
...
@@ -53,7 +53,7 @@ _err:
return
code
;
}
int32_t
metaSnap
shotReaderClose
(
SMetaSnapshot
Reader
*
pReader
)
{
int32_t
metaSnap
ReaderClose
(
SMetaSnap
Reader
*
pReader
)
{
if
(
pReader
)
{
tdbTbcClose
(
pReader
->
pTbc
);
taosMemoryFree
(
pReader
);
...
...
@@ -61,7 +61,7 @@ int32_t metaSnapshotReaderClose(SMetaSnapshotReader* pReader) {
return
0
;
}
int32_t
metaSnap
shotRead
(
SMetaSnapshot
Reader
*
pReader
,
void
**
ppData
,
uint32_t
*
nDatap
)
{
int32_t
metaSnap
Read
(
SMetaSnap
Reader
*
pReader
,
void
**
ppData
,
uint32_t
*
nDatap
)
{
const
void
*
pKey
=
NULL
;
const
void
*
pData
=
NULL
;
int32_t
nKey
=
0
;
...
...
source/dnode/vnode/src/tsdb/tsdbSnapshot.c
浏览文件 @
eb888684
...
...
@@ -15,7 +15,7 @@
#include "tsdb.h"
struct
STsdbSnap
shot
Reader
{
struct
STsdbSnapReader
{
STsdb
*
pTsdb
;
int64_t
sver
;
int64_t
ever
;
...
...
@@ -25,22 +25,23 @@ struct STsdbSnapshotReader {
SDelFReader
*
pDelFReader
;
};
typedef
struct
STsdbSnap
shot
Writer
{
typedef
struct
STsdbSnapWriter
{
STsdb
*
pTsdb
;
int64_t
sver
;
int64_t
ever
;
// for data file
int32_t
iDFileSet
;
SDataFWriter
*
pDataFWriter
;
// for del file
SDelFWriter
*
pDelFWriter
;
}
STsdbSnap
shot
Writer
;
}
STsdbSnapWriter
;
int32_t
tsdbSnap
shotReaderOpen
(
STsdb
*
pTsdb
,
STsdbSnapshot
Reader
**
ppReader
,
int64_t
sver
,
int64_t
ever
)
{
int32_t
code
=
0
;
STsdbSnap
shot
Reader
*
pReader
=
NULL
;
int32_t
tsdbSnap
ReaderOpen
(
STsdb
*
pTsdb
,
STsdbSnap
Reader
**
ppReader
,
int64_t
sver
,
int64_t
ever
)
{
int32_t
code
=
0
;
STsdbSnapReader
*
pReader
=
NULL
;
// alloc
pReader
=
(
STsdbSnap
shot
Reader
*
)
taosMemoryCalloc
(
1
,
sizeof
(
*
pReader
));
pReader
=
(
STsdbSnapReader
*
)
taosMemoryCalloc
(
1
,
sizeof
(
*
pReader
));
if
(
pReader
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
...
...
@@ -58,9 +59,13 @@ _err:
return
code
;
}
int32_t
tsdbSnap
shotRead
(
STsdbSnapshot
Reader
*
pReader
,
void
**
ppData
,
uint32_t
*
nData
)
{
int32_t
tsdbSnap
Read
(
STsdbSnap
Reader
*
pReader
,
void
**
ppData
,
uint32_t
*
nData
)
{
int32_t
code
=
0
;
// TODO
// read data file
// read del file
return
code
;
_err:
...
...
@@ -68,7 +73,7 @@ _err:
return
code
;
}
int32_t
tsdbSnap
shotReaderClose
(
STsdbSnapshot
Reader
*
pReader
)
{
int32_t
tsdbSnap
ReaderClose
(
STsdbSnap
Reader
*
pReader
)
{
int32_t
code
=
0
;
taosMemoryFree
(
pReader
);
return
code
;
...
...
source/dnode/vnode/src/vnd/vnodeSnapshot.c
浏览文件 @
eb888684
...
...
@@ -15,29 +15,29 @@
#include "vnodeInt.h"
struct
SVSnap
shot
Reader
{
SVnode
*
pVnode
;
int64_t
sver
;
int64_t
ever
;
int8_t
isMetaEnd
;
int8_t
isTsdbEnd
;
SMetaSnap
shot
Reader
*
pMetaReader
;
STsdbSnap
shot
Reader
*
pTsdbReader
;
void
*
pData
;
int32_t
nData
;
struct
SVSnapReader
{
SVnode
*
pVnode
;
int64_t
sver
;
int64_t
ever
;
int8_t
isMetaEnd
;
int8_t
isTsdbEnd
;
SMetaSnapReader
*
pMetaReader
;
STsdbSnapReader
*
pTsdbReader
;
void
*
pData
;
int32_t
nData
;
};
struct
SVSnap
shot
Writer
{
struct
SVSnapWriter
{
SVnode
*
pVnode
;
int64_t
sver
;
int64_t
ever
;
};
// SVSnap
shot
Reader ========================================================
int32_t
vnodeSnap
shotReaderOpen
(
SVnode
*
pVnode
,
SVSnapshot
Reader
**
ppReader
,
int64_t
sver
,
int64_t
ever
)
{
SVSnap
shot
Reader
*
pReader
=
NULL
;
// SVSnapReader ========================================================
int32_t
vnodeSnap
ReaderOpen
(
SVnode
*
pVnode
,
SVSnap
Reader
**
ppReader
,
int64_t
sver
,
int64_t
ever
)
{
SVSnapReader
*
pReader
=
NULL
;
pReader
=
(
SVSnap
shot
Reader
*
)
taosMemoryCalloc
(
1
,
sizeof
(
*
pReader
));
pReader
=
(
SVSnapReader
*
)
taosMemoryCalloc
(
1
,
sizeof
(
*
pReader
));
if
(
pReader
==
NULL
)
{
terrno
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
...
...
@@ -48,13 +48,13 @@ int32_t vnodeSnapshotReaderOpen(SVnode *pVnode, SVSnapshotReader **ppReader, int
pReader
->
isMetaEnd
=
0
;
pReader
->
isTsdbEnd
=
0
;
if
(
metaSnap
shot
ReaderOpen
(
pVnode
->
pMeta
,
&
pReader
->
pMetaReader
,
sver
,
ever
)
<
0
)
{
if
(
metaSnapReaderOpen
(
pVnode
->
pMeta
,
&
pReader
->
pMetaReader
,
sver
,
ever
)
<
0
)
{
taosMemoryFree
(
pReader
);
goto
_err
;
}
if
(
tsdbSnap
shot
ReaderOpen
(
pVnode
->
pTsdb
,
&
pReader
->
pTsdbReader
,
sver
,
ever
)
<
0
)
{
metaSnap
shot
ReaderClose
(
pReader
->
pMetaReader
);
if
(
tsdbSnapReaderOpen
(
pVnode
->
pTsdb
,
&
pReader
->
pTsdbReader
,
sver
,
ever
)
<
0
)
{
metaSnapReaderClose
(
pReader
->
pMetaReader
);
taosMemoryFree
(
pReader
);
goto
_err
;
}
...
...
@@ -68,21 +68,21 @@ _err:
return
-
1
;
}
int32_t
vnodeSnap
shotReaderClose
(
SVSnapshot
Reader
*
pReader
)
{
int32_t
vnodeSnap
ReaderClose
(
SVSnap
Reader
*
pReader
)
{
if
(
pReader
)
{
vnodeFree
(
pReader
->
pData
);
tsdbSnap
shot
ReaderClose
(
pReader
->
pTsdbReader
);
metaSnap
shot
ReaderClose
(
pReader
->
pMetaReader
);
tsdbSnapReaderClose
(
pReader
->
pTsdbReader
);
metaSnapReaderClose
(
pReader
->
pMetaReader
);
taosMemoryFree
(
pReader
);
}
return
0
;
}
int32_t
vnodeSnap
shotRead
(
SVSnapshot
Reader
*
pReader
,
const
void
**
ppData
,
uint32_t
*
nData
)
{
int32_t
vnodeSnap
Read
(
SVSnap
Reader
*
pReader
,
const
void
**
ppData
,
uint32_t
*
nData
)
{
int32_t
code
=
0
;
if
(
!
pReader
->
isMetaEnd
)
{
code
=
metaSnap
shot
Read
(
pReader
->
pMetaReader
,
&
pReader
->
pData
,
&
pReader
->
nData
);
code
=
metaSnapRead
(
pReader
->
pMetaReader
,
&
pReader
->
pData
,
&
pReader
->
nData
);
if
(
code
)
{
if
(
code
==
TSDB_CODE_VND_READ_END
)
{
pReader
->
isMetaEnd
=
1
;
...
...
@@ -97,7 +97,7 @@ int32_t vnodeSnapshotRead(SVSnapshotReader *pReader, const void **ppData, uint32
}
if
(
!
pReader
->
isTsdbEnd
)
{
code
=
tsdbSnap
shot
Read
(
pReader
->
pTsdbReader
,
&
pReader
->
pData
,
&
pReader
->
nData
);
code
=
tsdbSnapRead
(
pReader
->
pTsdbReader
,
&
pReader
->
pData
,
&
pReader
->
nData
);
if
(
code
)
{
if
(
code
==
TSDB_CODE_VND_READ_END
)
{
pReader
->
isTsdbEnd
=
1
;
...
...
@@ -115,13 +115,13 @@ int32_t vnodeSnapshotRead(SVSnapshotReader *pReader, const void **ppData, uint32
return
code
;
}
// SVSnap
shot
Writer ========================================================
int32_t
vnodeSnapshotWriterOpen
(
SVnode
*
pVnode
,
int64_t
sver
,
int64_t
ever
,
SVSnap
shot
Writer
**
ppWriter
)
{
int32_t
code
=
0
;
SVSnap
shot
Writer
*
pWriter
=
NULL
;
// SVSnapWriter ========================================================
int32_t
vnodeSnapshotWriterOpen
(
SVnode
*
pVnode
,
int64_t
sver
,
int64_t
ever
,
SVSnapWriter
**
ppWriter
)
{
int32_t
code
=
0
;
SVSnapWriter
*
pWriter
=
NULL
;
// alloc
pWriter
=
(
SVSnap
shot
Writer
*
)
taosMemoryCalloc
(
1
,
sizeof
(
*
pWriter
));
pWriter
=
(
SVSnapWriter
*
)
taosMemoryCalloc
(
1
,
sizeof
(
*
pWriter
));
if
(
pWriter
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
...
...
@@ -136,13 +136,13 @@ _err:
return
code
;
}
int32_t
vnodeSnapshotWrite
(
SVSnap
shot
Writer
*
pWriter
,
uint8_t
*
pData
,
uint32_t
nData
)
{
int32_t
vnodeSnapshotWrite
(
SVSnapWriter
*
pWriter
,
uint8_t
*
pData
,
uint32_t
nData
)
{
int32_t
code
=
0
;
// TODO
return
code
;
}
int32_t
vnodeSnapshotWriterClose
(
SVSnap
shot
Writer
*
pWriter
,
int8_t
rollback
)
{
int32_t
vnodeSnapshotWriterClose
(
SVSnapWriter
*
pWriter
,
int8_t
rollback
)
{
int32_t
code
=
0
;
if
(
!
rollback
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录