Merge pull request #8830 from taosdata/release/TS-744

[TS-744]<release>: kh release script modify

cmake/install.inc

@@ -17,12 +17,6 @@ ELSEIF (TD_WINDOWS)
     SET(CMAKE_INSTALL_PREFIX C:/TDengine)
   ENDIF ()
 
-  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}/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)
@@ -30,16 +24,27 @@ ELSEIF (TD_WINDOWS)
   INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver)
 
   IF (TD_POWER)
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/packaging/cfg DESTINATION .)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/power.exe DESTINATION .)
   ELSEIF (TD_TQ)
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/packaging/cfg DESTINATION .)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/tq.exe DESTINATION .)
   ELSEIF (TD_PRO)
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/packaging/cfg DESTINATION .)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/prodbc.exe DESTINATION .)
   ELSEIF (TD_KH)
+    INSTALL(FILES ${TD_COMMUNITY_DIR}/packaging/cfg/kinghistorian.cfg DESTINATION cfg)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/khclient.exe DESTINATION .)
   ELSEIF (TD_JH)
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/packaging/cfg DESTINATION .)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/jh_taos.exe DESTINATION .)
   ELSE ()
+    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(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taosdemo.exe DESTINATION .)
   ENDIF ()

packaging/cfg/kinghistorian.cfg

+########################################################
+#                                                      #
+#             KingHistorian Configuration              #
+#   Any questions, please email support@wellintech.com #
+#                                                      #
+########################################################
+
+# first fully qualified domain name (FQDN) for KingHistorian system
+# firstEp                   hostname:6030
+
+# local fully qualified domain name (FQDN)
+# fqdn                      hostname
+
+# first port number for the connection (12 continuous UDP/TCP port number are used) 
+# serverPort                6030
+
+# log file's directory
+# logDir                    /var/log/kinghistorian
+
+# data file's directory
+# dataDir                   /var/lib/kinghistorian
+
+# temporary file's directory
+# tempDir                   /tmp/
+
+# the arbitrator's fully qualified domain name (FQDN) for KingHistorian system, for cluster only   
+# arbitrator                arbitrator_hostname:6042     
+
+# number of threads per CPU core
+# numOfThreadsPerCore       1.0
+
+# number of threads to commit cache data
+# numOfCommitThreads        4
+
+# the proportion of total CPU cores available for query processing
+# 2.0: the query threads will be set to double of the CPU cores.
+# 1.0: all CPU cores are available for query processing [default].
+# 0.5: only half of the CPU cores are available for query.
+# 0.0: only one core available.
+# ratioOfQueryCores        1.0
+
+# the last_row/first/last aggregator will not change the original column name in the result fields
+keepColumnName            1
+
+# number of management nodes in the system
+# numOfMnodes               3
+
+# enable/disable backuping vnode directory when removing vnode
+# vnodeBak                  1
+
+# enable/disable installation / usage report
+# telemetryReporting        1
+
+# enable/disable load balancing
+# balance                   1
+
+# role for dnode. 0 - any, 1 - mnode, 2 - dnode
+# role                      0
+
+# max timer control blocks
+# maxTmrCtrl                512
+
+# time interval of system monitor, seconds 
+# monitorInterval           30
+
+# number of seconds allowed for a dnode to be offline, for cluster only 
+# offlineThreshold          864000
+
+# RPC re-try timer, millisecond
+# rpcTimer                  300
+
+# RPC maximum time for ack, seconds. 
+# rpcMaxTime                600
+
+# time interval of dnode status reporting to mnode, seconds, for cluster only 
+# statusInterval            1
+
+# time interval of heart beat from shell to dnode, seconds
+# shellActivityTimer        3
+
+# minimum sliding window time, milli-second
+# minSlidingTime            10
+
+# minimum time window, milli-second
+# minIntervalTime           10
+
+# maximum delay before launching a stream computation, milli-second
+# maxStreamCompDelay        20000
+
+# maximum delay before launching a stream computation for the first time, milli-second
+# maxFirstStreamCompDelay   10000
+
+# retry delay when a stream computation fails, milli-second
+# retryStreamCompDelay      10
+
+# the delayed time for launching a stream computation, from 0.1(default, 10% of whole computing time window) to 0.9
+# streamCompDelayRatio      0.1
+
+# max number of vgroups per db, 0 means configured automatically
+# maxVgroupsPerDb           0
+
+# max number of tables per vnode
+# maxTablesPerVnode         1000000
+
+# cache block size (Mbyte)
+# cache                     16
+
+# number of cache blocks per vnode
+# blocks                    6
+
+# number of days per DB file
+# days                  10
+
+# number of days to keep DB file
+# keep                  3650
+
+# minimum rows of records in file block
+# minRows               100
+
+# maximum rows of records in file block
+# maxRows               4096
+
+# the number of acknowledgments required for successful data writing
+# quorum                1     
+
+# enable/disable compression
+# comp                  2
+
+# write ahead log (WAL) level, 0: no wal; 1: write wal, but no fysnc; 2: write wal, and call fsync
+# walLevel              1
+
+# if walLevel is set to 2, the cycle of fsync being executed, if set to 0, fsync is called right away
+# fsync                 3000
+
+# number of replications, for cluster only 
+# replica               1
+
+# the compressed rpc message, option:
+#  -1 (no compression)
+#   0 (all message compressed),
+# > 0 (rpc message body which larger than this value will be compressed)
+# compressMsgSize       -1
+
+# max length of an SQL
+# maxSQLLength          65480
+
+# max length of WildCards
+# maxWildCardsLength    100
+
+# the maximum number of records allowed for super table time sorting
+# maxNumOfOrderedRes    100000
+
+# system time zone
+# timezone              Asia/Shanghai (CST, +0800)
+# system time zone (for windows 10)
+# timezone              UTC-8
+
+# system locale
+# locale                en_US.UTF-8
+
+# default system charset
+# charset               UTF-8
+
+# max number of connections allowed in dnode
+# maxShellConns         5000
+
+# max number of connections allowed in client
+# maxConnections        5000
+
+# stop writing logs when the disk size of the log folder is less than this value
+# minimalLogDirGB       0.1
+
+# stop writing temporary files when the disk size of the tmp folder is less than this value
+# minimalTmpDirGB       0.1
+
+# if disk free space is less than this value, khserver service exit directly within startup process
+# minimalDataDirGB      0.1
+
+# One mnode is equal to the number of vnode consumed
+# mnodeEqualVnodeNum    4
+
+# enbale/disable http service
+# http                  1
+
+# enable/disable system monitor 
+# monitor               1
+
+# enable/disable recording the SQL statements via restful interface
+# httpEnableRecordSql   0
+
+# number of threads used to process http requests
+# httpMaxThreads        2
+
+# maximum number of rows returned by the restful interface
+# restfulRowLimit       10240
+
+# The following parameter is used to limit the maximum number of lines in log files.
+# max number of lines per log filters
+# numOfLogLines         10000000
+
+# enable/disable async log
+# asyncLog              1
+
+# time of keeping log files, days
+# logKeepDays           0
+
+
+# The following parameters are used for debug purpose only.
+# debugFlag 8 bits mask: FILE-SCREEN-UNUSED-HeartBeat-DUMP-TRACE_WARN-ERROR
+# 131: output warning and error 
+# 135: output debug, warning and error
+# 143: output trace, debug, warning and error to log
+# 199: output debug, warning and error to both screen and file
+# 207: output trace, debug, warning and error to both screen and file
+
+# debug flag for all log type, take effect when non-zero value
+# debugFlag             0
+
+# debug flag for meta management messages
+# mDebugFlag            135
+
+# debug flag for dnode messages
+# dDebugFlag            135
+
+# debug flag for sync module
+# sDebugFlag            135
+
+# debug flag for WAL
+# wDebugFlag            135
+
+# debug flag for SDB
+# sdbDebugFlag          135
+
+# debug flag for RPC 
+# rpcDebugFlag          131
+
+# debug flag for  TIMER
+# tmrDebugFlag          131
+
+# debug flag for KingHistorian client 
+# cDebugFlag            131
+
+# debug flag for JNI
+# jniDebugFlag          131
+
+# debug flag for storage
+# uDebugFlag            131
+
+# debug flag for http server
+# httpDebugFlag         131
+
+# debug flag for monitor
+# monDebugFlag          131
+
+# debug flag for query
+# qDebugFlag            131
+
+# debug flag for vnode
+# vDebugFlag            131
+
+# debug flag for TSDB
+# tsdbDebugFlag         131
+
+# debug flag for continue query
+# cqDebugFlag           131
+
+# enable/disable recording the SQL in kinghistorian client
+# enableRecordSql    0
+
+# generate core file when service crash
+# enableCoreFile        1
+
+# maximum display width of binary and nchar fields in the shell. The parts exceeding this limit will be hidden
+# maxBinaryDisplayWidth 30
+
+# enable/disable stream (continuous query)
+# stream                1
+
+# in retrieve blocking model, only in 50% query threads will be used in query processing in dnode
+# retrieveBlockingModel    0
+
+# the maximum allowed query buffer size in MB during query processing for each data node
+# -1 no limit (default)
+# 0  no query allowed, queries are disabled
+# queryBufferSize         -1
+

packaging/tools/install_kh.sh

@@ -169,6 +169,7 @@ function install_bin() {
     ${csudo} rm -f ${bin_link_dir}/khclient    || :
     ${csudo} rm -f ${bin_link_dir}/khserver    || :
     ${csudo} rm -f ${bin_link_dir}/khdemo      || :
+    ${csudo} rm -f ${bin_link_dir}/khdump      || :
     ${csudo} rm -f ${bin_link_dir}/rmkh        || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator || :
     ${csudo} rm -f ${bin_link_dir}/set_core    || :
@@ -178,6 +179,7 @@ function install_bin() {
     #Make link
     [ -x ${install_main_dir}/bin/khclient ] && ${csudo} ln -s ${install_main_dir}/bin/khclient ${bin_link_dir}/khclient                     || :
     [ -x ${install_main_dir}/bin/khserver ] && ${csudo} ln -s ${install_main_dir}/bin/khserver ${bin_link_dir}/khserver                     || :
+    [ -x ${install_main_dir}/bin/khdump ] && ${csudo} ln -s ${install_main_dir}/bin/khdump ${bin_link_dir}/khdump            || :
     [ -x ${install_main_dir}/bin/khdemo ] && ${csudo} ln -s ${install_main_dir}/bin/khdemo ${bin_link_dir}/khdemo            || :
     [ -x ${install_main_dir}/bin/remove_kh.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_kh.sh ${bin_link_dir}/rmkh  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :

src/util/src/tconfig.c

@@ -330,31 +330,34 @@ void taosReadGlobalLogCfg() {
     }
     strcpy(configDir, full_path.we_wordv[0]);
   } else {
-    #ifdef _TD_POWER_
+#ifdef _TD_POWER_
     printf("configDir:%s not there, use default value: /etc/power", configDir);
     strcpy(configDir, "/etc/power");
-	#elif (_TD_TQ_ == true)
+#elif (_TD_TQ_ == true)
     printf("configDir:%s not there, use default value: /etc/tq", configDir);
     strcpy(configDir, "/etc/tq");
-	#elif (_TD_PRO_ == true)
+#elif (_TD_PRO_ == true)
     printf("configDir:%s not there, use default value: /etc/ProDB", configDir);
     strcpy(configDir, "/etc/ProDB");
-	#elif (_TD_KH_ == true)
+#elif (_TD_KH_ == true)
     printf("configDir:%s not there, use default value: /etc/kinghistorian", configDir);
     strcpy(configDir, "/etc/kinghistorian");
-	#elif (_TD_JH_ == true)
+#elif (_TD_JH_ == true)
     printf("configDir:%s not there, use default value: /etc/jh_taos", configDir);
     strcpy(configDir, "/etc/jh_taos");
-    #else
+#else
     printf("configDir:%s not there, use default value: /etc/taos", configDir);
     strcpy(configDir, "/etc/taos");
-    #endif
+#endif
   }
   wordfree(&full_path);
 
   taosReadLogOption("logDir", tsLogDir);
-  
+#ifdef _TD_KH_  
+  sprintf(fileName, "%s/kinghistorian.cfg", configDir);
+#else
   sprintf(fileName, "%s/taos.cfg", configDir);
+#endif
   fp = fopen(fileName, "r");
   if (fp == NULL) {
     printf("\nconfig file:%s not found, all variables are set to default\n", fileName);
@@ -398,8 +401,11 @@ bool taosReadGlobalCfg() {
   char * line, *option, *value, *value2, *value3;
   int    olen, vlen, vlen2, vlen3;
   char   fileName[PATH_MAX] = {0};
-
+#ifdef _TD_KH_
+  sprintf(fileName, "%s/kinghistorian.cfg", configDir);
+#else
   sprintf(fileName, "%s/taos.cfg", configDir);
+#endif
   FILE* fp = fopen(fileName, "r");
   if (fp == NULL) {
     struct stat s;