fix: gcc 12 compile (#613)

taosdata · Mar 11, 2023 · 06d0feb · 06d0feb
1 parent 38ceff4
commit 06d0feb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/3.0-windows-build.yml b/.github/workflows/3.0-windows-build.yml
@@ -62,7 +62,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: 'fix/sangshuduo/TD-23094-taosbenchmark-sub-2.6'
+          ref: 'chore/sangshuduo/TD-19593-gcc12-support'
 
       - name: create debug directory
         if: |

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -339,14 +339,18 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin
             )
             MESSAGE(STATUS "src's cmake detected current OS is " ${OS_ID} "")
 
-            EXECUTE_PROCESS (
+            IF (${OS_ID} MATCHES "arch")
+                MESSAGE(STATUS "${OS_ID} linux has no libatomic.a, use dynamic lib instead of")
+            ELSE ()
+                EXECUTE_PROCESS (
                     COMMAND gcc -print-file-name=libatomic.a
                     OUTPUT_VARIABLE LIBATOMIC_PATH
-            )
-            STRING(STRIP "${LIBATOMIC_PATH}" LIBATOMIC_PATH)
-            MESSAGE(STATUS "libatomic.a path: ${LIBATOMIC_PATH}")
-            ADD_LIBRARY(atomic STATIC IMPORTED)
-            SET_PROPERTY(TARGET atomic PROPERTY IMPORTED_LOCATION "${LIBATOMIC_PATH}")
+                )
+                STRING(STRIP "${LIBATOMIC_PATH}" LIBATOMIC_PATH)
+                MESSAGE(STATUS "libatomic.a path: ${LIBATOMIC_PATH}")
+                ADD_LIBRARY(atomic STATIC IMPORTED)
+                SET_PROPERTY(TARGET atomic PROPERTY IMPORTED_LOCATION "${LIBATOMIC_PATH}")
+            ENDIF ()
 
             ADD_LIBRARY(avro STATIC IMPORTED)
             SET_PROPERTY(TARGET avro PROPERTY IMPORTED_LOCATION

diff --git a/src/benchQuery.c b/src/benchQuery.c
@@ -668,10 +668,12 @@ void *queryKiller(void *arg) {
                 if (execUSec > g_queryInfo.killQueryThreshold * 1000000) {
                     char sql[SHORT_1K_SQL_BUFF_LEN] = {0};
                     tstrncpy(sql, (char*)row[2],
-                             min(strlen((char*)row[2]), SHORT_1K_SQL_BUFF_LEN));
+                             min(strlen((char*)row[2])+1,
+                                 SHORT_1K_SQL_BUFF_LEN));
 
                     char killId[KILLID_LEN] = {0};
-                    tstrncpy(killId, (char*)row[0], KILLID_LEN);
+                    tstrncpy(killId, (char*)row[0],
+                            min(strlen((char*)row[0])+1, KILLID_LEN));
                     char killCommand[KILLID_LEN + 15] = {0};
                     snprintf(killCommand, KILLID_LEN + 15,
                              "KILL QUERY '%s'", killId);