From 455f3743d845d9acc6e51e8e4ace9157e1e05746 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 7 Jul 2021 18:22:10 +0800 Subject: [PATCH 1/3] make CI/CD happy --- src/client/src/tscSQLParser.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 9134c6f77b..a0ec54ae4b 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -8793,7 +8793,6 @@ void normalizeSqlNode(SSqlNode* pSqlNode, const char* dbName) { // 2. pSqlNode->pWhere // 3. pSqlNode->pHaving // 4. pSqlNode->pSortOrder - // pSqlNode->from } From cff7b2395bb123afce5a6ddc7733c226ddf00613 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 7 Jul 2021 18:41:00 +0800 Subject: [PATCH 2/3] compile errro on arm --- cmake/define.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/define.inc b/cmake/define.inc index 67f40e748b..d71c62dad5 100755 --- a/cmake/define.inc +++ b/cmake/define.inc @@ -83,6 +83,8 @@ IF (TD_ARM_64) ADD_DEFINITIONS(-DUSE_LIBICONV) MESSAGE(STATUS "arm64 is defined") SET(COMMON_FLAGS "-Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE") + + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/lua/src) ENDIF () IF (TD_ARM_32) @@ -91,6 +93,8 @@ IF (TD_ARM_32) ADD_DEFINITIONS(-DUSE_LIBICONV) MESSAGE(STATUS "arm32 is defined") SET(COMMON_FLAGS "-Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wno-incompatible-pointer-types ") + + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/lua/src) ENDIF () IF (TD_MIPS_64) From 6350955e6ced53ef08066ebe491189518db0f32b Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 7 Jul 2021 18:59:15 +0800 Subject: [PATCH 3/3] compile errro on arm --- src/client/src/tscSQLParser.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index a0ec54ae4b..5fceb0cca3 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -8794,7 +8794,6 @@ void normalizeSqlNode(SSqlNode* pSqlNode, const char* dbName) { // 3. pSqlNode->pHaving // 4. pSqlNode->pSortOrder // pSqlNode->from - } #endif