Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
9db7c027
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看板
提交
9db7c027
编写于
11月 24, 2021
作者:
X
Xiaoyu Wang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-10986]<feature>: Add elapsed function.
上级
43c94bd3
变更
4
展开全部
隐藏空白更改
内联
并排
Showing
4 changed file
with
429 addition
and
57 deletion
+429
-57
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+1
-1
src/query/src/qAggMain.c
src/query/src/qAggMain.c
+40
-9
src/query/src/qExecutor.c
src/query/src/qExecutor.c
+13
-15
tests/pytest/query/elapsed.py
tests/pytest/query/elapsed.py
+375
-32
未找到文件。
src/client/src/tscUtil.c
浏览文件 @
9db7c027
...
...
@@ -380,7 +380,7 @@ bool tscIsPointInterpQuery(SQueryInfo* pQueryInfo) {
}
bool
tscNeedTableSeqScan
(
SQueryInfo
*
pQueryInfo
)
{
return
tscQueryContainsFunction
(
pQueryInfo
,
TSDB_FUNC_TWA
)
||
tscQueryContainsFunction
(
pQueryInfo
,
TSDB_FUNC_ELAPSED
);
return
pQueryInfo
->
stableQuery
&&
(
tscQueryContainsFunction
(
pQueryInfo
,
TSDB_FUNC_TWA
)
||
tscQueryContainsFunction
(
pQueryInfo
,
TSDB_FUNC_ELAPSED
)
);
}
bool
tsIsArithmeticQueryOnAggResult
(
SQueryInfo
*
pQueryInfo
)
{
...
...
src/query/src/qAggMain.c
浏览文件 @
9db7c027
...
...
@@ -5090,23 +5090,54 @@ static void elapsedFunction(SQLFunctionCtx *pCtx) {
pInfo
->
min
=
pCtx
->
preAggVals
.
statis
.
min
;
pInfo
->
max
=
pCtx
->
preAggVals
.
statis
.
max
;
}
else
{
pInfo
->
max
=
pCtx
->
preAggVals
.
statis
.
max
;
if
(
pCtx
->
order
==
TSDB_ORDER_ASC
)
{
pInfo
->
max
=
pCtx
->
preAggVals
.
statis
.
max
;
}
else
{
pInfo
->
min
=
pCtx
->
preAggVals
.
statis
.
min
;
}
}
}
else
{
// 0 == pCtx->size mean this is end interpolation.
if
(
0
==
pCtx
->
size
)
{
if
(
pCtx
->
order
==
TSDB_ORDER_DESC
)
{
if
(
pCtx
->
end
.
key
!=
INT64_MIN
)
{
pInfo
->
min
=
pCtx
->
end
.
key
;
}
}
else
{
if
(
pCtx
->
end
.
key
!=
INT64_MIN
)
{
pInfo
->
max
=
pCtx
->
end
.
key
+
1
;
}
}
goto
elapsedOver
;
}
if
(
pCtx
->
start
.
key
==
INT64_MIN
)
{
pInfo
->
min
=
pCtx
->
ptsList
[
0
];
}
else
{
pInfo
->
min
=
pCtx
->
start
.
key
;
}
int64_t
*
ptsList
=
(
int64_t
*
)
GET_INPUT_DATA_LIST
(
pCtx
);
// pCtx->start.key == INT64_MIN mean this is first window or there is actual start point of current window.
// pCtx->end.key == INT64_MIN mean current window does not end in current data block or there is actual end point of current window.
if
(
pCtx
->
order
==
TSDB_ORDER_DESC
)
{
if
(
pCtx
->
start
.
key
==
INT64_MIN
)
{
pInfo
->
max
=
(
pInfo
->
max
<
ptsList
[
pCtx
->
size
-
1
])
?
ptsList
[
pCtx
->
size
-
1
]
:
pInfo
->
max
;
}
else
{
pInfo
->
max
=
pCtx
->
start
.
key
+
1
;
}
if
(
pCtx
->
end
.
key
!=
INT64_MIN
)
{
pInfo
->
max
=
pCtx
->
end
.
key
+
1
;
if
(
pCtx
->
end
.
key
!=
INT64_MIN
)
{
pInfo
->
min
=
pCtx
->
end
.
key
;
}
else
{
pInfo
->
min
=
ptsList
[
0
];
}
}
else
{
pInfo
->
max
=
pCtx
->
ptsList
[
pCtx
->
size
-
1
];
if
(
pCtx
->
start
.
key
==
INT64_MIN
)
{
pInfo
->
min
=
(
pInfo
->
min
>
ptsList
[
0
])
?
ptsList
[
0
]
:
pInfo
->
min
;
}
else
{
pInfo
->
min
=
pCtx
->
start
.
key
;
}
if
(
pCtx
->
end
.
key
!=
INT64_MIN
)
{
pInfo
->
max
=
pCtx
->
end
.
key
+
1
;
}
else
{
pInfo
->
max
=
ptsList
[
pCtx
->
size
-
1
];
}
}
}
...
...
src/query/src/qExecutor.c
浏览文件 @
9db7c027
...
...
@@ -1531,7 +1531,6 @@ static void hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResul
STimeWindow
win
=
getActiveTimeWindow
(
pResultRowInfo
,
ts
,
pQueryAttr
);
bool
masterScan
=
IS_MASTER_SCAN
(
pRuntimeEnv
);
SResultRow
*
pResult
=
NULL
;
int32_t
ret
=
setResultOutputBufByKey
(
pRuntimeEnv
,
pResultRowInfo
,
pSDataBlock
->
info
.
tid
,
&
win
,
masterScan
,
&
pResult
,
tableGroupId
,
pInfo
->
pCtx
,
numOfOutput
,
pInfo
->
rowCellInfoOffset
);
...
...
@@ -1554,23 +1553,22 @@ static void hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResul
continue
;
}
STimeWindow
w
=
pRes
->
win
;
ret
=
setResultOutputBufByKey
(
pRuntimeEnv
,
pResultRowInfo
,
pSDataBlock
->
info
.
tid
,
&
w
,
masterScan
,
&
pResult
,
tableGroupId
,
pInfo
->
pCtx
,
numOfOutput
,
pInfo
->
rowCellInfoOffset
);
if
(
ret
!=
TSDB_CODE_SUCCESS
)
{
longjmp
(
pRuntimeEnv
->
env
,
TSDB_CODE_QRY_OUT_OF_MEMORY
);
}
assert
(
!
resultRowInterpolated
(
pResult
,
RESULT_ROW_END_INTERP
));
STimeWindow
w
=
pRes
->
win
;
ret
=
setResultOutputBufByKey
(
pRuntimeEnv
,
pResultRowInfo
,
pSDataBlock
->
info
.
tid
,
&
w
,
masterScan
,
&
pResult
,
tableGroupId
,
pInfo
->
pCtx
,
numOfOutput
,
pInfo
->
rowCellInfoOffset
);
if
(
ret
!=
TSDB_CODE_SUCCESS
)
{
longjmp
(
pRuntimeEnv
->
env
,
TSDB_CODE_QRY_OUT_OF_MEMORY
);
}
doTimeWindowInterpolation
(
pOperatorInfo
,
pInfo
,
pSDataBlock
->
pDataBlock
,
*
(
TSKEY
*
)
pRuntimeEnv
->
prevRow
[
0
],
-
1
,
tsCols
[
startPos
],
startPos
,
w
.
ekey
,
RESULT_ROW_END_INTERP
);
assert
(
!
resultRowInterpolated
(
pResult
,
RESULT_ROW_END_INTERP
));
setResultRowInterpo
(
pResult
,
RESULT_ROW_END_INTERP
);
setNotInterpoWindowKey
(
pInfo
->
pCtx
,
pQueryAttr
->
numOfOutput
,
RESULT_ROW_START
_INTERP
);
doTimeWindowInterpolation
(
pOperatorInfo
,
pInfo
,
pSDataBlock
->
pDataBlock
,
*
(
TSKEY
*
)
pRuntimeEnv
->
prevRow
[
0
],
-
1
,
tsCols
[
startPos
],
startPos
,
QUERY_IS_ASC_QUERY
(
pQueryAttr
)
?
w
.
ekey
:
w
.
skey
,
RESULT_ROW_END
_INTERP
);
doApplyFunctions
(
pRuntimeEnv
,
pInfo
->
pCtx
,
&
w
,
startPos
,
0
,
tsCols
,
pSDataBlock
->
info
.
rows
,
numOfOutput
);
}
setResultRowInterpo
(
pResult
,
RESULT_ROW_END_INTERP
);
setNotInterpoWindowKey
(
pInfo
->
pCtx
,
pQueryAttr
->
numOfOutput
,
RESULT_ROW_START_INTERP
);
doApplyFunctions
(
pRuntimeEnv
,
pInfo
->
pCtx
,
&
w
,
startPos
,
0
,
tsCols
,
pSDataBlock
->
info
.
rows
,
numOfOutput
);
}
// restore current time window
ret
=
setResultOutputBufByKey
(
pRuntimeEnv
,
pResultRowInfo
,
pSDataBlock
->
info
.
tid
,
&
win
,
masterScan
,
&
pResult
,
tableGroupId
,
pInfo
->
pCtx
,
...
...
tests/pytest/query/elapsed.py
浏览文件 @
9db7c027
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录