Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
5ef54236
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
5ef54236
编写于
12月 09, 2019
作者:
S
slguan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TBASE-1299]
上级
5ff6e633
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
19 addition
and
32 deletion
+19
-32
src/client/src/tscFunctionImpl.c
src/client/src/tscFunctionImpl.c
+0
-2
src/client/src/tscParseInsert.c
src/client/src/tscParseInsert.c
+0
-3
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+0
-2
src/system/detail/inc/mgmt.h
src/system/detail/inc/mgmt.h
+1
-1
src/system/detail/src/mgmtShell.c
src/system/detail/src/mgmtShell.c
+0
-2
src/system/lite/src/dnodeMgmt.spec.c
src/system/lite/src/dnodeMgmt.spec.c
+2
-2
src/system/lite/src/mgmtBalance.spec.c
src/system/lite/src/mgmtBalance.spec.c
+1
-1
src/system/lite/src/mgmtDnodeInt.spec.c
src/system/lite/src/mgmtDnodeInt.spec.c
+2
-2
src/system/lite/src/vnodeFile.spec.c
src/system/lite/src/vnodeFile.spec.c
+1
-1
src/util/src/tcompression.c
src/util/src/tcompression.c
+8
-8
src/util/src/tcrc32c.c
src/util/src/tcrc32c.c
+0
-2
src/util/src/textbuffer.c
src/util/src/textbuffer.c
+0
-2
src/util/src/ttokenizer.c
src/util/src/ttokenizer.c
+4
-4
未找到文件。
src/client/src/tscFunctionImpl.c
浏览文件 @
5ef54236
...
@@ -13,8 +13,6 @@
...
@@ -13,8 +13,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/
#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
#include "os.h"
#include "os.h"
#include "taosmsg.h"
#include "taosmsg.h"
#include "tast.h"
#include "tast.h"
...
...
src/client/src/tscParseInsert.c
浏览文件 @
5ef54236
...
@@ -18,9 +18,6 @@
...
@@ -18,9 +18,6 @@
#define _XOPEN_SOURCE
#define _XOPEN_SOURCE
#pragma GCC diagnostic ignored "-Woverflow"
#pragma GCC diagnostic ignored "-Wunused-variable"
#include "os.h"
#include "os.h"
#include "ihash.h"
#include "ihash.h"
#include "tscSecondaryMerge.h"
#include "tscSecondaryMerge.h"
...
...
src/client/src/tscSQLParser.c
浏览文件 @
5ef54236
...
@@ -28,8 +28,6 @@
...
@@ -28,8 +28,6 @@
#include "tsclient.h"
#include "tsclient.h"
#include "tscSQLParser.h"
#include "tscSQLParser.h"
#pragma GCC diagnostic ignored "-Wunused-variable"
#define DEFAULT_PRIMARY_TIMESTAMP_COL_NAME "_c0"
#define DEFAULT_PRIMARY_TIMESTAMP_COL_NAME "_c0"
// -1 is tbname column index, so here use the -2 as the initial value
// -1 is tbname column index, so here use the -2 as the initial value
...
...
src/system/detail/inc/mgmt.h
浏览文件 @
5ef54236
...
@@ -419,7 +419,7 @@ void mgmtCleanupBalance();
...
@@ -419,7 +419,7 @@ void mgmtCleanupBalance();
int
mgmtAllocVnodes
(
SVgObj
*
pVgroup
);
int
mgmtAllocVnodes
(
SVgObj
*
pVgroup
);
void
mgmtSetDnodeShellRemoving
(
SDnodeObj
*
pDnode
);
void
mgmtSetDnodeShellRemoving
(
SDnodeObj
*
pDnode
);
void
mgmtSetDnodeUnRemove
(
SDnodeObj
*
pDnode
);
void
mgmtSetDnodeUnRemove
(
SDnodeObj
*
pDnode
);
void
mgmtStartBalanceTimer
(
int
mseconds
);
void
mgmtStartBalanceTimer
(
int
64_t
mseconds
);
void
mgmtSetDnodeOfflineOnSdbChanged
();
void
mgmtSetDnodeOfflineOnSdbChanged
();
void
mgmtUpdateVgroupState
(
SVgObj
*
pVgroup
,
int
lbStatus
,
int
srcIp
);
void
mgmtUpdateVgroupState
(
SVgObj
*
pVgroup
,
int
lbStatus
,
int
srcIp
);
bool
mgmtAddVnode
(
SVgObj
*
pVgroup
,
SDnodeObj
*
pSrcDnode
,
SDnodeObj
*
pDestDnode
);
bool
mgmtAddVnode
(
SVgObj
*
pVgroup
,
SDnodeObj
*
pSrcDnode
,
SDnodeObj
*
pDestDnode
);
...
...
src/system/detail/src/mgmtShell.c
浏览文件 @
5ef54236
...
@@ -1363,5 +1363,3 @@ void mgmtInitProcessShellMsg() {
...
@@ -1363,5 +1363,3 @@ void mgmtInitProcessShellMsg() {
mgmtProcessShellMsg
[
TSDB_MSG_TYPE_KILL_STREAM
]
=
mgmtProcessKillStreamMsg
;
mgmtProcessShellMsg
[
TSDB_MSG_TYPE_KILL_STREAM
]
=
mgmtProcessKillStreamMsg
;
mgmtProcessShellMsg
[
TSDB_MSG_TYPE_KILL_CONNECTION
]
=
mgmtProcessKillConnectionMsg
;
mgmtProcessShellMsg
[
TSDB_MSG_TYPE_KILL_CONNECTION
]
=
mgmtProcessKillConnectionMsg
;
}
}
#pragma GCC diagnostic pop
src/system/lite/src/dnodeMgmt.spec.c
浏览文件 @
5ef54236
...
@@ -50,7 +50,7 @@ char *taosBuildReqMsgToMnode(SMgmtObj *pObj, char type) {
...
@@ -50,7 +50,7 @@ char *taosBuildReqMsgToMnode(SMgmtObj *pObj, char type) {
}
}
int
taosSendMsgToMnode
(
SMgmtObj
*
pObj
,
char
*
msg
,
int
msgLen
)
{
int
taosSendMsgToMnode
(
SMgmtObj
*
pObj
,
char
*
msg
,
int
msgLen
)
{
dTrace
(
"msg:%s is sent to mnode"
,
taosMsg
[
*
(
msg
-
1
)]);
dTrace
(
"msg:%s is sent to mnode"
,
taosMsg
[
(
uint8_t
)(
*
(
msg
-
1
)
)]);
/*
/*
* Lite version has no message header, so minus one
* Lite version has no message header, so minus one
...
@@ -81,7 +81,7 @@ void vnodeProcessMsgFromMgmtSpec(SSchedMsg *sched) {
...
@@ -81,7 +81,7 @@ void vnodeProcessMsgFromMgmtSpec(SSchedMsg *sched) {
char
msgType
=
*
sched
->
msg
;
char
msgType
=
*
sched
->
msg
;
char
*
content
=
sched
->
msg
+
1
;
char
*
content
=
sched
->
msg
+
1
;
dTrace
(
"msg:%s is received from mgmt"
,
taosMsg
[
msgType
]);
dTrace
(
"msg:%s is received from mgmt"
,
taosMsg
[
(
uint8_t
)
msgType
]);
vnodeProcessMsgFromMgmt
(
content
,
0
,
msgType
,
0
);
vnodeProcessMsgFromMgmt
(
content
,
0
,
msgType
,
0
);
...
...
src/system/lite/src/mgmtBalance.spec.c
浏览文件 @
5ef54236
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
#include "mgmtBalance.h"
#include "mgmtBalance.h"
#include "tstatus.h"
#include "tstatus.h"
void
mgmtStartBalanceTimer
(
int
mseconds
)
{}
void
mgmtStartBalanceTimer
(
int
64_t
mseconds
)
{}
int
mgmtInitBalance
()
{
return
0
;
}
int
mgmtInitBalance
()
{
return
0
;
}
...
...
src/system/lite/src/mgmtDnodeInt.spec.c
浏览文件 @
5ef54236
...
@@ -61,7 +61,7 @@ char *taosBuildReqMsgToDnode(SDnodeObj *pObj, char type) {
...
@@ -61,7 +61,7 @@ char *taosBuildReqMsgToDnode(SDnodeObj *pObj, char type) {
int
taosSendSimpleRspToDnode
(
SDnodeObj
*
pObj
,
char
rsptype
,
char
code
)
{
return
0
;
}
int
taosSendSimpleRspToDnode
(
SDnodeObj
*
pObj
,
char
rsptype
,
char
code
)
{
return
0
;
}
int
taosSendMsgToDnode
(
SDnodeObj
*
pObj
,
char
*
msg
,
int
msgLen
)
{
int
taosSendMsgToDnode
(
SDnodeObj
*
pObj
,
char
*
msg
,
int
msgLen
)
{
mTrace
(
"msg:%s is sent to dnode"
,
taosMsg
[
*
(
msg
-
1
)]);
mTrace
(
"msg:%s is sent to dnode"
,
taosMsg
[
(
uint8_t
)(
*
(
msg
-
1
)
)]);
/*
/*
* Lite version has no message header, so minus one
* Lite version has no message header, so minus one
...
@@ -142,7 +142,7 @@ void mgmtProcessDnodeStatus(void *handle, void *tmrId) {
...
@@ -142,7 +142,7 @@ void mgmtProcessDnodeStatus(void *handle, void *tmrId) {
void
mgmtProcessMsgFromDnodeSpec
(
SSchedMsg
*
sched
)
{
void
mgmtProcessMsgFromDnodeSpec
(
SSchedMsg
*
sched
)
{
char
msgType
=
*
sched
->
msg
;
char
msgType
=
*
sched
->
msg
;
char
*
content
=
sched
->
msg
+
1
;
char
*
content
=
sched
->
msg
+
1
;
mTrace
(
"msg:%s is received from dnode"
,
taosMsg
[
msgType
]);
mTrace
(
"msg:%s is received from dnode"
,
taosMsg
[
(
uint8_t
)
msgType
]);
mgmtProcessMsgFromDnode
(
content
,
0
,
msgType
,
mgmtGetDnode
(
0
));
mgmtProcessMsgFromDnode
(
content
,
0
,
msgType
,
mgmtGetDnode
(
0
));
free
(
sched
->
msg
);
free
(
sched
->
msg
);
...
...
src/system/lite/src/vnodeFile.spec.c
浏览文件 @
5ef54236
...
@@ -24,7 +24,7 @@ char* vnodeGetDataDir(int vnode, int fileId) { return dataDir; }
...
@@ -24,7 +24,7 @@ char* vnodeGetDataDir(int vnode, int fileId) { return dataDir; }
void
vnodeAdustVnodeFile
(
SVnodeObj
*
pVnode
)
{
void
vnodeAdustVnodeFile
(
SVnodeObj
*
pVnode
)
{
// Retention policy here
// Retention policy here
int
fileId
=
pVnode
->
fileId
-
pVnode
->
numOfFiles
+
1
;
int
fileId
=
pVnode
->
fileId
-
pVnode
->
numOfFiles
+
1
;
int
cfile
=
taosGetTimestamp
(
pVnode
->
cfg
.
precision
)
/
pVnode
->
cfg
.
daysPerFile
/
tsMsPerDay
[
pVnode
->
cfg
.
precision
];
int
cfile
=
taosGetTimestamp
(
pVnode
->
cfg
.
precision
)
/
pVnode
->
cfg
.
daysPerFile
/
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
];
while
(
fileId
<=
cfile
-
pVnode
->
maxFiles
)
{
while
(
fileId
<=
cfile
-
pVnode
->
maxFiles
)
{
vnodeRemoveFile
(
pVnode
->
vnode
,
fileId
);
vnodeRemoveFile
(
pVnode
->
vnode
,
fileId
);
pVnode
->
numOfFiles
--
;
pVnode
->
numOfFiles
--
;
...
...
src/util/src/tcompression.c
浏览文件 @
5ef54236
...
@@ -355,16 +355,16 @@ int tsCompressINTImp(const char *const input, const int nelements, char *const o
...
@@ -355,16 +355,16 @@ int tsCompressINTImp(const char *const input, const int nelements, char *const o
tmp_bit
=
(
LONG_BYTES
*
BITS_PER_BYTE
)
-
BUILDIN_CLZL
(
zigzag_value
);
tmp_bit
=
(
LONG_BYTES
*
BITS_PER_BYTE
)
-
BUILDIN_CLZL
(
zigzag_value
);
}
}
if
(
elems
+
1
<=
selector_to_elems
[
selector
]
&&
elems
+
1
<=
selector_to_elems
[
bit_to_selector
[
tmp_bit
]])
{
if
(
elems
+
1
<=
selector_to_elems
[
(
uint8_t
)
selector
]
&&
elems
+
1
<=
selector_to_elems
[(
uint8_t
)
bit_to_selector
[(
uint8_t
)
tmp_bit
]])
{
// If can hold another one.
// If can hold another one.
selector
=
selector
>
bit_to_selector
[
tmp_bit
]
?
selector
:
bit_to_selector
[
tmp_bit
];
selector
=
selector
>
bit_to_selector
[
(
uint8_t
)
tmp_bit
]
?
selector
:
bit_to_selector
[(
uint8_t
)
tmp_bit
];
elems
++
;
elems
++
;
bit
=
bit_per_integer
[
selector
];
bit
=
bit_per_integer
[
(
uint8_t
)
selector
];
}
else
{
}
else
{
// if cannot hold another one.
// if cannot hold another one.
while
(
elems
<
selector_to_elems
[
selector
])
selector
++
;
while
(
elems
<
selector_to_elems
[
(
uint8_t
)
selector
])
selector
++
;
elems
=
selector_to_elems
[
selector
];
elems
=
selector_to_elems
[
(
uint8_t
)
selector
];
bit
=
bit_per_integer
[
selector
];
bit
=
bit_per_integer
[
(
uint8_t
)
selector
];
break
;
break
;
}
}
prev_value_tmp
=
curr_value
;
prev_value_tmp
=
curr_value
;
...
@@ -455,8 +455,8 @@ int tsDecompressINTImp(const char *const input, const int nelements, char *const
...
@@ -455,8 +455,8 @@ int tsDecompressINTImp(const char *const input, const int nelements, char *const
memcpy
(
&
w
,
ip
,
LONG_BYTES
);
memcpy
(
&
w
,
ip
,
LONG_BYTES
);
char
selector
=
(
char
)(
w
&
INT64MASK
(
4
));
// selector = 4
char
selector
=
(
char
)(
w
&
INT64MASK
(
4
));
// selector = 4
char
bit
=
bit_per_integer
[
selector
];
// bit = 3
char
bit
=
bit_per_integer
[
(
uint8_t
)
selector
];
// bit = 3
int
elems
=
selector_to_elems
[
selector
];
int
elems
=
selector_to_elems
[
(
uint8_t
)
selector
];
for
(
int
i
=
0
;
i
<
elems
;
i
++
)
{
for
(
int
i
=
0
;
i
<
elems
;
i
++
)
{
uint64_t
zigzag_value
;
uint64_t
zigzag_value
;
...
...
src/util/src/tcrc32c.c
浏览文件 @
5ef54236
...
@@ -25,8 +25,6 @@
...
@@ -25,8 +25,6 @@
#include <stdlib.h>
#include <stdlib.h>
#include "tcrc32c.h"
#include "tcrc32c.h"
//todo : use the original source code
//#pragma GCC diagnostic ignored "-Wunused-function"
#define POLY 0x82f63b78
#define POLY 0x82f63b78
#define LONG_SHIFT 8192
#define LONG_SHIFT 8192
...
...
src/util/src/textbuffer.c
浏览文件 @
5ef54236
...
@@ -23,8 +23,6 @@
...
@@ -23,8 +23,6 @@
#include "ttypes.h"
#include "ttypes.h"
#include "tutil.h"
#include "tutil.h"
//#pragma GCC diagnostic ignored "-Wformat"
#define COLMODEL_GET_VAL(data, schema, allrow, rowId, colId) \
#define COLMODEL_GET_VAL(data, schema, allrow, rowId, colId) \
(data + (schema)->colOffset[colId] * (allrow) + (rowId) * (schema)->pFields[colId].bytes)
(data + (schema)->colOffset[colId] * (allrow) + (rowId) * (schema)->pFields[colId].bytes)
...
...
src/util/src/ttokenizer.c
浏览文件 @
5ef54236
...
@@ -510,7 +510,7 @@ uint32_t tSQLGetToken(char* z, uint32_t* tokenType) {
...
@@ -510,7 +510,7 @@ uint32_t tSQLGetToken(char* z, uint32_t* tokenType) {
if
((
z
[
i
]
==
'a'
||
z
[
i
]
==
's'
||
z
[
i
]
==
'm'
||
z
[
i
]
==
'h'
||
z
[
i
]
==
'd'
||
z
[
i
]
==
'n'
||
z
[
i
]
==
'y'
||
if
((
z
[
i
]
==
'a'
||
z
[
i
]
==
's'
||
z
[
i
]
==
'm'
||
z
[
i
]
==
'h'
||
z
[
i
]
==
'd'
||
z
[
i
]
==
'n'
||
z
[
i
]
==
'y'
||
z
[
i
]
==
'w'
||
z
[
i
]
==
'A'
||
z
[
i
]
==
'S'
||
z
[
i
]
==
'M'
||
z
[
i
]
==
'H'
||
z
[
i
]
==
'D'
||
z
[
i
]
==
'N'
||
z
[
i
]
==
'w'
||
z
[
i
]
==
'A'
||
z
[
i
]
==
'S'
||
z
[
i
]
==
'M'
||
z
[
i
]
==
'H'
||
z
[
i
]
==
'D'
||
z
[
i
]
==
'N'
||
z
[
i
]
==
'Y'
||
z
[
i
]
==
'W'
)
&&
z
[
i
]
==
'Y'
||
z
[
i
]
==
'W'
)
&&
(
isIdChar
[
z
[
i
+
1
]]
==
0
))
{
(
isIdChar
[
(
uint8_t
)
z
[
i
+
1
]]
==
0
))
{
*
tokenType
=
TK_VARIABLE
;
*
tokenType
=
TK_VARIABLE
;
i
+=
1
;
i
+=
1
;
return
i
;
return
i
;
...
@@ -551,7 +551,7 @@ uint32_t tSQLGetToken(char* z, uint32_t* tokenType) {
...
@@ -551,7 +551,7 @@ uint32_t tSQLGetToken(char* z, uint32_t* tokenType) {
case
't'
:
case
't'
:
case
'F'
:
case
'F'
:
case
'f'
:
{
case
'f'
:
{
for
(
i
=
1
;
((
z
[
i
]
&
0x80
)
==
0
)
&&
isIdChar
[
z
[
i
]];
i
++
)
{
for
(
i
=
1
;
((
z
[
i
]
&
0x80
)
==
0
)
&&
isIdChar
[
(
uint8_t
)
z
[
i
]];
i
++
)
{
}
}
if
((
i
==
4
&&
strncasecmp
(
z
,
"true"
,
4
)
==
0
)
||
(
i
==
5
&&
strncasecmp
(
z
,
"false"
,
5
)
==
0
))
{
if
((
i
==
4
&&
strncasecmp
(
z
,
"true"
,
4
)
==
0
)
||
(
i
==
5
&&
strncasecmp
(
z
,
"false"
,
5
)
==
0
))
{
...
@@ -560,10 +560,10 @@ uint32_t tSQLGetToken(char* z, uint32_t* tokenType) {
...
@@ -560,10 +560,10 @@ uint32_t tSQLGetToken(char* z, uint32_t* tokenType) {
}
}
}
}
default:
{
default:
{
if
(((
*
z
&
0x80
)
!=
0
)
||
!
isIdChar
[
*
z
])
{
if
(((
*
z
&
0x80
)
!=
0
)
||
!
isIdChar
[
(
uint8_t
)(
*
z
)
])
{
break
;
break
;
}
}
for
(
i
=
1
;
((
z
[
i
]
&
0x80
)
==
0
)
&&
isIdChar
[
z
[
i
]];
i
++
)
{
for
(
i
=
1
;
((
z
[
i
]
&
0x80
)
==
0
)
&&
isIdChar
[
(
uint8_t
)
z
[
i
]];
i
++
)
{
}
}
*
tokenType
=
tSQLKeywordCode
(
z
,
i
);
*
tokenType
=
tSQLKeywordCode
(
z
,
i
);
return
i
;
return
i
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录