Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
m0_53320357
TDengine
提交
dc64d4ed
TDengine
项目概览
m0_53320357
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
3
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,发现更多精彩内容 >>
提交
dc64d4ed
编写于
7月 31, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-1037]
上级
9d6896cc
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
29 addition
and
55 deletion
+29
-55
src/inc/taosdef.h
src/inc/taosdef.h
+2
-1
src/os/inc/osString.h
src/os/inc/osString.h
+3
-2
src/os/inc/osTime.h
src/os/inc/osTime.h
+1
-1
src/os/inc/osWindows.h
src/os/inc/osWindows.h
+2
-0
src/os/src/windows/CMakeLists.txt
src/os/src/windows/CMakeLists.txt
+12
-8
src/os/src/windows/w64File.c
src/os/src/windows/w64File.c
+6
-2
src/rpc/CMakeLists.txt
src/rpc/CMakeLists.txt
+2
-9
src/util/CMakeLists.txt
src/util/CMakeLists.txt
+1
-32
未找到文件。
src/inc/taosdef.h
浏览文件 @
dc64d4ed
...
...
@@ -22,6 +22,7 @@ extern "C" {
#include <stdint.h>
#include <stdbool.h>
#include "osDef.h"
#include "taos.h"
#define TSDB__packed
...
...
@@ -161,7 +162,7 @@ extern tDataTypeDescriptor tDataTypeDesc[11];
bool
isValidDataType
(
int32_t
type
);
//bool isNull(const char *val, int32_t type);
static
inline
__attribute__
((
always_inline
))
bool
isNull
(
const
char
*
val
,
int32_t
type
)
{
static
FORCE_INLINE
bool
isNull
(
const
char
*
val
,
int32_t
type
)
{
switch
(
type
)
{
case
TSDB_DATA_TYPE_BOOL
:
return
*
(
uint8_t
*
)
val
==
TSDB_DATA_BOOL_NULL
;
...
...
src/os/inc/osString.h
浏览文件 @
dc64d4ed
...
...
@@ -41,8 +41,9 @@ extern "C" {
(dst)[(size)-1] = 0; \
} while (0);
// TAOS_OS_FUNC_STRING_STR2INT64
int64_t
tsosStr2int64
(
char
*
str
);
#ifndef TAOS_OS_FUNC_STRING_STR2INT64
int64_t
tsosStr2int64
(
char
*
str
);
#endif
// USE_LIBICONV
int32_t
taosUcs4ToMbs
(
void
*
ucs4
,
int32_t
ucs4_max_len
,
char
*
mbs
);
...
...
src/os/inc/osTime.h
浏览文件 @
dc64d4ed
...
...
@@ -23,7 +23,7 @@ extern "C" {
#include "os.h"
#include "taosdef.h"
#ifndef TAOS_OS_
DEF_TIME
#ifndef TAOS_OS_
FUNC_TIME_DEF
#define MILLISECOND_PER_SECOND ((int64_t)1000L)
#endif
#define MILLISECOND_PER_MINUTE (MILLISECOND_PER_SECOND * 60)
...
...
src/os/inc/osWindows.h
浏览文件 @
dc64d4ed
...
...
@@ -43,6 +43,7 @@
#include <WS2tcpip.h>
#include <winbase.h>
#include <Winsock2.h>
#include <process.h>
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -124,6 +125,7 @@ typedef int (*__compar_fn_t)(const void *, const void *);
#define socklen_t int
#define htobe64 htonll
#define twrite write
#define getpid _getpid
int
gettimeofday
(
struct
timeval
*
tv
,
struct
timezone
*
tz
);
struct
tm
*
localtime_r
(
const
time_t
*
timep
,
struct
tm
*
result
);
...
...
src/os/src/windows/CMakeLists.txt
浏览文件 @
dc64d4ed
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8
)
PROJECT
(
TDengine
)
IF
(
TD_WINDOWS_64
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/pthread
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
inc
)
AUX_SOURCE_DIRECTORY
(
src SRC
)
ADD_LIBRARY
(
os
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
os winmm IPHLPAPI ws2_32
)
ENDIF
()
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/pthread
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/iconv
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/regex
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/os/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/util/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/common/inc
)
AUX_SOURCE_DIRECTORY
(
. SRC
)
ADD_LIBRARY
(
os
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
os winmm IPHLPAPI ws2_32
)
src/os/src/windows/w64File.c
浏览文件 @
dc64d4ed
...
...
@@ -37,10 +37,9 @@ void taosGetTmpfilePath(const char *fileNamePrefix, char *dstPath) {
snprintf
(
dstPath
,
PATH_MAX
,
tmpPath
,
getpid
(),
rand
);
}
#define _SEND_FILE_STEP_ 1000
int
taos
T
SendFileImp
(
FILE
*
out_file
,
FILE
*
in_file
,
int64_t
*
offset
,
int32_t
count
)
{
int
taos
F
SendFileImp
(
FILE
*
out_file
,
FILE
*
in_file
,
int64_t
*
offset
,
int32_t
count
)
{
fseek
(
in_file
,
(
int32_t
)(
*
offset
),
0
);
int
writeLen
=
0
;
uint8_t
buffer
[
_SEND_FILE_STEP_
]
=
{
0
};
...
...
@@ -74,3 +73,8 @@ int taosTSendFileImp(FILE* out_file, FILE* in_file, int64_t* offset, int32_t cou
return
writeLen
;
}
ssize_t
taosTSendFileImp
(
int
dfd
,
int
sfd
,
off_t
*
offset
,
size_t
size
)
{
uError
(
"taosTSendFileImp no implemented yet"
);
return
0
;
}
\ No newline at end of file
src/rpc/CMakeLists.txt
浏览文件 @
dc64d4ed
...
...
@@ -10,19 +10,12 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/lz4/inc)
INCLUDE_DIRECTORIES
(
inc
)
IF
((
TD_LINUX_64
)
OR
(
TD_LINUX_32 AND TD_ARM
))
AUX_SOURCE_DIRECTORY
(
./
src SRC
)
AUX_SOURCE_DIRECTORY
(
src SRC
)
ELSEIF
(
TD_DARWIN_64
)
#LIST(APPEND SRC ./src/thaship.c)
#LIST(APPEND SRC ./src/trpc.c)
#LIST(APPEND SRC ./src/tstring.c)
#LIST(APPEND SRC ./src/tudp.c)
AUX_SOURCE_DIRECTORY
(
src SRC
)
ELSEIF
(
TD_WINDOWS_64
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/pthread
)
LIST
(
APPEND SRC ./src/thaship.c
)
LIST
(
APPEND SRC ./src/trpc.c
)
LIST
(
APPEND SRC ./src/tstring.c
)
LIST
(
APPEND SRC ./src/tudp.c
)
AUX_SOURCE_DIRECTORY
(
src SRC
)
ENDIF
()
ADD_LIBRARY
(
trpc
${
SRC
}
)
...
...
src/util/CMakeLists.txt
浏览文件 @
dc64d4ed
...
...
@@ -34,38 +34,7 @@ ELSEIF (TD_WINDOWS_64)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/iconv
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/regex
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/inc
)
LIST
(
APPEND SRC ./src/hash.c
)
LIST
(
APPEND SRC ./src/ihash.c
)
LIST
(
APPEND SRC ./src/lz4.c
)
LIST
(
APPEND SRC ./src/shash.c
)
LIST
(
APPEND SRC ./src/tbase64.c
)
LIST
(
APPEND SRC ./src/tcache.c
)
LIST
(
APPEND SRC ./src/tcompression.c
)
LIST
(
APPEND SRC ./src/textbuffer.c
)
LIST
(
APPEND SRC ./src/tglobalcfg.c
)
LIST
(
APPEND SRC ./src/thash.c
)
LIST
(
APPEND SRC ./src/thashutil.c
)
LIST
(
APPEND SRC ./src/thistogram.c
)
LIST
(
APPEND SRC ./src/tidpool.c
)
LIST
(
APPEND SRC ./src/tinterpolation.c
)
LIST
(
APPEND SRC ./src/tlog.c
)
LIST
(
APPEND SRC ./src/tlosertree.c
)
LIST
(
APPEND SRC ./src/tmd5.c
)
LIST
(
APPEND SRC ./src/tmem.c
)
LIST
(
APPEND SRC ./src/tmempool.c
)
LIST
(
APPEND SRC ./src/tmodule.c
)
LIST
(
APPEND SRC ./src/tnote.c
)
LIST
(
APPEND SRC ./src/tpercentile.c
)
LIST
(
APPEND SRC ./src/tsched.c
)
LIST
(
APPEND SRC ./src/tskiplist.c
)
LIST
(
APPEND SRC ./src/tsocket.c
)
LIST
(
APPEND SRC ./src/tstrbuild.c
)
LIST
(
APPEND SRC ./src/ttime.c
)
LIST
(
APPEND SRC ./src/ttimer.c
)
LIST
(
APPEND SRC ./src/ttokenizer.c
)
LIST
(
APPEND SRC ./src/ttypes.c
)
LIST
(
APPEND SRC ./src/tutil.c
)
LIST
(
APPEND SRC ./src/version.c
)
AUX_SOURCE_DIRECTORY
(
src SRC
)
ADD_LIBRARY
(
tutil
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
tutil iconv regex pthread osdetail winmm IPHLPAPI ws2_32 lz4
)
ELSEIF
(
TD_DARWIN_64
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录