Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
e3ab7346
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,发现更多精彩内容 >>
提交
e3ab7346
编写于
2月 15, 2020
作者:
S
slguan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
compile options
上级
cb1c3a17
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
32 addition
and
40 deletion
+32
-40
src/client/src/tscParseInsert.c
src/client/src/tscParseInsert.c
+1
-1
src/client/src/tscSql.c
src/client/src/tscSql.c
+2
-2
src/dnode/CMakeLists.txt
src/dnode/CMakeLists.txt
+7
-14
src/inc/taoserror.h
src/inc/taoserror.h
+3
-0
src/inc/taosmsg.h
src/inc/taosmsg.h
+0
-3
src/modules/http/src/httpJson.c
src/modules/http/src/httpJson.c
+1
-1
src/rpc/CMakeLists.txt
src/rpc/CMakeLists.txt
+2
-1
src/rpc/src/tudp.c
src/rpc/src/tudp.c
+0
-3
src/sdb/CMakeLists.txt
src/sdb/CMakeLists.txt
+2
-1
src/util/inc/tstatus.h
src/util/inc/tstatus.h
+7
-7
src/util/src/tstatus.c
src/util/src/tstatus.c
+7
-7
未找到文件。
src/client/src/tscParseInsert.c
浏览文件 @
e3ab7346
...
...
@@ -1071,7 +1071,7 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
}
// todo add to return
tscError
(
"async insert parse error, code:%d, %s"
,
code
,
ts
Error
[
code
]
);
tscError
(
"async insert parse error, code:%d, %s"
,
code
,
ts
trerror
(
code
)
);
pSql
->
asyncTblPos
=
NULL
;
}
...
...
src/client/src/tscSql.c
浏览文件 @
e3ab7346
...
...
@@ -849,7 +849,7 @@ char *taos_errstr(TAOS *taos) {
STscObj
*
pObj
=
(
STscObj
*
)
taos
;
uint8_t
code
;
if
(
pObj
==
NULL
||
pObj
->
signature
!=
pObj
)
return
ts
Error
[
globalCode
]
;
if
(
pObj
==
NULL
||
pObj
->
signature
!=
pObj
)
return
ts
trerror
(
globalCode
)
;
SSqlObj
*
pSql
=
pObj
->
pSql
;
...
...
@@ -862,7 +862,7 @@ char *taos_errstr(TAOS *taos) {
if
(
hasAdditionalErrorInfo
(
code
,
&
pSql
->
cmd
))
{
return
pSql
->
cmd
.
payload
;
}
else
{
return
ts
Error
[
code
]
;
return
ts
trerror
(
code
)
;
}
}
...
...
src/dnode/CMakeLists.txt
浏览文件 @
e3ab7346
...
...
@@ -4,25 +4,18 @@ 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_ENTERPRISE_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/dnode/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/mnode/detail/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/vnode/detail/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/client/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/modules/http/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/modules/monitor/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/inc
)
INCLUDE_DIRECTORIES
(
${
TD_ENTERPRISE_DIR
}
/src/util/cluster/inc
)
INCLUDE_DIRECTORIES
(
inc
)
AUX_SOURCE_DIRECTORY
(
src SRC
)
ADD_EXECUTABLE
(
taosd
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
taosd mnode vnode taos_static monitor http
)
ADD_LIBRARY
(
dnode
${
SRC
}
)
#ADD_EXECUTABLE(taosd ${SRC})
#TARGET_LINK_LIBRARIES(taosd mnode sdb vnode taos_static monitor http)
IF
(
TD_CLUSTER
)
TARGET_LINK_LIBRARIES
(
taosd dcluster
)
ENDIF
()
#
IF (TD_CLUSTER)
#
TARGET_LINK_LIBRARIES(taosd dcluster)
#
ENDIF ()
SET
(
PREPARE_ENV_CMD
"prepare_env_cmd"
)
SET
(
PREPARE_ENV_TARGET
"prepare_env_target"
)
...
...
src/inc/taoserror.h
浏览文件 @
e3ab7346
...
...
@@ -20,6 +20,9 @@
extern
"C"
{
#endif
#include <stdint.h>
#include <stdbool.h>
#ifdef TAOS_ERROR_C
#define TAOS_DEFINE_ERROR(name, mod, code, msg) {.val = (0x80000000 | ((mod)<<16) | (code)), .str=(msg)},
#else
...
...
src/inc/taosmsg.h
浏览文件 @
e3ab7346
...
...
@@ -319,9 +319,6 @@ typedef struct {
char
reserved
[
16
];
int32_t
sversion
;
SMColumn
schema
[];
SVariableMsg
tags
;
}
SCreateMsg
;
typedef
struct
{
...
...
src/modules/http/src/httpJson.c
浏览文件 @
e3ab7346
...
...
@@ -451,7 +451,7 @@ void httpJsonPairStatus(JsonBuf* buf, int code) {
}
else
if
(
code
==
TSDB_CODE_INVALID_TABLE
)
{
httpJsonPair
(
buf
,
"desc"
,
4
,
"failed to create table"
,
22
);
}
else
httpJsonPair
(
buf
,
"desc"
,
4
,
ts
Error
[
code
],
(
int
)
strlen
(
tsError
[
code
]
));
httpJsonPair
(
buf
,
"desc"
,
4
,
ts
trerror
(
code
),
(
int
)
strlen
(
tstrerror
(
code
)
));
}
}
}
\ No newline at end of file
src/rpc/CMakeLists.txt
浏览文件 @
e3ab7346
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8
)
PROJECT
(
TDengine
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
${
TD_OS_DIR
}
/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/util/inc
)
INCLUDE_DIRECTORIES
(
inc
)
IF
((
TD_LINUX_64
)
OR
(
TD_LINUX_32 AND TD_ARM
))
...
...
src/rpc/src/tudp.c
浏览文件 @
e3ab7346
...
...
@@ -699,10 +699,7 @@ int taosSendPacketViaTcp(uint32_t ip, uint16_t port, char *data, int dataLen, vo
pHead
=
(
STaosHeader
*
)
buffer
;
memcpy
(
pHead
,
data
,
sizeof
(
STaosHeader
));
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wbitfield-constant-conversion"
pHead
->
tcp
=
2
;
#pragma GCC diagnostic pop
msgLen
=
sizeof
(
STaosHeader
);
pHead
->
msgLen
=
(
int32_t
)
htonl
(
msgLen
);
...
...
src/sdb/CMakeLists.txt
浏览文件 @
e3ab7346
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8
)
PROJECT
(
TDengine
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
${
TD_OS_DIR
}
/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/inc
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/util/inc
)
INCLUDE_DIRECTORIES
(
inc
)
IF
((
TD_LINUX_64
)
OR
(
TD_LINUX_32 AND TD_ARM
))
...
...
src/util/inc/tstatus.h
浏览文件 @
e3ab7346
...
...
@@ -25,13 +25,13 @@ extern "C" {
#include "taoserror.h"
enum
_TSDB_VG_STATUS
{
TSDB_VG_STATUS_READY
=
TSDB_CODE_SUCCESS
,
TSDB_VG_STATUS_IN_PROGRESS
=
TSDB_CODE_ACTION_IN_PROGRESS
,
TSDB_VG_STATUS_NO_DISK_PERMISSIONS
=
TSDB_CODE_NO_DISK_PERMISSIONS
,
TSDB_VG_STATUS_SERVER_NO_PACE
=
TSDB_CODE_SERV_NO_DISKSPACE
,
TSDB_VG_STATUS_SERV_OUT_OF_MEMORY
=
TSDB_CODE_SERV_OUT_OF_MEMORY
,
TSDB_VG_STATUS_INIT_FAILED
=
TSDB_CODE_VG_INIT_FAILED
,
TSDB_VG_STATUS_FULL
=
TSDB_CODE_NO_ENOUGH_DNODES
,
TSDB_VG_STATUS_READY
=
TSDB_CODE_SUCCESS
,
TSDB_VG_STATUS_IN_PROGRESS
=
1
,
//
TSDB_CODE_ACTION_IN_PROGRESS,
TSDB_VG_STATUS_NO_DISK_PERMISSIONS
=
73
,
//
TSDB_CODE_NO_DISK_PERMISSIONS,
TSDB_VG_STATUS_SERVER_NO_PACE
=
110
,
//
TSDB_CODE_SERV_NO_DISKSPACE,
TSDB_VG_STATUS_SERV_OUT_OF_MEMORY
=
69
,
//
TSDB_CODE_SERV_OUT_OF_MEMORY,
TSDB_VG_STATUS_INIT_FAILED
=
74
,
//
TSDB_CODE_VG_INIT_FAILED,
TSDB_VG_STATUS_FULL
=
48
,
//
TSDB_CODE_NO_ENOUGH_DNODES,
};
enum
_TSDB_DB_STATUS
{
...
...
src/util/src/tstatus.c
浏览文件 @
e3ab7346
...
...
@@ -18,13 +18,13 @@
const
char
*
taosGetVgroupStatusStr
(
int32_t
vgroupStatus
)
{
switch
(
vgroupStatus
)
{
case
TSDB_VG_STATUS_READY
:
return
ts
Error
[
vgroupStatus
]
;
case
TSDB_VG_STATUS_IN_PROGRESS
:
return
ts
Error
[
vgroupStatus
]
;
case
TSDB_VG_STATUS_NO_DISK_PERMISSIONS
:
return
ts
Error
[
vgroupStatus
]
;
case
TSDB_VG_STATUS_SERVER_NO_PACE
:
return
ts
Error
[
vgroupStatus
]
;
case
TSDB_VG_STATUS_SERV_OUT_OF_MEMORY
:
return
ts
Error
[
vgroupStatus
]
;
case
TSDB_VG_STATUS_INIT_FAILED
:
return
ts
Error
[
vgroupStatus
]
;
case
TSDB_VG_STATUS_FULL
:
return
ts
Error
[
vgroupStatus
]
;
case
TSDB_VG_STATUS_READY
:
return
ts
trerror
(
vgroupStatus
)
;
case
TSDB_VG_STATUS_IN_PROGRESS
:
return
ts
trerror
(
vgroupStatus
)
;
case
TSDB_VG_STATUS_NO_DISK_PERMISSIONS
:
return
ts
trerror
(
vgroupStatus
)
;
case
TSDB_VG_STATUS_SERVER_NO_PACE
:
return
ts
trerror
(
vgroupStatus
)
;
case
TSDB_VG_STATUS_SERV_OUT_OF_MEMORY
:
return
ts
trerror
(
vgroupStatus
)
;
case
TSDB_VG_STATUS_INIT_FAILED
:
return
ts
trerror
(
vgroupStatus
)
;
case
TSDB_VG_STATUS_FULL
:
return
ts
trerror
(
vgroupStatus
)
;
default:
return
"undefined"
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录