Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
4fb57298
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
4fb57298
编写于
8月 12, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/develop' into feature/os
上级
94d0aa19
d63c90b5
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
10 addition
and
17 deletion
+10
-17
src/inc/taosdef.h
src/inc/taosdef.h
+1
-0
src/plugins/monitor/src/monitorMain.c
src/plugins/monitor/src/monitorMain.c
+1
-1
src/query/src/qExecutor.c
src/query/src/qExecutor.c
+1
-1
src/tsdb/src/tsdbRead.c
src/tsdb/src/tsdbRead.c
+2
-10
src/util/src/version.c
src/util/src/version.c
+5
-5
未找到文件。
src/inc/taosdef.h
浏览文件 @
4fb57298
...
...
@@ -242,6 +242,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
#define TSDB_MAX_BYTES_PER_ROW 16384
#define TSDB_MAX_TAGS_LEN 16384
#define TSDB_MAX_TAGS 128
#define TSDB_MAX_TAG_CONDITIONS 1024
#define TSDB_AUTH_LEN 16
#define TSDB_KEY_LEN 16
...
...
src/plugins/monitor/src/monitorMain.c
浏览文件 @
4fb57298
...
...
@@ -35,7 +35,7 @@
#define SQL_LENGTH 1024
#define LOG_LEN_STR 100
#define IP_LEN_STR
18
#define IP_LEN_STR
TSDB_EP_LEN
#define CHECK_INTERVAL 1000
typedef
enum
{
...
...
src/query/src/qExecutor.c
浏览文件 @
4fb57298
...
...
@@ -5547,7 +5547,7 @@ static int32_t buildAirthmeticExprFromMsg(SExprInfo *pArithExprInfo, SQueryTable
qDebug
(
"qmsg:%p create arithmetic expr from binary string: %s"
,
pQueryMsg
,
pArithExprInfo
->
base
.
arg
[
0
].
argValue
.
pz
);
tExprNode
*
pExprNode
=
NULL
;
TRY
(
TSDB_MAX_TAGS
)
{
TRY
(
TSDB_MAX_TAG
_CONDITION
S
)
{
pExprNode
=
exprTreeFromBinary
(
pArithExprInfo
->
base
.
arg
[
0
].
argValue
.
pz
,
pArithExprInfo
->
base
.
arg
[
0
].
argBytes
);
}
CATCH
(
code
)
{
CLEANUP_EXECUTE
();
...
...
src/tsdb/src/tsdbRead.c
浏览文件 @
4fb57298
...
...
@@ -1115,14 +1115,6 @@ static void doMergeTwoLevelData(STsdbQueryHandle* pQueryHandle, STableCheckInfo*
TSKEY
*
tsArray
=
pCols
->
cols
[
0
].
pData
;
if
(
ASCENDING_TRAVERSE
(
pQueryHandle
->
order
))
{
TSKEY
s
=
tsArray
[
cur
->
pos
];
assert
(
s
>=
pQueryHandle
->
window
.
skey
&&
s
<=
pQueryHandle
->
window
.
ekey
);
}
else
{
TSKEY
s
=
tsArray
[
cur
->
pos
];
assert
(
s
<=
pQueryHandle
->
window
.
skey
&&
s
>=
pQueryHandle
->
window
.
ekey
);
}
// for search the endPos, so the order needs to reverse
int32_t
order
=
(
pQueryHandle
->
order
==
TSDB_ORDER_ASC
)
?
TSDB_ORDER_DESC
:
TSDB_ORDER_ASC
;
...
...
@@ -2381,7 +2373,7 @@ int32_t tsdbQuerySTableByTagCond(TSDB_REPO_T* tsdb, uint64_t uid, TSKEY skey, co
int32_t
ret
=
TSDB_CODE_SUCCESS
;
tExprNode
*
expr
=
NULL
;
TRY
(
TSDB_MAX_TAGS
)
{
TRY
(
TSDB_MAX_TAG
_CONDITION
S
)
{
expr
=
exprTreeFromTableName
(
tbnameCond
);
if
(
expr
==
NULL
)
{
expr
=
exprTreeFromBinary
(
pTagCond
,
len
);
...
...
@@ -2575,4 +2567,4 @@ static int tsdbCheckInfoCompar(const void* key1, const void* key2) {
ASSERT
(
false
);
return
0
;
}
}
\ No newline at end of file
}
src/util/src/version.c
浏览文件 @
4fb57298
char
version
[
12
]
=
"2.0.0.
0
"
;
char
version
[
12
]
=
"2.0.0.
6
"
;
char
compatible_version
[
12
]
=
"2.0.0.0"
;
char
gitinfo
[
48
]
=
"
8df8b7d9930342dd34ba13df160a7d538fad7bc7
"
;
char
gitinfoOfInternal
[
48
]
=
"
bad4f040145fba581d1ab0c5dd718a5ede3e209
f"
;
char
buildinfo
[
64
]
=
"Built by
root at 2020-08-03 17:23
"
;
char
gitinfo
[
48
]
=
"
e9a20fafbe9e3b0b12cbdf55604163b4b9a41b41
"
;
char
gitinfoOfInternal
[
48
]
=
"
dd679db0b9edeedad68574c1e031544711a9831
f"
;
char
buildinfo
[
64
]
=
"Built by
at 2020-08-12 07:59
"
;
void
libtaos_2_0_0_
0
_Linux_x64
()
{};
void
libtaos_2_0_0_
6
_Linux_x64
()
{};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录