diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcad242a30..c89195a89a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,21 +38,56 @@ 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_MIPS_64 FALSE)
SET(TD_DARWIN_64 FALSE)
SET(TD_WINDOWS_64 FALSE)
+ # if generate ARM version:
+ # cmake -DARMVER=arm32 .. or cmake -DARMVER=arm64
+ IF (${ARMVER} MATCHES "arm32")
+ SET(TD_ARM TRUE)
+ SET(TD_ARM_32 TRUE)
+ ADD_DEFINITIONS(-D_TD_ARM_)
+ ADD_DEFINITIONS(-D_TD_ARM_32_)
+ ELSEIF (${ARMVER} MATCHES "arm64")
+ SET(TD_ARM TRUE)
+ SET(TD_ARM_64 TRUE)
+ ADD_DEFINITIONS(-D_TD_ARM_)
+ ADD_DEFINITIONS(-D_TD_ARM_64_)
+ ENDIF ()
+
+ IF (TD_ARM)
+ ADD_DEFINITIONS(-D_TD_ARM_)
+ IF (TD_ARM_32)
+ ADD_DEFINITIONS(-D_TD_ARM_32_)
+ ELSEIF (TD_ARM_64)
+ ADD_DEFINITIONS(-D_TD_ARM_64_)
+ ELSE ()
+ EXIT ()
+ ENDIF ()
+ ENDIF ()
+
IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
SET(TD_LINUX_64 TRUE)
SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/linux)
ADD_DEFINITIONS(-D_M_X64)
MESSAGE(STATUS "The current platform is Linux 64-bit")
- ELSE ()
+ ELSEIF (${CMAKE_SIZEOF_VOID_P} MATCHES 4)
+ IF (TD_ARM)
SET(TD_LINUX_32 TRUE)
- MESSAGE(FATAL_ERROR "The current platform is Linux 32-bit, not supported yet")
+ SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/linux)
+ #ADD_DEFINITIONS(-D_M_IX86)
+ MESSAGE(STATUS "The current platform is Linux 32-bit")
+ ELSE ()
+ MESSAGE(FATAL_ERROR "The current platform is Linux 32-bit, but no ARM not supported yet")
+ EXIT ()
+ ENDIF ()
+ ELSE ()
+ MESSAGE(FATAL_ERROR "The current platform is Linux neither 32-bit nor 64-bit, not supported yet")
EXIT ()
ENDIF ()
ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -102,13 +137,27 @@ IF (NOT DEFINED TD_CLUSTER)
IF (TD_LINUX_64)
SET(DEBUG_FLAGS "-O0 -DDEBUG")
SET(RELEASE_FLAGS "-O0")
- 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")
+ 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 ()
+ SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -Wno-char-subscripts -malign-stringops -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+ ENDIF ()
ELSE ()
- SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -Wno-char-subscripts -malign-stringops -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+ SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -g -Wno-char-subscripts -fsigned-char -munaligned-access -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
ENDIF ()
ADD_DEFINITIONS(-DLINUX)
ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
+ ELSEIF (TD_LINUX_32)
+ IF (NOT TD_ARM)
+ EXIT ()
+ ENDIF ()
+ SET(DEBUG_FLAGS "-O0 -DDEBUG")
+ SET(RELEASE_FLAGS "-O0")
+ SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -g -Wno-char-subscripts -fsigned-char -munaligned-access -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+ ADD_DEFINITIONS(-DLINUX)
+ ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
+ ADD_DEFINITIONS(-DUSE_LIBICONV)
ELSEIF (TD_WINDOWS_64)
SET(CMAKE_GENERATOR "NMake Makefiles" CACHE INTERNAL "" FORCE)
SET(COMMON_FLAGS "/nologo /WX- /Oi /Oy- /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /errorReport:prompt /analyze-")
@@ -169,6 +218,14 @@ IF (NOT DEFINED TD_CLUSTER)
INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
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)
+ EXIT ()
+ ENDIF ()
+ SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")
+ INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
+ 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_WINDOWS_64)
SET(CMAKE_INSTALL_PREFIX C:/TDengine)
INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/go DESTINATION connector)
diff --git a/documentation/tdenginedocs-cn/getting-started/index.html b/documentation/tdenginedocs-cn/getting-started/index.html
index d7e8fe311c..65ef667d00 100644
--- a/documentation/tdenginedocs-cn/getting-started/index.html
+++ b/documentation/tdenginedocs-cn/getting-started/index.html
@@ -63,7 +63,7 @@ Query OK, 2 row(s) in set (0.001700s)
主要功能
TDengine的核心功能是时序数据库。除此之外，为减少研发的复杂度、系统维护的难度，TDengine还提供缓存、消息队列、订阅、流式计算等功能。更详细的功能如下：
写数据时自动建子表
-在某些特殊场景中，用户在写数据时并不确定某个设备的表是否存在，此时可使用自动建表语法来实现写入数据时里用超级表定义的表结构自动创建不存在的子表，若该表已存在则不会建立新表。注意：自动建表语句只能自动建立子表而不能建立超级表，这就要求超级表已经被事先定义好。自动建表语法跟insert/import语法非常相似，唯一区别是语句中增加了超级表和标签信息。具体语法如下：
+在某些特殊场景中，用户在写数据时并不确定某个设备的表是否存在，此时可使用自动建表语法来实现写入数据时用超级表定义的表结构自动创建不存在的子表，若该表已存在则不会建立新表。注意：自动建表语句只能自动建立子表而不能建立超级表，这就要求超级表已经被事先定义好。自动建表语法跟insert/import语法非常相似，唯一区别是语句中增加了超级表和标签信息。具体语法如下：
INSERT INTO <tb_name> USING <stb_name> TAGS (<tag1_value>, ...) VALUES (field_value, ...) (field_value, ...) ...;
向表tb_name中插入一条或多条记录，如果tb_name这张表不存在，则会用超级表stb_name定义的表结构以及用户指定的标签值(即tag1_value…)来创建名为tb_name新表，并将用户指定的值写入表中。如果tb_name已经存在，则建表过程会被忽略，系统也不会检查tb_name的标签是否与用户指定的标签值一致，也即不会更新已存在表的标签。
INSERT INTO <tb1_name> USING <stb1_name> TAGS (<tag1_value1>, ...) VALUES (<field1_value1>, ...) (<field1_value2>, ...) ... <tb_name2> USING <stb_name2> TAGS(<tag1_value2>, ...) VALUES (<field1_value1>, ...) ...;
@@ -105,6 +105,6 @@ GROUP BY location, type
查询仅位于北京以外地区的温度传感器最近24小时(24h)采样值的数量count(*)、平均温度avg(degree)、最高温度max(degree)和最低温度min(degree)，将采集结果按照10分钟为周期进行聚合，并将结果按所处地域(location)和传感器类型(type)再次进行聚合。
SELECT COUNT(*), AVG(degree), MAX(degree), MIN(degree)
FROM thermometer
-WHERE name<>'beijing' and ts>=now-1d
+WHERE location<>'beijing' and ts>=now-1d
INTERVAL(10M)
GROUP BY location, type
回去