Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
b1573409
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1193
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
b1573409
编写于
12月 13, 2021
作者:
C
Cary Xu
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into hotfix/TS-854
上级
98afcfe4
c4bb51e6
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
60 addition
and
106 deletion
+60
-106
.appveyor.yml
.appveyor.yml
+0
-49
packaging/release.sh
packaging/release.sh
+15
-1
packaging/tools/install_client_jh.sh
packaging/tools/install_client_jh.sh
+0
-6
packaging/tools/install_client_kh.sh
packaging/tools/install_client_kh.sh
+0
-6
packaging/tools/install_client_power.sh
packaging/tools/install_client_power.sh
+0
-6
packaging/tools/install_client_pro.sh
packaging/tools/install_client_pro.sh
+0
-6
packaging/tools/install_client_tq.sh
packaging/tools/install_client_tq.sh
+0
-6
packaging/tools/makeclient.sh
packaging/tools/makeclient.sh
+2
-1
packaging/tools/makeclient_jh.sh
packaging/tools/makeclient_jh.sh
+3
-3
packaging/tools/makeclient_kh.sh
packaging/tools/makeclient_kh.sh
+3
-3
packaging/tools/makeclient_power.sh
packaging/tools/makeclient_power.sh
+3
-3
packaging/tools/makeclient_pro.sh
packaging/tools/makeclient_pro.sh
+3
-3
packaging/tools/makeclient_tq.sh
packaging/tools/makeclient_tq.sh
+3
-3
src/kit/shell/src/shellDarwin.c
src/kit/shell/src/shellDarwin.c
+2
-2
src/kit/shell/src/shellLinux.c
src/kit/shell/src/shellLinux.c
+2
-2
src/kit/shell/src/shellWindows.c
src/kit/shell/src/shellWindows.c
+20
-2
src/kit/taosdemo/taosdemo.c
src/kit/taosdemo/taosdemo.c
+1
-1
src/util/src/tconfig.c
src/util/src/tconfig.c
+3
-3
未找到文件。
.appveyor.yml
已删除
100644 → 0
浏览文件 @
98afcfe4
version
:
1.0.{build}
image
:
-
Visual Studio
2015
-
macos
environment
:
matrix
:
-
ARCH
:
amd64
-
ARCH
:
x86
matrix
:
exclude
:
-
image
:
macos
ARCH
:
x86
for
:
-
matrix
:
only
:
-
image
:
Visual Studio
2015
clone_folder
:
c:\dev\TDengine
clone_depth
:
1
init
:
-
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%
before_build
:
-
cd c:\dev\TDengine
-
md build
build_script
:
-
cd build
-
cmake -G "NMake Makefiles" .. -DBUILD_JDBC=false
-
nmake install
-
matrix
:
only
:
-
image
:
macos
clone_depth
:
1
build_script
:
-
mkdir debug
-
cd debug
-
cmake .. > /dev/null
-
make > /dev/null
notifications
:
-
provider
:
Email
to
:
-
sangshuduo@gmail.com
on_build_success
:
true
on_build_failure
:
true
on_build_status_changed
:
true
packaging/release.sh
浏览文件 @
b1573409
...
...
@@ -349,8 +349,16 @@ if [[ "$dbName" == "kh" ]]; then
sed
-i
"s/taos
\.
cfg/kinghistorian
\.
cfg/g"
${
top_dir
}
/src/util/src/tconfig.c
sed
-i
"s/etc
\/
taos/etc
\/
kinghistorian/g"
${
top_dir
}
/src/util/src/tconfig.c
# src/kit/taosdemo/taosdemo.c
sed
-i
"s/taosdemo --help/khdemo --help/g"
${
top_dir
}
/src/kit/taosdemo/taosdemo.c
sed
-i
"s/taosdemo --usage/khdemo --usage/g"
${
top_dir
}
/src/kit/taosdemo/taosdemo.c
sed
-i
"s/Usage: taosdemo/Usage: khdemo/g"
${
top_dir
}
/src/kit/taosdemo/taosdemo.c
sed
-i
"s/taosdemo is simulating/khdemo is simulating/g"
${
top_dir
}
/src/kit/taosdemo/taosdemo.c
sed
-i
"s/taosdemo version/khdemo version/g"
${
top_dir
}
/src/kit/taosdemo/taosdemo.c
sed
-i
"s/
\"
taosdata
\"
/
\"
khroot
\"
/g"
${
top_dir
}
/src/kit/taosdemo/taosdemo.c
sed
-i
"s/support@taosdata.com/support@wellintech.com/g"
${
top_dir
}
/src/kit/taosdemo/taosdemo.c
sed
-i
"s/taosc, rest, and stmt/khclient, rest, and stmt/g"
${
top_dir
}
/src/kit/taosdemo/taosdemo.c
sed
-i
"s/taosdemo uses/khdemo uses/g"
${
top_dir
}
/src/kit/taosdemo/taosdemo.c
sed
-i
"s/use 'taosc'/use 'khclient'/g"
${
top_dir
}
/src/kit/taosdemo/taosdemo.c
# src/util/src/tlog.c
sed
-i
"s/log
\/
taos/log
\/
kinghistorian/g"
${
top_dir
}
/src/util/src/tlog.c
# src/dnode/src/dnodeSystem.c
...
...
@@ -363,7 +371,7 @@ if [[ "$dbName" == "kh" ]]; then
sed
-i
"s/taosinfo/khinfo/g"
${
top_dir
}
/src/util/src/tnote.c
# src/dnode/CMakeLists.txt
sed
-i
"s/taos
\.
cfg/kinghistorian
\.
cfg/g"
${
top_dir
}
/src/dnode/CMakeLists.txt
# src/
dnode/CMakeLists.txt
# src/
kit/taosdump/taosdump.c
sed
-i
"s/Default is taosdata/Default is khroot/g"
${
top_dir
}
/src/kit/taosdump/taosdump.c
sed
-i
"s/
\"
taosdata
\"
/
\"
khroot
\"
/g"
${
top_dir
}
/src/kit/taosdump/taosdump.c
sed
-i
"s/TDengine/KingHistorian/g"
${
top_dir
}
/src/kit/taosdump/taosdump.c
...
...
@@ -372,6 +380,12 @@ if [[ "$dbName" == "kh" ]]; then
sed
-i
"s/etc
\/
taos/etc
\/
kinghistorian/g"
${
top_dir
}
/src/os/src/linux/linuxEnv.c
sed
-i
"s/lib
\/
taos/lib
\/
kinghistorian/g"
${
top_dir
}
/src/os/src/linux/linuxEnv.c
sed
-i
"s/log
\/
taos/log
\/
kinghistorian/g"
${
top_dir
}
/src/os/src/linux/linuxEnv.c
# src/kit/shell/src/shellDarwin.c
sed
-i
"s/TDengine shell/KingHistorian shell/g"
${
top_dir
}
/src/kit/shell/src/shellDarwin.c
sed
-i
"s/2020 by TAOS Data/2021 by Wellintech/g"
${
top_dir
}
/src/kit/shell/src/shellDarwin.c
# src/kit/shell/src/shellLinux.c
sed
-i
"s/TDengine shell/KingHistorian shell/g"
${
top_dir
}
/src/kit/shell/src/shellLinux.c
sed
-i
"s/2020 by TAOS Data/2021 by Wellintech/g"
${
top_dir
}
/src/kit/shell/src/shellLinux.c
# src/os/src/windows/wEnv.c
sed
-i
"s/TDengine/KingHistorian/g"
${
top_dir
}
/src/os/src/windows/wEnv.c
# src/kit/shell/src/shellEngine.c
...
...
packaging/tools/install_client_jh.sh
浏览文件 @
b1573409
...
...
@@ -188,9 +188,6 @@ function update() {
install_log
install_header
install_lib
if
[
"
$pagMode
"
!=
"lite"
]
;
then
install_connector
fi
install_examples
install_bin
install_config
...
...
@@ -215,9 +212,6 @@ function install() {
install_log
install_header
install_lib
if
[
"
$pagMode
"
!=
"lite"
]
;
then
install_connector
fi
install_examples
install_bin
install_config
...
...
packaging/tools/install_client_kh.sh
浏览文件 @
b1573409
...
...
@@ -189,9 +189,6 @@ function update() {
install_log
install_header
install_lib
if
[
"
$pagMode
"
!=
"lite"
]
;
then
install_connector
fi
install_examples
install_bin
install_config
...
...
@@ -216,9 +213,6 @@ function install() {
install_log
install_header
install_lib
if
[
"
$pagMode
"
!=
"lite"
]
;
then
install_connector
fi
install_examples
install_bin
install_config
...
...
packaging/tools/install_client_power.sh
浏览文件 @
b1573409
...
...
@@ -246,9 +246,6 @@ function update_PowerDB() {
install_log
install_header
install_lib
if
[
"
$pagMode
"
!=
"lite"
]
;
then
install_connector
fi
install_examples
install_bin
install_config
...
...
@@ -274,9 +271,6 @@ function install_PowerDB() {
install_header
install_lib
install_jemalloc
if
[
"
$pagMode
"
!=
"lite"
]
;
then
install_connector
fi
install_examples
install_bin
install_config
...
...
packaging/tools/install_client_pro.sh
浏览文件 @
b1573409
...
...
@@ -188,9 +188,6 @@ function update_prodb() {
install_log
install_header
install_lib
if
[
"
$pagMode
"
!=
"lite"
]
;
then
install_connector
fi
install_examples
install_bin
install_config
...
...
@@ -215,9 +212,6 @@ function install_prodb() {
install_log
install_header
install_lib
if
[
"
$pagMode
"
!=
"lite"
]
;
then
install_connector
fi
install_examples
install_bin
install_config
...
...
packaging/tools/install_client_tq.sh
浏览文件 @
b1573409
...
...
@@ -192,9 +192,6 @@ function update_tq() {
install_log
install_header
install_lib
if
[
"
$pagMode
"
!=
"lite"
]
;
then
install_connector
fi
install_examples
install_bin
install_config
...
...
@@ -219,9 +216,6 @@ function install_tq() {
install_log
install_header
install_lib
if
[
"
$pagMode
"
!=
"lite"
]
;
then
install_connector
fi
install_examples
install_bin
install_config
...
...
packaging/tools/makeclient.sh
浏览文件 @
b1573409
...
...
@@ -46,7 +46,8 @@ if [ "$osType" != "Darwin" ]; then
bin_files
=
"
${
build_dir
}
/bin/taos
${
script_dir
}
/remove_client.sh"
else
bin_files
=
"
${
build_dir
}
/bin/taos
${
build_dir
}
/bin/taosdump
${
build_dir
}
/bin/taosdemo
\
${
script_dir
}
/remove_client.sh
${
script_dir
}
/set_core.sh
${
script_dir
}
/get_client.sh
${
script_dir
}
/taosd-dump-cfg.gdb"
${
script_dir
}
/remove_client.sh
${
script_dir
}
/set_core.sh
${
script_dir
}
/get_client.sh"
#${script_dir}/remove_client.sh ${script_dir}/set_core.sh ${script_dir}/get_client.sh ${script_dir}/taosd-dump-cfg.gdb"
fi
lib_files
=
"
${
build_dir
}
/lib/libtaos.so.
${
version
}
"
else
...
...
packaging/tools/makeclient_jh.sh
浏览文件 @
b1573409
...
...
@@ -69,15 +69,15 @@ if [ "$osType" != "Darwin" ]; then
if
[
"
$pagMode
"
==
"lite"
]
;
then
strip
${
build_dir
}
/bin/taos
cp
${
build_dir
}
/bin/taos
${
install_dir
}
/bin/jh_taos
cp
${
script_dir
}
/remove_jh.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/remove_
client_
jh.sh
${
install_dir
}
/bin
else
cp
${
build_dir
}
/bin/taos
${
install_dir
}
/bin/jh_taos
cp
${
script_dir
}
/remove_jh.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/remove_
client_
jh.sh
${
install_dir
}
/bin
cp
${
build_dir
}
/bin/taosdemo
${
install_dir
}
/bin/jhdemo
cp
${
build_dir
}
/bin/taosdump
${
install_dir
}
/bin/jh_taosdump
cp
${
script_dir
}
/set_core.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/get_client.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/taosd-dump-cfg.gdb
${
install_dir
}
/bin
#
cp ${script_dir}/taosd-dump-cfg.gdb ${install_dir}/bin
fi
else
cp
${
bin_files
}
${
install_dir
}
/bin
...
...
packaging/tools/makeclient_kh.sh
浏览文件 @
b1573409
...
...
@@ -70,15 +70,15 @@ if [ "$osType" != "Darwin" ]; then
if
[
"
$pagMode
"
==
"lite"
]
;
then
strip
${
build_dir
}
/bin/taos
cp
${
build_dir
}
/bin/taos
${
install_dir
}
/bin/khclient
cp
${
script_dir
}
/remove_kh.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/remove_
client_
kh.sh
${
install_dir
}
/bin
else
cp
${
build_dir
}
/bin/taos
${
install_dir
}
/bin/khclient
cp
${
script_dir
}
/remove_kh.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/remove_
client_
kh.sh
${
install_dir
}
/bin
cp
${
build_dir
}
/bin/taosdemo
${
install_dir
}
/bin/khdemo
cp
${
build_dir
}
/bin/taosdump
${
install_dir
}
/bin/khdump
cp
${
script_dir
}
/set_core.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/get_client.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/taosd-dump-cfg.gdb
${
install_dir
}
/bin
#
cp ${script_dir}/taosd-dump-cfg.gdb ${install_dir}/bin
fi
else
cp
${
bin_files
}
${
install_dir
}
/bin
...
...
packaging/tools/makeclient_power.sh
浏览文件 @
b1573409
...
...
@@ -109,15 +109,15 @@ if [ "$osType" != "Darwin" ]; then
if
[
"
$pagMode
"
==
"lite"
]
;
then
strip
${
build_dir
}
/bin/taos
cp
${
build_dir
}
/bin/taos
${
install_dir
}
/bin/power
cp
${
script_dir
}
/remove_power.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/remove_
client_
power.sh
${
install_dir
}
/bin
else
cp
${
build_dir
}
/bin/taos
${
install_dir
}
/bin/power
cp
${
script_dir
}
/remove_power.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/remove_
client_
power.sh
${
install_dir
}
/bin
cp
${
build_dir
}
/bin/taosdemo
${
install_dir
}
/bin/powerdemo
cp
${
build_dir
}
/bin/taosdump
${
install_dir
}
/bin/powerdump
cp
${
script_dir
}
/set_core.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/get_client.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/taosd-dump-cfg.gdb
${
install_dir
}
/bin
#
cp ${script_dir}/taosd-dump-cfg.gdb ${install_dir}/bin
fi
else
cp
${
bin_files
}
${
install_dir
}
/bin
...
...
packaging/tools/makeclient_pro.sh
浏览文件 @
b1573409
...
...
@@ -69,15 +69,15 @@ if [ "$osType" != "Darwin" ]; then
if
[
"
$pagMode
"
==
"lite"
]
;
then
strip
${
build_dir
}
/bin/taos
cp
${
build_dir
}
/bin/taos
${
install_dir
}
/bin/prodbc
cp
${
script_dir
}
/remove_pro.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/remove_
client_
pro.sh
${
install_dir
}
/bin
else
cp
${
build_dir
}
/bin/taos
${
install_dir
}
/bin/prodbc
cp
${
script_dir
}
/remove_pro.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/remove_
client_
pro.sh
${
install_dir
}
/bin
cp
${
build_dir
}
/bin/taosdemo
${
install_dir
}
/bin/prodemo
cp
${
build_dir
}
/bin/taosdump
${
install_dir
}
/bin/prodump
cp
${
script_dir
}
/set_core.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/get_client.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/taosd-dump-cfg.gdb
${
install_dir
}
/bin
#
cp ${script_dir}/taosd-dump-cfg.gdb ${install_dir}/bin
fi
else
cp
${
bin_files
}
${
install_dir
}
/bin
...
...
packaging/tools/makeclient_tq.sh
浏览文件 @
b1573409
...
...
@@ -69,15 +69,15 @@ if [ "$osType" != "Darwin" ]; then
if
[
"
$pagMode
"
==
"lite"
]
;
then
strip
${
build_dir
}
/bin/taos
cp
${
build_dir
}
/bin/taos
${
install_dir
}
/bin/tq
cp
${
script_dir
}
/remove_tq.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/remove_
client_
tq.sh
${
install_dir
}
/bin
else
cp
${
build_dir
}
/bin/taos
${
install_dir
}
/bin/tq
cp
${
script_dir
}
/remove_tq.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/remove_
client_
tq.sh
${
install_dir
}
/bin
cp
${
build_dir
}
/bin/taosdemo
${
install_dir
}
/bin/tqdemo
cp
${
build_dir
}
/bin/taosdump
${
install_dir
}
/bin/tqdump
cp
${
script_dir
}
/set_core.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/get_client.sh
${
install_dir
}
/bin
cp
${
script_dir
}
/taosd-dump-cfg.gdb
${
install_dir
}
/bin
#
cp ${script_dir}/taosd-dump-cfg.gdb ${install_dir}/bin
fi
else
cp
${
bin_files
}
${
install_dir
}
/bin
...
...
src/kit/shell/src/shellDarwin.c
浏览文件 @
b1573409
...
...
@@ -34,10 +34,10 @@ void insertChar(Command *cmd, char *c, int size);
void
printHelp
()
{
char
indent
[
10
]
=
" "
;
printf
(
"taos shell is used to test the
TDengine
database
\n
"
);
printf
(
"taos shell is used to test the database
\n
"
);
printf
(
"%s%s
\n
"
,
indent
,
"-h"
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"
TDengine s
erver IP address to connect. The default host is localhost."
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"
S
erver IP address to connect. The default host is localhost."
);
printf
(
"%s%s
\n
"
,
indent
,
"-p"
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"The password to use when connecting to the server."
);
printf
(
"%s%s
\n
"
,
indent
,
"-P"
);
...
...
src/kit/shell/src/shellLinux.c
浏览文件 @
b1573409
...
...
@@ -37,8 +37,8 @@ const char *argp_program_bug_address = "<support@taosdata.com>";
static
char
doc
[]
=
""
;
static
char
args_doc
[]
=
""
;
static
struct
argp_option
options
[]
=
{
{
"host"
,
'h'
,
"HOST"
,
0
,
"
TDengine s
erver FQDN to connect. The default host is localhost."
},
{
"password"
,
'p'
,
0
,
0
,
"The password to use when connecting to the server."
},
{
"host"
,
'h'
,
"HOST"
,
0
,
"
S
erver FQDN to connect. The default host is localhost."
},
{
"password"
,
'p'
,
0
,
0
,
"The password to use when connecting to the server."
},
{
"port"
,
'P'
,
"PORT"
,
0
,
"The TCP/IP port number to use for the connection."
},
{
"user"
,
'u'
,
"USER"
,
0
,
"The user name to use when connecting to the server."
},
{
"auth"
,
'A'
,
"Auth"
,
0
,
"The auth string to use when connecting to the server."
},
...
...
src/kit/shell/src/shellWindows.c
浏览文件 @
b1573409
...
...
@@ -21,8 +21,26 @@
extern
char
configDir
[];
#ifdef _TD_POWER_
char
WINCLIENT_VERSION
[]
=
"Welcome to the PowerDB shell from %s, Client Version:%s
\n
"
"Copyright (c) 2020 by PowerDB, Inc. All rights reserved.
\n\n
"
;
#elif (_TD_TQ_ == true)
char
WINCLIENT_VERSION
[]
=
"Welcome to the TQ shell from %s, Client Version:%s
\n
"
"Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
\n\n
"
;
#elif (_TD_PRO_ == true)
char
WINCLIENT_VERSION
[]
=
"Welcome to the ProDB shell from %s, Client Version:%s
\n
"
"Copyright (c) 2020 by Hanatech, Inc. All rights reserved.
\n\n
"
;
#elif (_TD_KH_ == true)
char
WINCLIENT_VERSION
[]
=
"Welcome to the KingHistorian shell from %s, Client Version:%s
\n
"
"Copyright (c) 2021 by Wellintech, Inc. All rights reserved.
\n\n
"
;
#elif (_TD_JH_ == true)
char
WINCLIENT_VERSION
[]
=
"Welcome to the jh_iot shell from %s, Client Version:%s
\n
"
"Copyright (c) 2021 by jinheng, Inc. All rights reserved.
\n\n
"
;
#else
char
WINCLIENT_VERSION
[]
=
"Welcome to the TDengine shell from %s, Client Version:%s
\n
"
"Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
\n\n
"
;
#endif
void
printVersion
()
{
printf
(
"version: %s
\n
"
,
version
);
...
...
@@ -30,10 +48,10 @@ void printVersion() {
void
printHelp
()
{
char
indent
[
10
]
=
" "
;
printf
(
"taos shell is used to test the
TDengine
database
\n
"
);
printf
(
"taos shell is used to test the database
\n
"
);
printf
(
"%s%s
\n
"
,
indent
,
"-h"
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"
TDengine s
erver FQDN to connect. The default host is localhost."
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"
S
erver FQDN to connect. The default host is localhost."
);
printf
(
"%s%s
\n
"
,
indent
,
"-p"
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"The password to use when connecting to the server."
);
printf
(
"%s%s
\n
"
,
indent
,
"-P"
);
...
...
src/kit/taosdemo/taosdemo.c
浏览文件 @
b1573409
...
...
@@ -773,7 +773,7 @@ static void printHelp() {
printf
(
"%s%s%s%s
\n
"
,
indent
,
"-c, --config-dir=CONFIG_DIR"
,
"
\t
"
,
"Configuration directory."
);
printf
(
"%s%s%s%s
\n
"
,
indent
,
"-h, --host=HOST"
,
"
\t\t
"
,
"
TDengine s
erver FQDN to connect. The default host is localhost."
);
"
S
erver FQDN to connect. The default host is localhost."
);
printf
(
"%s%s%s%s
\n
"
,
indent
,
"-P, --port=PORT"
,
"
\t\t
"
,
"The TCP/IP port number to use for the connection."
);
printf
(
"%s%s%s%s
\n
"
,
indent
,
"-I, --interface=INTERFACE"
,
"
\t
"
,
...
...
src/util/src/tconfig.c
浏览文件 @
b1573409
...
...
@@ -467,7 +467,7 @@ bool taosReadGlobalCfg() {
}
void
taosPrintGlobalCfg
()
{
uInfo
(
"
taos
config & system info:"
);
uInfo
(
"
config & system info:"
);
uInfo
(
"=================================="
);
for
(
int
i
=
0
;
i
<
tsGlobalConfigNum
;
++
i
)
{
...
...
@@ -553,7 +553,7 @@ static void taosDumpCfg(SGlobalCfg *cfg) {
}
void
taosDumpGlobalCfg
()
{
printf
(
"
taos
global config:
\n
"
);
printf
(
"
global config:
\n
"
);
printf
(
"==================================
\n
"
);
for
(
int
i
=
0
;
i
<
tsGlobalConfigNum
;
++
i
)
{
SGlobalCfg
*
cfg
=
tsGlobalConfig
+
i
;
...
...
@@ -564,7 +564,7 @@ void taosDumpGlobalCfg() {
taosDumpCfg
(
cfg
);
}
printf
(
"
\n
taos
local config:
\n
"
);
printf
(
"
\n
local config:
\n
"
);
printf
(
"==================================
\n
"
);
for
(
int
i
=
0
;
i
<
tsGlobalConfigNum
;
++
i
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录