Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
~笨蛋陪你哭
TDengine
提交
98a1ff7c
T
TDengine
项目概览
~笨蛋陪你哭
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
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,发现更多精彩内容 >>
提交
98a1ff7c
编写于
10月 31, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
revert codes
上级
3909b3c6
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
40 addition
and
40 deletion
+40
-40
src/client/inc/tsclient.h
src/client/inc/tsclient.h
+7
-7
src/client/src/tscSchemaUtil.c
src/client/src/tscSchemaUtil.c
+1
-1
src/client/src/tscServer.c
src/client/src/tscServer.c
+2
-2
src/client/src/tscSystem.c
src/client/src/tscSystem.c
+1
-1
src/common/inc/tglobal.h
src/common/inc/tglobal.h
+7
-7
src/common/src/tglobal.c
src/common/src/tglobal.c
+3
-3
src/dnode/src/dnodeEps.c
src/dnode/src/dnodeEps.c
+2
-2
src/dnode/src/dnodeMInfos.c
src/dnode/src/dnodeMInfos.c
+8
-8
src/dnode/src/dnodeMain.c
src/dnode/src/dnodeMain.c
+5
-5
src/util/src/tconfig.c
src/util/src/tconfig.c
+3
-3
src/vnode/src/vnodeCfg.c
src/vnode/src/vnodeCfg.c
+1
-1
未找到文件。
src/client/inc/tsclient.h
浏览文件 @
98a1ff7c
...
...
@@ -90,12 +90,12 @@ typedef struct STableComInfo {
int32_t
rowSize
;
}
STableComInfo
;
typedef
struct
SC
MC
orVgroupInfo
{
int32_t
version
;
int8_t
inUse
;
int8_t
numOfEps
;
SEpAddr1
epAddr
[
TSDB_MAX_REPLICA
];
}
SC
MC
orVgroupInfo
;
typedef
struct
SCorVgroupInfo
{
int32_t
version
;
int8_t
inUse
;
int8_t
numOfEps
;
SEpAddr1
epAddr
[
TSDB_MAX_REPLICA
];
}
SCorVgroupInfo
;
typedef
struct
STableMeta
{
STableComInfo
tableInfo
;
...
...
@@ -104,7 +104,7 @@ typedef struct STableMeta {
int16_t
tversion
;
char
sTableId
[
TSDB_TABLE_FNAME_LEN
];
SVgroupInfo
vgroupInfo
;
SC
MCorVgroupInfo
corVgroupInfo
;
SC
orVgroupInfo
corVgroupInfo
;
STableId
id
;
SSchema
schema
[];
// if the table is TSDB_CHILD_TABLE, schema is acquired by super table meta info
}
STableMeta
;
...
...
src/client/src/tscSchemaUtil.c
浏览文件 @
98a1ff7c
...
...
@@ -140,7 +140,7 @@ struct SSchema tscGetTbnameColumnSchema() {
strcpy
(
s
.
name
,
TSQL_TBNAME_L
);
return
s
;
}
static
void
tscInitCorVgroupInfo
(
SC
MC
orVgroupInfo
*
corVgroupInfo
,
SVgroupInfo
*
vgroupInfo
)
{
static
void
tscInitCorVgroupInfo
(
SCorVgroupInfo
*
corVgroupInfo
,
SVgroupInfo
*
vgroupInfo
)
{
corVgroupInfo
->
version
=
0
;
corVgroupInfo
->
inUse
=
0
;
corVgroupInfo
->
numOfEps
=
vgroupInfo
->
numOfEps
;
...
...
src/client/src/tscServer.c
浏览文件 @
98a1ff7c
...
...
@@ -100,7 +100,7 @@ void tscUpdateMgmtEpSet(SRpcEpSet *pEpSet) {
tscMgmtEpSet
.
epSet
=
*
pEpSet
;
taosCorEndWrite
(
&
tscMgmtEpSet
.
version
);
}
static
void
tscDumpEpSetFromVgroupInfo
(
SC
MC
orVgroupInfo
*
pVgroupInfo
,
SRpcEpSet
*
pEpSet
)
{
static
void
tscDumpEpSetFromVgroupInfo
(
SCorVgroupInfo
*
pVgroupInfo
,
SRpcEpSet
*
pEpSet
)
{
if
(
pVgroupInfo
==
NULL
)
{
return
;}
taosCorBeginRead
(
&
pVgroupInfo
->
version
);
int8_t
inUse
=
pVgroupInfo
->
inUse
;
...
...
@@ -117,7 +117,7 @@ static void tscUpdateVgroupInfo(SSqlObj *pObj, SRpcEpSet *pEpSet) {
SSqlCmd
*
pCmd
=
&
pObj
->
cmd
;
STableMetaInfo
*
pTableMetaInfo
=
tscGetTableMetaInfoFromCmd
(
pCmd
,
pCmd
->
clauseIndex
,
0
);
if
(
pTableMetaInfo
==
NULL
||
pTableMetaInfo
->
pTableMeta
==
NULL
)
{
return
;}
SC
MC
orVgroupInfo
*
pVgroupInfo
=
&
pTableMetaInfo
->
pTableMeta
->
corVgroupInfo
;
SCorVgroupInfo
*
pVgroupInfo
=
&
pTableMetaInfo
->
pTableMeta
->
corVgroupInfo
;
taosCorBeginWrite
(
&
pVgroupInfo
->
version
);
tscDebug
(
"before: Endpoint in use: %d"
,
pVgroupInfo
->
inUse
);
...
...
src/client/src/tscSystem.c
浏览文件 @
98a1ff7c
...
...
@@ -103,7 +103,7 @@ void taos_init_imp(void) {
}
taosReadGlobalCfg
();
taosCheckGlobalCfg
();
//
taosCheckGlobalCfg();
tscDebug
(
"starting to initialize TAOS client ..."
);
tscDebug
(
"Local End Point is:%s"
,
tsLocalEp
);
...
...
src/common/inc/tglobal.h
浏览文件 @
98a1ff7c
...
...
@@ -183,13 +183,13 @@ extern int32_t debugFlag;
#define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize)
void
taosInitGlobalCfg
();
int32_t
taosCheckGlobalCfg
();
void
taosSetAllDebugFlag
();
bool
taosCfgDynamicOptions
(
char
*
msg
);
int
taosGetFqdnPortFromEp
(
const
char
*
ep
,
char
*
fqdn
,
uint16_t
*
port
);
bool
taosCheckBalanceCfgOptions
(
const
char
*
option
,
int32_t
*
vnodeId
,
int32_t
*
dnodeId
);
void
taosInitGlobalCfg
();
bool
taosCheckGlobalCfg
();
void
taosSetAllDebugFlag
();
bool
taosCfgDynamicOptions
(
char
*
msg
);
int
taosGetFqdnPortFromEp
(
const
char
*
ep
,
char
*
fqdn
,
uint16_t
*
port
);
bool
taosCheckBalanceCfgOptions
(
const
char
*
option
,
int32_t
*
vnodeId
,
int32_t
*
dnodeId
);
#ifdef __cplusplus
}
#endif
...
...
src/common/src/tglobal.c
浏览文件 @
98a1ff7c
...
...
@@ -1316,7 +1316,7 @@ void taosInitGlobalCfg() {
pthread_once
(
&
tsInitGlobalCfgOnce
,
doInitGlobalConfig
);
}
int32_t
taosCheckGlobalCfg
()
{
bool
taosCheckGlobalCfg
()
{
char
fqdn
[
TSDB_FQDN_LEN
];
uint16_t
port
;
...
...
@@ -1375,9 +1375,9 @@ int32_t taosCheckGlobalCfg() {
tsSyncPort
=
tsServerPort
+
TSDB_PORT_SYNC
;
tsHttpPort
=
tsServerPort
+
TSDB_PORT_HTTP
;
taosPrintGlobalCfg
();
//
taosPrintGlobalCfg();
return
0
;
return
true
;
}
int
taosGetFqdnPortFromEp
(
const
char
*
ep
,
char
*
fqdn
,
uint16_t
*
port
)
{
...
...
src/dnode/src/dnodeEps.c
浏览文件 @
98a1ff7c
...
...
@@ -87,7 +87,7 @@ bool dnodeCheckEpChanged(int32_t dnodeId, char *epstr) {
char
epSaved
[
TSDB_EP_LEN
+
1
];
snprintf
(
epSaved
,
TSDB_EP_LEN
,
"%s:%u"
,
ep
->
dnodeFqdn
,
ep
->
dnodePort
);
changed
=
strcmp
(
epstr
,
epSaved
)
!=
0
;
tstrncpy
(
epstr
,
epSaved
,
TSDB_EP_LEN
);
//
tstrncpy(epstr, epSaved, TSDB_EP_LEN);
}
pthread_mutex_unlock
(
&
tsEpsMutex
);
return
changed
;
...
...
@@ -236,7 +236,7 @@ PRASE_EPS_OVER:
dnodeResetEps
(
eps
);
if
(
eps
)
free
(
eps
);
dnodeUpdateEp
(
dnodeGetDnodeId
(),
tsLocalEp
,
tsLocalFqdn
,
&
tsServerPort
);
//
dnodeUpdateEp(dnodeGetDnodeId(), tsLocalEp, tsLocalFqdn, &tsServerPort);
terrno
=
0
;
return
0
;
...
...
src/dnode/src/dnodeMInfos.c
浏览文件 @
98a1ff7c
...
...
@@ -124,10 +124,10 @@ void dnodeGetEpSetForShell(SRpcEpSet *epSet) {
}
static
void
dnodePrintMInfos
(
SMnodeInfos
*
minfos
)
{
dInfo
(
"print mnode infos, mnodeNum:%d inUse:%d"
,
minfos
->
mnodeNum
,
minfos
->
inUse
);
for
(
int32_t
i
=
0
;
i
<
minfos
->
mnodeNum
;
i
++
)
{
dInfo
(
"mnode index:%d, %s"
,
minfos
->
mnodeInfos
[
i
].
mnodeId
,
minfos
->
mnodeInfos
[
i
].
mnodeEp
);
}
//
dInfo("print mnode infos, mnodeNum:%d inUse:%d", minfos->mnodeNum, minfos->inUse);
//
for (int32_t i = 0; i < minfos->mnodeNum; i++) {
//
dInfo("mnode index:%d, %s", minfos->mnodeInfos[i].mnodeId, minfos->mnodeInfos[i].mnodeEp);
//
}
}
static
void
dnodeResetMInfos
(
SMnodeInfos
*
minfos
)
{
...
...
@@ -240,10 +240,10 @@ PARSE_MINFOS_OVER:
if
(
fp
!=
NULL
)
fclose
(
fp
);
terrno
=
0
;
for
(
int32_t
i
=
0
;
i
<
minfos
.
mnodeNum
;
++
i
)
{
SMnodeInfo
*
mInfo
=
&
minfos
.
mnodeInfos
[
i
];
dnodeUpdateEp
(
mInfo
->
mnodeId
,
mInfo
->
mnodeEp
,
NULL
,
NULL
);
}
//
for (int32_t i = 0; i < minfos.mnodeNum; ++i) {
//
SMnodeInfo *mInfo = &minfos.mnodeInfos[i];
//
dnodeUpdateEp(mInfo->mnodeId, mInfo->mnodeEp, NULL, NULL);
//
}
dnodeResetMInfos
(
&
minfos
);
return
0
;
}
...
...
src/dnode/src/dnodeMain.c
浏览文件 @
98a1ff7c
...
...
@@ -58,7 +58,7 @@ static const SDnodeComponent tsDnodeComponents[] = {
{
"dnodecfg"
,
dnodeInitCfg
,
dnodeCleanupCfg
},
{
"dnodeeps"
,
dnodeInitEps
,
dnodeCleanupEps
},
{
"mnodeinfos"
,
dnodeInitMInfos
,
dnodeCleanupMInfos
},
{
"globalcfg"
,
taosCheckGlobalCfg
,
NULL
},
//
{"globalcfg" ,taosCheckGlobalCfg, NULL},
{
"wal"
,
walInit
,
walCleanUp
},
{
"check"
,
dnodeInitCheck
,
dnodeCleanupCheck
},
// NOTES: dnodeInitCheck must be behind the dnodeinitStorage component !!!
{
"vread"
,
dnodeInitVnodeRead
,
dnodeCleanupVnodeRead
},
...
...
@@ -85,9 +85,7 @@ static int dnodeCreateDir(const char *dir) {
static
void
dnodeCleanupComponents
(
int32_t
stepId
)
{
for
(
int32_t
i
=
stepId
;
i
>=
0
;
i
--
)
{
if
(
tsDnodeComponents
[
i
].
cleanup
)
{
(
*
tsDnodeComponents
[
i
].
cleanup
)();
}
tsDnodeComponents
[
i
].
cleanup
();
}
}
...
...
@@ -124,12 +122,14 @@ int32_t dnodeInitSystem() {
printf
(
"failed to init log file
\n
"
);
}
if
(
!
taosReadGlobalCfg
())
{
if
(
!
taosReadGlobalCfg
()
||
!
taosCheckGlobalCfg
()
)
{
taosPrintGlobalCfg
();
dError
(
"TDengine read global config failed"
);
return
-
1
;
}
taosPrintGlobalCfg
();
dInfo
(
"start to initialize TDengine"
);
if
(
dnodeInitComponents
()
!=
0
)
{
...
...
src/util/src/tconfig.c
浏览文件 @
98a1ff7c
...
...
@@ -356,9 +356,9 @@ bool taosReadGlobalCfg() {
taosTFree
(
line
);
if
(
debugFlag
&
DEBUG_TRACE
||
debugFlag
&
DEBUG_DEBUG
||
debugFlag
&
DEBUG_DUMP
)
{
taosSetAllDebugFlag
();
}
//
if (debugFlag & DEBUG_TRACE || debugFlag & DEBUG_DEBUG || debugFlag & DEBUG_DUMP) {
//
taosSetAllDebugFlag();
//
}
return
true
;
}
...
...
src/vnode/src/vnodeCfg.c
浏览文件 @
98a1ff7c
...
...
@@ -72,7 +72,7 @@ int32_t vnodeReadCfg(SVnodeObj *pVnode) {
char
file
[
TSDB_FILENAME_LEN
+
30
]
=
{
0
};
sprintf
(
file
,
"%s/vnode%d/config.json"
,
tsVnodeDir
,
pVnode
->
vgId
);
vnodeMsg
.
cfg
.
vgId
=
pVnode
->
vgId
;
//
vnodeMsg.cfg.vgId = pVnode->vgId;
fp
=
fopen
(
file
,
"r"
);
if
(
!
fp
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录