Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
c97b9249
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
c97b9249
编写于
8月 14, 2023
作者:
M
Minglei Jin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cos: only for linux
上级
e1971cf0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
57 addition
and
28 deletion
+57
-28
cmake/cmake.options
cmake/cmake.options
+4
-0
contrib/CMakeLists.txt
contrib/CMakeLists.txt
+6
-3
source/common/src/tglobal.c
source/common/src/tglobal.c
+2
-0
source/dnode/vnode/CMakeLists.txt
source/dnode/vnode/CMakeLists.txt
+31
-25
source/dnode/vnode/src/vnd/vnodeCos.c
source/dnode/vnode/src/vnd/vnodeCos.c
+14
-0
未找到文件。
cmake/cmake.options
浏览文件 @
c97b9249
...
@@ -125,12 +125,16 @@ option(
...
@@ -125,12 +125,16 @@ option(
ON
ON
)
)
IF(${TD_LINUX})
option(
option(
BUILD_WITH_COS
BUILD_WITH_COS
"If build with cos"
"If build with cos"
ON
ON
)
)
ENDIF ()
option(
option(
BUILD_WITH_SQLITE
BUILD_WITH_SQLITE
"If build with sqlite"
"If build with sqlite"
...
...
contrib/CMakeLists.txt
浏览文件 @
c97b9249
...
@@ -6,6 +6,8 @@ function(cat IN_FILE OUT_FILE)
...
@@ -6,6 +6,8 @@ function(cat IN_FILE OUT_FILE)
file
(
APPEND
${
OUT_FILE
}
"
${
CONTENTS
}
"
)
file
(
APPEND
${
OUT_FILE
}
"
${
CONTENTS
}
"
)
endfunction
(
cat IN_FILE OUT_FILE
)
endfunction
(
cat IN_FILE OUT_FILE
)
if
(
${
TD_LINUX
}
)
set
(
CONTRIB_TMP_FILE3
"
${
CMAKE_BINARY_DIR
}
/deps_tmp_CMakeLists.txt.in3"
)
set
(
CONTRIB_TMP_FILE3
"
${
CMAKE_BINARY_DIR
}
/deps_tmp_CMakeLists.txt.in3"
)
configure_file
(
"
${
TD_SUPPORT_DIR
}
/deps_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE3
}
)
configure_file
(
"
${
TD_SUPPORT_DIR
}
/deps_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE3
}
)
...
@@ -35,6 +37,8 @@ execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
...
@@ -35,6 +37,8 @@ execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
execute_process
(
COMMAND
"
${
CMAKE_COMMAND
}
"
--build .
execute_process
(
COMMAND
"
${
CMAKE_COMMAND
}
"
--build .
WORKING_DIRECTORY
"
${
TD_CONTRIB_DIR
}
/deps-download"
)
WORKING_DIRECTORY
"
${
TD_CONTRIB_DIR
}
/deps-download"
)
endif
(
${
TD_LINUX
}
)
set
(
CONTRIB_TMP_FILE
"
${
CMAKE_BINARY_DIR
}
/deps_tmp_CMakeLists.txt.in"
)
set
(
CONTRIB_TMP_FILE
"
${
CMAKE_BINARY_DIR
}
/deps_tmp_CMakeLists.txt.in"
)
configure_file
(
"
${
TD_SUPPORT_DIR
}
/deps_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
configure_file
(
"
${
TD_SUPPORT_DIR
}
/deps_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
...
@@ -388,7 +392,7 @@ endif()
...
@@ -388,7 +392,7 @@ endif()
# cos
# cos
if
(
${
BUILD_WITH_COS
}
)
if
(
${
BUILD_WITH_COS
}
)
if
(
NOT
${
TD_WINDOWS
}
)
if
(
${
TD_LINUX
}
)
set
(
CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.1
)
set
(
CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.1
)
#ADD_DEFINITIONS(-DMINIXML_LIBRARY=${CMAKE_BINARY_DIR}/build/lib/libxml.a)
#ADD_DEFINITIONS(-DMINIXML_LIBRARY=${CMAKE_BINARY_DIR}/build/lib/libxml.a)
option
(
ENABLE_TEST
"Enable the tests"
OFF
)
option
(
ENABLE_TEST
"Enable the tests"
OFF
)
...
@@ -406,10 +410,9 @@ if(${BUILD_WITH_COS})
...
@@ -406,10 +410,9 @@ if(${BUILD_WITH_COS})
)
)
set
(
CMAKE_PROJECT_NAME
${
ORIG_CMAKE_PROJECT_NAME
}
)
set
(
CMAKE_PROJECT_NAME
${
ORIG_CMAKE_PROJECT_NAME
}
)
else
()
else
()
endif
(
NOT
${
TD_WINDOWS
}
)
endif
(
${
TD_LINUX
}
)
endif
(
${
BUILD_WITH_COS
}
)
endif
(
${
BUILD_WITH_COS
}
)
# lucene
# lucene
...
...
source/common/src/tglobal.c
浏览文件 @
c97b9249
...
@@ -292,7 +292,9 @@ int32_t taosSetS3Cfg(SConfig *pCfg) {
...
@@ -292,7 +292,9 @@ int32_t taosSetS3Cfg(SConfig *pCfg) {
}
}
}
}
if
(
tsS3BucketName
[
0
]
!=
'<'
&&
tsDiskCfgNum
>
1
)
{
if
(
tsS3BucketName
[
0
]
!=
'<'
&&
tsDiskCfgNum
>
1
)
{
#ifdef USE_COS
tsS3Enabled
=
true
;
tsS3Enabled
=
true
;
#endif
}
}
return
0
;
return
0
;
...
...
source/dnode/vnode/CMakeLists.txt
浏览文件 @
c97b9249
...
@@ -135,12 +135,6 @@ else()
...
@@ -135,12 +135,6 @@ else()
endif
()
endif
()
endif
()
endif
()
set
(
CMAKE_FIND_LIBRARY_SUFFIXES
".a"
)
find_library
(
APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/
)
find_library
(
APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/
)
find_library
(
MINIXML_LIBRARY mxml
)
find_library
(
CURL_LIBRARY curl
)
target_link_libraries
(
target_link_libraries
(
vnode
vnode
PUBLIC os
PUBLIC os
...
@@ -160,28 +154,24 @@ target_link_libraries(
...
@@ -160,28 +154,24 @@ target_link_libraries(
PUBLIC transport
PUBLIC transport
PUBLIC stream
PUBLIC stream
PUBLIC index
PUBLIC index
# s3
cos_c_sdk_static
${
APR_UTIL_LIBRARY
}
${
APR_LIBRARY
}
${
MINIXML_LIBRARY
}
${
CURL_LIBRARY
}
)
)
IF
(
TD_GRANT
)
if
(
${
TD_LINUX
}
)
TARGET_LINK_LIBRARIES
(
vnode PUBLIC grant
)
set
(
CMAKE_FIND_LIBRARY_SUFFIXES
".a"
)
ENDIF
()
find_library
(
APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/
)
find_library
(
APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/
)
target_compile_definitions
(
vnode PUBLIC -DMETA_REFACT
)
find_library
(
MINIXML_LIBRARY mxml
)
find_library
(
CURL_LIBRARY curl
)
if
(
${
BUILD_WITH_INVERTEDINDEX
}
)
target_link_libraries
(
add_definitions
(
-DUSE_INVERTED_INDEX
)
vnode
endif
(
${
BUILD_WITH_INVERTEDINDEX
}
)
if
(
${
BUILD_WITH_ROCKSDB
}
)
# s3
add_definitions
(
-DUSE_ROCKSDB
)
PUBLIC cos_c_sdk_static
endif
(
${
BUILD_WITH_ROCKSDB
}
)
PUBLIC
${
APR_UTIL_LIBRARY
}
PUBLIC
${
APR_LIBRARY
}
PUBLIC
${
MINIXML_LIBRARY
}
PUBLIC
${
CURL_LIBRARY
}
)
# s3
# s3
FIND_PROGRAM
(
APR_CONFIG_BIN NAMES apr-config apr-1-config PATHS /usr/bin /usr/local/bin /usr/local/apr/bin/
)
FIND_PROGRAM
(
APR_CONFIG_BIN NAMES apr-config apr-1-config PATHS /usr/bin /usr/local/bin /usr/local/apr/bin/
)
...
@@ -199,6 +189,22 @@ target_include_directories(
...
@@ -199,6 +189,22 @@ target_include_directories(
PUBLIC
"$ENV{HOME}/.cos-local.1/include"
PUBLIC
"$ENV{HOME}/.cos-local.1/include"
)
)
endif
(
${
TD_LINUX
}
)
IF
(
TD_GRANT
)
TARGET_LINK_LIBRARIES
(
vnode PUBLIC grant
)
ENDIF
()
target_compile_definitions
(
vnode PUBLIC -DMETA_REFACT
)
if
(
${
BUILD_WITH_INVERTEDINDEX
}
)
add_definitions
(
-DUSE_INVERTED_INDEX
)
endif
(
${
BUILD_WITH_INVERTEDINDEX
}
)
if
(
${
BUILD_WITH_ROCKSDB
}
)
add_definitions
(
-DUSE_ROCKSDB
)
endif
(
${
BUILD_WITH_ROCKSDB
}
)
if
(
${
BUILD_TEST
}
)
if
(
${
BUILD_TEST
}
)
add_subdirectory
(
test
)
add_subdirectory
(
test
)
endif
(
${
BUILD_TEST
}
)
endif
(
${
BUILD_TEST
}
)
source/dnode/vnode/src/vnd/vnodeCos.c
浏览文件 @
c97b9249
...
@@ -12,6 +12,7 @@ extern char tsS3AccessKeySecret[];
...
@@ -12,6 +12,7 @@ extern char tsS3AccessKeySecret[];
extern
char
tsS3BucketName
[];
extern
char
tsS3BucketName
[];
extern
char
tsS3AppId
[];
extern
char
tsS3AppId
[];
#ifdef USE_COS
int32_t
s3Init
()
{
int32_t
s3Init
()
{
if
(
cos_http_io_initialize
(
NULL
,
0
)
!=
COSE_OK
)
{
if
(
cos_http_io_initialize
(
NULL
,
0
)
!=
COSE_OK
)
{
return
-
1
;
return
-
1
;
...
@@ -294,3 +295,16 @@ long s3Size(const char *object_name) {
...
@@ -294,3 +295,16 @@ long s3Size(const char *object_name) {
return
size
;
return
size
;
}
}
#else
int32_t
s3Init
()
{
return
0
;
}
void
s3CleanUp
()
{}
void
s3PutObjectFromFile
(
const
char
*
file
,
const
char
*
object
)
{}
void
s3DeleteObjects
(
const
char
*
object_name
[],
int
nobject
)
{}
bool
s3Exists
(
const
char
*
object_name
)
{
return
false
;
}
bool
s3Get
(
const
char
*
object_name
,
const
char
*
path
)
{
return
false
;
}
void
s3EvictCache
(
const
char
*
path
,
long
object_size
)
{}
long
s3Size
(
const
char
*
object_name
)
{
return
0
;
}
#endif
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录