Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
f4475561
TDengine
项目概览
冷面1992
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f4475561
编写于
3月 30, 2021
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix more
上级
189058e7
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
147 addition
and
6 deletion
+147
-6
src/tsdb/src/tsdbFS.c
src/tsdb/src/tsdbFS.c
+2
-1
src/tsdb/src/tsdbFile.c
src/tsdb/src/tsdbFile.c
+1
-0
src/tsdb/src/tsdbRead.c
src/tsdb/src/tsdbRead.c
+6
-2
src/tsdb/src/tsdbSync.c
src/tsdb/src/tsdbSync.c
+3
-3
tests/script/data2.sim
tests/script/data2.sim
+135
-0
未找到文件。
src/tsdb/src/tsdbFS.c
浏览文件 @
f4475561
...
...
@@ -1225,7 +1225,8 @@ static void tsdbScanAndTryFixDFilesHeader(STsdbRepo *pRepo) {
for
(
TSDB_FILE_T
ftype
=
0
;
ftype
<
TSDB_FILE_MAX
;
ftype
++
)
{
SDFile
*
pDFile
=
TSDB_DFILE_IN_SET
(
&
fset
,
ftype
);
if
(
tsdbLoadDFileHeader
(
pDFile
,
&
info
)
<
0
||
memcmp
(
&
(
pDFile
->
info
),
&
info
,
sizeof
(
info
))
!=
0
)
{
if
((
tsdbLoadDFileHeader
(
pDFile
,
&
info
)
<
0
)
||
pDFile
->
info
.
size
!=
info
.
size
||
pDFile
->
info
.
magic
!=
info
.
magic
)
{
if
(
tsdbUpdateDFileHeader
(
pDFile
)
<
0
)
{
tsdbError
(
"vgId:%d failed to update DFile header of %s since %s, continue"
,
REPO_ID
(
pRepo
),
TSDB_FILE_FULL_NAME
(
pDFile
),
tstrerror
(
terrno
));
...
...
src/tsdb/src/tsdbFile.c
浏览文件 @
f4475561
...
...
@@ -567,6 +567,7 @@ void tsdbInitDFileSet(SDFileSet *pSet, SDiskID did, int vid, int fid, uint32_t v
}
void
tsdbInitDFileSetEx
(
SDFileSet
*
pSet
,
SDFileSet
*
pOSet
)
{
pSet
->
fid
=
pOSet
->
fid
;
for
(
TSDB_FILE_T
ftype
=
0
;
ftype
<
TSDB_FILE_MAX
;
ftype
++
)
{
tsdbInitDFileEx
(
TSDB_DFILE_IN_SET
(
pSet
,
ftype
),
TSDB_DFILE_IN_SET
(
pOSet
,
ftype
));
}
...
...
src/tsdb/src/tsdbRead.c
浏览文件 @
f4475561
...
...
@@ -917,7 +917,9 @@ static int32_t loadBlockInfo(STsdbQueryHandle * pQueryHandle, int32_t index, int
pCheckInfo
->
compSize
=
compIndex
->
len
;
}
tsdbLoadBlockInfo
(
&
(
pQueryHandle
->
rhelper
),
(
void
*
)(
pCheckInfo
->
pCompInfo
));
if
(
tsdbLoadBlockInfo
(
&
(
pQueryHandle
->
rhelper
),
(
void
*
)(
pCheckInfo
->
pCompInfo
))
<
0
)
{
return
terrno
;
}
SBlockInfo
*
pCompInfo
=
pCheckInfo
->
pCompInfo
;
TSKEY
s
=
TSKEY_INITIAL_VAL
,
e
=
TSKEY_INITIAL_VAL
;
...
...
@@ -2832,7 +2834,9 @@ int32_t tsdbRetrieveDataBlockStatisInfo(TsdbQueryHandleT* pQueryHandle, SDataSta
}
int64_t
stime
=
taosGetTimestampUs
();
tsdbLoadBlockStatis
(
&
pHandle
->
rhelper
,
pBlockInfo
->
compBlock
);
if
(
tsdbLoadBlockStatis
(
&
pHandle
->
rhelper
,
pBlockInfo
->
compBlock
)
<
0
)
{
return
terrno
;
}
int16_t
*
colIds
=
pHandle
->
defaultLoadColumn
->
pData
;
...
...
src/tsdb/src/tsdbSync.c
浏览文件 @
f4475561
...
...
@@ -194,8 +194,8 @@ static int32_t tsdbSyncRecvMeta(SSyncH *pSynch) {
return
0
;
}
if
(
pLMFile
==
NULL
||
memcmp
(
&
(
pSynch
->
pmf
->
info
),
&
(
pLMFile
->
info
),
sizeof
(
SMFInfo
))
!=
0
||
TSDB_FILE_IS_BAD
(
pLMFile
))
{
if
(
pLMFile
==
NULL
||
pSynch
->
pmf
->
info
.
size
!=
pLMFile
->
info
.
size
||
pSynch
->
pmf
->
info
.
magic
!=
pLMFile
->
info
.
magic
||
TSDB_FILE_IS_BAD
(
pLMFile
))
{
// Local has no meta file or has a different meta file, need to copy from remote
pSynch
->
mfChanged
=
true
;
...
...
@@ -536,7 +536,7 @@ static bool tsdbIsTowFSetSame(SDFileSet *pSet1, SDFileSet *pSet2) {
SDFile
*
pDFile1
=
TSDB_DFILE_IN_SET
(
pSet1
,
ftype
);
SDFile
*
pDFile2
=
TSDB_DFILE_IN_SET
(
pSet2
,
ftype
);
if
(
memcmp
((
void
*
)(
TSDB_FILE_INFO
(
pDFile1
)),
(
void
*
)(
TSDB_FILE_INFO
(
pDFile2
)),
sizeof
(
SDFInfo
))
!=
0
)
{
if
(
pDFile1
->
info
.
size
!=
pDFile2
->
info
.
size
||
pDFile1
->
info
.
magic
!=
pDFile2
->
info
.
magic
)
{
return
false
;
}
}
...
...
tests/script/data2.sim
0 → 100644
浏览文件 @
f4475561
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode2 -i 2
system sh/deploy.sh -n dnode3 -i 3
system sh/deploy.sh -n dnode4 -i 4
system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
system sh/cfg.sh -n dnode1 -c wallevel -v 2
system sh/cfg.sh -n dnode2 -c wallevel -v 2
system sh/cfg.sh -n dnode3 -c wallevel -v 2
system sh/cfg.sh -n dnode4 -c wallevel -v 2
print ========== step1
system sh/exec.sh -n dnode1 -s start
sql connect
sleep 2000
print ========== step2
sql create dnode $hostname2
system sh/exec.sh -n dnode2 -s start
sql create dnode $hostname3
system sh/exec.sh -n dnode3 -s start
$x = 0
show2:
$x = $x + 1
sleep 2000
if $x == 10 then
return -1
endi
sql show dnodes
print dnode1 openVnodes $data2_1
print dnode2 openVnodes $data2_2
print dnode3 openVnodes $data2_3
if $data2_1 != 0 then
goto show2
endi
if $data2_2 != 0 then
goto show2
endi
if $data2_3 != 0 then
goto show2
endi
print ========== step3
sql create database d1 days 1 replica 2
sql create table d1.t1 (t timestamp, i int)
sql insert into d1.t1 values(1591160480000, 25)
sql insert into d1.t1 values(1591160480002, 24)
sql insert into d1.t1 values(1591160480003, 23)
sql insert into d1.t1 values(1591160480004, 22)
sql insert into d1.t1 values(1591160480005, 21)
sql insert into d1.t1 values(1591260480000, 35)
sql insert into d1.t1 values(1591260480002, 34)
sql insert into d1.t1 values(1591260480003, 33)
sql insert into d1.t1 values(1591260480004, 32)
sql insert into d1.t1 values(1591260480005, 31)
sql insert into d1.t1 values(1591360480000, 45)
sql insert into d1.t1 values(1591360480002, 44)
sql insert into d1.t1 values(1591360480003, 43)
sql insert into d1.t1 values(1591360480004, 42)
sql insert into d1.t1 values(1591360480005, 41)
sql insert into d1.t1 values(1591460480000, 55)
sql insert into d1.t1 values(1591460480002, 54)
sql insert into d1.t1 values(1591460480003, 53)
sql insert into d1.t1 values(1591460480004, 52)
sql insert into d1.t1 values(1591460480005, 51)
sql insert into d1.t1 values(1591560480000, 65)
sql insert into d1.t1 values(1591560480002, 64)
sql insert into d1.t1 values(1591560480003, 63)
sql insert into d1.t1 values(1591560480004, 62)
sql insert into d1.t1 values(1591560480005, 61)
sql insert into d1.t1 values(1591660480000, 75)
sql insert into d1.t1 values(1591660480002, 74)
sql insert into d1.t1 values(1591660480003, 73)
sql insert into d1.t1 values(1591660480004, 72)
sql insert into d1.t1 values(1591660480005, 71)
$x = 0
show3:
$x = $x + 1
sleep 2000
if $x == 10 then
return -1
endi
sql show dnodes
print dnode1 openVnodes $data2_1
print dnode2 openVnodes $data2_2
print dnode3 openVnodes $data2_3
if $data2_1 != 0 then
goto show3
endi
if $data2_2 != 1 then
goto show3
endi
if $data2_3 != 1 then
goto show3
endi
sleep 3000
print ========== step4
system sh/exec.sh -n dnode2 -s stop -x SIGINT
system sh/exec.sh -n dnode3 -s stop -x SIGINT
print ========== step5
system_content rm -rf ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/v2f18418.*
print ========== step6
system sh/exec.sh -n dnode2 -s start
system sh/exec.sh -n dnode3 -s start
return
# print ========== step7
# system sh/exec.sh -n dnode1 -s stop -x SIGINT
# system sh/exec.sh -n dnode2 -s stop -x SIGINT
# system sh/exec.sh -n dnode3 -s stop -x SIGINT
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录