From 790c28f2059f078bb70cf7977f05ead1b63a42db Mon Sep 17 00:00:00 2001 From: Hui Li Date: Sat, 29 Aug 2020 16:07:53 +0800 Subject: [PATCH] [TD-1228] --- src/inc/taosdef.h | 2 +- src/kit/shell/src/shellEngine.c | 2 +- src/kit/taosdemo/taosdemo.c | 10 +++++----- src/os/src/linux/linuxEnv.c | 2 +- src/util/src/tconfig.c | 2 +- src/util/src/tlog.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h index 4c8b448292..cd25ddcc55 100644 --- a/src/inc/taosdef.h +++ b/src/inc/taosdef.h @@ -85,7 +85,7 @@ extern const int32_t TYPE_BYTES[11]; #define TSDB_DATA_NULL_STR_L "null" #define TSDB_DEFAULT_USER "root" -#ifdef _TD_OEM_POWER_ +#ifdef _TD_POWER_ #define TSDB_DEFAULT_PASS "powerdb" #else #define TSDB_DEFAULT_PASS "taosdata" diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c index 18f4feb013..c8df17d6ae 100644 --- a/src/kit/shell/src/shellEngine.c +++ b/src/kit/shell/src/shellEngine.c @@ -30,7 +30,7 @@ #include /**************** Global variables ****************/ -#ifdef _TD_OEM_POWER_ +#ifdef _TD_POWER_ 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"; char PROMPT_HEADER[] = "power> "; diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c index 99fa92adb3..699e96428e 100644 --- a/src/kit/taosdemo/taosdemo.c +++ b/src/kit/taosdemo/taosdemo.c @@ -89,7 +89,7 @@ typedef struct DemoArguments { {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, '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}, #else {0, 'P', "password", 0, "The password to use when connecting to the server. Default is 'taosdata'.", 3}, @@ -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, '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}, - #ifdef _TD_OEM_POWER_ + #ifdef _TD_POWER_ {0, 'c', "config_directory", 0, "Configuration directory. Default is '/etc/power/'.", 14}, #else {0, 'c', "config_directory", 0, "Configuration directory. Default is '/etc/taos/'.", 14}, @@ -287,7 +287,7 @@ typedef struct DemoArguments { 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\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'."); #else 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 { 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\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/'."); #else 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[]) { SDemoArguments arguments = { NULL, // host 0, // port "root", // user - #ifdef _TD_OEM_POWER_ + #ifdef _TD_POWER_ "powerdb", // password #else "taosdata", // password diff --git a/src/os/src/linux/linuxEnv.c b/src/os/src/linux/linuxEnv.c index 6946017e99..14b40a1f18 100644 --- a/src/os/src/linux/linuxEnv.c +++ b/src/os/src/linux/linuxEnv.c @@ -19,7 +19,7 @@ void osInit() { -#ifdef _TD_OEM_POWER_ +#ifdef _TD_POWER_ if (configDir[0] == 0) { strcpy(configDir, "/etc/power"); } diff --git a/src/util/src/tconfig.c b/src/util/src/tconfig.c index a976369287..875c597008 100644 --- a/src/util/src/tconfig.c +++ b/src/util/src/tconfig.c @@ -260,7 +260,7 @@ void taosReadGlobalLogCfg() { } strcpy(configDir, full_path.we_wordv[0]); } else { - #ifdef _TD_OEM_POWER_ + #ifdef _TD_POWER_ printf("configDir:%s not there, use default value: /etc/power", configDir); strcpy(configDir, "/etc/power"); #else diff --git a/src/util/src/tlog.c b/src/util/src/tlog.c index f532e2e93c..766301914a 100644 --- a/src/util/src/tlog.c +++ b/src/util/src/tlog.c @@ -66,7 +66,7 @@ int32_t tsAsyncLog = 1; float tsTotalLogDirGB = 0; float tsAvailLogDirGB = 0; float tsMinimalLogDirGB = 0.1f; -#ifdef _TD_OEM_POWER_ +#ifdef _TD_POWER_ char tsLogDir[TSDB_FILENAME_LEN] = "/var/log/power"; #else char tsLogDir[TSDB_FILENAME_LEN] = "/var/log/taos"; -- GitLab