Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
7a536237
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
7a536237
编写于
5月 14, 2022
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: do some internal refactor.
上级
e119b56f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
53 addition
and
4 deletion
+53
-4
contrib/CMakeLists.txt
contrib/CMakeLists.txt
+48
-1
source/libs/catalog/src/catalog.c
source/libs/catalog/src/catalog.c
+5
-3
未找到文件。
contrib/CMakeLists.txt
浏览文件 @
7a536237
...
@@ -98,6 +98,12 @@ if(${BUILD_WITH_NURAFT})
...
@@ -98,6 +98,12 @@ if(${BUILD_WITH_NURAFT})
cat
(
"
${
TD_SUPPORT_DIR
}
/nuraft_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
cat
(
"
${
TD_SUPPORT_DIR
}
/nuraft_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
endif
(
${
BUILD_WITH_NURAFT
}
)
endif
(
${
BUILD_WITH_NURAFT
}
)
# addr2line
if
(
${
BUILD_ADDR2LINE
}
)
cat
(
"
${
TD_SUPPORT_DIR
}
/libdwarf_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
cat
(
"
${
TD_SUPPORT_DIR
}
/addr2line_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
endif
(
${
BUILD_ADDR2LINE
}
)
# download dependencies
# download dependencies
configure_file
(
${
CONTRIB_TMP_FILE
}
"
${
TD_CONTRIB_DIR
}
/deps-download/CMakeLists.txt"
)
configure_file
(
${
CONTRIB_TMP_FILE
}
"
${
TD_CONTRIB_DIR
}
/deps-download/CMakeLists.txt"
)
execute_process
(
COMMAND
"
${
CMAKE_COMMAND
}
"
-G
"
${
CMAKE_GENERATOR
}
"
.
execute_process
(
COMMAND
"
${
CMAKE_COMMAND
}
"
-G
"
${
CMAKE_GENERATOR
}
"
.
...
@@ -327,7 +333,48 @@ if(${BUILD_WITH_SQLITE})
...
@@ -327,7 +333,48 @@ if(${BUILD_WITH_SQLITE})
endif
(
NOT TD_WINDOWS
)
endif
(
NOT TD_WINDOWS
)
endif
(
${
BUILD_WITH_SQLITE
}
)
endif
(
${
BUILD_WITH_SQLITE
}
)
# pthread
# addr2line
if
(
${
BUILD_ADDR2LINE
}
)
check_include_file
(
"sys/types.h"
HAVE_SYS_TYPES_H
)
check_include_file
(
"sys/stat.h"
HAVE_SYS_STAT_H
)
check_include_file
(
"inttypes.h"
HAVE_INTTYPES_H
)
check_include_file
(
"stddef.h"
HAVE_STDDEF_H
)
check_include_file
(
"stdlib.h"
HAVE_STDLIB_H
)
check_include_file
(
"string.h"
HAVE_STRING_H
)
check_include_file
(
"memory.h"
HAVE_MEMORY_H
)
check_include_file
(
"strings.h"
HAVE_STRINGS_H
)
check_include_file
(
"stdint.h"
HAVE_STDINT_H
)
check_include_file
(
"unistd.h"
HAVE_UNISTD_H
)
check_include_file
(
"sgidefs.h"
HAVE_SGIDEFS_H
)
check_include_file
(
"stdafx.h"
HAVE_STDAFX_H
)
check_include_file
(
"elf.h"
HAVE_ELF_H
)
check_include_file
(
"libelf.h"
HAVE_LIBELF_H
)
check_include_file
(
"libelf/libelf.h"
HAVE_LIBELF_LIBELF_H
)
check_include_file
(
"alloca.h"
HAVE_ALLOCA_H
)
check_include_file
(
"elfaccess.h"
HAVE_ELFACCESS_H
)
check_include_file
(
"sys/elf_386.h"
HAVE_SYS_ELF_386_H
)
check_include_file
(
"sys/elf_amd64.h"
HAVE_SYS_ELF_AMD64_H
)
check_include_file
(
"sys/elf_sparc.h"
HAVE_SYS_ELF_SPARC_H
)
check_include_file
(
"sys/ia64/elf.h"
HAVE_SYS_IA64_ELF_H
)
set
(
VERSION 0.3.1
)
set
(
PACKAGE_VERSION
"
\"
${
VERSION
}
\"
"
)
configure_file
(
libdwarf/cmake/config.h.cmake config.h
)
file
(
GLOB_RECURSE LIBDWARF_SOURCES
"libdwarf/src/lib/libdwarf/*.c"
)
add_library
(
libdwarf STATIC
${
LIBDWARF_SOURCES
}
)
set_target_properties
(
libdwarf PROPERTIES OUTPUT_NAME
"libdwarf"
)
if
(
HAVE_LIBELF_H OR HAVE_LIBELF_LIBELF_H
)
target_link_libraries
(
libdwarf PUBLIC libelf
)
endif
()
target_include_directories
(
libdwarf SYSTEM PUBLIC
"libdwarf/src/lib/libdwarf"
${
CMAKE_BINARY_DIR
}
/contrib
)
file
(
READ
"addr2line/addr2line.c"
ADDR2LINE_CONTENT
)
string
(
REPLACE
"static int"
"int"
ADDR2LINE_CONTENT
"
${
ADDR2LINE_CONTENT
}
"
)
string
(
REPLACE
"static void"
"void"
ADDR2LINE_CONTENT
"
${
ADDR2LINE_CONTENT
}
"
)
string
(
REPLACE
"main("
"main_addr2line("
ADDR2LINE_CONTENT
"
${
ADDR2LINE_CONTENT
}
"
)
file
(
WRITE
"addr2line/addr2line.c"
"
${
ADDR2LINE_CONTENT
}
"
)
add_library
(
addr2line STATIC
"addr2line/addr2line.c"
)
target_link_libraries
(
addr2line PUBLIC libdwarf dl z
)
target_include_directories
(
addr2line PUBLIC
"libdwarf/src/lib/libdwarf"
)
endif
(
${
BUILD_ADDR2LINE
}
)
# ================================================================================================
# ================================================================================================
...
...
source/libs/catalog/src/catalog.c
浏览文件 @
7a536237
...
@@ -2714,12 +2714,16 @@ typedef struct SCatalogReqObj {
...
@@ -2714,12 +2714,16 @@ typedef struct SCatalogReqObj {
void
*
doExtractpayload
(
const
SDataBuf
*
pMsg
){}
void
*
doExtractpayload
(
const
SDataBuf
*
pMsg
){}
int32_t
loadRemoteMetaCallback
(
void
*
param
,
const
SDataBuf
*
pMsg
,
int32_t
code
)
{
int32_t
loadRemoteMetaCallback
(
void
*
param
,
const
SDataBuf
*
pMsg
,
int32_t
code
)
{
SCatalogReqObj
*
pRsp
=
param
;
SCatalogReqObj
*
pRsp
=
(
SCatalogReqObj
*
)
param
;
// do handle the result.
// do handle the result.
// serialize data in pMsg and set the result into pRsp->pResult
// serialize data in pMsg and set the result into pRsp->pResult
pRsp
->
pResult
=
doExtractpayload
(
pMsg
);
pRsp
->
pResult
=
doExtractpayload
(
pMsg
);
//todo
// call user's callback function
// call user's callback function
pRsp
->
userFp
(
pRsp
->
pResult
,
pRsp
->
pUserParam
,
code
);
pRsp
->
userFp
(
pRsp
->
pResult
,
pRsp
->
pUserParam
,
code
);
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
...
@@ -2733,8 +2737,6 @@ int32_t catalogGetDBVgInfo_a(CatalogParamWrapper* pCatalogWrapper, __async_cb_fn
...
@@ -2733,8 +2737,6 @@ int32_t catalogGetDBVgInfo_a(CatalogParamWrapper* pCatalogWrapper, __async_cb_fn
return
TSDB_CODE_QRY_OUT_OF_MEMORY
;
return
TSDB_CODE_QRY_OUT_OF_MEMORY
;
}
}
pMsgSendInfo
->
param
=
param
;
SCatalogReqObj
*
pCatalogReq
=
taosMemoryCalloc
(
1
,
sizeof
(
SCatalogReqObj
));
SCatalogReqObj
*
pCatalogReq
=
taosMemoryCalloc
(
1
,
sizeof
(
SCatalogReqObj
));
pCatalogReq
->
userFp
=
fp
;
pCatalogReq
->
userFp
=
fp
;
pCatalogReq
->
pUserParam
=
param
;
pCatalogReq
->
pUserParam
=
param
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录