Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
57ceaed5
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
57ceaed5
编写于
7月 10, 2023
作者:
K
kailixu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: code revert
上级
f16fa6d0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
11 deletion
+10
-11
source/dnode/vnode/inc/vnode.h
source/dnode/vnode/inc/vnode.h
+1
-1
source/dnode/vnode/src/meta/metaQuery.c
source/dnode/vnode/src/meta/metaQuery.c
+0
-1
source/dnode/vnode/src/meta/metaTable.c
source/dnode/vnode/src/meta/metaTable.c
+2
-2
source/dnode/vnode/src/vnd/vnodeQuery.c
source/dnode/vnode/src/vnd/vnodeQuery.c
+7
-7
未找到文件。
source/dnode/vnode/inc/vnode.h
浏览文件 @
57ceaed5
...
@@ -125,7 +125,7 @@ int32_t metaUidFilterCachePut(void *pVnode, uint64_t suid, const void *pKey, in
...
@@ -125,7 +125,7 @@ int32_t metaUidFilterCachePut(void *pVnode, uint64_t suid, const void *pKey, in
int32_t
payloadLen
,
double
selectivityRatio
);
int32_t
payloadLen
,
double
selectivityRatio
);
tb_uid_t
metaGetTableEntryUidByName
(
SMeta
*
pMeta
,
const
char
*
name
);
tb_uid_t
metaGetTableEntryUidByName
(
SMeta
*
pMeta
,
const
char
*
name
);
int32_t
metaGetCachedTbGroup
(
void
*
pVnode
,
tb_uid_t
suid
,
const
uint8_t
*
pKey
,
int32_t
keyLen
,
SArray
**
pList
);
int32_t
metaGetCachedTbGroup
(
void
*
pVnode
,
tb_uid_t
suid
,
const
uint8_t
*
pKey
,
int32_t
keyLen
,
SArray
**
pList
);
int32_t
metaPutTbGroupToCache
(
void
*
pVnode
,
uint64_t
suid
,
const
void
*
pKey
,
int32_t
keyLen
,
void
*
pPayload
,
int32_t
metaPutTbGroupToCache
(
void
*
pVnode
,
uint64_t
suid
,
const
void
*
pKey
,
int32_t
keyLen
,
void
*
pPayload
,
int32_t
payloadLen
);
int32_t
payloadLen
);
bool
metaTbInFilterCache
(
void
*
pVnode
,
tb_uid_t
suid
,
int8_t
type
);
bool
metaTbInFilterCache
(
void
*
pVnode
,
tb_uid_t
suid
,
int8_t
type
);
int32_t
metaPutTbToFilterCache
(
void
*
pVnode
,
tb_uid_t
suid
,
int8_t
type
);
int32_t
metaPutTbToFilterCache
(
void
*
pVnode
,
tb_uid_t
suid
,
int8_t
type
);
...
...
source/dnode/vnode/src/meta/metaQuery.c
浏览文件 @
57ceaed5
...
@@ -671,7 +671,6 @@ int64_t metaGetTbNum(SMeta *pMeta) {
...
@@ -671,7 +671,6 @@ int64_t metaGetTbNum(SMeta *pMeta) {
// N.B. Called by statusReq per second
// N.B. Called by statusReq per second
int64_t
metaGetTimeSeriesNum
(
SMeta
*
pMeta
)
{
int64_t
metaGetTimeSeriesNum
(
SMeta
*
pMeta
)
{
fprintf
(
stderr
,
"@@@@@@@ %s:%d called @@@@@@@@@: vgId:%d, second:%d
\n
"
,
__func__
,
__LINE__
,
TD_VID
(
pMeta
->
pVnode
),
taosGetTimestampSec
());
// sum of (number of columns of stable - 1) * number of ctables (excluding timestamp column)
// sum of (number of columns of stable - 1) * number of ctables (excluding timestamp column)
if
(
pMeta
->
pVnode
->
config
.
vndStats
.
numOfTimeSeries
<=
0
||
if
(
pMeta
->
pVnode
->
config
.
vndStats
.
numOfTimeSeries
<=
0
||
++
pMeta
->
pVnode
->
config
.
vndStats
.
itvTimeSeries
%
(
60
*
5
)
==
0
)
{
++
pMeta
->
pVnode
->
config
.
vndStats
.
itvTimeSeries
%
(
60
*
5
)
==
0
)
{
...
...
source/dnode/vnode/src/meta/metaTable.c
浏览文件 @
57ceaed5
...
@@ -232,7 +232,7 @@ int metaCreateSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
...
@@ -232,7 +232,7 @@ int metaCreateSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
++
pMeta
->
pVnode
->
config
.
vndStats
.
numOfSTables
;
++
pMeta
->
pVnode
->
config
.
vndStats
.
numOfSTables
;
meta
Error
(
"vgId:%d, stb:%s is created, suid:%"
PRId64
,
TD_VID
(
pMeta
->
pVnode
),
pReq
->
name
,
pReq
->
suid
);
meta
Debug
(
"vgId:%d, stb:%s is created, suid:%"
PRId64
,
TD_VID
(
pMeta
->
pVnode
),
pReq
->
name
,
pReq
->
suid
);
return
0
;
return
0
;
...
@@ -798,7 +798,7 @@ int metaCreateTable(SMeta *pMeta, int64_t ver, SVCreateTbReq *pReq, STableMetaRs
...
@@ -798,7 +798,7 @@ int metaCreateTable(SMeta *pMeta, int64_t ver, SVCreateTbReq *pReq, STableMetaRs
}
}
}
}
meta
Error
(
"vgId:%d, table:%s uid %"
PRId64
" is created, type:%"
PRId8
,
TD_VID
(
pMeta
->
pVnode
),
pReq
->
name
,
pReq
->
uid
,
meta
Debug
(
"vgId:%d, table:%s uid %"
PRId64
" is created, type:%"
PRId8
,
TD_VID
(
pMeta
->
pVnode
),
pReq
->
name
,
pReq
->
uid
,
pReq
->
type
);
pReq
->
type
);
return
0
;
return
0
;
...
...
source/dnode/vnode/src/vnd/vnodeQuery.c
浏览文件 @
57ceaed5
...
@@ -410,9 +410,9 @@ void vnodeResetLoad(SVnode *pVnode, SVnodeLoad *pLoad) {
...
@@ -410,9 +410,9 @@ void vnodeResetLoad(SVnode *pVnode, SVnodeLoad *pLoad) {
"nBatchInsertSuccess"
);
"nBatchInsertSuccess"
);
}
}
void
vnodeGetInfo
(
void
*
pVnode
,
const
char
**
dbname
,
int32_t
*
vgId
,
int64_t
*
numOfTables
,
int64_t
*
numOfNormalTables
)
{
void
vnodeGetInfo
(
void
*
pVnode
,
const
char
**
dbname
,
int32_t
*
vgId
,
int64_t
*
numOfTables
,
int64_t
*
numOfNormalTables
)
{
SVnode
*
pVnodeObj
=
pVnode
;
SVnode
*
pVnodeObj
=
pVnode
;
SVnodeCfg
*
pConf
=
&
pVnodeObj
->
config
;
SVnodeCfg
*
pConf
=
&
pVnodeObj
->
config
;
if
(
dbname
)
{
if
(
dbname
)
{
*
dbname
=
pConf
->
dbname
;
*
dbname
=
pConf
->
dbname
;
...
@@ -431,7 +431,7 @@ void vnodeGetInfo(void *pVnode, const char **dbname, int32_t *vgId, int64_t *num
...
@@ -431,7 +431,7 @@ void vnodeGetInfo(void *pVnode, const char **dbname, int32_t *vgId, int64_t *num
}
}
}
}
int32_t
vnodeGetTableList
(
void
*
pVnode
,
int8_t
type
,
SArray
*
pList
)
{
int32_t
vnodeGetTableList
(
void
*
pVnode
,
int8_t
type
,
SArray
*
pList
)
{
if
(
type
==
TSDB_SUPER_TABLE
)
{
if
(
type
==
TSDB_SUPER_TABLE
)
{
return
vnodeGetStbIdList
(
pVnode
,
0
,
pList
);
return
vnodeGetStbIdList
(
pVnode
,
0
,
pList
);
}
else
{
}
else
{
...
@@ -555,7 +555,7 @@ static int32_t vnodeGetStbColumnNum(SVnode *pVnode, tb_uid_t suid, int *num) {
...
@@ -555,7 +555,7 @@ static int32_t vnodeGetStbColumnNum(SVnode *pVnode, tb_uid_t suid, int *num) {
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
#if
n
def TD_ENTERPRISE
#ifdef TD_ENTERPRISE
#define TK_LOG_STB_NUM 19
#define TK_LOG_STB_NUM 19
static
const
char
*
tkLogStb
[
TK_LOG_STB_NUM
]
=
{
"cluster_info"
,
static
const
char
*
tkLogStb
[
TK_LOG_STB_NUM
]
=
{
"cluster_info"
,
"data_dir"
,
"data_dir"
,
...
@@ -673,12 +673,12 @@ void *vnodeGetIdx(void *pVnode) {
...
@@ -673,12 +673,12 @@ void *vnodeGetIdx(void *pVnode) {
return
NULL
;
return
NULL
;
}
}
return
metaGetIdx
(((
SVnode
*
)
pVnode
)
->
pMeta
);
return
metaGetIdx
(((
SVnode
*
)
pVnode
)
->
pMeta
);
}
}
void
*
vnodeGetIvtIdx
(
void
*
pVnode
)
{
void
*
vnodeGetIvtIdx
(
void
*
pVnode
)
{
if
(
pVnode
==
NULL
)
{
if
(
pVnode
==
NULL
)
{
return
NULL
;
return
NULL
;
}
}
return
metaGetIvtIdx
(((
SVnode
*
)
pVnode
)
->
pMeta
);
return
metaGetIvtIdx
(((
SVnode
*
)
pVnode
)
->
pMeta
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录