Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
~笨蛋陪你哭
TDengine
提交
5ff6e633
T
TDengine
项目概览
~笨蛋陪你哭
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
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,发现更多精彩内容 >>
提交
5ff6e633
编写于
12月 09, 2019
作者:
S
slguan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TBASE-1299]
上级
4af36698
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
16 addition
and
45 deletion
+16
-45
src/inc/tutil.h
src/inc/tutil.h
+2
-2
src/kit/taosdemo/taosdemo.c
src/kit/taosdemo/taosdemo.c
+0
-2
src/rpc/src/trpc.c
src/rpc/src/trpc.c
+2
-6
src/system/detail/src/dnodeSystem.c
src/system/detail/src/dnodeSystem.c
+0
-5
src/system/detail/src/mgmtShell.c
src/system/detail/src/mgmtShell.c
+5
-10
src/system/detail/src/vnodeMeter.c
src/system/detail/src/vnodeMeter.c
+0
-2
src/system/detail/src/vnodeRead.c
src/system/detail/src/vnodeRead.c
+5
-7
src/system/detail/src/vnodeShell.c
src/system/detail/src/vnodeShell.c
+2
-3
src/system/detail/src/vnodeStore.c
src/system/detail/src/vnodeStore.c
+0
-6
src/system/detail/src/vnodeUtil.c
src/system/detail/src/vnodeUtil.c
+0
-2
未找到文件。
src/inc/tutil.h
浏览文件 @
5ff6e633
...
...
@@ -37,8 +37,8 @@ extern "C" {
#define tfree(x) \
{ \
if (x) { \
free(
x
); \
x =
NULL
; \
free(
(void*)(x)
); \
x =
0
; \
} \
}
...
...
src/kit/taosdemo/taosdemo.c
浏览文件 @
5ff6e633
...
...
@@ -33,8 +33,6 @@
extern
char
configDir
[];
#pragma GCC diagnostic ignored "-Wmissing-braces"
#define BUFFER_SIZE 65536
#define MAX_DB_NAME_SIZE 64
#define MAX_TB_NAME_SIZE 64
...
...
src/rpc/src/trpc.c
浏览文件 @
5ff6e633
...
...
@@ -246,9 +246,7 @@ char *taosBuildReqHeader(void *param, char type, char *msg) {
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"
pHeader
->
uid
=
(
uint32_t
)((
int64_t
)
pConn
+
(
int64_t
)
getpid
());
memcpy
(
pHeader
->
meterId
,
pConn
->
meterId
,
tListLen
(
pHeader
->
meterId
));
...
...
@@ -280,9 +278,7 @@ 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"
pHeader
->
uid
=
(
uint32_t
)((
int64_t
)
pConn
+
(
int64_t
)
getpid
());
memcpy
(
pHeader
->
meterId
,
pConn
->
meterId
,
tListLen
(
pHeader
->
meterId
));
...
...
src/system/detail/src/dnodeSystem.c
浏览文件 @
5ff6e633
...
...
@@ -26,9 +26,6 @@
#include "tglobalcfg.h"
#include "vnode.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Woverflow"
SModule
tsModule
[
TSDB_MOD_MAX
]
=
{
0
};
uint32_t
tsModuleStatus
=
0
;
pthread_mutex_t
dmutex
;
...
...
@@ -219,5 +216,3 @@ void dnodeCountRequest(SCountInfo *info) {
info
->
selectReqNum
=
atomic_exchange_32
(
&
vnodeSelectReqNum
,
0
);
info
->
insertReqNum
=
atomic_exchange_32
(
&
vnodeInsertReqNum
,
0
);
}
#pragma GCC diagnostic pop
\ No newline at end of file
src/system/detail/src/mgmtShell.c
浏览文件 @
5ff6e633
...
...
@@ -23,12 +23,6 @@
#include "tlog.h"
#include "tstatus.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Woverflow"
#pragma GCC diagnostic ignored "-Wpointer-sign"
#pragma GCC diagnostic ignored "-Wint-conversion"
#define MAX_LEN_OF_METER_META (sizeof(SMultiMeterMeta) + sizeof(SSchema) * TSDB_MAX_COLUMNS + sizeof(SSchema) * TSDB_MAX_TAGS + TSDB_MAX_TAGS_LEN)
void
*
pShellConn
=
NULL
;
...
...
@@ -695,7 +689,7 @@ int mgmtProcessAlterUserMsg(char *pMsg, int msgLen, SConnObj *pConn) {
(
strcmp
(
pConn
->
pUser
->
user
,
"root"
)
==
0
))
{
if
((
pAlter
->
flag
&
TSDB_ALTER_USER_PASSWD
)
!=
0
)
{
memset
(
pUser
->
pass
,
0
,
sizeof
(
pUser
->
pass
));
taosEncryptPass
(
pAlter
->
pass
,
strlen
(
pAlter
->
pass
),
pUser
->
pass
);
taosEncryptPass
(
(
uint8_t
*
)
pAlter
->
pass
,
strlen
(
pAlter
->
pass
),
pUser
->
pass
);
}
if
((
pAlter
->
flag
&
TSDB_ALTER_USER_PRIVILEGES
)
!=
0
)
{
if
(
pAlter
->
privilege
==
1
)
{
// super
...
...
@@ -931,7 +925,7 @@ int mgmtProcessRetrieveMsg(char *pMsg, int msgLen, SConnObj *pConn) {
taosSendMsgToPeer
(
pConn
->
thandle
,
pStart
,
msgLen
);
if
(
rowsToRead
==
0
)
{
uintptr_t
oldSign
=
atomic_val_compare_exchange_ptr
(
&
pShow
->
signature
,
pShow
,
0
);
uintptr_t
oldSign
=
(
uintptr_t
)
atomic_val_compare_exchange_ptr
(
&
pShow
->
signature
,
pShow
,
0
);
if
(
oldSign
!=
(
uintptr_t
)
pShow
)
{
return
msgLen
;
}
...
...
@@ -1139,8 +1133,9 @@ void mgmtEstablishConn(SConnObj *pConn) {
}
}
uint32_t
temp
;
taosGetRpcConnInfo
(
pConn
->
thandle
,
&
temp
,
&
pConn
->
ip
,
&
pConn
->
port
,
&
temp
,
&
temp
);
int32_t
tempint32
;
uint32_t
tempuint32
;
taosGetRpcConnInfo
(
pConn
->
thandle
,
&
tempuint32
,
&
pConn
->
ip
,
&
pConn
->
port
,
&
tempint32
,
&
tempint32
);
mgmtAddConnIntoAcct
(
pConn
);
}
...
...
src/system/detail/src/vnodeMeter.c
浏览文件 @
5ff6e633
...
...
@@ -26,8 +26,6 @@
#include "vnodeUtil.h"
#include "tstatus.h"
#pragma GCC diagnostic ignored "-Wpointer-sign"
#define VALID_TIMESTAMP(key, curKey, prec) (((key) >= 0) && ((key) <= ((curKey) + 36500 * tsMsPerDay[prec])))
int
tsMeterSizeOnFile
;
...
...
src/system/detail/src/vnodeRead.c
浏览文件 @
5ff6e633
...
...
@@ -26,8 +26,6 @@
#include "vnodeRead.h"
#include "vnodeUtil.h"
#pragma GCC diagnostic ignored "-Wint-conversion"
int
(
*
pQueryFunc
[])(
SMeterObj
*
,
SQuery
*
)
=
{
vnodeQueryFromCache
,
vnodeQueryFromFile
};
int
vnodeInterpolationSearchKey
(
char
*
pValue
,
int
num
,
TSKEY
key
,
int
order
)
{
...
...
@@ -1003,8 +1001,9 @@ int32_t vnodeConvertQueryMeterMsg(SQueryMeterMsg *pQueryMsg) {
if
(
pDestFilterInfo
->
filterOnBinary
)
{
pDestFilterInfo
->
len
=
htobe64
(
pFilterInfo
->
len
);
pDestFilterInfo
->
pz
=
calloc
(
1
,
pDestFilterInfo
->
len
+
1
);
memcpy
(
pDestFilterInfo
->
pz
,
pMsg
,
pDestFilterInfo
->
len
+
1
);
pDestFilterInfo
->
pz
=
(
int64_t
)
calloc
(
1
,
pDestFilterInfo
->
len
+
1
);
memcpy
((
void
*
)
pDestFilterInfo
->
pz
,
pMsg
,
pDestFilterInfo
->
len
+
1
);
pMsg
+=
(
pDestFilterInfo
->
len
+
1
);
}
else
{
pDestFilterInfo
->
lowerBndi
=
htobe64
(
pFilterInfo
->
lowerBndi
);
...
...
@@ -1022,8 +1021,7 @@ int32_t vnodeConvertQueryMeterMsg(SQueryMeterMsg *pQueryMsg) {
* 1. simple projection query on meters, we only record the pSqlFuncExprs[i].colIdx value
* 2. for complex queries, whole SqlExprs object is required.
*/
pQueryMsg
->
pSqlFuncExprs
=
malloc
(
POINTER_BYTES
*
pQueryMsg
->
numOfOutputCols
);
pQueryMsg
->
pSqlFuncExprs
=
(
int64_t
)
malloc
(
POINTER_BYTES
*
pQueryMsg
->
numOfOutputCols
);
SSqlFuncExprMsg
*
pExprMsg
=
(
SSqlFuncExprMsg
*
)
pMsg
;
for
(
int32_t
i
=
0
;
i
<
pQueryMsg
->
numOfOutputCols
;
++
i
)
{
...
...
@@ -1070,7 +1068,7 @@ int32_t vnodeConvertQueryMeterMsg(SQueryMeterMsg *pQueryMsg) {
pQueryMsg
->
colNameLen
=
htonl
(
pQueryMsg
->
colNameLen
);
if
(
hasArithmeticFunction
)
{
// column name array
assert
(
pQueryMsg
->
colNameLen
>
0
);
pQueryMsg
->
colNameList
=
pMsg
;
pQueryMsg
->
colNameList
=
(
int64_t
)
pMsg
;
pMsg
+=
pQueryMsg
->
colNameLen
;
}
...
...
src/system/detail/src/vnodeShell.c
浏览文件 @
5ff6e633
...
...
@@ -30,7 +30,6 @@
#include "vnodeStore.h"
#include "tstatus.h"
#pragma GCC diagnostic ignored "-Wint-conversion"
extern
int
tsMaxQueues
;
void
*
pShellServer
=
NULL
;
...
...
@@ -390,7 +389,7 @@ _query_over:
tfree
(
pMeterObjList
);
ret
=
vnodeSendQueryRspMsg
(
pObj
,
code
,
pObj
->
qhandle
);
free
(
pQueryMsg
->
pSidExtInfo
);
t
free
(
pQueryMsg
->
pSidExtInfo
);
for
(
int32_t
i
=
0
;
i
<
pQueryMsg
->
numOfCols
;
++
i
)
{
vnodeFreeColumnInfo
(
&
pQueryMsg
->
colList
[
i
]);
}
...
...
@@ -455,7 +454,7 @@ void vnodeExecuteRetrieveReq(SSchedMsg *pSched) {
pRsp
->
precision
=
htons
(
timePrec
);
if
(
code
==
TSDB_CODE_SUCCESS
)
{
pRsp
->
offset
=
htobe64
(
vnodeGetOffsetVal
(
pRetrieve
->
qhandle
));
pRsp
->
offset
=
htobe64
(
vnodeGetOffsetVal
(
(
void
*
)
pRetrieve
->
qhandle
));
pRsp
->
useconds
=
htobe64
(((
SQInfo
*
)(
pRetrieve
->
qhandle
))
->
useconds
);
}
else
{
pRsp
->
offset
=
0
;
...
...
src/system/detail/src/vnodeStore.c
浏览文件 @
5ff6e633
...
...
@@ -24,9 +24,6 @@
#include "vnodeUtil.h"
#include "tstatus.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic warning "-Woverflow"
int
tsMaxVnode
=
-
1
;
int
tsOpenVnodes
=
0
;
SVnodeObj
*
vnodeList
=
NULL
;
...
...
@@ -386,6 +383,3 @@ void vnodeCalcOpenVnodes() {
void
vnodeUpdateHeadFile
(
int
vnode
,
int
oldTables
,
int
newTables
)
{
//todo rewrite the head file with newTables
}
#pragma GCC diagnostic pop
src/system/detail/src/vnodeUtil.c
浏览文件 @
5ff6e633
...
...
@@ -23,8 +23,6 @@
#include "vnodeDataFilterFunc.h"
#include "vnodeUtil.h"
#pragma GCC diagnostic ignored "-Wint-conversion"
int
vnodeCheckFileIntegrity
(
FILE
*
fp
)
{
/*
int savedSessions, savedMeterSize;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录