Skip to content

Commit f5c0e8a

Browse files
authored
Try to make IoTDBTableAggregationNonStream2IT more stable (apache#16361)
1 parent d9075a6 commit f5c0e8a

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationIT.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3741,7 +3741,7 @@ public void lastQueryTest() {
37413741
expectedHeader,
37423742
retArray,
37433743
DATABASE_NAME);
3744-
} catch (Exception e) {
3744+
} catch (Error e) {
37453745
// second try
37463746
tableResultSetEqualTest(
37473747
"select last(time),last_by(s1,time),last_by(s2,time),last_by(s3,time),last_by(s4,time),last_by(s5,time),last_by(s6,time),last_by(s7,time),last_by(s8,time),last_by(s9,time),last_by(s10,time) from table1 where device_id='d01'",
@@ -3779,7 +3779,7 @@ public void lastQueryTest() {
37793779
expectedHeader,
37803780
retArray,
37813781
DATABASE_NAME);
3782-
} catch (Exception e) {
3782+
} catch (Error e) {
37833783
// second try
37843784
tableResultSetEqualTest(
37853785
"select device_id,last(time),last_by(s1,time),last_by(s2,time),last_by(s3,time),last_by(s4,time),last_by(s5,time),last_by(s6,time),last_by(s7,time),last_by(s8,time),last_by(s9,time),last_by(s10,time) from table1 where device_id in ('d01', 'd04', 'd09', 'd12') group by device_id order by device_id",
@@ -3820,7 +3820,7 @@ public void lastQueryTest() {
38203820
expectedHeader,
38213821
retArray,
38223822
DATABASE_NAME);
3823-
} catch (Exception e) {
3823+
} catch (Error e) {
38243824
// second try
38253825
tableResultSetEqualTest(
38263826
"select province,city,region,device_id,last(time),last_by(s1,time),last_by(s2,time),last_by(s3,time),last_by(s4,time),last_by(s5,time),last_by(s6,time),last_by(s7,time),last_by(s8,time),last_by(s9,time),last_by(s10,time) from table1 where device_id in ('d01', 'd04', 'd09', 'd12') group by 1,2,3,4 order by 1,2,3,4",
@@ -3871,7 +3871,7 @@ public void lastQueryTest() {
38713871
expectedHeader,
38723872
retArray,
38733873
DATABASE_NAME);
3874-
} catch (Exception e) {
3874+
} catch (Error e) {
38753875
// second try
38763876
tableResultSetEqualTest(
38773877
"select device_id,date_bin(5s,time),last(time),last_by(s1,time),last_by(s2,time),last_by(s3,time),last_by(s4,time),last_by(s5,time),last_by(s6,time),last_by(s7,time),last_by(s8,time),last_by(s9,time),last_by(s10,time) from table1 where device_id in ('d01', 'd04', 'd09', 'd12') group by province,city,region,device_id,date_bin(5s,time) order by device_id,date_bin(5s,time)",
@@ -3925,7 +3925,7 @@ public void lastQueryTest() {
39253925
expectedHeader,
39263926
retArray,
39273927
DATABASE_NAME);
3928-
} catch (Exception e) {
3928+
} catch (Error e) {
39293929
// second try
39303930
tableResultSetEqualTest(
39313931
"select province,city,region,last(time),last_by(s1,time),last_by(s2,time),last_by(s3,time),last_by(s4,time),last_by(s5,time),last_by(s6,time),last_by(s7,time),last_by(s8,time),last_by(s9,time),last_by(s10,time) from table1 where device_id NOT in ('d01', 'd08', 'd12', 'd13') group by 1,2,3 order by 1,2,3",
@@ -3965,7 +3965,7 @@ public void lastQueryTest() {
39653965
expectedHeader,
39663966
retArray,
39673967
DATABASE_NAME);
3968-
} catch (Exception e) {
3968+
} catch (Error e) {
39693969
// second try
39703970
tableResultSetEqualTest(
39713971
"select province,city,region,last(time),last_by(s1,time),last_by(s2,time),last_by(s3,time),last_by(s4,time),last_by(s5,time),last_by(s6,time),last_by(s7,time),last_by(s8,time),last_by(s9,time),last_by(s10,time) from table1 where device_id NOT in ('d01', 'd08', 'd12', 'd13') group by 1,2,3 order by 1,2,3",
@@ -4002,7 +4002,7 @@ public void lastQueryTest() {
40024002
expectedHeader,
40034003
retArray,
40044004
DATABASE_NAME);
4005-
} catch (Exception e) {
4005+
} catch (Error e) {
40064006
// second try
40074007
tableResultSetEqualTest(
40084008
"select province,city,last(time),last_by(s1,time),last_by(s2,time),last_by(s3,time),last_by(s4,time),last_by(s5,time),last_by(s6,time),last_by(s7,time),last_by(s8,time),last_by(s9,time),last_by(s10,time) from table1 where device_id NOT in ('d01', 'd05', 'd08', 'd09', 'd12', 'd13') group by 1,2 order by 1,2",
@@ -4038,7 +4038,7 @@ public void lastQueryTest() {
40384038
expectedHeader,
40394039
retArray,
40404040
DATABASE_NAME);
4041-
} catch (Exception e) {
4041+
} catch (Error e) {
40424042
// second try
40434043
tableResultSetEqualTest(
40444044
"select province,last(time),last_by(s1,time),last_by(s2,time),last_by(s3,time),last_by(s4,time),last_by(s5,time),last_by(s6,time),last_by(s7,time),last_by(s8,time),last_by(s9,time),last_by(s10,time) from table1 where device_id NOT in ('d01', 'd05', 'd08', 'd09', 'd12', 'd13') group by 1 order by 1",
@@ -4076,7 +4076,7 @@ public void lastQueryTest() {
40764076
expectedHeader,
40774077
retArray,
40784078
DATABASE_NAME);
4079-
} catch (Exception e) {
4079+
} catch (Error e) {
40804080
// second try
40814081
tableResultSetEqualTest(
40824082
"select device_id, last(time),last_by(s1,time),last_by(s2,time),last_by(s3,time),last_by(s4,time),last_by(s5,time),last_by(s6,time),last_by(s7,time),last_by(s8,time),last_by(s9,time),last_by(s10,time) from table1 where city = 'shanghai' and type='A' group by province,city,region,device_id order by device_id",

0 commit comments

Comments
 (0)