Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
怡红公子⭕
TDengine
提交
e83174b3
T
TDengine
项目概览
怡红公子⭕
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
5
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,发现更多精彩内容 >>
未验证
提交
e83174b3
编写于
12月 07, 2019
作者:
J
Jeff Tao
提交者:
GitHub
12月 07, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #880 from taosdata/feature/slguan
Remove compiler warning options
上级
9d8b9691
a20f3ef1
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
15 addition
and
8 deletion
+15
-8
src/inc/sdb.h
src/inc/sdb.h
+1
-1
src/inc/taosmsg.h
src/inc/taosmsg.h
+1
-1
src/rpc/src/trpc.c
src/rpc/src/trpc.c
+11
-4
src/sdb/inc/sdbint.h
src/sdb/inc/sdbint.h
+1
-1
src/sdb/src/sdbEngine.c
src/sdb/src/sdbEngine.c
+1
-1
未找到文件。
src/inc/sdb.h
浏览文件 @
e83174b3
...
...
@@ -105,7 +105,7 @@ extern SSdbPeer *sdbPeer[];
#endif
void
*
sdbOpenTable
(
int
maxRows
,
int32_t
maxRowSize
,
char
*
name
,
char
keyType
,
char
*
directory
,
void
*
sdbOpenTable
(
int
maxRows
,
int32_t
maxRowSize
,
char
*
name
,
uint8_t
keyType
,
char
*
directory
,
void
*
(
*
appTool
)(
char
,
void
*
,
char
*
,
int
,
int
*
));
void
*
sdbGetRow
(
void
*
handle
,
void
*
key
);
...
...
src/inc/taosmsg.h
浏览文件 @
e83174b3
...
...
@@ -664,7 +664,7 @@ typedef struct {
uint32_t
destId
;
char
meterId
[
TSDB_UNI_LEN
];
char
empty
[
3
];
char
msgType
;
uint8_t
msgType
;
int32_t
msgLen
;
uint8_t
content
[
0
];
}
SIntMsg
;
...
...
src/rpc/src/trpc.c
浏览文件 @
e83174b3
...
...
@@ -31,8 +31,6 @@
#include "tutil.h"
#include "lz4.h"
#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
typedef
struct
_msg_node
{
struct
_msg_node
*
next
;
void
*
ahandle
;
...
...
@@ -58,7 +56,7 @@ typedef struct {
uint16_t
tranId
;
// outgoing transcation ID, for build message
uint16_t
outTranId
;
// outgoing transcation ID
uint16_t
inTranId
;
char
outType
;
uint8_t
outType
;
char
inType
;
char
closing
;
char
rspReceived
;
...
...
@@ -203,7 +201,7 @@ static STaosHeader* taosDecompressRpcMsg(STaosHeader* pHeader, SSchedMsg* pSched
//tDump(pHeader->content, msgLen);
if
(
buf
)
{
int32_t
originalLen
=
LZ4_decompress_safe
(
pHeader
->
content
+
overhead
,
buf
+
sizeof
(
STaosHeader
),
int32_t
originalLen
=
LZ4_decompress_safe
(
(
const
char
*
)(
pHeader
->
content
+
overhead
)
,
buf
+
sizeof
(
STaosHeader
),
msgLen
-
overhead
,
contLen
);
memcpy
(
buf
,
pHeader
,
sizeof
(
STaosHeader
));
...
...
@@ -220,6 +218,8 @@ static STaosHeader* taosDecompressRpcMsg(STaosHeader* pHeader, SSchedMsg* pSched
tError
(
"failed to allocate memory to decompress msg, contLen:%d, reason:%s"
,
contLen
,
strerror
(
errno
));
pSchedMsg
->
msg
=
NULL
;
}
return
NULL
;
}
char
*
taosBuildReqHeader
(
void
*
param
,
char
type
,
char
*
msg
)
{
...
...
@@ -245,7 +245,10 @@ char *taosBuildReqHeader(void *param, char type, char *msg) {
pHeader
->
sourceId
=
pConn
->
ownId
;
pHeader
->
destId
=
pConn
->
peerId
;
pHeader
->
port
=
0
;
#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
pHeader
->
uid
=
(
uint32_t
)
pConn
+
(
uint32_t
)
getpid
();
#pragma GCC diagnostic warning "-Wpointer-to-int-cast"
memcpy
(
pHeader
->
meterId
,
pConn
->
meterId
,
tListLen
(
pHeader
->
meterId
));
...
...
@@ -276,7 +279,11 @@ char *taosBuildReqMsgWithSize(void *param, char type, int size) {
pHeader
->
sourceId
=
pConn
->
ownId
;
pHeader
->
destId
=
pConn
->
peerId
;
#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
pHeader
->
uid
=
(
uint32_t
)
pConn
+
(
uint32_t
)
getpid
();
#pragma GCC diagnostic warning "-Wpointer-to-int-cast"
memcpy
(
pHeader
->
meterId
,
pConn
->
meterId
,
tListLen
(
pHeader
->
meterId
));
return
(
char
*
)
pHeader
->
content
;
...
...
src/sdb/inc/sdbint.h
浏览文件 @
e83174b3
...
...
@@ -127,7 +127,7 @@ typedef struct {
}
SMnodeStatus
;
typedef
struct
{
char
dbId
;
uint8_t
dbId
;
char
type
;
uint64_t
version
;
short
dataLen
;
...
...
src/sdb/src/sdbEngine.c
浏览文件 @
e83174b3
...
...
@@ -287,7 +287,7 @@ sdb_exit1:
return
-
1
;
}
void
*
sdbOpenTable
(
int
maxRows
,
int32_t
maxRowSize
,
char
*
name
,
char
keyType
,
char
*
directory
,
void
*
sdbOpenTable
(
int
maxRows
,
int32_t
maxRowSize
,
char
*
name
,
uint8_t
keyType
,
char
*
directory
,
void
*
(
*
appTool
)(
char
,
void
*
,
char
*
,
int
,
int
*
))
{
SSdbTable
*
pTable
=
(
SSdbTable
*
)
malloc
(
sizeof
(
SSdbTable
));
if
(
pTable
==
NULL
)
return
NULL
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录