Merge branch '3.0' into enh/refactorBackend
This commit is contained in:
parent
e483570cd7
commit
703f323b3f
|
@ -248,7 +248,7 @@ int32_t tsTtlBatchDropNum = 10000; // number of tables dropped per batch
|
|||
// internal
|
||||
int32_t tsTransPullupInterval = 2;
|
||||
int32_t tsMqRebalanceInterval = 2;
|
||||
int32_t tsStreamCheckpointInterval = 10;
|
||||
int32_t tsStreamCheckpointInterval = 40;
|
||||
float tsSinkDataRate = 2.0;
|
||||
int32_t tsStreamNodeCheckInterval = 15;
|
||||
int32_t tsTtlUnit = 86400;
|
||||
|
@ -361,9 +361,17 @@ static int32_t taosLoadCfg(SConfig *pCfg, const char **envCmd, const char *input
|
|||
}
|
||||
if (taosIsDir(cfgDir)) {
|
||||
#ifdef CUS_PROMPT
|
||||
snprintf(cfgFile, sizeof(cfgFile), "%s" "%s" "%s.cfg", cfgDir, tdDirsep, CUS_PROMPT);
|
||||
snprintf(cfgFile, sizeof(cfgFile),
|
||||
"%s"
|
||||
"%s"
|
||||
"%s.cfg",
|
||||
cfgDir, tdDirsep, CUS_PROMPT);
|
||||
#else
|
||||
snprintf(cfgFile, sizeof(cfgFile), "%s" "%s" "taos.cfg", cfgDir, tdDirsep);
|
||||
snprintf(cfgFile, sizeof(cfgFile),
|
||||
"%s"
|
||||
"%s"
|
||||
"taos.cfg",
|
||||
cfgDir, tdDirsep);
|
||||
#endif
|
||||
} else {
|
||||
tstrncpy(cfgFile, cfgDir, sizeof(cfgDir));
|
||||
|
|
Loading…
Reference in New Issue