Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
哥们要飞
TDengine
提交
aa65f33c
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,发现更多精彩内容 >>
未验证
提交
aa65f33c
编写于
4月 23, 2021
作者:
H
haojun Liao
提交者:
GitHub
4月 23, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5853 from taosdata/hotfix/TD-3805
[TD-3805]CQ time issue
上级
090b7cd3
2bfc6a90
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
91 addition
and
8 deletion
+91
-8
src/client/src/tscProfile.c
src/client/src/tscProfile.c
+1
-1
src/client/src/tscStream.c
src/client/src/tscStream.c
+10
-4
src/cq/src/cqMain.c
src/cq/src/cqMain.c
+1
-1
tests/pytest/stream/new.py
tests/pytest/stream/new.py
+1
-1
tests/pytest/stream/stream2.py
tests/pytest/stream/stream2.py
+3
-0
tests/pytest/stream/sys.py
tests/pytest/stream/sys.py
+1
-1
tests/pytest/util/sql.py
tests/pytest/util/sql.py
+1
-0
tests/script/general/stream/stream_1970.sim
tests/script/general/stream/stream_1970.sim
+73
-0
未找到文件。
src/client/src/tscProfile.c
浏览文件 @
aa65f33c
...
...
@@ -273,7 +273,7 @@ int tscBuildQueryStreamDesc(void *pMsg, STscObj *pObj) {
pSdesc
->
num
=
htobe64
(
pStream
->
num
);
pSdesc
->
useconds
=
htobe64
(
pStream
->
useconds
);
pSdesc
->
stime
=
htobe64
(
pStream
->
stime
-
pStream
->
interval
.
interval
);
pSdesc
->
stime
=
(
pStream
->
stime
==
INT64_MIN
)
?
htobe64
(
pStream
->
stime
)
:
htobe64
(
pStream
->
stime
-
pStream
->
interval
.
interval
);
pSdesc
->
ctime
=
htobe64
(
pStream
->
ctime
);
pSdesc
->
slidingTime
=
htobe64
(
pStream
->
interval
.
sliding
);
...
...
src/client/src/tscStream.c
浏览文件 @
aa65f33c
...
...
@@ -403,11 +403,13 @@ static void tscSetNextLaunchTimer(SSqlStream *pStream, SSqlObj *pSql) {
return
;
}
if
(
pStream
->
stime
>
0
)
{
timer
=
pStream
->
stime
-
taosGetTimestamp
(
pStream
->
precision
);
if
(
timer
<
0
)
{
timer
=
0
;
}
}
}
timer
+=
getLaunchTimeDelay
(
pStream
);
...
...
@@ -474,6 +476,10 @@ static int32_t tscSetSlidingWindowInfo(SSqlObj *pSql, SSqlStream *pStream) {
static
int64_t
tscGetStreamStartTimestamp
(
SSqlObj
*
pSql
,
SSqlStream
*
pStream
,
int64_t
stime
)
{
SQueryInfo
*
pQueryInfo
=
tscGetQueryInfoDetail
(
&
pSql
->
cmd
,
0
);
if
(
stime
==
INT64_MIN
)
{
return
stime
;
}
if
(
pStream
->
isProject
)
{
// no data in table, flush all data till now to destination meter, 10sec delay
pStream
->
interval
.
interval
=
tsProjectExecInterval
;
...
...
src/cq/src/cqMain.c
浏览文件 @
aa65f33c
...
...
@@ -449,7 +449,7 @@ static void cqCreateStream(SCqContext *pContext, SCqObj *pObj) {
pObj
->
tmrId
=
0
;
if
(
pObj
->
pStream
==
NULL
)
{
pObj
->
pStream
=
taos_open_stream
(
pContext
->
dbConn
,
pObj
->
sqlStr
,
cqProcessStreamRes
,
0
,
(
void
*
)
pObj
->
rid
,
NULL
);
pObj
->
pStream
=
taos_open_stream
(
pContext
->
dbConn
,
pObj
->
sqlStr
,
cqProcessStreamRes
,
INT64_MIN
,
(
void
*
)
pObj
->
rid
,
NULL
);
// TODO the pObj->pStream may be released if error happens
if
(
pObj
->
pStream
)
{
...
...
tests/pytest/stream/new.py
浏览文件 @
aa65f33c
...
...
@@ -42,7 +42,7 @@ class TDTestCase:
tdLog
.
info
(
"=============== step3"
)
start
=
time
.
time
()
tdSql
.
waitedQuery
(
"select * from st"
,
1
,
1
2
0
)
tdSql
.
waitedQuery
(
"select * from st"
,
1
,
1
8
0
)
delay
=
int
(
time
.
time
()
-
start
)
+
80
v
=
tdSql
.
getData
(
0
,
3
)
if
v
>=
51
:
...
...
tests/pytest/stream/stream2.py
浏览文件 @
aa65f33c
...
...
@@ -88,6 +88,8 @@ class TDTestCase:
except
Exception
as
e
:
tdLog
.
info
(
repr
(
e
))
time
.
sleep
(
5
)
tdSql
.
query
(
"show streams"
)
tdSql
.
checkRows
(
1
)
tdSql
.
checkData
(
0
,
2
,
's0'
)
...
...
@@ -146,6 +148,7 @@ class TDTestCase:
except
Exception
as
e
:
tdLog
.
info
(
repr
(
e
))
time
.
sleep
(
5
)
tdSql
.
query
(
"show streams"
)
tdSql
.
checkRows
(
2
)
tdSql
.
checkData
(
0
,
2
,
's1'
)
...
...
tests/pytest/stream/sys.py
浏览文件 @
aa65f33c
...
...
@@ -47,7 +47,7 @@ class TDTestCase:
"select * from iostrm"
,
]
for
sql
in
sqls
:
(
rows
,
_
)
=
tdSql
.
waitedQuery
(
sql
,
1
,
12
0
)
(
rows
,
_
)
=
tdSql
.
waitedQuery
(
sql
,
1
,
24
0
)
if
rows
<
1
:
tdLog
.
exit
(
"failed: sql:%s, expect at least one row"
%
sql
)
...
...
tests/pytest/util/sql.py
浏览文件 @
aa65f33c
...
...
@@ -87,6 +87,7 @@ class TDSql:
self
.
queryResult
=
self
.
cursor
.
fetchall
()
self
.
queryRows
=
len
(
self
.
queryResult
)
self
.
queryCols
=
len
(
self
.
cursor
.
description
)
tdLog
.
info
(
"sql: %s, try to retrieve %d rows,get %d rows"
%
(
sql
,
expectRows
,
self
.
queryRows
))
if
self
.
queryRows
>=
expectRows
:
return
(
self
.
queryRows
,
i
)
time
.
sleep
(
1
)
...
...
tests/script/general/stream/stream_1970.sim
0 → 100644
浏览文件 @
aa65f33c
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
sleep 2000
sql connect
print ======================== dnode1 start
$dbPrefix = s3_db
$tbPrefix = s3_tb
$mtPrefix = s3_mt
$stPrefix = s3_st
$tbNum = 10
$rowNum = 20
$totalNum = 200
print =============== step1
$i = 0
$db = $dbPrefix . $i
$mt = $mtPrefix . $i
$st = $stPrefix . $i
sql drop databae $db -x step1
step1:
sql create database $db keep 36500
sql use $db
sql create stable $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
sql create table cq1 as select count(*) from $mt interval(10s);
sleep 1000
sql create table $st using $mt tags(1);
sql insert into $st values (-50000, 1, 1.0);
sql insert into $st values (-10000, 1, 1.0);
sql insert into $st values (10000, 1, 1.0);
$i = 0
while $i < 12
sql select * from cq1;
if $rows != 3 then
sleep 10000
else
if $data00 != @70-01-01 07:59:10.000@ then
return -1
endi
if $data01 != 1 then
return -1
endi
if $data10 != @70-01-01 07:59:50.000@ then
return -1
endi
if $data11 != 1 then
return -1
endi
if $data20 != @70-01-01 08:00:10.000@ then
return -1
endi
if $data21 != 1 then
return -1
endi
$i = 12
endi
$i = $i + 1
endw
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录