From edc118e825b022fbc61f6123e741948ad783955e Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Mon, 24 Jan 2022 12:57:42 +0800
Subject: [PATCH] rename MAX/MIN/POW2/SWAP/ABS name

---
 2.0/src/client/src/tscSQLParser.c      | 2 +-
 include/common/tdataformat.h           | 2 +-
 include/libs/tfs/tfs.h                 | 2 +-
 include/os/osMath.h                    | 2 +-
 source/dnode/mnode/impl/src/mndDnode.c | 2 +-
 source/libs/parser/src/astValidate.c   | 2 +-
 source/os/src/osDir.c                  | 2 +-
 source/util/src/tlog.c                 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/2.0/src/client/src/tscSQLParser.c b/2.0/src/client/src/tscSQLParser.c
index 7d2d6f6ebf..1c50a2823e 100644
--- a/2.0/src/client/src/tscSQLParser.c
+++ b/2.0/src/client/src/tscSQLParser.c
@@ -8089,7 +8089,7 @@ int32_t checkQueryRangeForFill(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
     }
 
-    int64_t timeRange = ABS(pQueryInfo->window.skey - pQueryInfo->window.ekey);
+    int64_t timeRange = TABS(pQueryInfo->window.skey - pQueryInfo->window.ekey);
 
     int64_t intervalRange = 0;
     if (pQueryInfo->interval.intervalUnit == 'n' || pQueryInfo->interval.intervalUnit == 'y') {
diff --git a/include/common/tdataformat.h b/include/common/tdataformat.h
index cc30cd78f5..58ede62b23 100644
--- a/include/common/tdataformat.h
+++ b/include/common/tdataformat.h
@@ -136,7 +136,7 @@ typedef uint64_t TKEY;
 #define TKEY_IS_NEGATIVE(tkey) (((tkey)&TKEY_NEGATIVE_FLAG) != 0)
 #define TKEY_IS_DELETED(tkey) (((tkey)&TKEY_DELETE_FLAG) != 0)
 #define tdSetTKEYDeleted(tkey) ((tkey) | TKEY_DELETE_FLAG)
-#define tdGetTKEY(key) (((TKEY)ABS(key)) | (TKEY_NEGATIVE_FLAG & (TKEY)(key)))
+#define tdGetTKEY(key) (((TKEY)TABS(key)) | (TKEY_NEGATIVE_FLAG & (TKEY)(key)))
 #define tdGetKey(tkey) (((TSKEY)((tkey)&TKEY_VALUE_FILTER)) * (TKEY_IS_NEGATIVE(tkey) ? -1 : 1))
 
 #define MIN_TS_KEY ((TSKEY)0x8000000000000001)
diff --git a/include/libs/tfs/tfs.h b/include/libs/tfs/tfs.h
index e1f28092cf..289cfd9b04 100644
--- a/include/libs/tfs/tfs.h
+++ b/include/libs/tfs/tfs.h
@@ -33,7 +33,7 @@ typedef struct {
 
 typedef struct {
   SDiskID did;
-  char    aname[TSDB_FILENAME_LEN];  // ABS name
+  char    aname[TSDB_FILENAME_LEN];  // TABS name
   char    rname[TSDB_FILENAME_LEN];  // REL name
   STfs   *pTfs;
 } STfsFile;
diff --git a/include/os/osMath.h b/include/os/osMath.h
index 44a63500ab..948fbbf665 100644
--- a/include/os/osMath.h
+++ b/include/os/osMath.h
@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 #define TPOW2(x) ((x) * (x))
-#define ABS(x) ((x) > 0 ? (x) : -(x))
+#define TABS(x) ((x) > 0 ? (x) : -(x))
 
 #if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
 
diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c
index 4bc570c11d..efdacf957b 100644
--- a/source/dnode/mnode/impl/src/mndDnode.c
+++ b/source/dnode/mnode/impl/src/mndDnode.c
@@ -234,7 +234,7 @@ int32_t mndGetDnodeSize(SMnode *pMnode) {
 }
 
 bool mndIsDnodeOnline(SMnode *pMnode, SDnodeObj *pDnode, int64_t curMs) {
-  int64_t interval = ABS(pDnode->lastAccessTime - curMs);
+  int64_t interval = TABS(pDnode->lastAccessTime - curMs);
   if (interval > 3500 * pMnode->cfg.statusInterval) {
     if (pDnode->rebootTime > 0) {
       pDnode->offlineReason = DND_REASON_STATUS_MSG_TIMEOUT;
diff --git a/source/libs/parser/src/astValidate.c b/source/libs/parser/src/astValidate.c
index 46321fc191..563443d3c3 100644
--- a/source/libs/parser/src/astValidate.c
+++ b/source/libs/parser/src/astValidate.c
@@ -1267,7 +1267,7 @@ static int32_t checkFillQueryRange(SQueryStmtInfo* pQueryInfo, SMsgBuf* pMsgBuf)
 //    return buildInvalidOperationMsg(pMsgBuf, msg1);
 //  }
 
-  int64_t timeRange = ABS(pQueryInfo->window.skey - pQueryInfo->window.ekey);
+  int64_t timeRange = TABS(pQueryInfo->window.skey - pQueryInfo->window.ekey);
 
   int64_t intervalRange = 0;
   if (!TIME_IS_VAR_DURATION(pQueryInfo->interval.intervalUnit)) {
diff --git a/source/os/src/osDir.c b/source/os/src/osDir.c
index 070fe4a6c8..04efbef5b3 100644
--- a/source/os/src/osDir.c
+++ b/source/os/src/osDir.c
@@ -98,7 +98,7 @@ void taosRemoveOldFiles(char *dirname, int32_t keepDays) {
       }
 
       if (fileSec <= 100) continue;
-      int32_t days = (int32_t)(ABS(sec - fileSec) / 86400 + 1);
+      int32_t days = (int32_t)(TABS(sec - fileSec) / 86400 + 1);
       if (days > keepDays) {
         (void)remove(filename);
         //printf("file:%s is removed, days:%d keepDays:%d", filename, days, keepDays);
diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c
index c284efbcd4..c7b1350591 100644
--- a/source/util/src/tlog.c
+++ b/source/util/src/tlog.c
@@ -185,7 +185,7 @@ static void taosKeepOldLog(char *oldName) {
     }
   }
 
-  taosRemoveOldFiles(tsLogDir, ABS(tsLogKeepDays));
+  taosRemoveOldFiles(tsLogDir, TABS(tsLogKeepDays));
 }
 
 static void *taosThreadToOpenNewFile(void *param) {