diff --git a/include/common/tanalytics.h b/include/common/tanalytics.h index 344093245b..4c3cad9c5b 100644 --- a/include/common/tanalytics.h +++ b/include/common/tanalytics.h @@ -25,11 +25,11 @@ extern "C" { #endif -#define ANAL_FORECAST_DEFAULT_ROWS 10 -#define ANAL_FORECAST_DEFAULT_CONF 95 -#define ANAL_FORECAST_DEFAULT_WNCHECK 1 -#define ANAL_FORECAST_MAX_ROWS 40000 -#define ANAL_ANOMALY_WINDOW_MAX_ROWS 40000 +#define ANALY_FORECAST_DEFAULT_ROWS 10 +#define ANALY_FORECAST_DEFAULT_CONF 95 +#define ANALY_FORECAST_DEFAULT_WNCHECK 1 +#define ANALY_FORECAST_MAX_ROWS 40000 +#define ANALY_ANOMALY_WINDOW_MAX_ROWS 40000 typedef struct { EAnalAlgoType type; diff --git a/include/util/tdef.h b/include/util/tdef.h index cd7a697e59..270e9df444 100644 --- a/include/util/tdef.h +++ b/include/util/tdef.h @@ -653,9 +653,9 @@ enum { RAND_ERR_MEMORY = 1, RAND_ERR_FILE = 2, RAND_ERR_NETWORK = 4 }; #define AUDIT_OPERATION_LEN 20 typedef enum { - ANAL_ALGO_TYPE_ANOMALY_DETECT = 0, - ANAL_ALGO_TYPE_FORECAST = 1, - ANAL_ALGO_TYPE_END, + ANALY_ALGO_TYPE_ANOMALY_DETECT = 0, + ANALY_ALGO_TYPE_FORECAST = 1, + ANALY_ALGO_TYPE_END, } EAnalAlgoType; typedef enum { diff --git a/source/common/src/tanalytics.c b/source/common/src/tanalytics.c index 0ed67eed0a..610661677a 100644 --- a/source/common/src/tanalytics.c +++ b/source/common/src/tanalytics.c @@ -38,9 +38,9 @@ static int32_t taosAnalBufGetCont(SAnalyticBuf *pBuf, char **ppCont, int64_t * const char *taosAnalysisAlgoType(EAnalAlgoType type) { switch (type) { - case ANAL_ALGO_TYPE_ANOMALY_DETECT: + case ANALY_ALGO_TYPE_ANOMALY_DETECT: return "anomaly-detection"; - case ANAL_ALGO_TYPE_FORECAST: + case ANALY_ALGO_TYPE_FORECAST: return "forecast"; default: return "unknown"; @@ -49,9 +49,9 @@ const char *taosAnalysisAlgoType(EAnalAlgoType type) { const char *taosAnalAlgoUrlStr(EAnalAlgoType type) { switch (type) { - case ANAL_ALGO_TYPE_ANOMALY_DETECT: + case ANALY_ALGO_TYPE_ANOMALY_DETECT: return "anomaly-detect"; - case ANAL_ALGO_TYPE_FORECAST: + case ANALY_ALGO_TYPE_FORECAST: return "forecast"; default: return "unknown"; @@ -59,13 +59,13 @@ const char *taosAnalAlgoUrlStr(EAnalAlgoType type) { } EAnalAlgoType taosAnalAlgoInt(const char *name) { - for (EAnalAlgoType i = 0; i < ANAL_ALGO_TYPE_END; ++i) { + for (EAnalAlgoType i = 0; i < ANALY_ALGO_TYPE_END; ++i) { if (strcasecmp(name, taosAnalysisAlgoType(i)) == 0) { return i; } } - return ANAL_ALGO_TYPE_END; + return ANALY_ALGO_TYPE_END; } int32_t taosAnalyticsInit() { diff --git a/source/dnode/mgmt/node_mgmt/src/dmTransport.c b/source/dnode/mgmt/node_mgmt/src/dmTransport.c index 6fefd47a6f..3a25119c3f 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmTransport.c +++ b/source/dnode/mgmt/node_mgmt/src/dmTransport.c @@ -174,7 +174,7 @@ static void dmProcessRpcMsg(SDnode *pDnode, SRpcMsg *pRpc, SEpSet *pEpSet) { case TDMT_MND_RETRIEVE_IP_WHITE_RSP: dmUpdateRpcIpWhite(&pDnode->data, pTrans->serverRpc, pRpc); return; - case TDMT_MND_RETRIEVE_ANAL_ALGO_RSP: + case TDMT_MND_RETRIEVE_ANALY_ALGO_RSP: dmUpdateAnalFunc(&pDnode->data, pTrans->serverRpc, pRpc); return; default: diff --git a/source/dnode/mnode/impl/src/mndAnode.c b/source/dnode/mnode/impl/src/mndAnode.c index 9f5635a74b..45e4c2cef7 100644 --- a/source/dnode/mnode/impl/src/mndAnode.c +++ b/source/dnode/mnode/impl/src/mndAnode.c @@ -649,13 +649,13 @@ void mndRetrieveAlgoList(SMnode* pMnode, SArray* pFc, SArray* pAd) { break; } - if (pObj->numOfAlgos >= ANAL_ALGO_TYPE_END) { - if (pObj->algos[ANAL_ALGO_TYPE_ANOMALY_DETECT] != NULL) { - taosArrayAddAll(pAd, pObj->algos[ANAL_ALGO_TYPE_ANOMALY_DETECT]); + if (pObj->numOfAlgos >= ANALY_ALGO_TYPE_END) { + if (pObj->algos[ANALY_ALGO_TYPE_ANOMALY_DETECT] != NULL) { + taosArrayAddAll(pAd, pObj->algos[ANALY_ALGO_TYPE_ANOMALY_DETECT]); } - if (pObj->algos[ANAL_ALGO_TYPE_FORECAST] != NULL) { - taosArrayAddAll(pFc, pObj->algos[ANAL_ALGO_TYPE_FORECAST]); + if (pObj->algos[ANALY_ALGO_TYPE_FORECAST] != NULL) { + taosArrayAddAll(pFc, pObj->algos[ANALY_ALGO_TYPE_FORECAST]); } } @@ -738,11 +738,11 @@ static int32_t mndDecodeAlgoList(SJson *pJson, SAnodeObj *pObj) { if (details == NULL) return TSDB_CODE_INVALID_JSON_FORMAT; int32_t numOfDetails = tjsonGetArraySize(details); - pObj->algos = taosMemoryCalloc(ANAL_ALGO_TYPE_END, sizeof(SArray *)); + pObj->algos = taosMemoryCalloc(ANALY_ALGO_TYPE_END, sizeof(SArray *)); if (pObj->algos == NULL) return TSDB_CODE_OUT_OF_MEMORY; - pObj->numOfAlgos = ANAL_ALGO_TYPE_END; - for (int32_t i = 0; i < ANAL_ALGO_TYPE_END; ++i) { + pObj->numOfAlgos = ANALY_ALGO_TYPE_END; + for (int32_t i = 0; i < ANALY_ALGO_TYPE_END; ++i) { pObj->algos[i] = taosArrayInit(4, sizeof(SAnodeAlgo)); if (pObj->algos[i] == NULL) return TSDB_CODE_OUT_OF_MEMORY; } @@ -754,7 +754,7 @@ static int32_t mndDecodeAlgoList(SJson *pJson, SAnodeObj *pObj) { code = tjsonGetStringValue2(detail, "type", buf, sizeof(buf)); if (code < 0) return TSDB_CODE_INVALID_JSON_FORMAT; EAnalAlgoType type = taosAnalAlgoInt(buf); - if (type < 0 || type >= ANAL_ALGO_TYPE_END) return TSDB_CODE_MND_ANODE_INVALID_ALGO_TYPE; + if (type < 0 || type >= ANALY_ALGO_TYPE_END) return TSDB_CODE_MND_ANODE_INVALID_ALGO_TYPE; SJson *algos = tjsonGetObjectItem(detail, "algo"); if (algos == NULL) return TSDB_CODE_INVALID_JSON_FORMAT; diff --git a/source/libs/executor/src/anomalywindowoperator.c b/source/libs/executor/src/anomalywindowoperator.c index 3124fa0b57..456a886daf 100644 --- a/source/libs/executor/src/anomalywindowoperator.c +++ b/source/libs/executor/src/anomalywindowoperator.c @@ -83,7 +83,7 @@ int32_t createAnomalywindowOperatorInfo(SOperatorInfo* downstream, SPhysiNode* p goto _error; } - if (taosAnalGetAlgoUrl(pInfo->algoName, ANAL_ALGO_TYPE_ANOMALY_DETECT, pInfo->algoUrl, sizeof(pInfo->algoUrl)) != 0) { + if (taosAnalGetAlgoUrl(pInfo->algoName, ANALY_ALGO_TYPE_ANOMALY_DETECT, pInfo->algoUrl, sizeof(pInfo->algoUrl)) != 0) { qError("%s failed to get anomaly_window algorithm url from %s", id, pInfo->algoName); code = TSDB_CODE_ANA_ALGO_NOT_LOAD; goto _error; @@ -265,7 +265,7 @@ static void anomalyDestroyOperatorInfo(void* param) { } static int32_t anomalyCacheBlock(SAnomalyWindowOperatorInfo* pInfo, SSDataBlock* pSrc) { - if (pInfo->anomalySup.cachedRows > ANAL_ANOMALY_WINDOW_MAX_ROWS) { + if (pInfo->anomalySup.cachedRows > ANALY_ANOMALY_WINDOW_MAX_ROWS) { return TSDB_CODE_ANA_ANODE_TOO_MANY_ROWS; } @@ -439,7 +439,7 @@ static int32_t anomalyAnalysisWindow(SOperatorInfo* pOperator) { code = taosAnalBufWriteOptStr(&analBuf, "prec", prec); QUERY_CHECK_CODE(code, lino, _OVER); - int64_t wncheck = ANAL_FORECAST_DEFAULT_WNCHECK; + int64_t wncheck = ANALY_FORECAST_DEFAULT_WNCHECK; bool hasWncheck = taosAnalGetOptInt(pInfo->anomalyOpt, "wncheck", &wncheck); if (!hasWncheck) { qDebug("anomaly_window wncheck not found from %s, use default:%" PRId64, pInfo->anomalyOpt, wncheck); diff --git a/source/libs/executor/src/forecastoperator.c b/source/libs/executor/src/forecastoperator.c index 02b122830c..280a920aff 100644 --- a/source/libs/executor/src/forecastoperator.c +++ b/source/libs/executor/src/forecastoperator.c @@ -76,10 +76,10 @@ static int32_t forecastCacheBlock(SForecastSupp* pSupp, SSDataBlock* pBlock, con int32_t lino = 0; SAnalyticBuf* pBuf = &pSupp->analBuf; - if (pSupp->cachedRows > ANAL_FORECAST_MAX_ROWS) { + if (pSupp->cachedRows > ANALY_FORECAST_MAX_ROWS) { code = TSDB_CODE_ANA_ANODE_TOO_MANY_ROWS; qError("%s rows:%" PRId64 " for forecast cache, error happens, code:%s, upper limit:%d", id, pSupp->cachedRows, - tstrerror(code), ANAL_FORECAST_MAX_ROWS); + tstrerror(code), ANALY_FORECAST_MAX_ROWS); return code; } @@ -139,7 +139,7 @@ static int32_t forecastCloseBuf(SForecastSupp* pSupp) { code = taosAnalBufWriteOptStr(pBuf, "prec", prec); if (code != 0) return code; - int64_t wncheck = ANAL_FORECAST_DEFAULT_WNCHECK; + int64_t wncheck = ANALY_FORECAST_DEFAULT_WNCHECK; bool hasWncheck = taosAnalGetOptInt(pSupp->algoOpt, "wncheck", &wncheck); if (!hasWncheck) { qDebug("forecast wncheck not found from %s, use default:%" PRId64, pSupp->algoOpt, wncheck); @@ -151,7 +151,7 @@ static int32_t forecastCloseBuf(SForecastSupp* pSupp) { code = taosAnalBufWriteOptInt(pBuf, "return_conf", !noConf); if (code != 0) return code; - pSupp->optRows = ANAL_FORECAST_DEFAULT_ROWS; + pSupp->optRows = ANALY_FORECAST_DEFAULT_ROWS; bool hasRows = taosAnalGetOptInt(pSupp->algoOpt, "rows", &pSupp->optRows); if (!hasRows) { qDebug("forecast rows not found from %s, use default:%" PRId64, pSupp->algoOpt, pSupp->optRows); @@ -159,7 +159,7 @@ static int32_t forecastCloseBuf(SForecastSupp* pSupp) { code = taosAnalBufWriteOptInt(pBuf, "forecast_rows", pSupp->optRows); if (code != 0) return code; - int64_t conf = ANAL_FORECAST_DEFAULT_CONF; + int64_t conf = ANALY_FORECAST_DEFAULT_CONF; bool hasConf = taosAnalGetOptInt(pSupp->algoOpt, "conf", &conf); if (!hasConf) { qDebug("forecast conf not found from %s, use default:%" PRId64, pSupp->algoOpt, conf); @@ -530,7 +530,7 @@ static int32_t forecastParseAlgo(SForecastSupp* pSupp) { return TSDB_CODE_ANA_ALGO_NOT_FOUND; } - if (taosAnalGetAlgoUrl(pSupp->algoName, ANAL_ALGO_TYPE_FORECAST, pSupp->algoUrl, sizeof(pSupp->algoUrl)) != 0) { + if (taosAnalGetAlgoUrl(pSupp->algoName, ANALY_ALGO_TYPE_FORECAST, pSupp->algoUrl, sizeof(pSupp->algoUrl)) != 0) { qError("failed to get forecast algorithm url from %s", pSupp->algoName); return TSDB_CODE_ANA_ALGO_NOT_LOAD; }