Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Cherenkov effect
TDengine
提交
9fd8ed52
T
TDengine
项目概览
Cherenkov effect
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9fd8ed52
编写于
11月 13, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
差异文件
Merge from feature/table
上级
4e42b8cf
3a9b5392
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
16 addition
and
12 deletion
+16
-12
src/connector/go
src/connector/go
+1
-1
src/inc/taosdef.h
src/inc/taosdef.h
+1
-1
src/inc/tsdb.h
src/inc/tsdb.h
+2
-2
src/mnode/src/mnodeSdb.c
src/mnode/src/mnodeSdb.c
+1
-1
src/sync/src/syncMain.c
src/sync/src/syncMain.c
+10
-6
tests/examples/JDBC/connectionPools/pom.xml
tests/examples/JDBC/connectionPools/pom.xml
+1
-1
未找到文件。
go
@
66df175e
比较
8c58c512
...
66df175e
Subproject commit
8c58c512b6acda8bcdfa48fdc7140227b5221766
Subproject commit
66df175edf467df6f80d07789f1a35a6d2551310
src/inc/taosdef.h
浏览文件 @
9fd8ed52
...
@@ -334,7 +334,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size, void* buf
...
@@ -334,7 +334,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size, void* buf
#define TSDB_MIN_DAYS_PER_FILE 1
#define TSDB_MIN_DAYS_PER_FILE 1
#define TSDB_MAX_DAYS_PER_FILE 3650
#define TSDB_MAX_DAYS_PER_FILE 3650
#define TSDB_DEFAULT_DAYS_PER_FILE
2
#define TSDB_DEFAULT_DAYS_PER_FILE
10
#define TSDB_MIN_KEEP 1 // data in db to be reserved.
#define TSDB_MIN_KEEP 1 // data in db to be reserved.
#define TSDB_MAX_KEEP 365000 // data in db to be reserved.
#define TSDB_MAX_KEEP 365000 // data in db to be reserved.
...
...
src/inc/tsdb.h
浏览文件 @
9fd8ed52
...
@@ -126,7 +126,7 @@ uint32_t tsdbGetFileInfo(TSDB_REPO_T *repo, char *name, uint32_t *index, uint32_
...
@@ -126,7 +126,7 @@ uint32_t tsdbGetFileInfo(TSDB_REPO_T *repo, char *name, uint32_t *index, uint32_
// the TSDB repository info
// the TSDB repository info
typedef
struct
STsdbRepoInfo
{
typedef
struct
STsdbRepoInfo
{
STsdbCfg
tsdbCfg
;
STsdbCfg
tsdbCfg
;
int64_t
version
;
// version of the repository
uint64_t
version
;
// version of the repository
int64_t
tsdbTotalDataSize
;
// the original inserted data size
int64_t
tsdbTotalDataSize
;
// the original inserted data size
int64_t
tsdbTotalDiskSize
;
// the total disk size taken by this TSDB repository
int64_t
tsdbTotalDiskSize
;
// the total disk size taken by this TSDB repository
// TODO: Other informations to add
// TODO: Other informations to add
...
@@ -136,7 +136,7 @@ STsdbRepoInfo *tsdbGetStatus(TSDB_REPO_T *pRepo);
...
@@ -136,7 +136,7 @@ STsdbRepoInfo *tsdbGetStatus(TSDB_REPO_T *pRepo);
// the meter information report structure
// the meter information report structure
typedef
struct
{
typedef
struct
{
STableCfg
tableCfg
;
STableCfg
tableCfg
;
int64_t
version
;
uint64_t
version
;
int64_t
tableTotalDataSize
;
// In bytes
int64_t
tableTotalDataSize
;
// In bytes
int64_t
tableTotalDiskSize
;
// In bytes
int64_t
tableTotalDiskSize
;
// In bytes
}
STableInfo
;
}
STableInfo
;
...
...
src/mnode/src/mnodeSdb.c
浏览文件 @
9fd8ed52
...
@@ -71,7 +71,7 @@ typedef struct _SSdbTable {
...
@@ -71,7 +71,7 @@ typedef struct _SSdbTable {
typedef
struct
{
typedef
struct
{
ESyncRole
role
;
ESyncRole
role
;
ESdbStatus
status
;
ESdbStatus
status
;
int64_t
version
;
uint64_t
version
;
int64_t
sync
;
int64_t
sync
;
void
*
wal
;
void
*
wal
;
SSyncCfg
cfg
;
SSyncCfg
cfg
;
...
...
src/sync/src/syncMain.c
浏览文件 @
9fd8ed52
...
@@ -1219,13 +1219,17 @@ static int32_t syncForwardToPeerImpl(SSyncNode *pNode, void *data, void *mhandle
...
@@ -1219,13 +1219,17 @@ static int32_t syncForwardToPeerImpl(SSyncNode *pNode, void *data, void *mhandle
int32_t
fwdLen
;
int32_t
fwdLen
;
int32_t
code
=
0
;
int32_t
code
=
0
;
if
(
nodeRole
==
TAOS_SYNC_ROLE_SLAVE
&&
pWalHead
->
version
>
nodeVersion
+
1
)
{
sError
(
"vgId:%d, received ver:%"
PRIu64
", inconsistent with last ver:%"
PRIu64
", restart connection"
,
pNode
->
vgId
,
if
(
pWalHead
->
version
>
nodeVersion
+
1
)
{
pWalHead
->
version
,
nodeVersion
);
sError
(
"vgId:%d, hver:%"
PRIu64
", inconsistent with ver:%"
PRIu64
,
pNode
->
vgId
,
pWalHead
->
version
,
nodeVersion
);
if
(
nodeRole
==
TAOS_SYNC_ROLE_SLAVE
)
{
sInfo
(
"vgId:%d, restart connection"
,
pNode
->
vgId
);
for
(
int32_t
i
=
0
;
i
<
pNode
->
replica
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
pNode
->
replica
;
++
i
)
{
pPeer
=
pNode
->
peerInfo
[
i
];
pPeer
=
pNode
->
peerInfo
[
i
];
syncRestartConnection
(
pPeer
);
syncRestartConnection
(
pPeer
);
}
}
}
return
TSDB_CODE_SYN_INVALID_VERSION
;
return
TSDB_CODE_SYN_INVALID_VERSION
;
}
}
...
...
tests/examples/JDBC/connectionPools/pom.xml
浏览文件 @
9fd8ed52
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
<dependency>
<dependency>
<groupId>
com.mchange
</groupId>
<groupId>
com.mchange
</groupId>
<artifactId>
c3p0
</artifactId>
<artifactId>
c3p0
</artifactId>
<version>
0.9.5.
2
</version>
<version>
0.9.5.
4
</version>
</dependency>
</dependency>
<!-- log4j -->
<!-- log4j -->
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录