Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
36b49b50
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
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看板
提交
36b49b50
编写于
7月 04, 2022
作者:
wmmhello
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix:<TD-16840> meta ttl index core if insert with benchmark
上级
fcea74fe
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
17 addition
and
6 deletion
+17
-6
source/dnode/vnode/src/vnd/vnodeSvr.c
source/dnode/vnode/src/vnd/vnodeSvr.c
+1
-1
source/libs/tdb/src/db/tdbBtree.c
source/libs/tdb/src/db/tdbBtree.c
+4
-1
source/libs/tdb/src/db/tdbDb.c
source/libs/tdb/src/db/tdbDb.c
+5
-1
source/libs/tdb/src/db/tdbPager.c
source/libs/tdb/src/db/tdbPager.c
+4
-0
tests/system-test/2-query/json_tag.py
tests/system-test/2-query/json_tag.py
+2
-2
tests/system-test/fulltest.sh
tests/system-test/fulltest.sh
+1
-1
未找到文件。
source/dnode/vnode/src/vnd/vnodeSvr.c
浏览文件 @
36b49b50
...
@@ -136,7 +136,7 @@ int32_t vnodeProcessWriteReq(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRp
...
@@ -136,7 +136,7 @@ int32_t vnodeProcessWriteReq(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRp
if
(
vnodeProcessDropTbReq
(
pVnode
,
version
,
pReq
,
len
,
pRsp
)
<
0
)
goto
_err
;
if
(
vnodeProcessDropTbReq
(
pVnode
,
version
,
pReq
,
len
,
pRsp
)
<
0
)
goto
_err
;
break
;
break
;
case
TDMT_VND_DROP_TTL_TABLE
:
case
TDMT_VND_DROP_TTL_TABLE
:
//
if (vnodeProcessDropTtlTbReq(pVnode, version, pReq, len, pRsp) < 0) goto _err;
if
(
vnodeProcessDropTtlTbReq
(
pVnode
,
version
,
pReq
,
len
,
pRsp
)
<
0
)
goto
_err
;
break
;
break
;
case
TDMT_VND_CREATE_SMA
:
{
case
TDMT_VND_CREATE_SMA
:
{
if
(
vnodeProcessCreateTSmaReq
(
pVnode
,
version
,
pReq
,
len
,
pRsp
)
<
0
)
goto
_err
;
if
(
vnodeProcessCreateTSmaReq
(
pVnode
,
version
,
pReq
,
len
,
pRsp
)
<
0
)
goto
_err
;
...
...
source/libs/tdb/src/db/tdbBtree.c
浏览文件 @
36b49b50
...
@@ -314,7 +314,7 @@ static int tdbDefaultKeyCmprFn(const void *pKey1, int keyLen1, const void *pKey2
...
@@ -314,7 +314,7 @@ static int tdbDefaultKeyCmprFn(const void *pKey1, int keyLen1, const void *pKey2
static
int
tdbBtreeOpenImpl
(
SBTree
*
pBt
)
{
static
int
tdbBtreeOpenImpl
(
SBTree
*
pBt
)
{
// Try to get the root page of the an existing btree
// Try to get the root page of the an existing btree
#if 0
SPgno pgno;
SPgno pgno;
SPage *pPage;
SPage *pPage;
int ret;
int ret;
...
@@ -339,6 +339,8 @@ static int tdbBtreeOpenImpl(SBTree *pBt) {
...
@@ -339,6 +339,8 @@ static int tdbBtreeOpenImpl(SBTree *pBt) {
ASSERT(pgno != 0);
ASSERT(pgno != 0);
pBt->root = pgno;
pBt->root = pgno;
#endif
pBt
->
root
=
0
;
return
0
;
return
0
;
}
}
...
@@ -1991,6 +1993,7 @@ int tdbBtcMoveTo(SBTC *pBtc, const void *pKey, int kLen, int *pCRst) {
...
@@ -1991,6 +1993,7 @@ int tdbBtcMoveTo(SBTC *pBtc, const void *pKey, int kLen, int *pCRst) {
const
void
*
pTKey
;
const
void
*
pTKey
;
int
tkLen
;
int
tkLen
;
tdbError
(
"ttl moveto, pager:%p, ipage:%d"
,
pPager
,
pBtc
->
iPage
);
if
(
pBtc
->
iPage
<
0
)
{
if
(
pBtc
->
iPage
<
0
)
{
// move from a clear cursor
// move from a clear cursor
ret
=
tdbPagerFetchPage
(
pPager
,
&
pBt
->
root
,
&
(
pBtc
->
pPage
),
tdbBtreeInitPage
,
ret
=
tdbPagerFetchPage
(
pPager
,
&
pBt
->
root
,
&
(
pBtc
->
pPage
),
tdbBtreeInitPage
,
...
...
source/libs/tdb/src/db/tdbDb.c
浏览文件 @
36b49b50
...
@@ -121,9 +121,10 @@ SPager *tdbEnvGetPager(TDB *pDb, const char *fname) {
...
@@ -121,9 +121,10 @@ SPager *tdbEnvGetPager(TDB *pDb, const char *fname) {
hash
=
tdbCstringHash
(
fname
);
hash
=
tdbCstringHash
(
fname
);
ppPager
=
&
pDb
->
pgrHash
[
hash
%
pDb
->
nPgrHash
];
ppPager
=
&
pDb
->
pgrHash
[
hash
%
pDb
->
nPgrHash
];
tdbTrace
(
"tdbttl getPager1: pager:%p, index:%d, name:%s"
,
*
ppPager
,
hash
%
pDb
->
nPgrHash
,
fname
);
for
(;
*
ppPager
&&
(
strcmp
(
fname
,
(
*
ppPager
)
->
dbFileName
)
!=
0
);
ppPager
=
&
((
*
ppPager
)
->
pHashNext
))
{
for
(;
*
ppPager
&&
(
strcmp
(
fname
,
(
*
ppPager
)
->
dbFileName
)
!=
0
);
ppPager
=
&
((
*
ppPager
)
->
pHashNext
))
{
}
}
tdbTrace
(
"tdbttl getPager2: pager:%p, index:%d, name:%s"
,
*
ppPager
,
hash
%
pDb
->
nPgrHash
,
fname
);
return
*
ppPager
;
return
*
ppPager
;
}
}
...
@@ -143,9 +144,12 @@ void tdbEnvAddPager(TDB *pDb, SPager *pPager) {
...
@@ -143,9 +144,12 @@ void tdbEnvAddPager(TDB *pDb, SPager *pPager) {
// add to hash
// add to hash
hash
=
tdbCstringHash
(
pPager
->
dbFileName
);
hash
=
tdbCstringHash
(
pPager
->
dbFileName
);
ppPager
=
&
pDb
->
pgrHash
[
hash
%
pDb
->
nPgrHash
];
ppPager
=
&
pDb
->
pgrHash
[
hash
%
pDb
->
nPgrHash
];
tdbTrace
(
"tdbttl addPager1: pager:%p, index:%d, name:%s"
,
*
ppPager
,
hash
%
pDb
->
nPgrHash
,
pPager
->
dbFileName
);
pPager
->
pHashNext
=
*
ppPager
;
pPager
->
pHashNext
=
*
ppPager
;
*
ppPager
=
pPager
;
*
ppPager
=
pPager
;
tdbTrace
(
"tdbttl addPager2: pager:%p, index:%d, name:%s"
,
*
ppPager
,
hash
%
pDb
->
nPgrHash
,
pPager
->
dbFileName
);
// increase the counter
// increase the counter
pDb
->
nPager
++
;
pDb
->
nPager
++
;
}
}
...
...
source/libs/tdb/src/db/tdbPager.c
浏览文件 @
36b49b50
...
@@ -214,6 +214,7 @@ int tdbPagerCommit(SPager *pPager, TXN *pTxn) {
...
@@ -214,6 +214,7 @@ int tdbPagerCommit(SPager *pPager, TXN *pTxn) {
}
}
}
}
tdbTrace
(
"tdbttl commit:%p, %d"
,
pPager
,
pPager
->
dbOrigSize
);
pPager
->
dbOrigSize
=
pPager
->
dbFileSize
;
pPager
->
dbOrigSize
=
pPager
->
dbFileSize
;
// release the page
// release the page
...
@@ -269,6 +270,7 @@ int tdbPagerFetchPage(SPager *pPager, SPgno *ppgno, SPage **ppPage, int (*initPa
...
@@ -269,6 +270,7 @@ int tdbPagerFetchPage(SPager *pPager, SPgno *ppgno, SPage **ppPage, int (*initPa
return
-
1
;
return
-
1
;
}
}
tdbTrace
(
"tdbttl fetch pager:%p"
,
pPage
->
pPager
);
// init page if need
// init page if need
if
(
!
TDB_PAGE_INITIALIZED
(
pPage
))
{
if
(
!
TDB_PAGE_INITIALIZED
(
pPage
))
{
ret
=
tdbPagerInitPage
(
pPager
,
pPage
,
initPage
,
arg
,
loadPage
);
ret
=
tdbPagerInitPage
(
pPager
,
pPage
,
initPage
,
arg
,
loadPage
);
...
@@ -347,10 +349,12 @@ static int tdbPagerInitPage(SPager *pPager, SPage *pPage, int (*initPage)(SPage
...
@@ -347,10 +349,12 @@ static int tdbPagerInitPage(SPager *pPager, SPage *pPage, int (*initPage)(SPage
pgno
=
TDB_PAGE_PGNO
(
pPage
);
pgno
=
TDB_PAGE_PGNO
(
pPage
);
tdbTrace
(
"tdbttl init pager:%p, pgno:%d, loadPage:%d, size:%d"
,
pPager
,
pgno
,
loadPage
,
pPager
->
dbOrigSize
);
if
(
loadPage
&&
pgno
<=
pPager
->
dbOrigSize
)
{
if
(
loadPage
&&
pgno
<=
pPager
->
dbOrigSize
)
{
init
=
1
;
init
=
1
;
nRead
=
tdbOsPRead
(
pPager
->
fd
,
pPage
->
pData
,
pPage
->
pageSize
,
((
i64
)
pPage
->
pageSize
)
*
(
pgno
-
1
));
nRead
=
tdbOsPRead
(
pPager
->
fd
,
pPage
->
pData
,
pPage
->
pageSize
,
((
i64
)
pPage
->
pageSize
)
*
(
pgno
-
1
));
tdbTrace
(
"tdbttl pager:%p, pgno:%d, nRead:%ld"
,
pPager
,
pgno
,
nRead
);
if
(
nRead
<
pPage
->
pageSize
)
{
if
(
nRead
<
pPage
->
pageSize
)
{
ASSERT
(
0
);
ASSERT
(
0
);
return
-
1
;
return
-
1
;
...
...
tests/system-test/2-query/json_tag.py
浏览文件 @
36b49b50
...
@@ -33,9 +33,9 @@ class TDTestCase:
...
@@ -33,9 +33,9 @@ class TDTestCase:
def
init
(
self
,
conn
,
logSql
):
def
init
(
self
,
conn
,
logSql
):
self
.
testcasePath
=
os
.
path
.
split
(
__file__
)[
0
]
self
.
testcasePath
=
os
.
path
.
split
(
__file__
)[
0
]
self
.
testcaseFilename
=
os
.
path
.
split
(
__file__
)[
-
1
]
self
.
testcaseFilename
=
os
.
path
.
split
(
__file__
)[
-
1
]
os
.
system
(
"rm -rf %s/%s.sql"
%
(
self
.
testcasePath
,
self
.
testcaseFilename
))
#
os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
tdLog
.
debug
(
"start to execute %s"
%
__file__
)
tdLog
.
debug
(
"start to execute %s"
%
__file__
)
tdSql
.
init
(
conn
.
cursor
(),
logSql
)
tdSql
.
init
(
conn
.
cursor
(),
True
)
def
run
(
self
):
def
run
(
self
):
# tdSql.prepare()
# tdSql.prepare()
...
...
tests/system-test/fulltest.sh
浏览文件 @
36b49b50
...
@@ -23,7 +23,7 @@ python3 ./test.py -f 1-insert/alter_stable.py
...
@@ -23,7 +23,7 @@ python3 ./test.py -f 1-insert/alter_stable.py
python3 ./test.py
-f
1-insert/alter_table.py
python3 ./test.py
-f
1-insert/alter_table.py
python3 ./test.py
-f
1-insert/insertWithMoreVgroup.py
python3 ./test.py
-f
1-insert/insertWithMoreVgroup.py
python3 ./test.py
-f
1-insert/table_comment.py
python3 ./test.py
-f
1-insert/table_comment.py
#
python3 ./test.py -f 1-insert/table_param_ttl.py
python3 ./test.py
-f
1-insert/table_param_ttl.py
python3 ./test.py
-f
2-query/between.py
python3 ./test.py
-f
2-query/between.py
python3 ./test.py
-f
2-query/distinct.py
python3 ./test.py
-f
2-query/distinct.py
python3 ./test.py
-f
2-query/varchar.py
python3 ./test.py
-f
2-query/varchar.py
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录