Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
XKZJ_WCL
TDengine
提交
1c9d23b0
T
TDengine
项目概览
XKZJ_WCL
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1c9d23b0
编写于
4月 15, 2020
作者:
S
slguan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rearrange the source code directory
上级
98286acc
变更
37
隐藏空白更改
内联
并排
Showing
37 changed file
with
45 addition
and
49 deletion
+45
-49
deps/CMakeLists.txt
deps/CMakeLists.txt
+2
-0
deps/cJson/CMakeLists.txt
deps/cJson/CMakeLists.txt
+4
-0
deps/cJson/inc/cJSON.h
deps/cJson/inc/cJSON.h
+0
-0
deps/cJson/src/cJSON.c
deps/cJson/src/cJSON.c
+0
-0
deps/lz4/CMakeLists.txt
deps/lz4/CMakeLists.txt
+4
-0
deps/lz4/inc/lz4.h
deps/lz4/inc/lz4.h
+0
-0
deps/lz4/src/lz4.c
deps/lz4/src/lz4.c
+0
-0
src/CMakeLists.txt
src/CMakeLists.txt
+2
-2
src/dnode/CMakeLists.txt
src/dnode/CMakeLists.txt
+5
-3
src/plugins/http/CMakeLists.txt
src/plugins/http/CMakeLists.txt
+2
-0
src/query/CMakeLists.txt
src/query/CMakeLists.txt
+1
-1
src/rpc/CMakeLists.txt
src/rpc/CMakeLists.txt
+3
-1
src/tsdb/CMakeLists.txt
src/tsdb/CMakeLists.txt
+0
-0
src/tsdb/inc/tsdb.h
src/tsdb/inc/tsdb.h
+0
-0
src/tsdb/inc/tsdbMain.h
src/tsdb/inc/tsdbMain.h
+0
-0
src/tsdb/src/tsdbCache.c
src/tsdb/src/tsdbCache.c
+0
-0
src/tsdb/src/tsdbCompactor.c
src/tsdb/src/tsdbCompactor.c
+0
-0
src/tsdb/src/tsdbFile.c
src/tsdb/src/tsdbFile.c
+0
-0
src/tsdb/src/tsdbMain.c
src/tsdb/src/tsdbMain.c
+0
-0
src/tsdb/src/tsdbMeta.c
src/tsdb/src/tsdbMeta.c
+0
-0
src/tsdb/src/tsdbMetaFile.c
src/tsdb/src/tsdbMetaFile.c
+0
-0
src/tsdb/src/tsdbRead.c
src/tsdb/src/tsdbRead.c
+0
-0
src/tsdb/tests/CMakeLists.txt
src/tsdb/tests/CMakeLists.txt
+0
-0
src/tsdb/tests/tsdbTests.cpp
src/tsdb/tests/tsdbTests.cpp
+0
-0
src/util/CMakeLists.txt
src/util/CMakeLists.txt
+5
-3
src/vnode/CMakeLists.txt
src/vnode/CMakeLists.txt
+15
-3
src/vnode/cache/inc/cache.h
src/vnode/cache/inc/cache.h
+0
-17
src/vnode/inc/vnodeInt.h
src/vnode/inc/vnodeInt.h
+0
-0
src/vnode/main/CMakeLists.txt
src/vnode/main/CMakeLists.txt
+0
-18
src/vnode/src/vnodeMain.c
src/vnode/src/vnodeMain.c
+0
-0
src/vnode/src/vnodeRead.c
src/vnode/src/vnodeRead.c
+0
-0
src/vnode/src/vnodeWrite.c
src/vnode/src/vnodeWrite.c
+0
-0
src/wal/CMakeLists.txt
src/wal/CMakeLists.txt
+0
-0
src/wal/src/walMain.c
src/wal/src/walMain.c
+0
-0
src/wal/test/CMakeLists.txt
src/wal/test/CMakeLists.txt
+0
-0
src/wal/test/waltest.c
src/wal/test/waltest.c
+0
-0
tests/tsim/CMakeLists.txt
tests/tsim/CMakeLists.txt
+2
-1
未找到文件。
deps/CMakeLists.txt
浏览文件 @
1c9d23b0
...
...
@@ -5,3 +5,5 @@ ADD_SUBDIRECTORY(zlib-1.2.11)
ADD_SUBDIRECTORY
(
pthread
)
ADD_SUBDIRECTORY
(
regex
)
ADD_SUBDIRECTORY
(
iconv
)
ADD_SUBDIRECTORY
(
lz4
)
ADD_SUBDIRECTORY
(
cJson
)
src/thirdparty
/CMakeLists.txt
→
deps/cJson
/CMakeLists.txt
浏览文件 @
1c9d23b0
aux_source_directory
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/src SOURCE_LIST
)
add_library
(
thirdparty
${
SOURCE_LIST
}
)
target_include_directories
(
thirdparty PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/inc
)
\ No newline at end of file
add_library
(
cJson
${
SOURCE_LIST
}
)
target_include_directories
(
cJson PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/inc
)
\ No newline at end of file
src/util
/inc/cJSON.h
→
deps/cJson
/inc/cJSON.h
浏览文件 @
1c9d23b0
文件已移动
src/util
/src/cJSON.c
→
deps/cJson
/src/cJSON.c
浏览文件 @
1c9d23b0
文件已移动
deps/lz4/CMakeLists.txt
0 → 100644
浏览文件 @
1c9d23b0
aux_source_directory
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/src SOURCE_LIST
)
add_library
(
lz4
${
SOURCE_LIST
}
)
target_include_directories
(
lz4 PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/inc
)
\ No newline at end of file
src/thirdparty
/inc/lz4.h
→
deps/lz4
/inc/lz4.h
浏览文件 @
1c9d23b0
文件已移动
src/thirdparty
/src/lz4.c
→
deps/lz4
/src/lz4.c
浏览文件 @
1c9d23b0
文件已移动
src/CMakeLists.txt
浏览文件 @
1c9d23b0
...
...
@@ -3,8 +3,6 @@ PROJECT(TDengine)
# Base compile
ADD_SUBDIRECTORY
(
os
)
ADD_SUBDIRECTORY
(
thirdparty
)
ADD_SUBDIRECTORY
(
common
)
ADD_SUBDIRECTORY
(
util
)
ADD_SUBDIRECTORY
(
rpc
)
...
...
@@ -14,5 +12,7 @@ ADD_SUBDIRECTORY(kit)
ADD_SUBDIRECTORY
(
plugins
)
ADD_SUBDIRECTORY
(
mnode
)
ADD_SUBDIRECTORY
(
vnode
)
ADD_SUBDIRECTORY
(
tsdb
)
ADD_SUBDIRECTORY
(
wal
)
ADD_SUBDIRECTORY
(
dnode
)
#ADD_SUBDIRECTORY(connector/jdbc)
src/dnode/CMakeLists.txt
浏览文件 @
1c9d23b0
...
...
@@ -7,14 +7,16 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/util/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/query/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/mnode/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/
vnode/
tsdb/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/tsdb/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/common/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/cJson/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/lz4/inc
)
INCLUDE_DIRECTORIES
(
${
TD_ENTERPRISE_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
inc
)
AUX_SOURCE_DIRECTORY
(
src SRC
)
ADD_EXECUTABLE
(
taosd
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
taosd mnode taos_static monitor http tsdb twal vnode
)
TARGET_LINK_LIBRARIES
(
taosd mnode taos_static monitor http tsdb twal vnode
cJson lz4
)
IF
(
TD_ACCOUNT
)
TARGET_LINK_LIBRARIES
(
taosd account
)
...
...
@@ -31,7 +33,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
TARGET_LINK_LIBRARIES
(
taosd balance sync
)
ENDIF
()
IF
(
TD_MPEER
)
IF
(
TD_MPEER
)
TARGET_LINK_LIBRARIES
(
taosd mpeer sync
)
ENDIF
()
...
...
src/plugins/http/CMakeLists.txt
浏览文件 @
1c9d23b0
...
...
@@ -7,6 +7,8 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/util/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/query/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/zlib-1.2.11/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/cJson/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/lz4/inc
)
INCLUDE_DIRECTORIES
(
${
TD_OS_DIR
}
/inc
)
INCLUDE_DIRECTORIES
(
inc
)
AUX_SOURCE_DIRECTORY
(
src SRC
)
...
...
src/query/CMakeLists.txt
浏览文件 @
1c9d23b0
...
...
@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/util/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/common/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/
vnode/
tsdb/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/tsdb/inc
)
INCLUDE_DIRECTORIES
(
inc
)
IF
((
TD_LINUX_64
)
OR
(
TD_LINUX_32 AND TD_ARM
))
...
...
src/rpc/CMakeLists.txt
浏览文件 @
1c9d23b0
...
...
@@ -4,6 +4,8 @@ PROJECT(TDengine)
INCLUDE_DIRECTORIES
(
${
TD_OS_DIR
}
/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/util/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/cJson/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/lz4/inc
)
INCLUDE_DIRECTORIES
(
inc
)
IF
((
TD_LINUX_64
)
OR
(
TD_LINUX_32 AND TD_ARM
))
...
...
@@ -22,7 +24,7 @@ ELSEIF (TD_WINDOWS_64)
ENDIF
()
ADD_LIBRARY
(
trpc
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
trpc tutil
)
TARGET_LINK_LIBRARIES
(
trpc tutil
lz4
)
ADD_SUBDIRECTORY
(
test
)
src/
vnode/
tsdb/CMakeLists.txt
→
src/tsdb/CMakeLists.txt
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
tsdb/inc/tsdb.h
→
src/tsdb/inc/tsdb.h
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
tsdb/inc/tsdbMain.h
→
src/tsdb/inc/tsdbMain.h
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
tsdb/src/tsdbCache.c
→
src/tsdb/src/tsdbCache.c
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
tsdb/src/tsdbCompactor.c
→
src/tsdb/src/tsdbCompactor.c
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
tsdb/src/tsdbFile.c
→
src/tsdb/src/tsdbFile.c
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
tsdb/src/tsdbMain.c
→
src/tsdb/src/tsdbMain.c
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
tsdb/src/tsdbMeta.c
→
src/tsdb/src/tsdbMeta.c
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
tsdb/src/tsdbMetaFile.c
→
src/tsdb/src/tsdbMetaFile.c
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
tsdb/src/tsdbRead.c
→
src/tsdb/src/tsdbRead.c
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
tsdb/tests/CMakeLists.txt
→
src/tsdb/tests/CMakeLists.txt
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
tsdb/tests/tsdbTests.cpp
→
src/tsdb/tests/tsdbTests.cpp
浏览文件 @
1c9d23b0
文件已移动
src/util/CMakeLists.txt
浏览文件 @
1c9d23b0
...
...
@@ -6,9 +6,11 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/util/inc
)
IF
((
TD_LINUX_64
)
OR
(
TD_LINUX_32 AND TD_ARM
))
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/cJson/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/lz4/inc
)
AUX_SOURCE_DIRECTORY
(
src SRC
)
ADD_LIBRARY
(
tutil
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
tutil
thirdparty
pthread os m rt
)
TARGET_LINK_LIBRARIES
(
tutil pthread os m rt
)
FIND_PATH
(
ICONV_INCLUDE_EXIST iconv.h /usr/include/ /usr/local/include/
)
IF
(
ICONV_INCLUDE_EXIST
)
ADD_DEFINITIONS
(
-DUSE_LIBICONV
)
...
...
@@ -65,7 +67,7 @@ ELSEIF (TD_WINDOWS_64)
LIST
(
APPEND SRC ./src/tutil.c
)
LIST
(
APPEND SRC ./src/version.c
)
ADD_LIBRARY
(
tutil
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
tutil
thirdparty
iconv regex pthread os winmm IPHLPAPI ws2_32
)
TARGET_LINK_LIBRARIES
(
tutil iconv regex pthread os winmm IPHLPAPI ws2_32
)
ELSEIF
(
TD_DARWIN_64
)
ADD_DEFINITIONS
(
-DUSE_LIBICONV
)
LIST
(
APPEND SRC ./src/hash.c
)
...
...
@@ -102,7 +104,7 @@ ELSEIF(TD_DARWIN_64)
LIST
(
APPEND SRC ./src/version.c
)
LIST
(
APPEND SRC ./src/hash.c
)
ADD_LIBRARY
(
tutil
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
tutil
thirdparty
iconv pthread os
)
TARGET_LINK_LIBRARIES
(
tutil iconv pthread os
)
ENDIF
()
#IF (TD_CLUSTER)
...
...
src/vnode/CMakeLists.txt
浏览文件 @
1c9d23b0
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8
)
PROJECT
(
TDengine
)
ADD_SUBDIRECTORY
(
wal
)
ADD_SUBDIRECTORY
(
tsdb
)
ADD_SUBDIRECTORY
(
main
)
IF
((
TD_LINUX_64
)
OR
(
TD_LINUX_32 AND TD_ARM
))
INCLUDE_DIRECTORIES
(
${
TD_OS_DIR
}
/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/util/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/query/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/tsdb/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/common/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/dnode/inc
)
INCLUDE_DIRECTORIES
(
${
TD_ENTERPRISE_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
inc
)
AUX_SOURCE_DIRECTORY
(
src SRC
)
ADD_LIBRARY
(
vnode
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
vnode tsdb
)
ENDIF
()
\ No newline at end of file
src/vnode/cache/inc/cache.h
已删除
100644 → 0
浏览文件 @
98286acc
#if !defined(_TD_CACHE_H_)
#define _TD_CACHE_H_
#define TD_MIN_CACHE_BLOCK_SIZE 1024*1024
/* 1M */
#define TD_MAX_CACHE_BLOCK_SIZE 64*1024*1024
/* 64M */
typedef
void
cache_pool_t
;
typedef
struct
SCacheBlock
{
int32_t
blockId
;
char
data
[];
}
SCacheBlock
;
#endif // _TD_CACHE_H_
src/vnode/
main/
inc/vnodeInt.h
→
src/vnode/inc/vnodeInt.h
浏览文件 @
1c9d23b0
文件已移动
src/vnode/main/CMakeLists.txt
已删除
100644 → 0
浏览文件 @
98286acc
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8
)
PROJECT
(
TDengine
)
IF
((
TD_LINUX_64
)
OR
(
TD_LINUX_32 AND TD_ARM
))
INCLUDE_DIRECTORIES
(
${
TD_OS_DIR
}
/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/util/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/query/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/vnode/tsdb/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/common/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/dnode/inc
)
INCLUDE_DIRECTORIES
(
${
TD_ENTERPRISE_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
inc
)
AUX_SOURCE_DIRECTORY
(
src SRC
)
ADD_LIBRARY
(
vnode
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
vnode tsdb
)
ENDIF
()
\ No newline at end of file
src/vnode/
main/
src/vnodeMain.c
→
src/vnode/src/vnodeMain.c
浏览文件 @
1c9d23b0
文件已移动
src/vnode/
main/
src/vnodeRead.c
→
src/vnode/src/vnodeRead.c
浏览文件 @
1c9d23b0
文件已移动
src/vnode/
main/
src/vnodeWrite.c
→
src/vnode/src/vnodeWrite.c
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
wal/CMakeLists.txt
→
src/wal/CMakeLists.txt
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
wal/src/walMain.c
→
src/wal/src/walMain.c
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
wal/test/CMakeLists.txt
→
src/wal/test/CMakeLists.txt
浏览文件 @
1c9d23b0
文件已移动
src/
vnode/
wal/test/waltest.c
→
src/wal/test/waltest.c
浏览文件 @
1c9d23b0
文件已移动
tests/tsim/CMakeLists.txt
浏览文件 @
1c9d23b0
...
...
@@ -3,6 +3,7 @@ PROJECT(TDengine)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/util/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/client/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/cJson/inc
)
INCLUDE_DIRECTORIES
(
${
TD_OS_DIR
}
/inc
)
INCLUDE_DIRECTORIES
(
inc
)
...
...
@@ -12,4 +13,4 @@ ENDIF ()
AUX_SOURCE_DIRECTORY
(
src SRC
)
ADD_EXECUTABLE
(
tsim
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
tsim taos_static trpc tutil pthread
)
TARGET_LINK_LIBRARIES
(
tsim taos_static trpc tutil pthread
cJson
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录