Merge pull request #698 from taosdata/feature/lihui

Feature/lihui

Merge pull request #698 from taosdata/feature/lihui
Feature/lihui
6f553c57 · fangpanpan · GitHub · b68d5e88 · 27a508b7 · 6f553c57
15 changed file
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,12 +38,19 @@ IF (NOT DEFINED TD_CLUSTER)
  # Set macro definitions according to os platform
  SET(TD_LINUX_64 FALSE)
  SET(TD_LINUX_32 FALSE)
-  SET(_TD_ARM_ FALSE)
-  SET(_TD_ARM_64 FALSE)
-  SET(_TD_ARM_32 FALSE)
+  SET(TD_ARM FALSE)
+  SET(TD_ARM_64 FALSE)
+  SET(TD_ARM_32 FALSE)
  SET(TD_MIPS_64 FALSE)
  SET(TD_DARWIN_64 FALSE)
  SET(TD_WINDOWS_64 FALSE)
+  
+  IF (TD_ARM)
+    ADD_DEFINITIONS(-D_TD_ARM_)
+    IF (TD_ARM_32)
+      ADD_DEFINITIONS(-D_TD_ARM_32_)
+    ENDIF ()
+  ENDIF ()

  IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
@@ -52,7 +59,7 @@ IF (NOT DEFINED TD_CLUSTER)
      ADD_DEFINITIONS(-D_M_X64)
      MESSAGE(STATUS "The current platform is Linux 64-bit")
  ELSEIF (${CMAKE_SIZEOF_VOID_P} MATCHES 4)
-    IF (_TD_ARM_)
+    IF (TD_ARM)
      SET(TD_LINUX_32 TRUE)
      SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/linux)
      #ADD_DEFINITIONS(-D_M_IX86)
@@ -112,7 +119,7 @@ IF (NOT DEFINED TD_CLUSTER)
  IF (TD_LINUX_64)
    SET(DEBUG_FLAGS "-O0 -DDEBUG")
    SET(RELEASE_FLAGS "-O0")
-    IF (NOT _TD_ARM_)
+    IF (NOT TD_ARM)
      IF (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
        SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -Wno-char-subscripts -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
      ELSE ()
@@ -124,7 +131,7 @@ IF (NOT DEFINED TD_CLUSTER)
    ADD_DEFINITIONS(-DLINUX)
    ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
  ELSEIF (TD_LINUX_32)
-    IF (NOT _TD_ARM_)
+    IF (NOT TD_ARM)
      EXIT ()
    ENDIF ()
    SET(DEBUG_FLAGS "-O0 -DDEBUG")
@@ -194,7 +201,7 @@ IF (NOT DEFINED TD_CLUSTER)
    INSTALL(CODE "execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})")
    INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR})")
  ELSEIF (TD_LINUX_32)
-    IF (NOT _TD_ARM_)
+    IF (NOT TD_ARM)
      EXIT ()
    ENDIF ()
    SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")

--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -7,7 +7,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 AUX_SOURCE_DIRECTORY(./src SRC)

-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/linux)

  # set the static lib name

--- a/src/kit/shell/CMakeLists.txt
+++ b/src/kit/shell/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)

-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  AUX_SOURCE_DIRECTORY(./src SRC)
  LIST(REMOVE_ITEM SRC ./src/shellWindows.c)
  ADD_EXECUTABLE(shell ${SRC})  

--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -445,7 +445,7 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
              case TSDB_DATA_TYPE_BIGINT:
                printf("%*lld|", l[i], *((int64_t *)row[i]));
                break;
-              case TSDB_DATA_TYPE_FLOAT:
+              case TSDB_DATA_TYPE_FLOAT: {
 #ifdef _TD_ARM_32_
                float fv = 0;
                //memcpy(&fv, row[i], sizeof(float));
@@ -454,8 +454,9 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
 #else
                printf("%*.5f|", l[i], *((float *)row[i]));
 #endif
+              }
                break;
-              case TSDB_DATA_TYPE_DOUBLE:
+              case TSDB_DATA_TYPE_DOUBLE: {
 #ifdef _TD_ARM_32_
                double dv = 0;
                //memcpy(&dv, row[i], sizeof(double));
@@ -464,6 +465,7 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
 #else
                printf("%*.9f|", l[i], *((double *)row[i]));
 #endif
+              }
                break;
              case TSDB_DATA_TYPE_BINARY:
              case TSDB_DATA_TYPE_NCHAR:
@@ -528,7 +530,7 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
              case TSDB_DATA_TYPE_BIGINT:
                printf("%lld\n", *((int64_t *)row[i]));
                break;
-              case TSDB_DATA_TYPE_FLOAT:
+              case TSDB_DATA_TYPE_FLOAT: {
 #ifdef _TD_ARM_32_
                float fv = 0;
                //memcpy(&fv, row[i], sizeof(float));
@@ -537,8 +539,9 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
 #else
                printf("%.5f\n", *((float *)row[i]));
 #endif
+              }
                break;
-              case TSDB_DATA_TYPE_DOUBLE:
+              case TSDB_DATA_TYPE_DOUBLE: {
 #ifdef _TD_ARM_32_
                double dv = 0;
 		        //memcpy(&dv, row[i], sizeof(double));
@@ -547,7 +550,8 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
 #else
                printf("%.9f\n", *((double *)row[i]));
 #endif
-              break;
+              }
+                break;
              case TSDB_DATA_TYPE_BINARY:
              case TSDB_DATA_TYPE_NCHAR:
                memset(t_str, 0, TSDB_MAX_BYTES_PER_ROW);
@@ -614,7 +618,7 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
              case TSDB_DATA_TYPE_BIGINT:
                fprintf(fp, "%lld", *((int64_t *)row[i]));
                break;
-              case TSDB_DATA_TYPE_FLOAT:
+              case TSDB_DATA_TYPE_FLOAT: {
 #ifdef _TD_ARM_32_
                float fv = 0;
                //memcpy(&fv, row[i], sizeof(float));
@@ -623,8 +627,9 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
 #else
                fprintf(fp, "%.5f", *((float *)row[i]));
 #endif
+              }
                break;
-              case TSDB_DATA_TYPE_DOUBLE:
+              case TSDB_DATA_TYPE_DOUBLE: {
 #ifdef _TD_ARM_32_
                double dv = 0;
 		        //memcpy(&dv, row[i], sizeof(double));
@@ -633,6 +638,7 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
 #else
                fprintf(fp, "%.9f", *((double *)row[i]));
 #endif
+              }
                break;
              case TSDB_DATA_TYPE_BINARY:
              case TSDB_DATA_TYPE_NCHAR:

--- a/src/kit/taosdemo/CMakeLists.txt
+++ b/src/kit/taosdemo/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)

-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  AUX_SOURCE_DIRECTORY(. SRC)
  ADD_EXECUTABLE(taosdemo ${SRC})
  TARGET_LINK_LIBRARIES(taosdemo taos_static)

--- a/src/kit/taosdump/CMakeLists.txt
+++ b/src/kit/taosdump/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)

-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  AUX_SOURCE_DIRECTORY(. SRC)
  ADD_EXECUTABLE(taosdump ${SRC})
  TARGET_LINK_LIBRARIES(taosdump taos_static)

--- a/src/modules/http/CMakeLists.txt
+++ b/src/modules/http/CMakeLists.txt
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)

-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/zlib-1.2.11/inc)

--- a/src/modules/monitor/CMakeLists.txt
+++ b/src/modules/monitor/CMakeLists.txt
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)

-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)

--- a/src/os/linux/CMakeLists.txt
+++ b/src/os/linux/CMakeLists.txt
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)

-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
  INCLUDE_DIRECTORIES(inc)
  AUX_SOURCE_DIRECTORY(src SRC)

--- a/src/rpc/CMakeLists.txt
+++ b/src/rpc/CMakeLists.txt
@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)

-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  AUX_SOURCE_DIRECTORY(./src SRC)
 ELSEIF (TD_DARWIN_64)
  LIST(APPEND SRC ./src/thaship.c)

--- a/src/sdb/CMakeLists.txt
+++ b/src/sdb/CMakeLists.txt
@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)

-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
    AUX_SOURCE_DIRECTORY(src SRC)
    ADD_LIBRARY(sdb ${SRC})
    TARGET_LINK_LIBRARIES(sdb trpc)

--- a/src/system/detail/CMakeLists.txt
+++ b/src/system/detail/CMakeLists.txt
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)

-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/http/inc)

--- a/src/system/lite/CMakeLists.txt
+++ b/src/system/lite/CMakeLists.txt
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)

-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/http/inc)

--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(TDengine)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)

-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  AUX_SOURCE_DIRECTORY(src SRC)
  ADD_LIBRARY(tutil ${SRC})
  TARGET_LINK_LIBRARIES(tutil pthread os m rt)

--- a/src/util/src/tcrc32c.c
+++ b/src/util/src/tcrc32c.c
@@ -1353,7 +1353,7 @@ uint32_t crc32c_hw(uint32_t crc, crc_stream buf, size_t len) {
 #endif // #ifndef _TD_ARM_

 void taosResolveCRC() {
-#ifndef _TD_ARM_32
+#ifndef _TD_ARM_
  int sse42;
  SSE42(sse42);
  crc32c = sse42 ? crc32c_hw : crc32c_sf;