Skip to content

Commit eda4249

Browse files
VGalaxiesVGalaxies
authored
Subscription IT: Refactor how IT is categorized for intro table model tests (#15485)
1 parent a70416c commit eda4249

File tree

101 files changed

+701
-536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+701
-536
lines changed

‎.github/workflows/pipe-it.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ jobs:
431431
name: cluster-log-dual-tree-manual-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster1 }}-${{ matrix.cluster2 }}
432432
path: integration-test/target/cluster-logs
433433
retention-days: 30
434-
subscription-arch-verification:
434+
subscription-tree-arch-verification:
435435
strategy:
436436
fail-fast: false
437437
max-parallel: 15
@@ -476,7 +476,7 @@ jobs:
476476
-DintegrationTest.forkCount=1 -DConfigNodeMaxHeapSize=256 -DDataNodeMaxHeapSize=1024 -DDataNodeMaxDirectMemorySize=768 \
477477
-DClusterConfigurations=${{ matrix.cluster1 }},${{ matrix.cluster2 }} \
478478
-pl integration-test \
479-
-am -PMultiClusterIT2SubscriptionArchVerification \
479+
-am -PMultiClusterIT2SubscriptionTreeArchVerification \
480480
-ntp >> ~/run-tests-$attempt.log && return 0
481481
test_output=$(cat ~/run-tests-$attempt.log)
482482
@@ -515,7 +515,7 @@ jobs:
515515
name: cluster-log-subscription-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster1 }}-${{ matrix.cluster2 }}
516516
path: integration-test/target/cluster-logs
517517
retention-days: 30
518-
subscription-regression-consumer:
518+
subscription-tree-regression-consumer:
519519
strategy:
520520
fail-fast: false
521521
max-parallel: 15
@@ -560,7 +560,7 @@ jobs:
560560
-DintegrationTest.forkCount=1 -DConfigNodeMaxHeapSize=256 -DDataNodeMaxHeapSize=1024 -DDataNodeMaxDirectMemorySize=768 \
561561
-DClusterConfigurations=${{ matrix.cluster1 }},${{ matrix.cluster2 }} \
562562
-pl integration-test \
563-
-am -PMultiClusterIT2SubscriptionRegressionConsumer \
563+
-am -PMultiClusterIT2SubscriptionTreeRegressionConsumer \
564564
-ntp >> ~/run-tests-$attempt.log && return 0
565565
test_output=$(cat ~/run-tests-$attempt.log)
566566
@@ -599,7 +599,7 @@ jobs:
599599
name: cluster-log-subscription-regression-consumer-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster1 }}-${{ matrix.cluster2 }}
600600
path: integration-test/target/cluster-logs
601601
retention-days: 30
602-
subscription-regression-misc:
602+
subscription-tree-regression-misc:
603603
strategy:
604604
fail-fast: false
605605
max-parallel: 15
@@ -644,7 +644,7 @@ jobs:
644644
-DintegrationTest.forkCount=1 -DConfigNodeMaxHeapSize=256 -DDataNodeMaxHeapSize=1024 -DDataNodeMaxDirectMemorySize=768 \
645645
-DClusterConfigurations=${{ matrix.cluster1 }},${{ matrix.cluster2 }} \
646646
-pl integration-test \
647-
-am -PMultiClusterIT2SubscriptionRegressionMisc \
647+
-am -PMultiClusterIT2SubscriptionTreeRegressionMisc \
648648
-ntp >> ~/run-tests-$attempt.log && return 0
649649
test_output=$(cat ~/run-tests-$attempt.log)
650650

‎integration-test/pom.xml‎

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@
449449
</activation>
450450
<properties>
451451
<integrationTest.excludedGroups>org.apache.iotdb.itbase.category.ManualIT</integrationTest.excludedGroups>
452-
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT1,org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic,org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced,org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionArchVerification,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc,org.apache.iotdb.itbase.category.MultiClusterIT3,org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic,org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualEnhanced</integrationTest.includedGroups>
452+
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT1,org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic,org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced,org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeArchVerification,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTableArchVerification,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTableRegressionConsumer,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTableRegressionMisc,org.apache.iotdb.itbase.category.MultiClusterIT3,org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic,org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualEnhanced</integrationTest.includedGroups>
453453
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
454454
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
455455
<integrationTest.readAndVerifyWithMultiNode>true</integrationTest.readAndVerifyWithMultiNode>
@@ -541,41 +541,83 @@
541541
</properties>
542542
</profile>
543543
<profile>
544-
<id>MultiClusterIT2SubscriptionArchVerification</id>
544+
<id>MultiClusterIT2SubscriptionTreeArchVerification</id>
545545
<activation>
546546
<activeByDefault>false</activeByDefault>
547547
</activation>
548548
<properties>
549549
<integrationTest.excludedGroups>org.apache.iotdb.itbase.category.ManualIT</integrationTest.excludedGroups>
550-
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionArchVerification</integrationTest.includedGroups>
550+
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeArchVerification</integrationTest.includedGroups>
551551
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
552552
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
553553
<integrationTest.readAndVerifyWithMultiNode>true</integrationTest.readAndVerifyWithMultiNode>
554554
<integrationTest.testEnv>MultiCluster</integrationTest.testEnv>
555555
</properties>
556556
</profile>
557557
<profile>
558-
<id>MultiClusterIT2SubscriptionRegressionConsumer</id>
558+
<id>MultiClusterIT2SubscriptionTreeRegressionConsumer</id>
559559
<activation>
560560
<activeByDefault>false</activeByDefault>
561561
</activation>
562562
<properties>
563563
<integrationTest.excludedGroups>org.apache.iotdb.itbase.category.ManualIT</integrationTest.excludedGroups>
564-
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer</integrationTest.includedGroups>
564+
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer</integrationTest.includedGroups>
565565
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
566566
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
567567
<integrationTest.readAndVerifyWithMultiNode>true</integrationTest.readAndVerifyWithMultiNode>
568568
<integrationTest.testEnv>MultiCluster</integrationTest.testEnv>
569569
</properties>
570570
</profile>
571571
<profile>
572-
<id>MultiClusterIT2SubscriptionRegressionMisc</id>
572+
<id>MultiClusterIT2SubscriptionTreeRegressionMisc</id>
573573
<activation>
574574
<activeByDefault>false</activeByDefault>
575575
</activation>
576576
<properties>
577577
<integrationTest.excludedGroups>org.apache.iotdb.itbase.category.ManualIT</integrationTest.excludedGroups>
578-
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc</integrationTest.includedGroups>
578+
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc</integrationTest.includedGroups>
579+
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
580+
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
581+
<integrationTest.readAndVerifyWithMultiNode>true</integrationTest.readAndVerifyWithMultiNode>
582+
<integrationTest.testEnv>MultiCluster</integrationTest.testEnv>
583+
</properties>
584+
</profile>
585+
<profile>
586+
<id>MultiClusterIT2SubscriptionTableArchVerification</id>
587+
<activation>
588+
<activeByDefault>false</activeByDefault>
589+
</activation>
590+
<properties>
591+
<integrationTest.excludedGroups>org.apache.iotdb.itbase.category.ManualIT</integrationTest.excludedGroups>
592+
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTableArchVerification</integrationTest.includedGroups>
593+
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
594+
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
595+
<integrationTest.readAndVerifyWithMultiNode>true</integrationTest.readAndVerifyWithMultiNode>
596+
<integrationTest.testEnv>MultiCluster</integrationTest.testEnv>
597+
</properties>
598+
</profile>
599+
<profile>
600+
<id>MultiClusterIT2SubscriptionTableRegressionConsumer</id>
601+
<activation>
602+
<activeByDefault>false</activeByDefault>
603+
</activation>
604+
<properties>
605+
<integrationTest.excludedGroups>org.apache.iotdb.itbase.category.ManualIT</integrationTest.excludedGroups>
606+
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTableRegressionConsumer</integrationTest.includedGroups>
607+
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
608+
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
609+
<integrationTest.readAndVerifyWithMultiNode>true</integrationTest.readAndVerifyWithMultiNode>
610+
<integrationTest.testEnv>MultiCluster</integrationTest.testEnv>
611+
</properties>
612+
</profile>
613+
<profile>
614+
<id>MultiClusterIT2SubscriptionTableRegressionMisc</id>
615+
<activation>
616+
<activeByDefault>false</activeByDefault>
617+
</activation>
618+
<properties>
619+
<integrationTest.excludedGroups>org.apache.iotdb.itbase.category.ManualIT</integrationTest.excludedGroups>
620+
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTableRegressionMisc</integrationTest.includedGroups>
579621
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
580622
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
581623
<integrationTest.readAndVerifyWithMultiNode>true</integrationTest.readAndVerifyWithMultiNode>

‎integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTableArchVerification.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package org.apache.iotdb.itbase.category;
21+
22+
public interface MultiClusterIT2SubscriptionTableArchVerification {}

‎integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTableRegressionConsumer.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package org.apache.iotdb.itbase.category;
21+
22+
public interface MultiClusterIT2SubscriptionTableRegressionConsumer {}

integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionArchVerification.java renamed to integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTableRegressionMisc.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919

2020
package org.apache.iotdb.itbase.category;
2121

22-
public interface MultiClusterIT2SubscriptionArchVerification {}
22+
public interface MultiClusterIT2SubscriptionTableRegressionMisc {}

integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionRegressionMisc.java renamed to integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTreeArchVerification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919

2020
package org.apache.iotdb.itbase.category;
2121

22-
public interface MultiClusterIT2SubscriptionRegressionMisc {}
22+
public interface MultiClusterIT2SubscriptionTreeArchVerification {}

‎integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTreeRegressionConsumer.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package org.apache.iotdb.itbase.category;
21+
22+
public interface MultiClusterIT2SubscriptionTreeRegressionConsumer {}

integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionRegressionConsumer.java renamed to integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTreeRegressionMisc.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919

2020
package org.apache.iotdb.itbase.category;
2121

22-
public interface MultiClusterIT2SubscriptionRegressionConsumer {}
22+
public interface MultiClusterIT2SubscriptionTreeRegressionMisc {}

‎integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/tablemodel/.gitkeep‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#

integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionConsumerGroupIT.java renamed to integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/treemodel/IoTDBSubscriptionConsumerGroupIT.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.iotdb.subscription.it.dual;
20+
package org.apache.iotdb.subscription.it.dual.treemodel;
2121

2222
import org.apache.iotdb.common.rpc.thrift.TSStatus;
2323
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
@@ -26,7 +26,7 @@
2626
import org.apache.iotdb.isession.ISession;
2727
import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper;
2828
import org.apache.iotdb.it.framework.IoTDBTestRunner;
29-
import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionArchVerification;
29+
import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeArchVerification;
3030
import org.apache.iotdb.rpc.TSStatusCode;
3131
import org.apache.iotdb.rpc.subscription.config.TopicConstant;
3232
import org.apache.iotdb.session.subscription.SubscriptionTreeSession;
@@ -35,6 +35,7 @@
3535
import org.apache.iotdb.session.subscription.payload.SubscriptionMessageType;
3636
import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet;
3737
import org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant;
38+
import org.apache.iotdb.subscription.it.dual.AbstractSubscriptionDualIT;
3839

3940
import org.apache.tsfile.read.TsFileReader;
4041
import org.apache.tsfile.read.common.Path;
@@ -69,7 +70,7 @@
6970
import static org.junit.Assert.fail;
7071

7172
@RunWith(IoTDBTestRunner.class)
72-
@Category({MultiClusterIT2SubscriptionArchVerification.class})
73+
@Category({MultiClusterIT2SubscriptionTreeArchVerification.class})
7374
public class IoTDBSubscriptionConsumerGroupIT extends AbstractSubscriptionDualIT {
7475

7576
// Test dimensions:

0 commit comments

Comments
 (0)