Merge pull request #9969 from taosdata/feature/warning

Remove warnings and adjust dependencies

2.0/src/query/tests/astTest.cpp

@@ -633,3 +633,5 @@ TEST(testCase, astTest) {
 //  exprSerializeTest2();
 }
 #endif
+
+#pragma GCC diagnostic pop
\ No newline at end of file

2.0/src/query/tests/cSortTest.cpp

@@ -5,6 +5,7 @@
 #include "tsdb.h"
 #include "qExtbuffer.h"
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
@@ -122,3 +123,5 @@ TEST(testCase, columnsort_test) {
 
   destroyColumnModel(pModel);
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

2.0/src/query/tests/histogramTest.cpp

@@ -6,6 +6,7 @@
 #include "taos.h"
 #include "qHistogram.h"
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 
@@ -140,3 +141,5 @@ TEST(testCase, heapsort) {
   //
   //    free(pEntry);
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

2.0/src/query/tests/patternMatchTest.cpp

@@ -6,6 +6,7 @@
 #include "qAggMain.h"
 #include "tcompare.h"
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 
@@ -84,3 +85,5 @@ TEST(testCase, patternMatchTest) {
   ret = patternMatch("%9", str, 2, &info);
   EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

2.0/src/query/tests/percentileTest.cpp

@@ -7,6 +7,7 @@
 
 #include "qPercentile.h"
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 
@@ -255,3 +256,5 @@ TEST(testCase, percentileTest) {
   unsignedDataTest();
   largeDataTest();
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

2.0/src/query/tests/rangeMergeTest.cpp

@@ -7,6 +7,7 @@
 
 #include "qFilter.h"
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 
@@ -365,3 +366,5 @@ TEST(testCase, rangeMergeTest) {
   intDataTest();
 
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

2.0/src/query/tests/resultBufferTest.cpp

@@ -6,6 +6,7 @@
 #include "taos.h"
 #include "tsdb.h"
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 
@@ -161,3 +162,5 @@ TEST(testCase, resultBufferTest) {
   writeDownTest();
   recyclePageTest();
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

2.0/src/query/tests/tsBufTest.cpp

@@ -9,6 +9,7 @@
 #include "ttoken.h"
 #include "tutil.h"
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
@@ -513,3 +514,5 @@ TEST(testCase, tsBufTest) {
   mergeDiffVnodeBufferTest();
   mergeIdenticalVnodeBufferTest();
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

2.0/src/query/tests/unitTest.cpp

@@ -4,6 +4,7 @@
 #include "taos.h"
 #include "tsdb.h"
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
@@ -910,3 +911,4 @@ TEST(testCase, getTempFilePath_test) {
   printf("%s\n", path);
 }
 
+#pragma GCC diagnostic pop
\ No newline at end of file

CMakeLists.txt

@@ -10,8 +10,8 @@ set(CMAKE_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/cmake")
 set(CMAKE_CONTRIB_DIR "${CMAKE_SOURCE_DIR}/contrib")
 include(${CMAKE_SUPPORT_DIR}/cmake.options)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -gdwarf-2 -msse4.2 -mfma -g3")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -gdwarf-2 -msse4.2 -mfma -g3")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -fPIC -gdwarf-2 -msse4.2 -mfma -g3")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -fPIC -gdwarf-2 -msse4.2 -mfma -g3")
 
 # contrib
 add_subdirectory(contrib)

include/util/compare.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_UTIL_COMPARE_H
-#define _TD_UTIL_COMPARE_H
+#ifndef _TD_UTIL_COMPARE_H_
+#define _TD_UTIL_COMPARE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,67 +35,65 @@ extern "C" {
 #define FLT_GREATEREQUAL(_x, _y) (FLT_EQUAL((_x), (_y)) || ((_x) > (_y)))
 #define FLT_LESSEQUAL(_x, _y)    (FLT_EQUAL((_x), (_y)) || ((_x) < (_y)))
 
-#define PATTERN_COMPARE_INFO_INITIALIZER { '%', '_' }
+#define PATTERN_COMPARE_INFO_INITIALIZER \
+  { '%', '_' }
 
 typedef struct SPatternCompareInfo {
   char matchAll;  // symbol for match all wildcard, default: '%'
   char matchOne;  // symbol for match one wildcard, default: '_'
 } SPatternCompareInfo;
 
-int patternMatch(const char *pattern, const char *str, size_t size, const SPatternCompareInfo *pInfo);
+int32_t patternMatch(const char *pattern, const char *str, size_t size, const SPatternCompareInfo *pInfo);
 
-int WCSPatternMatch(const wchar_t *pattern, const wchar_t *str, size_t size, const SPatternCompareInfo *pInfo);
+int32_t WCSPatternMatch(const wchar_t *pattern, const wchar_t *str, size_t size, const SPatternCompareInfo *pInfo);
 
-
-int32_t taosArrayCompareString(const void* a, const void* b);
+int32_t taosArrayCompareString(const void *a, const void *b);
 
 int32_t setCompareBytes1(const void *pLeft, const void *pRight);
-
 int32_t setCompareBytes2(const void *pLeft, const void *pRight);
-
 int32_t setCompareBytes4(const void *pLeft, const void *pRight);
 int32_t setCompareBytes8(const void *pLeft, const void *pRight);
 
+int32_t compareInt8Val(const void *pLeft, const void *pRight);
+int32_t compareInt16Val(const void *pLeft, const void *pRight);
 int32_t compareInt32Val(const void *pLeft, const void *pRight);
 int32_t compareInt64Val(const void *pLeft, const void *pRight);
 
-int32_t compareInt16Val(const void *pLeft, const void *pRight);
-
-int32_t compareInt8Val(const void *pLeft, const void *pRight);
-
+int32_t compareUint8Val(const void *pLeft, const void *pRight);
+int32_t compareUint16Val(const void *pLeft, const void *pRight);
 int32_t compareUint32Val(const void *pLeft, const void *pRight);
 int32_t compareUint64Val(const void *pLeft, const void *pRight);
 
-int32_t compareUint16Val(const void *pLeft, const void *pRight);
-
-int32_t compareUint8Val(const void* pLeft, const void* pRight);
-
 int32_t compareFloatVal(const void *pLeft, const void *pRight);
-
 int32_t compareDoubleVal(const void *pLeft, const void *pRight);
 
 int32_t compareLenPrefixedStr(const void *pLeft, const void *pRight);
-
 int32_t compareLenPrefixedWStr(const void *pLeft, const void *pRight);
-int32_t compareStrRegexComp(const void* pLeft, const void* pRight);
-int32_t compareStrRegexCompMatch(const void* pLeft, const void* pRight);
-int32_t compareStrRegexCompNMatch(const void* pLeft, const void* pRight);
-int32_t compareFindItemInSet(const void *pLeft, const void* pRight);
+
+int32_t compareStrRegexComp(const void *pLeft, const void *pRight);
+int32_t compareStrRegexCompMatch(const void *pLeft, const void *pRight);
+int32_t compareStrRegexCompNMatch(const void *pLeft, const void *pRight);
+
+int32_t compareFindItemInSet(const void *pLeft, const void *pRight);
+
 int32_t compareInt8ValDesc(const void *pLeft, const void *pRight);
-int32_t compareInt16ValDesc(const void* pLeft, const void* pRight);
-int32_t compareInt32ValDesc(const void* pLeft, const void* pRight);
-int32_t compareInt64ValDesc(const void* pLeft, const void* pRight);
-int32_t compareFloatValDesc(const void* pLeft, const void* pRight);
-int32_t compareDoubleValDesc(const void* pLeft, const void* pRight);
-int32_t compareUint8ValDesc(const void* pLeft, const void* pRight);
-int32_t compareUint16ValDesc(const void* pLeft, const void* pRight);
-int32_t compareUint32ValDesc(const void* pLeft, const void* pRight);
-int32_t compareUint64ValDesc(const void* pLeft, const void* pRight);
-int32_t compareLenPrefixedStrDesc(const void* pLeft, const void* pRight);
-int32_t compareLenPrefixedWStrDesc(const void* pLeft, const void* pRight);
+int32_t compareInt16ValDesc(const void *pLeft, const void *pRight);
+int32_t compareInt32ValDesc(const void *pLeft, const void *pRight);
+int32_t compareInt64ValDesc(const void *pLeft, const void *pRight);
+
+int32_t compareFloatValDesc(const void *pLeft, const void *pRight);
+int32_t compareDoubleValDesc(const void *pLeft, const void *pRight);
+
+int32_t compareUint8ValDesc(const void *pLeft, const void *pRight);
+int32_t compareUint16ValDesc(const void *pLeft, const void *pRight);
+int32_t compareUint32ValDesc(const void *pLeft, const void *pRight);
+int32_t compareUint64ValDesc(const void *pLeft, const void *pRight);
+
+int32_t compareLenPrefixedStrDesc(const void *pLeft, const void *pRight);
+int32_t compareLenPrefixedWStrDesc(const void *pLeft, const void *pRight);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  /*_TD_UTIL_COMPARE_H*/
+#endif /*_TD_UTIL_COMPARE_H_*/

source/client/test/clientTests.cpp

@@ -17,8 +17,9 @@
 #include <taoserror.h>
 #include <tglobal.h>
 #include <iostream>
-#pragma GCC diagnostic ignored "-Wwrite-strings"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wsign-compare"
@@ -679,3 +680,5 @@ TEST(testCase, show_table_Test) {
 //  taos_free_result(pRes);
 //  taos_close(pConn);
 //}
+
+#pragma GCC diagnostic pop
\ No newline at end of file

source/common/src/ttime.c

@@ -100,12 +100,12 @@ int32_t taosParseTime(const char* timestr, int64_t* time, int32_t len, int32_t t
   } else if (checkTzPresent(timestr, len)) {
     return parseTimeWithTz(timestr, time, timePrec, 0);
   } else {
-    return (*parseLocaltimeFp[day_light])(timestr, time, timePrec);
+    return (*parseLocaltimeFp[day_light])((char*)timestr, time, timePrec);
   }
 }
 
-bool checkTzPresent(const char *str, int32_t len) {
-  char *seg = forwardToTimeStringEnd(str);
+bool checkTzPresent(const char* str, int32_t len) {
+  char*   seg = forwardToTimeStringEnd((char*)str);
   int32_t seg_len = len - (int32_t)(seg - str);
 
   char *c = &seg[seg_len - 1];
@@ -267,7 +267,7 @@ int32_t parseTimeWithTz(const char* timestr, int64_t* time, int32_t timePrec, ch
 #endif
 
   int64_t fraction = 0;
-  str = forwardToTimeStringEnd(timestr);
+  str = forwardToTimeStringEnd((char*)timestr);
 
   if ((str[0] == 'Z' || str[0] == 'z') && str[1] == '\0') {
     /* utc time, no millisecond, return directly*/

source/common/test/commonTests.cpp

 #include <gtest/gtest.h>
 #include <iostream>
-#pragma GCC diagnostic ignored "-Wwrite-strings"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
@@ -94,3 +95,5 @@ TEST(testCase, toInteger_test) {
   ret = toInteger(s, strlen(s), 10, &val, &sign);
   ASSERT_EQ(ret, -1);
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

source/dnode/vnode/inc/tq.h

@@ -303,6 +303,8 @@ void tqClose(STQ*);
 int tqPushMsg(STQ*, void* msg, int64_t version);
 int tqCommit(STQ*);
 
+int tqSetCursor(STQ*, STqSetCurReq* pMsg);
+
 #if 0
 int tqConsume(STQ*, SRpcMsg* pReq, SRpcMsg** pRsp);
 int tqSetCursor(STQ*, STqSetCurReq* pMsg);

source/dnode/vnode/src/meta/metaTbCfg.c

@@ -32,7 +32,7 @@ size_t metaEncodeTbObjFromTbOptions(const STbCfg *pTbOptions, void *pBuf, size_t
   switch (pTbOptions->type) {
     case META_SUPER_TABLE:
       tlen += taosEncodeFixedU64(ppBuf, pTbOptions->stbCfg.suid);
-      tlen += tdEncodeSchema(ppBuf, pTbOptions->stbCfg.pTagSchema);
+      tlen += tdEncodeSchema(ppBuf, (STSchema *)pTbOptions->stbCfg.pTagSchema);
       // TODO: encode schema version array
       break;
     case META_CHILD_TABLE:

source/dnode/vnode/src/vnd/vnodeQuery.c

@@ -19,7 +19,10 @@
 static int32_t vnodeGetTableList(SVnode *pVnode, SRpcMsg *pMsg);
 static int     vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp);
 
-int vnodeQueryOpen(SVnode *pVnode) { return qWorkerInit(NODE_TYPE_VNODE, pVnode->vgId, NULL, &pVnode->pQuery, pVnode, vnodePutReqToVQueryQ); }
+int vnodeQueryOpen(SVnode *pVnode) {
+  return qWorkerInit(NODE_TYPE_VNODE, pVnode->vgId, NULL, (void **)&pVnode->pQuery, pVnode,
+                     (putReqToQueryQFp)vnodePutReqToVQueryQ);
+}
 
 int vnodeProcessQueryReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
   vTrace("query message is processing");

source/libs/executor/test/executorTests.cpp

@@ -17,8 +17,9 @@
 #include <gtest/gtest.h>
 #include <tglobal.h>
 #include <iostream>
-#pragma GCC diagnostic ignored "-Wwrite-strings"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wsign-compare"
@@ -220,3 +221,5 @@ TEST(testCase, build_executor_tree_Test) {
   DataSinkHandle sinkHandle = nullptr;
   int32_t code = qCreateExecTask((void*) 1, 2, NULL, (void**) &pTaskInfo, &sinkHandle);
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

source/libs/parser/test/mockCatalog.cpp

@@ -18,8 +18,14 @@
 #include <iostream>
 
 #include "stub.h"
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat"
+
 #include "addr_any.h"
 
+#pragma GCC diagnostic pop
+
 namespace {
 
 void generateTestT1(MockCatalogService* mcs) {

source/libs/parser/test/parserTests.cpp

@@ -17,8 +17,9 @@
 #include <gtest/gtest.h>
 #include <iostream>
 #include "tglobal.h"
-#pragma GCC diagnostic ignored "-Wwrite-strings"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wsign-compare"
@@ -782,3 +783,5 @@ TEST(testCase, create_user_Test) {
 
   destroySqlInfo(&info1);
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

source/libs/parser/test/plannerTest.cpp

@@ -17,8 +17,9 @@
 #include <gtest/gtest.h>
 #include <tglobal.h>
 #include <iostream>
-#pragma GCC diagnostic ignored "-Wwrite-strings"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wsign-compare"
@@ -204,3 +205,5 @@ TEST(testCase, displayPlan) {
   //   TableScan(t.1abc #110) time_range: -9223372036854775808 - 9223372036854775807
 
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

source/libs/parser/test/tokenizerTest.cpp

 #include <gtest/gtest.h>
 #include <iostream>
-#pragma GCC diagnostic ignored "-Wwrite-strings"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wsign-compare"
@@ -722,3 +723,4 @@ TEST(testCase, extractMeta_test) {
   destroySqlInfo(&info1);
 }
 
+#pragma GCC diagnostic pop
\ No newline at end of file

source/libs/planner/test/plannerTests.cpp

@@ -22,8 +22,8 @@
 #include "parser.h"
 #include "mockCatalog.h"
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wwrite-strings"
-
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wsign-compare"
@@ -103,3 +103,5 @@ TEST(testCase, planner_test) {
 //  qParserCleanupMetaRequestInfo(&req);
 //  destroySqlInfo(&info1);
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

source/libs/qcom/src/querymsg.c

@@ -18,6 +18,9 @@
 #include "query.h"
 #include "trpc.h"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+
 int32_t (*queryBuildMsg[TDMT_MAX])(void* input, char **msg, int32_t msgSize, int32_t *msgLen) = {0};
 
 int32_t (*queryProcessMsgRsp[TDMT_MAX])(void* output, char *msg, int32_t msgSize) = {0};
@@ -288,7 +291,4 @@ void initQueryModuleMsgHandle() {
   queryProcessMsgRsp[TMSG_INDEX(TDMT_MND_USE_DB)] = queryProcessUseDBRsp;
 }
 
-
-
-
-
+#pragma GCC diagnostic pop
\ No newline at end of file

source/libs/qcom/test/queryTest.cpp

@@ -18,8 +18,9 @@
 #include "tmsg.h"
 #include "query.h"
 #include "trpc.h"
-#pragma GCC diagnostic ignored "-Wwrite-strings"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wsign-compare"
@@ -82,3 +83,5 @@ TEST(testCase, error_in_async_test) {
   usleep(1000);
   printf("Error code:%d after asynchronously exec function\n", code);
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

source/libs/qworker/inc/qworkerInt.h

@@ -219,8 +219,7 @@ typedef struct SQWorkerMgmt {
   }                                                       \
 } while (0)
 
-
-
+int32_t qwBuildAndSendCancelRsp(SRpcMsg *pMsg, int32_t code);
 
 #ifdef __cplusplus
 }

source/libs/qworker/test/qworkerTests.cpp

@@ -16,11 +16,17 @@
 #include <gtest/gtest.h>
 #include <tglobal.h>
 #include <iostream>
-#pragma GCC diagnostic ignored "-Wwrite-strings"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wformat"
+#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"
+#pragma GCC diagnostic ignored "-Wpointer-arith"
+
 #include "os.h"
 
 #include "taos.h"
@@ -461,11 +467,11 @@ void *controlThread(void *param) {
 }
 
 void *queryQueueThread(void *param) {
-
+  return NULL;
 }
 
 void *fetchQueueThread(void *param) {
-
+  return NULL;
 }
 
 
@@ -783,5 +789,4 @@ int main(int argc, char** argv) {
   return RUN_ALL_TESTS();
 }
 
-
-
+#pragma GCC diagnostic pop
\ No newline at end of file

source/libs/scheduler/inc/schedulerInt.h

@@ -146,12 +146,15 @@ typedef struct SSchJob {
 #define SCH_SET_JOB_TYPE(pAttr, type) (pAttr)->queryJob = ((type) != QUERY_TYPE_MODIFY)
 #define SCH_JOB_NEED_FETCH(pAttr) ((pAttr)->queryJob)
 
-#define SCH_JOB_ELOG(param, ...) qError("QID:%"PRIx64" " param, pJob->queryId, __VA_ARGS__)
-#define SCH_JOB_DLOG(param, ...) qDebug("QID:%"PRIx64" " param, pJob->queryId, __VA_ARGS__)
-
-#define SCH_TASK_ELOG(param, ...) qError("QID:%"PRIx64",TID:%"PRId64" " param, pJob->queryId, pTask->taskId, __VA_ARGS__)
-#define SCH_TASK_DLOG(param, ...) qDebug("QID:%"PRIx64",TID:%"PRId64" " param, pJob->queryId, pTask->taskId, __VA_ARGS__)
-#define SCH_TASK_WLOG(param, ...) qWarn("QID:%"PRIx64",TID:%"PRId64" " param, pJob->queryId, pTask->taskId, __VA_ARGS__)
+#define SCH_JOB_ELOG(param, ...) qError("QID:%" PRIx64 " " param, pJob->queryId, __VA_ARGS__)
+#define SCH_JOB_DLOG(param, ...) qDebug("QID:%" PRIx64 " " param, pJob->queryId, __VA_ARGS__)
+
+#define SCH_TASK_ELOG(param, ...) \
+  qError("QID:%" PRIx64 ",TID:%" PRId64 " " param, pJob->queryId, pTask->taskId, __VA_ARGS__)
+#define SCH_TASK_DLOG(param, ...) \
+  qDebug("QID:%" PRIx64 ",TID:%" PRId64 " " param, pJob->queryId, pTask->taskId, __VA_ARGS__)
+#define SCH_TASK_WLOG(param, ...) \
+  qWarn("QID:%" PRIx64 ",TID:%" PRId64 " " param, pJob->queryId, pTask->taskId, __VA_ARGS__)
 
 #define SCH_ERR_RET(c) do { int32_t _code = c; if (_code != TSDB_CODE_SUCCESS) { terrno = _code; return _code; } } while (0)
 #define SCH_RET(c) do { int32_t _code = c; if (_code != TSDB_CODE_SUCCESS) { terrno = _code; } return _code; } while (0)

source/libs/scheduler/test/schedulerTests.cpp

@@ -16,11 +16,7 @@
 #include <gtest/gtest.h>
 #include <tglobal.h>
 #include <iostream>
-#pragma GCC diagnostic ignored "-Wwrite-strings"
 
-#pragma GCC diagnostic ignored "-Wunused-function"
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#pragma GCC diagnostic ignored "-Wsign-compare"
 #include "os.h"
 
 #include "taos.h"
@@ -30,6 +26,16 @@
 #include "scheduler.h"
 #include "tep.h"
 #include "trpc.h"
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wwrite-strings"
+#pragma GCC diagnostic ignored "-Wliteral-suffix"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wreturn-type"
+#pragma GCC diagnostic ignored "-Wformat"
+
 #include "schedulerInt.h"
 #include "stub.h"
 #include "addr_any.h"
@@ -680,6 +686,4 @@ int main(int argc, char** argv) {
   return RUN_ALL_TESTS();
 }
 
-
-
-
+#pragma GCC diagnostic pop
\ No newline at end of file

source/libs/sync/src/raft_handle_vote_message.c

@@ -37,7 +37,7 @@ int syncRaftHandleVoteMessage(SSyncRaft* pRaft, const SSyncMessage* pMsg) {
   if (pRespMsg == NULL) {
     return 0;
   }
-  syncInfo("[%d:%d] [logterm: %" PRId64 ", index: %" PRId64 ", vote: %d] %s for %d"\    
+  syncInfo("[%d:%d] [logterm: %" PRId64 ", index: %" PRId64 ", vote: %d] %s for %d"    
     "[logterm: %" PRId64 ", index: %" PRId64 "] at term %" PRId64 "",
     pRaft->selfGroupId, pRaft->selfId, lastTerm, lastIndex, pRaft->voteFor,
     grant ? "grant" : "reject",

source/libs/sync/src/sync.c

@@ -23,8 +23,8 @@ SSyncManager* gSyncManager = NULL;
 #define SYNC_ACTIVITY_TIMER 5
 #define SYNC_SERVER_WORKER 2
 
-static void syncProcessRsp(SRpcMsg *pMsg, SEpSet *pEpSet);
-static void syncProcessReqMsg(SRpcMsg *pMsg, SEpSet *pEpSet);
+static void syncProcessRsp(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet);
+static void syncProcessReqMsg(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet);
 
 static int syncInitRpcServer(SSyncManager* syncManager, const SSyncCluster* pSyncCfg);
 static int syncInitRpcClient(SSyncManager* syncManager);
@@ -119,7 +119,7 @@ SSyncNode* syncStart(const SSyncInfo* pInfo) {
     return NULL;
   }
 
-  pNode->syncTimer = taosTmrStart(syncNodeTick, SYNC_TICK_TIMER, (void*)pInfo->vgId, gSyncManager->syncTimerManager);
+  pNode->syncTimer = taosTmrStart(syncNodeTick, SYNC_TICK_TIMER, (void*)((int64_t)pInfo->vgId), gSyncManager->syncTimerManager);
 
   // start raft
   pNode->raft.pNode = pNode;
@@ -176,12 +176,12 @@ int32_t syncRemoveNode(SSyncNode syncNode, const SNodeInfo *pNode) {
 }
 
 // process rpc rsp message from other sync server
-static void syncProcessRsp(SRpcMsg *pMsg, SEpSet *pEpSet) {
+static void syncProcessRsp(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet) {
 
 }
 
 // process rpc message from other sync server
-static void syncProcessReqMsg(SRpcMsg *pMsg, SEpSet *pEpSet) {
+static void syncProcessReqMsg(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet) {
 
 }
 
@@ -195,7 +195,7 @@ static int syncInitRpcServer(SSyncManager* syncManager, const SSyncCluster* pSyn
   }
   assert(pSyncCfg->selfIndex < pSyncCfg->replica && pSyncCfg->selfIndex >= 0);
   const SNodeInfo* pNode = &(pSyncCfg->nodeInfo[pSyncCfg->replica]);
-  char buffer[20] = {'\0'};
+  char buffer[156] = {'\0'};
   snprintf(buffer, sizeof(buffer), "%s:%d", &(pNode->nodeFqdn[0]), pNode->nodePort);
   size_t len = strlen(buffer);
   void** ppRpcServer = taosHashGet(gSyncManager->rpcServerTable, buffer, len);
@@ -287,7 +287,7 @@ static void *syncWorkerMain(void *argv) {
 }
 
 static void syncNodeTick(void *param, void *tmrId) {
-  SyncGroupId vgId = (SyncGroupId)param;
+  SyncGroupId vgId = (SyncGroupId)((int64_t)param);
   SSyncNode **ppNode = taosHashGet(gSyncManager->vgroupTable, &vgId, sizeof(SyncGroupId*));
   if (ppNode == NULL) {
     return;
@@ -298,5 +298,5 @@ static void syncNodeTick(void *param, void *tmrId) {
   syncRaftTick(&pNode->raft);
   pthread_mutex_unlock(&pNode->mutex);
 
-  pNode->syncTimer = taosTmrStart(syncNodeTick, SYNC_TICK_TIMER, (void*)pNode->vgId, gSyncManager->syncTimerManager);
+  pNode->syncTimer = taosTmrStart(syncNodeTick, SYNC_TICK_TIMER, (void*)(int64_t)pNode->vgId, gSyncManager->syncTimerManager);
 }
\ No newline at end of file

source/util/src/compare.c

@@ -16,13 +16,13 @@
 #define _GNU_SOURCE
 #define _XOPEN_SOURCE
 #define _DEFAULT_SOURCE
-
 #include "os.h"
-#include "types.h"
+
 #include "compare.h"
-#include "ulog.h"
-#include "thash.h"
 #include "regex.h"
+#include "thash.h"
+#include "types.h"
+#include "ulog.h"
 
 int32_t setCompareBytes1(const void *pLeft, const void *pRight) {
   return NULL != taosHashGet((SHashObj *)pRight, pLeft, 1) ? 1 : 0;
@@ -228,7 +228,7 @@ int32_t compareLenPrefixedWStrDesc(const void* pLeft, const void* pRight) {
  *      '_': Matches one character
  *
  */
-int patternMatch(const char *patterStr, const char *str, size_t size, const SPatternCompareInfo *pInfo) {
+int32_t patternMatch(const char *patterStr, const char *str, size_t size, const SPatternCompareInfo *pInfo) {
   char c, c1;
 
   int32_t i = 0;
@@ -289,7 +289,7 @@ int patternMatch(const char *patterStr, const char *str, size_t size, const SPat
   return (str[j] == 0 || j >= size) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH;
 }
 
-int WCSPatternMatch(const wchar_t *patterStr, const wchar_t *str, size_t size, const SPatternCompareInfo *pInfo) {
+int32_t WCSPatternMatch(const wchar_t *patterStr, const wchar_t *str, size_t size, const SPatternCompareInfo *pInfo) {
   wchar_t c, c1;
   wchar_t matchOne = L'_';  // "_"
   wchar_t matchAll = L'%';  // "%"
@@ -360,11 +360,11 @@ int32_t compareStrRegexComp(const void* pLeft, const void* pRight) {
   memcpy(str, varDataVal(pLeft), sz);
   str[sz] = 0;
 
-  int errCode = 0;
+  int32_t errCode = 0;
   regex_t regex;
   char    msgbuf[256] = {0};
 
-  int cflags = REG_EXTENDED;
+  int32_t cflags = REG_EXTENDED;
   if ((errCode = regcomp(&regex, pattern, cflags)) != 0) {
     regerror(errCode, &regex, msgbuf, sizeof(msgbuf));
     uError("Failed to compile regex pattern %s. reason %s", pattern, msgbuf);

source/util/src/tskiplist.c

@@ -13,11 +13,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-#include "tskiplist.h"
+
 #include "os.h"
+
 #include "compare.h"
-#include "ulog.h"
+#include "tskiplist.h"
 #include "tutil.h"
+#include "ulog.h"
 
 static int                initForwardBackwardPtr(SSkipList *pSkipList);
 static SSkipListNode *    getPriorNode(SSkipList *pSkipList, const char *val, int32_t order, SSkipListNode **pCur);
@@ -52,11 +54,17 @@ SSkipList *tSkipListCreate(uint8_t maxLevel, uint8_t keyType, uint16_t keyLen, _
   pSkipList->flags = flags;
   pSkipList->keyFn = fn;
   pSkipList->seed = rand();
+
+#if 0 
+  // the function getkeycomparfunc is defined in common
   if (comparFn == NULL) {
     pSkipList->comparFn = getKeyComparFunc(keyType, TSDB_ORDER_ASC);
   } else {
     pSkipList->comparFn = comparFn;
   }
+#else
+  pSkipList->comparFn = comparFn;
+#endif
 
   if (initForwardBackwardPtr(pSkipList) < 0) {
     tSkipListDestroy(pSkipList);

source/util/test/encodeTest.cpp

@@ -4,6 +4,11 @@
 
 #include "encode.h"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshift-count-overflow"
+#pragma GCC diagnostic ignored "-Woverflow"
+#pragma GCC diagnostic ignored "-Woverflow"
+
 #define BUF_SIZE 64
 td_endian_t endian_arr[2] = {TD_LITTLE_ENDIAN, TD_BIG_ENDIAN};
 
@@ -354,10 +359,10 @@ TEST(td_encode_test, compound_struct_encode_test) {
   SCoder       encoder, decoder;
   uint8_t *    buf1;
   int32_t      buf1size;
-  uint8_t *    buf2;
+  uint8_t     *buf2;
   int32_t      buf2size;
-  SStructA_v1  sa1 = {.A_a = 10, .A_b = 65478, .A_c = "Hello"};
-  SStructA_v2  sa2 = {.A_a = 10, .A_b = 65478, .A_c = "Hello", .A_d = 67, .A_e = 13};
+  SStructA_v1  sa1 = {.A_a = 10, .A_b = 65478, .A_c = (char *)"Hello"};
+  SStructA_v2  sa2 = {.A_a = 10, .A_b = 65478, .A_c = (char *)"Hello", .A_d = 67, .A_e = 13};
   SFinalReq_v1 req1 = {.pA = &sa1, .v_a = 15, .v_b = 35};
   SFinalReq_v2 req2 = {.pA = &sa2, .v_a = 15, .v_b = 32, .v_c = 37};
   SFinalReq_v1 dreq11, dreq21;
@@ -431,3 +436,5 @@ TEST(td_encode_test, compound_struct_encode_test) {
   GTEST_ASSERT_EQ(dreq21.v_b, req2.v_b);
   tCoderClear(&decoder);
 }
+
+#pragma GCC diagnostic pop
\ No newline at end of file

tests/test/c/create_table.c

@@ -182,7 +182,7 @@ void *threadFunc(void *param) {
     exit(1);
   }
 
-  pError("====before thread:%d, table range: %"PRId64 " - %"PRId64 "\n",
+  pPrint("====before thread:%d, table range: %"PRId64 " - %"PRId64 "\n",
 			  pInfo->threadIndex,
 			  pInfo->tableBeginIndex,
 			  pInfo->tableEndIndex);
@@ -190,7 +190,7 @@ void *threadFunc(void *param) {
   pInfo->tableBeginIndex += startOffset;
   pInfo->tableEndIndex   += startOffset;
 
-  pError("====after thread:%d, table range: %"PRId64 " - %"PRId64 "\n",
+  pPrint("====after thread:%d, table range: %"PRId64 " - %"PRId64 "\n",
 			  pInfo->threadIndex,
 			  pInfo->tableBeginIndex,
 			  pInfo->tableEndIndex);