xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch '3.0' into enh/TD-30988-3.0

This commit is contained in:
kailixu 2024-07-25 09:31:57 +08:00
parent 7ee18c5178 c5d1c890af
commit d42b86e56d
14 changed files with 1040 additions and 892 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/ttime.h
View File

@ -117,7 +117,7 @@ int32_t taosTs2Char(const char* format, SArray** formats, int64_t ts, int32_t pr
int32_t taosChar2Ts(const char* format, SArray** formats, const char* tsStr, int64_t* ts, int32_t precision, char* errMsg, int32_t taosChar2Ts(const char* format, SArray** formats, const char* tsStr, int64_t* ts, int32_t precision, char* errMsg,
int32_t errMsgLen); int32_t errMsgLen);
void TEST_ts2char(const char* format, int64_t ts, int32_t precision, char* out, int32_t outLen); int32_t TEST_ts2char(const char* format, int64_t ts, int32_t precision, char* out, int32_t outLen);
int32_t TEST_char2ts(const char* format, int64_t* ts, int32_t precision, const char* tsStr); int32_t TEST_char2ts(const char* format, int64_t* ts, int32_t precision, const char* tsStr);
/// @brief get offset seconds from zero timezone to input timezone /// @brief get offset seconds from zero timezone to input timezone

8
include/util/tconfig.h
View File

@ -101,7 +101,7 @@ typedef struct {
typedef struct SConfig SConfig; typedef struct SConfig SConfig;
typedef struct SConfigIter SConfigIter; typedef struct SConfigIter SConfigIter;
SConfig *cfgInit(); int32_t cfgInit(SConfig **ppCfg);
int32_t cfgLoad(SConfig *pCfg, ECfgSrcType cfgType, const void *sourceStr); int32_t cfgLoad(SConfig *pCfg, ECfgSrcType cfgType, const void *sourceStr);
int32_t cfgLoadFromArray(SConfig *pCfg, SArray *pArgs); // SConfigPair int32_t cfgLoadFromArray(SConfig *pCfg, SArray *pArgs); // SConfigPair
void cfgCleanup(SConfig *pCfg); void cfgCleanup(SConfig *pCfg);
@ -110,7 +110,7 @@ SConfigItem *cfgGetItem(SConfig *pCfg, const char *pName);
int32_t cfgSetItem(SConfig *pCfg, const char *name, const char *value, ECfgSrcType stype, bool lock); int32_t cfgSetItem(SConfig *pCfg, const char *name, const char *value, ECfgSrcType stype, bool lock);
int32_t cfgCheckRangeForDynUpdate(SConfig *pCfg, const char *name, const char *pVal, bool isServer); int32_t cfgCheckRangeForDynUpdate(SConfig *pCfg, const char *name, const char *pVal, bool isServer);
SConfigIter *cfgCreateIter(SConfig *pConf); int32_t cfgCreateIter(SConfig *pConf, SConfigIter **ppIter);
SConfigItem *cfgNextIter(SConfigIter *pIter); SConfigItem *cfgNextIter(SConfigIter *pIter);
void cfgDestroyIter(SConfigIter *pIter); void cfgDestroyIter(SConfigIter *pIter);
void cfgLock(SConfig *pCfg); void cfgLock(SConfig *pCfg);
@ -131,8 +131,8 @@ int32_t cfgAddTimezone(SConfig *pCfg, const char *name, const char *defaultVal,
const char *cfgStypeStr(ECfgSrcType type); const char *cfgStypeStr(ECfgSrcType type);
const char *cfgDtypeStr(ECfgDataType type); const char *cfgDtypeStr(ECfgDataType type);
void cfgDumpItemValue(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *pLen); int32_t cfgDumpItemValue(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *pLen);
void cfgDumpItemScope(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *pLen); int32_t cfgDumpItemScope(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *pLen);
void cfgDumpCfg(SConfig *pCfg, bool tsc, bool dump); void cfgDumpCfg(SConfig *pCfg, bool tsc, bool dump);
void cfgDumpCfgS3(SConfig *pCfg, bool tsc, bool dump); void cfgDumpCfgS3(SConfig *pCfg, bool tsc, bool dump);

4
include/util/tutil.h
View File

@ -152,9 +152,9 @@ static FORCE_INLINE int32_t taosGetTbHashVal(const char *tbname, int32_t tblen,
#define TCONTAINER_OF(ptr, type, member) ((type *)((char *)(ptr)-offsetof(type, member))) #define TCONTAINER_OF(ptr, type, member) ((type *)((char *)(ptr)-offsetof(type, member)))
#define TAOS_RETURN(code) \ #define TAOS_RETURN(CODE) \
do { \ do { \
return (terrno = (code)); \ return (terrno = (CODE)); \
} while (0) } while (0)
#define TAOS_CHECK_RETURN(CMD) \ #define TAOS_CHECK_RETURN(CMD) \

13
source/common/src/tglobal.c
View File

@ -1263,8 +1263,8 @@ int32_t taosCreateLog(const char *logname, int32_t logFileNum, const char *cfgDi
const char *envFile, char *apolloUrl, SArray *pArgs, bool tsc) { const char *envFile, char *apolloUrl, SArray *pArgs, bool tsc) {
if (tsCfg == NULL) osDefaultInit(); if (tsCfg == NULL) osDefaultInit();
SConfig *pCfg = cfgInit(); SConfig *pCfg = NULL;
if (pCfg == NULL) return -1; TAOS_CHECK_RETURN(cfgInit(&pCfg));
if (tsc) { if (tsc) {
tsLogEmbedded = 0; tsLogEmbedded = 0;
@ -1325,8 +1325,8 @@ int32_t taosReadDataFolder(const char *cfgDir, const char **envCmd, const char *
SArray *pArgs) { SArray *pArgs) {
if (tsCfg == NULL) osDefaultInit(); if (tsCfg == NULL) osDefaultInit();
SConfig *pCfg = cfgInit(); SConfig *pCfg = NULL;
if (pCfg == NULL) return -1; TAOS_CHECK_RETURN(cfgInit(&pCfg));
if (cfgAddDir(pCfg, "dataDir", tsDataDir, CFG_SCOPE_SERVER, CFG_DYN_NONE) != 0) return -1; if (cfgAddDir(pCfg, "dataDir", tsDataDir, CFG_SCOPE_SERVER, CFG_DYN_NONE) != 0) return -1;
if (cfgAddInt32(pCfg, "dDebugFlag", dDebugFlag, 0, 255, CFG_SCOPE_SERVER, CFG_DYN_SERVER) != 0) return -1; if (cfgAddInt32(pCfg, "dDebugFlag", dDebugFlag, 0, 255, CFG_SCOPE_SERVER, CFG_DYN_SERVER) != 0) return -1;
@ -1371,10 +1371,7 @@ static int32_t taosCheckGlobalCfg() {
static int32_t cfgInitWrapper(SConfig **pCfg) { static int32_t cfgInitWrapper(SConfig **pCfg) {
if (*pCfg == NULL) { if (*pCfg == NULL) {
*pCfg = cfgInit(); TAOS_CHECK_RETURN(cfgInit(pCfg));
if (*pCfg == NULL) {
return terrno;
}
} }
return 0; return 0;
} }

10
source/common/src/tmisce.c
View File

@ -270,11 +270,7 @@ int32_t dumpConfToDataBlock(SSDataBlock* pBlock, int32_t startCol) {
TAOS_CHECK_GOTO(blockDataEnsureCapacity(pBlock, cfgGetSize(pConf)), NULL, _exit); TAOS_CHECK_GOTO(blockDataEnsureCapacity(pBlock, cfgGetSize(pConf)), NULL, _exit);
pIter = cfgCreateIter(pConf); TAOS_CHECK_GOTO(cfgCreateIter(pConf, &pIter), NULL, _exit);
if (pIter == NULL) {
code = TSDB_CODE_OUT_OF_MEMORY;
TAOS_CHECK_GOTO(code, NULL, _exit);
}
cfgLock(pConf); cfgLock(pConf);
locked = 1; locked = 1;
@ -296,7 +292,7 @@ int32_t dumpConfToDataBlock(SSDataBlock* pBlock, int32_t startCol) {
char value[TSDB_CONFIG_VALUE_LEN + VARSTR_HEADER_SIZE] = {0}; char value[TSDB_CONFIG_VALUE_LEN + VARSTR_HEADER_SIZE] = {0};
int32_t valueLen = 0; int32_t valueLen = 0;
cfgDumpItemValue(pItem, &value[VARSTR_HEADER_SIZE], TSDB_CONFIG_VALUE_LEN, &valueLen); TAOS_CHECK_GOTO(cfgDumpItemValue(pItem, &value[VARSTR_HEADER_SIZE], TSDB_CONFIG_VALUE_LEN, &valueLen), NULL, _exit);
varDataSetLen(value, valueLen); varDataSetLen(value, valueLen);
pColInfo = taosArrayGet(pBlock->pDataBlock, col++); pColInfo = taosArrayGet(pBlock->pDataBlock, col++);
@ -308,7 +304,7 @@ int32_t dumpConfToDataBlock(SSDataBlock* pBlock, int32_t startCol) {
TAOS_CHECK_GOTO(colDataSetVal(pColInfo, numOfRows, value, false), NULL, _exit); TAOS_CHECK_GOTO(colDataSetVal(pColInfo, numOfRows, value, false), NULL, _exit);
char scope[TSDB_CONFIG_SCOPE_LEN + VARSTR_HEADER_SIZE] = {0}; char scope[TSDB_CONFIG_SCOPE_LEN + VARSTR_HEADER_SIZE] = {0};
cfgDumpItemScope(pItem, &scope[VARSTR_HEADER_SIZE], TSDB_CONFIG_SCOPE_LEN, &valueLen); TAOS_CHECK_GOTO(cfgDumpItemScope(pItem, &scope[VARSTR_HEADER_SIZE], TSDB_CONFIG_SCOPE_LEN, &valueLen), NULL, _exit);
varDataSetLen(scope, valueLen); varDataSetLen(scope, valueLen);
pColInfo = taosArrayGet(pBlock->pDataBlock, col++); pColInfo = taosArrayGet(pBlock->pDataBlock, col++);

156
source/common/src/ttime.c
View File

@ -96,8 +96,6 @@ char* forwardToTimeStringEnd(char* str) {
} }
int32_t parseFraction(char* str, char** end, int32_t timePrec, int64_t* pFraction) { int32_t parseFraction(char* str, char** end, int32_t timePrec, int64_t* pFraction) {
int32_t code = TSDB_CODE_SUCCESS;
int32_t i = 0; int32_t i = 0;
int64_t fraction = 0; int64_t fraction = 0;
@ -147,8 +145,6 @@ int32_t parseFraction(char* str, char** end, int32_t timePrec, int64_t* pFractio
} }
int32_t parseTimezone(char* str, int64_t* tzOffset) { int32_t parseTimezone(char* str, int64_t* tzOffset) {
int32_t code = TSDB_CODE_SUCCESS;
int64_t hour = 0; int64_t hour = 0;
int32_t i = 0; int32_t i = 0;
@ -224,8 +220,6 @@ int32_t offsetOfTimezone(char* tzStr, int64_t* offset) {
* 2013-04-12T15:52:01.123+0800 * 2013-04-12T15:52:01.123+0800
*/ */
int32_t parseTimeWithTz(const char* timestr, int64_t* time, int32_t timePrec, char delim) { int32_t parseTimeWithTz(const char* timestr, int64_t* time, int32_t timePrec, char delim) {
int32_t code = TSDB_CODE_SUCCESS;
int64_t factor = TSDB_TICK_PER_SECOND(timePrec); int64_t factor = TSDB_TICK_PER_SECOND(timePrec);
int64_t tzOffset = 0; int64_t tzOffset = 0;
@ -315,8 +309,6 @@ static FORCE_INLINE bool validateTm(struct tm* pTm) {
} }
int32_t parseLocaltime(char* timestr, int32_t len, int64_t* utime, int32_t timePrec, char delim) { int32_t parseLocaltime(char* timestr, int32_t len, int64_t* utime, int32_t timePrec, char delim) {
int32_t code = TSDB_CODE_SUCCESS;
*utime = 0; *utime = 0;
struct tm tm = {0}; struct tm tm = {0};
@ -358,8 +350,6 @@ int32_t parseLocaltime(char* timestr, int32_t len, int64_t* utime, int32_t timeP
} }
int32_t parseLocaltimeDst(char* timestr, int32_t len, int64_t* utime, int32_t timePrec, char delim) { int32_t parseLocaltimeDst(char* timestr, int32_t len, int64_t* utime, int32_t timePrec, char delim) {
int32_t code = TSDB_CODE_SUCCESS;
*utime = 0; *utime = 0;
struct tm tm = {0}; struct tm tm = {0};
tm.tm_isdst = -1; tm.tm_isdst = -1;
@ -484,8 +474,6 @@ int64_t convertTimePrecision(int64_t utime, int32_t fromPrecision, int32_t toPre
// !!!!notice: double lose precison if time is too large, for example: 1626006833631000000*1.0 = double = // !!!!notice: double lose precison if time is too large, for example: 1626006833631000000*1.0 = double =
// 1626006833631000064 // 1626006833631000064
int32_t convertTimeFromPrecisionToUnit(int64_t time, int32_t fromPrecision, char toUnit, int64_t* pRes) { int32_t convertTimeFromPrecisionToUnit(int64_t time, int32_t fromPrecision, char toUnit, int64_t* pRes) {
int32_t code = TSDB_CODE_SUCCESS;
if (fromPrecision != TSDB_TIME_PRECISION_MILLI && fromPrecision != TSDB_TIME_PRECISION_MICRO && if (fromPrecision != TSDB_TIME_PRECISION_MILLI && fromPrecision != TSDB_TIME_PRECISION_MICRO &&
fromPrecision != TSDB_TIME_PRECISION_NANO) { fromPrecision != TSDB_TIME_PRECISION_NANO) {
TAOS_RETURN(TSDB_CODE_INVALID_PARA); TAOS_RETURN(TSDB_CODE_INVALID_PARA);
@ -559,13 +547,14 @@ int32_t convertTimeFromPrecisionToUnit(int64_t time, int32_t fromPrecision, char
} }
int32_t convertStringToTimestamp(int16_t type, char* inputData, int64_t timePrec, int64_t* timeVal) { int32_t convertStringToTimestamp(int16_t type, char* inputData, int64_t timePrec, int64_t* timeVal) {
int32_t code = TSDB_CODE_SUCCESS;
int32_t charLen = varDataLen(inputData); int32_t charLen = varDataLen(inputData);
char* newColData; char* newColData;
if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_VARBINARY) { if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_VARBINARY) {
newColData = taosMemoryCalloc(1, charLen + 1); newColData = taosMemoryCalloc(1, charLen + 1);
memcpy(newColData, varDataVal(inputData), charLen); if (NULL == newColData) {
TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
}
(void)memcpy(newColData, varDataVal(inputData), charLen);
int32_t ret = taosParseTime(newColData, timeVal, charLen, (int32_t)timePrec, tsDaylight); int32_t ret = taosParseTime(newColData, timeVal, charLen, (int32_t)timePrec, tsDaylight);
if (ret != TSDB_CODE_SUCCESS) { if (ret != TSDB_CODE_SUCCESS) {
taosMemoryFree(newColData); taosMemoryFree(newColData);
@ -574,6 +563,9 @@ int32_t convertStringToTimestamp(int16_t type, char* inputData, int64_t timePrec
taosMemoryFree(newColData); taosMemoryFree(newColData);
} else if (type == TSDB_DATA_TYPE_NCHAR) { } else if (type == TSDB_DATA_TYPE_NCHAR) {
newColData = taosMemoryCalloc(1, charLen + TSDB_NCHAR_SIZE); newColData = taosMemoryCalloc(1, charLen + TSDB_NCHAR_SIZE);
if (NULL == newColData) {
TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
}
int len = taosUcs4ToMbs((TdUcs4*)varDataVal(inputData), charLen, newColData); int len = taosUcs4ToMbs((TdUcs4*)varDataVal(inputData), charLen, newColData);
if (len < 0) { if (len < 0) {
taosMemoryFree(newColData); taosMemoryFree(newColData);
@ -593,8 +585,6 @@ int32_t convertStringToTimestamp(int16_t type, char* inputData, int64_t timePrec
} }
int32_t getDuration(int64_t val, char unit, int64_t* result, int32_t timePrecision) { int32_t getDuration(int64_t val, char unit, int64_t* result, int32_t timePrecision) {
int32_t code = TSDB_CODE_SUCCESS;
switch (unit) { switch (unit) {
case 's': case 's':
if (val > INT64_MAX / MILLISECOND_PER_SECOND) { if (val > INT64_MAX / MILLISECOND_PER_SECOND) {
@ -658,8 +648,6 @@ int32_t getDuration(int64_t val, char unit, int64_t* result, int32_t timePrecisi
*/ */
int32_t parseAbsoluteDuration(const char* token, int32_t tokenlen, int64_t* duration, char* unit, int32_t parseAbsoluteDuration(const char* token, int32_t tokenlen, int64_t* duration, char* unit,
int32_t timePrecision) { int32_t timePrecision) {
int32_t code = TSDB_CODE_SUCCESS;
errno = 0; errno = 0;
char* endPtr = NULL; char* endPtr = NULL;
@ -680,8 +668,6 @@ int32_t parseAbsoluteDuration(const char* token, int32_t tokenlen, int64_t* dura
int32_t parseNatualDuration(const char* token, int32_t tokenLen, int64_t* duration, char* unit, int32_t timePrecision, int32_t parseNatualDuration(const char* token, int32_t tokenLen, int64_t* duration, char* unit, int32_t timePrecision,
bool negativeAllow) { bool negativeAllow) {
int32_t code = TSDB_CODE_SUCCESS;
errno = 0; errno = 0;
/* get the basic numeric value */ /* get the basic numeric value */
@ -718,7 +704,7 @@ int64_t taosTimeAdd(int64_t t, int64_t duration, char unit, int32_t precision) {
struct tm tm; struct tm tm;
time_t tt = (time_t)(t / TSDB_TICK_PER_SECOND(precision)); time_t tt = (time_t)(t / TSDB_TICK_PER_SECOND(precision));
taosLocalTime(&tt, &tm, NULL); (void)taosLocalTime(&tt, &tm, NULL);
int32_t mon = tm.tm_year * 12 + tm.tm_mon + (int32_t)numOfMonth; int32_t mon = tm.tm_year * 12 + tm.tm_mon + (int32_t)numOfMonth;
tm.tm_year = mon / 12; tm.tm_year = mon / 12;
tm.tm_mon = mon % 12; tm.tm_mon = mon % 12;
@ -779,11 +765,11 @@ int32_t taosTimeCountIntervalForFill(int64_t skey, int64_t ekey, int64_t interva
struct tm tm; struct tm tm;
time_t t = (time_t)skey; time_t t = (time_t)skey;
taosLocalTime(&t, &tm, NULL); (void)taosLocalTime(&t, &tm, NULL);
int32_t smon = tm.tm_year * 12 + tm.tm_mon; int32_t smon = tm.tm_year * 12 + tm.tm_mon;
t = (time_t)ekey; t = (time_t)ekey;
taosLocalTime(&t, &tm, NULL); (void)taosLocalTime(&t, &tm, NULL);
int32_t emon = tm.tm_year * 12 + tm.tm_mon; int32_t emon = tm.tm_year * 12 + tm.tm_mon;
if (unit == 'y') { if (unit == 'y') {
@ -808,7 +794,7 @@ int64_t taosTimeTruncate(int64_t ts, const SInterval* pInterval) {
start /= (int64_t)(TSDB_TICK_PER_SECOND(precision)); start /= (int64_t)(TSDB_TICK_PER_SECOND(precision));
struct tm tm; struct tm tm;
time_t tt = (time_t)start; time_t tt = (time_t)start;
taosLocalTime(&tt, &tm, NULL); (void)taosLocalTime(&tt, &tm, NULL);
tm.tm_sec = 0; tm.tm_sec = 0;
tm.tm_min = 0; tm.tm_min = 0;
tm.tm_hour = 0; tm.tm_hour = 0;
@ -978,8 +964,6 @@ const char* fmtts(int64_t ts) {
} }
int32_t taosFormatUtcTime(char* buf, int32_t bufLen, int64_t t, int32_t precision) { int32_t taosFormatUtcTime(char* buf, int32_t bufLen, int64_t t, int32_t precision) {
int32_t code = TSDB_CODE_SUCCESS;
char ts[40] = {0}; char ts[40] = {0};
struct tm ptm; struct tm ptm;
@ -1018,7 +1002,7 @@ int32_t taosFormatUtcTime(char* buf, int32_t bufLen, int64_t t, int32_t precisio
TAOS_RETURN(TSDB_CODE_INVALID_PARA); TAOS_RETURN(TSDB_CODE_INVALID_PARA);
} }
if (taosLocalTime(&quot, &ptm, buf) == NULL) { if (NULL == taosLocalTime(&quot, &ptm, buf)) {
TAOS_RETURN(TAOS_SYSTEM_ERROR(errno)); TAOS_RETURN(TAOS_SYSTEM_ERROR(errno));
} }
int32_t length = (int32_t)strftime(ts, 40, "%Y-%m-%dT%H:%M:%S", &ptm); int32_t length = (int32_t)strftime(ts, 40, "%Y-%m-%dT%H:%M:%S", &ptm);
@ -1032,7 +1016,9 @@ int32_t taosFormatUtcTime(char* buf, int32_t bufLen, int64_t t, int32_t precisio
int32_t taosTs2Tm(int64_t ts, int32_t precision, struct STm* tm) { int32_t taosTs2Tm(int64_t ts, int32_t precision, struct STm* tm) {
tm->fsec = ts % TICK_PER_SECOND[precision] * (TICK_PER_SECOND[TSDB_TIME_PRECISION_NANO] / TICK_PER_SECOND[precision]); tm->fsec = ts % TICK_PER_SECOND[precision] * (TICK_PER_SECOND[TSDB_TIME_PRECISION_NANO] / TICK_PER_SECOND[precision]);
time_t t = ts / TICK_PER_SECOND[precision]; time_t t = ts / TICK_PER_SECOND[precision];
taosLocalTime(&t, &tm->tm, NULL); if (NULL == taosLocalTime(&t, &tm->tm, NULL)) {
TAOS_RETURN(TAOS_SYSTEM_ERROR(errno));
}
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
@ -1344,7 +1330,7 @@ static int32_t tm2char(const SArray* formats, const struct STm* tm, char* s, int
TSFormatNode* format = taosArrayGet(formats, i); TSFormatNode* format = taosArrayGet(formats, i);
if (format->type != TS_FORMAT_NODE_TYPE_KEYWORD) { if (format->type != TS_FORMAT_NODE_TYPE_KEYWORD) {
if (s - start + format->len + 1 > outLen) break; if (s - start + format->len + 1 > outLen) break;
strncpy(s, format->c, format->len); (void)strncpy(s, format->c, format->len);
s += format->len; s += format->len;
continue; continue;
} }
@ -1353,37 +1339,37 @@ static int32_t tm2char(const SArray* formats, const struct STm* tm, char* s, int
switch (format->key->id) { switch (format->key->id) {
case TSFKW_AM: case TSFKW_AM:
case TSFKW_PM: case TSFKW_PM:
sprintf(s, tm->tm.tm_hour % 24 >= 12 ? "PM" : "AM"); (void)sprintf(s, tm->tm.tm_hour % 24 >= 12 ? "PM" : "AM");
s += 2; s += 2;
break; break;
case TSFKW_A_M: case TSFKW_A_M:
case TSFKW_P_M: case TSFKW_P_M:
sprintf(s, tm->tm.tm_hour % 24 >= 12 ? "P.M." : "A.M."); (void)sprintf(s, tm->tm.tm_hour % 24 >= 12 ? "P.M." : "A.M.");
s += 4; s += 4;
break; break;
case TSFKW_am: case TSFKW_am:
case TSFKW_pm: case TSFKW_pm:
sprintf(s, tm->tm.tm_hour % 24 >= 12 ? "pm" : "am"); (void)sprintf(s, tm->tm.tm_hour % 24 >= 12 ? "pm" : "am");
s += 2; s += 2;
break; break;
case TSFKW_a_m: case TSFKW_a_m:
case TSFKW_p_m: case TSFKW_p_m:
sprintf(s, tm->tm.tm_hour % 24 >= 12 ? "p.m." : "a.m."); (void)sprintf(s, tm->tm.tm_hour % 24 >= 12 ? "p.m." : "a.m.");
s += 4; s += 4;
break; break;
case TSFKW_DDD: case TSFKW_DDD:
#ifdef WINDOWS #ifdef WINDOWS
return TSDB_CODE_FUNC_TO_CHAR_NOT_SUPPORTED; return TSDB_CODE_FUNC_TO_CHAR_NOT_SUPPORTED;
#endif #endif
sprintf(s, "%03d", tm->tm.tm_yday + 1); (void)sprintf(s, "%03d", tm->tm.tm_yday + 1);
s += strlen(s); s += strlen(s);
break; break;
case TSFKW_DD: case TSFKW_DD:
sprintf(s, "%02d", tm->tm.tm_mday); (void)sprintf(s, "%02d", tm->tm.tm_mday);
s += 2; s += 2;
break; break;
case TSFKW_D: case TSFKW_D:
sprintf(s, "%d", tm->tm.tm_wday + 1); (void)sprintf(s, "%d", tm->tm.tm_wday + 1);
s += 1; s += 1;
break; break;
case TSFKW_DAY: { case TSFKW_DAY: {
@ -1391,20 +1377,20 @@ static int32_t tm2char(const SArray* formats, const struct STm* tm, char* s, int
const char* wd = weekDays[tm->tm.tm_wday]; const char* wd = weekDays[tm->tm.tm_wday];
char buf[10] = {0}; char buf[10] = {0};
for (int32_t i = 0; i < strlen(wd); ++i) buf[i] = toupper(wd[i]); for (int32_t i = 0; i < strlen(wd); ++i) buf[i] = toupper(wd[i]);
sprintf(s, "%-9s", buf); (void)sprintf(s, "%-9s", buf);
s += strlen(s); s += strlen(s);
break; break;
} }
case TSFKW_Day: case TSFKW_Day:
// Monday, TuesDay... // Monday, TuesDay...
sprintf(s, "%-9s", weekDays[tm->tm.tm_wday]); (void)sprintf(s, "%-9s", weekDays[tm->tm.tm_wday]);
s += strlen(s); s += strlen(s);
break; break;
case TSFKW_day: { case TSFKW_day: {
const char* wd = weekDays[tm->tm.tm_wday]; const char* wd = weekDays[tm->tm.tm_wday];
char buf[10] = {0}; char buf[10] = {0};
for (int32_t i = 0; i < strlen(wd); ++i) buf[i] = tolower(wd[i]); for (int32_t i = 0; i < strlen(wd); ++i) buf[i] = tolower(wd[i]);
sprintf(s, "%-9s", buf); (void)sprintf(s, "%-9s", buf);
s += strlen(s); s += strlen(s);
break; break;
} }
@ -1413,13 +1399,13 @@ static int32_t tm2char(const SArray* formats, const struct STm* tm, char* s, int
const char* wd = shortWeekDays[tm->tm.tm_wday]; const char* wd = shortWeekDays[tm->tm.tm_wday];
char buf[8] = {0}; char buf[8] = {0};
for (int32_t i = 0; i < strlen(wd); ++i) buf[i] = toupper(wd[i]); for (int32_t i = 0; i < strlen(wd); ++i) buf[i] = toupper(wd[i]);
sprintf(s, "%3s", buf); (void)sprintf(s, "%3s", buf);
s += 3; s += 3;
break; break;
} }
case TSFKW_Dy: case TSFKW_Dy:
// Mon, Tue // Mon, Tue
sprintf(s, "%3s", shortWeekDays[tm->tm.tm_wday]); (void)sprintf(s, "%3s", shortWeekDays[tm->tm.tm_wday]);
s += 3; s += 3;
break; break;
case TSFKW_dy: { case TSFKW_dy: {
@ -1427,33 +1413,33 @@ static int32_t tm2char(const SArray* formats, const struct STm* tm, char* s, int
const char* wd = shortWeekDays[tm->tm.tm_wday]; const char* wd = shortWeekDays[tm->tm.tm_wday];
char buf[8] = {0}; char buf[8] = {0};
for (int32_t i = 0; i < strlen(wd); ++i) buf[i] = tolower(wd[i]); for (int32_t i = 0; i < strlen(wd); ++i) buf[i] = tolower(wd[i]);
sprintf(s, "%3s", buf); (void)sprintf(s, "%3s", buf);
s += 3; s += 3;
break; break;
} }
case TSFKW_HH24: case TSFKW_HH24:
sprintf(s, "%02d", tm->tm.tm_hour); (void)sprintf(s, "%02d", tm->tm.tm_hour);
s += 2; s += 2;
break; break;
case TSFKW_HH: case TSFKW_HH:
case TSFKW_HH12: case TSFKW_HH12:
// 0 or 12 o'clock in 24H coresponds to 12 o'clock (AM/PM) in 12H // 0 or 12 o'clock in 24H coresponds to 12 o'clock (AM/PM) in 12H
sprintf(s, "%02d", tm->tm.tm_hour % 12 == 0 ? 12 : tm->tm.tm_hour % 12); (void)sprintf(s, "%02d", tm->tm.tm_hour % 12 == 0 ? 12 : tm->tm.tm_hour % 12);
s += 2; s += 2;
break; break;
case TSFKW_MI: case TSFKW_MI:
sprintf(s, "%02d", tm->tm.tm_min); (void)sprintf(s, "%02d", tm->tm.tm_min);
s += 2; s += 2;
break; break;
case TSFKW_MM: case TSFKW_MM:
sprintf(s, "%02d", tm->tm.tm_mon + 1); (void)sprintf(s, "%02d", tm->tm.tm_mon + 1);
s += 2; s += 2;
break; break;
case TSFKW_MONTH: { case TSFKW_MONTH: {
const char* mon = fullMonths[tm->tm.tm_mon]; const char* mon = fullMonths[tm->tm.tm_mon];
char buf[10] = {0}; char buf[10] = {0};
for (int32_t i = 0; i < strlen(mon); ++i) buf[i] = toupper(mon[i]); for (int32_t i = 0; i < strlen(mon); ++i) buf[i] = toupper(mon[i]);
sprintf(s, "%-9s", buf); (void)sprintf(s, "%-9s", buf);
s += strlen(s); s += strlen(s);
break; break;
} }
@ -1461,44 +1447,44 @@ static int32_t tm2char(const SArray* formats, const struct STm* tm, char* s, int
const char* mon = months[tm->tm.tm_mon]; const char* mon = months[tm->tm.tm_mon];
char buf[10] = {0}; char buf[10] = {0};
for (int32_t i = 0; i < strlen(mon); ++i) buf[i] = toupper(mon[i]); for (int32_t i = 0; i < strlen(mon); ++i) buf[i] = toupper(mon[i]);
sprintf(s, "%s", buf); (void)sprintf(s, "%s", buf);
s += strlen(s); s += strlen(s);
break; break;
} }
case TSFKW_Month: case TSFKW_Month:
sprintf(s, "%-9s", fullMonths[tm->tm.tm_mon]); (void)sprintf(s, "%-9s", fullMonths[tm->tm.tm_mon]);
s += strlen(s); s += strlen(s);
break; break;
case TSFKW_month: { case TSFKW_month: {
const char* mon = fullMonths[tm->tm.tm_mon]; const char* mon = fullMonths[tm->tm.tm_mon];
char buf[10] = {0}; char buf[10] = {0};
for (int32_t i = 0; i < strlen(mon); ++i) buf[i] = tolower(mon[i]); for (int32_t i = 0; i < strlen(mon); ++i) buf[i] = tolower(mon[i]);
sprintf(s, "%-9s", buf); (void)sprintf(s, "%-9s", buf);
s += strlen(s); s += strlen(s);
break; break;
} }
case TSFKW_Mon: case TSFKW_Mon:
sprintf(s, "%s", months[tm->tm.tm_mon]); (void)sprintf(s, "%s", months[tm->tm.tm_mon]);
s += strlen(s); s += strlen(s);
break; break;
case TSFKW_mon: { case TSFKW_mon: {
const char* mon = months[tm->tm.tm_mon]; const char* mon = months[tm->tm.tm_mon];
char buf[10] = {0}; char buf[10] = {0};
for (int32_t i = 0; i < strlen(mon); ++i) buf[i] = tolower(mon[i]); for (int32_t i = 0; i < strlen(mon); ++i) buf[i] = tolower(mon[i]);
sprintf(s, "%s", buf); (void)sprintf(s, "%s", buf);
s += strlen(s); s += strlen(s);
break; break;
} }
case TSFKW_SS: case TSFKW_SS:
sprintf(s, "%02d", tm->tm.tm_sec); (void)sprintf(s, "%02d", tm->tm.tm_sec);
s += 2; s += 2;
break; break;
case TSFKW_MS: case TSFKW_MS:
sprintf(s, "%03" PRId64, tm->fsec / 1000000L); (void)sprintf(s, "%03" PRId64, tm->fsec / 1000000L);
s += 3; s += 3;
break; break;
case TSFKW_US: case TSFKW_US:
sprintf(s, "%06" PRId64, tm->fsec / 1000L); (void)sprintf(s, "%06" PRId64, tm->fsec / 1000L);
s += 6; s += 6;
break; break;
case TSFKW_NS: case TSFKW_NS:
@ -1506,23 +1492,23 @@ static int32_t tm2char(const SArray* formats, const struct STm* tm, char* s, int
s += 9; s += 9;
break; break;
case TSFKW_TZH: case TSFKW_TZH:
sprintf(s, "%s%02d", tsTimezone < 0 ? "-" : "+", tsTimezone); (void)sprintf(s, "%s%02d", tsTimezone < 0 ? "-" : "+", tsTimezone);
s += strlen(s); s += strlen(s);
break; break;
case TSFKW_YYYY: case TSFKW_YYYY:
sprintf(s, "%04d", tm->tm.tm_year + 1900); (void)sprintf(s, "%04d", tm->tm.tm_year + 1900);
s += strlen(s); s += strlen(s);
break; break;
case TSFKW_YYY: case TSFKW_YYY:
sprintf(s, "%03d", (tm->tm.tm_year + 1900) % 1000); (void)sprintf(s, "%03d", (tm->tm.tm_year + 1900) % 1000);
s += strlen(s); s += strlen(s);
break; break;
case TSFKW_YY: case TSFKW_YY:
sprintf(s, "%02d", (tm->tm.tm_year + 1900) % 100); (void)sprintf(s, "%02d", (tm->tm.tm_year + 1900) % 100);
s += strlen(s); s += strlen(s);
break; break;
case TSFKW_Y: case TSFKW_Y:
sprintf(s, "%01d", (tm->tm.tm_year + 1900) % 10); (void)sprintf(s, "%01d", (tm->tm.tm_year + 1900) % 10);
s += strlen(s); s += strlen(s);
break; break;
default: default:
@ -1557,7 +1543,7 @@ static const char* tsFormatStr2Int32(int32_t* dest, const char* str, int32_t len
s = last; s = last;
} else { } else {
char buf[16] = {0}; char buf[16] = {0};
strncpy(buf, s, len); (void)strncpy(buf, s, len);
int32_t copiedLen = strlen(buf); int32_t copiedLen = strlen(buf);
if (copiedLen < len) { if (copiedLen < len) {
if (!needMoreDigit) { if (!needMoreDigit) {
@ -1936,10 +1922,13 @@ static int32_t char2ts(const char* s, SArray* formats, int64_t* ts, int32_t prec
int32_t taosTs2Char(const char* format, SArray** formats, int64_t ts, int32_t precision, char* out, int32_t outLen) { int32_t taosTs2Char(const char* format, SArray** formats, int64_t ts, int32_t precision, char* out, int32_t outLen) {
if (!*formats) { if (!*formats) {
*formats = taosArrayInit(8, sizeof(TSFormatNode)); *formats = taosArrayInit(8, sizeof(TSFormatNode));
if (!*formats){
TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
}
parseTsFormat(format, *formats); parseTsFormat(format, *formats);
} }
struct STm tm; struct STm tm;
taosTs2Tm(ts, precision, &tm); TAOS_CHECK_RETURN(taosTs2Tm(ts, precision, &tm));
return tm2char(*formats, &tm, out, outLen); return tm2char(*formats, &tm, out, outLen);
} }
@ -1949,6 +1938,9 @@ int32_t taosChar2Ts(const char* format, SArray** formats, const char* tsStr, int
int32_t fErrIdx; int32_t fErrIdx;
if (!*formats) { if (!*formats) {
*formats = taosArrayInit(4, sizeof(TSFormatNode)); *formats = taosArrayInit(4, sizeof(TSFormatNode));
if (!*formats) {
TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
}
parseTsFormat(format, *formats); parseTsFormat(format, *formats);
} }
int32_t code = char2ts(tsStr, *formats, ts, precision, &sErrPos, &fErrIdx); int32_t code = char2ts(tsStr, *formats, ts, precision, &sErrPos, &fErrIdx);
@ -1964,16 +1956,24 @@ int32_t taosChar2Ts(const char* format, SArray** formats, const char* tsStr, int
snprintf(errMsg, errMsgLen, "timestamp format not supported"); snprintf(errMsg, errMsgLen, "timestamp format not supported");
code = TSDB_CODE_FUNC_TO_TIMESTAMP_FAILED_NOT_SUPPORTED; code = TSDB_CODE_FUNC_TO_TIMESTAMP_FAILED_NOT_SUPPORTED;
} }
return code; TAOS_RETURN(code);
} }
void TEST_ts2char(const char* format, int64_t ts, int32_t precision, char* out, int32_t outLen) { int32_t TEST_ts2char(const char* format, int64_t ts, int32_t precision, char* out, int32_t outLen) {
int32_t code = TSDB_CODE_SUCCESS;
SArray* formats = taosArrayInit(4, sizeof(TSFormatNode)); SArray* formats = taosArrayInit(4, sizeof(TSFormatNode));
if (!formats) {
TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
}
parseTsFormat(format, formats); parseTsFormat(format, formats);
struct STm tm; struct STm tm;
taosTs2Tm(ts, precision, &tm); TAOS_CHECK_GOTO(taosTs2Tm(ts, precision, &tm), NULL, _exit);
tm2char(formats, &tm, out, outLen); TAOS_CHECK_GOTO(tm2char(formats, &tm, out, outLen), NULL, _exit);
_exit:
taosArrayDestroy(formats); taosArrayDestroy(formats);
TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
int32_t TEST_char2ts(const char* format, int64_t* ts, int32_t precision, const char* tsStr) { int32_t TEST_char2ts(const char* format, int64_t* ts, int32_t precision, const char* tsStr) {
@ -1997,17 +1997,19 @@ static int8_t UNIT_INDEX[26] = {/*a*/ 2, 0, -1, 6, -1, -1, -1,
#define GET_UNIT_INDEX(idx) UNIT_INDEX[(idx) - 97] #define GET_UNIT_INDEX(idx) UNIT_INDEX[(idx) - 97]
static int64_t UNIT_MATRIX[10][11] = {/* ns, us, ms, s, min, h, d, w, month, y*/ // clang-format off
/*ns*/ {1, 1000, 0}, static int64_t UNIT_MATRIX[10][11] = { /* ns, us, ms, s, min, h, d, w, month, y*/
/*ns*/ { 1, 1000, 0},
/*us*/ {1000, 1, 1000, 0}, /*us*/ {1000, 1, 1000, 0},
/*ms*/ {0, 1000, 1, 1000, 0}, /*ms*/ { 0, 1000, 1, 1000, 0},
/*s*/ {0, 0, 1000, 1, 60, 0}, /*s*/ { 0, 0, 1000, 1, 60, 0},
/*min*/ {0, 0, 0, 60, 1, 60, 0}, /*min*/ { 0, 0, 0, 60, 1, 60, 0},
/*h*/ {0, 0, 0, 0, 60, 1, 1, 0}, /*h*/ { 0, 0, 0, 0, 60, 1, 1, 0},
/*d*/ {0, 0, 0, 0, 0, 24, 1, 7, 1, 0}, /*d*/ { 0, 0, 0, 0, 0, 24, 1, 7, 1, 0},
/*w*/ {0, 0, 0, 0, 0, 0, 7, 1, -1, 0}, /*w*/ { 0, 0, 0, 0, 0, 0, 7, 1, -1, 0},
/*mon*/ {0, 0, 0, 0, 0, 0, 0, 0, 1, 12, 0}, /*mon*/ { 0, 0, 0, 0, 0, 0, 0, 0, 1, 12, 0},
/*y*/ {0, 0, 0, 0, 0, 0, 0, 0, 12, 1, 0}}; /*y*/ { 0, 0, 0, 0, 0, 0, 0, 0, 12, 1, 0}};
// clang-format on
static bool recursiveTsmaCheckRecursive(int64_t baseInterval, int8_t baseIdx, int64_t interval, int8_t idx, static bool recursiveTsmaCheckRecursive(int64_t baseInterval, int8_t baseIdx, int64_t interval, int8_t idx,
bool checkEq) { bool checkEq) {

3
source/common/test/commonTests.cpp
View File

@ -465,7 +465,8 @@ TEST(timeTest, timestamp2tm) {
void test_ts2char(int64_t ts, const char* format, int32_t precison, const char* expected) { void test_ts2char(int64_t ts, const char* format, int32_t precison, const char* expected) {
char buf[256] = {0}; char buf[256] = {0};
TEST_ts2char(format, ts, precison, buf, 256); int32_t code = TEST_ts2char(format, ts, precison, buf, 256);
ASSERT_EQ(code, 0);
printf("ts: %ld format: %s res: [%s], expected: [%s]\n", ts, format, buf, expected); printf("ts: %ld format: %s res: [%s], expected: [%s]\n", ts, format, buf, expected);
ASSERT_STREQ(expected, buf); ASSERT_STREQ(expected, buf);
} }

944
source/dnode/mnode/impl/src/mndVgroup.c
View File

File diff suppressed because it is too large Load Diff

17
source/dnode/mnode/impl/src/mndView.c
View File

@ -43,9 +43,7 @@ int32_t mndInitView(SMnode *pMnode) {
#endif #endif
} }
void mndCleanupView(SMnode *pMnode) { void mndCleanupView(SMnode *pMnode) { mDebug("mnd view cleanup"); }
mDebug("mnd view cleanup");
}
int32_t mndProcessCreateViewReq(SRpcMsg *pReq) { int32_t mndProcessCreateViewReq(SRpcMsg *pReq) {
#ifndef TD_ENTERPRISE #ifndef TD_ENTERPRISE
@ -53,8 +51,7 @@ int32_t mndProcessCreateViewReq(SRpcMsg *pReq) {
#else #else
SCMCreateViewReq createViewReq = {0}; SCMCreateViewReq createViewReq = {0};
if (tDeserializeSCMCreateViewReq(pReq->pCont, pReq->contLen, &createViewReq) != 0) { if (tDeserializeSCMCreateViewReq(pReq->pCont, pReq->contLen, &createViewReq) != 0) {
terrno = TSDB_CODE_INVALID_MSG; TAOS_RETURN(TSDB_CODE_INVALID_MSG);
return -1;
} }
mInfo("start to create view:%s, sql:%s", createViewReq.fullname, createViewReq.sql); mInfo("start to create view:%s, sql:%s", createViewReq.fullname, createViewReq.sql);
@ -69,8 +66,7 @@ int32_t mndProcessDropViewReq(SRpcMsg *pReq) {
#else #else
SCMDropViewReq dropViewReq = {0}; SCMDropViewReq dropViewReq = {0};
if (tDeserializeSCMDropViewReq(pReq->pCont, pReq->contLen, &dropViewReq) != 0) { if (tDeserializeSCMDropViewReq(pReq->pCont, pReq->contLen, &dropViewReq) != 0) {
terrno = TSDB_CODE_INVALID_MSG; TAOS_RETURN(TSDB_CODE_INVALID_MSG);
return -1;
} }
mInfo("start to drop view:%s, sql:%s", dropViewReq.name, dropViewReq.sql); mInfo("start to drop view:%s, sql:%s", dropViewReq.name, dropViewReq.sql);
@ -86,15 +82,13 @@ int32_t mndProcessGetViewMetaReq(SRpcMsg *pReq) {
SViewMetaReq req = {0}; SViewMetaReq req = {0};
if (tDeserializeSViewMetaReq(pReq->pCont, pReq->contLen, &req) != 0) { if (tDeserializeSViewMetaReq(pReq->pCont, pReq->contLen, &req) != 0) {
terrno = TSDB_CODE_INVALID_MSG; TAOS_RETURN(TSDB_CODE_INVALID_MSG);
return -1;
} }
return mndProcessViewMetaReqImpl(&req, pReq); return mndProcessViewMetaReqImpl(&req, pReq);
#endif #endif
} }
int32_t mndRetrieveView(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows) { int32_t mndRetrieveView(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows) {
#ifndef TD_ENTERPRISE #ifndef TD_ENTERPRISE
return 0; return 0;
@ -107,6 +101,3 @@ void mndCancelGetNextView(SMnode *pMnode, void *pIter) {
SSdb *pSdb = pMnode->pSdb; SSdb *pSdb = pMnode->pSdb;
sdbCancelFetch(pSdb, pIter); sdbCancelFetch(pSdb, pIter);
} }

188
source/libs/geometry/src/geomFunc.c
View File

@ -21,8 +21,8 @@
#include "sclInt.h" #include "sclInt.h"
#include "sclvector.h" #include "sclvector.h"
typedef int32_t (*_geomDoRelationFunc_t)(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2, typedef int32_t (*_geomDoRelationFunc_t)(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1,
bool swapped, char *res); const GEOSGeometry *geom2, bool swapped, char *res);
typedef int32_t (*_geomInitCtxFunc_t)(); typedef int32_t (*_geomInitCtxFunc_t)();
typedef int32_t (*_geomExecuteOneParamFunc_t)(SColumnInfoData *pInputData, int32_t i, SColumnInfoData *pOutputData); typedef int32_t (*_geomExecuteOneParamFunc_t)(SColumnInfoData *pInputData, int32_t i, SColumnInfoData *pOutputData);
@ -47,7 +47,7 @@ int32_t doMakePointFunc(double x, double y, unsigned char **output) {
goto _exit; goto _exit;
} }
memcpy(varDataVal(*output), outputGeom, size); (void)memcpy(varDataVal(*output), outputGeom, size);
varDataSetLen(*output, size); varDataSetLen(*output, size);
code = TSDB_CODE_SUCCESS; code = TSDB_CODE_SUCCESS;
@ -62,7 +62,7 @@ _exit:
int32_t doGeomFromTextFunc(const char *input, unsigned char **output) { int32_t doGeomFromTextFunc(const char *input, unsigned char **output) {
int32_t code = TSDB_CODE_FAILED; int32_t code = TSDB_CODE_FAILED;
if ((varDataLen(input)) == 0) { //empty value if ((varDataLen(input)) == 0) { // empty value
*output = NULL; *output = NULL;
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
@ -77,12 +77,9 @@ int32_t doGeomFromTextFunc(const char *input, unsigned char **output) {
code = TSDB_CODE_OUT_OF_MEMORY; code = TSDB_CODE_OUT_OF_MEMORY;
goto _exit; goto _exit;
} }
memcpy(inputGeom, varDataVal(input), varDataLen(input)); (void)memcpy(inputGeom, varDataVal(input), varDataLen(input));
code = doGeomFromText(inputGeom, &outputGeom, &size); TAOS_CHECK_GOTO(doGeomFromText(inputGeom, &outputGeom, &size), NULL, _exit);
if (code != TSDB_CODE_SUCCESS) {
goto _exit;
}
*output = taosMemoryCalloc(1, size + VARSTR_HEADER_SIZE); *output = taosMemoryCalloc(1, size + VARSTR_HEADER_SIZE);
if (*output == NULL) { if (*output == NULL) {
@ -90,7 +87,7 @@ int32_t doGeomFromTextFunc(const char *input, unsigned char **output) {
goto _exit; goto _exit;
} }
memcpy(varDataVal(*output), outputGeom, size); (void)memcpy(varDataVal(*output), outputGeom, size);
varDataSetLen(*output, size); varDataSetLen(*output, size);
code = TSDB_CODE_SUCCESS; code = TSDB_CODE_SUCCESS;
@ -106,16 +103,13 @@ _exit:
int32_t doAsTextFunc(unsigned char *input, char **output) { int32_t doAsTextFunc(unsigned char *input, char **output) {
int32_t code = TSDB_CODE_FAILED; int32_t code = TSDB_CODE_FAILED;
if ((varDataLen(input)) == 0) { //empty value if ((varDataLen(input)) == 0) { // empty value
*output = NULL; *output = NULL;
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
char *outputWKT = NULL; char *outputWKT = NULL;
code = doAsText(varDataVal(input), varDataLen(input), &outputWKT); TAOS_CHECK_GOTO(doAsText(varDataVal(input), varDataLen(input), &outputWKT), NULL, _exit);
if (code != TSDB_CODE_SUCCESS) {
goto _exit;
}
size_t size = strlen(outputWKT); size_t size = strlen(outputWKT);
*output = taosMemoryCalloc(1, size + VARSTR_HEADER_SIZE); *output = taosMemoryCalloc(1, size + VARSTR_HEADER_SIZE);
@ -124,7 +118,7 @@ int32_t doAsTextFunc(unsigned char *input, char **output) {
goto _exit; goto _exit;
} }
memcpy(varDataVal(*output), outputWKT, size); (void)memcpy(varDataVal(*output), outputWKT, size);
varDataSetLen(*output, size); varDataSetLen(*output, size);
code = TSDB_CODE_SUCCESS; code = TSDB_CODE_SUCCESS;
@ -139,28 +133,17 @@ int32_t executeMakePointFunc(SColumnInfoData *pInputData[], int32_t iLeft, int32
int32_t code = TSDB_CODE_FAILED; int32_t code = TSDB_CODE_FAILED;
_getDoubleValue_fn_t getDoubleValueFn[2]; _getDoubleValue_fn_t getDoubleValueFn[2];
getDoubleValueFn[0]= getVectorDoubleValueFn(pInputData[0]->info.type); getDoubleValueFn[0] = getVectorDoubleValueFn(pInputData[0]->info.type);
getDoubleValueFn[1]= getVectorDoubleValueFn(pInputData[1]->info.type); getDoubleValueFn[1] = getVectorDoubleValueFn(pInputData[1]->info.type);
unsigned char *output = NULL; unsigned char *output = NULL;
double leftRes = 0; double leftRes = 0;
double rightRes = 0; double rightRes = 0;
code = getDoubleValueFn[0](pInputData[0]->pData, iLeft, &leftRes);
if (TSDB_CODE_SUCCESS != code) { TAOS_CHECK_GOTO(getDoubleValueFn[0](pInputData[0]->pData, iLeft, &leftRes), NULL, _exit);
goto _exit; TAOS_CHECK_GOTO(getDoubleValueFn[1](pInputData[1]->pData, iRight, &rightRes), NULL, _exit);
} TAOS_CHECK_GOTO(doMakePointFunc(leftRes, rightRes, &output), NULL, _exit);
code = getDoubleValueFn[1](pInputData[1]->pData, iRight, &rightRes); TAOS_CHECK_GOTO(colDataSetVal(pOutputData, TMAX(iLeft, iRight), output, (output == NULL)), NULL, _exit);
if (TSDB_CODE_SUCCESS != code) {
goto _exit;
}
code = doMakePointFunc(leftRes, rightRes, &output);
if (TSDB_CODE_SUCCESS != code) {
goto _exit;
}
code = colDataSetVal(pOutputData, TMAX(iLeft, iRight), output, (output == NULL));
if (TSDB_CODE_SUCCESS != code) {
goto _exit;
}
_exit: _exit:
if (output) { if (output) {
@ -175,12 +158,9 @@ int32_t executeGeomFromTextFunc(SColumnInfoData *pInputData, int32_t i, SColumnI
char *input = colDataGetData(pInputData, i); char *input = colDataGetData(pInputData, i);
unsigned char *output = NULL; unsigned char *output = NULL;
code = doGeomFromTextFunc(input, &output);
if (code != TSDB_CODE_SUCCESS) {
goto _exit;
}
code = colDataSetVal(pOutputData, i, output, (output == NULL)); TAOS_CHECK_GOTO(doGeomFromTextFunc(input, &output), NULL, _exit);
TAOS_CHECK_GOTO(colDataSetVal(pOutputData, i, output, (output == NULL)), NULL, _exit);
_exit: _exit:
if (output) { if (output) {
@ -195,12 +175,9 @@ int32_t executeAsTextFunc(SColumnInfoData *pInputData, int32_t i, SColumnInfoDat
unsigned char *input = colDataGetData(pInputData, i); unsigned char *input = colDataGetData(pInputData, i);
char *output = NULL; char *output = NULL;
code = doAsTextFunc(input, &output);
if (code != TSDB_CODE_SUCCESS) {
goto _exit;
}
code = colDataSetVal(pOutputData, i, output, (output == NULL)); TAOS_CHECK_GOTO(doAsTextFunc(input, &output), NULL, _exit);
TAOS_CHECK_GOTO(colDataSetVal(pOutputData, i, output, (output == NULL)), NULL, _exit);
_exit: _exit:
if (output) { if (output) {
@ -211,36 +188,22 @@ _exit:
} }
int32_t executeRelationFunc(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, int32_t executeRelationFunc(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1,
const GEOSGeometry *geom2, int32_t i, const GEOSGeometry *geom2, int32_t i, bool swapped, SColumnInfoData *pOutputData,
bool swapped, SColumnInfoData *pOutputData,
_geomDoRelationFunc_t doRelationFn) { _geomDoRelationFunc_t doRelationFn) {
int32_t code = TSDB_CODE_FAILED;
char res = 0; char res = 0;
if (!geom1 || !geom2) { //if empty input value if (!geom1 || !geom2) { // if empty input value
res = -1; res = -1;
code = TSDB_CODE_SUCCESS; } else {
} TAOS_CHECK_RETURN(doRelationFn(geom1, preparedGeom1, geom2, swapped, &res));
else {
code = doRelationFn(geom1, preparedGeom1, geom2, swapped, &res);
if (code != TSDB_CODE_SUCCESS) {
return code;
}
} }
code = colDataSetVal(pOutputData, i, &res, (res==-1)); return colDataSetVal(pOutputData, i, &res, (res == -1));
return code;
} }
int32_t geomOneParamFunction(SScalarParam *pInput, SScalarParam *pOutput, int32_t geomOneParamFunction(SScalarParam *pInput, SScalarParam *pOutput, _geomInitCtxFunc_t initCtxFn,
_geomInitCtxFunc_t initCtxFn, _geomExecuteOneParamFunc_t executeOneParamFn) { _geomExecuteOneParamFunc_t executeOneParamFn) {
int32_t code = TSDB_CODE_FAILED; TAOS_CHECK_RETURN(initCtxFn());
code = initCtxFn();
if (code != TSDB_CODE_SUCCESS) {
return code;
}
SColumnInfoData *pInputData = pInput->columnData; SColumnInfoData *pInputData = pInput->columnData;
SColumnInfoData *pOutputData = pOutput->columnData; SColumnInfoData *pOutputData = pOutput->columnData;
@ -248,42 +211,30 @@ int32_t geomOneParamFunction(SScalarParam *pInput, SScalarParam *pOutput,
if (IS_NULL_TYPE(GET_PARAM_TYPE(pInput))) { if (IS_NULL_TYPE(GET_PARAM_TYPE(pInput))) {
colDataSetNNULL(pOutputData, 0, pInput->numOfRows); colDataSetNNULL(pOutputData, 0, pInput->numOfRows);
code = TSDB_CODE_SUCCESS; } else {
}
else {
for (int32_t i = 0; i < pInput->numOfRows; ++i) { for (int32_t i = 0; i < pInput->numOfRows; ++i) {
if (colDataIsNull_s(pInputData, i)) { if (colDataIsNull_s(pInputData, i)) {
colDataSetNULL(pOutputData, i); colDataSetNULL(pOutputData, i);
code = TSDB_CODE_SUCCESS;
continue; continue;
} }
code = executeOneParamFn(pInputData, i, pOutputData); TAOS_CHECK_RETURN(executeOneParamFn(pInputData, i, pOutputData));
if (code != TSDB_CODE_SUCCESS) {
return code;
}
} }
} }
return code; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
int32_t geomTwoParamsFunction(SScalarParam *pInput, SScalarParam *pOutput, int32_t geomTwoParamsFunction(SScalarParam *pInput, SScalarParam *pOutput, _geomInitCtxFunc_t initCtxFn,
_geomInitCtxFunc_t initCtxFn, _geomExecuteTwoParamsFunc_t executeTwoParamsFn) { _geomExecuteTwoParamsFunc_t executeTwoParamsFn) {
int32_t code = TSDB_CODE_FAILED; TAOS_CHECK_RETURN(initCtxFn());
code = initCtxFn();
if (code != TSDB_CODE_SUCCESS) {
return code;
}
SColumnInfoData *pInputData[2]; SColumnInfoData *pInputData[2];
SColumnInfoData *pOutputData = pOutput->columnData; SColumnInfoData *pOutputData = pOutput->columnData;
pInputData[0] = pInput[0].columnData; pInputData[0] = pInput[0].columnData;
pInputData[1] = pInput[1].columnData; pInputData[1] = pInput[1].columnData;
bool hasNullType = (IS_NULL_TYPE(GET_PARAM_TYPE(&pInput[0])) || bool hasNullType = (IS_NULL_TYPE(GET_PARAM_TYPE(&pInput[0])) || IS_NULL_TYPE(GET_PARAM_TYPE(&pInput[1])));
IS_NULL_TYPE(GET_PARAM_TYPE(&pInput[1])));
bool isConstantLeft = (pInput[0].numOfRows == 1); bool isConstantLeft = (pInput[0].numOfRows == 1);
bool isConstantRight = (pInput[1].numOfRows == 1); bool isConstantRight = (pInput[1].numOfRows == 1);
int32_t numOfRows = TMAX(pInput[0].numOfRows, pInput[1].numOfRows); int32_t numOfRows = TMAX(pInput[0].numOfRows, pInput[1].numOfRows);
@ -293,9 +244,7 @@ int32_t geomTwoParamsFunction(SScalarParam *pInput, SScalarParam *pOutput,
(isConstantLeft && colDataIsNull_s(pInputData[0], 0)) || // left operand is constant NULL (isConstantLeft && colDataIsNull_s(pInputData[0], 0)) || // left operand is constant NULL
(isConstantRight && colDataIsNull_s(pInputData[1], 0))) { // right operand is constant NULL (isConstantRight && colDataIsNull_s(pInputData[1], 0))) { // right operand is constant NULL
colDataSetNNULL(pOutputData, 0, numOfRows); colDataSetNNULL(pOutputData, 0, numOfRows);
code = TSDB_CODE_SUCCESS; } else {
}
else {
int32_t iLeft = 0; int32_t iLeft = 0;
int32_t iRight = 0; int32_t iRight = 0;
for (int32_t i = 0; i < numOfRows; ++i) { for (int32_t i = 0; i < numOfRows; ++i) {
@ -305,32 +254,24 @@ int32_t geomTwoParamsFunction(SScalarParam *pInput, SScalarParam *pOutput,
if ((!isConstantLeft && colDataIsNull_s(pInputData[0], iLeft)) || if ((!isConstantLeft && colDataIsNull_s(pInputData[0], iLeft)) ||
(!isConstantRight && colDataIsNull_s(pInputData[1], iRight))) { (!isConstantRight && colDataIsNull_s(pInputData[1], iRight))) {
colDataSetNULL(pOutputData, i); colDataSetNULL(pOutputData, i);
code = TSDB_CODE_SUCCESS;
continue; continue;
} }
code = executeTwoParamsFn(pInputData, iLeft, iRight, pOutputData); TAOS_CHECK_RETURN(executeTwoParamsFn(pInputData, iLeft, iRight, pOutputData));
if (code != TSDB_CODE_SUCCESS) {
return code;
}
} }
} }
return code; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
int32_t geomRelationFunction(SScalarParam *pInput, SScalarParam *pOutput, int32_t geomRelationFunction(SScalarParam *pInput, SScalarParam *pOutput, bool swapAllowed,
bool swapAllowed, _geomDoRelationFunc_t doRelationFn) { _geomDoRelationFunc_t doRelationFn) {
int32_t code = TSDB_CODE_FAILED; int32_t code = TSDB_CODE_FAILED;
code = initCtxRelationFunc(); TAOS_CHECK_RETURN(initCtxRelationFunc());
if (code != TSDB_CODE_SUCCESS) {
return code;
}
// handle with all NULL output // handle with all NULL output
bool hasNullType = (IS_NULL_TYPE(GET_PARAM_TYPE(&pInput[0])) || bool hasNullType = (IS_NULL_TYPE(GET_PARAM_TYPE(&pInput[0])) || IS_NULL_TYPE(GET_PARAM_TYPE(&pInput[1])));
IS_NULL_TYPE(GET_PARAM_TYPE(&pInput[1])));
bool isConstant1 = (pInput[0].numOfRows == 1); bool isConstant1 = (pInput[0].numOfRows == 1);
bool isConstant2 = (pInput[1].numOfRows == 1); bool isConstant2 = (pInput[1].numOfRows == 1);
int32_t numOfRows = TMAX(pInput[0].numOfRows, pInput[1].numOfRows); int32_t numOfRows = TMAX(pInput[0].numOfRows, pInput[1].numOfRows);
@ -341,24 +282,21 @@ int32_t geomRelationFunction(SScalarParam *pInput, SScalarParam *pOutput,
(isConstant1 && colDataIsNull_s(pInput[0].columnData, 0)) || // left operand is constant NULL (isConstant1 && colDataIsNull_s(pInput[0].columnData, 0)) || // left operand is constant NULL
(isConstant2 && colDataIsNull_s(pInput[1].columnData, 0))) { // right operand is constant NULL (isConstant2 && colDataIsNull_s(pInput[1].columnData, 0))) { // right operand is constant NULL
colDataSetNNULL(pOutputData, 0, numOfRows); colDataSetNNULL(pOutputData, 0, numOfRows);
code = TSDB_CODE_SUCCESS; TAOS_RETURN(TSDB_CODE_SUCCESS);
return code;
} }
bool swapped = false; bool swapped = false;
SColumnInfoData *pInputData[2]; SColumnInfoData *pInputData[2];
// swap two input data to make sure input data 0 is constant if swapAllowed and only isConstant2 is true // swap two input data to make sure input data 0 is constant if swapAllowed and only isConstant2 is true
if (swapAllowed && if (swapAllowed && !isConstant1 && isConstant2) {
!isConstant1 && isConstant2) {
pInputData[0] = pInput[1].columnData; pInputData[0] = pInput[1].columnData;
pInputData[1] = pInput[0].columnData; pInputData[1] = pInput[0].columnData;
isConstant1 = true; isConstant1 = true;
isConstant2 = false; isConstant2 = false;
swapped = true; swapped = true;
} } else {
else {
pInputData[0] = pInput[0].columnData; pInputData[0] = pInput[0].columnData;
pInputData[1] = pInput[1].columnData; pInputData[1] = pInput[1].columnData;
} }
@ -369,43 +307,27 @@ int32_t geomRelationFunction(SScalarParam *pInput, SScalarParam *pOutput,
// if there is constant, make PreparedGeometry from pInputData 0 // if there is constant, make PreparedGeometry from pInputData 0
if (isConstant1) { if (isConstant1) {
code = readGeometry(colDataGetData(pInputData[0], 0), &geom1, &preparedGeom1); TAOS_CHECK_GOTO(readGeometry(colDataGetData(pInputData[0], 0), &geom1, &preparedGeom1), NULL, _exit);
if (code != TSDB_CODE_SUCCESS) {
goto _exit;
}
} }
if (isConstant2) { if (isConstant2) {
code = readGeometry(colDataGetData(pInputData[1], 0), &geom2, NULL); TAOS_CHECK_GOTO(readGeometry(colDataGetData(pInputData[1], 0), &geom2, NULL), NULL, _exit);
if (code != TSDB_CODE_SUCCESS) {
goto _exit;
}
} }
for (int32_t i = 0; i < numOfRows; ++i) { for (int32_t i = 0; i < numOfRows; ++i) {
if ((!isConstant1 && colDataIsNull_s(pInputData[0], i)) || if ((!isConstant1 && colDataIsNull_s(pInputData[0], i)) || (!isConstant2 && colDataIsNull_s(pInputData[1], i))) {
(!isConstant2 && colDataIsNull_s(pInputData[1], i))) {
colDataSetNULL(pOutputData, i); colDataSetNULL(pOutputData, i);
code = TSDB_CODE_SUCCESS;
continue; continue;
} }
if (!isConstant1) { if (!isConstant1) {
code = readGeometry(colDataGetData(pInputData[0], i), &geom1, &preparedGeom1); TAOS_CHECK_GOTO(readGeometry(colDataGetData(pInputData[0], i), &geom1, &preparedGeom1), NULL, _exit);
if (code != TSDB_CODE_SUCCESS) {
goto _exit;
}
} }
if (!isConstant2) { if (!isConstant2) {
code = readGeometry(colDataGetData(pInputData[1], i), &geom2, NULL); TAOS_CHECK_GOTO(readGeometry(colDataGetData(pInputData[1], i), &geom2, NULL), NULL, _exit);
if (code != TSDB_CODE_SUCCESS) {
goto _exit;
}
} }
code = executeRelationFunc(geom1, preparedGeom1, geom2, i, swapped, pOutputData, doRelationFn); TAOS_CHECK_GOTO(executeRelationFunc(geom1, preparedGeom1, geom2, i, swapped, pOutputData, doRelationFn), NULL,
if (code != TSDB_CODE_SUCCESS) { _exit);
goto _exit;
}
if (!isConstant1) { if (!isConstant1) {
destroyGeometry(&geom1, &preparedGeom1); destroyGeometry(&geom1, &preparedGeom1);
@ -415,11 +337,13 @@ int32_t geomRelationFunction(SScalarParam *pInput, SScalarParam *pOutput,
} }
} }
code = TSDB_CODE_SUCCESS;
_exit: _exit:
destroyGeometry(&geom1, &preparedGeom1); destroyGeometry(&geom1, &preparedGeom1);
destroyGeometry(&geom2, NULL); destroyGeometry(&geom2, NULL);
return code; TAOS_RETURN(code);
} }
int32_t makePointFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) { int32_t makePointFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {

90
source/libs/geometry/src/geosWrapper.c
View File

@ -18,7 +18,8 @@
#include "types.h" #include "types.h"
typedef char (*_geosRelationFunc_t)(GEOSContextHandle_t handle, const GEOSGeometry *g1, const GEOSGeometry *g2); typedef char (*_geosRelationFunc_t)(GEOSContextHandle_t handle, const GEOSGeometry *g1, const GEOSGeometry *g2);
typedef char (*_geosPreparedRelationFunc_t)(GEOSContextHandle_t handle, const GEOSPreparedGeometry *pg1, const GEOSGeometry *g2); typedef char (*_geosPreparedRelationFunc_t)(GEOSContextHandle_t handle, const GEOSPreparedGeometry *pg1,
const GEOSGeometry *g2);
void geosFreeBuffer(void *buffer) { void geosFreeBuffer(void *buffer) {
if (buffer) { if (buffer) {
@ -27,13 +28,13 @@ void geosFreeBuffer(void *buffer) {
} }
void geosErrMsgeHandler(const char *errMsg, void *userData) { void geosErrMsgeHandler(const char *errMsg, void *userData) {
char* targetErrMsg = userData; char *targetErrMsg = userData;
snprintf(targetErrMsg, 512, "%s", errMsg); snprintf(targetErrMsg, 512, "%s", errMsg);
} }
int32_t initCtxMakePoint() { int32_t initCtxMakePoint() {
int32_t code = TSDB_CODE_FAILED; int32_t code = TSDB_CODE_FAILED;
SGeosContext* geosCtx = getThreadLocalGeosCtx(); SGeosContext *geosCtx = getThreadLocalGeosCtx();
if (geosCtx->handle == NULL) { if (geosCtx->handle == NULL) {
geosCtx->handle = GEOS_init_r(); geosCtx->handle = GEOS_init_r();
@ -41,7 +42,7 @@ int32_t initCtxMakePoint() {
return code; return code;
} }
GEOSContext_setErrorMessageHandler_r(geosCtx->handle, geosErrMsgeHandler, geosCtx->errMsg); (void)GEOSContext_setErrorMessageHandler_r(geosCtx->handle, geosErrMsgeHandler, geosCtx->errMsg);
} }
if (geosCtx->WKBWriter == NULL) { if (geosCtx->WKBWriter == NULL) {
@ -58,7 +59,7 @@ int32_t initCtxMakePoint() {
// need to call geosFreeBuffer(*outputGeom) later // need to call geosFreeBuffer(*outputGeom) later
int32_t doMakePoint(double x, double y, unsigned char **outputGeom, size_t *size) { int32_t doMakePoint(double x, double y, unsigned char **outputGeom, size_t *size) {
int32_t code = TSDB_CODE_FAILED; int32_t code = TSDB_CODE_FAILED;
SGeosContext* geosCtx = getThreadLocalGeosCtx(); SGeosContext *geosCtx = getThreadLocalGeosCtx();
GEOSGeometry *geom = NULL; GEOSGeometry *geom = NULL;
unsigned char *wkb = NULL; unsigned char *wkb = NULL;
@ -89,6 +90,10 @@ _exit:
static int32_t initWktRegex(pcre2_code **ppRegex, pcre2_match_data **ppMatchData) { static int32_t initWktRegex(pcre2_code **ppRegex, pcre2_match_data **ppMatchData) {
int32_t code = 0; int32_t code = 0;
char *wktPatternWithSpace = taosMemoryCalloc(4, 1024); char *wktPatternWithSpace = taosMemoryCalloc(4, 1024);
if (NULL == wktPatternWithSpace) {
return TSDB_CODE_OUT_OF_MEMORY;
}
sprintf( sprintf(
wktPatternWithSpace, wktPatternWithSpace,
"^( *)point( *)z?m?( *)((empty)|(\\(( *)(([-+]?[0-9]+\\.?[0-9]*)|([-+]?[0-9]*\\.?[0-9]+))(e[-+]?[0-9]+)?(( " "^( *)point( *)z?m?( *)((empty)|(\\(( *)(([-+]?[0-9]+\\.?[0-9]*)|([-+]?[0-9]*\\.?[0-9]+))(e[-+]?[0-9]+)?(( "
@ -149,7 +154,7 @@ static int32_t initWktRegex(pcre2_code **ppRegex, pcre2_match_data **ppMatchData
int32_t initCtxGeomFromText() { int32_t initCtxGeomFromText() {
int32_t code = TSDB_CODE_FAILED; int32_t code = TSDB_CODE_FAILED;
SGeosContext* geosCtx = getThreadLocalGeosCtx(); SGeosContext *geosCtx = getThreadLocalGeosCtx();
if (geosCtx->handle == NULL) { if (geosCtx->handle == NULL) {
geosCtx->handle = GEOS_init_r(); geosCtx->handle = GEOS_init_r();
@ -157,7 +162,7 @@ int32_t initCtxGeomFromText() {
return code; return code;
} }
GEOSContext_setErrorMessageHandler_r(geosCtx->handle, geosErrMsgeHandler, geosCtx->errMsg); (void)GEOSContext_setErrorMessageHandler_r(geosCtx->handle, geosErrMsgeHandler, geosCtx->errMsg);
} }
if (geosCtx->WKTReader == NULL) { if (geosCtx->WKTReader == NULL) {
@ -185,7 +190,7 @@ int32_t initCtxGeomFromText() {
// need to call geosFreeBuffer(*outputGeom) later // need to call geosFreeBuffer(*outputGeom) later
int32_t doGeomFromText(const char *inputWKT, unsigned char **outputGeom, size_t *size) { int32_t doGeomFromText(const char *inputWKT, unsigned char **outputGeom, size_t *size) {
int32_t code = TSDB_CODE_FAILED; int32_t code = TSDB_CODE_FAILED;
SGeosContext* geosCtx = getThreadLocalGeosCtx(); SGeosContext *geosCtx = getThreadLocalGeosCtx();
GEOSGeometry *geom = NULL; GEOSGeometry *geom = NULL;
unsigned char *wkb = NULL; unsigned char *wkb = NULL;
@ -220,7 +225,7 @@ _exit:
int32_t initCtxAsText() { int32_t initCtxAsText() {
int32_t code = TSDB_CODE_FAILED; int32_t code = TSDB_CODE_FAILED;
SGeosContext* geosCtx = getThreadLocalGeosCtx(); SGeosContext *geosCtx = getThreadLocalGeosCtx();
if (geosCtx->handle == NULL) { if (geosCtx->handle == NULL) {
geosCtx->handle = GEOS_init_r(); geosCtx->handle = GEOS_init_r();
@ -228,7 +233,7 @@ int32_t initCtxAsText() {
return code; return code;
} }
GEOSContext_setErrorMessageHandler_r(geosCtx->handle, geosErrMsgeHandler, geosCtx->errMsg); (void)GEOSContext_setErrorMessageHandler_r(geosCtx->handle, geosErrMsgeHandler, geosCtx->errMsg);
} }
if (geosCtx->WKBReader == NULL) { if (geosCtx->WKBReader == NULL) {
@ -256,7 +261,7 @@ int32_t initCtxAsText() {
// need to call geosFreeBuffer(*outputWKT) later // need to call geosFreeBuffer(*outputWKT) later
int32_t doAsText(const unsigned char *inputGeom, size_t size, char **outputWKT) { int32_t doAsText(const unsigned char *inputGeom, size_t size, char **outputWKT) {
int32_t code = TSDB_CODE_FAILED; int32_t code = TSDB_CODE_FAILED;
SGeosContext* geosCtx = getThreadLocalGeosCtx(); SGeosContext *geosCtx = getThreadLocalGeosCtx();
GEOSGeometry *geom = NULL; GEOSGeometry *geom = NULL;
unsigned char *wkt = NULL; unsigned char *wkt = NULL;
@ -287,7 +292,7 @@ _exit:
int32_t initCtxRelationFunc() { int32_t initCtxRelationFunc() {
int32_t code = TSDB_CODE_FAILED; int32_t code = TSDB_CODE_FAILED;
SGeosContext* geosCtx = getThreadLocalGeosCtx(); SGeosContext *geosCtx = getThreadLocalGeosCtx();
if (geosCtx->handle == NULL) { if (geosCtx->handle == NULL) {
geosCtx->handle = GEOS_init_r(); geosCtx->handle = GEOS_init_r();
@ -295,7 +300,7 @@ int32_t initCtxRelationFunc() {
return code; return code;
} }
GEOSContext_setErrorMessageHandler_r(geosCtx->handle, geosErrMsgeHandler, geosCtx->errMsg); (void)GEOSContext_setErrorMessageHandler_r(geosCtx->handle, geosErrMsgeHandler, geosCtx->errMsg);
} }
if (geosCtx->WKBReader == NULL) { if (geosCtx->WKBReader == NULL) {
@ -309,88 +314,81 @@ int32_t initCtxRelationFunc() {
} }
int32_t doGeosRelation(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2, int32_t doGeosRelation(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2,
bool swapped, char *res, bool swapped, char *res, _geosRelationFunc_t relationFn, _geosRelationFunc_t swappedRelationFn,
_geosRelationFunc_t relationFn,
_geosRelationFunc_t swappedRelationFn,
_geosPreparedRelationFunc_t preparedRelationFn, _geosPreparedRelationFunc_t preparedRelationFn,
_geosPreparedRelationFunc_t swappedPreparedRelationFn) { _geosPreparedRelationFunc_t swappedPreparedRelationFn) {
int32_t code = TSDB_CODE_FAILED; SGeosContext *geosCtx = getThreadLocalGeosCtx();
SGeosContext* geosCtx = getThreadLocalGeosCtx();
if (!preparedGeom1) { if (!preparedGeom1) {
if (!swapped) { if (!swapped) {
ASSERT(relationFn); ASSERT(relationFn);
*res = relationFn(geosCtx->handle, geom1, geom2); *res = relationFn(geosCtx->handle, geom1, geom2);
} } else {
else {
ASSERT(swappedRelationFn); ASSERT(swappedRelationFn);
*res = swappedRelationFn(geosCtx->handle, geom1, geom2); *res = swappedRelationFn(geosCtx->handle, geom1, geom2);
} }
} } else {
else {
if (!swapped) { if (!swapped) {
ASSERT(preparedRelationFn); ASSERT(preparedRelationFn);
*res = preparedRelationFn(geosCtx->handle, preparedGeom1, geom2); *res = preparedRelationFn(geosCtx->handle, preparedGeom1, geom2);
} } else {
else {
ASSERT(swappedPreparedRelationFn); ASSERT(swappedPreparedRelationFn);
*res = swappedPreparedRelationFn(geosCtx->handle, preparedGeom1, geom2); *res = swappedPreparedRelationFn(geosCtx->handle, preparedGeom1, geom2);
} }
} }
code = TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
return code;
} }
int32_t doIntersects(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2, int32_t doIntersects(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2,
bool swapped, char *res) { bool swapped, char *res) {
return doGeosRelation(geom1, preparedGeom1, geom2, swapped, res, return doGeosRelation(geom1, preparedGeom1, geom2, swapped, res, GEOSIntersects_r, GEOSIntersects_r,
GEOSIntersects_r, GEOSIntersects_r, GEOSPreparedIntersects_r, GEOSPreparedIntersects_r); GEOSPreparedIntersects_r, GEOSPreparedIntersects_r);
} }
int32_t doEquals(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2, int32_t doEquals(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2,
bool swapped, char *res) { bool swapped, char *res) {
return doGeosRelation(geom1, NULL, geom2, swapped, res, return doGeosRelation(geom1, NULL, geom2, swapped, res, GEOSEquals_r, GEOSEquals_r, NULL,
GEOSEquals_r, GEOSEquals_r, NULL, NULL); // no prepared version for eguals() NULL); // no prepared version for eguals()
} }
int32_t doTouches(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2, int32_t doTouches(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2,
bool swapped, char *res) { bool swapped, char *res) {
return doGeosRelation(geom1, preparedGeom1, geom2, swapped, res, return doGeosRelation(geom1, preparedGeom1, geom2, swapped, res, GEOSTouches_r, GEOSTouches_r, GEOSPreparedTouches_r,
GEOSTouches_r, GEOSTouches_r, GEOSPreparedTouches_r, GEOSPreparedTouches_r); GEOSPreparedTouches_r);
} }
int32_t doCovers(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2, int32_t doCovers(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2,
bool swapped, char *res) { bool swapped, char *res) {
return doGeosRelation(geom1, preparedGeom1, geom2, swapped, res, return doGeosRelation(geom1, preparedGeom1, geom2, swapped, res, GEOSCovers_r, GEOSCoveredBy_r, GEOSPreparedCovers_r,
GEOSCovers_r, GEOSCoveredBy_r, GEOSPreparedCovers_r, GEOSPreparedCoveredBy_r); GEOSPreparedCoveredBy_r);
} }
int32_t doContains(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2, int32_t doContains(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2,
bool swapped, char *res) { bool swapped, char *res) {
return doGeosRelation(geom1, preparedGeom1, geom2, swapped, res, return doGeosRelation(geom1, preparedGeom1, geom2, swapped, res, GEOSContains_r, GEOSWithin_r, GEOSPreparedContains_r,
GEOSContains_r, GEOSWithin_r, GEOSPreparedContains_r, GEOSPreparedWithin_r); GEOSPreparedWithin_r);
} }
int32_t doContainsProperly(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1, const GEOSGeometry *geom2, int32_t doContainsProperly(const GEOSGeometry *geom1, const GEOSPreparedGeometry *preparedGeom1,
bool swapped, char *res) { const GEOSGeometry *geom2, bool swapped, char *res) {
return doGeosRelation(geom1, preparedGeom1, geom2, swapped, res, return doGeosRelation(geom1, preparedGeom1, geom2, swapped, res, NULL, NULL, GEOSPreparedContainsProperly_r, NULL);
NULL, NULL, GEOSPreparedContainsProperly_r, NULL);
} }
// input is with VARSTR format // input is with VARSTR format
// need to call destroyGeometry(outputGeom, outputPreparedGeom) later // need to call destroyGeometry(outputGeom, outputPreparedGeom) later
int32_t readGeometry(const unsigned char *input, GEOSGeometry **outputGeom, const GEOSPreparedGeometry **outputPreparedGeom) { int32_t readGeometry(const unsigned char *input, GEOSGeometry **outputGeom,
SGeosContext* geosCtx = getThreadLocalGeosCtx(); const GEOSPreparedGeometry **outputPreparedGeom) {
SGeosContext *geosCtx = getThreadLocalGeosCtx();
ASSERT(outputGeom); //it is not allowed if outputGeom is NULL ASSERT(outputGeom); // it is not allowed if outputGeom is NULL
*outputGeom = NULL; *outputGeom = NULL;
if (outputPreparedGeom) { //it means not to generate PreparedGeometry if outputPreparedGeom is NULL if (outputPreparedGeom) { // it means not to generate PreparedGeometry if outputPreparedGeom is NULL
*outputPreparedGeom = NULL; *outputPreparedGeom = NULL;
} }
if (varDataLen(input) == 0) { //empty value if (varDataLen(input) == 0) { // empty value
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
@ -410,7 +408,7 @@ int32_t readGeometry(const unsigned char *input, GEOSGeometry **outputGeom, cons
} }
void destroyGeometry(GEOSGeometry **geom, const GEOSPreparedGeometry **preparedGeom) { void destroyGeometry(GEOSGeometry **geom, const GEOSPreparedGeometry **preparedGeom) {
SGeosContext* geosCtx = getThreadLocalGeosCtx(); SGeosContext *geosCtx = getThreadLocalGeosCtx();
if (preparedGeom && *preparedGeom) { if (preparedGeom && *preparedGeom) {
GEOSPreparedGeom_destroy_r(geosCtx->handle, *preparedGeom); GEOSPreparedGeom_destroy_r(geosCtx->handle, *preparedGeom);

38
source/libs/monitor/src/monMain.c
View File

@ -15,17 +15,17 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "monInt.h" #include "monInt.h"
#include "taos_monitor.h"
#include "taoserror.h" #include "taoserror.h"
#include "tglobal.h"
#include "thttp.h" #include "thttp.h"
#include "ttime.h" #include "ttime.h"
#include "taos_monitor.h"
#include "tglobal.h"
SMonitor tsMonitor = {0}; SMonitor tsMonitor = {0};
char* tsMonUri = "/report"; char *tsMonUri = "/report";
char* tsMonFwUri = "/general-metric"; char *tsMonFwUri = "/general-metric";
char* tsMonSlowLogUri = "/slow-sql-detail-batch"; char *tsMonSlowLogUri = "/slow-sql-detail-batch";
char* tsMonFwBasicUri = "/taosd-cluster-basic"; char *tsMonFwBasicUri = "/taosd-cluster-basic";
void monRecordLog(int64_t ts, ELogLevel level, const char *content) { void monRecordLog(int64_t ts, ELogLevel level, const char *content) {
taosThreadMutexLock(&tsMonitor.lock); taosThreadMutexLock(&tsMonitor.lock);
@ -54,8 +54,7 @@ int32_t monGetLogs(SMonLogs *logs) {
taosArrayClear(tsMonitor.logs); taosArrayClear(tsMonitor.logs);
taosThreadMutexUnlock(&tsMonitor.lock); taosThreadMutexUnlock(&tsMonitor.lock);
if (logs->logs == NULL) { if (logs->logs == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
return -1;
} }
return 0; return 0;
} }
@ -105,8 +104,7 @@ void monSetBmInfo(SMonBmInfo *pInfo) {
int32_t monInit(const SMonCfg *pCfg) { int32_t monInit(const SMonCfg *pCfg) {
tsMonitor.logs = taosArrayInit(16, sizeof(SMonLogItem)); tsMonitor.logs = taosArrayInit(16, sizeof(SMonLogItem));
if (tsMonitor.logs == NULL) { if (tsMonitor.logs == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
return -1;
} }
tsMonitor.cfg = *pCfg; tsMonitor.cfg = *pCfg;
@ -146,6 +144,7 @@ static void monCleanupMonitorInfo(SMonInfo *pMonitor) {
} }
static SMonInfo *monCreateMonitorInfo() { static SMonInfo *monCreateMonitorInfo() {
terrno = 0;
SMonInfo *pMonitor = taosMemoryCalloc(1, sizeof(SMonInfo)); SMonInfo *pMonitor = taosMemoryCalloc(1, sizeof(SMonInfo));
if (pMonitor == NULL) { if (pMonitor == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY; terrno = TSDB_CODE_OUT_OF_MEMORY;
@ -274,11 +273,11 @@ static void monGenClusterJsonBasic(SMonInfo *pMonitor) {
SMonClusterInfo *pInfo = &pMonitor->mmInfo.cluster; SMonClusterInfo *pInfo = &pMonitor->mmInfo.cluster;
if (pMonitor->mmInfo.cluster.first_ep_dnode_id == 0) return; if (pMonitor->mmInfo.cluster.first_ep_dnode_id == 0) return;
//tjsonAddStringToObject(pMonitor->pJson, "first_ep", pInfo->first_ep); // tjsonAddStringToObject(pMonitor->pJson, "first_ep", pInfo->first_ep);
tjsonAddStringToObject(pMonitor->pJson, "first_ep", tsFirst); tjsonAddStringToObject(pMonitor->pJson, "first_ep", tsFirst);
tjsonAddDoubleToObject(pMonitor->pJson, "first_ep_dnode_id", pInfo->first_ep_dnode_id); tjsonAddDoubleToObject(pMonitor->pJson, "first_ep_dnode_id", pInfo->first_ep_dnode_id);
tjsonAddStringToObject(pMonitor->pJson, "cluster_version", pInfo->version); tjsonAddStringToObject(pMonitor->pJson, "cluster_version", pInfo->version);
//tjsonAddDoubleToObject(pMonitor->pJson, "monitor_interval", pInfo->monitor_interval); // tjsonAddDoubleToObject(pMonitor->pJson, "monitor_interval", pInfo->monitor_interval);
} }
static void monGenVgroupJson(SMonInfo *pMonitor) { static void monGenVgroupJson(SMonInfo *pMonitor) {
@ -554,9 +553,9 @@ static void monGenLogJson(SMonInfo *pMonitor) {
if (tjsonAddItemToArray(pSummaryJson, pLogTrace) != 0) tjsonDelete(pLogTrace); if (tjsonAddItemToArray(pSummaryJson, pLogTrace) != 0) tjsonDelete(pLogTrace);
} }
void monSendReport(SMonInfo *pMonitor){ void monSendReport(SMonInfo *pMonitor) {
char *pCont = tjsonToString(pMonitor->pJson); char *pCont = tjsonToString(pMonitor->pJson);
if(tsMonitorLogProtocol){ if (tsMonitorLogProtocol) {
uInfoL("report cont:\n%s", pCont); uInfoL("report cont:\n%s", pCont);
} }
if (pCont != NULL) { if (pCont != NULL) {
@ -591,7 +590,7 @@ void monGenAndSendReport() {
SMonInfo *pMonitor = monCreateMonitorInfo(); SMonInfo *pMonitor = monCreateMonitorInfo();
if (pMonitor == NULL) return; if (pMonitor == NULL) return;
if(!tsMonitorForceV2){ if (!tsMonitorForceV2) {
monGenBasicJson(pMonitor); monGenBasicJson(pMonitor);
monGenClusterJson(pMonitor); monGenClusterJson(pMonitor);
monGenVgroupJson(pMonitor); monGenVgroupJson(pMonitor);
@ -602,8 +601,7 @@ void monGenAndSendReport() {
monGenLogJson(pMonitor); monGenLogJson(pMonitor);
monSendReport(pMonitor); monSendReport(pMonitor);
} } else {
else{
monGenClusterInfoTable(pMonitor); monGenClusterInfoTable(pMonitor);
monGenVgroupInfoTable(pMonitor); monGenVgroupInfoTable(pMonitor);
monGenDnodeInfoTable(pMonitor); monGenDnodeInfoTable(pMonitor);
@ -624,10 +622,10 @@ void monGenAndSendReport() {
monCleanupMonitorInfo(pMonitor); monCleanupMonitorInfo(pMonitor);
} }
void monSendContent(char *pCont, const char* uri) { void monSendContent(char *pCont, const char *uri) {
if (!tsEnableMonitor || tsMonitorFqdn[0] == 0 || tsMonitorPort == 0) return; if (!tsEnableMonitor || tsMonitorFqdn[0] == 0 || tsMonitorPort == 0) return;
if(tsMonitorLogProtocol){ if (tsMonitorLogProtocol) {
if (pCont != NULL){ if (pCont != NULL) {
uInfoL("report client cont:\n%s\n", pCont); uInfoL("report client cont:\n%s\n", pCont);
} }
} }

344
source/util/src/tconfig.c
View File

@ -42,22 +42,21 @@ int32_t cfgLoadFromApollUrl(SConfig *pConfig, const char *url);
extern char **environ; extern char **environ;
SConfig *cfgInit() { int32_t cfgInit(SConfig ** ppCfg) {
SConfig *pCfg = taosMemoryCalloc(1, sizeof(SConfig)); SConfig *pCfg = taosMemoryCalloc(1, sizeof(SConfig));
if (pCfg == NULL) { if (pCfg == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
return NULL;
} }
pCfg->array = taosArrayInit(32, sizeof(SConfigItem)); pCfg->array = taosArrayInit(32, sizeof(SConfigItem));
if (pCfg->array == NULL) { if (pCfg->array == NULL) {
taosMemoryFree(pCfg); taosMemoryFree(pCfg);
terrno = TSDB_CODE_OUT_OF_MEMORY; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
return NULL;
} }
taosThreadMutexInit(&pCfg->lock, NULL); taosThreadMutexInit(&pCfg->lock, NULL);
return pCfg; *ppCfg = pCfg;
TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
int32_t cfgLoad(SConfig *pCfg, ECfgSrcType cfgType, const void *sourceStr) { int32_t cfgLoad(SConfig *pCfg, ECfgSrcType cfgType, const void *sourceStr) {
@ -73,7 +72,7 @@ int32_t cfgLoad(SConfig *pCfg, ECfgSrcType cfgType, const void *sourceStr) {
case CFG_STYPE_ENV_CMD: case CFG_STYPE_ENV_CMD:
return cfgLoadFromEnvCmd(pCfg, (const char **)sourceStr); return cfgLoadFromEnvCmd(pCfg, (const char **)sourceStr);
default: default:
return -1; return TSDB_CODE_INVALID_PARA;
} }
} }
@ -82,11 +81,11 @@ int32_t cfgLoadFromArray(SConfig *pCfg, SArray *pArgs) {
for (int32_t i = 0; i < size; ++i) { for (int32_t i = 0; i < size; ++i) {
SConfigPair *pPair = taosArrayGet(pArgs, i); SConfigPair *pPair = taosArrayGet(pArgs, i);
if (cfgSetItem(pCfg, pPair->name, pPair->value, CFG_STYPE_ARG_LIST, true) != 0) { if (cfgSetItem(pCfg, pPair->name, pPair->value, CFG_STYPE_ARG_LIST, true) != 0) {
return -1; return TSDB_CODE_INVALID_PARA;
} }
} }
return 0; return TSDB_CODE_SUCCESS;
} }
void cfgItemFreeVal(SConfigItem *pItem) { void cfgItemFreeVal(SConfigItem *pItem) {
@ -126,28 +125,27 @@ static int32_t cfgCheckAndSetConf(SConfigItem *pItem, const char *conf) {
pItem->str = taosStrdup(conf); pItem->str = taosStrdup(conf);
if (pItem->str == NULL) { if (pItem->str == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
return -1;
} }
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
static int32_t cfgCheckAndSetDir(SConfigItem *pItem, const char *inputDir) { static int32_t cfgCheckAndSetDir(SConfigItem *pItem, const char *inputDir) {
char fullDir[PATH_MAX] = {0}; char fullDir[PATH_MAX] = {0};
if (taosExpandDir(inputDir, fullDir, PATH_MAX) != 0) { if (taosExpandDir(inputDir, fullDir, PATH_MAX) != 0) {
uError("failed to expand dir:%s", inputDir); int32_t code = TAOS_SYSTEM_ERROR(errno);
return -1; uError("failed to expand dir:%s since %s", inputDir, tstrerror(code));
TAOS_RETURN(code);
} }
taosMemoryFreeClear(pItem->str); taosMemoryFreeClear(pItem->str);
pItem->str = taosStrdup(fullDir); pItem->str = taosStrdup(fullDir);
if (pItem->str == NULL) { if (pItem->str == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
return -1;
} }
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
static int32_t cfgSetBool(SConfigItem *pItem, const char *value, ECfgSrcType stype) { static int32_t cfgSetBool(SConfigItem *pItem, const char *value, ECfgSrcType stype) {
@ -166,97 +164,88 @@ static int32_t cfgSetBool(SConfigItem *pItem, const char *value, ECfgSrcType sty
static int32_t cfgSetInt32(SConfigItem *pItem, const char *value, ECfgSrcType stype) { static int32_t cfgSetInt32(SConfigItem *pItem, const char *value, ECfgSrcType stype) {
int32_t ival; int32_t ival;
int32_t code = taosStrHumanToInt32(value, &ival); TAOS_CHECK_RETURN(taosStrHumanToInt32(value, &ival));
if (code != TSDB_CODE_SUCCESS) return code;
if (ival < pItem->imin || ival > pItem->imax) { if (ival < pItem->imin || ival > pItem->imax) {
uError("cfg:%s, type:%s src:%s value:%d out of range[%" PRId64 ", %" PRId64 "]", pItem->name, uError("cfg:%s, type:%s src:%s value:%d out of range[%" PRId64 ", %" PRId64 "]", pItem->name,
cfgDtypeStr(pItem->dtype), cfgStypeStr(stype), ival, pItem->imin, pItem->imax); cfgDtypeStr(pItem->dtype), cfgStypeStr(stype), ival, pItem->imin, pItem->imax);
terrno = TSDB_CODE_OUT_OF_RANGE; TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
return -1;
} }
pItem->i32 = ival; pItem->i32 = ival;
pItem->stype = stype; pItem->stype = stype;
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
static int32_t cfgSetInt64(SConfigItem *pItem, const char *value, ECfgSrcType stype) { static int32_t cfgSetInt64(SConfigItem *pItem, const char *value, ECfgSrcType stype) {
int64_t ival; int64_t ival;
int32_t code = taosStrHumanToInt64(value, &ival); TAOS_CHECK_RETURN(taosStrHumanToInt64(value, &ival));
if (code != TSDB_CODE_SUCCESS) return code;
if (ival < pItem->imin || ival > pItem->imax) { if (ival < pItem->imin || ival > pItem->imax) {
uError("cfg:%s, type:%s src:%s value:%" PRId64 " out of range[%" PRId64 ", %" PRId64 "]", pItem->name, uError("cfg:%s, type:%s src:%s value:%" PRId64 " out of range[%" PRId64 ", %" PRId64 "]", pItem->name,
cfgDtypeStr(pItem->dtype), cfgStypeStr(stype), ival, pItem->imin, pItem->imax); cfgDtypeStr(pItem->dtype), cfgStypeStr(stype), ival, pItem->imin, pItem->imax);
terrno = TSDB_CODE_OUT_OF_RANGE; TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
return -1;
} }
pItem->i64 = ival; pItem->i64 = ival;
pItem->stype = stype; pItem->stype = stype;
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
static int32_t cfgSetFloat(SConfigItem *pItem, const char *value, ECfgSrcType stype) { static int32_t cfgSetFloat(SConfigItem *pItem, const char *value, ECfgSrcType stype) {
double dval; double dval;
int32_t code = parseCfgReal(value, &dval); TAOS_CHECK_RETURN(parseCfgReal(value, &dval));
if (dval < pItem->fmin || dval > pItem->fmax) { if (dval < pItem->fmin || dval > pItem->fmax) {
uError("cfg:%s, type:%s src:%s value:%f out of range[%f, %f]", pItem->name, cfgDtypeStr(pItem->dtype), uError("cfg:%s, type:%s src:%s value:%f out of range[%f, %f]", pItem->name, cfgDtypeStr(pItem->dtype),
cfgStypeStr(stype), dval, pItem->fmin, pItem->fmax); cfgStypeStr(stype), dval, pItem->fmin, pItem->fmax);
terrno = TSDB_CODE_OUT_OF_RANGE; TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
return -1;
} }
pItem->fval = (float)dval; pItem->fval = (float)dval;
pItem->stype = stype; pItem->stype = stype;
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
static int32_t cfgSetString(SConfigItem *pItem, const char *value, ECfgSrcType stype) { static int32_t cfgSetString(SConfigItem *pItem, const char *value, ECfgSrcType stype) {
char *tmp = taosStrdup(value); char *tmp = taosStrdup(value);
if (tmp == NULL) { if (tmp == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
uError("cfg:%s, type:%s src:%s value:%s failed to dup since %s", pItem->name, cfgDtypeStr(pItem->dtype), uError("cfg:%s, type:%s src:%s value:%s failed to dup since %s", pItem->name, cfgDtypeStr(pItem->dtype),
cfgStypeStr(stype), value, terrstr()); cfgStypeStr(stype), value, tstrerror(TSDB_CODE_OUT_OF_MEMORY));
return -1; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
} }
taosMemoryFreeClear(pItem->str); taosMemoryFreeClear(pItem->str);
pItem->str = tmp; pItem->str = tmp;
pItem->stype = stype; pItem->stype = stype;
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
static int32_t cfgSetDir(SConfigItem *pItem, const char *value, ECfgSrcType stype) { static int32_t cfgSetDir(SConfigItem *pItem, const char *value, ECfgSrcType stype) {
if (cfgCheckAndSetDir(pItem, value) != 0) { int32_t code = cfgCheckAndSetDir(pItem, value);
if (TSDB_CODE_SUCCESS != code) {
uError("cfg:%s, type:%s src:%s value:%s failed to dup since %s", pItem->name, cfgDtypeStr(pItem->dtype), uError("cfg:%s, type:%s src:%s value:%s failed to dup since %s", pItem->name, cfgDtypeStr(pItem->dtype),
cfgStypeStr(stype), value, terrstr()); cfgStypeStr(stype), value, tstrerror(code));
return -1; TAOS_RETURN(code);
} }
pItem->stype = stype; pItem->stype = stype;
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
static int32_t doSetConf(SConfigItem *pItem, const char *value, ECfgSrcType stype) { static int32_t doSetConf(SConfigItem *pItem, const char *value, ECfgSrcType stype) {
if (cfgCheckAndSetConf(pItem, value) != 0) { int32_t code = cfgCheckAndSetConf(pItem, value);
terrno = TSDB_CODE_OUT_OF_MEMORY; if (TSDB_CODE_SUCCESS != code) {
uError("cfg:%s, type:%s src:%s value:%s failed to dup since %s", pItem->name, cfgDtypeStr(pItem->dtype), uError("cfg:%s, type:%s src:%s value:%s failed to dup since %s", pItem->name, cfgDtypeStr(pItem->dtype),
cfgStypeStr(stype), value, terrstr()); cfgStypeStr(stype), value, tstrerror(TSDB_CODE_OUT_OF_MEMORY));
return -1; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
} }
pItem->stype = stype; pItem->stype = stype;
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
static int32_t cfgSetTimezone(SConfigItem *pItem, const char *value, ECfgSrcType stype) { static int32_t cfgSetTimezone(SConfigItem *pItem, const char *value, ECfgSrcType stype) {
int32_t code = doSetConf(pItem, value, stype); TAOS_CHECK_RETURN(doSetConf(pItem, value, stype));
if (code != TSDB_CODE_SUCCESS) {
return code;
}
osSetTimezone(value); osSetTimezone(value);
return code; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
static int32_t cfgSetTfsItem(SConfig *pCfg, const char *name, const char *value, const char *level, const char *primary, static int32_t cfgSetTfsItem(SConfig *pCfg, const char *name, const char *value, const char *level, const char *primary,
@ -267,16 +256,15 @@ static int32_t cfgSetTfsItem(SConfig *pCfg, const char *name, const char *value,
if (pItem == NULL) { if (pItem == NULL) {
taosThreadMutexUnlock(&pCfg->lock); taosThreadMutexUnlock(&pCfg->lock);
return -1; TAOS_RETURN(TSDB_CODE_CFG_NOT_FOUND);
} }
if (pItem->array == NULL) { if (pItem->array == NULL) {
pItem->array = taosArrayInit(16, sizeof(SDiskCfg)); pItem->array = taosArrayInit(16, sizeof(SDiskCfg));
if (pItem->array == NULL) { if (pItem->array == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
taosThreadMutexUnlock(&pCfg->lock); taosThreadMutexUnlock(&pCfg->lock);
return -1; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
} }
} }
@ -287,34 +275,32 @@ static int32_t cfgSetTfsItem(SConfig *pCfg, const char *name, const char *value,
cfg.disable = disable ? atoi(disable) : 0; cfg.disable = disable ? atoi(disable) : 0;
void *ret = taosArrayPush(pItem->array, &cfg); void *ret = taosArrayPush(pItem->array, &cfg);
if (ret == NULL) { if (ret == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
taosThreadMutexUnlock(&pCfg->lock); taosThreadMutexUnlock(&pCfg->lock);
return -1; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
} }
pItem->stype = stype; pItem->stype = stype;
taosThreadMutexUnlock(&pCfg->lock); taosThreadMutexUnlock(&pCfg->lock);
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
static int32_t cfgUpdateDebugFlagItem(SConfig *pCfg, const char *name, bool resetArray) { static int32_t cfgUpdateDebugFlagItem(SConfig *pCfg, const char *name, bool resetArray) {
SConfigItem *pDebugFlagItem = cfgGetItem(pCfg, "debugFlag"); SConfigItem *pDebugFlagItem = cfgGetItem(pCfg, "debugFlag");
if (resetArray) { if (resetArray) {
// reset // reset
if (pDebugFlagItem == NULL) return -1; if (pDebugFlagItem == NULL) TAOS_RETURN(TSDB_CODE_CFG_NOT_FOUND);
// logflag names that should 'not' be set by 'debugFlag' // logflag names that should 'not' be set by 'debugFlag'
if (pDebugFlagItem->array == NULL) { if (pDebugFlagItem->array == NULL) {
pDebugFlagItem->array = taosArrayInit(16, sizeof(SLogVar)); pDebugFlagItem->array = taosArrayInit(16, sizeof(SLogVar));
if (pDebugFlagItem->array == NULL) { if (pDebugFlagItem->array == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
return -1;
} }
} }
taosArrayClear(pDebugFlagItem->array); taosArrayClear(pDebugFlagItem->array);
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
// update // update
@ -322,9 +308,11 @@ static int32_t cfgUpdateDebugFlagItem(SConfig *pCfg, const char *name, bool rese
if (pDebugFlagItem->array != NULL) { if (pDebugFlagItem->array != NULL) {
SLogVar logVar = {0}; SLogVar logVar = {0};
strncpy(logVar.name, name, TSDB_LOG_VAR_LEN - 1); strncpy(logVar.name, name, TSDB_LOG_VAR_LEN - 1);
taosArrayPush(pDebugFlagItem->array, &logVar); if (NULL == taosArrayPush(pDebugFlagItem->array, &logVar)) {
TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
} }
return 0; }
TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
int32_t cfgSetItem(SConfig *pCfg, const char *name, const char *value, ECfgSrcType stype, bool lock) { int32_t cfgSetItem(SConfig *pCfg, const char *name, const char *value, ECfgSrcType stype, bool lock) {
@ -337,9 +325,8 @@ int32_t cfgSetItem(SConfig *pCfg, const char *name, const char *value, ECfgSrcTy
SConfigItem *pItem = cfgGetItem(pCfg, name); SConfigItem *pItem = cfgGetItem(pCfg, name);
if (pItem == NULL) { if (pItem == NULL) {
terrno = TSDB_CODE_CFG_NOT_FOUND;
taosThreadMutexUnlock(&pCfg->lock); taosThreadMutexUnlock(&pCfg->lock);
return -1; TAOS_RETURN(TSDB_CODE_CFG_NOT_FOUND);
} }
switch (pItem->dtype) { switch (pItem->dtype) {
@ -382,7 +369,7 @@ int32_t cfgSetItem(SConfig *pCfg, const char *name, const char *value, ECfgSrcTy
} }
case CFG_DTYPE_NONE: case CFG_DTYPE_NONE:
default: default:
terrno = TSDB_CODE_INVALID_CFG; code = TSDB_CODE_INVALID_CFG;
break; break;
} }
@ -390,7 +377,7 @@ int32_t cfgSetItem(SConfig *pCfg, const char *name, const char *value, ECfgSrcTy
taosThreadMutexUnlock(&pCfg->lock); taosThreadMutexUnlock(&pCfg->lock);
} }
return code; TAOS_RETURN(code);
} }
SConfigItem *cfgGetItem(SConfig *pCfg, const char *pName) { SConfigItem *cfgGetItem(SConfig *pCfg, const char *pName) {
@ -403,7 +390,6 @@ SConfigItem *cfgGetItem(SConfig *pCfg, const char *pName) {
} }
} }
terrno = TSDB_CODE_CFG_NOT_FOUND;
return NULL; return NULL;
} }
@ -427,20 +413,18 @@ int32_t cfgCheckRangeForDynUpdate(SConfig *pCfg, const char *name, const char *p
SConfigItem *pItem = cfgGetItem(pCfg, name); SConfigItem *pItem = cfgGetItem(pCfg, name);
if (!pItem || (pItem->dynScope & dynType) == 0) { if (!pItem || (pItem->dynScope & dynType) == 0) {
uError("failed to config:%s, not support update this config", name); uError("failed to config:%s, not support update this config", name);
terrno = TSDB_CODE_INVALID_CFG;
cfgUnLock(pCfg); cfgUnLock(pCfg);
return -1; TAOS_RETURN(TSDB_CODE_INVALID_CFG);
} }
switch (pItem->dtype) { switch (pItem->dtype) {
case CFG_DTYPE_STRING:{ case CFG_DTYPE_STRING: {
if(strcasecmp(name, "slowLogScope") == 0){ if (strcasecmp(name, "slowLogScope") == 0) {
char* tmp = taosStrdup(pVal); char *tmp = taosStrdup(pVal);
if(taosSetSlowLogScope(tmp) < 0){ if (taosSetSlowLogScope(tmp) < 0) {
terrno = TSDB_CODE_INVALID_CFG;
cfgUnLock(pCfg); cfgUnLock(pCfg);
taosMemoryFree(tmp); taosMemoryFree(tmp);
return -1; TAOS_RETURN(TSDB_CODE_INVALID_CFG);
} }
taosMemoryFree(tmp); taosMemoryFree(tmp);
} }
@ -449,9 +433,8 @@ int32_t cfgCheckRangeForDynUpdate(SConfig *pCfg, const char *name, const char *p
int32_t ival = (int32_t)atoi(pVal); int32_t ival = (int32_t)atoi(pVal);
if (ival != 0 && ival != 1) { if (ival != 0 && ival != 1) {
uError("cfg:%s, type:%s value:%d out of range[0, 1]", pItem->name, cfgDtypeStr(pItem->dtype), ival); uError("cfg:%s, type:%s value:%d out of range[0, 1]", pItem->name, cfgDtypeStr(pItem->dtype), ival);
terrno = TSDB_CODE_OUT_OF_RANGE;
cfgUnLock(pCfg); cfgUnLock(pCfg);
return -1; TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
} }
} break; } break;
case CFG_DTYPE_INT32: { case CFG_DTYPE_INT32: {
@ -464,9 +447,8 @@ int32_t cfgCheckRangeForDynUpdate(SConfig *pCfg, const char *name, const char *p
if (ival < pItem->imin || ival > pItem->imax) { if (ival < pItem->imin || ival > pItem->imax) {
uError("cfg:%s, type:%s value:%d out of range[%" PRId64 ", %" PRId64 "]", pItem->name, uError("cfg:%s, type:%s value:%d out of range[%" PRId64 ", %" PRId64 "]", pItem->name,
cfgDtypeStr(pItem->dtype), ival, pItem->imin, pItem->imax); cfgDtypeStr(pItem->dtype), ival, pItem->imin, pItem->imax);
terrno = TSDB_CODE_OUT_OF_RANGE;
cfgUnLock(pCfg); cfgUnLock(pCfg);
return -1; TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
} }
} break; } break;
case CFG_DTYPE_INT64: { case CFG_DTYPE_INT64: {
@ -474,14 +456,13 @@ int32_t cfgCheckRangeForDynUpdate(SConfig *pCfg, const char *name, const char *p
int32_t code = taosStrHumanToInt64(pVal, &ival); int32_t code = taosStrHumanToInt64(pVal, &ival);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
cfgUnLock(pCfg); cfgUnLock(pCfg);
return code; TAOS_RETURN(code);
} }
if (ival < pItem->imin || ival > pItem->imax) { if (ival < pItem->imin || ival > pItem->imax) {
uError("cfg:%s, type:%s value:%" PRId64 " out of range[%" PRId64 ", %" PRId64 "]", pItem->name, uError("cfg:%s, type:%s value:%" PRId64 " out of range[%" PRId64 ", %" PRId64 "]", pItem->name,
cfgDtypeStr(pItem->dtype), ival, pItem->imin, pItem->imax); cfgDtypeStr(pItem->dtype), ival, pItem->imin, pItem->imax);
terrno = TSDB_CODE_OUT_OF_RANGE;
cfgUnLock(pCfg); cfgUnLock(pCfg);
return -1; TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
} }
} break; } break;
case CFG_DTYPE_FLOAT: case CFG_DTYPE_FLOAT:
@ -490,14 +471,13 @@ int32_t cfgCheckRangeForDynUpdate(SConfig *pCfg, const char *name, const char *p
int32_t code = parseCfgReal(pVal, &dval); int32_t code = parseCfgReal(pVal, &dval);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
cfgUnLock(pCfg); cfgUnLock(pCfg);
return code; TAOS_RETURN(code);
} }
if (dval < pItem->fmin || dval > pItem->fmax) { if (dval < pItem->fmin || dval > pItem->fmax) {
uError("cfg:%s, type:%s value:%f out of range[%f, %f]", pItem->name, cfgDtypeStr(pItem->dtype), dval, uError("cfg:%s, type:%s value:%f out of range[%f, %f]", pItem->name, cfgDtypeStr(pItem->dtype), dval,
pItem->fmin, pItem->fmax); pItem->fmin, pItem->fmax);
terrno = TSDB_CODE_OUT_OF_RANGE;
cfgUnLock(pCfg); cfgUnLock(pCfg);
return -1; TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
} }
} break; } break;
default: default:
@ -505,15 +485,14 @@ int32_t cfgCheckRangeForDynUpdate(SConfig *pCfg, const char *name, const char *p
} }
cfgUnLock(pCfg); cfgUnLock(pCfg);
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
static int32_t cfgAddItem(SConfig *pCfg, SConfigItem *pItem, const char *name) { static int32_t cfgAddItem(SConfig *pCfg, SConfigItem *pItem, const char *name) {
pItem->stype = CFG_STYPE_DEFAULT; pItem->stype = CFG_STYPE_DEFAULT;
pItem->name = taosStrdup(name); pItem->name = taosStrdup(name);
if (pItem->name == NULL) { if (pItem->name == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
return -1;
} }
int32_t size = taosArrayGetSize(pCfg->array); int32_t size = taosArrayGetSize(pCfg->array);
@ -521,7 +500,7 @@ static int32_t cfgAddItem(SConfig *pCfg, SConfigItem *pItem, const char *name) {
SConfigItem *existItem = taosArrayGet(pCfg->array, i); SConfigItem *existItem = taosArrayGet(pCfg->array, i);
if (existItem != NULL && strcmp(existItem->name, pItem->name) == 0) { if (existItem != NULL && strcmp(existItem->name, pItem->name) == 0) {
taosMemoryFree(pItem->name); taosMemoryFree(pItem->name);
return TSDB_CODE_INVALID_CFG; TAOS_RETURN(TSDB_CODE_INVALID_CFG);
} }
} }
@ -535,11 +514,10 @@ static int32_t cfgAddItem(SConfig *pCfg, SConfigItem *pItem, const char *name) {
} }
taosMemoryFree(pItem->name); taosMemoryFree(pItem->name);
terrno = TSDB_CODE_OUT_OF_MEMORY; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
return -1;
} }
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
int32_t cfgAddBool(SConfig *pCfg, const char *name, bool defaultVal, int8_t scope, int8_t dynScope) { int32_t cfgAddBool(SConfig *pCfg, const char *name, bool defaultVal, int8_t scope, int8_t dynScope) {
@ -550,8 +528,7 @@ int32_t cfgAddBool(SConfig *pCfg, const char *name, bool defaultVal, int8_t scop
int32_t cfgAddInt32(SConfig *pCfg, const char *name, int32_t defaultVal, int64_t minval, int64_t maxval, int8_t scope, int32_t cfgAddInt32(SConfig *pCfg, const char *name, int32_t defaultVal, int64_t minval, int64_t maxval, int8_t scope,
int8_t dynScope) { int8_t dynScope) {
if (defaultVal < minval || defaultVal > maxval) { if (defaultVal < minval || defaultVal > maxval) {
terrno = TSDB_CODE_OUT_OF_RANGE; TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
return -1;
} }
SConfigItem item = {.dtype = CFG_DTYPE_INT32, SConfigItem item = {.dtype = CFG_DTYPE_INT32,
@ -566,8 +543,7 @@ int32_t cfgAddInt32(SConfig *pCfg, const char *name, int32_t defaultVal, int64_t
int32_t cfgAddInt64(SConfig *pCfg, const char *name, int64_t defaultVal, int64_t minval, int64_t maxval, int8_t scope, int32_t cfgAddInt64(SConfig *pCfg, const char *name, int64_t defaultVal, int64_t minval, int64_t maxval, int8_t scope,
int8_t dynScope) { int8_t dynScope) {
if (defaultVal < minval || defaultVal > maxval) { if (defaultVal < minval || defaultVal > maxval) {
terrno = TSDB_CODE_OUT_OF_RANGE; TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
return -1;
} }
SConfigItem item = {.dtype = CFG_DTYPE_INT64, SConfigItem item = {.dtype = CFG_DTYPE_INT64,
@ -582,8 +558,7 @@ int32_t cfgAddInt64(SConfig *pCfg, const char *name, int64_t defaultVal, int64_t
int32_t cfgAddFloat(SConfig *pCfg, const char *name, float defaultVal, float minval, float maxval, int8_t scope, int32_t cfgAddFloat(SConfig *pCfg, const char *name, float defaultVal, float minval, float maxval, int8_t scope,
int8_t dynScope) { int8_t dynScope) {
if (defaultVal < minval || defaultVal > maxval) { if (defaultVal < minval || defaultVal > maxval) {
terrno = TSDB_CODE_OUT_OF_RANGE; TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
return -1;
} }
SConfigItem item = {.dtype = CFG_DTYPE_FLOAT, SConfigItem item = {.dtype = CFG_DTYPE_FLOAT,
@ -599,45 +574,32 @@ int32_t cfgAddString(SConfig *pCfg, const char *name, const char *defaultVal, in
SConfigItem item = {.dtype = CFG_DTYPE_STRING, .scope = scope, .dynScope = dynScope}; SConfigItem item = {.dtype = CFG_DTYPE_STRING, .scope = scope, .dynScope = dynScope};
item.str = taosStrdup(defaultVal); item.str = taosStrdup(defaultVal);
if (item.str == NULL) { if (item.str == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
return -1;
} }
return cfgAddItem(pCfg, &item, name); return cfgAddItem(pCfg, &item, name);
} }
int32_t cfgAddDir(SConfig *pCfg, const char *name, const char *defaultVal, int8_t scope, int8_t dynScope) { int32_t cfgAddDir(SConfig *pCfg, const char *name, const char *defaultVal, int8_t scope, int8_t dynScope) {
SConfigItem item = {.dtype = CFG_DTYPE_DIR, .scope = scope, .dynScope = dynScope}; SConfigItem item = {.dtype = CFG_DTYPE_DIR, .scope = scope, .dynScope = dynScope};
if (cfgCheckAndSetDir(&item, defaultVal) != 0) { TAOS_CHECK_RETURN(cfgCheckAndSetDir(&item, defaultVal));
return -1;
}
return cfgAddItem(pCfg, &item, name); return cfgAddItem(pCfg, &item, name);
} }
int32_t cfgAddLocale(SConfig *pCfg, const char *name, const char *defaultVal, int8_t scope, int8_t dynScope) { int32_t cfgAddLocale(SConfig *pCfg, const char *name, const char *defaultVal, int8_t scope, int8_t dynScope) {
SConfigItem item = {.dtype = CFG_DTYPE_LOCALE, .scope = scope, .dynScope = dynScope}; SConfigItem item = {.dtype = CFG_DTYPE_LOCALE, .scope = scope, .dynScope = dynScope};
if (cfgCheckAndSetConf(&item, defaultVal) != 0) { TAOS_CHECK_RETURN(cfgCheckAndSetConf(&item, defaultVal));
return -1;
}
return cfgAddItem(pCfg, &item, name); return cfgAddItem(pCfg, &item, name);
} }
int32_t cfgAddCharset(SConfig *pCfg, const char *name, const char *defaultVal, int8_t scope, int8_t dynScope) { int32_t cfgAddCharset(SConfig *pCfg, const char *name, const char *defaultVal, int8_t scope, int8_t dynScope) {
SConfigItem item = {.dtype = CFG_DTYPE_CHARSET, .scope = scope, .dynScope = dynScope}; SConfigItem item = {.dtype = CFG_DTYPE_CHARSET, .scope = scope, .dynScope = dynScope};
if (cfgCheckAndSetConf(&item, defaultVal) != 0) { TAOS_CHECK_RETURN(cfgCheckAndSetConf(&item, defaultVal));
return -1;
}
return cfgAddItem(pCfg, &item, name); return cfgAddItem(pCfg, &item, name);
} }
int32_t cfgAddTimezone(SConfig *pCfg, const char *name, const char *defaultVal, int8_t scope, int8_t dynScope) { int32_t cfgAddTimezone(SConfig *pCfg, const char *name, const char *defaultVal, int8_t scope, int8_t dynScope) {
SConfigItem item = {.dtype = CFG_DTYPE_TIMEZONE, .scope = scope, .dynScope = dynScope}; SConfigItem item = {.dtype = CFG_DTYPE_TIMEZONE, .scope = scope, .dynScope = dynScope};
if (cfgCheckAndSetConf(&item, defaultVal) != 0) { TAOS_CHECK_RETURN(cfgCheckAndSetConf(&item, defaultVal));
return -1;
}
return cfgAddItem(pCfg, &item, name); return cfgAddItem(pCfg, &item, name);
} }
@ -693,7 +655,7 @@ const char *cfgDtypeStr(ECfgDataType type) {
} }
} }
void cfgDumpItemValue(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *pLen) { int32_t cfgDumpItemValue(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *pLen) {
int32_t len = 0; int32_t len = 0;
switch (pItem->dtype) { switch (pItem->dtype) {
case CFG_DTYPE_BOOL: case CFG_DTYPE_BOOL:
@ -719,14 +681,19 @@ void cfgDumpItemValue(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *p
break; break;
} }
if (len < 0) {
TAOS_RETURN(TAOS_SYSTEM_ERROR(errno));
}
if (len > bufSize) { if (len > bufSize) {
len = bufSize; len = bufSize;
} }
*pLen = len; *pLen = len;
TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
void cfgDumpItemScope(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *pLen) { int32_t cfgDumpItemScope(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *pLen) {
int32_t len = 0; int32_t len = 0;
switch (pItem->scope) { switch (pItem->scope) {
case CFG_SCOPE_SERVER: case CFG_SCOPE_SERVER:
@ -740,11 +707,16 @@ void cfgDumpItemScope(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *p
break; break;
} }
if (len < 0) {
TAOS_RETURN(TAOS_SYSTEM_ERROR(errno));
}
if (len > bufSize) { if (len > bufSize) {
len = bufSize; len = bufSize;
} }
*pLen = len; *pLen = len;
TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
void cfgDumpCfgS3(SConfig *pCfg, bool tsc, bool dump) { void cfgDumpCfgS3(SConfig *pCfg, bool tsc, bool dump) {
@ -919,14 +891,14 @@ int32_t cfgLoadFromEnvVar(SConfig *pConfig) {
char **pEnv = environ; char **pEnv = environ;
line[1023] = 0; line[1023] = 0;
if (pEnv == NULL) return 0; if (pEnv == NULL) TAOS_RETURN(TSDB_CODE_SUCCESS);
while (*pEnv != NULL) { while (*pEnv != NULL) {
name = value = value2 = value3 = value4 = NULL; name = value = value2 = value3 = value4 = NULL;
olen = vlen = vlen2 = vlen3 = vlen4 = 0; olen = vlen = vlen2 = vlen3 = vlen4 = 0;
strncpy(line, *pEnv, sizeof(line) - 1); strncpy(line, *pEnv, sizeof(line) - 1);
pEnv++; pEnv++;
taosEnvToCfg(line, line); (void)taosEnvToCfg(line, line);
paGetToken(line, &name, &olen); paGetToken(line, &name, &olen);
if (olen == 0) continue; if (olen == 0) continue;
@ -943,21 +915,21 @@ int32_t cfgLoadFromEnvVar(SConfig *pConfig) {
if (vlen3 != 0) { if (vlen3 != 0) {
value3[vlen3] = 0; value3[vlen3] = 0;
paGetToken(value3 + vlen3 + 1, &value4, &vlen4); paGetToken(value3 + vlen3 + 1, &value4, &vlen4);
if(vlen4 != 0) value4[vlen4] = 0; if (vlen4 != 0) value4[vlen4] = 0;
} }
} }
code = cfgSetItem(pConfig, name, value, CFG_STYPE_ENV_VAR, true); code = cfgSetItem(pConfig, name, value, CFG_STYPE_ENV_VAR, true);
if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break; if (TSDB_CODE_SUCCESS != code && TSDB_CODE_CFG_NOT_FOUND != code) break;
if (strcasecmp(name, "dataDir") == 0) { if (strcasecmp(name, "dataDir") == 0) {
code = cfgSetTfsItem(pConfig, name, value, value2, value3, value4, CFG_STYPE_ENV_VAR); code = cfgSetTfsItem(pConfig, name, value, value2, value3, value4, CFG_STYPE_ENV_VAR);
if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break; if (TSDB_CODE_SUCCESS != code && TSDB_CODE_CFG_NOT_FOUND != code) break;
} }
} }
uInfo("load from env variables cfg success"); uInfo("load from env variables cfg success");
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
int32_t cfgLoadFromEnvCmd(SConfig *pConfig, const char **envCmd) { int32_t cfgLoadFromEnvCmd(SConfig *pConfig, const char **envCmd) {
@ -965,11 +937,11 @@ int32_t cfgLoadFromEnvCmd(SConfig *pConfig, const char **envCmd) {
int32_t olen, vlen, vlen2, vlen3, vlen4; int32_t olen, vlen, vlen2, vlen3, vlen4;
int32_t code = 0; int32_t code = 0;
int32_t index = 0; int32_t index = 0;
if (envCmd == NULL) return 0; if (envCmd == NULL) TAOS_RETURN(TSDB_CODE_SUCCESS);
while (envCmd[index] != NULL) { while (envCmd[index] != NULL) {
strncpy(buf, envCmd[index], sizeof(buf) - 1); strncpy(buf, envCmd[index], sizeof(buf) - 1);
buf[sizeof(buf) - 1] = 0; buf[sizeof(buf) - 1] = 0;
taosEnvToCfg(buf, buf); (void)taosEnvToCfg(buf, buf);
index++; index++;
name = value = value2 = value3 = value4 = NULL; name = value = value2 = value3 = value4 = NULL;
@ -990,21 +962,21 @@ int32_t cfgLoadFromEnvCmd(SConfig *pConfig, const char **envCmd) {
if (vlen3 != 0) { if (vlen3 != 0) {
value3[vlen3] = 0; value3[vlen3] = 0;
paGetToken(value3 + vlen3 + 1, &value4, &vlen4); paGetToken(value3 + vlen3 + 1, &value4, &vlen4);
if(vlen4 != 0) value4[vlen4] = 0; if (vlen4 != 0) value4[vlen4] = 0;
} }
} }
code = cfgSetItem(pConfig, name, value, CFG_STYPE_ENV_CMD, true); code = cfgSetItem(pConfig, name, value, CFG_STYPE_ENV_CMD, true);
if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break; if (TSDB_CODE_SUCCESS != code && TSDB_CODE_CFG_NOT_FOUND != code) break;
if (strcasecmp(name, "dataDir") == 0) { if (strcasecmp(name, "dataDir") == 0) {
code = cfgSetTfsItem(pConfig, name, value, value2, value3, value4, CFG_STYPE_ENV_CMD); code = cfgSetTfsItem(pConfig, name, value, value2, value3, value4, CFG_STYPE_ENV_CMD);
if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break; if (TSDB_CODE_SUCCESS != code && TSDB_CODE_CFG_NOT_FOUND != code) break;
} }
} }
uInfo("load from env cmd cfg success"); uInfo("load from env cmd cfg success");
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
int32_t cfgLoadFromEnvFile(SConfig *pConfig, const char *envFile) { int32_t cfgLoadFromEnvFile(SConfig *pConfig, const char *envFile) {
@ -1017,20 +989,19 @@ int32_t cfgLoadFromEnvFile(SConfig *pConfig, const char *envFile) {
if (envFile != NULL && strlen(envFile) > 0) { if (envFile != NULL && strlen(envFile) > 0) {
if (!taosCheckExistFile(envFile)) { if (!taosCheckExistFile(envFile)) {
uError("failed to load env file:%s", envFile); uError("failed to load env file:%s", envFile);
return -1; TAOS_RETURN(TSDB_CODE_NOT_FOUND);
} }
filepath = envFile; filepath = envFile;
} else { } else {
if (!taosCheckExistFile(filepath)) { if (!taosCheckExistFile(filepath)) {
uInfo("env file:%s not load", filepath); uInfo("env file:%s not load", filepath);
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
} }
TdFilePtr pFile = taosOpenFile(filepath, TD_FILE_READ | TD_FILE_STREAM); TdFilePtr pFile = taosOpenFile(filepath, TD_FILE_READ | TD_FILE_STREAM);
if (pFile == NULL) { if (pFile == NULL) {
terrno = TAOS_SYSTEM_ERROR(errno); TAOS_RETURN(TAOS_SYSTEM_ERROR(errno));
return -1;
} }
while (!taosEOFFile(pFile)) { while (!taosEOFFile(pFile)) {
@ -1042,7 +1013,7 @@ int32_t cfgLoadFromEnvFile(SConfig *pConfig, const char *envFile) {
break; break;
} }
if (line[_bytes - 1] == '\n') line[_bytes - 1] = 0; if (line[_bytes - 1] == '\n') line[_bytes - 1] = 0;
taosEnvToCfg(line, line); (void)taosEnvToCfg(line, line);
paGetToken(line, &name, &olen); paGetToken(line, &name, &olen);
if (olen == 0) continue; if (olen == 0) continue;
@ -1059,23 +1030,23 @@ int32_t cfgLoadFromEnvFile(SConfig *pConfig, const char *envFile) {
if (vlen3 != 0) { if (vlen3 != 0) {
value3[vlen3] = 0; value3[vlen3] = 0;
paGetToken(value3 + vlen3 + 1, &value4, &vlen4); paGetToken(value3 + vlen3 + 1, &value4, &vlen4);
if(vlen4 != 0) value4[vlen4] = 0; if (vlen4 != 0) value4[vlen4] = 0;
} }
} }
code = cfgSetItem(pConfig, name, value, CFG_STYPE_ENV_FILE, true); code = cfgSetItem(pConfig, name, value, CFG_STYPE_ENV_FILE, true);
if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break; if (TSDB_CODE_SUCCESS != code && TSDB_CODE_CFG_NOT_FOUND != code) break;
if (strcasecmp(name, "dataDir") == 0) { if (strcasecmp(name, "dataDir") == 0) {
code = cfgSetTfsItem(pConfig, name, value, value2, value3, value4, CFG_STYPE_ENV_FILE); code = cfgSetTfsItem(pConfig, name, value, value2, value3, value4, CFG_STYPE_ENV_FILE);
if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break; if (TSDB_CODE_SUCCESS != code && TSDB_CODE_CFG_NOT_FOUND != code) break;
} }
} }
taosCloseFile(&pFile); taosCloseFile(&pFile);
uInfo("load from env cfg file %s success", filepath); uInfo("load from env cfg file %s success", filepath);
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
int32_t cfgLoadFromCfgFile(SConfig *pConfig, const char *filepath) { int32_t cfgLoadFromCfgFile(SConfig *pConfig, const char *filepath) {
@ -1087,13 +1058,13 @@ int32_t cfgLoadFromCfgFile(SConfig *pConfig, const char *filepath) {
TdFilePtr pFile = taosOpenFile(filepath, TD_FILE_READ | TD_FILE_STREAM); TdFilePtr pFile = taosOpenFile(filepath, TD_FILE_READ | TD_FILE_STREAM);
if (pFile == NULL) { if (pFile == NULL) {
// success when the file does not exist // success when the file does not exist
code = TAOS_SYSTEM_ERROR(errno);
if (errno == ENOENT) { if (errno == ENOENT) {
terrno = TAOS_SYSTEM_ERROR(errno); uInfo("failed to load from cfg file %s since %s, use default parameters", filepath, tstrerror(code));
uInfo("failed to load from cfg file %s since %s, use default parameters", filepath, terrstr()); TAOS_RETURN(TSDB_CODE_SUCCESS);
return 0;
} else { } else {
uError("failed to load from cfg file %s since %s", filepath, terrstr()); uError("failed to load from cfg file %s since %s", filepath, tstrerror(code));
return -1; TAOS_RETURN(code);
} }
} }
@ -1134,7 +1105,7 @@ int32_t cfgLoadFromCfgFile(SConfig *pConfig, const char *filepath) {
} }
code = cfgSetItem(pConfig, name, newValue, CFG_STYPE_CFG_FILE, true); code = cfgSetItem(pConfig, name, newValue, CFG_STYPE_CFG_FILE, true);
if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break; if (TSDB_CODE_SUCCESS != code && TSDB_CODE_CFG_NOT_FOUND != code) break;
} else { } else {
paGetToken(value + vlen + 1, &value2, &vlen2); paGetToken(value + vlen + 1, &value2, &vlen2);
if (vlen2 != 0) { if (vlen2 != 0) {
@ -1148,12 +1119,12 @@ int32_t cfgLoadFromCfgFile(SConfig *pConfig, const char *filepath) {
} }
code = cfgSetItem(pConfig, name, value, CFG_STYPE_CFG_FILE, true); code = cfgSetItem(pConfig, name, value, CFG_STYPE_CFG_FILE, true);
if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break; if (TSDB_CODE_SUCCESS != code && TSDB_CODE_CFG_NOT_FOUND != code) break;
} }
if (strcasecmp(name, "dataDir") == 0) { if (strcasecmp(name, "dataDir") == 0) {
code = cfgSetTfsItem(pConfig, name, value, value2, value3, value4, CFG_STYPE_CFG_FILE); code = cfgSetTfsItem(pConfig, name, value, value2, value3, value4, CFG_STYPE_CFG_FILE);
if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break; if (TSDB_CODE_SUCCESS != code && TSDB_CODE_CFG_NOT_FOUND != code) break;
} }
size_t len = strlen(name); size_t len = strlen(name);
@ -1161,18 +1132,18 @@ int32_t cfgLoadFromCfgFile(SConfig *pConfig, const char *filepath) {
const size_t debugFlagLen = strlen(debugFlagStr); const size_t debugFlagLen = strlen(debugFlagStr);
if (len >= debugFlagLen && strcasecmp(name + len - debugFlagLen, debugFlagStr) == 0) { if (len >= debugFlagLen && strcasecmp(name + len - debugFlagLen, debugFlagStr) == 0) {
code = cfgUpdateDebugFlagItem(pConfig, name, len == debugFlagLen); code = cfgUpdateDebugFlagItem(pConfig, name, len == debugFlagLen);
if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break; if (TSDB_CODE_SUCCESS != code && TSDB_CODE_CFG_NOT_FOUND != code) break;
} }
} }
taosCloseFile(&pFile); taosCloseFile(&pFile);
if (code == 0 || (code != 0 && terrno == TSDB_CODE_CFG_NOT_FOUND)) { if (TSDB_CODE_SUCCESS == code || TSDB_CODE_CFG_NOT_FOUND == code) {
uInfo("load from cfg file %s success", filepath); uInfo("load from cfg file %s success", filepath);
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} else { } else {
uError("failed to load from cfg file %s since %s", filepath, terrstr()); uError("failed to load from cfg file %s since %s", filepath, tstrerror(code));
return -1; TAOS_RETURN(code);
} }
} }
@ -1247,46 +1218,52 @@ int32_t cfgLoadFromApollUrl(SConfig *pConfig, const char *url) {
int32_t code = 0; int32_t code = 0;
if (url == NULL || strlen(url) == 0) { if (url == NULL || strlen(url) == 0) {
uInfo("apoll url not load"); uInfo("apoll url not load");
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
char *p = strchr(url, ':'); char *p = strchr(url, ':');
if (p == NULL) { if (p == NULL) {
uError("fail to load apoll url: %s, unknown format", url); uError("fail to load apoll url: %s, unknown format", url);
return -1; TAOS_RETURN(TSDB_CODE_INVALID_PARA);
} }
p++; p++;
SJson *pJson = NULL;
if (strncmp(url, "jsonFile", 8) == 0) { if (strncmp(url, "jsonFile", 8) == 0) {
char *filepath = p; char *filepath = p;
if (!taosCheckExistFile(filepath)) { if (!taosCheckExistFile(filepath)) {
uError("failed to load json file:%s", filepath); uError("failed to load json file:%s", filepath);
return -1; TAOS_RETURN(TSDB_CODE_NOT_FOUND);
} }
TdFilePtr pFile = taosOpenFile(filepath, TD_FILE_READ); TdFilePtr pFile = taosOpenFile(filepath, TD_FILE_READ);
if (pFile == NULL) { if (pFile == NULL) {
terrno = TAOS_SYSTEM_ERROR(errno); TAOS_RETURN(TAOS_SYSTEM_ERROR(errno));
return -1;
} }
size_t fileSize = taosLSeekFile(pFile, 0, SEEK_END); size_t fileSize = taosLSeekFile(pFile, 0, SEEK_END);
char *buf = taosMemoryMalloc(fileSize); char *buf = taosMemoryMalloc(fileSize);
if (!buf) {
taosCloseFile(&pFile);
uError("load json file error: %s, failed to alloc memory", filepath);
TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
}
taosLSeekFile(pFile, 0, SEEK_SET); taosLSeekFile(pFile, 0, SEEK_SET);
if (taosReadFile(pFile, buf, fileSize) <= 0) { if (taosReadFile(pFile, buf, fileSize) <= 0) {
taosCloseFile(&pFile); taosCloseFile(&pFile);
uError("load json file error: %s", filepath); uError("load json file error: %s", filepath);
taosMemoryFreeClear(buf); taosMemoryFreeClear(buf);
return -1; TAOS_RETURN(TSDB_CODE_INVALID_DATA_FMT);
} }
taosCloseFile(&pFile); taosCloseFile(&pFile);
SJson *pJson = tjsonParse(buf); pJson = tjsonParse(buf);
if (NULL == pJson) { if (NULL == pJson) {
const char *jsonParseError = tjsonGetError(); const char *jsonParseError = tjsonGetError();
if (jsonParseError != NULL) { if (jsonParseError != NULL) {
uError("load json file parse error: %s", jsonParseError); uError("load json file parse error: %s", jsonParseError);
} }
taosMemoryFreeClear(buf); taosMemoryFreeClear(buf);
return -1; TAOS_RETURN(TSDB_CODE_INVALID_DATA_FMT);
} }
taosMemoryFreeClear(buf); taosMemoryFreeClear(buf);
@ -1295,13 +1272,17 @@ int32_t cfgLoadFromApollUrl(SConfig *pConfig, const char *url) {
cJSON *item = tjsonGetArrayItem(pJson, i); cJSON *item = tjsonGetArrayItem(pJson, i);
if (item == NULL) break; if (item == NULL) break;
char *itemName = NULL, *itemValueString = NULL; char *itemName = NULL, *itemValueString = NULL;
tjsonGetObjectName(item, &itemName); TAOS_CHECK_GOTO(tjsonGetObjectName(item, &itemName), NULL, _err_json);
tjsonGetObjectName(item, &itemName); TAOS_CHECK_GOTO(tjsonGetObjectValueString(item, &itemValueString), NULL, _err_json);
tjsonGetObjectValueString(item, &itemValueString);
if (itemValueString != NULL && itemName != NULL) { if (itemValueString != NULL && itemName != NULL) {
size_t itemNameLen = strlen(itemName); size_t itemNameLen = strlen(itemName);
size_t itemValueStringLen = strlen(itemValueString); size_t itemValueStringLen = strlen(itemValueString);
cfgLineBuf = taosMemoryMalloc(itemNameLen + itemValueStringLen + 2); cfgLineBuf = taosMemoryMalloc(itemNameLen + itemValueStringLen + 2);
if (NULL == cfgLineBuf) {
code = TSDB_CODE_OUT_OF_MEMORY;
goto _err_json;
}
memcpy(cfgLineBuf, itemName, itemNameLen); memcpy(cfgLineBuf, itemName, itemNameLen);
cfgLineBuf[itemNameLen] = ' '; cfgLineBuf[itemNameLen] = ' ';
memcpy(&cfgLineBuf[itemNameLen + 1], itemValueString, itemValueStringLen); memcpy(&cfgLineBuf[itemNameLen + 1], itemValueString, itemValueStringLen);
@ -1327,11 +1308,11 @@ int32_t cfgLoadFromApollUrl(SConfig *pConfig, const char *url) {
} }
code = cfgSetItem(pConfig, name, value, CFG_STYPE_APOLLO_URL, true); code = cfgSetItem(pConfig, name, value, CFG_STYPE_APOLLO_URL, true);
if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break; if (TSDB_CODE_SUCCESS != code && TSDB_CODE_CFG_NOT_FOUND != code) break;
if (strcasecmp(name, "dataDir") == 0) { if (strcasecmp(name, "dataDir") == 0) {
code = cfgSetTfsItem(pConfig, name, value, value2, value3, value4, CFG_STYPE_APOLLO_URL); code = cfgSetTfsItem(pConfig, name, value, value2, value3, value4, CFG_STYPE_APOLLO_URL);
if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break; if (TSDB_CODE_SUCCESS != code && TSDB_CODE_CFG_NOT_FOUND != code) break;
} }
} }
} }
@ -1341,16 +1322,20 @@ int32_t cfgLoadFromApollUrl(SConfig *pConfig, const char *url) {
// } else if (strncmp(url, "etcdUrl", 7) == 0) { // } else if (strncmp(url, "etcdUrl", 7) == 0) {
} else { } else {
uError("Unsupported url: %s", url); uError("Unsupported url: %s", url);
return -1; TAOS_RETURN(TSDB_CODE_INVALID_PARA);
} }
uInfo("load from apoll url not implemented yet"); uInfo("load from apoll url not implemented yet");
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
_err_json:
tjsonDelete(pJson);
TAOS_RETURN(code);
} }
int32_t cfgGetApollUrl(const char **envCmd, const char *envFile, char *apolloUrl) { int32_t cfgGetApollUrl(const char **envCmd, const char *envFile, char *apolloUrl) {
int32_t index = 0; int32_t index = 0;
if (envCmd == NULL) return 0; if (envCmd == NULL) TAOS_RETURN(TSDB_CODE_SUCCESS);
while (envCmd[index] != NULL) { while (envCmd[index] != NULL) {
if (strncmp(envCmd[index], "TAOS_APOLLO_URL", 14) == 0) { if (strncmp(envCmd[index], "TAOS_APOLLO_URL", 14) == 0) {
char *p = strchr(envCmd[index], '='); char *p = strchr(envCmd[index], '=');
@ -1362,7 +1347,7 @@ int32_t cfgGetApollUrl(const char **envCmd, const char *envFile, char *apolloUrl
} }
memcpy(apolloUrl, p, TMIN(strlen(p) + 1, PATH_MAX)); memcpy(apolloUrl, p, TMIN(strlen(p) + 1, PATH_MAX));
uInfo("get apollo url from env cmd success"); uInfo("get apollo url from env cmd success");
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
} }
index++; index++;
@ -1384,7 +1369,7 @@ int32_t cfgGetApollUrl(const char **envCmd, const char *envFile, char *apolloUrl
} }
memcpy(apolloUrl, p, TMIN(strlen(p) + 1, PATH_MAX)); memcpy(apolloUrl, p, TMIN(strlen(p) + 1, PATH_MAX));
uInfo("get apollo url from env variables success, apolloUrl=%s", apolloUrl); uInfo("get apollo url from env variables success, apolloUrl=%s", apolloUrl);
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
} }
} }
@ -1393,13 +1378,13 @@ int32_t cfgGetApollUrl(const char **envCmd, const char *envFile, char *apolloUrl
if (envFile != NULL && strlen(envFile) > 0) { if (envFile != NULL && strlen(envFile) > 0) {
if (!taosCheckExistFile(envFile)) { if (!taosCheckExistFile(envFile)) {
uError("failed to load env file:%s", envFile); uError("failed to load env file:%s", envFile);
return -1; TAOS_RETURN(TSDB_CODE_NOT_FOUND);
} }
filepath = envFile; filepath = envFile;
} else { } else {
if (!taosCheckExistFile(filepath)) { if (!taosCheckExistFile(filepath)) {
uInfo("env file:%s not load", filepath); uInfo("env file:%s not load", filepath);
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
} }
int64_t _bytes; int64_t _bytes;
@ -1422,7 +1407,7 @@ int32_t cfgGetApollUrl(const char **envCmd, const char *envFile, char *apolloUrl
memcpy(apolloUrl, p, TMIN(strlen(p) + 1, PATH_MAX)); memcpy(apolloUrl, p, TMIN(strlen(p) + 1, PATH_MAX));
taosCloseFile(&pFile); taosCloseFile(&pFile);
uInfo("get apollo url from env file success"); uInfo("get apollo url from env file success");
return 0; TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
} }
} }
@ -1430,7 +1415,7 @@ int32_t cfgGetApollUrl(const char **envCmd, const char *envFile, char *apolloUrl
} }
uInfo("fail get apollo url from cmd env file"); uInfo("fail get apollo url from cmd env file");
return -1; TAOS_RETURN(TSDB_CODE_INVALID_PARA);
} }
struct SConfigIter { struct SConfigIter {
@ -1438,15 +1423,16 @@ struct SConfigIter {
SConfig *pConf; SConfig *pConf;
}; };
SConfigIter *cfgCreateIter(SConfig *pConf) { int32_t cfgCreateIter(SConfig *pConf, SConfigIter **ppIter) {
SConfigIter* pIter = taosMemoryCalloc(1, sizeof(SConfigIter)); SConfigIter *pIter = taosMemoryCalloc(1, sizeof(SConfigIter));
if (pIter == NULL) { if (pIter == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY; TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
return NULL;
} }
pIter->pConf = pConf; pIter->pConf = pConf;
return pIter;
*ppIter = pIter;
TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
SConfigItem *cfgNextIter(SConfigIter* pIter) { SConfigItem *cfgNextIter(SConfigIter* pIter) {

11
source/util/test/cfgTest.cpp
View File

@ -51,7 +51,10 @@ TEST_F(CfgTest, 01_Str) {
} }
TEST_F(CfgTest, 02_Basic) { TEST_F(CfgTest, 02_Basic) {
SConfig *pConfig = cfgInit(); SConfig *pConfig = NULL;
int32_t code = cfgInit(&pConfig);
ASSERT_EQ(code, TSDB_CODE_SUCCESS);
ASSERT_NE(pConfig, nullptr); ASSERT_NE(pConfig, nullptr);
EXPECT_EQ(cfgAddBool(pConfig, "test_bool", 0, 0, 0), 0); EXPECT_EQ(cfgAddBool(pConfig, "test_bool", 0, 0, 0), 0);
@ -66,7 +69,11 @@ TEST_F(CfgTest, 02_Basic) {
int32_t size = cfgGetSize(pConfig); int32_t size = cfgGetSize(pConfig);
SConfigItem* pItem = NULL; SConfigItem* pItem = NULL;
SConfigIter* pIter = cfgCreateIter(pConfig); SConfigIter *pIter = NULL;
code = cfgCreateIter(pConfig, &pIter);
ASSERT_EQ(code, TSDB_CODE_SUCCESS);
ASSERT_NE(pIter, nullptr);
while((pItem = cfgNextIter(pIter)) != NULL) { while((pItem = cfgNextIter(pIter)) != NULL) {
switch (pItem->dtype) { switch (pItem->dtype) {
case CFG_DTYPE_BOOL: case CFG_DTYPE_BOOL: