remove oem infos

CMakeLists.txt

@@ -50,7 +50,6 @@ SET(TD_MEM_CHECK FALSE)
 
 SET(TD_PAGMODE_LITE FALSE)
 SET(TD_SOMODE_STATIC FALSE)
-SET(TD_POWER FALSE)
 SET(TD_GODLL FALSE)
 
 SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})

cmake/define.inc

@@ -41,26 +41,6 @@ IF (TD_GODLL)
   ADD_DEFINITIONS(-D_TD_GO_DLL_)
 ENDIF ()
 
-IF (TD_POWER)
-  ADD_DEFINITIONS(-D_TD_POWER_)
-ENDIF ()
-
-IF (TD_TQ)
-  ADD_DEFINITIONS(-D_TD_TQ_)
-ENDIF ()
-
-IF (TD_PRO)
-  ADD_DEFINITIONS(-D_TD_PRO_)
-ENDIF ()
-
-IF (TD_KH)
-  ADD_DEFINITIONS(-D_TD_KH_)
-ENDIF ()
-
-IF (TD_JH)
-  ADD_DEFINITIONS(-D_TD_JH_)
-ENDIF ()
-
 IF (TD_MEM_CHECK)
   ADD_DEFINITIONS(-DTAOS_MEM_CHECK)
 ENDIF ()

cmake/input.inc

@@ -43,23 +43,6 @@ IF (${SOMODE} MATCHES "static")
   MESSAGE(STATUS "Link so using static mode")
 ENDIF ()
 
-IF (${DBNAME} MATCHES "power")
-  SET(TD_POWER TRUE)
-  MESSAGE(STATUS "power is true")
-ELSEIF (${DBNAME} MATCHES "tq")
-  SET(TD_TQ TRUE)
-  MESSAGE(STATUS "tq is true")
-ELSEIF (${DBNAME} MATCHES "pro")
-  SET(TD_PRO TRUE)
-  MESSAGE(STATUS "pro is true")
-ELSEIF (${DBNAME} MATCHES "kh")
-  SET(TD_KH TRUE)
-  MESSAGE(STATUS "kh is true")
-ELSEIF (${DBNAME} MATCHES "jh")
-  SET(TD_JH TRUE)
-  MESSAGE(STATUS "jh is true")
-ENDIF ()
-
 IF (${DLLTYPE} MATCHES "go")
   SET(TD_GODLL TRUE)
   MESSAGE(STATUS "input dll type: " ${DLLTYPE})

cmake/install.inc

@@ -3,48 +3,24 @@ IF (TD_LINUX)
   INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
   INSTALL(CODE "execute_process(COMMAND bash ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR} Linux ${TD_VER_NUMBER})")
 ELSEIF (TD_WINDOWS)
-  IF (TD_POWER)
-    SET(CMAKE_INSTALL_PREFIX C:/PowerDB)
-  ELSEIF (TD_TQ)
-    SET(CMAKE_INSTALL_PREFIX C:/TQueue)
-  ELSEIF (TD_PRO)
-    SET(CMAKE_INSTALL_PREFIX C:/ProDB)
-  ELSEIF (TD_KH)
-    SET(CMAKE_INSTALL_PREFIX C:/KingHistorian)
-  ELSEIF (TD_JH)
-    SET(CMAKE_INSTALL_PREFIX C:/jh_iot)
-  ELSE ()
-    SET(CMAKE_INSTALL_PREFIX C:/TDengine)
-  ENDIF ()
+  SET(CMAKE_INSTALL_PREFIX C:/TDengine)
 
   INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/go     DESTINATION connector)
   INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/nodejs DESTINATION connector)
   INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/python DESTINATION connector)
   INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/C\# DESTINATION connector)
   INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/tests/examples DESTINATION .)
-  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/packaging/cfg DESTINATION .)
+  
+  INSTALL(FILES ${TD_COMMUNITY_DIR}/packaging/cfg/taos.cfg DESTINATION cfg)
+  
   INSTALL(FILES ${TD_COMMUNITY_DIR}/src/inc/taos.h DESTINATION include)
   INSTALL(FILES ${TD_COMMUNITY_DIR}/src/inc/taoserror.h DESTINATION include)
   INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver)
   INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.exp DESTINATION driver)
   INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver)
 
-  IF (TD_POWER)
-    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/power.exe DESTINATION .)
-  ELSEIF (TD_TQ)
-    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/tq.exe DESTINATION .)
-  ELSEIF (TD_PRO)
-    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/prodbc.exe DESTINATION .)
-  ELSEIF (TD_KH)
-    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/khclient.exe DESTINATION .)
-  ELSEIF (TD_JH)
-    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/jh_taos.exe DESTINATION .)
-  ELSE ()
-    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)
-  ENDIF ()
+  INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)
 
-  #INSTALL(TARGETS taos RUNTIME DESTINATION driver)
-  #INSTALL(TARGETS shell RUNTIME DESTINATION .)
   IF (TD_MVN_INSTALLED)
     INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.36-dist.jar DESTINATION connector/jdbc)
   ENDIF ()

src/client/src/tscSystem.c

@@ -47,17 +47,7 @@ int32_t    tscNumOfObj = 0;         // number of sqlObj in current process.
 static void  *tscCheckDiskUsageTmr;
 void      *tscRpcCache;            // cache to keep rpc obj
 int32_t    tscNumOfThreads = 1;     // num of rpc threads
-#ifdef _TD_POWER_
-char       tscLogFileName[12] = "powerlog";
-#elif (_TD_TQ_ == true)
-char       tscLogFileName[12] = "tqlog";
-#elif (_TD_PRO_ == true)
-char       tscLogFileName[12] = "prolog";
-#elif (_TD_KH_ == true)
-char       tscLogFileName[12] = "khclientlog";
-#else
 char       tscLogFileName[12] = "taoslog";
-#endif
 int        tscLogFileNum = 10;
 
 static pthread_mutex_t rpcObjMutex; // mutex to protect open the rpc obj concurrently

src/inc/taosdef.h

@@ -85,20 +85,7 @@ extern const int32_t TYPE_BYTES[16];
 #define TSDB_DATA_NULL_STR_L            "null"
 
 #define TSDB_DEFAULT_USER               "root"
-
-#ifdef _TD_POWER_
-#define TSDB_DEFAULT_PASS               "powerdb"
-#elif (_TD_TQ_ == true)
-#define TSDB_DEFAULT_PASS               "tqueue"
-#elif (_TD_PRO_ == true)
-#define TSDB_DEFAULT_PASS               "prodb"
-#elif (_TD_KH_ == true)
-#define TSDB_DEFAULT_PASS               "khroot"
-#elif (_TD_JH_ == true)
-#define TSDB_DEFAULT_PASS               "jhdata"
-#else
 #define TSDB_DEFAULT_PASS               "taosdata"
-#endif
 
 #define SHELL_MAX_PASSWORD_LEN          20
 

src/kit/shell/CMakeLists.txt

@@ -38,19 +38,7 @@ ELSEIF (TD_WINDOWS)
 
   TARGET_LINK_LIBRARIES(shell taos_static cJson)
 
-  IF (TD_POWER)
-    SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME power)
-  ELSEIF (TD_TQ)
-    SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME tq)
-  ELSEIF (TD_PRO)
-    SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME prodbc)
-  ELSEIF (TD_KH)
-    SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME khclient)
-  ELSEIF (TD_JH)
-    SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME jh_taos)
-  ELSE ()
-    SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
-  ENDIF ()
+  SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
 ELSEIF (TD_DARWIN)
   LIST(APPEND SRC ./src/shellEngine.c)
   LIST(APPEND SRC ./src/shellMain.c)

src/kit/shell/inc/shell.h

@@ -27,21 +27,7 @@
 #define MAX_IP_SIZE            20
 #define MAX_HISTORY_SIZE       1000
 #define MAX_COMMAND_SIZE       1048586
-
-#ifdef _TD_POWER_
-    #define HISTORY_FILE           ".power_history"
-#elif (_TD_TQ_ == true)
-    #define HISTORY_FILE           ".tq_history"
-#elif (_TD_PRO_ == true)
-    #define HISTORY_FILE           ".prodb_history"
-#elif (_TD_KH_ == true)
-    #define HISTORY_FILE           ".kh_history"
-#elif (_TD_JH_ == true)
-    #define HISTORY_FILE           ".jh_taos_history"
-#else
-    #define HISTORY_FILE           ".taos_history"
-#endif
-
+#define HISTORY_FILE           ".taos_history"
 #define DEFAULT_RES_SHOW_NUM   100
 
 typedef struct SShellHistory {

src/kit/shell/src/shellEngine.c

@@ -30,43 +30,11 @@
 #include <regex.h>
 
 /**************** Global variables ****************/
-#ifdef _TD_POWER_
-char      CLIENT_VERSION[] = "Welcome to the PowerDB shell from %s, Client Version:%s\n"
-                             "Copyright (c) 2020 by PowerDB, Inc. All rights reserved.\n\n";
-char      PROMPT_HEADER[] = "power> ";
-char      CONTINUE_PROMPT[] = "    -> ";
-int       prompt_size = 7;
-#elif (_TD_TQ_ == true)
-char      CLIENT_VERSION[] = "Welcome to the TQ shell from %s, Client Version:%s\n"
-                             "Copyright (c) 2020 by TQ, Inc. All rights reserved.\n\n";
-char      PROMPT_HEADER[] = "tq> ";
-char      CONTINUE_PROMPT[] = " -> ";
-int       prompt_size = 4;
-#elif (_TD_PRO_ == true)
-char      CLIENT_VERSION[] = "Welcome to the ProDB shell from %s, Client Version:%s\n"
-                             "Copyright (c) 2020 by Hanatech, Inc. All rights reserved.\n\n";
-char      PROMPT_HEADER[] = "ProDB> ";
-char      CONTINUE_PROMPT[] = "    -> ";
-int       prompt_size = 7;
-#elif (_TD_KH_ == true)
-char      CLIENT_VERSION[] = "Welcome to the KingHistorian shell from %s, Client Version:%s\n"
-                             "Copyright (c) 2021 by Hanatech, Inc. All rights reserved.\n\n";
-char      PROMPT_HEADER[] = "kh> ";
-char      CONTINUE_PROMPT[] = " -> ";
-int       prompt_size = 4;
-#elif (_TD_JH_ == true)
-char      CLIENT_VERSION[] = "Welcome to the jh_iot shell from %s, Client Version:%s\n"
-                             "Copyright (c) 2021 by jinheng, Inc. All rights reserved.\n\n";
-char      PROMPT_HEADER[] = "jh_taos> ";
-char      CONTINUE_PROMPT[] = "      -> ";
-int       prompt_size = 9;
-#else
 char      CLIENT_VERSION[] = "Welcome to the TDengine shell from %s, Client Version:%s\n"
                              "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
 char      PROMPT_HEADER[] = "taos> ";
 char      CONTINUE_PROMPT[] = "   -> ";
 int       prompt_size = 6;
-#endif
 
 int64_t result = 0;
 SShellHistory   history;

src/kit/shell/src/shellWindows.c

@@ -333,19 +333,7 @@ void *shellLoopQuery(void *arg) {
 }
 
 void get_history_path(char *history) {
-#ifdef _TD_POWER_
-  sprintf(history, "C:/PowerDB/%s", HISTORY_FILE); 
-#elif (_TD_TQ_ == true)
-  sprintf(history, "C:/TQueue/%s", HISTORY_FILE); 
-#elif (_TD_PRO_ == true)
-  sprintf(history, "C:/ProDB/%s", HISTORY_FILE); 
-#elif (_TD_KH_ == true)
-  sprintf(history, "C:/KingHistorian/%s", HISTORY_FILE); 
-#elif (_TD_JH_ == true)
-  sprintf(history, "C:/jh_iot/%s", HISTORY_FILE); 
-#else
   sprintf(history, "C:/TDengine/%s", HISTORY_FILE); 
-#endif
 }
 
 void exitShell() { exit(EXIT_SUCCESS); }

src/os/src/linux/linuxEnv.c

@@ -18,50 +18,12 @@
 #include "tglobal.h"
 
 void osInit() {
-#ifdef _TD_POWER_
-  if (configDir[0] == 0) {
-    strcpy(configDir, "/etc/power");
-  }
-  strcpy(tsDataDir, "/var/lib/power");
-  strcpy(tsLogDir, "/var/log/power");
-  strcpy(tsScriptDir, "/etc/power");
-#elif (_TD_TQ_ == true)
-	if (configDir[0] == 0) {
-	  strcpy(configDir, "/etc/tq");
-	}
-	strcpy(tsDataDir, "/var/lib/tq");
-	strcpy(tsLogDir, "/var/log/tq");
-	strcpy(tsScriptDir, "/etc/tq");
-#elif (_TD_PRO_ == true)
-	if (configDir[0] == 0) {
-	  strcpy(configDir, "/etc/ProDB");
-	}
-	strcpy(tsDataDir, "/var/lib/ProDB");
-	strcpy(tsLogDir, "/var/log/ProDB");
-	strcpy(tsScriptDir, "/etc/ProDB");
-#elif (_TD_KH_ == true)
-	if (configDir[0] == 0) {
-	  strcpy(configDir, "/etc/kinghistorian");
-	}
-	strcpy(tsDataDir, "/var/lib/kinghistorian");
-	strcpy(tsLogDir, "/var/log/kinghistorian");
-	strcpy(tsScriptDir, "/etc/kinghistorian");
-#elif (_TD_JH_ == true)
-	if (configDir[0] == 0) {
-	  strcpy(configDir, "/etc/jh_taos");
-	}
-	strcpy(tsDataDir, "/var/lib/jh_taos");
-	strcpy(tsLogDir, "/var/log/jh_taos");
-	strcpy(tsScriptDir, "/etc/jh_taos");
-#else
   if (configDir[0] == 0) {
     strcpy(configDir, "/etc/taos");
   }
   strcpy(tsDataDir, "/var/lib/taos");
   strcpy(tsLogDir, "/var/log/taos");
   strcpy(tsScriptDir, "/etc/taos");
-#endif
-
   strcpy(tsVnodeDir, "");
   strcpy(tsDnodeDir, "");
   strcpy(tsMnodeDir, "");

src/os/src/windows/wEnv.c

@@ -22,58 +22,13 @@ extern void taosWinSocketInit();
 
 void osInit() {
   taosSetCoreDump();
-#ifdef _TD_POWER_
-  if (configDir[0] == 0) {
-    strcpy(configDir, "C:/PowerDB/cfg");
-  }
-
-  strcpy(tsVnodeDir, "C:/PowerDB/data");
-  strcpy(tsDataDir, "C:/PowerDB/data");
-  strcpy(tsLogDir, "C:/PowerDB/log");
-  strcpy(tsScriptDir, "C:/PowerDB/script");
-#elif (_TD_TQ_ == true)
-  if (configDir[0] == 0) {
-    strcpy(configDir, "C:/TQueue/cfg");
-  }
-  strcpy(tsVnodeDir, "C:/TQueue/data");
-  strcpy(tsDataDir, "C:/TQueue/data");
-  strcpy(tsLogDir, "C:/TQueue/log");
-  strcpy(tsScriptDir, "C:/TQueue/script");
-#elif (_TD_PRO_ == true)
-  if (configDir[0] == 0) {
-    strcpy(configDir, "C:/ProDB/cfg");
-  }
-  strcpy(tsVnodeDir, "C:/ProDB/data");
-  strcpy(tsDataDir, "C:/ProDB/data");
-  strcpy(tsLogDir, "C:/ProDB/log");
-  strcpy(tsScriptDir, "C:/ProDB/script");
-#elif (_TD_KH_ == true)
-  if (configDir[0] == 0) {
-    strcpy(configDir, "C:/KingHistorian/cfg");
-  }
-  strcpy(tsVnodeDir, "C:/KingHistorian/data");
-  strcpy(tsDataDir, "C:/KingHistorian/data");
-  strcpy(tsLogDir, "C:/KingHistorian/log");
-  strcpy(tsScriptDir, "C:/KingHistorian/script");
-#elif (_TD_JH_ == true)
-  if (configDir[0] == 0) {
-    strcpy(configDir, "C:/jh_iot/cfg");
-  }
-  strcpy(tsVnodeDir, "C:/jh_iot/data");
-  strcpy(tsDataDir, "C:/jh_iot/data");
-  strcpy(tsLogDir, "C:/jh_iot/log");
-  strcpy(tsScriptDir, "C:/jh_iot/script");
-#else
   if (configDir[0] == 0) {
     strcpy(configDir, "C:/TDengine/cfg");
   }
-
   strcpy(tsVnodeDir, "C:/TDengine/data");
   strcpy(tsDataDir, "C:/TDengine/data");
   strcpy(tsLogDir, "C:/TDengine/log");
   strcpy(tsScriptDir, "C:/TDengine/script");
-#endif
-
   strcpy(tsDnodeDir, "");
   strcpy(tsMnodeDir, "");  
   strcpy(tsOsName, "Windows");

src/util/src/tconfig.c

@@ -374,25 +374,8 @@ void taosReadGlobalLogCfg() {
     }
     strcpy(configDir, full_path.we_wordv[0]);
   } else {
-    #ifdef _TD_POWER_
-    printf("configDir:%s not there, use default value: /etc/power", configDir);
-    strcpy(configDir, "/etc/power");
-	#elif (_TD_TQ_ == true)
-    printf("configDir:%s not there, use default value: /etc/tq", configDir);
-    strcpy(configDir, "/etc/tq");
-	#elif (_TD_PRO_ == true)
-    printf("configDir:%s not there, use default value: /etc/ProDB", configDir);
-    strcpy(configDir, "/etc/ProDB");
-	#elif (_TD_KH_ == true)
-    printf("configDir:%s not there, use default value: /etc/kinghistorian", configDir);
-    strcpy(configDir, "/etc/kinghistorian");
-	#elif (_TD_JH_ == true)
-    printf("configDir:%s not there, use default value: /etc/jh_taos", configDir);
-    strcpy(configDir, "/etc/jh_taos");
-    #else
     printf("configDir:%s not there, use default value: /etc/taos", configDir);
     strcpy(configDir, "/etc/taos");
-    #endif
   }
   wordfree(&full_path);
 

src/util/src/tlog.c

@@ -80,20 +80,7 @@ int64_t dbgWN = 0;
 int64_t dbgSmallWN = 0;
 int64_t dbgBigWN = 0;
 int64_t dbgWSize = 0;
-
-#ifdef _TD_POWER_
-char    tsLogDir[TSDB_FILENAME_LEN] = "/var/log/power";
-#elif (_TD_TQ_ == true)
-char    tsLogDir[TSDB_FILENAME_LEN] = "/var/log/tq";
-#elif (_TD_PRO_ == true)
-char    tsLogDir[TSDB_FILENAME_LEN] = "/var/log/ProDB";
-#elif (_TD_KH_ == true)
-char    tsLogDir[TSDB_FILENAME_LEN] = "/var/log/kinghistorian";
-#elif (_TD_JH_ == true)
-char    tsLogDir[TSDB_FILENAME_LEN] = "/var/log/jh_taos";
-#else
 char    tsLogDir[PATH_MAX] = "/var/log/taos";
-#endif
 
 static SLogObj   tsLogObj = { .fileNum = 1 };
 static void *    taosAsyncOutputLog(void *param);