Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
83cfd5d8
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1193
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看板
提交
83cfd5d8
编写于
4月 19, 2023
作者:
dengyihao
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'enh/rocksRevert' of
https://github.com/taosdata/TDengine
into enh/rocksRevert
上级
5402a606
9c6275e4
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
725 addition
and
567 deletion
+725
-567
source/libs/executor/src/timewindowoperator.c
source/libs/executor/src/timewindowoperator.c
+5
-31
tests/script/tsim/sma/rsmaCreateInsertQuery.sim
tests/script/tsim/sma/rsmaCreateInsertQuery.sim
+3
-0
tests/script/tsim/sma/rsmaPersistenceRecovery.sim
tests/script/tsim/sma/rsmaPersistenceRecovery.sim
+3
-0
tests/script/tsim/stream/distributeInterval0.sim
tests/script/tsim/stream/distributeInterval0.sim
+9
-9
tests/script/tsim/stream/fillHistoryBasic1.sim
tests/script/tsim/stream/fillHistoryBasic1.sim
+152
-527
tests/script/tsim/stream/fillHistoryBasic4.sim
tests/script/tsim/stream/fillHistoryBasic4.sim
+553
-0
未找到文件。
source/libs/executor/src/timewindowoperator.c
浏览文件 @
83cfd5d8
...
@@ -1455,18 +1455,6 @@ STimeWindow getFinalTimeWindow(int64_t ts, SInterval* pInterval) {
...
@@ -1455,18 +1455,6 @@ STimeWindow getFinalTimeWindow(int64_t ts, SInterval* pInterval) {
return
w
;
return
w
;
}
}
static
void
closeChildIntervalWindow
(
SOperatorInfo
*
pOperator
,
SArray
*
pChildren
,
TSKEY
maxTs
)
{
int32_t
size
=
taosArrayGetSize
(
pChildren
);
for
(
int32_t
i
=
0
;
i
<
size
;
i
++
)
{
SOperatorInfo
*
pChildOp
=
taosArrayGetP
(
pChildren
,
i
);
SStreamIntervalOperatorInfo
*
pChInfo
=
pChildOp
->
info
;
ASSERTS
(
pChInfo
->
twAggSup
.
calTrigger
==
STREAM_TRIGGER_AT_ONCE
,
"children trigger type should be at once"
);
pChInfo
->
twAggSup
.
maxTs
=
TMAX
(
pChInfo
->
twAggSup
.
maxTs
,
maxTs
);
closeStreamIntervalWindow
(
pChInfo
->
aggSup
.
pResultRowHashTable
,
&
pChInfo
->
twAggSup
,
&
pChInfo
->
interval
,
NULL
,
NULL
,
NULL
,
pOperator
);
}
}
static
void
doBuildDeleteResult
(
SStreamIntervalOperatorInfo
*
pInfo
,
SArray
*
pWins
,
int32_t
*
index
,
static
void
doBuildDeleteResult
(
SStreamIntervalOperatorInfo
*
pInfo
,
SArray
*
pWins
,
int32_t
*
index
,
SSDataBlock
*
pBlock
)
{
SSDataBlock
*
pBlock
)
{
blockDataCleanup
(
pBlock
);
blockDataCleanup
(
pBlock
);
...
@@ -1534,6 +1522,10 @@ void destroyStreamFinalIntervalOperatorInfo(void* param) {
...
@@ -1534,6 +1522,10 @@ void destroyStreamFinalIntervalOperatorInfo(void* param) {
cleanupBasicInfo
(
&
pInfo
->
binfo
);
cleanupBasicInfo
(
&
pInfo
->
binfo
);
cleanupAggSup
(
&
pInfo
->
aggSup
);
cleanupAggSup
(
&
pInfo
->
aggSup
);
// it should be empty.
// it should be empty.
void
*
pIte
=
NULL
;
while
((
pIte
=
taosHashIterate
(
pInfo
->
pPullDataMap
,
pIte
))
!=
NULL
)
{
taosArrayDestroy
(
*
(
void
**
)
pIte
);
}
taosHashCleanup
(
pInfo
->
pPullDataMap
);
taosHashCleanup
(
pInfo
->
pPullDataMap
);
taosArrayDestroy
(
pInfo
->
pPullWins
);
taosArrayDestroy
(
pInfo
->
pPullWins
);
blockDataDestroy
(
pInfo
->
pPullDataRes
);
blockDataDestroy
(
pInfo
->
pPullDataRes
);
...
@@ -4426,23 +4418,6 @@ void destroyMergeIntervalOperatorInfo(void* param) {
...
@@ -4426,23 +4418,6 @@ void destroyMergeIntervalOperatorInfo(void* param) {
taosMemoryFreeClear
(
param
);
taosMemoryFreeClear
(
param
);
}
}
static
int32_t
finalizeWindowResult
(
SOperatorInfo
*
pOperatorInfo
,
uint64_t
tableGroupId
,
STimeWindow
*
win
,
SSDataBlock
*
pResultBlock
)
{
SMergeIntervalAggOperatorInfo
*
miaInfo
=
pOperatorInfo
->
info
;
SIntervalAggOperatorInfo
*
iaInfo
=
&
miaInfo
->
intervalAggOperatorInfo
;
SExecTaskInfo
*
pTaskInfo
=
pOperatorInfo
->
pTaskInfo
;
bool
ascScan
=
(
iaInfo
->
inputOrder
==
TSDB_ORDER_ASC
);
SExprSupp
*
pExprSup
=
&
pOperatorInfo
->
exprSupp
;
SET_RES_WINDOW_KEY
(
iaInfo
->
aggSup
.
keyBuf
,
&
win
->
skey
,
TSDB_KEYSIZE
,
tableGroupId
);
SResultRowPosition
*
p1
=
(
SResultRowPosition
*
)
tSimpleHashGet
(
iaInfo
->
aggSup
.
pResultRowHashTable
,
iaInfo
->
aggSup
.
keyBuf
,
GET_RES_WINDOW_KEY_LEN
(
TSDB_KEYSIZE
));
ASSERT
(
p1
!=
NULL
);
// finalizeResultRows(iaInfo->aggSup.pResultBuf, p1, pResultBlock, pTaskInfo);
tSimpleHashRemove
(
iaInfo
->
aggSup
.
pResultRowHashTable
,
iaInfo
->
aggSup
.
keyBuf
,
GET_RES_WINDOW_KEY_LEN
(
TSDB_KEYSIZE
));
return
TSDB_CODE_SUCCESS
;
}
static
int32_t
outputPrevIntervalResult
(
SOperatorInfo
*
pOperatorInfo
,
uint64_t
tableGroupId
,
SSDataBlock
*
pResultBlock
,
static
int32_t
outputPrevIntervalResult
(
SOperatorInfo
*
pOperatorInfo
,
uint64_t
tableGroupId
,
SSDataBlock
*
pResultBlock
,
STimeWindow
*
newWin
)
{
STimeWindow
*
newWin
)
{
SMergeIntervalAggOperatorInfo
*
miaInfo
=
pOperatorInfo
->
info
;
SMergeIntervalAggOperatorInfo
*
miaInfo
=
pOperatorInfo
->
info
;
...
@@ -4463,7 +4438,6 @@ static int32_t outputPrevIntervalResult(SOperatorInfo* pOperatorInfo, uint64_t t
...
@@ -4463,7 +4438,6 @@ static int32_t outputPrevIntervalResult(SOperatorInfo* pOperatorInfo, uint64_t t
STimeWindow
*
prevWin
=
&
prevGrpWin
->
window
;
STimeWindow
*
prevWin
=
&
prevGrpWin
->
window
;
if
((
ascScan
&&
newWin
->
skey
>
prevWin
->
ekey
)
||
((
!
ascScan
)
&&
newWin
->
skey
<
prevWin
->
ekey
))
{
if
((
ascScan
&&
newWin
->
skey
>
prevWin
->
ekey
)
||
((
!
ascScan
)
&&
newWin
->
skey
<
prevWin
->
ekey
))
{
// finalizeWindowResult(pOperatorInfo, tableGroupId, prevWin, pResultBlock);
tdListPopNode
(
miaInfo
->
groupIntervals
,
listNode
);
tdListPopNode
(
miaInfo
->
groupIntervals
,
listNode
);
}
}
}
}
...
@@ -4623,7 +4597,6 @@ static SSDataBlock* doMergeIntervalAgg(SOperatorInfo* pOperator) {
...
@@ -4623,7 +4597,6 @@ static SSDataBlock* doMergeIntervalAgg(SOperatorInfo* pOperator) {
if
(
listNode
!=
NULL
)
{
if
(
listNode
!=
NULL
)
{
SGroupTimeWindow
*
grpWin
=
(
SGroupTimeWindow
*
)(
listNode
->
data
);
SGroupTimeWindow
*
grpWin
=
(
SGroupTimeWindow
*
)(
listNode
->
data
);
// finalizeWindowResult(pOperator, grpWin->groupId, &grpWin->window, pRes);
pRes
->
info
.
id
.
groupId
=
grpWin
->
groupId
;
pRes
->
info
.
id
.
groupId
=
grpWin
->
groupId
;
}
}
}
}
...
@@ -4768,6 +4741,7 @@ static SSDataBlock* doStreamIntervalAgg(SOperatorInfo* pOperator) {
...
@@ -4768,6 +4741,7 @@ static SSDataBlock* doStreamIntervalAgg(SOperatorInfo* pOperator) {
doDeleteWindows
(
pOperator
,
&
pInfo
->
interval
,
pBlock
,
pInfo
->
pDelWins
,
pInfo
->
pUpdatedMap
);
doDeleteWindows
(
pOperator
,
&
pInfo
->
interval
,
pBlock
,
pInfo
->
pDelWins
,
pInfo
->
pUpdatedMap
);
continue
;
continue
;
}
else
if
(
pBlock
->
info
.
type
==
STREAM_GET_ALL
)
{
}
else
if
(
pBlock
->
info
.
type
==
STREAM_GET_ALL
)
{
qDebug
(
"===stream===single interval recv|block type STREAM_GET_ALL"
);
getAllIntervalWindow
(
pInfo
->
aggSup
.
pResultRowHashTable
,
pInfo
->
pUpdatedMap
);
getAllIntervalWindow
(
pInfo
->
aggSup
.
pResultRowHashTable
,
pInfo
->
pUpdatedMap
);
continue
;
continue
;
}
else
if
(
pBlock
->
info
.
type
==
STREAM_CREATE_CHILD_TABLE
)
{
}
else
if
(
pBlock
->
info
.
type
==
STREAM_CREATE_CHILD_TABLE
)
{
...
...
tests/script/tsim/sma/rsmaCreateInsertQuery.sim
浏览文件 @
83cfd5d8
...
@@ -4,6 +4,9 @@ system sh/exec.sh -n dnode1 -s start
...
@@ -4,6 +4,9 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sleep 50
sql connect
sql connect
#todo xukaili sma should use rocksdb.
return 1
print =============== create database with retentions
print =============== create database with retentions
sql create database d0 retentions 5s:7d,10s:21d,15s:365d;
sql create database d0 retentions 5s:7d,10s:21d,15s:365d;
sql use d0
sql use d0
...
...
tests/script/tsim/sma/rsmaPersistenceRecovery.sim
浏览文件 @
83cfd5d8
...
@@ -4,6 +4,9 @@ system sh/exec.sh -n dnode1 -s start
...
@@ -4,6 +4,9 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sleep 50
sql connect
sql connect
#todo xukaili sma should use rocksdb.
return 1
print =============== create database with retentions
print =============== create database with retentions
sql create database d0 retentions 5s:7d,5m:21d,15m:365d;
sql create database d0 retentions 5s:7d,5m:21d,15m:365d;
sql use d0
sql use d0
...
...
tests/script/tsim/stream/distributeInterval0.sim
浏览文件 @
83cfd5d8
...
@@ -62,7 +62,7 @@ $loop_count = 0
...
@@ -62,7 +62,7 @@ $loop_count = 0
loop0:
loop0:
$loop_count = $loop_count + 1
$loop_count = $loop_count + 1
if $loop_count ==
1
0 then
if $loop_count ==
3
0 then
return -1
return -1
endi
endi
...
@@ -93,7 +93,7 @@ $loop_count = 0
...
@@ -93,7 +93,7 @@ $loop_count = 0
loop01:
loop01:
$loop_count = $loop_count + 1
$loop_count = $loop_count + 1
if $loop_count ==
1
0 then
if $loop_count ==
3
0 then
return -1
return -1
endi
endi
...
@@ -132,7 +132,7 @@ $loop_count = 0
...
@@ -132,7 +132,7 @@ $loop_count = 0
loop011:
loop011:
$loop_count = $loop_count + 1
$loop_count = $loop_count + 1
if $loop_count ==
1
0 then
if $loop_count ==
3
0 then
return -1
return -1
endi
endi
...
@@ -171,7 +171,7 @@ $loop_count = 0
...
@@ -171,7 +171,7 @@ $loop_count = 0
loop02:
loop02:
$loop_count = $loop_count + 1
$loop_count = $loop_count + 1
if $loop_count ==
1
0 then
if $loop_count ==
3
0 then
return -1
return -1
endi
endi
...
@@ -211,7 +211,7 @@ $loop_count = 0
...
@@ -211,7 +211,7 @@ $loop_count = 0
loop03:
loop03:
$loop_count = $loop_count + 1
$loop_count = $loop_count + 1
if $loop_count ==
1
0 then
if $loop_count ==
3
0 then
return -1
return -1
endi
endi
...
@@ -258,7 +258,7 @@ $loop_count = 0
...
@@ -258,7 +258,7 @@ $loop_count = 0
loop04:
loop04:
$loop_count = $loop_count + 1
$loop_count = $loop_count + 1
if $loop_count ==
1
0 then
if $loop_count ==
3
0 then
return -1
return -1
endi
endi
...
@@ -300,7 +300,7 @@ sleep 2000
...
@@ -300,7 +300,7 @@ sleep 2000
sql select * from streamtST1;
sql select * from streamtST1;
$loop_count = $loop_count + 1
$loop_count = $loop_count + 1
if $loop_count ==
1
0 then
if $loop_count ==
3
0 then
return -1
return -1
endi
endi
...
@@ -429,7 +429,7 @@ sql select * from streamtST1;
...
@@ -429,7 +429,7 @@ sql select * from streamtST1;
sleep 2000
sleep 2000
$loop_count = $loop_count + 1
$loop_count = $loop_count + 1
if $loop_count ==
1
0 then
if $loop_count ==
3
0 then
return -1
return -1
endi
endi
...
@@ -468,7 +468,7 @@ sql select * from streamtST3;
...
@@ -468,7 +468,7 @@ sql select * from streamtST3;
sleep 2000
sleep 2000
$loop_count = $loop_count + 1
$loop_count = $loop_count + 1
if $loop_count ==
1
0 then
if $loop_count ==
3
0 then
return -1
return -1
endi
endi
...
...
tests/script/tsim/stream/fillHistoryBasic1.sim
浏览文件 @
83cfd5d8
...
@@ -26,575 +26,139 @@ sql insert into t1 values(1648791243003,4,2,3,3.1);
...
@@ -26,575 +26,139 @@ sql insert into t1 values(1648791243003,4,2,3,3.1);
sql insert into t1 values(1648791213004,4,2,3,4.1);
sql insert into t1 values(1648791213004,4,2,3,4.1);
sleep 5000
$loop_count = 0
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
loop00:
if $rows != 4 then
print ======$rows
return -1
endi
# row 0
if $data01 != 2 then
print ======$data01
return -1
endi
if $data02 != 2 then
print ======$data02
return -1
endi
if $data03 != 5 then
print ======$data03
return -1
endi
if $data04 != 2 then
print ======$data04
return -1
endi
if $data05 != 3 then
print ======$data05
return -1
endi
# row 1
if $data11 != 1 then
print ======$data11
return -1
endi
if $data12 != 1 then
print ======$data12
return -1
endi
if $data13 != 2 then
print ======$data13
return -1
endi
if $data14 != 2 then
print ======$data14
return -1
endi
if $data15 != 3 then
print ======$data15
return -1
endi
# row 2
if $data21 != 1 then
print ======$data21
return -1
endi
if $data22 != 1 then
print ======$data22
return -1
endi
if $data23 != 3 then
print ======$data23
return -1
endi
if $data24 != 2 then
print ======$data24
return -1
endi
if $data25 != 3 then
print ======$data25
return -1
endi
# row 3
if $data31 != 1 then
print ======$data31
return -1
endi
if $data32 != 1 then
print ======$data32
return -1
endi
if $data33 != 4 then
print ======$data33
return -1
endi
if $data34 != 2 then
print ======$data34
return -1
endi
if $data35 != 3 then
print ======$data35
return -1
endi
sql insert into t1 values(1648791223001,12,14,13,11.1);
sleep 1000
sql select * from streamt;
print count(*) , count(d) , sum(a) , max(b) , min(c)
print 0: $data00 , $data01 , $data02 , $data03 , $data04 , $data05
print 1: $data10 , $data11 , $data12 , $data13 , $data14 , $data15
if $rows != 4 then
print ======$rows
return -1
endi
# row 0
if $data01 != 2 then
print ======$data01
return -1
endi
if $data02 != 2 then
print ======$data02
return -1
endi
if $data03 != 5 then
print ======$data03
return -1
endi
if $data04 != 2 then
print ======$data04
return -1
endi
if $data05 != 3 then
print ======$data05
return -1
endi
# row 1
if $data11 != 1 then
print ======$data11
return -1
endi
if $data12 != 1 then
print ======$data12
return -1
endi
if $data13 != 12 then
print ======$data13
return -1
endi
if $data14 != 14 then
print ======$data14
return -1
endi
if $data15 != 13 then
print ======$data15
return -1
endi
# row 2
if $data21 != 1 then
print ======$data21
return -1
endi
if $data22 != 1 then
print ======$data22
return -1
endi
if $data23 != 3 then
print ======$data23
return -1
endi
if $data24 != 2 then
print ======$data24
return -1
endi
if $data25 != 3 then
print ======$data25
return -1
endi
# row 3
if $data31 != 1 then
print ======$data31
return -1
endi
if $data32 != 1 then
print ======$data32
return -1
endi
if $data33 != 4 then
print ======$data33
return -1
endi
if $data34 != 2 then
print ======$data34
return -1
endi
if $data35 != 3 then
print ======$data35
return -1
endi
sql insert into t1 values(1648791223002,12,14,13,11.1);
sleep 1000
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
if $data11 != 2 then
print ======$data11
return -1
endi
if $data12 != 2 then
print ======$data12
return -1
endi
if $data13 != 24 then
print ======$data13
return -1
endi
if $data14 != 14 then
print ======$data14
return -1
endi
if $data15 != 13 then
print ======$data15
return -1
endi
sql insert into t1 values(1648791223003,12,14,13,11.1);
sleep 1000
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
if $data11 != 3 then
print ======$data11
return -1
endi
if $data12 != 3 then
print ======$data12
return -1
endi
if $data13 != 36 then
print ======$data13
return -1
endi
if $data14 != 14 then
print ======$data14
return -1
endi
if $data15 != 13 then
print ======$data15
return -1
endi
sql insert into t1 values(1648791223001,1,1,1,1.1);
sql insert into t1 values(1648791223002,2,2,2,2.1);
sql insert into t1 values(1648791223003,3,3,3,3.1);
sleep 1000
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
if $data11 != 3 then
print ======$data11
return -1
endi
if $data12 != 3 then
print ======$data12
return -1
endi
if $data13 != 6 then
print ======$data13
return -1
endi
if $data14 != 3 then
print ======$data14
return -1
endi
if $data15 != 1 then
print ======$data15
return -1
endi
sql insert into t1 values(1648791233003,3,2,3,2.1);
sql insert into t1 values(1648791233002,5,6,7,8.1);
sql insert into t1 values(1648791233002,3,2,3,2.1);
sleep 1000
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 2
if $data21 != 2 then
print ======$data21
return -1
endi
if $data22 != 2 then
print ======$data22
return -1
endi
if $data23 != 6 then
print ======$data23
return -1
endi
if $data24 != 2 then
print ======$data24
return -1
endi
if $data25 != 3 then
print ======$data25
return -1
endi
sql insert into t1 values(1648791213004,4,2,3,4.1) (1648791213006,5,4,7,9.1) (1648791213004,40,20,30,40.1) (1648791213005,4,2,3,4.1);
sleep 1000
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 0
if $data01 != 4 then
print ======$data01
return -1
endi
if $data02 != 4 then
print ======$data02
return -1
endi
if $data03 != 50 then
print ======$data03 != 50
return -1
endi
if $data04 != 20 then
print ======$data04 != 20
return -1
endi
if $data05 != 3 then
print ======$data05
return -1
endi
sql insert into t1 values(1648791223004,4,2,3,4.1) (1648791233006,5,4,7,9.1) (1648791223004,40,20,30,40.1) (1648791233005,4,2,3,4.1);
sleep 1000
sleep 1000
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
if $data11 != 4 then
print ======$data11
return -1
endi
if $data12 != 4 then
print ======$data12
return -1
endi
if $data13 != 46 then
print ======$data13 != 46
return -1
endi
if $data14 != 20 then
print ======$data14 != 20
return -1
endi
if $data15 != 1 then
print ======$data15
return -1
endi
# row 2
if $data21 != 4 then
print ======$data21
return -1
endi
if $data22 != 4 then
print ======$data22
return -1
endi
if $data23 != 15 then
print ======$data23
return -1
endi
if $data24 != 4 then
print ======$data24
return -1
endi
if $data25 != 3 then
$loop_count = $loop_count + 1
print ======$data25
if $loop_count == 30 then
return -1
return -1
endi
endi
sql create database test2 vgroups 1;
sql select * from information_schema.ins_databases;
sql use test2;
sql create table t1(ts timestamp, a int, b int , c int, d double);
sql insert into t1 values(1648791213000,1,2,3,1.0);
sql insert into t1 values(1648791223001,2,2,3,1.1);
sql insert into t1 values(1648791233002,3,2,3,2.1);
sql insert into t1 values(1648791243003,4,2,3,3.1);
sql insert into t1 values(1648791213004,4,2,3,4.1);
sql create stream stream2 trigger at_once fill_history 1 IGNORE EXPIRED 0 into streamt as select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from t1 interval(10s);
sleep 5000
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
if $rows != 4 then
if $rows != 4 then
print ======$rows
print ======$rows
return -1
goto loop00
endi
endi
# row 0
# row 0
if $data01 != 2 then
if $data01 != 2 then
print ======$data01
print ======$data01
return -1
goto loop00
endi
endi
if $data02 != 2 then
if $data02 != 2 then
print ======$data02
print ======$data02
return -1
goto loop00
endi
endi
if $data03 != 5 then
if $data03 != 5 then
print ======$data03
print ======$data03
return -1
goto loop00
endi
endi
if $data04 != 2 then
if $data04 != 2 then
print ======$data04
print ======$data04
return -1
goto loop00
endi
endi
if $data05 != 3 then
if $data05 != 3 then
print ======$data05
print ======$data05
return -1
goto loop00
endi
endi
# row 1
# row 1
if $data11 != 1 then
if $data11 != 1 then
print ======$data11
print ======$data11
return -1
goto loop00
endi
endi
if $data12 != 1 then
if $data12 != 1 then
print ======$data12
print ======$data12
return -1
goto loop00
endi
endi
if $data13 != 2 then
if $data13 != 2 then
print ======$data13
print ======$data13
return -1
goto loop00
endi
endi
if $data14 != 2 then
if $data14 != 2 then
print ======$data14
print ======$data14
return -1
goto loop00
endi
endi
if $data15 != 3 then
if $data15 != 3 then
print ======$data15
print ======$data15
return -1
goto loop00
endi
endi
# row 2
# row 2
if $data21 != 1 then
if $data21 != 1 then
print ======$data21
print ======$data21
return -1
goto loop00
endi
endi
if $data22 != 1 then
if $data22 != 1 then
print ======$data22
print ======$data22
return -1
goto loop00
endi
endi
if $data23 != 3 then
if $data23 != 3 then
print ======$data23
print ======$data23
return -1
goto loop00
endi
endi
if $data24 != 2 then
if $data24 != 2 then
print ======$data24
print ======$data24
return -1
goto loop00
endi
endi
if $data25 != 3 then
if $data25 != 3 then
print ======$data25
print ======$data25
return -1
goto loop00
endi
endi
# row 3
# row 3
if $data31 != 1 then
if $data31 != 1 then
print ======$data31
print ======$data31
return -1
goto loop00
endi
endi
if $data32 != 1 then
if $data32 != 1 then
print ======$data32
print ======$data32
return -1
goto loop00
endi
endi
if $data33 != 4 then
if $data33 != 4 then
print ======$data33
print ======$data33
return -1
goto loop00
endi
endi
if $data34 != 2 then
if $data34 != 2 then
print ======$data34
print ======$data34
return -1
goto loop00
endi
endi
if $data35 != 3 then
if $data35 != 3 then
print ======$data35
print ======$data35
return -1
goto loop00
endi
endi
sql insert into t1 values(1648791223001,12,14,13,11.1);
sql insert into t1 values(1648791223001,12,14,13,11.1);
$loop_count = 0
loop01:
sleep 1000
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select * from streamt;
sql select * from streamt;
print count(*) , count(d) , sum(a) , max(b) , min(c)
print count(*) , count(d) , sum(a) , max(b) , min(c)
...
@@ -603,321 +167,382 @@ print 1: $data10 , $data11 , $data12 , $data13 , $data14 , $data15
...
@@ -603,321 +167,382 @@ print 1: $data10 , $data11 , $data12 , $data13 , $data14 , $data15
if $rows != 4 then
if $rows != 4 then
print ======$rows
print ======$rows
return -
1
goto loop0
1
endi
endi
# row 0
# row 0
if $data01 != 2 then
if $data01 != 2 then
print ======$data01
print ======$data01
return -
1
goto loop0
1
endi
endi
if $data02 != 2 then
if $data02 != 2 then
print ======$data02
print ======$data02
return -
1
goto loop0
1
endi
endi
if $data03 != 5 then
if $data03 != 5 then
print ======$data03
print ======$data03
return -
1
goto loop0
1
endi
endi
if $data04 != 2 then
if $data04 != 2 then
print ======$data04
print ======$data04
return -
1
goto loop0
1
endi
endi
if $data05 != 3 then
if $data05 != 3 then
print ======$data05
print ======$data05
return -
1
goto loop0
1
endi
endi
# row 1
# row 1
if $data11 != 1 then
if $data11 != 1 then
print ======$data11
print ======$data11
return -
1
goto loop0
1
endi
endi
if $data12 != 1 then
if $data12 != 1 then
print ======$data12
print ======$data12
return -
1
goto loop0
1
endi
endi
if $data13 != 12 then
if $data13 != 12 then
print ======$data13
print ======$data13
return -
1
goto loop0
1
endi
endi
if $data14 != 14 then
if $data14 != 14 then
print ======$data14
print ======$data14
return -
1
goto loop0
1
endi
endi
if $data15 != 13 then
if $data15 != 13 then
print ======$data15
print ======$data15
return -
1
goto loop0
1
endi
endi
# row 2
# row 2
if $data21 != 1 then
if $data21 != 1 then
print ======$data21
print ======$data21
return -
1
goto loop0
1
endi
endi
if $data22 != 1 then
if $data22 != 1 then
print ======$data22
print ======$data22
return -
1
goto loop0
1
endi
endi
if $data23 != 3 then
if $data23 != 3 then
print ======$data23
print ======$data23
return -
1
goto loop0
1
endi
endi
if $data24 != 2 then
if $data24 != 2 then
print ======$data24
print ======$data24
return -
1
goto loop0
1
endi
endi
if $data25 != 3 then
if $data25 != 3 then
print ======$data25
print ======$data25
return -
1
goto loop0
1
endi
endi
# row 3
# row 3
if $data31 != 1 then
if $data31 != 1 then
print ======$data31
print ======$data31
return -
1
goto loop0
1
endi
endi
if $data32 != 1 then
if $data32 != 1 then
print ======$data32
print ======$data32
return -
1
goto loop0
1
endi
endi
if $data33 != 4 then
if $data33 != 4 then
print ======$data33
print ======$data33
return -
1
goto loop0
1
endi
endi
if $data34 != 2 then
if $data34 != 2 then
print ======$data34
print ======$data34
return -
1
goto loop0
1
endi
endi
if $data35 != 3 then
if $data35 != 3 then
print ======$data35
print ======$data35
return -
1
goto loop0
1
endi
endi
sql insert into t1 values(1648791223002,12,14,13,11.1);
sql insert into t1 values(1648791223002,12,14,13,11.1);
$loop_count = 0
loop02:
sleep 1000
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
# row 1
if $data11 != 2 then
if $data11 != 2 then
print ======$data11
print ======$data11
return -1
goto loop02
endi
endi
if $data12 != 2 then
if $data12 != 2 then
print ======$data12
print ======$data12
return -1
goto loop02
endi
endi
if $data13 != 24 then
if $data13 != 24 then
print ======$data13
print ======$data13
return -1
goto loop02
endi
endi
if $data14 != 14 then
if $data14 != 14 then
print ======$data14
print ======$data14
return -1
goto loop02
endi
endi
if $data15 != 13 then
if $data15 != 13 then
print ======$data15
print ======$data15
return -1
goto loop02
endi
endi
sql insert into t1 values(1648791223003,12,14,13,11.1);
sql insert into t1 values(1648791223003,12,14,13,11.1);
$loop_count = 0
loop03:
sleep 1000
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
# row 1
if $data11 != 3 then
if $data11 != 3 then
print ======$data11
print ======$data11
return -1
goto loop03
endi
endi
if $data12 != 3 then
if $data12 != 3 then
print ======$data12
print ======$data12
return -1
goto loop03
endi
endi
if $data13 != 36 then
if $data13 != 36 then
print ======$data13
print ======$data13
return -1
goto loop03
endi
endi
if $data14 != 14 then
if $data14 != 14 then
print ======$data14
print ======$data14
return -1
goto loop03
endi
endi
if $data15 != 13 then
if $data15 != 13 then
print ======$data15
print ======$data15
return -1
goto loop03
endi
endi
sql insert into t1 values(1648791223001,1,1,1,1.1);
sql insert into t1 values(1648791223001,1,1,1,1.1);
sql insert into t1 values(1648791223002,2,2,2,2.1);
sql insert into t1 values(1648791223002,2,2,2,2.1);
sql insert into t1 values(1648791223003,3,3,3,3.1);
sql insert into t1 values(1648791223003,3,3,3,3.1);
$loop_count = 0
loop04:
sleep 1000
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
# row 1
if $data11 != 3 then
if $data11 != 3 then
print ======$data11
print ======$data11
return -1
goto loop04
endi
endi
if $data12 != 3 then
if $data12 != 3 then
print ======$data12
print ======$data12
return -1
goto loop04
endi
endi
if $data13 != 6 then
if $data13 != 6 then
print ======$data13
print ======$data13
return -1
goto loop04
endi
endi
if $data14 != 3 then
if $data14 != 3 then
print ======$data14
print ======$data14
return -1
goto loop04
endi
endi
if $data15 != 1 then
if $data15 != 1 then
print ======$data15
print ======$data15
return -1
goto loop04
endi
endi
sql insert into t1 values(1648791233003,3,2,3,2.1);
sql insert into t1 values(1648791233003,3,2,3,2.1);
sql insert into t1 values(1648791233002,5,6,7,8.1);
sql insert into t1 values(1648791233002,5,6,7,8.1);
sql insert into t1 values(1648791233002,3,2,3,2.1);
sql insert into t1 values(1648791233002,3,2,3,2.1);
$loop_count = 0
loop1:
sleep 1000
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 2
# row 2
if $data21 != 2 then
if $data21 != 2 then
print ======$data21
print ======$data21
return -
1
goto loop
1
endi
endi
if $data22 != 2 then
if $data22 != 2 then
print ======$data22
print ======$data22
return -
1
goto loop
1
endi
endi
if $data23 != 6 then
if $data23 != 6 then
print ======$data23
print ======$data23
return -
1
goto loop
1
endi
endi
if $data24 != 2 then
if $data24 != 2 then
print ======$data24
print ======$data24
return -
1
goto loop
1
endi
endi
if $data25 != 3 then
if $data25 != 3 then
print ======$data25
print ======$data25
return -
1
goto loop
1
endi
endi
sql insert into t1 values(1648791213004,4,2,3,4.1) (1648791213006,5,4,7,9.1) (1648791213004,40,20,30,40.1) (1648791213005,4,2,3,4.1);
sql insert into t1 values(1648791213004,4,2,3,4.1) (1648791213006,5,4,7,9.1) (1648791213004,40,20,30,40.1) (1648791213005,4,2,3,4.1);
$loop_count = 0
loop05:
sleep 1000
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 0
# row 0
if $data01 != 4 then
if $data01 != 4 then
print ======$data01
print ======$data01
return -1
goto loop05
endi
endi
if $data02 != 4 then
if $data02 != 4 then
print ======$data02
print ======$data02
return -1
goto loop05
endi
endi
if $data03 != 50 then
if $data03 != 50 then
print ======$data03 != 50
print ======$data03 != 50
return -1
goto loop05
endi
endi
if $data04 != 20 then
if $data04 != 20 then
print ======$data04 != 20
print ======$data04 != 20
return -1
goto loop05
endi
endi
if $data05 != 3 then
if $data05 != 3 then
print ======$data05
print ======$data05
return -1
goto loop05
endi
endi
sql insert into t1 values(1648791223004,4,2,3,4.1) (1648791233006,5,4,7,9.1) (1648791223004,40,20,30,40.1) (1648791233005,4,2,3,4.1);
sql insert into t1 values(1648791223004,4,2,3,4.1) (1648791233006,5,4,7,9.1) (1648791223004,40,20,30,40.1) (1648791233005,4,2,3,4.1);
$loop_count = 0
loop06:
sleep 1000
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
# row 1
if $data11 != 4 then
if $data11 != 4 then
print ======$data11
print ======$data11
return -1
goto loop06
endi
endi
if $data12 != 4 then
if $data12 != 4 then
print ======$data12
print ======$data12
return -1
goto loop06
endi
endi
if $data13 != 46 then
if $data13 != 46 then
print ======$data13 != 46
print ======$data13 != 46
return -1
goto loop06
endi
endi
if $data14 != 20 then
if $data14 != 20 then
print ======$data14 != 20
print ======$data14 != 20
return -1
goto loop06
endi
endi
if $data15 != 1 then
if $data15 != 1 then
print ======$data15
print ======$data15
return -1
goto loop06
endi
endi
# row 2
# row 2
if $data21 != 4 then
if $data21 != 4 then
print ======$data21
print ======$data21
return -1
goto loop06
endi
endi
if $data22 != 4 then
if $data22 != 4 then
print ======$data22
print ======$data22
return -1
goto loop06
endi
endi
if $data23 != 15 then
if $data23 != 15 then
print ======$data23
print ======$data23
return -1
goto loop06
endi
endi
if $data24 != 4 then
if $data24 != 4 then
print ======$data24
print ======$data24
return -1
goto loop06
endi
endi
if $data25 != 3 then
if $data25 != 3 then
print ======$data25
print ======$data25
return -1
goto loop06
endi
endi
print =====over
tests/script/tsim/stream/fillHistoryBasic4.sim
0 → 100644
浏览文件 @
83cfd5d8
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
print =============== create database
sql create database test vgroups 1;
sql select * from information_schema.ins_databases
if $rows != 3 then
return -1
endi
print $data00 $data01 $data02
sql use test;
sql create database test2 vgroups 1;
sql select * from information_schema.ins_databases;
sql use test2;
sql create table t1(ts timestamp, a int, b int , c int, d double);
sql insert into t1 values(1648791213000,1,2,3,1.0);
sql insert into t1 values(1648791223001,2,2,3,1.1);
sql insert into t1 values(1648791233002,3,2,3,2.1);
sql insert into t1 values(1648791243003,4,2,3,3.1);
sql insert into t1 values(1648791213004,4,2,3,4.1);
print create stream stream2 trigger at_once fill_history 1 IGNORE EXPIRED 0 into streamt as select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from t1 interval(10s)
sql create stream stream2 trigger at_once fill_history 1 IGNORE EXPIRED 0 into streamt as select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from t1 interval(10s);
$loop_count = 0
loop0:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
if $rows != 4 then
print ======$rows
goto loop0
endi
# row 0
if $data01 != 2 then
print ======$data01
goto loop0
endi
if $data02 != 2 then
print ======$data02
goto loop0
endi
if $data03 != 5 then
print ======$data03
goto loop0
endi
if $data04 != 2 then
print ======$data04
goto loop0
endi
if $data05 != 3 then
print ======$data05
goto loop0
endi
# row 1
if $data11 != 1 then
print ======$data11
goto loop0
endi
if $data12 != 1 then
print ======$data12
goto loop0
endi
if $data13 != 2 then
print ======$data13
goto loop0
endi
if $data14 != 2 then
print ======$data14
goto loop0
endi
if $data15 != 3 then
print ======$data15
goto loop0
endi
# row 2
if $data21 != 1 then
print ======$data21
goto loop0
endi
if $data22 != 1 then
print ======$data22
goto loop0
endi
if $data23 != 3 then
print ======$data23
goto loop0
endi
if $data24 != 2 then
print ======$data24
goto loop0
endi
if $data25 != 3 then
print ======$data25
goto loop0
endi
# row 3
if $data31 != 1 then
print ======$data31
goto loop0
endi
if $data32 != 1 then
print ======$data32
goto loop0
endi
if $data33 != 4 then
print ======$data33
goto loop0
endi
if $data34 != 2 then
print ======$data34
goto loop0
endi
if $data35 != 3 then
print ======$data35
goto loop0
endi
sql insert into t1 values(1648791223001,12,14,13,11.1);
$loop_count = 0
loop07:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select * from streamt;
print count(*) , count(d) , sum(a) , max(b) , min(c)
print 0: $data00 , $data01 , $data02 , $data03 , $data04 , $data05
print 1: $data10 , $data11 , $data12 , $data13 , $data14 , $data15
if $rows != 4 then
print ======$rows
goto loop07
endi
# row 0
if $data01 != 2 then
print ======$data01
goto loop07
endi
if $data02 != 2 then
print ======$data02
goto loop07
endi
if $data03 != 5 then
print ======$data03
goto loop07
endi
if $data04 != 2 then
print ======$data04
goto loop07
endi
if $data05 != 3 then
print ======$data05
goto loop07
endi
# row 1
if $data11 != 1 then
print ======$data11
goto loop07
endi
if $data12 != 1 then
print ======$data12
goto loop07
endi
if $data13 != 12 then
print ======$data13
goto loop07
endi
if $data14 != 14 then
print ======$data14
goto loop07
endi
if $data15 != 13 then
print ======$data15
goto loop07
endi
# row 2
if $data21 != 1 then
print ======$data21
goto loop07
endi
if $data22 != 1 then
print ======$data22
goto loop07
endi
if $data23 != 3 then
print ======$data23
goto loop07
endi
if $data24 != 2 then
print ======$data24
goto loop07
endi
if $data25 != 3 then
print ======$data25
goto loop07
endi
# row 3
if $data31 != 1 then
print ======$data31
goto loop07
endi
if $data32 != 1 then
print ======$data32
goto loop07
endi
if $data33 != 4 then
print ======$data33
goto loop07
endi
if $data34 != 2 then
print ======$data34
goto loop07
endi
if $data35 != 3 then
print ======$data35
goto loop07
endi
sql insert into t1 values(1648791223002,12,14,13,11.1);
$loop_count = 0
loop08:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
if $data11 != 2 then
print ======$data11
goto loop08
endi
if $data12 != 2 then
print ======$data12
goto loop08
endi
if $data13 != 24 then
print ======$data13
goto loop08
endi
if $data14 != 14 then
print ======$data14
goto loop08
endi
if $data15 != 13 then
print ======$data15
goto loop08
endi
sql insert into t1 values(1648791223003,12,14,13,11.1);
$loop_count = 0
loop09:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
if $data11 != 3 then
print ======$data11
goto loop09
endi
if $data12 != 3 then
print ======$data12
goto loop09
endi
if $data13 != 36 then
print ======$data13
goto loop09
endi
if $data14 != 14 then
print ======$data14
goto loop09
endi
if $data15 != 13 then
print ======$data15
goto loop09
endi
sql insert into t1 values(1648791223001,1,1,1,1.1);
sql insert into t1 values(1648791223002,2,2,2,2.1);
sql insert into t1 values(1648791223003,3,3,3,3.1);
$loop_count = 0
loop010:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
if $data11 != 3 then
print ======$data11
goto loop010
endi
if $data12 != 3 then
print ======$data12
goto loop010
endi
if $data13 != 6 then
print ======$data13
goto loop010
endi
if $data14 != 3 then
print ======$data14
goto loop010
endi
if $data15 != 1 then
print ======$data15
goto loop010
endi
sql insert into t1 values(1648791233003,3,2,3,2.1);
sql insert into t1 values(1648791233002,5,6,7,8.1);
sql insert into t1 values(1648791233002,3,2,3,2.1);
$loop_count = 0
loop011:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 2
if $data21 != 2 then
print ======$data21
goto loop011
endi
if $data22 != 2 then
print ======$data22
goto loop011
endi
if $data23 != 6 then
print ======$data23
goto loop011
endi
if $data24 != 2 then
print ======$data24
goto loop011
endi
if $data25 != 3 then
print ======$data25
goto loop011
endi
sql insert into t1 values(1648791213004,4,2,3,4.1) (1648791213006,5,4,7,9.1) (1648791213004,40,20,30,40.1) (1648791213005,4,2,3,4.1);
$loop_count = 0
loop012:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 0
if $data01 != 4 then
print ======$data01
goto loop012
endi
if $data02 != 4 then
print ======$data02
goto loop012
endi
if $data03 != 50 then
print ======$data03 != 50
goto loop012
endi
if $data04 != 20 then
print ======$data04 != 20
goto loop012
endi
if $data05 != 3 then
print ======$data05
goto loop012
endi
sql insert into t1 values(1648791223004,4,2,3,4.1) (1648791233006,5,4,7,9.1) (1648791223004,40,20,30,40.1) (1648791233005,4,2,3,4.1);
$loop_count = 0
loop013:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 30 then
return -1
endi
sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
if $data11 != 4 then
print ======$data11
goto loop013
endi
if $data12 != 4 then
print ======$data12
goto loop013
endi
if $data13 != 46 then
print ======$data13 != 46
goto loop013
endi
if $data14 != 20 then
print ======$data14 != 20
goto loop013
endi
if $data15 != 1 then
print ======$data15
goto loop013
endi
# row 2
if $data21 != 4 then
print ======$data21
goto loop013
endi
if $data22 != 4 then
print ======$data22
goto loop013
endi
if $data23 != 15 then
print ======$data23
goto loop013
endi
if $data24 != 4 then
print ======$data24
goto loop013
endi
if $data25 != 3 then
print ======$data25
goto loop013
endi
print ======over
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录