Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
1edb6d5b
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,发现更多精彩内容 >>
提交
1edb6d5b
编写于
12月 19, 2022
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
more code
上级
b99e501a
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
120 addition
and
5 deletion
+120
-5
source/dnode/vnode/CMakeLists.txt
source/dnode/vnode/CMakeLists.txt
+1
-0
source/dnode/vnode/src/inc/vnd.h
source/dnode/vnode/src/inc/vnd.h
+4
-0
source/dnode/vnode/src/inc/vnodeInt.h
source/dnode/vnode/src/inc/vnodeInt.h
+6
-0
source/dnode/vnode/src/tsdb/tsdbCompact.c
source/dnode/vnode/src/tsdb/tsdbCompact.c
+27
-4
source/dnode/vnode/src/vnd/vnodeCommit.c
source/dnode/vnode/src/vnd/vnodeCommit.c
+1
-1
source/dnode/vnode/src/vnd/vnodeCompact.c
source/dnode/vnode/src/vnd/vnodeCompact.c
+77
-0
source/dnode/vnode/src/vnd/vnodeSvr.c
source/dnode/vnode/src/vnd/vnodeSvr.c
+4
-0
未找到文件。
source/dnode/vnode/CMakeLists.txt
浏览文件 @
1edb6d5b
...
...
@@ -14,6 +14,7 @@ target_sources(
"src/vnd/vnodeSvr.c"
"src/vnd/vnodeSync.c"
"src/vnd/vnodeSnapshot.c"
"src/vnd/vnodeCompact.c"
# meta
"src/meta/metaOpen.c"
...
...
source/dnode/vnode/src/inc/vnd.h
浏览文件 @
1edb6d5b
...
...
@@ -94,6 +94,10 @@ int32_t vnodeSyncCommit(SVnode* pVnode);
int32_t
vnodeAsyncCommit
(
SVnode
*
pVnode
);
bool
vnodeShouldRollback
(
SVnode
*
pVnode
);
// vnodeCompact.c
int32_t
vnodeAsyncCompact
(
SVnode
*
pVnode
);
int32_t
vnodeSyncCompact
(
SVnode
*
pVnode
);
// vnodeSync.c
int32_t
vnodeSyncOpen
(
SVnode
*
pVnode
,
char
*
path
);
int32_t
vnodeSyncStart
(
SVnode
*
pVnode
);
...
...
source/dnode/vnode/src/inc/vnodeInt.h
浏览文件 @
1edb6d5b
...
...
@@ -76,6 +76,7 @@ typedef struct SRSmaSnapReader SRSmaSnapReader;
typedef
struct
SRSmaSnapWriter
SRSmaSnapWriter
;
typedef
struct
SSnapDataHdr
SSnapDataHdr
;
typedef
struct
SCommitInfo
SCommitInfo
;
typedef
struct
SCompactInfo
SCompactInfo
;
#define VNODE_META_DIR "meta"
#define VNODE_TSDB_DIR "tsdb"
...
...
@@ -428,6 +429,11 @@ struct SCommitInfo {
SVnode
*
pVnode
;
TXN
*
txn
;
};
struct
SCompactInfo
{
SVnodeInfo
info
;
SVnode
*
pVnode
;
TXN
*
txn
;
};
#ifdef __cplusplus
}
...
...
source/dnode/vnode/src/tsdb/tsdbCompact.c
浏览文件 @
1edb6d5b
...
...
@@ -15,8 +15,8 @@
#include "tsdb.h"
typedef
struct
{
}
SMemDIter
;
//
typedef struct {
//
} SMemDIter;
typedef
struct
{
SArray
*
aBlockIdx
;
// SArray<SBlockIdx>
...
...
@@ -34,6 +34,12 @@ typedef struct {
int32_t
iRow
;
}
SSttDIter
;
typedef
struct
{
int32_t
flag
;
SRowInfo
rowInfo
;
char
handle
[];
}
STsdbDataIter
;
typedef
struct
{
STsdb
*
pTsdb
;
STsdbFS
fs
;
...
...
@@ -47,6 +53,25 @@ typedef struct {
#define TSDB_FLG_DEEP_COMPACT 0x1
// ITER =========================
static
int32_t
tsdbDataIterOpen
(
STsdbDataIter
*
pIter
)
{
int32_t
code
=
0
;
int32_t
lino
=
0
;
// TODO
_exit:
return
code
;
}
static
void
tsdbDataIterClose
(
STsdbDataIter
*
pIter
)
{
// TODO
}
static
int32_t
tsdbDataIterNext
(
STsdbDataIter
*
pIter
)
{
int32_t
code
=
0
;
int32_t
lino
=
0
;
// TODO
_exit:
return
code
;
}
// COMPACT =========================
static
int32_t
tsdbBeginCompact
(
STsdb
*
pTsdb
,
STsdbCompactor
*
pCompactor
)
{
...
...
@@ -106,8 +131,6 @@ static int32_t tsdbDeepCompact(STsdbCompactor *pCompactor) {
code
=
tsdbDataFReaderOpen
(
&
pCompactor
->
pReader
,
pTsdb
,
pCompactor
->
pDFileSet
);
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
//
_exit:
if
(
code
)
{
tsdbError
(
"vgId:%d %s failed at line %d since %s"
,
TD_VID
(
pTsdb
->
pVnode
),
__func__
,
lino
,
tstrerror
(
code
));
...
...
source/dnode/vnode/src/vnd/vnodeCommit.c
浏览文件 @
1edb6d5b
...
...
@@ -184,7 +184,7 @@ _err:
return
-
1
;
}
static
void
vnodePrepareCommit
(
SVnode
*
pVnode
)
{
void
vnodePrepareCommit
(
SVnode
*
pVnode
)
{
tsem_wait
(
&
pVnode
->
canCommit
);
tsdbPrepareCommit
(
pVnode
->
pTsdb
);
...
...
source/dnode/vnode/src/vnd/vnodeCompact.c
0 → 100644
浏览文件 @
1edb6d5b
/*
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3
* or later ("AGPL"), as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "vnd.h"
extern
void
vnodePrepareCommit
(
SVnode
*
pVnode
);
#define vnodePrepareCompact vnodePrepareCommit
static
int32_t
vnodeCompactImpl
(
SCompactInfo
*
pInfo
)
{
int32_t
code
=
0
;
// TODO
return
code
;
}
static
int32_t
vnodeCompactTask
(
void
*
param
)
{
int32_t
code
=
0
;
SCompactInfo
*
pInfo
=
(
SCompactInfo
*
)
param
;
// compact
vnodeCompactImpl
(
pInfo
);
// end compact
tsem_post
(
&
pInfo
->
pVnode
->
canCommit
);
_exit:
taosMemoryFree
(
pInfo
);
return
code
;
}
int32_t
vnodeAsyncCompact
(
SVnode
*
pVnode
)
{
int32_t
code
=
0
;
// prepare
vnodePrepareCompact
(
pVnode
);
// schedule compact task
SCompactInfo
*
pInfo
=
taosMemoryCalloc
(
1
,
sizeof
(
*
pInfo
));
if
(
NULL
==
pInfo
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_exit
;
}
pInfo
->
info
.
config
=
pVnode
->
config
;
pInfo
->
info
.
state
.
committed
=
pVnode
->
state
.
applied
;
pInfo
->
info
.
state
.
commitTerm
=
pVnode
->
state
.
applyTerm
;
pInfo
->
info
.
state
.
commitID
=
pVnode
->
state
.
commitID
;
pInfo
->
pVnode
=
pVnode
;
pInfo
->
txn
=
metaGetTxn
(
pVnode
->
pMeta
);
vnodeScheduleTask
(
vnodeCompactTask
,
pInfo
);
_exit:
if
(
code
)
{
vError
(
"vgId:%d %s failed since %s"
,
TD_VID
(
pInfo
->
pVnode
),
__func__
,
tstrerror
(
code
));
}
return
code
;
}
int32_t
vnodeSyncCompact
(
SVnode
*
pVnode
)
{
vnodeAsyncCompact
(
pVnode
);
tsem_wait
(
&
pVnode
->
canCommit
);
tsem_post
(
&
pVnode
->
canCommit
);
return
0
;
}
\ No newline at end of file
source/dnode/vnode/src/vnd/vnodeSvr.c
浏览文件 @
1edb6d5b
...
...
@@ -299,6 +299,10 @@ int32_t vnodeProcessWriteMsg(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRp
vnodeSyncCommit
(
pVnode
);
vnodeBegin
(
pVnode
);
goto
_exit
;
case
TDMT_VND_COMPACT
:
vnodeAsyncCompact
(
pVnode
);
vnodeBegin
(
pVnode
);
goto
_exit
;
default:
vError
(
"vgId:%d, unprocessed msg, %d"
,
TD_VID
(
pVnode
),
pMsg
->
msgType
);
return
-
1
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录