Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
6f553c57
TDengine
项目概览
冷面1992
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
6f553c57
编写于
11月 11, 2019
作者:
F
fangpanpan
提交者:
GitHub
11月 11, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #698 from taosdata/feature/lihui
Feature/lihui
上级
b68d5e88
27a508b7
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
40 addition
and
27 deletion
+40
-27
CMakeLists.txt
CMakeLists.txt
+14
-7
src/client/CMakeLists.txt
src/client/CMakeLists.txt
+1
-1
src/kit/shell/CMakeLists.txt
src/kit/shell/CMakeLists.txt
+1
-1
src/kit/shell/src/shellEngine.c
src/kit/shell/src/shellEngine.c
+13
-7
src/kit/taosdemo/CMakeLists.txt
src/kit/taosdemo/CMakeLists.txt
+1
-1
src/kit/taosdump/CMakeLists.txt
src/kit/taosdump/CMakeLists.txt
+1
-1
src/modules/http/CMakeLists.txt
src/modules/http/CMakeLists.txt
+1
-1
src/modules/monitor/CMakeLists.txt
src/modules/monitor/CMakeLists.txt
+1
-1
src/os/linux/CMakeLists.txt
src/os/linux/CMakeLists.txt
+1
-1
src/rpc/CMakeLists.txt
src/rpc/CMakeLists.txt
+1
-1
src/sdb/CMakeLists.txt
src/sdb/CMakeLists.txt
+1
-1
src/system/detail/CMakeLists.txt
src/system/detail/CMakeLists.txt
+1
-1
src/system/lite/CMakeLists.txt
src/system/lite/CMakeLists.txt
+1
-1
src/util/CMakeLists.txt
src/util/CMakeLists.txt
+1
-1
src/util/src/tcrc32c.c
src/util/src/tcrc32c.c
+1
-1
未找到文件。
CMakeLists.txt
浏览文件 @
6f553c57
...
...
@@ -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"
)
...
...
src/client/CMakeLists.txt
浏览文件 @
6f553c57
...
...
@@ -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
...
...
src/kit/shell/CMakeLists.txt
浏览文件 @
6f553c57
...
...
@@ -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
}
)
...
...
src/kit/shell/src/shellEngine.c
浏览文件 @
6f553c57
...
...
@@ -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
:
...
...
src/kit/taosdemo/CMakeLists.txt
浏览文件 @
6f553c57
...
...
@@ -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
)
...
...
src/kit/taosdump/CMakeLists.txt
浏览文件 @
6f553c57
...
...
@@ -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
)
...
...
src/modules/http/CMakeLists.txt
浏览文件 @
6f553c57
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
)
...
...
src/modules/monitor/CMakeLists.txt
浏览文件 @
6f553c57
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
)
...
...
src/os/linux/CMakeLists.txt
浏览文件 @
6f553c57
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
)
...
...
src/rpc/CMakeLists.txt
浏览文件 @
6f553c57
...
...
@@ -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
)
...
...
src/sdb/CMakeLists.txt
浏览文件 @
6f553c57
...
...
@@ -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
)
...
...
src/system/detail/CMakeLists.txt
浏览文件 @
6f553c57
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
)
...
...
src/system/lite/CMakeLists.txt
浏览文件 @
6f553c57
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
)
...
...
src/util/CMakeLists.txt
浏览文件 @
6f553c57
...
...
@@ -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
)
...
...
src/util/src/tcrc32c.c
浏览文件 @
6f553c57
...
...
@@ -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
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录