Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
XKZJ_WCL
TDengine
提交
790c28f2
T
TDengine
项目概览
XKZJ_WCL
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
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,发现更多精彩内容 >>
提交
790c28f2
编写于
8月 29, 2020
作者:
H
Hui Li
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-1228]
上级
2aa54b4e
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
10 addition
and
10 deletion
+10
-10
src/inc/taosdef.h
src/inc/taosdef.h
+1
-1
src/kit/shell/src/shellEngine.c
src/kit/shell/src/shellEngine.c
+1
-1
src/kit/taosdemo/taosdemo.c
src/kit/taosdemo/taosdemo.c
+5
-5
src/os/src/linux/linuxEnv.c
src/os/src/linux/linuxEnv.c
+1
-1
src/util/src/tconfig.c
src/util/src/tconfig.c
+1
-1
src/util/src/tlog.c
src/util/src/tlog.c
+1
-1
未找到文件。
src/inc/taosdef.h
浏览文件 @
790c28f2
...
@@ -85,7 +85,7 @@ extern const int32_t TYPE_BYTES[11];
...
@@ -85,7 +85,7 @@ extern const int32_t TYPE_BYTES[11];
#define TSDB_DATA_NULL_STR_L "null"
#define TSDB_DATA_NULL_STR_L "null"
#define TSDB_DEFAULT_USER "root"
#define TSDB_DEFAULT_USER "root"
#ifdef _TD_
OEM_
POWER_
#ifdef _TD_POWER_
#define TSDB_DEFAULT_PASS "powerdb"
#define TSDB_DEFAULT_PASS "powerdb"
#else
#else
#define TSDB_DEFAULT_PASS "taosdata"
#define TSDB_DEFAULT_PASS "taosdata"
...
...
src/kit/shell/src/shellEngine.c
浏览文件 @
790c28f2
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
#include <regex.h>
#include <regex.h>
/**************** Global variables ****************/
/**************** Global variables ****************/
#ifdef _TD_
OEM_
POWER_
#ifdef _TD_POWER_
char
CLIENT_VERSION
[]
=
"Welcome to the PowerDB shell from %s, Client Version:%s
\n
"
char
CLIENT_VERSION
[]
=
"Welcome to the PowerDB shell from %s, Client Version:%s
\n
"
"Copyright (c) 2017 by PowerDB, Inc. All rights reserved.
\n\n
"
;
"Copyright (c) 2017 by PowerDB, Inc. All rights reserved.
\n\n
"
;
char
PROMPT_HEADER
[]
=
"power> "
;
char
PROMPT_HEADER
[]
=
"power> "
;
...
...
src/kit/taosdemo/taosdemo.c
浏览文件 @
790c28f2
...
@@ -89,7 +89,7 @@ typedef struct DemoArguments {
...
@@ -89,7 +89,7 @@ typedef struct DemoArguments {
{
0
,
'h'
,
"host"
,
0
,
"The host to connect to TDengine. Default is localhost."
,
0
},
{
0
,
'h'
,
"host"
,
0
,
"The host to connect to TDengine. Default is localhost."
,
0
},
{
0
,
'p'
,
"port"
,
0
,
"The TCP/IP port number to use for the connection. Default is 0."
,
1
},
{
0
,
'p'
,
"port"
,
0
,
"The TCP/IP port number to use for the connection. Default is 0."
,
1
},
{
0
,
'u'
,
"user"
,
0
,
"The TDengine user name to use when connecting to the server. Default is 'root'."
,
2
},
{
0
,
'u'
,
"user"
,
0
,
"The TDengine user name to use when connecting to the server. Default is 'root'."
,
2
},
#ifdef _TD_
OEM_
POWER_
#ifdef _TD_POWER_
{
0
,
'P'
,
"password"
,
0
,
"The password to use when connecting to the server. Default is 'powerdb'."
,
3
},
{
0
,
'P'
,
"password"
,
0
,
"The password to use when connecting to the server. Default is 'powerdb'."
,
3
},
#else
#else
{
0
,
'P'
,
"password"
,
0
,
"The password to use when connecting to the server. Default is 'taosdata'."
,
3
},
{
0
,
'P'
,
"password"
,
0
,
"The password to use when connecting to the server. Default is 'taosdata'."
,
3
},
...
@@ -108,7 +108,7 @@ typedef struct DemoArguments {
...
@@ -108,7 +108,7 @@ typedef struct DemoArguments {
{
0
,
'r'
,
"num_of_records_per_req"
,
0
,
"The number of records per request. Default is 1000."
,
10
},
{
0
,
'r'
,
"num_of_records_per_req"
,
0
,
"The number of records per request. Default is 1000."
,
10
},
{
0
,
't'
,
"num_of_tables"
,
0
,
"The number of tables. Default is 10000."
,
11
},
{
0
,
't'
,
"num_of_tables"
,
0
,
"The number of tables. Default is 10000."
,
11
},
{
0
,
'n'
,
"num_of_records_per_table"
,
0
,
"The number of records per table. Default is 100000."
,
12
},
{
0
,
'n'
,
"num_of_records_per_table"
,
0
,
"The number of records per table. Default is 100000."
,
12
},
#ifdef _TD_
OEM_
POWER_
#ifdef _TD_POWER_
{
0
,
'c'
,
"config_directory"
,
0
,
"Configuration directory. Default is '/etc/power/'."
,
14
},
{
0
,
'c'
,
"config_directory"
,
0
,
"Configuration directory. Default is '/etc/power/'."
,
14
},
#else
#else
{
0
,
'c'
,
"config_directory"
,
0
,
"Configuration directory. Default is '/etc/taos/'."
,
14
},
{
0
,
'c'
,
"config_directory"
,
0
,
"Configuration directory. Default is '/etc/taos/'."
,
14
},
...
@@ -287,7 +287,7 @@ typedef struct DemoArguments {
...
@@ -287,7 +287,7 @@ typedef struct DemoArguments {
printf
(
"%s%s
\n
"
,
indent
,
"-u"
);
printf
(
"%s%s
\n
"
,
indent
,
"-u"
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"user, The user name to use when connecting to the server. Default is 'root'."
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"user, The user name to use when connecting to the server. Default is 'root'."
);
printf
(
"%s%s
\n
"
,
indent
,
"-p"
);
printf
(
"%s%s
\n
"
,
indent
,
"-p"
);
#ifdef _TD_
OEM_
POWER_
#ifdef _TD_POWER_
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"password, The password to use when connecting to the server. Default is 'powerdb'."
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"password, The password to use when connecting to the server. Default is 'powerdb'."
);
#else
#else
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"password, The password to use when connecting to the server. Default is 'taosdata'."
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"password, The password to use when connecting to the server. Default is 'taosdata'."
);
...
@@ -321,7 +321,7 @@ typedef struct DemoArguments {
...
@@ -321,7 +321,7 @@ typedef struct DemoArguments {
printf
(
"%s%s
\n
"
,
indent
,
"-n"
);
printf
(
"%s%s
\n
"
,
indent
,
"-n"
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"num_of_records_per_table, The number of records per table. Default is 100000."
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"num_of_records_per_table, The number of records per table. Default is 100000."
);
printf
(
"%s%s
\n
"
,
indent
,
"-c"
);
printf
(
"%s%s
\n
"
,
indent
,
"-c"
);
#ifdef _TD_
OEM_
POWER_
#ifdef _TD_POWER_
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"config_directory, Configuration directory. Default is '/etc/power/'."
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"config_directory, Configuration directory. Default is '/etc/power/'."
);
#else
#else
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"config_directory, Configuration directory. Default is '/etc/taos/'."
);
printf
(
"%s%s%s
\n
"
,
indent
,
indent
,
"config_directory, Configuration directory. Default is '/etc/taos/'."
);
...
@@ -529,7 +529,7 @@ int main(int argc, char *argv[]) {
...
@@ -529,7 +529,7 @@ int main(int argc, char *argv[]) {
SDemoArguments
arguments
=
{
NULL
,
// host
SDemoArguments
arguments
=
{
NULL
,
// host
0
,
// port
0
,
// port
"root"
,
// user
"root"
,
// user
#ifdef _TD_
OEM_
POWER_
#ifdef _TD_POWER_
"powerdb"
,
// password
"powerdb"
,
// password
#else
#else
"taosdata"
,
// password
"taosdata"
,
// password
...
...
src/os/src/linux/linuxEnv.c
浏览文件 @
790c28f2
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
void
osInit
()
{
void
osInit
()
{
#ifdef _TD_
OEM_
POWER_
#ifdef _TD_POWER_
if
(
configDir
[
0
]
==
0
)
{
if
(
configDir
[
0
]
==
0
)
{
strcpy
(
configDir
,
"/etc/power"
);
strcpy
(
configDir
,
"/etc/power"
);
}
}
...
...
src/util/src/tconfig.c
浏览文件 @
790c28f2
...
@@ -260,7 +260,7 @@ void taosReadGlobalLogCfg() {
...
@@ -260,7 +260,7 @@ void taosReadGlobalLogCfg() {
}
}
strcpy
(
configDir
,
full_path
.
we_wordv
[
0
]);
strcpy
(
configDir
,
full_path
.
we_wordv
[
0
]);
}
else
{
}
else
{
#ifdef _TD_
OEM_
POWER_
#ifdef _TD_POWER_
printf
(
"configDir:%s not there, use default value: /etc/power"
,
configDir
);
printf
(
"configDir:%s not there, use default value: /etc/power"
,
configDir
);
strcpy
(
configDir
,
"/etc/power"
);
strcpy
(
configDir
,
"/etc/power"
);
#else
#else
...
...
src/util/src/tlog.c
浏览文件 @
790c28f2
...
@@ -66,7 +66,7 @@ int32_t tsAsyncLog = 1;
...
@@ -66,7 +66,7 @@ int32_t tsAsyncLog = 1;
float
tsTotalLogDirGB
=
0
;
float
tsTotalLogDirGB
=
0
;
float
tsAvailLogDirGB
=
0
;
float
tsAvailLogDirGB
=
0
;
float
tsMinimalLogDirGB
=
0
.
1
f
;
float
tsMinimalLogDirGB
=
0
.
1
f
;
#ifdef _TD_
OEM_
POWER_
#ifdef _TD_POWER_
char
tsLogDir
[
TSDB_FILENAME_LEN
]
=
"/var/log/power"
;
char
tsLogDir
[
TSDB_FILENAME_LEN
]
=
"/var/log/power"
;
#else
#else
char
tsLogDir
[
TSDB_FILENAME_LEN
]
=
"/var/log/taos"
;
char
tsLogDir
[
TSDB_FILENAME_LEN
]
=
"/var/log/taos"
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录