Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
b1f85ec0
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1187
Star
22018
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看板
提交
b1f85ec0
编写于
4年前
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[td-225] fix bugs in sliding query
上级
1761b011
Branches不可用
ver
ver-3.1.0.2
ver-3.1.0.1
ver-3.1.0.0
ver-3.0.7.8
ver-3.0.7.1
ver-3.0.7.0
ver-3.0.6.1
ver-3.0.6.0
ver-3.0.5.1
ver-3.0.5.0
ver-3.0.4.2
ver-3.0.4.1
ver-3.0.4.0
ver-3.0.3.2
ver-3.0.3.1
ver-3.0.3.0
ver-3.0.2.220221228
ver-3.0.2.20221226
ver-3.0.2.20105
ver-3.0.2.6
ver-3.0.2.5
ver-3.0.2.4
ver-3.0.2.3
ver-3.0.2.2
ver-3.0.2.1
ver-3.0.2.0
ver-3.0.1.8
ver-3.0.1.7
ver-3.0.1.6
ver-3.0.1.5
ver-3.0.1.4
ver-3.0.1.3
ver-3.0.1.2
ver-3.0.1.1
ver-3.0.1.0
ver-3.0.0.2
ver-3.0.0.1
ver-3.0.0.0
ver-2.6.0.99
ver-2.6.0.63
ver-2.6.0.61
ver-2.6.0.59
ver-2.6.0.57
ver-2.6.0.55
ver-2.6.0.53
ver-2.6.0.51
ver-2.6.0.49
ver-2.6.0.47
ver-2.6.0.45
ver-2.6.0.44
ver-2.6.0.43
ver-2.6.0.41
ver-2.6.0.39
ver-2.6.0.38
ver-2.6.0.36
ver-2.6.0.35
ver-2.6.0.34
ver-2.6.0.33
ver-2.6.0.32
ver-2.6.0.31
ver-2.6.0.30
ver-2.6.0.28
ver-2.6.0.27
ver-2.6.0.25
ver-2.6.0.24
ver-2.6.0.22
ver-2.6.0.21
ver-2.6.0.19
ver-2.6.0.18
ver-2.6.0.17
ver-2.6.0.16
ver-2.6.0.15
ver-2.6.0.14
ver-2.6.0.12
ver-2.6.0.10
ver-2.6.0.8
ver-2.6.0.7
ver-2.6.0.6
ver-2.6.0.4
ver-2.6.0.3-kh
ver-2.6.0.1
ver-2.6.0.0
ver-2.5.0.1
ver-2.5.0.0
ver-2.4.0.43
ver-2.4.0.41
ver-2.4.0.39
ver-2.4.0.38
ver-2.4.0.37
ver-2.4.0.36
ver-2.4.0.35
ver-2.4.0.33
ver-2.4.0.31
ver-2.4.0.30
ver-2.4.0.27
ver-2.4.0.26
ver-2.4.0.25
ver-2.4.0.24
ver-2.4.0.20
ver-2.4.0.18
ver-2.4.0.16
ver-2.4.0.14
ver-2.4.0.12
ver-2.4.0.11
ver-2.4.0.10
ver-2.4.0.9
ver-2.4.0.8
ver-2.4.0.7
ver-2.4.0.6
ver-2.4.0.5
ver-2.4.0.4
ver-2.4.0.3
ver-2.4.0.2
ver-2.4.0.1
ver-2.4.0.0
ver-2.3.6.0
ver-2.3.5.0
ver-2.3.4.0
ver-2.3.3.0
ver-2.3.2.2
ver-2.3.2.1
ver-2.3.2.0
ver-2.3.1.0
ver-2.3.0.0
ver-2.2.2.16
ver-2.2.2.15
ver-2.2.2.14
ver-2.2.2.13
ver-2.2.2.12
ver-2.2.2.11
ver-2.2.2.10
ver-2.2.2.9
ver-2.2.2.8
ver-2.2.2.7
ver-2.2.2.6
ver-2.2.2.5
ver-2.2.2.4
ver-2.2.2.3
ver-2.2.2.1
ver-2.2.2.1-ningsi
ver-2.2.2.0
ver-2.2.1.6
ver-2.2.1.5
ver-2.2.1.4
ver-2.2.1.3
ver-2.2.1.2
ver-2.2.1.1
ver-2.2.1.0
ver-2.2.0.1001
ver-2.2.0.7
ver-2.2.0.6
ver-2.2.0.5
ver-2.2.0.4
ver-2.2.0.3
ver-2.2.0.2
ver-2.2.0.1
ver-2.2.0.0
ver-2.1.7.7
ver-2.1.7.6
ver-2.1.7.2
ver-2.1.7.1
ver-2.1.6.0
ver-2.1.5.0
ver-2.1.4.1
ver-2.1.3.2
ver-2.1.3.0
ver-2.1.2.0
ver-2.1.1.0
ver-2.1.0.1
ver-2.1.0.0
ver-2.1.0
ver-2.0.22.3
ver-2.0.22.2
ver-2.0.22.1
ver-2.0.22.0
ver-2.0.21.6
ver-2.0.21.5
ver-2.0.21.4
ver-2.0.21.3
ver-2.0.21.2
ver-2.0.21.1
ver-2.0.21.0
ver-2.0.20.20
ver-2.0.20.19
ver-2.0.20.18
ver-2.0.20.16
ver-2.0.20.13
ver-2.0.20.12
ver-2.0.20.11
ver-2.0.20.10
ver-2.0.20.9
ver-2.0.20.4
ver-2.0.20.3
ver-2.0.20.2
ver-2.0.20.0
ver-2.0.19.1
ver-2.0.19.0
ver-2.0.18.2
ver-2.0.18.0
ver-2.0.17.4
ver-2.0.17.0
ver-2.0.16.0
ver-2.0.15.0
ver-2.0.14.0
ver-2.0.13.0
ver-2.0.12.0
ver-2.0.11.0
ver-2.0.10.0
ver-2.0.9.0
ver-2.0.8.2
ver-2.0.8.0
ver-2.0.7.0
ver-2.0.6.0
ver-2.0.5.2
ver-2.0.5.0
ver-2.0.4.0
ver-2.0.3.2
ver-2.0.3.1
ver-2.0.3.0
ver-2.0.2.2
ver-2.0.2.2-beta
ver-2.0.2.1
ver-2.0.2.0
ver-2.0.1.9
ver-2.0.1.1
ver-2.0.1.1-ningsi
ver-2.0.1.0
ver-2.0.0.4
ver-2.0.0.3
ver-2.0.0.2
ver-2.0.0.1
ver-2.0.0.0
tq-1.0.0.1
release/ver-2.1.2.0
mac-enter-test
autoaddcol_07161651
autoaddcol_07161108
autoaddcol_07150626
autoaddcol_0720_1434
autoaddcol_0719_1122
autoaddcol_0718_2208
TDB-ver0.8
TDB-ver-0.7
无相关合并请求
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
36 addition
and
15 deletion
+36
-15
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+6
-4
src/inc/taosmsg.h
src/inc/taosmsg.h
+2
-0
src/query/src/qExecutor.c
src/query/src/qExecutor.c
+1
-2
src/query/src/qUtil.c
src/query/src/qUtil.c
+23
-8
src/query/src/qextbuffer.c
src/query/src/qextbuffer.c
+2
-1
src/tsdb/src/tsdbMeta.c
src/tsdb/src/tsdbMeta.c
+2
-0
未找到文件。
src/client/src/tscSQLParser.c
浏览文件 @
b1f85ec0
...
...
@@ -4487,10 +4487,12 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
SUpdateTableTagValMsg
*
pUpdateMsg
=
(
SUpdateTableTagValMsg
*
)
pCmd
->
payload
;
pUpdateMsg
->
head
.
vgId
=
htonl
(
pTableMeta
->
vgroupInfo
.
vgId
);
pUpdateMsg
->
tid
=
htonl
(
pTableMeta
->
sid
);
pUpdateMsg
->
uid
=
htobe64
(
pTableMeta
->
uid
);
pUpdateMsg
->
colId
=
htons
(
pTagsSchema
->
colId
);
pUpdateMsg
->
tversion
=
htons
(
pTableMeta
->
tversion
);
pUpdateMsg
->
tid
=
htonl
(
pTableMeta
->
sid
);
pUpdateMsg
->
uid
=
htobe64
(
pTableMeta
->
uid
);
pUpdateMsg
->
colId
=
htons
(
pTagsSchema
->
colId
);
pUpdateMsg
->
type
=
htons
(
pTagsSchema
->
type
);
pUpdateMsg
->
bytes
=
htons
(
pTagsSchema
->
bytes
);
pUpdateMsg
->
tversion
=
htons
(
pTableMeta
->
tversion
);
pUpdateMsg
->
numOfTags
=
htons
(
numOfTags
);
pUpdateMsg
->
schemaLen
=
htonl
(
schemaLen
);
...
...
This diff is collapsed.
Click to expand it.
src/inc/taosmsg.h
浏览文件 @
b1f85ec0
...
...
@@ -285,6 +285,8 @@ typedef struct {
int32_t
tid
;
int16_t
tversion
;
int16_t
colId
;
int16_t
type
;
int16_t
bytes
;
int32_t
tagValLen
;
int16_t
numOfTags
;
int32_t
schemaLen
;
...
...
This diff is collapsed.
Click to expand it.
src/query/src/qExecutor.c
浏览文件 @
b1f85ec0
...
...
@@ -1099,7 +1099,6 @@ static bool functionNeedToExecute(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx
// todo add comments
if
((
functionId
==
TSDB_FUNC_LAST_DST
||
functionId
==
TSDB_FUNC_LAST
))
{
return
pCtx
->
param
[
0
].
i64Key
==
pQuery
->
order
.
order
;
// return !QUERY_IS_ASC_QUERY(pQuery);
}
// in the supplementary scan, only the following functions need to be executed
...
...
@@ -4716,8 +4715,8 @@ static void multiTableQueryProcess(SQInfo *pQInfo) {
el
=
scanMultiTableDataBlocks
(
pQInfo
);
qDebug
(
"QInfo:%p reversed scan completed, elapsed time: %"
PRId64
"ms"
,
pQInfo
,
el
);
doRestoreContext
(
pQInfo
);
doCloseAllTimeWindowAfterScan
(
pQInfo
);
doRestoreContext
(
pQInfo
);
}
else
{
qDebug
(
"QInfo:%p no need to do reversed scan, query completed"
,
pQInfo
);
}
...
...
This diff is collapsed.
Click to expand it.
src/query/src/qUtil.c
浏览文件 @
b1f85ec0
...
...
@@ -180,19 +180,34 @@ void closeAllTimeWindow(SWindowResInfo *pWindowResInfo) {
/*
* remove the results that are not the FIRST time window that spreads beyond the
* the last qualified time stamp in case of sliding query, which the sliding time is not equalled to the interval time
* the last qualified time stamp in case of sliding query, which the sliding time is not equalled to the interval time.
* NOTE: remove redundant, only when the result set order equals to traverse order
*/
void
removeRedundantWindow
(
SWindowResInfo
*
pWindowResInfo
,
TSKEY
lastKey
,
int32_t
order
)
{
assert
(
pWindowResInfo
->
size
>=
0
&&
pWindowResInfo
->
capacity
>=
pWindowResInfo
->
size
);
if
(
pWindowResInfo
->
size
<=
1
)
{
return
;
}
// get the result order
int32_t
resultOrder
=
(
pWindowResInfo
->
pResult
[
0
].
window
.
skey
<
pWindowResInfo
->
pResult
[
1
].
window
.
skey
)
?
TSDB_ORDER_ASC:
TSDB_ORDER_DESC
;
if
(
order
!=
resultOrder
)
{
return
;
}
int32_t
i
=
0
;
while
(
i
<
pWindowResInfo
->
size
&&
((
pWindowResInfo
->
pResult
[
i
].
window
.
ekey
<
lastKey
&&
order
==
QUERY_ASC_FORWARD_STEP
)
||
(
pWindowResInfo
->
pResult
[
i
].
window
.
skey
>
lastKey
&&
order
==
QUERY_DESC_FORWARD_STEP
)))
{
++
i
;
if
(
order
==
QUERY_ASC_FORWARD_STEP
)
{
while
(
i
<
pWindowResInfo
->
size
&&
(
pWindowResInfo
->
pResult
[
i
].
window
.
ekey
<
lastKey
))
{
++
i
;
}
}
else
if
(
order
==
QUERY_DESC_FORWARD_STEP
)
{
while
(
i
<
pWindowResInfo
->
size
&&
(
pWindowResInfo
->
pResult
[
i
].
window
.
skey
>
lastKey
))
{
++
i
;
}
}
// assert(i < pWindowResInfo->size);
if
(
i
<
pWindowResInfo
->
size
)
{
pWindowResInfo
->
size
=
(
i
+
1
);
}
...
...
This diff is collapsed.
Click to expand it.
src/query/src/qextbuffer.c
浏览文件 @
b1f85ec0
...
...
@@ -118,7 +118,7 @@ static bool tExtMemBufferAlloc(tExtMemBuffer *pMemBuffer) {
* To flush data to disk to accommodate more data
*/
if
(
pMemBuffer
->
numOfInMemPages
>
0
&&
pMemBuffer
->
numOfInMemPages
==
pMemBuffer
->
inMemCapacity
)
{
if
(
!
tExtMemBufferFlush
(
pMemBuffer
)
)
{
if
(
tExtMemBufferFlush
(
pMemBuffer
)
!=
0
)
{
return
false
;
}
}
...
...
@@ -268,6 +268,7 @@ int32_t tExtMemBufferFlush(tExtMemBuffer *pMemBuffer) {
size_t
retVal
=
fwrite
((
char
*
)
&
(
first
->
item
),
pMemBuffer
->
pageSize
,
1
,
pMemBuffer
->
file
);
if
(
retVal
<=
0
)
{
// failed to write to buffer, may be not enough space
ret
=
TAOS_SYSTEM_ERROR
(
errno
);
return
ret
;
}
pMemBuffer
->
fileMeta
.
numOfElemsInFile
+=
first
->
item
.
num
;
...
...
This diff is collapsed.
Click to expand it.
src/tsdb/src/tsdbMeta.c
浏览文件 @
b1f85ec0
...
...
@@ -274,6 +274,8 @@ int tsdbUpdateTagValue(TSDB_REPO_T *repo, SUpdateTableTagValMsg *pMsg) {
pMsg
->
tid
=
htonl
(
pMsg
->
tid
);
pMsg
->
tversion
=
htons
(
pMsg
->
tversion
);
pMsg
->
colId
=
htons
(
pMsg
->
colId
);
pMsg
->
type
=
htons
(
pMsg
->
type
);
pMsg
->
bytes
=
htons
(
pMsg
->
bytes
);
pMsg
->
tagValLen
=
htonl
(
pMsg
->
tagValLen
);
pMsg
->
numOfTags
=
htons
(
pMsg
->
numOfTags
);
pMsg
->
schemaLen
=
htonl
(
pMsg
->
schemaLen
);
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部